Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

package.json

@@ -38,6 +38,7 @@
     "json2xml": "^0.1.3",
     "jspdf": "^2.5.1",
     "jssha": "^3.2.0",
+    "lay-excel": "^1.7.6",
     "object-assign": "^4.1.1",
     "qs": "^6.9.3",
     "sass-loader": "^6.0.7",

src/views/SporadicManage/components/oldAreaSporadic/transportOrder/addTransportOrder.vue

@@ -94,7 +94,6 @@
       :wrapperClosable="false"
       modal
       close-on-press-escape
-    
     >
       <el-input
         placeholder="请输入内容"

src/views/TMS/components/importedShip/addLoadShip.vue

@@ -3,22 +3,22 @@
   <div class="shipTransport">
     <page-title>返回</page-title>
     <!-- 第一部分 -->
-      <div class="top">
-        <el-input placeholder="请输入内容" v-model="input" clearable> </el-input> 
-        <el-button type="primary" class="btn" @click="onclick()">
-          <i class="el-icon-search"></i>查询
-        </el-button>   
-      </div>
-      <dilTable v-bind.sync="option" @radio-change="currentRadioChange">
-      </dilTable>
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick()">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option" @radio-change="currentRadioChange">
+    </dilTable>
     <div class="form">
       <!-- 第二部分 -->
       <div class="form_box">
-          <dil-form :formId="120" v-model="form"></dil-form>
+        <dil-form :formId="120" v-model="form"></dil-form>
       </div>
     </div>
     <div class="button_box">
-        <el-button type="primary" @click="makeSure">新增装船作业</el-button>
+      <el-button type="primary" @click="makeSure">新增装船作业</el-button>
     </div>
   </div>
 </template>
@@ -31,7 +31,7 @@ export default {
   components: { PageTitle },
   data() {
     return {
-      input:'',
+      input: "",
       restaurants: [],
       state: "",
       form: {},
@@ -39,44 +39,38 @@ export default {
         // 表格请求数据的地址
         requestUrl: "/api/v1/tms/getCapacityList?apiId=138",
         // 控制显示当选列
-        selectionType: "radio",
-        rowMap:{},
+        selectionType: "radio"
       },
+      rowMap: {}
     };
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     currentRadioChange(row) {
-      this.rowMap=row
-      
-      console.log("addd",this.rowMap);
+      this.rowMap = row;
+      console.log("addd", this.rowMap);
     },
     // 新增
     makeSure() {
+      if (JSON.stringify(this.rowMap).length == 2) {
+        this.$message.error("未选择江船");
+        return;
+      }
       let mapVal = {
         resultActualInstallations: this.form.resultActualInstallations,
-      //  portId: this.form.portId,
-        resultLoadShipDate: sjTime(
-          this.form.resultLoadShipDate
-        ),
+        //  portId: this.form.portId,
+        resultLoadShipDate: sjTime(this.form.resultLoadShipDate),
         resultIsClear: this.form.resultIsClear,
-        resultPortDeclarationTime: sjTime(
-          this.form.resultPortDeclarationTime
-        ),
+        resultPortDeclarationTime: sjTime(this.form.resultPortDeclarationTime),
         resultPortDeclarationName: this.form.resultPortDeclarationName,
-        resultArrivalTime: sjTime(
-          this.form.resultArrivalTime
-        ),
+        resultArrivalTime: sjTime(this.form.resultArrivalTime),
         resultOutWharyName: this.form.resultOutWharyName,
-        resultOutWharyTime: sjTime(
-          this.form.resultOutWharyTime
-        ),
+        resultOutWharyTime: sjTime(this.form.resultOutWharyTime),
         resultMemo: this.form.resultMemo,
-        userId:getCookie("userId")
+        userId: getCookie("userId")
       };
-           //判断放货数量是否为数字
-       function isNumber() {
+      //判断放货数量是否为数字
+      function isNumber() {
         var value = mapVal.resultActualInstallations;
         //验证是否为数字
         var patrn = /^(-)?\d+(\.\d+)?$/;
@@ -86,74 +80,73 @@ export default {
           return true;
         }
       }
-      var val=this.value;
-    
+      var val = this.value;
+
       if (
-      mapVal.resultActualInstallations==null||
-     // mapVal.portId==null||
-      mapVal.resultLoadShipDate==null||
-      mapVal.resultIsClear==null||
-      mapVal.resultPortDeclarationTime==null||
-      mapVal.resultPortDeclarationName==null||
-      mapVal.resultArrivalTime==null||
-      mapVal.resultOutWharyName==null||
-      mapVal.resultOutWharyTime==null
-      ) this.$message.error("存在空值！");
-      else if(!isNumber(val)) this.$message.warning("实装数量必须为数字!")
+        mapVal.resultActualInstallations == null ||
+        // mapVal.portId==null||
+        mapVal.resultLoadShipDate == null ||
+        mapVal.resultIsClear == null ||
+        mapVal.resultPortDeclarationTime == null ||
+        mapVal.resultPortDeclarationName == null ||
+        mapVal.resultArrivalTime == null ||
+        mapVal.resultOutWharyName == null ||
+        mapVal.resultOutWharyTime == null
+      )
+        this.$message.error("存在空值！");
+      else if (!isNumber(val)) this.$message.warning("实装数量必须为数字!");
       else
-      this.axios
-        .post(
-          "/api/v1/tms/addLoadShip",
-          {
-           mapVal:mapVal,
-           rowMap:this.rowMap
-          }
-        )
-        .then((res) => {
-          if (res.data.code == 200) {
-            this.$message({
-              type: "success",
-              message: "新增成功!",
-            });
-            this.$router.go(-1);
-          }else if(res.data.code == 201){
-            this.$message.warning(res.data.data);
-          } else {
-            this.$message.error("新增失败！");
-          }
-          this.$refs['table'].resetField();
-        });
+        this.axios
+          .post("/api/v1/tms/addLoadShip", {
+            mapVal: mapVal,
+            rowMap: this.rowMap
+          })
+          .then(res => {
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "新增成功!"
+              });
+              this.$router.go(-1);
+            } else if (res.data.code == 201) {
+              this.$message.warning(res.data.data);
+            } else {
+              this.$message.error("新增失败！");
+            }
+            this.$refs["table"].resetField();
+          });
     },
     handleSelect(item) {
       console.log(item);
     },
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getCapacityList?apiId=138&con=" + this.input
-    },
-  },
+      this.option.requestUrl =
+        "/api/v1/tms/getCapacityList?apiId=138&con=" + this.input;
+    }
+  }
 };
 </script>
