conni

build/utils.js

@@ -18,8 +18,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 
 
 
-  let devModules = ['all']
-// let devModules = ['index','inward','SporadicManage']
+  // let devModules = ['all']
+let devModules = ['index','statisticalReport','inward']
 // let devModules = ['index','sale','RMS']
 // let devModules = ['index','SporadicManage','RMS','statisticalReport']
 // let devModules = ['index','inward','statisticalReport']

config/index.js

@@ -64,8 +64,8 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://172.16.33.166:8080",
-    // target: "http://localhost:8080",
+    // target: "http://172.16.33.166:8080",
+    target: "http://localhost:8081",
     // target: "http://localhost:8019",
     ws: true,
     pathRewrite: {

src/views/TMS/components/bmsport/handlingFee.vue

@@ -10,9 +10,9 @@
     <dilTable v-bind.sync="option">
       <el-table-column fixed="right" label="操作" align="center" width="100">
         <template slot-scope="scope">
-          <el-button @click="click(scope.row.feeId)" type="text" size="small"
+          <!-- <el-button @click="click(scope.row.feeId)" type="text" size="small"
             >编辑</el-button
-          >
+          > -->
           <el-button
             type="text"
             size="small"
@@ -88,10 +88,8 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
+    padding: 1.25rem 1.875rem;
     .el-input {
-      margin-left: 2.5rem;
-      margin-top: 2.5rem;
-      margin-bottom: 2.5rem;
       width: 250px;
     }
   }

src/views/TMS/components/bmsport/updateHandlingFee.vue

@@ -4,9 +4,7 @@
     <page-title>编辑</page-title>
     <div class="contractTitle">
       <div class="form-box">
-        <div class="form-box">
           <dil-form :formId="223" v-model="form1"></dil-form>
-        </div>
       </div>
     </div>
     <div class="button-box">
@@ -86,5 +84,18 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-// @import "@/styles/appoint/contract/ContractInsert.scss";
+  .form-box {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .el-form-item {
+          display: flex;
+          .el-form-item__label {
+            width: 170px !important;
+          }
+          .el-input {
+            width: 210px !important;
+          }
+    }
+  }
 </style>

src/views/TMS/components/bmsship/detailsOrder.vue

