修改

build/utils.js

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

config/index.js

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

src/views/TMS/components/importedFuel/transportReserveRanAdd.vue

@@ -2,13 +2,25 @@
   <!-- 新增运输作业页面 -->
   <div id="contractDetails">
     <page-title>运输预约</page-title>
-    <div style="text-align: center; font-size:20px; font-weight:bold; margin-top:15px; color:green">
+    <div
+      style="
+        text-align: center;
+        font-size: 20px;
+        font-weight: bold;
+        margin-top: 15px;
+        color: green;
+      "
+    >
       <span>燃料预约界面</span>
     </div>
-    <div style="text-align: center; font-size:15px; margin-top:15px; color:red">
-      <span>温馨提示：卸货到达钢请选择一厂，达兴二焦化请选择二厂<br>如选错厂区将会影响车辆上秤计量！！！</span>
+    <div
+      style="text-align: center; font-size: 15px; margin-top: 15px; color: red"
+    >
+      <span
+        >温馨提示：卸货到达钢请选择一厂，达兴二焦化请选择二厂<br />如选错厂区将会影响车辆上秤计量！！！</span
+      >
     </div>
-    <div class="orderType from" style="margin-top:15px">
+    <div class="orderType from" style="margin-top: 15px">
       <span class="text">卸货厂区：</span>
       <el-select
         class="select"
@@ -24,29 +36,26 @@
         >
         </el-option>
       </el-select>
+
       <span class="span"></span>
     </div>
     <div class="supplieUnit">
-      <el-form
-        :inline="true"
-        class="demo-form-inline"
-        label-width="80px"
-        >
+      <el-form :inline="true" class="demo-form-inline" label-width="80px">
         <el-form-item label="发货单位:">
-         <el-autocomplete
-          class="inline-input"
-          v-model="stateSupplier"
-          :fetch-suggestions="querySearchSupplier"
-          placeholder="请输入发货单位名称"
-          :trigger-on-focus="false"
-          @select="handleSelectSupplier"
-        >
-        <template slot-scope="{ item }">
-          <div class="name">{{ item.supplierName }}</div>
-        </template>
-        </el-autocomplete>
+          <el-autocomplete
+            class="inline-input"
+            v-model="stateSupplier"
+            :fetch-suggestions="querySearchSupplier"
+            placeholder="请输入发货单位名称"
+            :trigger-on-focus="false"
+            @select="handleSelectSupplier"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.supplierName }}</div>
+            </template>
+          </el-autocomplete>
         </el-form-item>
-     </el-form>
+      </el-form>
     </div>
     <div class="material from">
       <span class="text">物资：</span>
@@ -55,7 +64,8 @@
     </div>
     <div class="remark from">
       <span class="text">船名：</span>
-      <el-input class="input" v-model="remark" @blur="onBlur" :disabled="true"> </el-input>
+      <el-input class="input" v-model="remark" @blur="onBlur" :disabled="true">
+      </el-input>
       <span class="span"></span>
     </div>
     <div class="forwardingUnit from">
@@ -63,6 +73,11 @@
       <el-input class="input" v-model="unloadPointName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
     </div>
+    <div class="loadUnit from">
+      <span class="text">装货点：</span>
+      <el-input class="input" v-model="loadNames" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(8)">浏览</el-button>
+    </div>
     <div class="lineId from">
       <span class="text">选择路线：</span>
       <el-input class="input" v-model="lineName" disabled> </el-input>
@@ -212,6 +227,17 @@
           :drawer="drawer"
         ></dilTable>
       </div>
+      <div v-show="onDrawerNumber == 8">
+        <dilTable
+          v-bind.sync="loadName"
+          @radio-change="currentRadioChange8"
+          :isKuang="isKuang"
+          @func="func"
+          :isHeigth="isHeigth5"
+          :shiyHeigth="shiyHeigth5"
+          :drawer="drawer"
+        ></dilTable>
+      </div>
     </el-drawer>
     <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
