修改

build/utils.js

@@ -16,8 +16,7 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 // let devModules = ["index", "appoint", "statisticalReport"];
-let devModules = ["all"];
-
+let devModules = ["index","TMS","appoint"];
 // let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS','WMS']
 // let devModules = ["index", "ADMINISTRATORS", "RMS"];
 // let devModules = ["index", "inward", "statisticalReport"];

src/views/TMS/components/domesticMine/wagonUnLoadAdd.vue

@@ -6,41 +6,42 @@
       <el-divider content-position="left"></el-divider>
     </div>
     <div>
-      <div class="search" style="display:flex">
-        <div style="margin-top: 18px;margin-left:10px">
+      <div class="search" style="display: flex">
+        <div style="margin-top: 18px; margin-left: 10px">
           <el-label>车皮号：</el-label>
         </div>
         <el-input
-        placeholder="请输入"
-        v-model="wagon"
-        style="margin: 10px; width:10%"
-        clearable
+          placeholder="请输入"
+          v-model="wagon"
+          style="margin: 10px; width: 10%"
+          clearable
         ></el-input>
-        <div style="margin-top: 18px;margin-left:10px">
+        <div style="margin-top: 18px; margin-left: 10px">
           <el-label>订单号：</el-label>
         </div>
         <el-input
-        placeholder="请输入"
-        v-model="purchaseOrderNum"
-        style="margin: 10px; width:10%"
-        clearable
+          placeholder="请输入"
+          v-model="purchaseOrderNum"
+          style="margin: 10px; width: 10%"
+          clearable
         ></el-input>
-        <div style="margin-top: 18px;margin-left:10px">
-          <el-label>物资名：</el-label>
+        <div style="margin-top: 18px; margin-left: 10px">
+          <el-label>物资名称：</el-label>
         </div>
         <el-input
           placeholder="请输入"
           v-model="materialName"
-          style="margin: 10px;width:10%"
+          style="margin: 10px; width: 10%"
           clearable
         ></el-input>
-      <el-button
-        type="primary"
-        class="btn"
-        @click="searchOrder()"
-        style="margin: 10px;">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+        <el-button
+          type="primary"
+          class="btn"
+          @click="searchOrder()"
+          style="margin: 10px"
+        >
+          <i class="el-icon-search"></i>查询
+        </el-button>
       </div>
       <dilTable
         v-bind.sync="option"
@@ -75,10 +76,11 @@
         type="primary"
         class="btn"
         @click="searchUnLoadPoint()"
-        style="margin-bottom: 0.9375rem">
+        style="margin-bottom: 0.9375rem"
+      >
         <i class="el-icon-search"></i>查询
       </el-button>
-       <div>
+      <div>
         <dilTable
           v-bind.sync="unloadPoint"
           @radio-change="currentRadioChange"
