tijiao

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','TMS','RMS']
+// let devModules = ['all'];
+let devModules = ['index','inward']
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

src/views/inward/components/inwardImport/oldAreaRailScale/addTruckLoad.vue

@@ -2,25 +2,18 @@
 <template>
   <div id="endMaintenance">
     <page-title>新增汽车装货</page-title>
-    <div class="main">
-      <span class="text">选择运输订单</span>
-      <span class="a"></span>
-    </div>
-
     <div class="tab">
       <dilTable
         v-bind.sync="option"
         @selection-change="selectionChange"
       ></dilTable>
     </div>
-
     <div>
-      <div class="form-box" style="margin-left: 5rem">
+      <div class="form-box">
         <dil-form :formId="343" v-model="form"></dil-form>
       </div>
     </div>
-
-    <div class="" style="margin-left: 40rem">
+    <div class="button-box">
       <el-button type="primary" @click="makeSure">确认新增</el-button>
       <el-button type="primary" @click="cancel">返回</el-button>
     </div>
@@ -36,7 +29,7 @@ export default {
     return {
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/cgNzLoadingResult/apiId=117&orderType=10&orderStatus=5",
+        requestUrl: "/api/v1/tms/cgNzLoadingResult?apiId=117&orderType=10&orderStatus=5",
         // 控制显示多选列
         selectionType: "select",
       },
@@ -90,4 +83,13 @@ export default {
 </script>
 
 <style lang="scss">
+.button-box,
+.form-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

src/views/inward/components/inwardImport/oldAreaRailScale/enFactory.vue

@@ -42,6 +42,9 @@ export default {
             display: flex;
             align-items: center;
             padding-left: 2.5rem;
+        .el-input{
+            width: 20%;
+        }
         }
     }
 </style>

src/views/inward/components/inwardImport/oldAreaRailScale/grossWeightResult.vue

@@ -42,6 +42,9 @@ export default {
             display: flex;
             align-items: center;
             padding-left: 2.5rem;
+        .el-input{
+            width: 20%;
+        }
         }
     }
 </style>

src/views/inward/components/inwardImport/oldAreaRailScale/outFactory.vue

@@ -42,6 +42,9 @@ export default {
             display: flex;
             align-items: center;
             padding-left: 2.5rem;
+            .el-input{
+                width: 20%;
+            }
         }
     }
 </style>

src/views/inward/components/inwardImport/oldAreaRailScale/receipt.vue

@@ -42,6 +42,10 @@ export default {
             display: flex;
             align-items: center;
             padding-left: 2.5rem;
+        .el-input{
+            width: 20%;
         }
+        }
+
     }
 </style>

src/views/inward/components/inwardImport/oldAreaRailScale/tareWeightResult.vue

@@ -42,6 +42,9 @@ export default {
             display: flex;
             align-items: center;
             padding-left: 2.5rem;
+            .el-input{
+                width: 20%;
+            }
         }
     }
 </style>

src/views/inward/components/inwardImport/oldAreaRailScale/truckLoad.vue

@@ -8,9 +8,6 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" class="btn" @click="toInsert">
-        <i class="el-icon-plus"></i>新增
-      </el-button>
     </div>
     <div class="tab">
       <dilTable v-bind.sync="option"></dilTable>
@@ -34,9 +31,6 @@ export default {
         "/api/v1/tms/getAllLoadResult?apiId=353&orderType=10&con=" +
         this.inputText;
     },
-    toInsert() {
-      this.$router.push("/oldAreaRailScaleAddTruckLoad");
-    },
   },
 };
 </script>
@@ -48,6 +42,9 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 2.5rem;
+    .el-input{
+      width:20%;
+    }
   }
 }
 </style>

src/views/inward/components/inwardImport/oldAreaRailScale/unload.vue

@@ -42,6 +42,9 @@ export default {
             display: flex;
             align-items: center;
             padding-left: 2.5rem;
+        .el-input{
+            width: 20%;
+        }
         }
     }
 </style>

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

@@ -3,6 +3,24 @@
   <div id="endMaintenance">
     <page-title>新增计划</page-title>
     <div>
+      <div class="truckList1">
+      <div class="truckList from">
+        <span class="text">选择承运商：</span>
+       <el-autocomplete
+      class="inline-input"
+      v-model="state2"
+      :fetch-suggestions="querySearch"
+      placeholder="请输入承运商名称"
+      :trigger-on-focus="false"
+      @select="handleSelect"
+      @input="oninput"
+    >
+  <template slot-scope="{ item }">
+    <div class="name">{{ item.value }}</div>
+  </template>
+    </el-autocomplete>
+      </div>
+    </div>
       <div class="form-box">
         <dil-form :formId="305" v-model="form"></dil-form>       
       </div>