-<style lang='scss'>
-.shipTransport{
-  .form{
+<style lang="scss">
+.shipTransport {
+  .form {
     display: flex;
-    .form_box{
+    .form_box {
       width: 320px;
       margin-left: 35%;
       margin-top: 30px;
       margin-right: 20px;
-      .el-form{
-        .preview-group{
-          .el-form-item{
-            .el-form-item__label{
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
               display: inline-block;
               width: 70px !important;
             }
-            .el-form-item__content{
-              .el-select{
+            .el-form-item__content {
+              .el-select {
                 width: 250px;
               }
-              .el-input{
+              .el-input {
                 width: 250px;
               }
             }
@@ -169,8 +162,8 @@ export default {
       margin-right: 1.25rem;
     }
   }
-  .button_box{
+  .button_box {
     margin-left: 45%;
   }
 }
-</style>
+</style>

src/views/TMS/components/importedShip/addShipmentInstructions.vue

@@ -58,11 +58,11 @@ export default {
       options: {
         requestUrl: "/api/v1/tms/getBatchListForAttorney?apiId=383",
         selectionType: "radio",
-        maplist: [],
+        maplist: []
       },
       form1: {},
       value: undefined,
-      batchId:"",
+      batchId: ""
     };
   },
   mounted() {},
@@ -76,25 +76,30 @@ export default {
     },
     currentRadioChange1(selection) {
       this.maplist = selection;
-      this.form1 = {
-        batchId: selection.resultForeignShipName + selection.materialName,
-      };
+      if (JSON.stringify(this.maplist).length > 2) {
+        this.$set(
+          this.form1,
+          "batchId",
+          selection.resultForeignShipName + selection.materialName
+        );
+        this.batchId = selection.batchId;
+      }
     },
     handleClose(done) {
       done();
     },
     // 确定
     makeSure() {
-         if (this.batchId == "" || this.batchId == undefined) {
+      if (this.batchId == "" || this.batchId == undefined) {
         this.$message.warning("请选择批次号");
         return;
       }
       let omsshipShipmentInstructions = {
         batchId: this.maplist.batchId,
         instructionsTotalTonnage: this.form1.instructionsTotalTonnage,
-        instructionTime: sjTime(this.form1.instructionTime),
+        instructionTime: sjTime(this.form1.instructionTime)
       };
-   
+
       //判断合计吨位是否为数字
       function isNumber() {
         var value = omsshipShipmentInstructions.instructionsTotalTonnage;
@@ -121,11 +126,11 @@ export default {
             "/api/v1/tms/addShipmentInstructions",
             omsshipShipmentInstructions
           )
-          .then((res) => {
+          .then(res => {
             if (res.data.code == "200") {
               this.$message({
                 type: "success",
-                message: "新增成功",
+                message: "新增成功"
               });
             }
             this.$router.go(-1);
@@ -134,8 +139,8 @@ export default {
     // 取消
     cancel() {
       this.$router.go(-1);
-    },
-  },
+    }
+  }
 };
 </script>
 

src/views/TMS/components/importedShip/addWaterQuality.vue

@@ -78,9 +78,10 @@ export default {
   components: { PageTitle },
   data() {
     return {
-      resultMoistureContent: "",
+      resultMoistureContent: null,
       contractMoistureValue: "",
       realWeight: "",
+      batchId: null,
       moistureTonnage: "",
       input: "",
       restaurants: [],
@@ -91,26 +92,37 @@ export default {
         requestUrl: "/api/v1/tms/getCapacityList?apiId=138",
         // 控制显示当选列
         selectionType: "radio",
-        waterQualityMap: [],
-      },
+        waterQualityMap: []
+      }
     };
   },
+  watch: {
+    resultMoistureContent() {
+      this.pipeiContarct();
+    },
+    batchId() {
+      this.pipeiContarct();
+    }
+  },
   mounted() {},
   methods: {
     currentRadioChange(row) {
       this.waterQualityMap = row;
+      this.batchId = this.waterQualityMap.batchId;
+      this.pipeiContarct();
+    },
+    pipeiContarct() {
       if (
         this.resultMoistureContent != null &&
         this.resultMoistureContent != ""
       ) {
         let map = {
           batchId: this.waterQualityMap.batchId,
-          resultMoistureContent: this.resultMoistureContent,
+          resultMoistureContent: this.resultMoistureContent
         };
-        console.log(map);
         this.axios
           .post("/api/v1/tms/getMoistureAndInstallations", map)
-          .then((res) => {
+          .then(res => {
             if (res.data.code == 200) {
               this.contractMoistureValue =
                 res.data.data.purchaseContractMoisture;
@@ -133,7 +145,7 @@ export default {
         resultInspectionFees: this.form.resultInspectionFees,
         contractMoistureValue: this.contractMoistureValue,
         realWeight: this.realWeight,
-        moistureTonnage: this.moistureTonnage,
+        moistureTonnage: this.moistureTonnage
       };
       //判断放货数量是否为数字
       function isNumber() {
@@ -163,13 +175,13 @@ export default {
         this.axios
           .post("/api/v1/tms/addWaterQualityResult", {
             mapVal: mapVal,
-            waterQualityMap: this.waterQualityMap,
+            waterQualityMap: this.waterQualityMap
           })
-          .then((res) => {
+          .then(res => {
             if (res.data.code == 200) {
               this.$message({
                 type: "success",
-                message: "新增成功!",
+                message: "新增成功!"
               });
               // this.$refs.table.refreshData();
               this.$router.go(-1);
@@ -188,11 +200,11 @@ export default {
     onclick() {
       this.option.requestUrl =
         "/api/v1/tms/getCapacityList?apiId=138&con=" + this.input;
-    },
-  },
+    }
+  }
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .shipTransport {
   .form {
     display: flex;
@@ -255,4 +267,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/views/TMS/components/importedShip/bargeShip.vue

@@ -2,21 +2,23 @@
   <!-- 驳船作业页面 -->
   <div class="shipTransport">
     <div class="top">
-
-      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+      <el-input
+        class="el-input"
+        placeholder="请输入内容"
+        v-model="input"
+        clearable
+      >
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
       <el-button type="primary" class="btn" @click="addclick">
-         <i class="el-icon-circle-plus-outline"></i>新增
+        <i class="el-icon-circle-plus-outline"></i>新增
       </el-button>
     </div>
     <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.bargeOperationId)" type="text" size="small"
-            >编辑</el-button
-          >
           <el-button
             type="text"
             size="small"
@@ -38,15 +40,15 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getBargeOperationList?apiId=61",
-      },
+        requestUrl: "/api/v1/tms/getBargeOperationList?apiId=61"
+      }
     };
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getBargeOperationList?apiId=61&con=" + this.input;
+      this.option.requestUrl =
+        "/api/v1/tms/getBargeOperationList?apiId=61&con=" + this.input;
     },
     click(bargeOperationId) {
       this.$router.push("/updateBargeShip/" + bargeOperationId);
@@ -72,44 +74,45 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true,
+        center: true
       })
-        .then(() => {       
+        .then(() => {
           this.axios
             .post(
-              "/api/v1/shipTms/tmsshipbargeoperations/deleteBargeOperation/" + bargeOperationId
+              "/api/v1/shipTms/tmsshipbargeoperations/deleteBargeOperation/" +
+                bargeOperationId
             )
             .then(() => {
               this.$message({
-            type: "success",
-            message: "删除成功!",
-          });
-              this.$router.go(0);
+                type: "success",
+                message: "删除成功!"
+              });
+              this.option.requestUrl =
+                "/api/v1/tms/getBargeOperationList?apiId=61&i=" + new Date();
             });
         })
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消删除!",
+            message: "取消删除!"
           });
         });
-    },
-  },
+    }
+  }
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .shipTransport {
   .top {
-     padding: 1.25rem 0.375rem;
-     .el-input{
-       width: 20%;
-       margin-right: 40rpx;
-     }
-     .btn{
-       width: 5.5%;
-       margin-left: 0.25rem;
-     }
-
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 40rpx;
+    }
+    .btn {
+      width: 5.5%;
+      margin-left: 0.25rem;
+    }
   }
 }
-</style>
+</style>

src/views/TMS/components/importedShip/instructionsCapacity.vue

@@ -22,12 +22,6 @@
     <dilTable v-bind.sync="option">
       <el-table-column fixed="right" label="操作" align="center" width="150">
         <template slot-scope="scope">
-          <el-button
-            @click="click(scope.row.orderId, scope.row.instructionsId)"
-            type="text"
-            size="mini"
-            >编辑</el-button
-          >
           <el-button
             type="text"
             size="mini"
@@ -55,21 +49,21 @@ export default {
         // 表格请求数据的地址
         requestUrl:
           "/api/v1/tms/getCapacities?apiId=76&instructionsId=" +
-          this.$route.params.instructionsId,
-      },
+          this.$route.params.instructionsId
+      }
     };
   },
   methods: {
     onInput() {
       this.axios
         .post("/api/v1/tms/getShipNameList?state=" + this.state)
-        .then((res) => {
+        .then(res => {
           var values = [];
           if (res.data.code == "0") {
-            res.data.data.forEach((element) => {
+            res.data.data.forEach(element => {
               values.push({
                 value: element.capacityName,
-                capacityId: element.capacityId,
+                capacityId: element.capacityId
               });
             });
           }
@@ -84,7 +78,7 @@ export default {
       cb(results);
     },
     createFilter(queryString) {
-      return (restaurant) => {
+      return restaurant => {
         return (
           restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
           0
@@ -107,7 +101,7 @@ export default {
         instructionsShipPosition: this.form.instructionsShipPosition,
         instructionContactInf: this.form.instructionContactInf,
         instructionsCapacityStatus: this.form.instructionsCapacityStatus,
-        instructionEsarrivalTime: sjTime(this.form.instructionEsarrivalTime),
+        instructionEsarrivalTime: sjTime(this.form.instructionEsarrivalTime)
       };
       //判断是否为电话号码
       function isTelePhone() {
@@ -153,11 +147,11 @@ export default {
             "/api/v1/tms/addInstructionsCapacity",
             omsshipInstructionsCapacity
           )
-          .then((res) => {
+          .then(res => {
             if (res.data.code == 200) {
               this.$message({
                 type: "success",
-                message: "新增成功!",
+                message: "新增成功!"
               });
               // this.$refs.table.refreshData();
               this.option.requestUrl =
@@ -186,7 +180,7 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true,
+        center: true
       })
         .then(() => {
           this.axios
@@ -194,22 +188,26 @@ export default {
             .then(() => {
               this.$message({
                 type: "success",
-                message: "删除成功!",
+                message: "删除成功!"
               });
-              this.$router.go(0);
+              this.option.requestUrl =
+                "/api/v1/tms/getCapacities?apiId=76&instructionsId=" +
+                this.$route.params.instructionsId +
+                "&i=" +
+                new Date();
             });
         })
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消删除!",
+            message: "取消删除!"
           });
         });
-    },
-  },
+    }
+  }
 };
 </script>
-<style lang='scss'>
+<style lang="scss">
 .homeworkPath {
   .shipName {
     display: flex;
@@ -232,4 +230,4 @@ export default {
     align-items: center;
   }
 }
-</style>
+</style>

src/views/TMS/components/importedShip/loadShip.vue

@@ -2,12 +2,18 @@
   <!-- 装船作业页面 -->
   <div class="shipTransport">
     <div class="top">
-     <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+      <el-input
+        class="el-input"
+        placeholder="请输入内容"
+        v-model="input"
+        clearable
+      >
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
       <el-button type="primary" class="btn" @click="addclick">
-            <i class="el-icon-circle-plus-outline"></i>新增
+        <i class="el-icon-circle-plus-outline"></i>新增
       </el-button>
     </div>
     <dilTable v-bind.sync="option">
@@ -37,18 +43,17 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getLoadShipList?apiId=63",
-      },
+        requestUrl: "/api/v1/tms/getLoadShipList?apiId=63"
+      }
     };
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     onclick() {
       // this.option.requestUrl = "/api/v1/tms/getLoadShipList?apiId=63&con=" + this.input;
     },
     click(resultId) {
-      console.log("aaa" +resultId)
+      console.log("aaa" + resultId);
       this.$router.push("/updateLoadShip/" + resultId);
     },
     addclick() {
@@ -60,43 +65,40 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true,
+        center: true
       })
         .then(() => {
-          this.axios
-            .post(
-              "/api/v1/tms/deleteLoadShip/" + resultId
-            )
-            .then(() => {
-                        this.$message({
-            type: "success",
-            message: "删除成功!",
-          });
-              this.$router.go(0);
+          this.axios.post("/api/v1/tms/deleteLoadShip/" + resultId).then(() => {
+            this.$message({
+              type: "success",
+              message: "删除成功!"
             });
+            this.option.requestUrl =
+              "/api/v1/tms/getLoadShipList?apiId=63&i=" + new Date();
+          });
         })
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消删除!",
+            message: "取消删除!"
           });
         });
-    },
-  },
+    }
+  }
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .shipTransport {
   .top {
-     padding: 1.25rem 0.375rem;
-     .el-input{
-       width: 20%;
-       margin-right: 40rpx;
-     }
-     .btn{
-       width: 5.5%;
-       margin-left: 0.25rem;
-     }
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 40rpx;
+    }
+    .btn {
+      width: 5.5%;
+      margin-left: 0.25rem;
+    }
   }
 }
-</style>
+</style>

src/views/TMS/components/importedShip/shipmentInstructions.vue

@@ -2,42 +2,57 @@
   <!-- 装船指令页面 -->
   <div class="shipTransport">
     <div class="top">
-      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input> 
+      <el-input
+        class="el-input"
+        placeholder="请输入内容"
+        v-model="input"
+        clearable
+      >
+      </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button class="btn" type="primary" @click="btnclick(0)">
-         <i class="el-icon-circle-plus-outline"></i>新增 </el-button>
+        <i class="el-icon-circle-plus-outline"></i>新增
+      </el-button>
     </div>
-    <el-tabs v-model="activeName"  @tab-click="handleClick">
+    <el-tabs v-model="activeName" @tab-click="handleClick">
       <!-- 未下发 -->
       <el-tab-pane label="未下发" name="first">
         <dilTable v-bind.sync="option" ref="table">
-          <el-table-column fixed="right" label="操作" align="center" width="180">
-        <template slot-scope="scope">
-          <el-button @click="selectclick(scope.row)" type="text" size="small"
-            >加船</el-button
-          >
-          <el-button
-            @click="issueclick(scope.row.instructionsId)"
-            type="text"
-            size="small"
-            >下发</el-button
-          >
-          <el-button
-            @click="click(scope.row.instructionsId)"
-            type="text"
-            size="small"
-            >编辑</el-button
-          >
-          <el-button
-            type="text"
-            size="small"
-            @click="deleteclick(scope.row.instructionsId)"
-            >删除</el-button
+          <el-table-column
+            fixed="right"
+            label="操作"
+            align="center"
+            width="180"
           >
-        </template>
-      </el-table-column>
+            <template slot-scope="scope">
+              <el-button
+                @click="selectclick(scope.row)"
+                type="text"
+                size="small"
+                >加船</el-button
+              >
+              <el-button
+                @click="issueclick(scope.row.instructionsId)"
+                type="text"
+                size="small"
+                >下发</el-button
+              >
+              <el-button
+                @click="click(scope.row.instructionsId)"
+                type="text"
+                size="small"
+                >编辑</el-button
+              >
+              <el-button
+                type="text"
+                size="small"
+                @click="deleteclick(scope.row.instructionsId)"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
         </dilTable>
       </el-tab-pane>
       <!-- 已下发 -->
@@ -55,26 +70,25 @@ export default {
     return {
       restaurants: [],
       input: "",
-      activeName:"first",
+      activeName: "first",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getShipMentInstructionsList?apiId=74&status=未下发",
+        requestUrl:
+          "/api/v1/tms/getShipMentInstructionsList?apiId=74&status=未下发"
       },
       option2: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getShipMentInstructionsList?apiId=74&status=已下发",
-      },
+        requestUrl:
+          "/api/v1/tms/getShipMentInstructionsList?apiId=74&status=已下发"
+      }
     };
   },
   mounted() {},
   methods: {
-      handleClick(tab, event) {
+    handleClick(tab, event) {
       console.log(tab, event);
     },
-    onclick() {
-      // this.option.requestUrl =
-      //   "/api/v1/tms/getShipMentInstructionsList?apiId=74&con=" + this.input;
-    },
+    onclick() {},
     btnclick() {
       this.$router.push("/addShipmentInstructions/");
     },
@@ -90,7 +104,7 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true,
+        center: true
       })
         .then(() => {
           this.axios
@@ -98,15 +112,20 @@ export default {
             .then(() => {
               this.$message({
                 type: "success",
-                message: "删除成功!",
+                message: "删除成功!"
               });
-              this.$router.go(0);
+              this.option.requestUrl =
+                "/api/v1/tms/getShipMentInstructionsList?apiId=74&status=未下发&i=" +
+                new Date();
+              this.option2.requestUrl =
+                "/api/v1/tms/getShipMentInstructionsList?apiId=74&status=已下发&i=" +
+                new Date();
             });
         })
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消删除!",
+            message: "取消删除!"
           });
         });
     },
@@ -116,42 +135,48 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true,
+        center: true
       })
         .then(() => {
-          this.$message({
-            type: "success",
-            message: "下发成功!",
-          });
           this.axios
-            .post("/api/v1/tms/sendShipmentInstructionsStatus/" + instructionsId)
+            .post(
+              "/api/v1/tms/sendShipmentInstructionsStatus/" + instructionsId
+            )
             .then(() => {
-              this.$router.go(0);
+              this.$message({
+                type: "success",
+                message: "下发成功!"
+              });
+              this.option.requestUrl =
+                "/api/v1/tms/getShipMentInstructionsList?apiId=74&status=未下发&i=" +
+                new Date();
+              this.option2.requestUrl =
+                "/api/v1/tms/getShipMentInstructionsList?apiId=74&status=已下发&i=" +
+                new Date();
             });
         })
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消下发!",
+            message: "取消下发!"
           });
         });
-    },
-  },
+    }
+  }
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .shipTransport {
   .top {
-
-     padding: 1.25rem 0.375rem;
-     .el-input{
-       width: 20%;
-       margin-right: 40rpx;
-     }
-     .btn{
-       width: 5.5%;
-       margin-left: 0.25rem;
-     }
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 40rpx;
+    }
+    .btn {
+      width: 5.5%;
+      margin-left: 0.25rem;
+    }
   }
 }
-</style>
+</style>

src/views/appoint/components/saleContract/addSaleOrder.vue

@@ -192,6 +192,7 @@
                   class="textinput111"
                   v-model.number="scope.row.meterNumber"
                   placeholder="(必填)"
+                  :disabled="scope.row.isDisable == 1"
                 ></el-input>
               </template>
               <!-- 分装车数 -->
@@ -558,6 +559,7 @@
       <div class="tablecls">
         <!-- 查询所有的物资 -->
         <dilTable
+          @rowDbClick="rowDbClick1"
           v-bind.sync="option1"
           @radio-change="currentRadioChange"
           :drawer="drawer"