@@ -227,30 +253,30 @@ export default {
   components: { PageTitle },
   data() {
     return {
-      stateSupplier:null,
+      stateSupplier: null,
       //限定first
-      isHeigth:true,
-      shiyHeigth:140,
+      isHeigth: true,
+      shiyHeigth: 140,
       //限定second
-      isHeigth1:true,
-      shiyHeigth1:140,
+      isHeigth1: true,
+      shiyHeigth1: 140,
       //限定third
-      isHeigth2:true,
-      shiyHeigth2:140,
+      isHeigth2: true,
+      shiyHeigth2: 140,
       //限定unloadPoint
-      isHeigth3:true,
-      shiyHeigth3:140,
+      isHeigth3: true,
+      shiyHeigth3: 140,
       //限定line
-      isHeigth4:true,
-      shiyHeigth4:140,
+      isHeigth4: true,
+      shiyHeigth4: 140,
       //限定purchaseOrder
-      isHeigth5:true,
-      shiyHeigth5:140,
+      isHeigth5: true,
+      shiyHeigth5: 140,
       isKuang: false,
       //采购订单号
       purchaseOrderNo: "",
       isMoreTrips: false,
-      purchaseOrgId:null,
+      purchaseOrgId: null,
       //订单类别
       orderTypeList: [
         {
@@ -304,8 +330,13 @@ export default {
       materialId: null,
       //是否需要打开模态窗口
       drawer: false,
+      // 装货点id
+      loadNameId: "",
+      // 装货点名称
+      loadNames: "",
       //卸货点id
       unloadPointId: "",
+
       //卸货点名称
       unloadPointName: "",
       //订单类别
@@ -340,6 +371,10 @@ export default {
         requestUrl: "",
         selectionType: "radio",
       },
+      loadName: {
+        requestUrl: "",
+        selectionType: "radio",
+      },
     };
   },
   watch: {
@@ -363,43 +398,53 @@ export default {
     onClick(index) {
       this.selectionList.splice(index, 1);
     },
-    onchange(){
-      if(this.orderType == 6){
-        this.purchaseOrgId = 1
-      }else{
-        this.purchaseOrgId = 2
+    onchange() {
+      if (this.orderType == 6) {
+        this.purchaseOrgId = 1;
+      } else {
+        this.purchaseOrgId = 2;
       }
-      this.getPurchaseOrderNo()
+      this.getPurchaseOrderNo();
     },
     onBlur() {
       this.getPurchaseOrderNo();
     },
     //发货单位弹出层
-    handleSelectSupplier(item){
-      this.supplierId = item.supplierId
-      this.supplierName = item.supplierName
+    handleSelectSupplier(item) {
+      this.supplierId = item.supplierId;
+      this.supplierName = item.supplierName;
     },
     //以下是发货单位边输边查搜索
     querySearchSupplier(queryString, cb) {
-        this.axios.post('/api/v1/uc/getSupplierMesByLike?index='+this.stateSupplier).then((res)=>{
-        if(res.data.code == "200"){    
-          var restaurantsSupplier = res.data.data
-          var results = queryString ? restaurantsSupplier.filter(this.createFilterSupplier(queryString)) :restaurantsSupplier;
-          // 调用 callback 返回建议列表的数据
-          cb(results);
-        }
-      })  
-      },
+      this.axios
+        .post("/api/v1/uc/getSupplierMesByLike?index=" + this.stateSupplier)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterSupplier(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
     createFilterSupplier(queryString) {
-        return (restaurantsSupplier) => {
-          return (restaurantsSupplier.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
-        };
-      },
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.value
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
     getPurchaseOrderNo() {
       let map = {
         materialId: this.materialId,
         supplierId: this.supplierId,
-        purchaseOrgId: this.purchaseOrgId
+        purchaseOrgId: this.purchaseOrgId,
       };
       if (this.remark) {
         map.remark = this.remark;
@@ -414,9 +459,9 @@ export default {
                 message: "没有匹配的采购订单号!",
                 type: "warning",
               });
-              this.purchaseOrderNo = null
-              this.purchaseOrderId = null
-              this.remark = null
+              this.purchaseOrderNo = null;
+              this.purchaseOrderId = null;
+              this.remark = null;
               this.form1 = [];
             } else {
               this.remark = res.data.data.remark;
@@ -435,7 +480,9 @@ export default {
         if (this.onDrawerNumber == 1) {
           this.frist.requestUrl =
             "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
-            this.input + "&supplierId=" + this.supplierId;;
+            this.input +
+            "&supplierId=" +
+            this.supplierId;
         } else if (this.onDrawerNumber == 2) {
           this.secend.requestUrl =
             "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
@@ -471,6 +518,13 @@ export default {
             this.input +
             "&i=" +
             new Date();
+        } else if (this.onDrawerNumber == 8) {
+          this.loadName.requestUrl =
+            "/api/v1/uc/getUnloadingMesByLike?apiId=374" +
+            "&con=" +
+            this.input +
+            "&i=" +
+            new Date();
         }
       } else {
         if (this.onDrawerNumber == 1) {
@@ -510,20 +564,25 @@ export default {
             this.supplierId +
             "&i=" +
             new Date();
+        } else if (this.onDrawerNumber == 8) {
+          this.loadName.requestUrl =
+            "/api/v1/uc/getUnloadingMesByLike?apiId=374&i="+ new Date();
         }
       }
     },
     ondrawer(num) {
-      if(this.supplierId == null){
-          this.$message.warning("请先填写发货单位")
-          return
+      if (this.supplierId == null) {
+        this.$message.warning("请先填写发货单位");
+        return;
       }
       this.drawer = true;
       this.onDrawerNumber = num;
       if (num == 1) {
         this.frist.requestUrl =
           "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
-          this.input + "&supplierId=" + this.supplierId;
+          this.input +
+          "&supplierId=" +
+          this.supplierId;
       } else if (num == 2) {
         this.secend.requestUrl =
           "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
@@ -548,13 +607,19 @@ export default {
           "/api/v1/uc/getUnloadingMesByLike?apiId=374&i=" + new Date();
       } else if (num == 5) {
         this.line.requestUrl =
-          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date() + "&con=" + "采购燃料";
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" +
+          new Date() +
+          "&con=" +
+          "采购燃料";
       } else if (num == 6) {
         this.purchaseOrder.requestUrl =
           "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId=" +
           this.supplierId +
           "&i=" +
           new Date();
+      } else if (num == 8) {
+        this.loadName.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=374&i=" + new Date();
       }
     },
     // 返回
@@ -564,7 +629,7 @@ export default {
     currentRadioChange1(selection) {
       this.materialName = selection.materialName;
       this.materialId = selection.materialId;
-      this.remark = null
+      this.remark = null;
       this.getPurchaseOrderNo();
     },
     currentRadioChange2(selection) {
@@ -580,6 +645,10 @@ export default {
       this.lineName = selection.lineName;
       this.lineId = selection.lineId;
     },
+    currentRadioChange8(selection) {
+      this.loadNames = selection.warehouseName;
+      this.loadNameId = selection.warehouseId;
+    },
     currentRadioChange6(selection) {
       console.log(selection);
       if (selection.orgId == 1) {
@@ -693,6 +762,7 @@ export default {
         supplierId: this.supplierId,
         purchaseOrderId: this.purchaseOrderId,
         unloadPointId: this.unloadPointId,
+        loadNameId: this.loadNameId,
         orderEntryTime: sjTime(this.form1.orderEntryTime),
         driverCapacityIdList: this.selectionList,
         orderType: this.orderType,
@@ -827,6 +897,20 @@ export default {
     margin-right: 20px;
   }
 }
+.loadUnit {
+  display: flex;
+  justify-content: center;
+  .text {
+    display: inline-block;
+    width: 170px;
+    text-align: right;
+  }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
+}
+
 .truckList1 {
   width: 100%;
   .truckList {
@@ -841,14 +925,16 @@ export default {
     }
   }
 }
-.drawer_top{
+.drawer_top {
   margin-top: -50px;
-  width: 100%;height: 60px;
+  width: 100%;
+  height: 60px;
   display: flex;
   align-items: center;
 }
-.drawer_table1{
-  width: 100%;height: 500px;
+.drawer_table1 {
+  width: 100%;
+  height: 500px;
 }
 .button_box {
   display: flex;