前端

build/utils.js

@@ -18,8 +18,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //  'logistics', 'process', '   ', 'reportform', 'basicconfig', 'system']
 // let devModules = ['index', 'qualityControl', 'standard', 'basicconfig'];
 // let devModules = ['index','devops','workFlow','systemConfig', 'microService'];
-let devModules = ['all'];
-// let devModules = ['index','inward','SporadicManage']
+// let devModules = ['all'];
+let devModules = ['index','inward','SporadicManage']
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

src/views/SporadicManage/components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue

@@ -3,11 +3,13 @@
   <!-- 新增运输作业页面 -->
   <div id="contractDetails">
     <page-title>运输预约</page-title>
-    <div class="forwardingUnit from">
+    <div class="truckList1">
+      <div class="forwardingUnit from">
       <span class="text">发货单位：</span>
       <el-input v-model="supplierName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
     </div>
+    </div>
     <div class="forwardingUnit from">
       <span class="text">收货单位：</span>
       <el-input v-model="receiveName" disabled> </el-input>
@@ -467,7 +469,7 @@ export default {
     },
     currentRadioChange5(selection) {
       console.log(selection)
-      this.lineName = selection.lineName+selection.lineDesk 
+      this.lineName = selection.lineName+'  '+selection.lineDesk 
       this.lineId = selection.lineId;
     },
     currentRadioChange3(selection) {
@@ -506,6 +508,7 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
+  width: 40%;
   margin-top: 5px;
   margin-bottom: 20px;
 }

src/views/SporadicManage/components/sporadicMaterial/transportAppoint/transportAppoint.vue

@@ -101,7 +101,8 @@ export default {
         .then((res) => {
           if (res.data.code == "200") {
             this.option1.requestUrl =
-              "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12&test=1";
+              "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12&test=1"
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=12&test=1"
             this.$message({
               type: "success",
               message: "下发成功!",
@@ -120,7 +121,9 @@ export default {
         .then((res) => {
           if (res.data.code == "200") {
             this.option1.requestUrl =
-              "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12";
+              "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12&test=1";
+            this.option2.requestUrl =
+            "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=12&test=1"
             this.$message({
               type: "success",
               message: "删除成功!",

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

@@ -139,6 +139,9 @@ export default {
   width: 100%;
   .truckList {
     width: 96%;
+    .el-input{
+      
+    }
     .text {
       display: inline-block;
       width: 120px;

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

@@ -201,20 +201,15 @@ export default {
     currentRadioChange2(selection) {
       this.mapList2 = selection
       console.log(this.mapList2)
-      var s1 = "";
-      this.truckPoint= s1.concat(this.mapList2.companyBranchName,this.mapList2.companyBranchName,this.mapList2.wareHouseName)
-       this.mapList2.companyBranchName+' '+this.mapList2.companyBranchName+this.mapList2.wareHouseName
+      
+      this.truckPoint= this.mapList2.companyBranchName+this.mapList2.companyBranchName+this.mapList2.wareHouseName
     },
     currentRadioChange3(selection) {
       this.mapList3 = selection
       this.truckPoint1 = this.mapList3.companyBranchName+this.mapList3.companyBranchName+this.mapList3.wareHouseName
     },
-    },
     // 新增
     makeSure() {
-      console.log(this.form.materialNumber)
-      console.log(this.form.materialWeight);
-      console.log(typeof(this.form.materialNumber));
       if(this.purchaseOrder == null){
           this.$alert('没有选择采购订单，请点击浏览选择采购订单')         
       }else if(this.truckPoint == null){
@@ -222,15 +217,10 @@ export default {
       }else if(this.truckPoint1 == null){
           this.$alert('没有选择卸货点，请点击浏览选择卸货点')
       }
-      // }else if(typeof(this.form.materialNumber) =="undefined"&typeof(this.form.materialWeight) =="undefined"){
-      //     this.$alert('请输入物资数量或者物资重量')
-      // }
       let requiremnet = {
         purchaseOrderId: this.mapList1.purchaseOrderId,
         requiremntUnitId: this.mapList2.wareHouseId,
-        capacityTypeId: this.form.capacityTypeId,
         materialWeight: this.form.materialWeight,
-        materialNumber: this.form.materialNumber,
         requirementEstimatedDuration: this.form.requirementEstimatedDuration,
         requirementOverlimit: this.form.requirementOverlimit,
         requirementShipperId: this.form.requirementShipperId,
@@ -259,9 +249,8 @@ export default {
     // 返回
     cancel() {
       this.$router.go(-1);
-    },
-  
-};
+    }, 
+}};
 </script>
 
 <style lang="scss">

src/views/inward/components/truckOrder/dispatchPlan.vue

@@ -76,7 +76,7 @@ export default {
                   message: "分派成功!",
                 });
                 this.first.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=3&carrierId=40&test=1"
-                this.second.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=40&carrierId=1&test=1"
+                this.second.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=40&test=1"
                 this.activeName = 'second'
               } else {
                 this.$message({