修改

build/utils.js

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

config/index.js

@@ -65,8 +65,8 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://172.16.33.162:80",
-    // target: "http://localhost:8080",
+    //target: "http://172.16.33.162:80",
+     target: "http://localhost:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

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

@@ -527,10 +527,10 @@ export default {
       }
       //绑定通用字段
       this.tableData.forEach((row)=>{
-        row.resultType=3;
-        row.resultLoadingDate=sjTime(that.form1.resultLoadingDate);
-        row.arrivalStationId=that.form1.arrivalStationId;
-        row.resultRemarks=that.form1.resultRemarks;
+        row.resultType=3;//装车类型为国产矿
+        row.arrivalStationId=that.form1.arrivalStationId;//到站id,默认老区轨道衡
+        row.resultLoadingDate=sjTime(that.form1.resultLoadingDate);//装车日期
+        row.resultRemarks=that.form1.resultRemarks;//备注
       })
       console.log(that.tableData);
       //请求添加
@@ -552,22 +552,26 @@ export default {
       this.$router.push("/wagonLoadMine");
     },
     // 导入excel
-    async importExcel(file) {
+    importExcel(file) {
       let that=this;
       if (!file) {
-        alert('文件错误，请重新选择');
+        that.$message({
+          message: "文件错误!",
+          type: "warning",
+        });
         return
         }
         var reader = new FileReader();
         var data=null;
         var workbook=null;
         //设置读取操作
-        reader.onload =async function (e) {
+        reader.onload = function (e) {
           console.log(e);
           data = e.target.result;
           workbook= XLSX.read(data, {
               type: 'binary'
           });
+          console.log(workbook);
           //读取表格
           let rows= XLSX.utils.sheet_to_json(workbook.Sheets[workbook.SheetNames[0]]);//只取第一页
           console.log(rows);
@@ -583,81 +587,29 @@ export default {
             }
           }
           //绑定数据
-          rows.forEach(async (row,index) => {
+          rows.forEach((row,index) => {
             let carNumber=row['车号'];
             if((typeof carNumber)!="undefined" && carNumber.length > 6){
-            //查询数据库中的对于物资和发货单位
-            let materialName=row['品  名'];
-            let supplierName=row['发货单位'];
-            let material;
-            let supplier;
-            if((typeof material)=="undefined" || material==null){
-                await that.axios.post("/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
-                    materialName).then((res)=>{
-                      if(res.data.code == "200" && res.data.data &&res.data.data.list.length > 0 ) {
-                        //赋值
-                        material={
-                            materialId:res.data.data.list[0].materialId,
-                            materialName:res.data.data.list[0].materialName
-                        };
-                      }else{
-                        this.$message.error("绑定品名失败，请检查数据！");
-                        material=null;
-                      }
-                });
-            }
-            if((typeof supplier)=="undefined" || supplier==null){
-                //绑定发货单位id
-                await that.axios.post("/api/v1/uc/getSupplierMesByMaterialId?apiId=247&index=" +
-                    supplierName).then((res)=>{
-                      if(res.data.code == "200" && res.data.data &&res.data.data.list.length > 0 ) {
-                        //赋值
-                        supplier={
-                          supplierId:res.data.data.list[0].supplierId,
-                          supplierName:res.data.data.list[0].supplierName
-                        }
-                      }else{
-                        supplier=null;
-                        this.$message.error("绑定发货单位失败，请检查数据！");
-                      }
-                });
+              //表格数据
+              let temp={
+                number:row['序号'],
+                materialName:row['品  名'],
+                supplierName:row['发货单位'],
+                sendDate:row['发货日期'],
+                sendStation:row['发站'],
+                arrivalStation:row['到站'],
+                wagonNo:row['车号'],
+                weight:row['标重']
+              }
+              that.tableData.push(temp);
             }
-            //表格数据
-            let temp={
-              number:row['序号'],
-              materialId:material.materialId,
-              materialName:material.materialName,
-              sendUnitId:supplier.supplierId,
-              supplierName:supplier.supplierName,
-              sendDate:row['发货日期'],
-              sendStation:row['发站'],
-              arrivalStation:row['到站'],
-              wagonNo:row['车号'],
-              weight:row['标重']
+            else{
+              console.log("车号"+carNumber+"不是7位数!");
             }
-            that.tableData.push(temp);
-          }
-          else
-            console.log("车号"+carNumber+"不符合格式");
         });
         };
         reader.readAsBinaryString(file.raw); //以二进制方式读取
-    },
-    indexOfMaterial(materialName,materials){
-      materials.forEach((item,index)=>{
-        console.log(item);
-          if(item.materialName==materialName)
-            return index;
-      });
-      return -1;
-    },
-    indexOfSupplier(supplierName,suppliers){
-      suppliers.forEach((item,index)=>{
-          if(item.supplierName==supplierName)
-            return index;
-      });
-      return -1;
-    },
+    }
   },
 };
 </script>

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

@@ -1,40 +1,6 @@
 <template>
   <div class="wagonLoadbu">
     <page-title>返回</page-title>
-    <!-- <div class="top">
-      <div class="text">物资：</div>
-      <el-select
-        v-model="materialId"
-        filterable
-        remote
-        reserve-keyword
-        placeholder="选择物资名"
-        :remote-method="searchMaterialName"
-        @change="searchSupplierName();getPurchaseOrderNo()">
-        <el-option
-          v-for="item in materialNames"
-          :key="item.materialId"
-          :label="item.materialName"
-          :value="item.materialId">
-        </el-option>
-      </el-select>
-      <div class="text">发货单位：</div>
-       <el-select
-        v-model="supplierId"
-        filterable
-        remote
-        reserve-keyword
-        placeholder="选择发货单位"
-        :remote-method="searchSupplierName"
-        @change="getPurchaseOrderNo();supplierIdChange()">
-        <el-option
-          v-for="item in supplierNames"
-          :key="item.supplierId"
-          :label="item.supplierName"
-          :value="item.supplierId">
-        </el-option>
-      </el-select>
-    </div> -->
      <div class="purchaseOrder_table">
       <div class="search" style="display:flex">
         <div style="margin-top: 18px;margin-left:10px">
@@ -68,14 +34,13 @@
       @click="makeSure" 
       style="margin: 10px;">确认配单
       </el-button>
-
       </div>
+      <!-- 采购订单号 -->
       <dilTable
         v-bind.sync="purchaseOption"
         @radio-change="orderChange"
       ></dilTable>
     </div>
-
     <!-- <div class="material form">
       <span class="text">物资：</span>
       <el-input v-model="materialName" disabled> </el-input>
@@ -97,12 +62,12 @@
       <el-input v-model="remark" @blur="onBlur" > </el-input>
       <span class="span"></span>
     </div>
-
     <div class="form">
       <div class="form_box">  
       <dil-form :formId="361" v-model="form1" ref="from1"></dil-form>
       </div>
     </div> -->
+    <!--待补录表格-->
     <div class="wagonLoadbu_table">
       <dilTable
         v-bind.sync="option"
@@ -111,10 +76,8 @@
       ></dilTable>
     </div>
     
-    
-   
     <!-- 模态窗口 -->
-    <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
+    <!-- <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
       <el-input
         placeholder="请输入内容"
         v-model="inputText"
@@ -147,7 +110,7 @@
           @radio-change="currentRadioChange3"
         ></dilTable>
       </div>
-    </el-drawer>
+    </el-drawer> -->
   </div>
 </template>
 
@@ -239,8 +202,7 @@ export default {
       else{
         let map = {
           resultIdList:this.selecTionListMap,
-          purchaseOrderId:this.purchaseOrderId,
-          insertUpdateRemark: this.form1.insertUpdateRemark
+          purchaseOrderId:this.purchaseOrderId
         }
         let that=this;
         this.axios.post('/api/v1/tms/updateDomesticLoadResult',map).then((res)=>{
@@ -250,8 +212,7 @@ export default {
               message: "配单成功!",
               type: "success",
             });
-            that.purchaseOption.requestUrl += "&i="+new Date();
-            console.log();
+            that.tableChange();
             // this.cancel();//不退出
           }
         })
@@ -272,7 +233,6 @@ export default {
       this.supplierId=selection.supplierId;
       this.supplierName=selection.supplierName;
       this.remark=selection.resultForeignShipName;
-      this.tableChange();
     },
     //表格选中
     selectionChange(selection) {
@@ -287,13 +247,11 @@ export default {
       this.materialName = selection.materialName;
       this.materialId = selection.materialId;
       this.getPurchaseOrderNo();
-      this.tableChange();
     },
     currentRadioChange2(selection) {
       this.supplierName = selection.supplierName;
       this.supplierId = selection.supplierId;
       this.getPurchaseOrderNo();
-      this.tableChange();
     },
     currentRadioChange3(selection) {
       this.unloadPointId = selection.warehouseId;
@@ -342,6 +300,7 @@ export default {
       }
     },
     searchOrder(){
+      //查询订单
       if((typeof this.search1)!="undefined" && (typeof this.search2)!='undefined'){
         let requestUrl="/api/v1/tms/findPurchaseOrderList?apiId=81";
         if(this.search1!=null){
@@ -398,13 +357,8 @@ export default {
       });
     },
     tableChange(){
-      //重新查询配单车辆
-      if(typeof this.materialId !='undefined'&& this.materialId!=null && typeof this.supplierId!='undefined' && this.supplierId!=null){
-         this.option.requestUrl=
-          "/api/v1/tms/getTmstrainWagonLoad?apiId=209&resultType=10&materialId="
-          +this.materialId+"&supplierId="
-          +this.supplierId;
-      }
+      //刷新表格
+      this.option.requestUrl="/api/v1/tms/getTmstrainWagonLoad?apiId=209&resultType=10&i="+new Date();
     }
   },
 };