@@ -26,6 +44,9 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      restaurants: [],
+      state2:null,
+      carrierId:null,
       form: {},
       first:{
         requestUrl:"/api/v1/ams/getTruckRequirementList?apiId=250&requirementStatus=2",
@@ -35,6 +56,32 @@ export default {
     };
   },
   methods: {
+    handleSelect(item){
+      this.carrierId = item.carrierId
+      item.carrierName = this.state2
+    },
+    oninput(){
+      this.axios.post('/api/v1/uc/getCarrierMesByLike?index='+this.state2).then((res)=>{
+        if(res.data.code == "200"){
+          console.log(res)
+          this.restaurants = res.data.data
+        }
+      })
+    },
+        //搜索
+    querySearch(queryString, cb) {
+        var restaurants = this.restaurants;
+        console.log(this.restaurants,"this.restaurants");
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) :restaurants;
+        // 调用 callback 返回建议列表的数据
+        console.log(results,"results");
+        cb(results);
+      },
+      createFilter(queryString) {
+        return (restaurants) => {
+          return (restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+        };
+      },
     currentRadioChange(selection){
         this.mapList = selection
     },
@@ -44,7 +91,7 @@ export default {
       let plan = {
         requirementId : this.mapList.requirementId,
         planTruckNumber: this.form.planTruckNumber,
-        carrierId: this.form.carrierId
+        carrierId: this.carrierId
       };
           
       this.axios
@@ -74,6 +121,9 @@ export default {
 </script>
 
 <style lang="scss">
+.el-form-item{
+  display: flex;
+}
 .form-box,
 .button-box
 {
@@ -84,4 +134,19 @@ export default {
   margin-top: 0.3125rem;
   margin-bottom: 1.25rem;
 }
+.truckList1 {
+  margin-left: 35%;
+  width: 100%;
+  .truckList {
+    width: 96%;
+    .text {
+      display: inline-block;
+      width: 120px;
+      text-align: right;
+    }
+    .truckBtn {
+      width: 250px;
+    }
+  }
+}
 </style>

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

@@ -2,10 +2,6 @@
 <template>
   <div id="endMaintenance">
     <page-title>新增需求</page-title>
-    <div class="main">
-      <span class="text">新增</span>
-      <span class="a"></span>
-    </div>
     <div>
       <div class="form-box f2">
         <el-form :inline="true" class="demo-form-inline">
@@ -20,7 +16,10 @@
       <div class="form-box f3">
         <el-form :inline="true" class="demo-form-inline">
           <el-form-item label="外轮船名">
-            <el-input v-model="foreignShipName" disabled> </el-input>
+            <el-input v-model="foreignShipName" disabled>浏览</el-input>
+          </el-form-item>
+           <el-form-item>
+            <el-button type="primary" disabled>船名</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -29,6 +28,9 @@
           <el-form-item label="物资名称">
             <el-input v-model="materialName" disabled> </el-input>
           </el-form-item>
+           <el-form-item>
+            <el-button type="primary" disabled>物资</el-button>
+          </el-form-item>
         </el-form>
       </div>
       <div class="form-box f5">
@@ -73,7 +75,7 @@
         <el-input
           placeholder="请输入内容"
           v-model="input"
-          style="margin-top: 10px; margin-left: 20px"
+          style="margin-top: 10px ;width:50%"
           clearable
         >
         </el-input>

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

@@ -118,13 +118,15 @@ export default {
           this.axios
             .post("/api/v1/ams/receiveRequirement/" + scope.row.requirementId)
             .then((res) => {
-              this.$router.go(0);
               if (res.data.code == 200) {
                 this.$message({
                   type: "success",
                   message: "接收成功!",
                 });
                 this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&test=1"
+                this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=257&planStatus=0&test=1"
+                this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&test=1"
+                this.fourth.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4&test=1"
               } else {
                 this.$message({
                   message: "接收失败",
@@ -231,7 +233,11 @@ export default {
                   type: "success",
                   message: "下发成功!",
                 });
-                this.$router.go(0);
+                this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&test=1"
+                this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=257&planStatus=0&test=1"
+                this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&test=1"
+                this.fourth.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4&test=1"
+                this.activeName = 'third'
               } else {
                 this.$message({
                   message: "下发失败",

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

@@ -152,6 +152,8 @@ export default {
                   message: "下发成功!",
                 });
               this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&test=1"
+              this.second.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&test=1"
+              this.activeName = 'second'
               } else {
                 this.$message({
                   message: "下发失败",

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

@@ -126,7 +126,7 @@ export default {
       carrierId:null,
       form: {},
       first:{
-       requestUrl: "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=1&planId="+this.$route.params.planId,
+       requestUrl: "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=40&planId="+this.$route.params.planId,
       },
       second:{
         requestUrl:"/api/v1/oms/getCapacityAndDriverList?apiId=246",
@@ -179,7 +179,7 @@ export default {
       //查看需求详情
       this.axios
         .post(
-          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=1&planId=" + this.$route.params.planId
+          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=40&planId=" + this.$route.params.planId
         )
         .then((res) => {
             console.log(res)

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

@@ -39,14 +39,14 @@ export default {
       first: {
         // first请求数据的地址
         requestUrl:
-          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=3&carrierId=1",
+          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=3&carrierId=40",
         selectionType: "select",
         mapList: [],
       },
       second: {
         // second请求数据的地址
         requestUrl:
-          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=1",
+          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=40&carrierId=1",
       },
       activeName: "first",
     };
@@ -75,7 +75,9 @@ export default {
                   type: "success",
                   message: "分派成功!",
                 });
-                this.$router.go(0);
+                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.activeName = 'second'
               } else {
                 this.$message({
                   message: "分派失败",

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

@@ -61,17 +61,17 @@ export default {
       first: {
         // first请求数据的地址
         requestUrl:
-          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&carrierId=1",
+          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&carrierId=40",
       },
       second: {
         // second请求数据的地址
         requestUrl:
-          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=1",
+          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=40",
       },
       third: {
         // second请求数据的地址
         requestUrl:
-          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3&carrierId=1",
+          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3&carrierId=40",
       },
       activeName: "first",
     };

src/views/inward/router/index.js

@@ -62,6 +62,10 @@ import daZhouOutFactory from '@/views/inward/components/inwardImport/daZhou/outF
 import trainLineUnload from '@/views/inward/components/inwardImport/oldAreaRailScale/trainLineUnload.vue'
 //内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--质检作业
 import oldAreaRailScaleQualityResult from '@/views/inward/components/inwardImport/oldAreaRailScale/qualityResult.vue'
+//内转进口矿-轨道衡厂内料场-质检作业
+import oldAreaEnfactoryResult from '@/views/inward/components/inwardImport/oldAreaRailScale/enFactory.vue'
+//内转老区轨道衡进厂
+import oldAreaOutfactoryResult from '@/views/inward/components/inwardImport/oldAreaRailScale/outFactory.vue'
 //内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--汽车装货
 import oldAreaRailScaleTruckLoad from '@/views/inward/components/inwardImport/oldAreaRailScale/truckLoad.vue'
 //内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--计毛作业
@@ -179,6 +183,8 @@ const constantRouterMap = [{
     {path: 'daZhouOutFactory',name: 'daZhouOutFactory',meta: {code: 'xtpzgl-yhgl'},component: daZhouOutFactory}, 
     {path: 'trainLineUnload',name: 'trainLineUnload',meta: {code: 'xtpzgl-yhgl'},component: trainLineUnload}, 
     {path: 'oldAreaRailScaleQualityResult',name: 'oldAreaRailScaleQualityResult',meta: {code: 'xtpzgl-yhgl'},component: oldAreaRailScaleQualityResult}, 
+    {path: 'oldAreaOutfactoryResult',name: 'oldAreaOutfactoryResult',meta: {code: 'xtpzgl-yhgl'},component: oldAreaOutfactoryResult},
+    {path: 'oldAreaEnfactoryResult',name: 'oldAreaEnfactoryResult',meta: {code: 'xtpzgl-yhgl'},component: oldAreaEnfactoryResult},
     {path: 'oldAreaRailScaleTruckLoad',name: 'oldAreaRailScaleTruckLoad',meta: {code: 'xtpzgl-yhgl'},component: oldAreaRailScaleTruckLoad}, 
     {path: 'oldAreaRailScaleGrossWeightResult',name: 'oldAreaRailScaleGrossWeightResult',meta: {code: 'xtpzgl-yhgl'},component: oldAreaRailScaleGrossWeightResult}, 
     {path: 'oldAreaRailScaleUnload',name: 'oldAreaRailScaleUnload',meta: {code: 'xtpzgl-yhgl'},component: oldAreaRailScaleUnload},