@@ -898,6 +900,14 @@ export default {
     this.getAllsaleMan();
   },
   methods: {
+    rowDbClick1(row) {
+      this.selectedMaterialId = row.materialId;
+      this.selectedMaterialName = row.materialName;
+      this.selectedMaterialSpecification = row.materialSpecification;
+      this.selectedMaterialModel = row.materialModel;
+      this.selectedMaterialCode = row.materialCode;
+      this.makeSureChange();
+    },
     rowDbClick(row) {
       this.materialList1 = [];
       this.materialList1.push(row);
@@ -989,8 +999,6 @@ export default {
           "/api/v1/ams/matchingAddressRecently?receiveId=" + this.consigneeId
         )
         .then(res => {
-          console.log("匹配收货地址");
-          console.log(res);
           const place = res.data.data;
           console.log(place);
           this.saleShipperAddressName =
@@ -1068,7 +1076,9 @@ export default {
         //判断物资是否为盘螺或非定尺
         if (
           e.materialName.includes("盘螺") ||
-          e.materialName.includes("乱尺")
+          e.materialName.includes("乱尺") ||
+          e.materialName.includes("盘元") ||
+          e.materialName.includes("盘圆")
         ) {
           getisPound = 0;
         } else {
@@ -1093,27 +1103,44 @@ export default {
             haveMeter: 0
           };
         } else {
-          var addmap = {
-            materialName: e.materialName,
-            Specification: e.materialSpecification + e.materialModel,
-            materialCode: e.materialCode,
-            orderPlanWeight: null,
-            meterNumber: null,
-            isPound: getisPound,
-            //物资Id
-            materialId: e.materialId,
-            //有米数
-            haveMeter: 1
-          };
+          if (e.materialName.includes("米")) {
+            console.log(e.materialName.replace(/[^0-9]/gi, ""));
+            var addmap = {
+              materialName: e.materialName,
+              Specification: e.materialSpecification + e.materialModel,
+              materialCode: e.materialCode,
+              orderPlanWeight: null,
+              meterNumber: e.materialName.replace(/[^0-9]/gi, ""),
+              isPound: getisPound,
+              //物资Id
+              materialId: e.materialId,
+              //有米数
+              haveMeter: 1,
+              isDisable: 1
+            };
+          } else {
+            var addmap = {
+              materialName: e.materialName,
+              Specification: e.materialSpecification + e.materialModel,
+              materialCode: e.materialCode,
+              orderPlanWeight: null,
+              meterNumber: null,
+              isPound: getisPound,
+              //物资Id
+              materialId: e.materialId,
+              //有米数
+              haveMeter: 1
+            };
+          }
         }
         this.materialList.push(addmap);
       });
       this.materialList1 = [];
       this.table1 = false;
       //初始化查询数据
-      (this.materialNameText = null),
-        (this.materialSpecificationText = null),
-        (this.materialModelText = null);
+      this.materialNameText = null;
+      this.materialSpecificationText = null;
+      this.materialModelText = null;
     },
     //删除物资行数据
     deleteMaterialRow(index, rows) {
@@ -1614,7 +1641,14 @@ export default {
 <style lang="scss" scoped>
 .addSalePlan {
   width: 100%;
+  .el-drawer__body {
+    overflow: auto;
+  }
+  .el-drawer__container ::-webkit-scrollbar {
+    display: none;
+  }
 }
+
 .form-box,
 .from {
   display: flex;

src/views/appoint/components/saleContract/addSaleOrderSteelSend.vue

@@ -57,7 +57,7 @@
                   :fetch-suggestions="querySearch"
                   placeholder="(必填)"
                   :trigger-on-focus="false"
-                  @select="handleSelect"
+                  @select="handleSelect(scope.row, scope.$index)"
                   @blur="checkRelationship(scope.$index)"
                   @change="batchUpdateValue(scope.row, scope.$index)"
                 ></el-autocomplete>
@@ -471,8 +471,17 @@ export default {
       }
     },
     //车牌号弹出层
-    handleSelect(item) {
+    handleSelect(row, index) {
       console.log("获取下拉值！");
+      this.axios
+        .post(
+          "/api/v1/ams/matchingDriverTelRecently?capacityNumber=" +
+            row.capacityNumber
+        )
+        .then(res => {
+          console.log(res);
+          row.driverTel = res.data.data;
+        });
     },
 
     //以下是车牌号边输边查搜索
@@ -559,8 +568,10 @@ export default {
               .then(res => {
                 if (res.data.code == "200") {
                   this.cancel();
+                  this.$message.success("派单成功！");
+                } else {
+                  this.$message.error("派单失败:" + res.data.data);
                 }
-                this.$message.success("派单成功！");
               });
           })
           .catch(() => {

src/views/appoint/components/saleContract/addSaleOrderSteelSendCarrier.vue

@@ -516,8 +516,10 @@ export default {
               .then(res => {
                 if (res.data.code == "200") {
                   this.cancel();
+                  this.$message.success("派单成功！");
+                } else {
+                  this.$message.error("派单失败:" + res.data.data);
                 }
-                this.$message.success("派单成功！");
               });
           })
           .catch(() => {

src/views/appoint/components/saleContract/saleOrder.vue

@@ -79,22 +79,10 @@ export default {
       endDate: new Date(),
       activeName: "four",
       input: "",
-      option: {
-        // 表格请求数据的地址
-        requestUrl: "/api/v1/ams/getSaleOrderInfoes?apiId=408"
-      },
-      option2: {
-        // 表格请求数据的地址
-        requestUrl: "/api/v1/ams/getSaleOrderReportedes?apiId=408"
-      },
-      option3: {
-        // 表格请求数据的地址
-        requestUrl: "/api/v1/ams/getAmsSaleOrderApprovedes?apiId=409"
-      },
       option4: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=2"
+          "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=475&shipperId=2"
         // &startDate="+sjTime(new Date().getTime() - 3600 * 1000 * 24 * 85)+"&endDate="+sjTime(new Date()),
       },
 
@@ -154,15 +142,9 @@ export default {
       console.log(tab, event);
     },
     onclick() {
-      if (this.activeName == "first") {
-        this.option.requestUrl =
-          "/api/v1/ams/getSaleOrderInfoes?apiId=408&con=" + this.input;
-      } else if (this.activeName == "second") {
-        this.option2.requestUrl =
-          "/api/v1/ams/getSaleOrderReportedes?apiId=408&con=" + this.input;
-      } else if (this.activeName == "four") {
+      if (this.activeName == "four") {
         this.option4.requestUrl =
-          "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=2&con=" +
+          "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=475&shipperId=2&con=" +
           this.input;
       }
     },

src/views/appoint/components/ship/addDeliveryAttorney.vue

@@ -58,17 +58,17 @@ export default {
       options: {
         requestUrl: "/api/v1/tms/getBatchListForAttorney?apiId=375",
         selectionType: "radio",
-        maplist: [],
+        maplist: []
       },
       batchIds: "",
       form1: {},
       value: undefined,
-      value2: undefined,
+      value2: undefined
     };
   },
   created() {
     this.form1 = {
-      downSwimPortId: 1,
+      downSwimPortId: 11
     };
   },
   mounted() {},
@@ -83,11 +83,16 @@ export default {
     handleClose(done) {
       done();
     },
-    currentRadioChange1(radio) {
-      this.form1 = {
-        batchId: radio.resultForeignShipName + radio.materialName,
-      };
-      this.batchIds = radio.batchId;
+    currentRadioChange1(selection) {
+      this.maplist = selection;
+      if (JSON.stringify(this.maplist).length > 2) {
+        this.$set(
+          this.form1,
+          "batchId",
+          selection.resultForeignShipName + selection.materialName
+        );
+        this.batchIds = selection.batchId;
+      }
     },
     // 确定
     makeSure() {
@@ -106,11 +111,11 @@ export default {
         noticeId: this.form1.noticeId,
         portId: this.form1.portId,
         attorneyPickupContactPerson: this.form1.attorneyPickupContactPerson,
-        userId: getCookie("userId"),
+        userId: getCookie("userId")
         // resultMemo: this.form1.resultMemo,
       };
       //身份证校验
-       function checkCardNo() {
+      function checkCardNo() {
         var value3 = AmsshipDeliveryAttorney.attorenyPickupIdcard;
         //验证是否为数字
         var patrn = /^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/;
@@ -146,25 +151,26 @@ export default {
       )
         this.$message.error("存在空值,请核实以后再提交");
       else if (!isTelePhone(val2)) this.$message.warning("联系电话格式不正确");
-       else if (!checkCardNo(val3)) this.$message.warning("请输入正确的身份证格式");
+      else if (!checkCardNo(val3))
+        this.$message.warning("请输入正确的身份证格式");
       else
         this.axios
           .post(
             "/api/v1/tms/insertshipDeliveryAttorney",
             AmsshipDeliveryAttorney
           )
-          .then((res) => {
+          .then(res => {
             this.$router.go(-1);
           });
     },
     // 取消
     cancel() {
       this.$router.go(-1);
-    },
-  },
+    }
+  }
 };
 </script>
-<style lang='scss'>
+<style lang="scss">
 .shipTransport {
   .form {
     display: flex;
@@ -215,4 +221,3 @@ export default {
   }
 }
 </style>
-

src/views/appoint/components/ship/addDeliveryNotice.vue

@@ -61,12 +61,12 @@ export default {
       input: "",
       drawer: false,
       direction: "rtl",
-      batchId: "",
+      batchId: null,
       form1: {},
       options: {
         requestUrl: "/api/v1/tms/getBatchListForAttorney?apiId=375",
         selectionType: "radio",
-        maplist: [],
+        maplist: []
       },
       value: undefined,
       value2: undefined,
@@ -74,10 +74,13 @@ export default {
       value5: undefined,
       value6: undefined,
       value7: undefined,
-      value8: undefined,
+      value8: undefined
     };
   },
-  mounted() {},
+  mounted() {
+    this.$set(this.form1, "requesterGroupId", 1);
+    this.$set(this.form1, "carrierId", 11);
+  },
   methods: {
     onDrawer() {
       this.drawer = true;
@@ -89,10 +92,14 @@ export default {
     },
     currentRadioChange1(selection) {
       this.maplist = selection;
-      this.form1 = {
-        batchId: selection.resultForeignShipName + selection.materialName,
-      };
-      this.batchId = selection.batchId;
+      if (JSON.stringify(this.maplist).length > 2) {
+        this.$set(
+          this.form1,
+          "batchId",
+          selection.resultForeignShipName + selection.materialName
+        );
+        this.batchId = selection.batchId;
+      }
     },
     handleClose(done) {
       done();
@@ -121,46 +128,10 @@ export default {
         aluminaContent: this.form1.aluminaContent,
         phosphorusContent: this.form1.phosphorusContent,
         manganeseContent: this.form1.manganeseContent,
-        userId: getCookie("userId"),
+        userId: getCookie("userId")
       };
-
+      console.log(map.noticePileFreeDays);
       //判断放货数量是否为数字
-      function isNumber() {
-        var value = map.noticePileFreeDays;
-        var value2 = map.purchaseContractUnitPrice;
-        var value4 = map.tfeContent;
-        var value5 = map.silicaContent;
-        var value6 = map.aluminaContent;
-        var value7 = map.phosphorusContent;
-        var value8 = map.manganeseContent;
-        //验证是否为数字
-        var patrn = /^(-)?\d+(\.\d+)?$/;
-        if (patrn.exec(value) == null || value == "") {
-          return false;
-        } else if (patrn.exec(value2) == null || value2 == "") {
-          return false;
-        } else if (patrn.exec(value4) == null || value4 == "") {
-          return false;
-        } else if (patrn.exec(value5) == null || value5 == "") {
-          return false;
-        } else if (patrn.exec(value6) == null || value6 == "") {
-          return false;
-        } else if (patrn.exec(value7) == null || value7 == "") {
-          return false;
-        } else if (patrn.exec(value8) == null || value8 == "") {
-          return false;
-        } else {
-          return true;
-        }
-      }
-      //定义变量
-      var val = this.value;
-      var val2 = this.value2;
-      var val4 = this.value4;
-      var val5 = this.value5;
-      var val6 = this.value6;
-      var val7 = this.value7;
-      var val8 = this.value8;
       if (
         map.noticeCommerceMethod == null ||
         map.noticeHandoverMethod == null ||
@@ -174,26 +145,43 @@ export default {
         map.aluminaContent == null ||
         map.phosphorusContent == null ||
         map.manganeseContent == null
-      )
+      ) {
         this.$message.error("存在空值！");
-      else if (!isNumber(val)) this.$message.warning("免堆天数必须为数字");
-      else if (!isNumber(val2)) this.$message.warning("单价必须为数字");
-      else if (!isNumber(val4)) this.$message.warning("TFe含量必须为数字");
-      else if (!isNumber(val5)) this.$message.warning("二氧化硅含量必须为数字");
-      else if (!isNumber(val6)) this.$message.warning("氧化铝含量必须为数字");
-      else if (!isNumber(val7)) this.$message.warning("磷含量必须为数字");
-      else if (!isNumber(val8)) this.$message.warning("锰含量必须为数字");
-      else
-        this.axios.post("/api/v1/tms/insertDeliveryNotice", map).then((res) => {
+        return;
+      }
+      if (
+        typeof map.noticePileFreeDays != "undefined" &&
+        !isNumber(map.noticePileFreeDays)
+      ) {
+        this.$message.error("免堆天数得为数字");
+        return;
+      }
+      {
+        var value2 = map.purchaseContractUnitPrice;
+        var value4 = map.tfeContent;
+        var value5 = map.silicaContent;
+        var value6 = map.aluminaContent;
+        var value7 = map.phosphorusContent;
+        var value8 = map.manganeseContent;
+        //验证是否为数字
+      }
+      if (
+        typeof map.noticePileFreeDays != "undefined" &&
+        !isNumber(map.noticePileFreeDays)
+      ) {
+        this.$message.error("免堆天数得为数字");
+        return;
+      } else
+        this.axios.post("/api/v1/tms/insertDeliveryNotice", map).then(res => {
           if (res.data.code == 200) {
             // this.$router.push("/ship/cargoResult");
             this.$message({
               type: "success",
-              message: "新增成功",
+              message: "新增成功"
             });
           } else {
             this.$message({
-              message: res.data.data,
+              message: res.data.data
             });
           }
           this.$router.go(-1);
@@ -202,11 +190,11 @@ export default {
     // 取消
     cancel() {
       this.$router.go(-1);
-    },
-  },
+    }
+  }
 };
 </script>
-<style lang='scss'>
+<style lang="scss">
 .shipTransport {
   .form {
     display: flex;

src/views/appoint/components/ship/attorneytext.vue

@@ -1,103 +1,173 @@
 <template>
   <div class="tableAllDate">
-      <page-title>返回</page-title>
-      <div id="pdfDom">
-      <div class="blank">
-      </div>
+    <page-title>返回</page-title>
+    <div id="pdfDom">
+      <div class="blank"></div>
       <!-- 循环遍历传过来的数组中的所有的对象，生成多张提货委托书 -->
-      <div >
-          <div class="title">
+      <div
+        v-for="(item, index) in amsShipDeliveryNameLists"
+        :key="index"
+        style="margin-top:40px"
+      >
+        <div class="title">
           <i class="titleText" align="center">委托书</i>
         </div>
         <div>
-        <!-- tablePart0 -->
-          <table border="0" cellpadding="10" cellspacing="0" style="margin: auto;font-size:20px;" width="1000px" class="tablePart0">
-          <tr>
-            <td style="width :100%">江苏{{attorneyMap.carrierName}}港口集团股份有限公司：</td>
-          </tr>
+          <!-- tablePart0 -->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="margin: auto;font-size:20px;"
+            width="1000px"
+            class="tablePart0"
+          >
+            <tr>
+              <td style="width :100%">
+                江苏{{ item.carrierName }}港口集团股份有限公司：
+              </td>
+            </tr>
           </table>
         </div>
         <div class="tableBody">
           <!-- tablePart1 -->
-          <table border="0" cellpadding="10" cellspacing="0" style="margin-top: 5px;" width="1000px" class="tablePart1">
-          <tr>
-            <td style="width :100%" padding-right="20px">兹委任重庆市万州区万港船务有限公司
-                前来贵港办理我公司的货权提货和水路运输事宜，品种：{{attorneyMap.materialName}}；外轮船名：{{attorneyMap.resultForeignShipName}}；
-                数量：{{attorneyMap.purchaseOrderMaterialNum}}
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="margin-top: 5px;"
+            width="1000px"
+            class="tablePart1"
+          >
+            <tr>
+              <td style="width :100%" padding-right="20px">
+                兹委任重庆市万州区万港船务有限公司
+                前来贵港办理我公司的货权提货和水路运输事宜，品种：{{
+                  item.materialName
+                }}；外轮船名：{{ item.resultForeignShipName }}； 数量：{{
+                  item.purchaseOrderMaterialNum
+                }}
                 湿吨（如遇最后一批提货，须清场）；物流流向：万州港。望贵公司予以支持为盼。
-            </td>
-          </tr>
+              </td>
+            </tr>
           </table>
+
           <!-- tablePart2 -->
-          <table border="0" cellpadding="10" cellspacing="0" style="
-          border-top: 0px" width="1000px" class="tablePart2">
-          <tr>
-            <th style="width :16.5%">提货联系人：</th>
-            <td style="width :10.5%">{{attorneyMap.attorneyPickupContactPerson}}</td>
-            <th style="width :14%">身份证号：</th>
-            <td style="width :59%">{{attorneyMap.attorneyPickupIdcard}}</td>
-          </tr>
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="
+          border-top: 0px"
+            width="1000px"
+            class="tablePart2"
+          >
+            <tr>
+              <th style="width :16.5%">提货联系人：</th>
+              <td style="width :10.5%">
+                {{ item.attorneyPickupContactPerson }}
+              </td>
+              <th style="width :14%">身份证号：</th>
+              <td style="width :59%">{{ item.attorneyPickupIdcard }}</td>
+            </tr>
           </table>
+
           <!-- tablePart3 -->
-          <table border="0" cellpadding="10" cellspacing="0" style="
-          border-top: 0px" width="1000px" class="tablePart3">
-          <tr>
-            <th style="width :16.5%">联系电话：</th>
-            <td style="width :83.5%">{{attorneyMap.attorneyContactTelephone}}</td>
-          </tr>
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="
+          border-top: 0px"
+            width="1000px"
+            class="tablePart3"
+          >
+            <tr>
+              <th style="width :16.5%">联系电话：</th>
+              <td style="width :83.5%">
+                {{ item.attorneyContactTelephone }}
+              </td>
+            </tr>
           </table>
+
           <!-- tablePart4 -->
-          <table border="1" cellpadding="10" cellspacing="0" style="
-          border-top: 0px" width="1000px" class="tablePart4">
-          <tr>
-            <th style="width :10.5%">顺颂商祺！</th>
-          </tr>
+          <table
+            border="1"
+            cellpadding="10"
+            cellspacing="0"
+            style="
+          border-top: 0px"
+            width="1000px"
+            class="tablePart4"
+          >
+            <tr>
+              <th style="width :10.5%">顺颂商祺！</th>
+            </tr>
           </table>
-          <!-- tablePart5 -->
-          <table border="1" cellpadding="10" cellspacing="0" style="
-          border-top: 0px" width="1000px" class="tablePart5">
-          <tr>
-            <th style="width :10.5%">（传真件/扫描件有效）</th>
-          </tr>
+
+          <table
+            border="1"
+            cellpadding="10"
+            cellspacing="0"
+            style="
+          border-top: 0px"
+            width="1000px"
+            class="tablePart5"
+          >
+            <tr>
+              <th style="width :10.5%">（传真件/扫描件有效）</th>
+            </tr>
           </table>
         </div>
         <div>
           <!-- tablePart6 -->
-          <table border="0" cellpadding="10" cellspacing="0" style="margin: auto;margin-top: 5px;font-size:20px;" width="1000px" class="tablePart6">
-          <tr>
-            <td style="width :48.5%">{{attorneyMap.shipperName}}</td>
-          </tr>
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="margin: auto;margin-top: 5px;font-size:20px;"
+            width="1000px"
+            class="tablePart6"
+          >
+            <tr>
+              <td style="width :48.5%">{{ item.shipperName }}</td>
+            </tr>
           </table>
         </div>
         <div>
-        <!-- tablePart7 -->
-        <table border="0" cellpadding="10" cellspacing="0" style="margin: auto;margin-top: 5px;font-size:20px;" width="1000px" class="tablePart7">
-        <tr>
-          <td style="width :63%"></td>
-          <td style="width :5%">{{year}}</td>
-          <th style="width :8%">年</th>
-          <td style="width :3%">{{month}}</td>
-          <th style="width :8%">月</th>
-          <td style="width :3%">{{date}}</td>
-          <th style="width :5%">日</th>
-        </tr>
-        </table>
-      </div>
-      </div>
-      </div>
-      <div class="buttns">
-        <el-button class="buttn"  type="primary" @click="getPdf()">
-            <i class="el-icon-download">{{"\xa0\xa0"}}</i>导出(pdf)
-        </el-button>
-        <!-- <el-button class="buttn"  type="primary" v-print="'#pdfDom'" @click="backScan()">
-            <i class="el-icon-printer">{{"\xa0\xa0"}}</i>打印
-        </el-button> -->
+          <!-- tablePart7 -->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="margin: auto;margin-top: 5px;font-size:20px;"
+            width="1000px"
+            class="tablePart7"
+          >
+            <tr>
+              <td style="width :63%"></td>
+              <td style="width :5%">{{ item.year }}</td>
+              <th style="width :8%">年</th>
+              <td style="width :3%">{{ item.month }}</td>
+              <th style="width :8%">月</th>
+              <td style="width :3%">{{ item.date }}</td>
+              <th style="width :5%">日</th>
+            </tr>
+          </table>
+        </div>
       </div>
+    </div>
+    <div class="buttns">
+      <el-button class="buttn" type="primary" @click="getPdf()">
+        <i class="el-icon-download">{{ "\xa0\xa0" }}</i
+        >导出(pdf)
+      </el-button>
+    </div>
   </div>
 </template>
 
 <script>
-import table from '@/components/DilCommonUI/packages/table/src/table.vue';
+import table from "@/components/DilCommonUI/packages/table/src/table.vue";
 import PageTitle from "@/components/Page/Title";
 export default {
   components: { table },
@@ -105,92 +175,83 @@ export default {
   name: "Login",
   data() {
     return {
-      amsShipDeliveryNameLists:[],
-      attorneyMap:{
-        carrierName:"",
-        materialName: "",
-        resultForeignShipName: "",
-        purchaseOrderMaterialNumber:"",
-        attorneyPickupContactPerson:"",
-        attorneyPickupIdcard:"",
-        attorneyContactTelephone:"",
-        shipperName:"",
-        attorneyTime:"",
-        year:"",
-        month:"",
-        date:"",
-      },
-      htmlTitle: '委托书'
+      amsShipDeliveryNameLists: [],
+      htmlTitle: "委托书"
     };
   },
-  created(){
-      this.getwts();
+  created() {
+    this.getwts();
   },
   methods: {
-      backScan(){
-        this.$router.go(-2);
-      },
-      getwts(){
-        // console.log(this.$route.params.test)
-        this.amsShipDeliveryNameLists=JSON.parse(this.$route.params.test).amsShipDeliveryNameList
-        // this.amsShipDeliveryNameLists = this.$route.params.test;
-        console.log(this.amsShipDeliveryNameLists)
-        for(let i =0;i<this.amsShipDeliveryNameLists.length;i++){
-            this.attorneyMap = this.amsShipDeliveryNameLists[i];
-            this.year=this.attorneyMap.attorneyTime.split('-')[0]
-            this.month=this.attorneyMap.attorneyTime.split('-')[1]
-            this.date=this.attorneyMap.attorneyTime.split('-')[2].split(" ")[0]
-        }
-      }
-      
-  },
-  
+    backScan() {
+      this.$router.go(-2);
+    },
+    getwts() {
+      // console.log(this.$route.params.test)
+      this.amsShipDeliveryNameLists = JSON.parse(
+        this.$route.params.test
+      ).amsShipDeliveryNameList;
+      console.log(this.amsShipDeliveryNameLists);
+      // this.amsShipDeliveryNameLists = this.$route.params.test;
+      console.log(this.amsShipDeliveryNameLists);
+      this.amsShipDeliveryNameLists.forEach(e => {
+        e.year = e.attorneyTime.split("-")[0];
+        e.month = e.attorneyTime.split("-")[1];
+        e.date = e.attorneyTime.split("-")[2].split(" ")[0];
+      });
+    }
+  }
 };
 </script>
 
 <style lang="scss" scoped>
-.title{
-    text-align: center;
-    margin-bottom: 30px;
-    .titleText{
+.title {
+  text-align: center;
+  margin-bottom: 30px;
+  .titleText {
     font-size: 30px;
-    }   
+  }
 }
-.buttns{
-    display: flex;
-    flex-wrap: nowrap;
-    margin-top: 20px;
-    margin-left: 900px;
-    .buttn{
-        margin-left: 10px;
-        width: 130px;
-    }
+.buttns {
+  display: flex;
+  flex-wrap: nowrap;
+  margin-top: 20px;
+  margin-left: 900px;
+  .buttn {
+    margin-left: 10px;
+    width: 130px;
+  }
 }
-.tableBody{
-  table, th, td
-  {
-      border: 0px solid black;
-      font-size:20px;
-      margin: auto;
+.tableBody {
+  table,
+  th,
+  td {
+    border: 0px solid black;
+    font-size: 20px;
+    margin: auto;
   }
-  .tablePart1 th{
-      border-top: 1px solid black;
+  .tablePart1 th {
+    border-top: 1px solid black;
   }
-  .tablePart2 td,th{
-    border-top: 0px
+  .tablePart2 td,
+  th {
+    border-top: 0px;
   }
-  .tablePart3 td,th{
-    border-top: 0px
+  .tablePart3 td,
+  th {
+    border-top: 0px;
   }
-  .tablePart4 td,th{
-    border-top: 0px
+  .tablePart4 td,
+  th {
+    border-top: 0px;
   }
-  .tablePart5 td,th{
-    border-top: 0px
+  .tablePart5 td,
+  th {
+    border-top: 0px;
   }
 }
-.blank{
+.blank {
   width: 100%;
   height: 50px;
 }
-</style>
+</style>

src/views/appoint/components/ship/cargoResult.vue

@@ -2,10 +2,10 @@
   <!-- 货权转移页面 -->
   <div class="shipTransport">
     <div class="top">
-     <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
- <el-button type="primary" class="btn" @click="onclick">
- <i class="el-icon-search"></i>查询
- </el-button>
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
       <el-button type="primary" class="btn" @click="addClick">
         <i class="el-icon-circle-plus-outline"></i>新增
       </el-button>
@@ -13,7 +13,10 @@
     <dilTable v-bind.sync="option">
       <el-table-column fixed="right" label="操作" width="100">
         <template slot-scope="scope">
-          <el-button @click="modifyclick(scope.row.cargoTransferResultId)" type="text" size="small"
+          <el-button
+            @click="modifyclick(scope.row.cargoTransferResultId)"
+            type="text"
+            size="small"
             >修改</el-button
           >
           <el-button
@@ -37,21 +40,22 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAmsshipCargoTranferResultList?apiId=66",
-      },
+        requestUrl: "/api/v1/tms/getAmsshipCargoTranferResultList?apiId=66"
+      }
     };
   },
 
   methods: {
     onclick() {
-      // console.log(this.input)
-      this.option.requestUrl = "/api/v1/tms/getAmsshipCargoTranferResultList?apiId=66&con=" + this.input;
+      this.option.requestUrl =
+        "/api/v1/tms/getAmsshipCargoTranferResultList?apiId=66&con=" +
+        this.input;
     },
     addClick() {
       this.$router.push("/addCargoResult/");
     },
-    modifyclick(cargoTransferResultId){
-       this.$router.push("/modifyCargoResult/" + cargoTransferResultId);
+    modifyclick(cargoTransferResultId) {
+      this.$router.push("/modifyCargoResult/" + cargoTransferResultId);
     },
     deleteclick(scope) {
       let cargoTransferResultId = scope;
@@ -59,32 +63,32 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true,
+        center: true
       })
         .then(() => {
           this.$message({
             type: "success",
-            message: "删除成功!",
+            message: "删除成功!"
           });
           this.axios
-            .post(
-              "/api/v1/tms/deleteByCargoId/" + cargoTransferResultId
-            )
+            .post("/api/v1/tms/deleteByCargoId/" + cargoTransferResultId)
             .then(() => {
-              this.$router.go(0);
+              this.option.requestUrl =
+                "/api/v1/tms/getAmsshipCargoTranferResultList?apiId=66&i=" +
+                new Date();
             });
         })
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消删除!",
+            message: "取消删除!"
           });
         });
-    },
-  },
+    }
+  }
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .shipTransport {
   .top {
     padding: 1.25rem 0.375rem;

src/views/appoint/components/ship/deliveryAttorney.vue

@@ -20,13 +20,12 @@
         type="primary"
         class="btn"
         @click="addPick"
-        v-show="activeName === 'second'"
-        v-model="makeSure"
+        v-if="activeName === 'second'"
       >
         <i class="el-icon-circle-plus-outline"></i>生成提货委托书
       </el-button>
     </div>
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tabs v-model="activeName">
       <!-- 未下发 -->
       <el-tab-pane label="未下发" name="first">
         <dilTable v-bind.sync="option1" ref="table">
@@ -64,10 +63,7 @@
       </el-tab-pane>
       <!-- 已下发 -->
       <el-tab-pane label="已下发" name="second">
-        <dilTable
-          v-bind.sync="option2"
-          @selection-change="currentSelectionChange"
-        >
+        <dilTable v-bind.sync="option2" @selection-change="selectionChange">
         </dilTable>
       </el-tab-pane>
     </el-tabs>
@@ -85,26 +81,25 @@ export default {
       option1: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/tms/getAmsshipDeliveryAttroneyList?apiId=73&status=0",
+          "/api/v1/tms/getAmsshipDeliveryAttroneyList?apiId=73&status=0"
       },
       option2: {
         // 表格请求数据的地址
         requestUrl:
           "/api/v1/tms/getAmsshipDeliveryAttroneyList?apiId=73&status=1",
-        selectionType: "radio",
-        amsShipDeliveryList: {},
+        selectionType: "select"
       },
+      amsShipDeliveryList: []
     };
   },
 
   methods: {
-    // 将所有数据送到新增提货委托书
-    handleClick(tab, event) {},
-    onclick() {},
-    makeSure() {},
-    currentSelectionChange(selection) {
+    selectionChange(selection) {
+      console.log(selection);
       this.amsShipDeliveryList = selection;
-      this.attorneyId = selection.attorneyId;
+    },
+    onclick() {
+      this.$message.info("功能尚未开通,请联系管理员！");
     },
     click(pathId) {
       this.$router.push("/path/addDeliveryNotice/" + pathId);
@@ -114,16 +109,15 @@ export default {
     },
     // 生成提货委托书
     addPick() {
-      if (this.amsShipDeliveryList.length == 0||this.amsShipDeliveryList==null) {
+      if (this.amsShipDeliveryList.length == 0) {
         this.$message.warning("请勾选已下发的提货委托,方可生成提货委托书");
         return;
-      } else {
-        let amsShipDeliveryNameList = {
-          amsShipDeliveryNameList: this.amsShipDeliveryList,
-        };
-        let test = encodeURIComponent(JSON.stringify(amsShipDeliveryNameList));
-        this.$router.push("/attorneytext/" + test);
       }
+      let amsShipDeliveryNameList = {
+        amsShipDeliveryNameList: this.amsShipDeliveryList
+      };
+      let test = encodeURIComponent(JSON.stringify(amsShipDeliveryNameList));
+      this.$router.push("/attorneytext/" + test);
     },
     //修改
     modifyClick(attorneyId) {
@@ -136,23 +130,25 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true,
+        center: true
       })
         .then(() => {
-          this.$message({
-            type: "success",
-            message: "删除成功!",
-          });
           this.axios
             .post("/api/v1/tms/deleteByAttorneyId/" + attorneyId)
             .then(() => {
-              this.$router.go(0);
+              this.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+              this.option1.requestUrl =
+                "/api/v1/tms/getAmsshipDeliveryAttroneyList?apiId=73&status=0&i=" +
+                new Date();
             });
         })
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消删除!",
+            message: "取消删除!"
           });
         });
     },
@@ -162,30 +158,35 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true,
+        center: true
       })
         .then(() => {
           this.$message({
             type: "success",
-            message: "下发成功",
+            message: "下发成功"
           });
           this.axios
             .post("/api/v1/tms/sendDeliveryAttorneyStatus/" + attorneyId)
             .then(() => {
-              this.$router.go(0);
+              this.option1.requestUrl =
+                "/api/v1/tms/getAmsshipDeliveryAttroneyList?apiId=73&status=0&i=" +
+                new Date();
+              this.option2.requestUrl =
+                "/api/v1/tms/getAmsshipDeliveryAttroneyList?apiId=73&status=1&i=" +
+                new Date();
             });
         })
         .catch(() => {
           this.$message({
             type: "info",
-            message: "下发失败!",
+            message: "下发失败!"
           });
         });
-    },
-  },
+    }
+  }
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .shipTransport {
   .top {
     padding: 1.25rem 0.375rem;

src/views/appoint/components/ship/deliveryNotice.vue

@@ -3,9 +3,8 @@
   <div class="shipTransport">
     <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      
       <el-button type="primary" class="btn" @click="onclick">
-         <i class="el-icon-search"></i>查询 
+        <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" class="btn" @click="addClick">
         <i class="el-icon-circle-plus-outline"></i>新增
@@ -65,75 +64,47 @@ export default {
       activeName: "first",
       option1: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=0",
+        requestUrl: "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=0"
       },
       option2: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=1",
-      },
+        requestUrl: "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=1"
+      }
     };
   },
   methods: {
-    // querySearch(queryString, cb) {
-    //   var restaurants = this.restaurants;
-    //   var results = queryString
-    //     ? restaurants.filter(this.createFilter(queryString))
-    //     : restaurants;
-    //   cb(results);
-    // },
-    // createFilter(queryString) {
-    //   return (restaurant) => {
-    //     return (
-    //       restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
-    //       0
-    //     );
-    //   };
-    // },
-    onclick() {
-      // this.option.requestUrl =
-      //   "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&con=" + this.input;
-    },
+    onclick() {},
     addClick() {
       this.$router.push("/addDeliveryNotice/");
     },
     modifyclick(noticeId) {
       this.$router.push("/modifyDeliveryNotice/" + noticeId);
     },
-    // 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 noticeId = scope;
       this.$confirm("是否删除", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true,
+        center: true
       })
         .then(() => {
-          this.$message({
-            type: "success",
-            message: "删除成功!",
-          });
           this.axios
             .post("/api/v1/tms/deleteByNoticeId/" + noticeId)
             .then(() => {
-              this.$router.go(0);
+              this.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+              this.option1.requestUrl =
+                "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=0&i=" +
+                new Date();
             });
         })
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消删除!",
+            message: "取消删除!"
           });
         });
     },
@@ -146,38 +117,42 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true,
+        center: true
       })
         .then(() => {
-          this.$message({
-            type: "success",
-            message: "下发成功!",
-          });
           this.axios
             .post("/api/v1/tms/sendDeliveryNotice/" + noticeId)
             .then(() => {
-              this.$router.go(0);
+              this.$message({
+                type: "success",
+                message: "下发成功!"
+              });
+              this.option1.requestUrl =
+                "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=0&i=" +
+                new Date();
+              this.option2.requestUrl =
+                "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=1&i=" +
+                new Date();
             });
         })
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消下发!",
+            message: "取消下发!"
           });
         });
