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

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

@@ -1,5 +1,5 @@
 <template>
-  <!-- 计量委托 -->
+  <!-- 国产矿计量委托 -->
   <div class="homeworkPath">
     <div class="top">
       <el-input

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

@@ -159,17 +159,14 @@ export default {
     },
     // 确认
     onClickConfirm() {
+      console.log(this.form1);
       let tmstrainLoadingResult = {
         resultId: this.$route.params.resultId,
         resultWagonNo: this.form1.resultWagonNo,
-        resultClass: this.form1.resultClass,
+        purchaseOrderRailPlanId:this.form1.purchaseOrderNo,
         sendStationId: this.sendStationId,
         arrivalStationId: this.toTheStationId,
         resultLoadingDate: sjTime(this.form1.resultLoadingDate),
-        batchId: this.form1.batchId,
-        capacityId: this.form1.capacityId,
-        resultMaterialNumber: this.form1.resultMaterialNumber,
-        resultMaterialTheoryweight: this.form1.resultMaterialTheoryweight,
         resultRemarks: this.form1.resultRemarks
       };
       console.log(tmstrainLoadingResult)
@@ -178,19 +175,20 @@ export default {
       tmstrainLoadingResult.sendStationId==null||
       tmstrainLoadingResult.arrivalStationId==null||
       tmstrainLoadingResult.resultLoadingDate==null||
-      tmstrainLoadingResult.batchId==null
+      tmstrainLoadingResult.purchaseOrderRailPlanId==null
       ) this.$message.error("必填项存在空值！");
-      else
-      this.axios
-        .post("/api/v1/tms/upadteTmstrainLoadingResultByResultId",
-          tmstrainLoadingResult)
-         .then(() => {
-          this.$message({
-            type: "success",  
-            message: "修改成功!",
+      else{
+          this.axios
+          .post("/api/v1/tms/upadteTmstrainLoadingResultByResultId",
+            tmstrainLoadingResult)
+          .then(() => {
+            this.$message({
+              type: "success",  
+              message: "修改成功!",
+            });
+            this.$router.go(-1);
           });
-          this.$router.go(-1);
-        });
+      }
     },
   },
 };

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

@@ -17,7 +17,10 @@
     <dilTable v-bind.sync="option">
       <el-table-column fixed="right" label="操作" width="100">
         <template slot-scope="scope">
-          <el-button @click="click(scope.row.resultId)" type="text" size="small"
+         
+          <el-button @click="click(scope.row.resultId)"  
+           :disabled="!scope.row.isEdit"
+          type="text" size="small"
             >修改</el-button
           >
           <el-button

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

@@ -1,5 +1,5 @@
 <template>
-  <!-- 计量委托 -->
+  <!-- 海港-老区轨道衡计量委托 -->
   <div class="homeworkPath">
     <div class="top">
       <el-input
@@ -12,13 +12,10 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <!-- <el-button type="primary" @click="btnclick(0)">
-        <i class="el-icon-s-promotion"></i>发送
-      </el-button> -->
     </div>
