修改采购进口矿

build/utils.js

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

config/index.js

@@ -65,7 +65,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
     target: "http://172.16.33.166:8080",
-    // target: "http://192.168.1.109:8080",
+    // target: "http://192.168.1.101:8019",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

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

@@ -99,7 +99,7 @@ export default {
       mapVal.resultOutWharyName==null||
       mapVal.resultOutWharyTime==null
       ) this.$message.error("存在空值！");
-      else if(isNumber(val)) this.$message.warning("实装数量必须为数字!")
+      else if(!isNumber(val)) this.$message.warning("实装数量必须为数字!")
       else
       this.axios
         .post(
@@ -110,14 +110,11 @@ export default {
           }
         )
         .then((res) => {
-          // console.log("返回成功了")
-          // console.log(res)
           if (res.data.code == 200) {
             this.$message({
               type: "success",
               message: "新增成功!",
             });
-            // this.$refs.table.refreshData();
             this.$router.go(-1);
           }else if(res.data.code == 201){
             this.$message.warning(res.data.data);

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

@@ -3,54 +3,71 @@
   <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="128" v-model="form"></dil-form>
+        <dil-form :formId="128" v-model="form"></dil-form>
       </div>
     </div>
     <!-- 下方内容 -->
     <div class="other">
       <el-form :inline="true">
         <el-form-item>
-          <label class="el-form-item__label" style="width: auto;">含水率</label>
+          <label class="el-form-item__label" style="width: auto">含水率</label>
         </el-form-item>
         <el-form-item>
-          <el-input  placeholder="" v-model="resultMoistureContent"></el-input>
+          <el-input placeholder="" v-model="resultMoistureContent"></el-input>
         </el-form-item>
-         
-         <el-form-item>
-          <label class="el-form-item__label" style="width: auto;">合同水分值</label>
+
+        <el-form-item>
+          <label class="el-form-item__label" style="width: auto"
+            >合同水分值</label
+          >
         </el-form-item>
         <el-form-item>
-          <el-input placeholder="" v-model="contractMoistureValue" :disabled="true"></el-input>
+          <el-input
+            placeholder=""
+            v-model="contractMoistureValue"
+            :disabled="true"
+          ></el-input>
         </el-form-item>
 
         <el-form-item>
-          <label class="el-form-item__label" style="width: auto;">实装吨位</label>
+          <label class="el-form-item__label" style="width: auto"
+            >实装吨位</label
+          >
         </el-form-item>
         <el-form-item>
-          <el-input placeholder="" v-model="realWeight" :disabled="true"></el-input>
+          <el-input
+            placeholder=""
+            v-model="realWeight"
+            :disabled="true"
+          ></el-input>
         </el-form-item>
 
         <el-form-item>
-          <label class="el-form-item__label" style="width: auto;">水分吨位</label>
+          <label class="el-form-item__label" style="width: auto"
+            >水分吨位</label
+          >
         </el-form-item>
         <el-form-item>
-          <el-input placeholder="" v-model="moistureTonnage" :disabled="true"></el-input>
+          <el-input
+            placeholder=""
+            v-model="moistureTonnage"
+            :disabled="true"
+          ></el-input>
         </el-form-item>
       </el-form>
-        <el-button type="primary" @click="makeSure">新增水分质检信息</el-button>
+      <el-button type="primary" @click="makeSure">新增水分质检信息</el-button>
     </div>
-    
   </div>
 </template>
 
@@ -61,11 +78,11 @@ export default {
   components: { PageTitle },
   data() {
     return {
-      resultMoistureContent:'',
-      contractMoistureValue:'',
-      realWeight:'',
-      moistureTonnage:'',
-      input:'',
+      resultMoistureContent: "",
+      contractMoistureValue: "",
+      realWeight: "",
+      moistureTonnage: "",
+      input: "",
       restaurants: [],
       state: "",
       form: {},
@@ -74,124 +91,128 @@ export default {
         requestUrl: "/api/v1/tms/getCapacityList?apiId=138",
         // 控制显示当选列
         selectionType: "radio",
-        waterQualityMap:[],
+        waterQualityMap: [],
       },
     };
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     currentRadioChange(row) {
-      this.waterQualityMap=row
-      //console.log("waterQualityMap",this.waterQualityMap)
-      if(this.resultMoistureContent!=null&&this.resultMoistureContent!=''){
-        
-        let map={
-          batchId:this.waterQualityMap.batchId,
-          resultMoistureContent:this.resultMoistureContent
+      this.waterQualityMap = row;
+      if (
+        this.resultMoistureContent != null &&
+        this.resultMoistureContent != ""
+      ) {
+        let map = {
+          batchId: this.waterQualityMap.batchId,
+          resultMoistureContent: this.resultMoistureContent,
         };
-        console.log(map)
+        console.log(map);
         this.axios
-          .post(
-            "/api/v1/tms/getMoistureAndInstallations",map
-          )
+          .post("/api/v1/tms/getMoistureAndInstallations", map)
           .then((res) => {
             if (res.data.code == 200) {
-              console.log("res",res.data.data)
-              this.contractMoistureValue=res.data.data.purchaseContractMoisture;
-              this.realWeight=res.data.data.resultActualInstallations;
-              this.moistureTonnage=res.data.data.resultWaterTonnage;
+              this.contractMoistureValue =
+                res.data.data.purchaseContractMoisture;
+              this.realWeight = res.data.data.resultActualInstallations;
+              this.moistureTonnage = res.data.data.resultWaterTonnage;
               // this.$refs.table.refreshData();
             } else {
               this.$message.error("失败！");
             }
           });
       }
-      
     },
     // 新增
     makeSure() {
       let mapVal = {
-        resultPlannedDate: sjTime(
-          this.form.planDate
-        ),
-        expectNoticeDate:sjTime(
-          this.form.expectNoticeDate
-        ),
+        resultPlannedDate: sjTime(this.form.planDate),
+        expectNoticeDate: sjTime(this.form.expectNoticeDate),
         resultEmptyHeavyWaterMeter: this.form.resultEmptyHeavyWaterMeter,
-        resultMoistureContent:this.resultMoistureContent,
+        resultMoistureContent: this.resultMoistureContent,
         resultInspectionFees: this.form.resultInspectionFees,
-        contractMoistureValue:this.contractMoistureValue,
-        realWeight:this.realWeight,
-        moistureTonnage:this.moistureTonnage
+        contractMoistureValue: this.contractMoistureValue,
+        realWeight: this.realWeight,
+        moistureTonnage: this.moistureTonnage,
       };
-      console.log(mapVal);
-       if (mapVal.resultPlannedDate==null||
-      mapVal.resultEmptyHeavyWaterMeter==null||
-      mapVal.resultMoistureContent==null||
-      mapVal.resultInspectionFees==null||
-      mapVal.contractMoistureValue==null||
-      mapVal.realWeight==null||
-      mapVal.moistureTonnage==null
-      ) this.$message.error("存在空值！");
+      //判断放货数量是否为数字
+      function isNumber() {
+        var value = mapVal.resultMoistureContent;
+        //验证是否为数字
+        var patrn = /^(-)?\d+(\.\d+)?$/;
+        if (patrn.exec(value) == null || value == "") {
+          return false;
+        } else {
+          return true;
+        }
+      }
+      var val = this.value;
+
+      if (
+        mapVal.resultPlannedDate == null ||
+        mapVal.resultEmptyHeavyWaterMeter == null ||
+        mapVal.resultMoistureContent == null ||
+        mapVal.resultInspectionFees == null ||
+        mapVal.contractMoistureValue == null ||
+        mapVal.realWeight == null ||
+        mapVal.moistureTonnage == null
+      )
+        this.$message.error("存在空值！");
+      else if (!isNumber(val)) this.$message.warning("含水率必须为数字");
       else
-      this.axios
-        .post(
-          "/api/v1/tms/addWaterQualityResult",
-          {
+        this.axios
+          .post("/api/v1/tms/addWaterQualityResult", {
             mapVal: mapVal,
-            waterQualityMap: this.waterQualityMap
-          }
-        )
-        .then((res) => {
-          if (res.data.code == 200) {
-            this.$message({
-              type: "success",
-              message: "新增成功!",
-            });
-            // this.$refs.table.refreshData();
-            this.$router.go(-1);
-          } else {
-            this.$message.error("新增失败！");
-          }
-          this.$refs['table'].resetField();
-        });
+            waterQualityMap: this.waterQualityMap,
+          })
+          .then((res) => {
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "新增成功!",
+              });
+              // this.$refs.table.refreshData();
+              this.$router.go(-1);
+            } else {
+              this.$message.error("新增失败！");
+            }
+            this.$refs["table"].resetField();
+          });
     },
     loadAll() {
-      return [
-
-      ];
+      return [];
     },
     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' scoped>
-.shipTransport{
-  .form{
+.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;
               }
             }
@@ -207,31 +228,31 @@ export default {
       margin-right: 1.25rem;
     }
   }
-  .button_box{
+  .button_box {
     margin-left: 45%;
   }
-  .other{
+  .other {
     width: 320px;
-      margin-left: 35%;
-      margin-right: 20px;
-      .el-form{
-        .preview-group{
-          .el-form-item{
-            .el-form-item__label{
-              display: inline-block;
-              width: 70px !important;
+    margin-left: 35%;
+    margin-right: 20px;
+    .el-form {
+      .preview-group {
+        .el-form-item {
+          .el-form-item__label {
+            display: inline-block;
+            width: 70px !important;
+          }
+          .el-form-item__content {
+            .el-select {
+              width: 250px;
             }
-            .el-form-item__content{
-              .el-select{
-                width: 250px;
-              }
-              .el-input{
-                width: 250px;
-              }
+            .el-input {
+              width: 250px;
             }
           }
         }
       }
+    }
   }
 }
 </style>

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

@@ -67,7 +67,16 @@ export default {
         ),
         bargeBackLocation: this.form1.bargeBackLocation,
       };
-      console.log(bagerShipMap);
+          if (
+        bagerShipMap.bargeOperationId == null ||
+        bagerShipMap.bargeSmallshipLoadWeight == null ||
+        bagerShipMap.bargeRefuteDate == null||
+        bagerShipMap.bargeRefuteLocation==null||
+        bagerShipMap.bargeBackDate==null||
+        bagerShipMap.bargeBackLocation==null
+      )
+        this.$message.error("存在空值！");
+      else if (!isNumber(val)) this.$message.warning("合计吨位请填写数字");
       this.axios
         .post(
           "/api/v1/tms/updateBargeOperation",

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

@@ -36,9 +36,6 @@ export default {
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
-            // console.log(e);
-            // console.log(this.form1);
-            // console.log(this.$route.params.loadingId);
           });
         });
     },
@@ -66,7 +63,7 @@ export default {
           this.form1.instructionEsarrivalTime
         ),
       };
-      console.log(omsshipInstructionsCapacity);
+     
       this.axios
         .post(
           "/api/v1/tms/updateInstructionsCapacity",

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

@@ -36,9 +36,6 @@ export default {
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
-            // console.log(e);
-            // console.log(this.form1);
-            // console.log(this.$route.params.loadingId);
           });
         });
     },
@@ -69,7 +66,20 @@ export default {
         ),
         resultIsClear: this.form1.resultIsClear,
       };
-      console.log(mapVal);
+              //判断放货数量是否为数字
+       function isNumber() {
+        var value = mapVal.resultActualInstallations;
+        //验证是否为数字
+        var patrn = /^(-)?\d+(\.\d+)?$/;
+        if (patrn.exec(value) == null || value == "") {
+          return false;
+        } else {
+          return true;
+        }
+      }
+      var val=this.value;
+    
+    
       this.axios
         .post(
           "/api/v1/tms/updateLoadShip",

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

@@ -73,7 +73,7 @@ export default {
         }
       }
       var val = this.value;
-      console.log(omsshipShipmentInstructions);
+    
       if (
         omsshipShipmentInstructions.instructionsTotalTonnage == null ||
         omsshipShipmentInstructions.instructionTime==null