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

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();
         });

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",

src/views/RMS/components/truckCalculate.vue

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

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

@@ -1,47 +1,45 @@
 <template>
   <!-- 修改车皮装车实绩 -->
-  <div class="contractDetails">
+  <div class="edit-domesticMine">
     <page-title>返回</page-title>
       <div class="form">
         <div class="form_box">
           <dil-form :formId="254" v-model="form1"></dil-form>
-        </div>
+          <el-form :inline="true" label-width="70px">
+            <div class="preview-group">
+              <el-form-item label="发站:">
+                  <el-autocomplete
+                    class="inline-input"
+                    v-model="sendStation"
+                    :fetch-suggestions="querySearchSendStation"
+                    placeholder="请输入发站名称"
+                    :trigger-on-focus="false"
+                    @select="handleSelectSendStation"
+                  >
+                    <template slot-scope="{ item }">
+                      <div class="name">{{ item.arrivalName }}</div>
+                    </template>
+                  </el-autocomplete>
+                </el-form-item>
+                <el-form-item label="到站:">
+                  <el-autocomplete
+                    class="inline-input"
+                    v-model="toTheStation"
+                    :fetch-suggestions="querySearchToTheStation"
+                    placeholder="请输入到站名称"
+                    :trigger-on-focus="false"
+                    @select="handleSelectToTheStation"
+                  >
+                    <template slot-scope="{ item }">
+                      <div class="name">{{ item.arrivalName }}</div>
+                    </template>
+                  </el-autocomplete>
+                </el-form-item>
+            </div>
+          </el-form>
+      </div>
     </div>
-    <div class="fromOther">
-      <el-form :inline="true" class="demo-form-inline" label-width="70px" style="margin-left:35%;">
-        <el-form-item label="发站:">
-          <el-autocomplete
-            class="inline-input"
-            v-model="sendStation"
-            :fetch-suggestions="querySearchSendStation"
-            placeholder="请输入发站名称"
-            :trigger-on-focus="false"
-            @select="handleSelectSendStation"
-          >
-            <template slot-scope="{ item }">
-              <div class="name">{{ item.arrivalName }}</div>
-            </template>
-          </el-autocomplete>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" class="demo-form-inline" label-width="70px" style="margin-left:35%;">
-        <el-form-item label="到站:">
-          <el-autocomplete
-            class="inline-input"
-            v-model="toTheStation"
-            :fetch-suggestions="querySearchToTheStation"
-            placeholder="请输入到站名称"
-            :trigger-on-focus="false"
-            @select="handleSelectToTheStation"
-          >
-            <template slot-scope="{ item }">
-              <div class="name">{{ item.arrivalName }}</div>
-            </template>
-          </el-autocomplete>
-        </el-form-item>
-      </el-form>
-    </div>
-    <div class="button_box">
+    <div class="button_box-domesticMine">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
     </div>
