tijiao

build/utils.js

@@ -17,7 +17,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 let devModules = ['all']
 // let devModules = ['index','inward','SporadicManage','RMS','statisticalReport','TMS'];
-// let devModules = ['index','inward','SporadicManage']
+// let devModules = ['index','inward','TMS']
 // let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
 // let devModules = ['index','appoint','TMS'];
 if (pathSrc.indexOf('node_modules') > -1) {

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

@@ -3,12 +3,12 @@
   <div id="contractDetails">
     <page-title>运输预约</page-title>
     <div class="orderType from">
-      <span class="text">订单类别：</span>
+      <span class="text">卸货厂区：</span>
       <el-select
         class="select"
         v-model="orderType"
         placeholder="请选择"
-
+        @change="onchange()"
       >
         <el-option
           v-for="item in orderTypeList"
@@ -102,7 +102,6 @@
             </template>
           </template>
         </el-table-column>
-
         <el-table-column fixed="right" label="操作" width="100">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="onClick(scope.$index)"
@@ -228,15 +227,16 @@ export default {
       //采购订单号
       purchaseOrderNo: "",
       isMoreTrips: false,
+      purchaseOrgId:null,
       //订单类别
       orderTypeList: [
         {
           value: 6,
-          label: "老厂区",
+          label: "一厂",
         },
         {
           value: 7,
-          label: "新厂区",
+          label: "二厂",
         },
       ],
       // 线路名称
@@ -340,6 +340,14 @@ export default {
     onClick(index) {
       this.selectionList.splice(index, 1);
     },
+    onchange(){
+      if(this.orderType == 6){
+        this.purchaseOrgId = 1
+      }else{
+        this.purchaseOrgId = 2
+      }
+      this.getPurchaseOrderNo()
+    },
     onBlur() {
       this.getPurchaseOrderNo();
     },
@@ -347,12 +355,13 @@ export default {
       let map = {
         materialId: this.materialId,
         supplierId: this.supplierId,
+        purchaseOrgId: this.purchaseOrgId
       };
       if (this.remark) {
         map.remark = this.remark;
       }
       console.log(this.map);
-      if (this.materialId && this.supplierId) {
+      if (this.materialId && this.supplierId && this.purchaseOrgId) {
         this.axios.post("/api/v1/oms/selectNewOrderId", map).then((res) => {
           console.log(res);
           if (res.data.code == "200") {
@@ -361,6 +370,7 @@ export default {
                 message: "没有匹配的采购订单号!",
                 type: "warning",
               });
+              this.purchaseOrderNo = null
               this.form1 = [];
             } else {
               console.log();

src/views/inward/components/truckAppoint/addRequirement.vue

@@ -2,6 +2,18 @@
   <!-- 新增运输作业页面 -->
   <div class="addPurRequirement">
     <page-title>运输预约</page-title>
+    <div class="purchaseOrder from">
+      <span class="text">卸货厂区:</span>
+      <el-select v-model="purchaseOrgId" placeholder="请选择" @change="onchange()" ref="selectlb">
+        <el-option
+          v-for="item in purchaseOrgList"
+          :key="item.value"
+          :label="item.label" 
+          :value="item.value"
+        >
+      </el-option>
+      </el-select>
+    </div>
     <div class="material from">
       <span class="text">物资：</span>
       <el-input class="input" v-model="materialName" disabled> </el-input>
@@ -80,12 +92,6 @@
           @radio-change="currentRadioChange4"
         ></dilTable>
       </div>
-      <div v-show="a == 5">
-        <dilTable
-          v-bind.sync="line"
-          @radio-change="currentRadioChange5"
-        ></dilTable>
-      </div>
     </el-drawer>
     <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
@@ -107,7 +113,7 @@ export default {
       //车辆表格数据
       selectionList: [],
       stateCarrier:null,
-
+      purchaseOrgId:null,
       // 表单
       form1: {},
       //采购订单号
@@ -152,6 +158,16 @@ export default {
         requestUrl: "",
         selectionType: "radio",
       },
+      purchaseOrgLable:null,
+      purchaseOrgList : [
+        {
+          value:1,
+          label:'一厂'
+        },{
+          value:2,
+          label:'二厂'
+          }
+      ]
     };
   },
   watch: {
@@ -171,16 +187,28 @@ export default {
     onBlur() {
       this.getPurchaseOrderNo();
     },
+    onchange(){
+      this.getPurchaseOrderNo();
+      console.log(this.purchaseOrgId)
+      if(this.purchaseOrgId == 1) {
+        this.purchaseOrgLable = "一厂"
+        console.log(this.purchaseOrgLable)
+      }else{
+        this.purchaseOrgLable = "二厂"
+        console.log(this.purchaseOrgLable)
+      }  
+    },
     getPurchaseOrderNo() {
       let map = {
         materialId: this.materialId,
         supplierId: this.supplierId,
+        purchaseOrgId:this.purchaseOrgId
       };
       if (this.remark) {
         map.remark = this.remark;
       }
-      console.log(this.map);
-      if (this.materialId && this.supplierId) {
+      console.log(map);
+      if (this.materialId && this.supplierId && this.purchaseOrgId) {
         this.axios.post("/api/v1/oms/selectNewOrderId", map).then((res) => {
           console.log(res);
           if (res.data.code == "200") {
@@ -189,9 +217,11 @@ export default {
                 message: "没有匹配的采购订单号!",
                 type: "warning",
               });
+              this.purchaseOrderNo = null
               this.form1 = [];
             } else {
               console.log();
+              console.log(res.data.data)
               this.remark = res.data.data.remark;
               this.purchaseOrderId = res.data.data.purchaseOrderId;
               this.purchaseOrderNo = res.data.data.purchaseOrderNo ;           
@@ -274,6 +304,8 @@ export default {
     },
     // 确认
     onClickConfirm() {
+      console.log(this.purchaseOrgLable,this.materialName,this.supplierName,this.purchaseOrderNo,this.unloadPointName,this.stateCarrier)
+      debugger
       this.disabled = true
       var state = 0;
       if (