liyg 2 vuotta sitten
vanhempi
commit
690fe81135

+ 1 - 1
src/views/RMS/components/addPort.vue

@@ -41,7 +41,7 @@ export default {
             // this.$refs.table.refreshData();
             this.$router.go(-1);
           } else {
-            this.$message.error("新增失败,可能存在重复!");
+            this.$message.error("新增失败,港口名称或者全称存在重复!");
           }
           // this.$refs['table'].resetField();
         });

+ 10 - 8
src/views/RMS/components/editPersonnel.vue

@@ -63,17 +63,19 @@ export default {
          personnelPost: this.form1.personnelPost,
          personnelWorkshopid: this.form1.personnelWorkshopid,
          personnelShifts: this.form1.personnelShifts,
-         shipperId: this.form1.shipperId,
+         departmentId: this.form1.departmentId,
          personnelTeam: this.form1.personnelTeam,
        }; 
          if(
-        RmsPersonnel.personnelJobNumber ==null ||
-        RmsPersonnel.personnelName ==null ||
-        RmsPersonnel.personnelPost ==null ||
-        RmsPersonnel.personnelWorkshopid==null ||
-        RmsPersonnel.personnelShifts==null ||
-        RmsPersonnel.departmentId==null 
-      )this.$message.error("存在空值!"); 
+        !RmsPersonnel.personnelJobNumber  ||
+        !RmsPersonnel.personnelName  ||
+        !RmsPersonnel.personnelPost  ||
+        !RmsPersonnel.personnelShifts ||
+        !RmsPersonnel.departmentId 
+      ){
+        this.$message.error("存在空值!"); 
+        return;
+      }
         this.axios
           .post(
             "/api/v1/rms/updatePersonnel",

+ 1 - 1
src/views/RMS/components/truckCalculate.vue

@@ -23,7 +23,7 @@
                size="small"
                @click="updateTruckCalculate(scope)"
              >
-               详细
+               修改
              </el-button> 
             <el-button
               type="text"

+ 14 - 3
src/views/appoint/components/purchase/addTrainPrice.vue

@@ -32,12 +32,23 @@ export default {
         trainPriceDate: sjTime(this.form1.trainPriceDate),
         trainType: this.form1.trainType
       };
+      try{
+        let temp=parseFloat(amsContractTrainPrice.trainPrice);
+        if(temp==temp){
+          amsContractTrainPrice.trainPrice=temp;
+        }
+      }catch(error){
+        
+      }
       console.log(amsContractTrainPrice);
       if (
-      amsContractTrainPrice.trainPrice==null||
-      amsContractTrainPrice.trainPriceDate==null||
-      amsContractTrainPrice.trainType==null
+      (!amsContractTrainPrice.trainPrice && amsContractTrainPrice.trainPrice!=0) ||
+      !amsContractTrainPrice.trainPriceDate ||
+      !amsContractTrainPrice.trainType
       ) this.$message.error("必填项存在空值!");
+      else if(typeof amsContractTrainPrice.trainPrice != 'number' || amsContractTrainPrice.trainPrice <= 0){
+        this.$message.error("单价必须是大于零的数字!"); 
+      }
       else
       this.axios
         .post(

+ 16 - 0
src/views/appoint/components/purchase/updateTrainPrice.vue

@@ -55,7 +55,23 @@ export default {
         trainPriceDate: sjTime(this.form1.trainPriceDate),
         trainType: this.form1.trainType
       };
+      try{
+        let temp=parseFloat(amsContractTrainPrice.trainPrice);
+        if(temp==temp){
+          amsContractTrainPrice.trainPrice=temp;
+        }
+      }catch(error){
+        
+      }
       console.log(amsContractTrainPrice);
+      if (
+      (!amsContractTrainPrice.trainPrice && amsContractTrainPrice.trainPrice!=0) ||
+      !amsContractTrainPrice.trainPriceDate ||
+      !amsContractTrainPrice.trainType
+      ) this.$message.error("必填项存在空值!");
+      else if(typeof amsContractTrainPrice.trainPrice != 'number' || amsContractTrainPrice.trainPrice <= 0){
+        this.$message.error("单价必须是大于零的数字!"); 
+      }else
       this.axios
         .post(
           "/api/v1/ams/updateTrainPrice",

+ 1 - 1
src/views/statisticalReport/components/purachaseMineral.vue

@@ -48,7 +48,7 @@ export default {
       totalNumber: 0,
       //合计车数
       totalCapacity: 0,
-      tableTitle:'采购燃料老区统计报表'
+      tableTitle:'采购进口矿汽运监控统计报表'
     };
   },
   methods: {