@@ -206,7 +204,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.contractDetails {
+.edit-domesticMine {
   .form {
     display: flex;
     .form_box {
@@ -234,7 +232,7 @@ export default {
       }
     }
   }
-  .button_box {
+  .button_box-domesticMine {
     margin-left: 42%;
     margin-top: 55px;
     width: 300px;

src/views/TMS/components/importedEmergency/editWagonLoadEmergency.vue

@@ -1,48 +1,46 @@
 <template>
   <!-- 修改车皮装车实绩 -->
-  <div class="addWagonLoad">
+  <div class="edit-importedEmergency">
     <page-title>编辑</page-title>
 
     <div class="form">
       <div class="form_box">
         <dil-form :formId="254" v-model="form1"></dil-form>
-      </div>
-    </div>
-    <div class="fromOther">
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:520px;">
-        <el-form-item label="发站:">
-          <el-autocomplete
-            class="inline-input"
-            v-model="sendStation"
-            :fetch-suggestions="querySearchSendStation"
-            placeholder="请输入发站名称"
-            :trigger-on-focus="false"
-            @select="handleSelectSendStation"
-          >
-            <template slot-scope="{ item }">
-              <div class="name">{{ item.arrivalName }}</div>
-            </template>
-          </el-autocomplete>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:520px;">
-        <el-form-item label="到站:">
-          <el-autocomplete
-            class="inline-input"
-            v-model="toTheStation"
-            :fetch-suggestions="querySearchToTheStation"
-            placeholder="请输入到站名称"
-            :trigger-on-focus="false"
-            @select="handleSelectToTheStation"
-          >
-            <template slot-scope="{ item }">
-              <div class="name">{{ item.arrivalName }}</div>
-            </template>
-          </el-autocomplete>
-        </el-form-item>
+        <el-form :inline="true" label-width="70px">
+          <div class="preview-group">
+              <el-form-item label="发站:">
+                <el-autocomplete
+                  class="inline-input"
+                  v-model="sendStation"
+                  :fetch-suggestions="querySearchSendStation"
+                  placeholder="请输入发站名称"
+                  :trigger-on-focus="false"
+                  @select="handleSelectSendStation"
+                >
+                  <template slot-scope="{ item }">
+                    <div class="name">{{ item.arrivalName }}</div>
+                  </template>
+                </el-autocomplete>
+              </el-form-item>
+              <el-form-item label="到站:">
+                <el-autocomplete
+                  class="inline-input"
+                  v-model="toTheStation"
+                  :fetch-suggestions="querySearchToTheStation"
+                  placeholder="请输入到站名称"
+                  :trigger-on-focus="false"
+                  @select="handleSelectToTheStation"
+                >
+                  <template slot-scope="{ item }">
+                    <div class="name">{{ item.arrivalName }}</div>
+                  </template>
+                </el-autocomplete>
+              </el-form-item>
+          </div>
       </el-form>
+      </div>
     </div>
-    <div class="button_box">
+    <div class="button_box-importedEmergency">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
     </div>
@@ -219,7 +217,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.addWagonLoad {
+.edit-importedEmergency {
   color: #606266;
   font-size: 0.675rem;
   font-weight: 500;
@@ -255,7 +253,7 @@ export default {
       }
     }
   }
-  .button_box {
+  .button_box-importedEmergency {
     display: flex;
     justify-content: center;
     padding-top: 30px;

src/views/TMS/components/importedMine/editWagonLoad.vue

@@ -1,49 +1,47 @@
 <template>
   <!-- 修改车皮装车实绩 -->
-  <div class="contractDetails">
+  <div class="edit-importedMine">
     <page-title>返回</page-title>
 
     <div class="form">
       <div class="form_box">
         <dil-form :formId="103" v-model="form1"></dil-form>
-      </div>
-    </div>
-    <div class="fromOther">
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:520px;">
-        <el-form-item label="发站:">
-          <el-autocomplete
-            class="inline-input"
-            v-model="sendStation"
-            :fetch-suggestions="querySearchSendStation"
-            placeholder="请输入发站名称"
-            :trigger-on-focus="false"
-            @select="handleSelectSendStation"
-          >
-            <template slot-scope="{ item }">
-              <div class="name">{{ item.arrivalName }}</div>
-            </template>
-          </el-autocomplete>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:520px;">
-        <el-form-item label="到站:">
-          <el-autocomplete
-            class="inline-input"
-            v-model="toTheStation"
-            :fetch-suggestions="querySearchToTheStation"
-            placeholder="请输入到站名称"
-            :trigger-on-focus="false"
-            @select="handleSelectToTheStation"
-          >
-            <template slot-scope="{ item }">
-              <div class="name">{{ item.arrivalName }}</div>
-            </template>
-          </el-autocomplete>
-        </el-form-item>
+        <el-form :inline="true"  label-width="70px">
+        <div class="preview-group">
+          <el-form-item label="发站:">
+            <el-autocomplete
+              class="inline-input"
+              v-model="sendStation"
+              :fetch-suggestions="querySearchSendStation"
+              placeholder="请输入发站名称"
+              :trigger-on-focus="false"
+              @select="handleSelectSendStation"
+            >
+              <template slot-scope="{ item }">
+                <div class="name">{{ item.arrivalName }}</div>
+              </template>
+            </el-autocomplete>
+          </el-form-item>
+          <el-form-item label="到站:">
+            <el-autocomplete
+              class="inline-input"
+              v-model="toTheStation"
+              :fetch-suggestions="querySearchToTheStation"
+              placeholder="请输入到站名称"
+              :trigger-on-focus="false"
+              @select="handleSelectToTheStation"
+            >
+              <template slot-scope="{ item }">
+                <div class="name">{{ item.arrivalName }}</div>
+              </template>
+            </el-autocomplete>
+          </el-form-item>
+        </div>
       </el-form>
+      </div>
     </div>
     <!-- 确定和取消 -->
-    <div class="button_box">
+    <div class="button_box-importedMine">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
@@ -220,7 +218,7 @@ export default {
 };
 </script>
 <style lang="scss">
-.contractDetails {
+.edit-importedMine {
   .form {
     display: flex;
     .form_box {
@@ -242,20 +240,13 @@ export default {
               .el-input {
                 width: 250px;
               }
-              .el-textarea {
-                .el-textarea__inner {
-                  width: 220px;
-                  margin-left: 65px;
-                  margin-top: 0.03rem;
-                }
-              }
             }
           }
         }
       }
     }
   }
-  .button_box {
+  .button_box-importedMine {
     margin-left: 42%;
     margin-top: 55px;
   }

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(

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",

src/views/sale/components/offSiteTransportation/currentLocation.vue

@@ -103,7 +103,7 @@ export default {
           console.log(res.data.data);
           if (res.data.data == "-1") {
             this.$message.error("运输订单未关闭,自提车辆无权查看!");
-          } else if (res.data.data.status != "1006") {
+          } else if (res.data.data.status == "1001") {
             that.map.setCenter([
               res.data.data.result.lon,
               res.data.data.result.lat
@@ -136,8 +136,8 @@ export default {
             }
             this.lon = res.data.data.result.lon;
             this.lat = res.data.data.result.lat;
-          } else {
-            this.$message.error("车辆暂时无GPS");
+          } else{
+             this.$message.error(res.data.data.statusStr);
             //清除定时器
             clearTimeout(this.timer);
           }

src/views/statisticalReport/components/purachaseMineral.vue

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