@@ -96,15 +98,15 @@ export default {
   data() {
     return {
       form1: {},
-      inputText:null,
-      drawer:false,
-      unloadPoint:null,
-      wagon:null,
-      purchaseOrderNum:null,
-      materialName:null,
+      inputText: null,
+      drawer: false,
+      unloadPoint: null,
+      wagon: null,
+      purchaseOrderNum: null,
+      materialName: null,
       direction: "rtl",
-      unloadPointId:null,
-      unloadPointName:null,
+      unloadPointId: null,
+      unloadPointName: null,
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/tms/getWagonNo/3?apiId=213",
@@ -120,8 +122,8 @@ export default {
     };
   },
   mounted() {
-    this.form1.resultArrivalDate=new Date();
-    this.form1.resultUnloadTime=new Date();
+    this.form1.resultArrivalDate = new Date();
+    this.form1.resultUnloadTime = new Date();
   },
   // created() {
   //   this.form1 = {
@@ -129,27 +131,33 @@ export default {
   //   };
   // },
   methods: {
-    searchOrder(){
-      let requestUrl="/api/v1/tms/getWagonNo/3?apiId=213";
-      if(typeof this.wagon !='undefined' && this.wagon!=null){
-          requestUrl+=("&wagon="+this.wagon);
+    searchOrder() {
+      let requestUrl = "/api/v1/tms/getWagonNo/3?apiId=213";
+      if (typeof this.wagon != "undefined" && this.wagon != null) {
+        requestUrl += "&wagon=" + this.wagon;
       }
-      if(typeof this.purchaseOrderNum !='undefined' && this.purchaseOrderNum!=null){
-          requestUrl+=("&purchaseOrderNum="+this.purchaseOrderNum);
+      if (
+        typeof this.purchaseOrderNum != "undefined" &&
+        this.purchaseOrderNum != null
+      ) {
+        requestUrl += "&purchaseOrderNum=" + this.purchaseOrderNum;
       }
-      if(typeof this.materialName !='undefined' && this.materialName!=null){
-          requestUrl+=("&materialName="+this.materialName);
+      if (
+        typeof this.materialName != "undefined" &&
+        this.materialName != null
+      ) {
+        requestUrl += "&materialName=" + this.materialName;
       }
-      this.option.requestUrl=requestUrl;
+      this.option.requestUrl = requestUrl;
     },
     ondrawer() {
       this.drawer = true;
     },
-    searchUnLoadPoint(){
+    searchUnLoadPoint() {
       this.unloadPoint.requestUrl =
-          "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.inputText;
+        "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.inputText;
     },
-    currentRadioChange(selection){
+    currentRadioChange(selection) {
       this.unloadPointId = selection.warehouseId;
       this.unloadPointName = selection.warehouseName;
       console.log(this.unloadPointId);
@@ -172,17 +180,17 @@ export default {
         resultArrivalDate: sjTime(this.form1.resultArrivalDate),
         resultUnloadTime: sjTime(this.form1.resultUnloadTime),
         resultRemark: this.form1.resultRemark,
-        unloadingPointId:this.unloadPointId,
-        insertUsername:getCookie("userId"),
+        unloadingPointId: this.unloadPointId,
+        insertUsername: getCookie("userId"),
         resultType: 3,
       };
       console.log(tmstrainWagonUnloadResult);
       if (
         tmstrainWagonUnloadResult.wagonNoList == null ||
-        tmstrainWagonUnloadResult.wagonNoList.length <=0 ||
+        tmstrainWagonUnloadResult.wagonNoList.length <= 0 ||
         tmstrainWagonUnloadResult.resultArrivalDate == null ||
         tmstrainWagonUnloadResult.resultUnloadTime == null ||
-        tmstrainWagonUnloadResult.unloadingPointId ==null
+        tmstrainWagonUnloadResult.unloadingPointId == null
       )
         this.$message.error("请填写完整信息！");
       else
@@ -216,7 +224,7 @@ export default {
     display: flex;
     .form_box {
       width: 320px;
-      margin-left: 35%;
+      margin-left: 25%;
       margin-top: 30px;
       margin-right: 22px;
       .el-form {

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

@@ -233,7 +233,6 @@ export default {
         //验证是否为数字
         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)$/;
-        // var patrn2 = /^(\d{3,4}-)?\d{7,8}$/;
         if (patrn.exec(value3) == null || value3 == "") {
           return false;
         } else {

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

@@ -280,7 +280,6 @@ export default {
       }
     },
     handleAvatarSuccess(res, file) {
-      // console.log("res",res.data)
       if (res.code) {
         this.upBool = false;
         if (this.num == 1) {

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

@@ -34,27 +34,26 @@
     <div class="mofrom">
       <span class="motext">批次</span>
       <el-input class="moinput" v-model="batchId" disabled> </el-input>
-      <el-button class="mobutton" type="primary" @click="ondrawer(5)"
-        disabled>浏览</el-button
+      <el-button class="mobutton" type="primary" @click="ondrawer(5)" disabled
+        >浏览</el-button
       >
     </div>
 
     <div class="form">
       <div class="form_box">
-         <el-form>
+        <el-form>
           <div class="preview-group">
-              <el-form-item label="发货港口:">
-                 <el-select
-                 v-model="portId"
-                 filterable >
-                  <el-option
-                    v-for="port in ports"
-                    :key="port.portId"
-                    :label="port.portName"
-                    :value="port.portId">
-                  </el-option>
-                </el-select>
-              </el-form-item>
+            <el-form-item label="发货港口:">
+              <el-select v-model="portId" filterable>
+                <el-option
+                  v-for="port in ports"
+                  :key="port.portId"
+                  :label="port.portName"
+                  :value="port.portId"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
           </div>
         </el-form>
         <dil-form :formId="112" v-model="form1"></dil-form>
@@ -175,17 +174,17 @@ export default {
     return {
       form1: {},
       a: 1,
-      portId:"",
-      ports:[],
+      portId: "",
+      ports: [],
       cargoPictureUrl: "",
       shippingCertificate: "",
       materialName: "",
       materialType: "",
-      foreignShipName:"",
+      foreignShipName: "",
       materialId: "",
       batchIds: "",
       cargo: "",
-      disabled:null,
+      disabled: null,
       receiver: "",
       input: "",
       drawer: false,
@@ -223,18 +222,18 @@ export default {
   },
   methods: {
     //查询所有港口
-    getPorts(){
+    getPorts() {
       this.axios.post("/api/v1/rms/getPortName?index=").then((res) => {
-          if (res.data.code == 200) {
-            //赋值
-            this.ports=res.data.data;
-          } else {
-            this.$message({
-              type: "warning",
-              message: res.data.data,
-            });
-          }
-        });
+        if (res.data.code == 200) {
+          //赋值
+          this.ports = res.data.data;
+        } else {
+          this.$message({
+            type: "warning",
+            message: res.data.data,
+          });
+        }
+      });
     },
     information() {
       this.axios
@@ -243,11 +242,11 @@ export default {
           res.data.data.forEach((e) => {
             console.log("aaa", e);
             this.form1 = e;
-            this.portId=e.portId;
-            this.batchId =  e.foreignShipName + e.materialName;
-            this.batchIds=e.batchId;
-            this.foreignShipName=e.foreignShipName;
-            this.materialId=e.materialId;
+            this.portId = e.portId;
+            this.batchId = e.foreignShipName + e.materialName;
+            this.batchIds = e.batchId;
+            this.foreignShipName = e.foreignShipName;
+            this.materialId = e.materialId;
             // this.materialId = e.materialId;
             this.cargo = e.cargoName;
             this.cargoId = e.cargoId;
@@ -327,14 +326,12 @@ export default {
       (this.second5.mapList5 = selection),
         (this.batchIds =
           selection.foreignShipName + "" + selection.materialName);
-            (this.batchIds =
-          selection.batchId);
-            (this.foreignShipName =
-          selection.foreignShipName);
+      this.batchIds = selection.batchId;
+      this.foreignShipName = selection.foreignShipName;
     },
     onchange(val) {},
     onclick(a) {
-       if (a == 2) {
+      if (a == 2) {
         this.second1.requestUrl =
           "/api/v1/tms/selectShippeByName?apiId=215&con=" + this.input;
       } else if (a == 3) {
@@ -344,7 +341,7 @@ export default {
         // console.log("aaaa");
         this.second3.requestUrl =
           "/api/v1/rms/getMaterialTypeList?apiId=376&con=" + this.input;
-      }else if(a==5){
+      } else if (a == 5) {
         this.second5.requestUrl =
           "/api/v1/tms/getBatchIdByForeign?apiId=489&con=" + this.input;
       }
@@ -379,8 +376,8 @@ export default {
         cargoId: this.second1.mapList2.cargoId,
         groupId: this.second2.mapList3.id,
         inFactoryShipName: this.form1.inFactoryShipName,
-        foreignShipName:  this.foreignShipName,
-        batchIds:this.batchIds,
+        foreignShipName: this.foreignShipName,
+        batchIds: this.batchIds,
         materialId: this.materialId,
         materialTypeId: this.second3.mapList4.materialTypeId,
         isNeedPortDisCharge: this.form1.isNeedPortDisCharge,
@@ -388,6 +385,19 @@ export default {
         cargoPictureUrl: this.cargoPictureUrl,
         userId: getCookie("userId"),
       };
+
+      if (this.second2.mapList3.length == 0) {
+        this.$message.warning("请选择收货人");
+        return;
+      }
+      if (this.second3.mapList4.length == 0) {
+        this.$message.warning("请选择物资品类");
+        return;
+      }
+      if (this.second5.mapList5.length == 0) {
+        this.$message.warning("请选择批次");
+        return;
+      }
       //判断是否为电话号码
       function isTelePhone() {
         var value2 = map.resultTelephoneFax;
@@ -401,7 +411,7 @@ export default {
         }
       }
       var val = this.value;
-       if (
+      if (
         map.noticeCommerceMethod == null ||
         map.noticeHandoverMethod == null ||
         map.noticePortConstructionFee == null ||
@@ -499,8 +509,7 @@ export default {
       ) {
         this.$message.error("放货数量得为数字");
         return;
-      } else{
-        
+      } else {
       }
       this.axios.post("/api/v1/tms/editDeliveryNotice", map).then((res) => {
         if (res.data.code == "200") {