-    <dilTable v-bind.sync="option" @selection-change="selectionChange">
-    </dilTable>
-  </div>
+      <dilTable v-bind.sync="option" @selection-change="selectionChange">
+      </dilTable>
+    </div>
 </template>
 <script>
 export default {

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

@@ -1,5 +1,5 @@
 <template>
-  <!-- 发送计量委托界面 -->
+  <!-- 万州港-达州计量委托界面 -->
   <div class="trainTransport">
     <div class="top">
       <el-input
@@ -9,15 +9,42 @@
         clearable
       >
       </el-input>
+      <span class="item_details">时间段:</span>
+        <el-date-picker
+          style="width:200px"
+          class="date_picker_style"
+          v-model="time[0]"
+          type="time"
+          format="yyyy-MM-dd HH:mm:ss"
+          placeholder="开始日期"
+        >
+        </el-date-picker>
+        <el-date-picker
+          style="width:200px"
+          class="date_picker_style"
+          v-model="time[1]"
+          type="time"
+          format="yyyy-MM-dd HH:mm:ss"
+          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="btnclick(0)">
-        <i class="el-icon-s-promotion"></i>发送
-      </el-button> -->
     </div>
-    <dilTable v-bind.sync="option" @selection-change="selectionChange">
-    </dilTable>
+    
+
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="待计量" name="first">
+        <dilTable v-bind.sync="option" @selection-change="selectionChange">
+        </dilTable>
+      </el-tab-pane>
+      <el-tab-pane label="已计量" name="second">
+        <dilTable v-bind.sync="option2" @selection-change="selectionChange2">
+        </dilTable>
+      </el-tab-pane>
+    </el-tabs>
+      
   </div>
 </template>
 
@@ -26,6 +53,8 @@
 export default {
   data() {
     return {
+      activeName:null,
+      time:[],
       input: "",
       option: {
         // 表格请求数据的地址
@@ -33,52 +62,36 @@ export default {
         // 控制显示多选列
         selectionType: "select",
       },
+      option2: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getWeightResult?apiId=58&resultType=1",
+        // 控制显示多选列
+        selectionType: "select",
+      },
       selectionListMap: [],
+      selectionListMap2:[],
       resultIdList: [],
     };
   },
   methods: {
+    handleClick(tag,event){
+      console.log(tag,event);
+    },
     onclick() {
       this.option.requestUrl =
         "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=1&con=" +
         this.input;
     },
-    btnclick() {
-      let map = {
-        resultIdList: this.selectionListMap,
-      };
-      if (this.selectionListMap.length == 0) {
-        this.$message({
-          message: "请勾选要发送计量委托的实绩!",
-          type: "warning",
-        });
-      } else {
-        this.axios
-          .post("/api/v1/tms/batchSendMeasureCommission", map)
-          .then((res) => {
-            if (res.data.data == "发送成功") {
-              this.$message({
-                type: "success",
-                message: res.data.data,
-              });
-              this.option.requestUrl =
-                "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=1" +
-                "&i=" +
-                new Date();
-            }else{
-                this.$message({
-                type: "warning",
-                message: res.data.data,
-              });
-            }
-          });
-      }
-    },
     selectionChange(selection) {
       this.selectionListMap = [];
       console.log(selection);
       this.selectionListMap = selection;
     },
+    selectionChange2(selection) {
+      this.selectionListMap2 = [];
+      console.log(selection);
+      this.selectionListMap2 = selection;
+    },
   },
 };
 </script>

src/views/sale/components/saleSelfMachine/printScan.vue

@@ -4,8 +4,16 @@
             <img :src="backgroundImgURL" width="100%" height="100%"/>
         </div>
         <div class="orderNumberData">
-            <el-input placeholder="请将二维码放置在扫描区" v-model="orderNumber" :focus="true" ref="inputs">
+            <el-input placeholder="请将二维码放置在扫描区" v-model="orderNumber" :focus="true" ref="inputs" :disabled="!isEdit">
             </el-input>
+            <div style="display:block;width:120px">
+                手动输入开关：
+            </div>
+            <el-switch
+            v-model="isEdit"
+            active-color="#66ccff"
+            inactive-color="#ffffff">
+            </el-switch>
         </div>
     </div>    
 </template>
@@ -14,6 +22,7 @@ export default {
     data(){
         return{
             orderNumber:null,
+            isEdit:false,
             backgroundImgURL:require('@/assets/saleSelfMachine/scanCode.jpg'),
         }
     },
@@ -50,13 +59,14 @@ export default {
         //}
          if(this.orderNumber!=null&&this.orderNumber.length==21){
             if(this.orderNumber.startsWith('WYSDD')==true||this.orderNumber.startsWith('wysdd')==true){
-          
-            this.$router.push({
-                path:"/saleSelfMachine?orderNumber="+this.orderNumber,
-            })
+                this.$router.push({
+                        path:"/saleSelfMachine?orderNumber="+this.orderNumber,
+                })
             }
-            }   
-        
+        }else if(this.orderNumber.length>21){
+            //清空输入框，免得一次多个重复订单还无法删除
+            this.orderNumber=null;
+        } 
     },3000)
     this.$once('hook:beforeDestroy', ()=>{
         clearInterval(timer)