-    },
-  },
+    }
+  }
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .shipTransport {
   .top {
-     padding: 1.25rem 0.375rem;
-     .el-input{
-       width: 20%;
-       margin-right: 40rpx;
-     }
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 40rpx;
+    }
   }
- 
 }
 </style>

src/views/queue/components/qmsEnFacotory/queueFApply.vue

@@ -49,6 +49,8 @@
         </el-table-column>
         <el-table-column prop="orderMaterialNumber" label="物资件数">
         </el-table-column>
+        <el-table-column prop="gatepostName" label="进厂门岗">
+        </el-table-column>
       </el-table>
     </div>
   </div>
@@ -106,7 +108,7 @@ export default {
         columnIndex === 2 ||
         columnIndex === 3 ||
         columnIndex === 4 ||
-        columnIndex === 5
+        columnIndex === 9
       ) {
         const _row = this.spanArr[rowIndex];
         const _col = _row > 0 ? 1 : 0;

src/views/queue/components/qmsEnFacotory/queueFCancel.vue

@@ -46,6 +46,8 @@
         </el-table-column>
         <el-table-column prop="materialModel" label="物资型号">
         </el-table-column>
+        <el-table-column prop="gatepostName" label="进厂门岗">
+        </el-table-column>
       </el-table>
     </div>
   </div>
@@ -107,7 +109,8 @@ export default {
         columnIndex === 1 ||
         columnIndex === 2 ||
         columnIndex === 3 ||
-        columnIndex === 4
+        columnIndex === 4 ||
+        columnIndex === 8
       ) {
         const _row = this.spanArr[rowIndex];
         const _col = _row > 0 ? 1 : 0;

src/views/queue/components/qmsEnFacotory/queueFEnd.vue

@@ -41,6 +41,8 @@
         </el-table-column>
         <el-table-column prop="materialModel" label="物资型号">
         </el-table-column>
+        <el-table-column prop="gatepostName" label="进厂门岗">
+        </el-table-column>
       </el-table>
     </div>
   </div>
@@ -96,7 +98,7 @@ export default {
         columnIndex === 1 ||
         columnIndex === 2 ||
         columnIndex === 3 ||
-        columnIndex === 4
+        columnIndex === 7
       ) {
         const _row = this.spanArr[rowIndex];
         const _col = _row > 0 ? 1 : 0;

src/views/queue/components/qmsEnFacotory/queueFJumpLine.vue

@@ -2,18 +2,169 @@
 <template>
   <div class="sale">
     <div class="top">
-      <span>车牌号：</span>
-      <el-input placeholder="请输入内容" class="input" v-model="inputText" clearable>
-      </el-input>
-      <el-button type="primary" class="btn" @click="onclick(0)">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <el-button type="primary" class="bt" @click="onclick(1)">
-        <i class="el-icon-plus"></i>新增排队插队
-      </el-button>
+      <el-form :inline="true" style="margin-top: 1rem;">
+        <el-form-item>
+          <label class="el-form-item__label" style="width: auto;">车牌号</label>
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model="capacityNo"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            class="btn"
+            @click="onclick"
+            style="margin-left: 4px;"
+            clearable
+            ><i class="el-icon-search"></i>查询</el-button
+          >
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            class="btn"
+            @click="onclickMaterial"
+            style="margin-left: 4px;"
+            clearable
+            ><i class="el-icon-search"></i>查询物资</el-button
+          >
+        </el-form-item>
+        <el-form-item
+          ><el-button type="primary" class="btn" @click="allow">
+            <i class="el-icon-d-arrow-right"></i>插队
+          </el-button></el-form-item
+        >
+      </el-form>
     </div>
-    <div class="tab">
-      <dilTable v-bind.sync="option"></dilTable>
+    <!-- 物资选择模态框 -->
+    <el-drawer
+      title="选择物资信息"
+      :visible.sync="table1"
+      direction="rtl"
+      size="90%"
+      :show-close="true"
+    >
+      <el-form :inline="true" style="margin-top: 0.5rem;">
+        <el-form-item>
+          <label class="el-form-item__label" style="width: auto;"
+            >物资名称</label
+          >
+        </el-form-item>
+        <el-form-item>
+          <el-input
+            placeholder="请输入内容"
+            v-model="materialNameText"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <label class="el-form-item__label" style="width: auto;">规格</label>
+        </el-form-item>
+        <el-form-item>
+          <el-input
+            placeholder="请输入内容"
+            v-model="materialSpecificationText"
+            clearable
+            ><template slot="prepend">Φ</template></el-input
+          >
+        </el-form-item>
+        <el-button
+          type="primary"
+          class="btn"
+          @click="onclickMaterial1"
+          style="margin-left: 4px;"
+          ><i class="el-icon-search"></i>查询</el-button
+        >
+        <el-button type="primary" @click="makeSureMaterial"
+          ><i class="el-icon-check"></i>确定</el-button
+        >
+      </el-form>
+      <div class="tablecls">
+        <!-- 查询所有的物资 -->
+        <dilTable
+          v-bind.sync="optionMa"
+          @selection-change="selectionChange2"
+          @rowDbClick="rowDbClick"
+        >
+        </dilTable>
+      </div>
+    </el-drawer>
+    <div class="tabs">
+      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+        <el-tab-pane label="单拼车辆排队链表" name="first">
+          <el-table
+            :data="tableData1"
+            border
+            style="width: 100%; margin-top: 20px"
+            @selection-change="handleSelectionChange"
+            max-height="500px"
+          >
+            <el-table-column type="selection" width="55"></el-table-column>
+            <el-table-column type="index" width="50"> </el-table-column>
+            <el-table-column prop="capacityNumber" label="车牌号" fit>
+            </el-table-column>
+            <el-table-column prop="resultStartTime" label="排队开始时间">
+            </el-table-column>
+            <el-table-column
+              prop="listNodeOrder"
+              label="序号"
+            ></el-table-column>
+            <el-table-column prop="materialName" label="物资名称">
+            </el-table-column>
+            <el-table-column prop="materialSpecification" label="物资规格">
+            </el-table-column>
+            <el-table-column prop="materialModel" label="物资型号">
+            </el-table-column>
+            <el-table-column prop="materialNumber" label="物资件数">
+            </el-table-column>
+            <el-table-column prop="driverTel" label="司机电话号码">
+            </el-table-column>
+            <el-table-column prop="sureTime" label="可进厂确认时间">
+            </el-table-column>
+            <el-table-column prop="resultInsertTime" label="插队时间">
+            </el-table-column>
+            <el-table-column prop="gatepostName" label="进厂门岗">
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="多拼车辆排队链表" name="second">
+          <el-table
+            :data="tableData"
+            :span-method="objectSpanMethod"
+            border
+            style="width: 100%; margin-top: 20px"
+            @selection-change="handleSelectionChange"
+            max-height="500px"
+          >
+            <el-table-column type="selection" width="55"></el-table-column>
+            <el-table-column prop="capacityNumber" label="车牌号" fit>
+            </el-table-column>
+            <el-table-column prop="grid" label="拼数" fit> </el-table-column>
+            <el-table-column prop="resultStartTime" label="排队开始时间">
+            </el-table-column>
+            <el-table-column
+              prop="listNodeOrder"
+              label="序号"
+            ></el-table-column>
+            <el-table-column prop="materialName" label="物资名称">
+            </el-table-column>
+            <el-table-column prop="materialSpecification" label="物资规格">
+            </el-table-column>
+            <el-table-column prop="materialModel" label="物资型号">
+            </el-table-column>
+            <el-table-column prop="materialNumber" label="物资件数">
+            </el-table-column>
+            <el-table-column prop="driverTel" label="司机电话号码">
+            </el-table-column>
+            <el-table-column prop="gatepostName" label="进厂门岗">
+            </el-table-column>
+            <el-table-column prop="resultInsertTime" label="插队时间">
+            </el-table-column>
+            <el-table-column prop="sureTime" label="可进厂确认时间">
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
     </div>
   </div>
 </template>
@@ -21,25 +172,215 @@
 export default {
   data() {
     return {
+      capacityNo: "",
       inputText: "",
-      option: {
+      optionMa: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/qms/getQueueInsert?apiId=132",
+        requestUrl: "",
+        // 控制显示多选列
+        selectionType: "select"
       },
+      activeName: "first",
+      tableData: [],
+      tableData1: [],
+      //存放每一行记录的合并数
+      spanArr: [],
+      maplist: [],
+      id: null,
+      option: [],
+      filterArr1: [],
+      table1: false,
+      //物资选中表格
+      materialList: [],
+      //物资选中暂存
+      materialList1: [],
+      //物资信息查询内容
+      materialNameText: null,
+      materialSpecificationText: null,
+      materialModelText: null
     };
   },
+  watch: {
+    activeName() {}
+  },
+  mounted() {
+    this.getSpellingArray();
+    this.getNoSpellingArray();
+  },
   methods: {
-    onclick(num) {
-      if (num == 0) {
-        this.option.requestUrl =
-          "/api/v1/qms/getQueueInsert?apiId=132&con=" + this.inputText+"&i="+new Date();
-      } else if (num == 1) {
-        this.$router.push({
-          path: "/addqueueFJumpLine",
+    rowDbClick(row) {
+      this.materialList = [];
+      this.materialList.push(row);
+      this.makeSureMaterial();
+    },
+    //物资模态框查询
+    onclickMaterial1() {
+      this.optionMa.requestUrl =
+        "/api/v1/uc/getSteelMaterial?apiId=244&materialNameText=" +
+        this.materialNameText +
+        "&materialSpecificationText=" +
+        this.materialSpecificationText;
+    },
+    onclickMaterial() {
+      this.table1 = true;
+      this.optionMa.requestUrl =
+        "/api/v1/uc/getSteelMaterial?apiId=244&i=" + new Date();
+      console.log("dasd");
+    },
+    //返回选中的物资信息
+    selectionChange2(selection) {
+      this.materialList1 = [];
+      this.materialList1 = selection;
+      this.materialList = this.materialList.concat(this.materialList1);
+    },
+    makeSureMaterial() {
+      console.log(this.materialList);
+      var materialIdList = [];
+      this.materialList.forEach(e => {
+        if (materialIdList.indexOf(e.materialId) == -1) {
+          materialIdList.push(e.materialId);
+        }
+      });
+      let map = {
+        materialList: materialIdList
+      };
+      this.materialList = [];
+      this.materialList1 = [];
+      if (this.activeName == "first") {
+        this.axios
+          .post("/api/v1/qms/getQueueListByQueueUp?isSpelling=0", map)
+          .then(res => {
+            this.tableData1 = res.data.data;
+          });
+      } else {
+        this.axios
+          .post("/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=1", map)
+          .then(res => {
+            this.tableData = res.data.data;
+            this.getSpanArr(this.tableData);
+          });
+      }
+      this.table1 = false;
+    },
+    //记录每一行的合并数
+    getSpanArr(data) {
+      //每次调用方法初始化
+      this.spanArr = [];
+      for (var i = 0; i < data.length; i++) {
+        if (i === 0) {
+          this.spanArr.push(1);
+          this.pos = 0;
+        } else {
+          // 判断当前元素与上一个元素是否相同
+          if (data[i].resultTotalId === data[i - 1].resultTotalId) {
+            this.spanArr[this.pos] += 1;
+            this.spanArr.push(0);
+          } else {
+            this.spanArr.push(1);
+            this.pos = i;
+          }
+        }
+      }
+    },
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (
+        columnIndex === 0 ||
+        columnIndex === 1 ||
+        columnIndex === 2 ||
+        columnIndex === 3 ||
+        columnIndex === 4 ||
+        columnIndex === 9 ||
+        columnIndex === 10 ||
+        columnIndex === 12
+      ) {
+        const _row = this.spanArr[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          rowspan: _row,
+          colspan: _col
+        };
+      }
+    },
+    handleClick() {
+      if (this.activeName == "first") {
+        this.getNoSpellingArray();
+      } else {
+        this.getSpellingArray();
+      }
+    },
+    getNoSpellingArray() {
+      this.axios
+        .post("/api/v1/qms/getQueueListByQueueUp?isSpelling=0&i=" + new Date())
+        .then(res => {
+          this.tableData1 = res.data.data;
         });
+    },
+    getSpellingArray() {
+      this.axios
+        .post(
+          "/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=1&i=" +
+            new Date()
+        )
+        .then(res => {
+          this.tableData = res.data.data;
+          console.log(this.tableData);
+          this.getSpanArr(this.tableData);
+        });
+    },
+    onclick() {
+      if (this.activeName == "first") {
+        this.option1.requestUrl =
+          "/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=0?capacityNumber=" +
+          this.capacityNo +
+          "&i=" +
+          new Date();
+      } else {
+        this.axios
+          .post(
+            "/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=1&i=" +
+              new Date() +
+              "&capacityNumber=" +
+              this.capacityNo
+          )
+          .then(res => {
+            this.tableData = res.data.data;
+            this.getSpanArr(this.tableData);
+          });
       }
     },
-  },
+    handleSelectionChange(selection) {
+      this.maplist = [];
+      this.maplist = selection;
+    },
+    updateBill(scope) {
+      console.log(scope.row.capacityId);
+      this.$router.push(
+        `/editBill/${scope.row.capacityId}/${scope.row.capacityNumber}`
+      );
+    },
+    filterArr(resultId) {
+      console.log("fdhjsaj");
+      this.filterArr1 = this.filterArr1.concat(
+        this.tableData.filter(ele => ele.resultId == resultId)
+      );
+    },
+    allow() {
+      if (this.maplist.length == 0) {
+        this.$message.error("请选择需要插队的车辆");
+        return;
+      }
+      let map = {
+        mapList: this.maplist
+      };
+      this.axios.post("/api/v1/qms/queueCutInLine", map).then(res => {
+        if (res.data.code == "200") {
+          this.$message.success("插队成功，等待放行");
+          this.getNoSpellingArray();
+          this.getSpellingArray();
+        }
+      });
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>
@@ -50,13 +391,26 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 40px;
-    .input{
-      width: 250px;
-      margin-right: 20px;
+    .el-form {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .el-form-item__label {
+        align-items: center;
+        line-height: 80px;
+      }
     }
-    .bt{
-      margin-left: 20px;
+  }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
+  .tabs {
+    margin-left: 20px;
+    margin-top: 10px;
+    .tabs /deep/ .el-tabs__nav {
+      font-size: 40px;
     }
   }
 }
-</style>
+</style>

src/views/queue/components/qmsEnFacotory/queueFListMonitor.vue

@@ -1,130 +1,119 @@
-// 链表监控
+// 链表监控 // 排队开始
 <template>
   <div class="sale">
     <div class="top">
-      <span>门岗名称：</span>
-      <el-input placeholder="请输入内容" class="input" v-model="inputText" clearable>
-      </el-input>
-      <el-button type="primary" class="btn" @click="onclick(0)">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+      <el-form :inline="true" style="margin-top: 1rem;">
+        <el-form-item>
+          <label class="el-form-item__label" style="width: auto;">车牌号</label>
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model="capacityNo"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            class="btn"
+            @click="onclick"
+            style="margin-left: 4px;"
+            clearable
+            ><i class="el-icon-search"></i>查询</el-button
+          >
+        </el-form-item>
+      </el-form>
     </div>
-    <div class="tab">
-      <dilTable v-bind.sync="option" ref="table">
-        <el-table-column fixed="right" label="操作" width="120">
-          <template slot-scope="scope" type="expand">
-            <el-button
-              @click="onclick(1, scope.row)"
-              type="text"
-              size="small"
-              v-if="scope.row.count > 0"
-            >
-              查看详情
-            </el-button>
-            <el-button type="text" size="small" disabled v-else>
-              查看详情
-            </el-button>
-          </template>
-        </el-table-column>
-        <!-- 排队详情下拉框 -->
-        <el-table-column type="expand" width="1">
-          <template slot-scope="props">
-            <el-form label-position="left" inline class="demo-table-expand">
-              <el-form-item v-model="gridId">
-                <div v-if="false">{{ props }}</div>
-                <div class="xq">
-                  <div v-for="(item, i) in queueDetail" :key="i" class="box">
-                    <!-- 头部 -->
-                    <div class="index">
-                      <span>{{ item.listNodeOrder }}</span>
-                    </div>
-                    <div class="img">
-                      <!-- 车辆图片 -->
-                      <div class="image">
-                        <img :src="imgurl" />
-                      </div>
-                    </div>
-                    <div class="time">
-                      <!-- 车牌号 -->
-                      <div class="carNumber">
-                        {{ item.capacityNumber }}
-                      </div>
-                      <!-- 等待时间 -->
-                      <div class="loadTime">
-                        {{ item.minute }}
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </el-form-item>
-            </el-form>
-          </template>
-        </el-table-column>
-      </dilTable>
+    <div class="tabs">
+      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+        <el-tab-pane label="单拼车辆排队链表" name="first">
+          <el-table
+            :data="tableData1"
+            border
+            style="width: 100%; margin-top: 20px"
+            @selection-change="handleSelectionChange"
+            max-height="500px"
+          >
+            <el-table-column type="index" width="50"> </el-table-column>
+            <el-table-column prop="count" label="排队数" fit> </el-table-column>
+            <el-table-column prop="materialName" label="物资名称">
+            </el-table-column>
+            <el-table-column prop="materialSpecification" label="物资规格">
+            </el-table-column>
+            <el-table-column prop="materialModel" label="物资型号">
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="多拼车辆排队链表" name="second">
+          <el-table
+            :data="tableData"
+            :span-method="objectSpanMethod"
+            border
+            style="width: 100%; margin-top: 20px"
+            @selection-change="handleSelectionChange"
+            max-height="500px"
+          >
+            <el-table-column type="selection" width="55"></el-table-column>
+            <el-table-column prop="count" label="排队数"> </el-table-column>
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
     </div>
   </div>
 </template>
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
-      //车图
-      imgurl: require("@/assets/img/car.png"),
+      capacityNo: "",
       inputText: "",
-      option: {
-        // 表格请求数据的地址
-        requestUrl: "/api/v1/qms/listMonitor?apiId=134",
-      },
-      //记录旧的row对象
-      oldRow: "",
-      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
-      oldRowCount: 1,
-      //排队网格id
-      gridId: "",
-      queueDetail: [],
+      activeName: "first",
+      tableData: [],
+      tableData1: [],
+      maplist: [],
+      filterArr1: [],
+      table1: false,
+      //物资选中表格
+      materialList: [],
+      //物资选中暂存
+      materialList1: [],
+      //物资信息查询内容
+      materialNameText: null,
+      materialSpecificationText: null,
+      materialModelText: null
     };
   },
+  watch: {
+    activeName() {}
+  },
+  mounted() {
+    this.getSpellingArray();
+    this.getNoSpellingArray();
+  },
   methods: {
-    onclick(num, row) {
-      if (num == 0) {
-        this.option.requestUrl =
-          "/api/v1/qms/listMonitor?apiId=134&con=" + this.inputText+"&i="+new Date();
-      } else if (num == 1) {
-        console.log(row);
-        // 记录重复点击次数
-        if (this.oldRow === row) {
-          this.oldRowCount += 1;
-        }
-        // 切换当前详情表
-        this.$refs.table.toggleRowExpansion(row);
-        // 打开前关闭上一个详情表
-        if (this.oldRow != "") {
-          if (this.oldRow != row) {
-            if (this.oldRowCount % 2 === 1) {
-              this.$refs.table.toggleRowExpansion(this.oldRow);
-            } else {
-              this.oldRowCount = 1;
-            }
-          } else {
-            this.oldRow = null;
-            return;
-          }
-        }
-        // 重置上一个点击对象
-        this.oldRow = row;
-        this.queueList(row.gatepostId);
+    handleClick() {
+      if (this.activeName == "first") {
+        this.getNoSpellingArray();
+      } else {
+        this.getSpellingArray();
       }
     },
-    queueList(gatepostId) {
-      var mapValue = {
-        gatepostId: gatepostId,
-      };
-      console.log(mapValue);
-      this.axios.post("/api/v1/qms/getListQueueMes", mapValue).then((res) => {
-        this.queueDetail = res.data.data;
-      });
+    getNoSpellingArray() {
+      this.axios
+        .post("/api/v1/qms/listMonitor?isSpelling=0&i=" + new Date())
+        .then(res => {
+          this.tableData1 = res.data.data;
+        });
     },
-  },
+    getSpellingArray() {
+      this.axios
+        .post("/api/v1/qms/listMonitor?apiId=473&isSpelling=1&i=" + new Date())
+        .then(res => {
+          this.tableData = res.data.data;
+        });
+    },
+    onclick() {
+      this.$message.info("未开通");
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>
@@ -135,56 +124,26 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 40px;
-    .input{
-        width: 250px;
-        margin-right: 20px;
-    }
-  }
-  .tab {
-    .xq {
+    .el-form {
       display: flex;
-      .box {
-        padding-right: 20px;
-        .index {
-          display: flex;
-          justify-content: center;
-          span {
-            background-color: #87ceeb;
-            display: inline-block;
-            width: 20px;
-            height: 20px;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            border-radius: 50%;
-            color: #fff;
-          }
-        }
-        .img {
-          display: flex;
-          justify-content: center;
-        }
-        .time {
-          display: flex;
-          color: #fff;
-          font-size: 12px;
-          .carNumber {
-            background-color: #7eb9ff;
-            height: 20px;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-          }
-          .loadTime {
-            background-color: #3e62d8;
-            height: 20px;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-          }
-        }
+      justify-content: center;
+      align-items: center;
+      .el-form-item__label {
+        align-items: center;
+        line-height: 80px;
       }
     }
   }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
+  .tabs {
+    margin-left: 20px;
+    margin-top: 10px;
+    .tabs /deep/ .el-tabs__nav {
+      font-size: 40px;
+    }
+  }
 }
-</style>
+</style>

src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -121,6 +121,8 @@
             </el-table-column>
             <el-table-column prop="sureTime" label="可进厂确认时间">
             </el-table-column>
+            <el-table-column prop="gatepostName" label="进厂门岗">
+            </el-table-column>
             <el-table-column label="装货点" width="100">
               <template slot-scope="scope">
                 <el-select size="mini" v-model="scope.row.id">
@@ -172,6 +174,8 @@
             </el-table-column>
             <el-table-column prop="driverTel" label="司机电话号码">
             </el-table-column>
+            <el-table-column prop="gatepostName" label="进厂门岗">
+            </el-table-column>
             <el-table-column prop="sureTime" label="可进厂确认时间">
             </el-table-column>
             <el-table-column label="装货点" width="100">
@@ -437,9 +441,7 @@ export default {
       this.axios.post("/api/v1/qms/allowEnFactory", map).then(res => {
         if (res.data.code == "200") {
           this.$message.success("放行成功，等待进厂");
-          this.option1.requestUrl =
-            "/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=0&i=" +
-            new Date();
+          this.getNoSpellingArray();
           this.getSpellingArray();
         }
       });

src/views/statisticalReport/components/Ship_dynamic_table.vue

@@ -1,135 +1,174 @@
 <template>
   <div>
-    <table-item :tableData="tableData" :col="col"> </table-item>
+    <div class="shipReport">
+      <div class="title">船舶动态表</div>
+      <div>
+        <el-button type="primary" @click="gotoexcel()"
+          ><i class="el-icon-download"></i>导出(Excel)</el-button
+        >
+      </div>
+      <table-item :tableData="tableData" :col="col"> </table-item>
+    </div>
   </div>
 </template>
 <script>
+import LAY_EXCEL from "lay-excel";
 import tableItem from "./tableItem";
 export default {
   name: "TableView",
   components: {
-    tableItem,
+    tableItem
   },
   data() {
     return {
+      tableTitle: "船舶动态表",
       // 树型结构表头数据
       col: [
         {
           prop: "pm",
-          label: "品名",
+          label: "品名"
         },
         {
           prop: "portName",
-          label: "港口名称",
+          label: "港口名称"
         },
         {
           prop: "tonnage",
-          label: "下游港口吨位",
+          label: "下游港口吨位"
         },
         {
           label: "未到闸船舶",
           children: [
             {
               prop: "capacity1",
-              label: "船名",
+              label: "船名"
             },
             {
               prop: "capacityNumber1",
-              label: "吨位",
+              label: "吨位"
             },
             {
               prop: "locationValue1",
-              label: "位置",
+              label: "位置"
             },
             {
               prop: "outPortTime1",
-              label: "离港时间",
-            },
-          ],
+              label: "离港时间"
+            }
+          ]
         },
         {
           label: "等闸船舶",
           children: [
             {
               prop: "capacity2",
-              label: "船名",
+              label: "船名"
             },
             {
               prop: "capacityNumber2",
-              label: "吨位",
+              label: "吨位"
             },
             {
               prop: "locationValue2",
-              label: "位置",
+              label: "位置"
             },
             {
               prop: "outPortTime2",
-              label: "离港时间",
-            },
-          ],
+              label: "离港时间"
+            }
+          ]
         },
         {
           label: "已过闸船舶",
           children: [
             {
               prop: "capacity3",
-              label: "船名",
+              label: "船名"
             },
             {
               prop: "capacityNumber3",
-              label: "吨位",
+              label: "吨位"
             },
             {
               prop: "locationValue3",
-              label: "位置",
+              label: "位置"
             },
             {
               prop: "outPortTime3",
-              label: "离港时间",
-            },
-          ],
+              label: "离港时间"
+            }
+          ]
         },
         {
           label: "到港待卸船舶",
           children: [
-             {
+            {
               prop: "capacity4",
-              label: "船名",
+              label: "船名"
             },
             {
               prop: "capacityNumber4",
-              label: "吨位",
+              label: "吨位"
             },
             {
               prop: "locationValue4",
-              label: "位置",
+              label: "位置"
             },
             {
               prop: "outPortTime4",
-              label: "离港时间",
+              label: "离港时间"
             },
             {
               prop: "dgsj",
-              label: "到港时间",
-            },
-          ],
-        },
+              label: "到港时间"
+            }
+          ]
+        }
       ],
       // 表格数据
-      tableData: [],
+      tableData: []
     };
   },
-  created(){
+  created() {},
+  mounted() {
     this.initialization();
+    console.log(this.$refs.excelDom);
   },
   methods: {
-    initialization() {
-      this.axios.post("/api/v1/tms/selectAllShipDynamaics")
-      .then((res) => {
-        console.log(res)
-        this.tableData = res.data.data;
+    gotoexcel() {
+      let _this = this;
+      let result = JSON.parse(JSON.stringify(_this.tableData));
+      console.log(result);
+      result.unshift({
+        pm: "品名",
+        portName: "港口名称",
+        tonnage: "下游港口吨位",
+        capacity1: "船名",
+        capacityNumber1: "吨位",
+        locationValue1: "位置"
       });
     },
-  },
+    initialization() {
+      this.axios.post("/api/v1/tms/selectAllShipDynamaics").then(res => {
+        if (res.data.code == "200") {
+          this.tableData = res.data.data;
+          console.log(this.tableData);
+        }
+      });
+    }
+  }
 };
 </script>
+
+<style lang="scss" scoped>
+.shipReport {
+  margin-top: 20px;
+  margin-left: 20px;
+  .title {
+    display: flex;
+    justify-content: center;
+    font-size: 20px;
+    font-weight: 700;
+  }
+}
+</style>

src/views/statisticalReport/components/salesLogisticsStatistics/saleChemicalCokeForm.vue

@@ -6,80 +6,150 @@
       <el-date-picker
         v-model="startTime"
         type="datetime"
-        placeholder="选择日期时间">
+        placeholder="选择日期时间"
+      >
       </el-date-picker>
       <span>至</span>
       <el-date-picker
         v-model="endTime"
         type="datetime"
-        placeholder="选择日期时间">
+        placeholder="选择日期时间"
+      >
       </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
+      <el-input
+        v-model="inputReceiveName"
+        style="width:200px"
+        placeholder="输入收货单位"
+        clearable="true"
+      ></el-input>
+      <el-button type="primary" @click="getReceiveName">查询</el-button>
+      <el-button type="primary" @click="exportData()"
+        ><i class="el-icon-download"></i>导出(Excel)</el-button
+      >
       <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>刷新
       </el-button>
       <span style="margin-left: 1rem;width:68px">合计净重：</span>
-      <el-input v-model="totalNumber" :disabled="true" style="width: 150px;"></el-input>
+      <el-input
+        v-model="totalNumber"
+        :disabled="true"
+        style="width: 150px;"
+      ></el-input>
       <span style="margin-left: 1rem;width:68px">合计车数：</span>
-      <el-input v-model="totalCapacity" :disabled="true" style="width: 150px;"></el-input>
+      <el-input
+        v-model="totalCapacity"
+        :disabled="true"
+        style="width: 150px;"
+      ></el-input>
     </div>
     <div class="table">
-      <dilTable ref="excelDom" v-bind.sync="option" :isHeigth="isHeigth" :shiyHeigth="shiyHeigth" :isKuang="isKuang" @func="func" @requestQuery="requestQuery" :pageSize = "pageSize"></dilTable>
+      <dilTable
+        ref="excelDom"
+        v-bind.sync="option"
+        :isHeigth="isHeigth"
+        :shiyHeigth="shiyHeigth"
+        :isKuang="isKuang"
+        @func="func"
+        @requestQuery="requestQuery"
+        :pageSize="pageSize"
+      ></dilTable>
     </div>
   </div>
 </template>
 
 <script>
-import { sjTime } from '@/utils/sharedJsFile'
+import { sjTime } from "@/utils/sharedJsFile";
 import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
-      shiyHeigth:140,
-      isHeigth:true,
-      pageSize:100,
-      isKuang:false,
+      shiyHeigth: 140,
+      isHeigth: true,
+      pageSize: 100,
+      isKuang: false,
       option: {
-        requestUrl: "",
+        requestUrl: ""
       },
-      startTime:null,
-      endTime:null,
+      startTime: null,
+      endTime: null,
       //合计净重
       totalNumber: 0,
       //合计车数
       totalCapacity: 0,
-      tableTitle:'销售统计报表'
+      tableTitle: "销售统计报表",
+      inputReceiveName: null
     };
   },
-  created(){
+  created() {
     //初始化表头
     if (getCookie("orgCode") == "chengyunshang") {
       this.option.requestUrl =
-        "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=2&shipperId=2&carrierSsoId=" + getCookie("userId") +"&i=" +new Date();
+        "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=2&shipperId=2&carrierSsoId=" +
+        getCookie("userId") +
+        "&i=" +
+        new Date();
     } else {
       this.option.requestUrl =
-        "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=2&shipperId=2&carrierSsoId=" + null +"&i=" +new Date();
+        "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=2&shipperId=2&carrierSsoId=" +
+        null +
+        "&i=" +
+        new Date();
     }
     //时间段初始化
     const start = new Date(new Date(new Date().toLocaleDateString()).getTime());
     var startTime = this.dataFormat(sjTime(start));
     var endTime = this.dataFormat(sjTime(new Date()));
-    this.tableTitle = startTime + ' 至 ' + endTime;
+    this.tableTitle = startTime + " 至 " + endTime;
   },
   methods: {
-    refresh(){
+    getReceiveName() {
+      if (this.inputReceiveName != null) {
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.option.requestUrl =
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=2&shipperId=2&carrierSsoId=" +
+            getCookie("userId") +
+            "&i=" +
+            new Date() +
+            "&receiveName=" +
+            this.inputReceiveName;
+        } else {
+          this.option.requestUrl =
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=2&shipperId=2&carrierSsoId=" +
+            null +
+            "&i=" +
+            new Date() +
+            "&receiveName=" +
+            this.inputReceiveName;
+        }
+      } else {
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.option.requestUrl =
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=2&shipperId=2&carrierSsoId=" +
+            getCookie("userId") +
+            "&i=" +
+            new Date();
+        } else {
+          this.option.requestUrl =
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=2&shipperId=2&carrierSsoId=" +
+            null +
+            "&i=" +
+            new Date();
+        }
+      }
+    },
+    refresh() {
       this.$router.go(0);
     },
-    func(res){
-      console.log(res)
-      var resultNetWeightTotal = 0
+    func(res) {
+      console.log(res);
+      var resultNetWeightTotal = 0;
       res.list.forEach(e => {
-        resultNetWeightTotal = resultNetWeightTotal+e.resultNetWeight
+        resultNetWeightTotal = resultNetWeightTotal + e.resultNetWeight;
       });
-      this.totalNumber = resultNetWeightTotal.toFixed(2) + " t"
+      this.totalNumber = resultNetWeightTotal.toFixed(2) + " t";
       this.totalCapacity = res.total;
       //获取总记录条数作为合计车数
       // this.totalCapacity = res.total;
@@ -88,53 +158,85 @@ export default {
     onclick() {
       let startTime = null;
       let endTime = null;
-      if(this.startTime && this.endTime){
+      if (this.startTime && this.endTime) {
         startTime = sjTime(this.startTime);
         endTime = sjTime(this.endTime);
         //修改报表名称
-        this.tableTitle = this.dataFormat(startTime) + ' 至 ' + this.dataFormat(endTime);
+        this.tableTitle =
+          this.dataFormat(startTime) + " 至 " + this.dataFormat(endTime);
         //加上时间重置表头
         if (getCookie("orgCode") == "chengyunshang") {
           this.option.requestUrl =
-            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&orderType=2&shipperId=2"+ "&carrierSsoId=" + getCookie("userId") +"&i=" +new Date();
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&orderType=2&shipperId=2" +
+            "&carrierSsoId=" +
+            getCookie("userId") +
+            "&i=" +
+            new Date();
         } else {
           this.option.requestUrl =
-            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&orderType=2&shipperId=2"+ "&carrierSsoId=" + null +"&i=" +new Date();
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&orderType=2&shipperId=2" +
+            "&carrierSsoId=" +
+            null +
+            "&i=" +
+            new Date();
         }
-      }else{
-        if(this.startTime){
+      } else {
+        if (this.startTime) {
           startTime = sjTime(this.startTime);
-        }else if(this.endTime){
+        } else if (this.endTime) {
           endTime = sjTime(this.endTime);
         }
         //加上时间重置表头
         if (getCookie("orgCode") == "chengyunshang") {
           this.option.requestUrl =
-            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime +"&orderType=2&shipperId=2"+ "&carrierSsoId=" + getCookie("userId") +"&i=" +new Date();
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&orderType=2&shipperId=2" +
+            "&carrierSsoId=" +
+            getCookie("userId") +
+            "&i=" +
+            new Date();
         } else {
           this.option.requestUrl =
-            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime +"&orderType=2&shipperId=2"+ "&carrierSsoId=" + null +"&i=" +new Date();
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&orderType=2&shipperId=2" +
+            "&carrierSsoId=" +
+            null +
+            "&i=" +
+            new Date();
         }
       }
     },
     //格式化日期
-    dataFormat(value){
+    dataFormat(value) {
       let date = new Date(value);
-        let y = date.getFullYear();
-        let MM = date.getMonth() + 1;
-        MM = MM < 10 ? ('0' + MM) : MM;
-        let d = date.getDate();
-        d = d < 10 ? ('0' + d) : d;
-        let h = date.getHours();
-        h = h < 10 ? ('0' + h) : h;
-        let m = date.getMinutes();
-        m = m < 10 ? ('0' + m) : m;
-        let s = date.getSeconds();
-        s = s < 10 ? ('0' + s) : s;
-        return y + '-' + MM + '-' + d + ' ' + h + '：' + m + '：' + s;
+      let y = date.getFullYear();
+      let MM = date.getMonth() + 1;
+      MM = MM < 10 ? "0" + MM : MM;
+      let d = date.getDate();
+      d = d < 10 ? "0" + d : d;
+      let h = date.getHours();
+      h = h < 10 ? "0" + h : h;
+      let m = date.getMinutes();
+      m = m < 10 ? "0" + m : m;
+      let s = date.getSeconds();
+      s = s < 10 ? "0" + s : s;
+      return y + "-" + MM + "-" + d + " " + h + "：" + m + "：" + s;
     }
-
-  },
+  }
 };
 </script>
 
@@ -146,9 +248,9 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
-    .el-date-editor{
+    .el-date-editor {
       margin: 20px;
     }
   }
 }
-</style>
+</style>

src/views/statisticalReport/components/salesLogisticsStatistics/saleCoproductForm.vue

@@ -6,80 +6,148 @@
       <el-date-picker
         v-model="startTime"
         type="datetime"
-        placeholder="选择日期时间">
+        placeholder="选择日期时间"
+      >
       </el-date-picker>
       <span>至</span>
       <el-date-picker
         v-model="endTime"
         type="datetime"
-        placeholder="选择日期时间">
+        placeholder="选择日期时间"
+      >
       </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
+      <el-input
+        v-model="inputReceiveName"
+        style="width:200px"
+        placeholder="输入收货单位"
+      ></el-input>
+      <el-button type="primary" @click="getReceiveName">查询</el-button>
+      <el-button type="primary" @click="exportData()"
+        ><i class="el-icon-download"></i>导出(Excel)</el-button
+      >
       <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>刷新
       </el-button>
       <span style="margin-left: 1rem;width:68px">合计净重：</span>
-      <el-input v-model="totalNumber" :disabled="true" style="width: 150px;"></el-input>
+      <el-input
+        v-model="totalNumber"
+        :disabled="true"
+        style="width: 150px;"
+      ></el-input>
       <span style="margin-left: 1rem;width:68px">合计车数：</span>
-      <el-input v-model="totalCapacity" :disabled="true" style="width: 150px;"></el-input>
+      <el-input
+        v-model="totalCapacity"
+        :disabled="true"
+        style="width: 150px;"
+      ></el-input>
     </div>
     <div class="table">
-      <dilTable ref="excelDom" v-bind.sync="option" :isHeigth="isHeigth" :shiyHeigth="shiyHeigth" :isKuang="isKuang" @func="func" @requestQuery="requestQuery" :pageSize = "pageSize"></dilTable>
+      <dilTable
+        ref="excelDom"
+        v-bind.sync="option"
+        :isHeigth="isHeigth"
+        :shiyHeigth="shiyHeigth"
+        :isKuang="isKuang"
+        @func="func"
+        @requestQuery="requestQuery"
+        :pageSize="pageSize"
+      ></dilTable>
     </div>
   </div>
 </template>
 
 <script>
-import { sjTime } from '@/utils/sharedJsFile'
+import { sjTime } from "@/utils/sharedJsFile";
 import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
-      shiyHeigth:140,
-      isHeigth:true,
-      pageSize:100,
-      isKuang:false,
+      shiyHeigth: 140,
+      isHeigth: true,
+      pageSize: 100,
+      isKuang: false,
       option: {
-        requestUrl: "",
+        requestUrl: ""
       },
-      startTime:null,
-      endTime:null,
+      startTime: null,
+      endTime: null,
       //合计净重
       totalNumber: 0,
       //合计车数
       totalCapacity: 0,
-      tableTitle:'销售统计报表'
+      tableTitle: "销售统计报表"
     };
   },
-  created(){
+  created() {
     //初始化表头
     if (getCookie("orgCode") == "chengyunshang") {
       this.option.requestUrl =
-        "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=2&shipperId=1&carrierSsoId=" + getCookie("userId") +"&i=" +new Date();
+        "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=2&shipperId=1&carrierSsoId=" +
+        getCookie("userId") +
+        "&i=" +
+        new Date();
     } else {
       this.option.requestUrl =
-        "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=2&shipperId=1&carrierSsoId=" + null +"&i=" +new Date();
+        "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=2&shipperId=1&carrierSsoId=" +
+        null +
+        "&i=" +
+        new Date();
     }
     //时间段初始化
     const start = new Date(new Date(new Date().toLocaleDateString()).getTime());
     var startTime = this.dataFormat(sjTime(start));
     var endTime = this.dataFormat(sjTime(new Date()));
-    this.tableTitle = startTime + ' 至 ' + endTime;
+    this.tableTitle = startTime + " 至 " + endTime;
   },
   methods: {
-    refresh(){
+    getReceiveName() {
+      if (this.inputReceiveName != null) {
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.option.requestUrl =
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=2&shipperId=2&carrierSsoId=" +
+            getCookie("userId") +
+            "&i=" +
+            new Date() +
+            "&receiveName=" +
+            this.inputReceiveName;
+        } else {
+          this.option.requestUrl =
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=2&shipperId=2&carrierSsoId=" +
+            null +
+            "&i=" +
+            new Date() +
+            "&receiveName=" +
+            this.inputReceiveName;
+        }
+      } else {
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.option.requestUrl =
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=2&shipperId=2&carrierSsoId=" +
+            getCookie("userId") +
+            "&i=" +
+            new Date();
+        } else {
+          this.option.requestUrl =
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=2&shipperId=2&carrierSsoId=" +
+            null +
+            "&i=" +
+            new Date();
+        }
+      }
+    },
+    refresh() {
       this.$router.go(0);
     },
-    func(res){
-      console.log(res)
-      var resultNetWeightTotal = 0
+    func(res) {
+      console.log(res);
+      var resultNetWeightTotal = 0;
       res.list.forEach(e => {
-        resultNetWeightTotal = resultNetWeightTotal+e.resultNetWeight
+        resultNetWeightTotal = resultNetWeightTotal + e.resultNetWeight;
       });
-      this.totalNumber = resultNetWeightTotal.toFixed(2) + " t"
+      this.totalNumber = resultNetWeightTotal.toFixed(2) + " t";
       this.totalCapacity = res.total;
       //获取总记录条数作为合计车数
       // this.totalCapacity = res.total;
@@ -88,53 +156,85 @@ export default {
     onclick() {
       let startTime = null;
       let endTime = null;
-      if(this.startTime && this.endTime){
+      if (this.startTime && this.endTime) {
         startTime = sjTime(this.startTime);
         endTime = sjTime(this.endTime);
         //修改报表名称
-        this.tableTitle = this.dataFormat(startTime) + ' 至 ' + this.dataFormat(endTime);
+        this.tableTitle =
+          this.dataFormat(startTime) + " 至 " + this.dataFormat(endTime);
         //加上时间重置表头
         if (getCookie("orgCode") == "chengyunshang") {
           this.option.requestUrl =
-            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&orderType=2&shipperId=1"+ "&carrierSsoId=" + getCookie("userId") +"&i=" +new Date();
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&orderType=2&shipperId=1" +
+            "&carrierSsoId=" +
+            getCookie("userId") +
+            "&i=" +
+            new Date();
         } else {
           this.option.requestUrl =
-            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&orderType=2&shipperId=1"+ "&carrierSsoId=" + null +"&i=" +new Date();
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&orderType=2&shipperId=1" +
+            "&carrierSsoId=" +
+            null +
+            "&i=" +
+            new Date();
         }
-      }else{
-        if(this.startTime){
+      } else {
+        if (this.startTime) {
           startTime = sjTime(this.startTime);
-        }else if(this.endTime){
+        } else if (this.endTime) {
           endTime = sjTime(this.endTime);
         }
         //加上时间重置表头
         if (getCookie("orgCode") == "chengyunshang") {
           this.option.requestUrl =
-            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime +"&orderType=2&shipperId=1"+ "&carrierSsoId=" + getCookie("userId") +"&i=" +new Date();
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&orderType=2&shipperId=1" +
+            "&carrierSsoId=" +
+            getCookie("userId") +
+            "&i=" +
+            new Date();
         } else {
           this.option.requestUrl =
-            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime +"&orderType=2&shipperId=1"+ "&carrierSsoId=" + null +"&i=" +new Date();
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&orderType=2&shipperId=1" +
+            "&carrierSsoId=" +
+            null +
+            "&i=" +
+            new Date();
         }
       }
     },
     //格式化日期
-    dataFormat(value){
+    dataFormat(value) {
       let date = new Date(value);
-        let y = date.getFullYear();
-        let MM = date.getMonth() + 1;
-        MM = MM < 10 ? ('0' + MM) : MM;
-        let d = date.getDate();
-        d = d < 10 ? ('0' + d) : d;
-        let h = date.getHours();
-        h = h < 10 ? ('0' + h) : h;
-        let m = date.getMinutes();
-        m = m < 10 ? ('0' + m) : m;
-        let s = date.getSeconds();
-        s = s < 10 ? ('0' + s) : s;
-        return y + '-' + MM + '-' + d + ' ' + h + '：' + m + '：' + s;
+      let y = date.getFullYear();
+      let MM = date.getMonth() + 1;
+      MM = MM < 10 ? "0" + MM : MM;
+      let d = date.getDate();
+      d = d < 10 ? "0" + d : d;
+      let h = date.getHours();
+      h = h < 10 ? "0" + h : h;
+      let m = date.getMinutes();
+      m = m < 10 ? "0" + m : m;
+      let s = date.getSeconds();
+      s = s < 10 ? "0" + s : s;
+      return y + "-" + MM + "-" + d + " " + h + "：" + m + "：" + s;
     }
-
-  },
+  }
 };
 </script>
 
@@ -146,9 +246,9 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
-    .el-date-editor{
+    .el-date-editor {
       margin: 20px;
     }
   }
 }
-</style>
+</style>