@@ -41,6 +41,9 @@ export default {
 .purchaseOrder {
   .top {
     padding: 1.25rem 1.875rem;
+    .el-input {
+      width: 250px;
+    }
   }
 }
 </style>

src/views/TMS/components/bmsship/detailsStatement.vue

@@ -7,13 +7,13 @@
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" @click="shipclick">
-        生成水运费账单
+        新增水运费账单
       </el-button>
       <el-button type="primary" @click="waterclick">
-        生成水分检测费账单
+        新增水分检测费账单
       </el-button>
       <el-button type="primary" @click="click()">
-        生成途损费账单
+        新增途损费账单
       </el-button>
     </div>
     <dilTable v-bind.sync="option" >
@@ -63,6 +63,9 @@ export default {
 .purchaseOrder {
   .top {
     padding: 1.25rem 1.875rem;
+    .el-input {
+      width: 250px;
+    }
   }
 }
 </style>

src/views/TMS/components/bmsship/lossDetailsStatement.vue

@@ -6,18 +6,8 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <!-- <el-button type="primary" @click="click()">
-        生成途损费账单
-      </el-button> -->
     </div>
     <dilTable v-bind.sync="option">
-      <!-- <el-table-column fixed="right" label="操作" width="100">
-        <template slot-scope="scope">
-          <el-button @click="btnclick(scope.row)" type="text" size="small"
-            >详情</el-button
-          >
-        </template>
-      </el-table-column> -->
     </dilTable>
   </div>
 </template>

src/views/TMS/components/bmsship/toBeStatement.vue

@@ -1,6 +1,7 @@
 <template>
   <!-- 船运计费详单页面 -->
   <div class="purchaseOrder">
+    <page-title>船运账单</page-title>
     <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
@@ -11,35 +12,24 @@
       </el-button>
     </div>
     <dilTable v-bind.sync="option"  @radio-change="currentRadioChange">
-      <!-- <el-table-column fixed="right" label="操作" width="100"> -->
-        <!-- <template slot-scope="scope">
-          <el-button @click="click(scope.row.pathId)" type="text" size="small"
-            >编辑</el-button
-          >
-          <el-button
-            type="text"
-            size="small"
-            @click="deleteclick(scope.row.pathId)"
-            >删除</el-button
-          >
-        </template> -->
-      <!-- </el-table-column> -->
     </dilTable>
   </div>
 </template>
 
 <script>
+import PageTitle from "@/components/Page/Title";
 export default {
+  components: { PageTitle },
   name: "purchaseOrder",
   data() {
     return {
       input:"",
+      map:{},
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/bms/getBatch?apiId=115",
         // 控制显示当选列
         selectionType: "radio",
-        map:{},
       },
     };
   },
@@ -52,6 +42,11 @@ export default {
       this.option.requestUrl = "/api/v1/bms/getBatch?apiId=115&con="+this.input;
     },
     btnclick() {
+      console.log(JSON.stringify(this.map).length)
+      if(JSON.stringify(this.map).length == 2){
+        this.$message.error("请勾选品名！")
+        return
+      }
       this.$confirm("是否生成", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -59,23 +54,24 @@ export default {
         center: true,
       })
         .then(() => {
-         
       this.axios.post("/api/v1/bms/addLossStatement",this.map)
                   .then((res) => {
                     var  num = res.data.data;
                     console.log(num,"num");
+                    console.log(res)
                     if( num > 0){
                        this.$message({
                           type: "success",
                           message: "生成账单成功!",
                         });
+                        this.$router.go(-1);
                     }else{
                        this.$message({
                           type: "warning",
-                          message: "未产生途损费用!",
+                          message:res.data.data,
                         });
                     }
-              this.$router.go(-1);
+              
             });
         })
         .catch(() => {
@@ -93,6 +89,9 @@ export default {
 .purchaseOrder {
   .top {
     padding: 1.25rem 1.875rem;
+    .el-input {
+      width: 250px;
+    }
   }
 }
 </style>

src/views/TMS/components/bmsship/uncomplateDetails.vue

@@ -1,6 +1,7 @@
 <template>
   <!-- 船运计费详单页面 -->
   <div class="purchaseOrder">
+    <page-title>船运账单</page-title>
     <div class="top">
       <el-input
         placeholder="请输入内容"
@@ -15,35 +16,24 @@
       </el-button>
     </div>
     <dilTable v-bind.sync="option" @selection-change="selectionChange">
-      <!-- <el-table-column fixed="right" label="操作" width="100"> -->
-        <!-- <template slot-scope="scope">
-          <el-button @click="click(scope.row.pathId)" type="text" size="small"
-            >编辑</el-button
-          >
-          <el-button
-            type="text"
-            size="small"
-            @click="deleteclick(scope.row.pathId)"
-            >删除</el-button
-          >
-        </template> -->
-      <!-- </el-table-column> -->
     </dilTable>
   </div>
 </template>
 
 <script>
+import PageTitle from "@/components/Page/Title";
 export default {
   name: "purchaseOrder",
+  components: { PageTitle },
   data() {
     return {
       input:"",
+      mapList:[],
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/bms/getUncomplateDetailsOrderList?apiId=93",
         // 控制显示多选列
         selectionType: "select",
-        mapList:[],
       },
     };
   },
@@ -55,6 +45,10 @@ export default {
       console.log(1);
     },
     btnclick() {
+      if(this.mapList.length == 0){
+        this.$message.error("请勾选详单！")
+        return
+      }
       this.$confirm("是否生成", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -86,6 +80,9 @@ export default {
 .purchaseOrder {
   .top {
     padding: 1.25rem 1.875rem;
+    .el-input {
+      width: 250px;
+    }
   }
 }
 </style>

src/views/TMS/components/bmsship/uncomplateWater.vue

@@ -1,6 +1,7 @@
 <template>
   <!-- 船运计费详单页面 -->
   <div class="purchaseOrder">
+    <page-title>船运账单</page-title>
     <div class="top">
       <el-input
         placeholder="请输入内容"
@@ -15,35 +16,25 @@
       </el-button>
     </div>
     <dilTable v-bind.sync="option" @selection-change="selectionChange">
-      <!-- <el-table-column fixed="right" label="操作" width="100"> -->
-        <!-- <template slot-scope="scope">
-          <el-button @click="click(scope.row.pathId)" type="text" size="small"
-            >编辑</el-button
-          >
-          <el-button
-            type="text"
-            size="small"
-            @click="deleteclick(scope.row.pathId)"
-            >删除</el-button
-          >
-        </template> -->
-      <!-- </el-table-column> -->
     </dilTable>
   </div>
 </template>
 
 <script>
+import PageTitle from "@/components/Page/Title";
 export default {
   name: "purchaseOrder",
+  components: { PageTitle },
   data() {
+    
     return {
       input:"",
+      mapList:[],
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/bms/getWaterResult?apiId=114",
         // 控制显示多选列
         selectionType: "select",
-        mapList:[],
       },
     };
   },
@@ -55,6 +46,11 @@ export default {
       console.log(1);
     },
     btnclick() {
+      console.log(this.mapList.length)
+      if(this.mapList.length == 0 ){
+        this.$message.error("请选择需要生成账单的水分检测详单")
+        return
+      }
       this.$confirm("是否生成", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -86,6 +82,9 @@ export default {
 .purchaseOrder {
   .top {
     padding: 1.25rem 1.875rem;
+    .el-input {
+      width: 250px;
+    }
   }
 }
 </style>

src/views/TMS/components/bmstrain/addTrainDetails.vue

@@ -1,6 +1,7 @@
 <template>
   <!-- 火运计费详单页面 -->
   <div class="purchaseOrder">
+    <page-title>火运详单</page-title>
     <div class="top">
       <el-input
         placeholder="请输入内容"
@@ -11,46 +12,32 @@
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" @click="btnclick">
-        生成火运详单
+        新增
       </el-button>
     </div>
     <dilTable v-bind.sync="option" @radio-change="currentRadioChange">
-      <!-- <el-table-column fixed="right" label="操作" width="100"> -->
-        <!-- <template slot-scope="scope">
-          <el-button @click="click(scope.row.pathId)" type="text" size="small"
-            >编辑</el-button
-          >
-          <el-button
-            type="text"
-            size="small"
-            @click="deleteclick(scope.row.pathId)"
-            >删除</el-button
-          >
-        </template> -->
-      <!-- </el-table-column> -->
     </dilTable>
   </div>
 </template>
 
 <script>
+import PageTitle from "@/components/Page/Title";
 export default {
+  components: { PageTitle },
   name: "purchaseOrder",
   data() {
     return {
       input:"",
+      map:{},
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/bms/getTrainResultList?apiId=122",
         // 控制显示当选列
         selectionType: "radio",
-        map:{},
       },
     };
   },
   methods: {
-    // selectionChange(selection) { 
-    //   this.mapList=selection
-    // },
     currentRadioChange(row) {
       this.map=row
       console.log(row);
@@ -59,6 +46,11 @@ export default {
       console.log(1);
     },
     btnclick() {
+      console.log()
+      if(JSON.stringify(this.map).length == 2){
+        this.$message.error("未勾选火运实绩")
+        return
+      }
       this.$confirm("是否生成", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -90,6 +82,9 @@ export default {
 .purchaseOrder {
   .top {
     padding: 1.25rem 1.875rem;
+    .el-input {
+      width: 250px;
+    }
   }
 }
 </style>

src/views/TMS/components/bmstrain/detailsTrainOrder.vue

@@ -45,6 +45,9 @@ export default {
 <style lang='scss' scoped>
 .purchaseOrder {
   .top {
+    .el-input {
+      width: 250px;
+    }
     padding: 1.25rem 1.875rem;
   }
 }

src/views/TMS/components/bmstrain/uncomplateTrainDetails.vue

@@ -15,19 +15,6 @@
       </el-button>
     </div>
     <dilTable v-bind.sync="option" @selection-change="selectionChange">
-      <!-- <el-table-column fixed="right" label="操作" width="100"> -->
-        <!-- <template slot-scope="scope">
-          <el-button @click="click(scope.row.pathId)" type="text" size="small"
-            >编辑</el-button
-          >
-          <el-button
-            type="text"
-            size="small"
-            @click="deleteclick(scope.row.pathId)"
-            >删除</el-button
-          >
-        </template> -->
-      <!-- </el-table-column> -->
     </dilTable>
   </div>
 </template>
@@ -86,6 +73,9 @@ export default {
 .purchaseOrder {
   .top {
     padding: 1.25rem 1.875rem;
+    .el-input {
+      width: 250px;
+    }  
   }
 }
 </style>

src/views/appoint/components/purchase/addTrainPrice.vue

@@ -1,27 +1,20 @@
 <template>
   <!-- 添加水运价格 -->
-  <div class="addShipPrice">
+  <div class="addTrainPrice">
     <page-title>新增</page-title>
-    <el-divider content-position="left">添加火运价格</el-divider>
-     <div class="form-box" style="margin-right: 10rem">
+     <div class="form-box" >
         <dil-form :formId="192" v-model="form1" ref="from1"></dil-form>
       </div>
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
-    <!-- <div class="primarybtn">
-      <el-button class="btn" @click="goback">取消</el-button>
-      <el-button type="primary" class="btn" @click="submitclick"
-        >确定</el-button
-      >
-    </div> -->
   </div>
 </template>
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime, isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
@@ -52,8 +45,6 @@ export default {
           amsContractTrainPrice
         )
         .then((res) => {
-        //   console.log(res);
-        //   console.log(this.form4);
           this.$router.go(-1);
         });
     },
@@ -65,5 +56,26 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-
+.addTrainPrice {
+  .form-box {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+    .el-form-item {
+      display: flex !important;
+      .el-form-item__label {
+        width: 170px !important;
+      }
+      .el-input {
+        width: 210px !important;
+      }
+    }
+  }
+  .button-box {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+}
 </style>

src/views/appoint/components/purchase/shipPrice.vue

@@ -103,6 +103,9 @@ export default {
 .homeworkPath {
   .top {
     padding: 1.25rem 1.875rem;
+    .el-input {
+      width: 250px;
+    }
   }
 }
 </style>

src/views/appoint/components/purchase/trainPrice.vue

@@ -35,6 +35,7 @@ export default {
     return {
       restaurants: [],
       state: "",
+      input:"",
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/ams/getTrainPriceList?apiId=116",
@@ -57,18 +58,6 @@ export default {
     click(priceId) {
       this.$router.push("/updateTrainPrice/" + priceId);
     },
-    // deleteclick(scope) {
-    //   let pathId = scope;
-    //   this.axios
-    //     .post("/api/v1/tms/operationPath/operationPathDelete?pathId=" + pathId)
-    //     .then((res) => {
-    //       this.$message({
-    //         message: "删除成功",
-    //         type: "success",
-    //       });
-    //       this.$router.go(0);
-    //     });
-    // },
     deleteclick(scope) {
       let priceId = scope;
       this.$confirm("是否删除", "提示", {
@@ -104,6 +93,9 @@ export default {
 .homeworkPath {
   .top {
     padding: 1.25rem 1.875rem;
+    .el-input {
+      width: 250px;
+    }
   }
 }
 </style>

src/views/appoint/components/purchase/updateTrainPrice.vue

@@ -1,19 +1,10 @@
 <template>
   <!-- 修改水运价格信息 -->
-  <div id="contractDetails">
+  <div class="addTrainPrice">
     <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">修改火运价格信息</span>
-      <span class="a"></span>
-    </div>
-    <div class="contractTitle">
       <div class="form-box">
-        <div class="form-one">
           <dil-form :formId="192" v-model="form1"></dil-form>
-        </div>
       </div>
-    </div>
-
     <div class="button-box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
@@ -23,7 +14,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime, isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
  data(){
@@ -42,9 +33,7 @@ export default {
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
-            // console.log(e);
-            // console.log(this.form1);
-            // console.log(this.$route.params.loadingId);
+          
           });
         });
     },
@@ -73,14 +62,35 @@ export default {
           amsContractTrainPrice
         )
         .then((res) => {
-          console.log(res);
-          console.log(this.form1);
-          this.$router.go(-1);
+          if(res.data.code == 200){
+            this.$router.go(-1);
+          }
         });
     },
   },
 };
 </script>
 <style lang="scss" scoped>
-
+  .addTrainPrice {
+  .form-box {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+    .el-form-item {
+      display: flex !important;
+      .el-form-item__label {
+        width: 170px !important;
+      }
+      .el-input {
+        width: 210px !important;
+      }
+    }
+  }
+  .button-box {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+}
 </style>

src/views/statisticalReport/components/inwardReport/putInwardReport.vue

@@ -44,7 +44,7 @@ export default {
       },
       startTime: null,
       endTime: null,
-      tableTitle:'零星出厂统计报表'
+      tableTitle:'采购内转统计报表'
     };
   }, 
   created(){