tij

build/utils.js

@@ -18,7 +18,9 @@ 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 = ['all'];
+// let devModules = ['index','inward','TMS','RMS']
+let devModules = ['index','SporadicManage']
 // let devModules = ['index','SporadicManage'];
 // let devModules = ['index','systemConfig', 'formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'custom'];
 // let devModules = ['index', 'systemConfig','formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'btnControll'];

config/index.js

@@ -63,14 +63,14 @@ let proxyTable = {
   //   }
   // },
   "/api/v1": {
-    target: "http://192.168.1.115:8080",
+    target: "http://192.168.1.104:8081",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
     }
   },
   "/views/api/v1": {
-    target: "http://192.168.1.115:8080",
+    target: "http://192.168.1.104:8081",
     ws: true,
     pathRewrite: {
       "^/views/api/v1": "/api/v1"

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

@@ -3,9 +3,6 @@
   <!-- 新增运输作业页面 -->
   <div id="contractDetails">
     <page-title>运输预约</page-title>
-    <div class="main">
-      <el-divider content-position="left">新增运输预约</el-divider>
-    </div>
     <div class="forwardingUnit from">
       <span class="text">发货单位：</span>
       <el-input v-model="supplierName" disabled> </el-input>
@@ -119,6 +116,13 @@
                   v-model.number="scope.row.orderMaterialWeight"
                 ></el-input>
               </template>
+              <!-- 装卸货优先级 -->
+               <template v-if="item.prop == 'materialPriority'">
+                <el-input
+                  class="textinput"
+                  v-model.number="scope.row.materialPriority"
+                ></el-input>
+              </template>
             </template>
             <template v-else>
               <span>{{ scope.row[item.prop] }}</span>
@@ -214,6 +218,7 @@
 </template>
 <script>
 import PageTitle from "@/components/Page/Title";
+
 export default {
   components: { PageTitle },
   data() {
@@ -237,9 +242,9 @@ export default {
       lineId: null,
       // 件数与重量的开关
       value: false,
-    //   物资模态框开关
+      //物资模态框开关
       table: false,
-      // 物资表格表头
+      //物资表格表头
       tableTop: [
         {
           prop: "materialCode",
@@ -261,6 +266,11 @@ export default {
           label: "件数",
           slot: true,
         },
+          {
+          prop: "materialPriority",
+          label: "装卸货优先级",
+          slot: true,
+        },
       ],
       // 收货单位ID
       receiveId:null,
@@ -350,6 +360,7 @@ export default {
     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
         }
       })
@@ -382,6 +393,7 @@ export default {
           Specification: e.materialSpecification+e.materialModel,
           orderMaterialWeight: null,        
           materialId: e.materialId,
+          materialPriority:e.materialPriority,
         };
         this.tableData.push(addmap);
         this.selectionList1 = [];
@@ -478,10 +490,10 @@ export default {
           mapList: this.tableData,
         };
         console.log(amsOrder);
-        debugger
+      
         this.axios.post("/api/v1/ams/addSporadicOrders", amsOrder).then((res) => {
           if (res.data.code == "200") {
-            this.$router.push("/sporadicMaterial/transportAppoint");
+            this.$router.go(-1)
           }
         });
       }
@@ -509,10 +521,13 @@ export default {
 }
 .lineId {
   .text {
-    display: inline-block;
+    display: flex;
     width: 10rem;
     text-align: right;
   }
+  .el-input{
+    width: 20%;
+  }
 }
 .material {
   .text {
@@ -523,10 +538,13 @@ export default {
 }
 .orderType{
   .text{
-    display: inline-block;
+    display: flex;
     width: 5.625rem;
     text-align: right;
   }
+  .el-select{
+  width: 100%;
+}
 }
 .switch {
   width: 100%;
@@ -539,8 +557,10 @@ export default {
 .forwardingUnit {
   .text {
     display: inline-block;
-    width: 10rem;
-    text-align: right;
+    text-align: center;
+    align-items: center;
+    justify-content: center;
+    width: 20%;
   }
 }
 .truckList1 {
@@ -557,6 +577,10 @@ export default {
     }
   }
 }
+.el-input{
+  width: 20%;
+}
+
 .button_box {
   display: flex;
   justify-content: center;

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

@@ -76,22 +76,23 @@ export default {
       console.log(tab, event);
     },
      // 下发
-    sendClick() {
-      console.log(this.maplist)
-         this.axios
-            .post(
-              "/api/v1/ams/issueSporadicOrders" + this.maplist
-            )
-            .then(() => {
-              this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12"
-            })
-            .then(() => {
-             this.$message({
-            type: "success",
-            message: "下发成功!",
-          });
-        })
-    },
+        // 下发
+    sendClick() {
+      console.log(this.maplist)
+         this.axios
+            .post(
+              "/api/v1/ams/issueSporadicOrders" , this.maplist
+            )
+            .then((res) => {
+          if(res.data.code == '200'){
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12&test=1"
+            this.$message({
+            type: "success",
+            message: "下发成功!",
+          });
+          }
+        })
+    },
     // 删除
     deleteClick(scope) {
          console.log(scope.row.sporadicOrderId);
@@ -105,14 +106,13 @@ export default {
             this.$message({
             type: "success",
             message: "删除成功!",
-          });
-          
+          });         
           }  
         })
     },
     //新增
     insertClick() {
-      this.$router.push("/sporadicMaterial/addTransportAppoint");
+      this.$router.push("addSporadicTransportAppoint");
     },
     //修改
     updateClick(orderId) {
@@ -125,7 +125,11 @@ export default {
 <style lang='scss' scoped>
    .homeworkPath {
    .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input{
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

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

@@ -336,6 +336,7 @@ export default {
 </script>
 
 <style lang="scss">
+
 .transportOrder {
   .transportOrder_top {
     width: 100%;
@@ -343,6 +344,9 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
+    .el-input{
+  width: 20%;
+}
   }
   .drawer_top {
     width: 100%;

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

@@ -16,7 +16,6 @@
       <el-input v-model="supplierName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
     </div>
-
     <div class="contractTitle from">
       <dil-form :formId="219" v-model="form1"></dil-form>
     </div>

src/views/inward/app.js

@@ -19,6 +19,14 @@ import apollo from '@/config/apolloConfig.js'
 import DilCommonUI from "@/components/DilCommonUI";
 Vue.use(DilCommonUI);
 
+import 'xe-utils' 
+
+import VXETable from 'vxe-table'
+import 'vxe-table/lib/style.css'
+Vue.use(VXETable)
+Vue.prototype.$XModal = VXETable.modal
+
+
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 

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

@@ -2,12 +2,8 @@
 <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" style="margin-left: 5rem">
+      <div class="form-box">
         <dil-form :formId="305" v-model="form"></dil-form>       
       </div>
     </div>
@@ -17,7 +13,7 @@
 						</dilTable>
             </div>
 		</template>
-    <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>
@@ -26,7 +22,6 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
@@ -52,7 +47,7 @@ export default {
         carrierId: this.form.carrierId
       };
           
-      this.$axios
+      this.axios
         .post(
           "/api/v1/ams/addTruckPlan",
           plan
@@ -79,4 +74,14 @@ export default {
 </script>
 
 <style lang="scss">
+.form-box,
+.button-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/truckAppoint/addRequirement.vue

@@ -61,7 +61,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <div class="form-box" style="margin-left: 16rem">
+      <div class="form-box">
         <dil-form :formId="300" v-model="form"></dil-form>
       </div>
       <el-drawer
@@ -111,7 +111,7 @@
         </div>
       </el-drawer>
     </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>
@@ -213,7 +213,7 @@ export default {
         requirementPlatformId: this.mapList4.wareHouseId
       };
       console.log(requiremnet);
-      this.$axios
+      this.axios
         .post("/api/v1/ams/addTruckRequirement", requiremnet)
         .then((res) => {
           if (res.data.code == 200) {
@@ -236,4 +236,17 @@ export default {
 </script>
 
 <style lang="scss">
+.el-form-item{
+  display: flex;
+}
+.form-box,
+.button-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/truckAppoint/plan.vue

@@ -115,7 +115,7 @@ export default {
         center: true,
       })
         .then(() => {
-          this.$axios
+          this.axios
             .post("/api/v1/ams/receiveRequirement/" + scope.row.requirementId)
             .then((res) => {
               this.$router.go(0);
@@ -124,6 +124,7 @@ export default {
                   type: "success",
                   message: "接收成功!",
                 });
+                this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&test=1"
               } else {
                 this.$message({
                   message: "接收失败",
@@ -157,7 +158,7 @@ export default {
         center: true,
       })
         .then(() => {
-          this.$axios
+          this.axios
             .post("/api/v1/ams/finishTruckPlan/" + scope.row.planId)
             .then((res) => {
               if (res.data.code == "200") {
@@ -189,7 +190,7 @@ export default {
         center: true,
       })
         .then(() => {
-          this.$axios
+          this.axios
             .post("/api/v1/ams/deleteTruckPlan/" + scope.row.planId)
             .then((res) => {
               if (res.data.code == 200) {
@@ -222,7 +223,7 @@ export default {
         center: true,
       })
         .then(() => {
-          this.$axios
+          this.axios
             .post("/api/v1/ams/downTruckPlan", this.second.mapList)
             .then((res) => {
               if (res.data.code == 200) {
@@ -250,12 +251,13 @@ export default {
 };
 </script>
 <style lang="scss">
-.steel_inbound {
-  .sache {
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
+.steel_inbound{
+  .sache{
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
   }
-}
 </style>

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

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

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

@@ -42,7 +42,7 @@ export default {
   },
   methods: {
     information(){
-         this.$axios
+         this.axios
         .post("api/v1/ams/selectInwardPlanToUpdate/" + this.$route.params.planId)
         .then((res) => {
           res.data.data.forEach((e) => {
@@ -62,7 +62,7 @@ export default {
         carrierId: this.form.carrierId
       };
           
-      this.$axios
+      this.axios
         .post(
           "/api/v1/ams/addTruckPlan",
           plan

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

@@ -45,7 +45,7 @@
   </el-form-item>
 </el-form>
 </div>
-      <div class="form-box" style="margin-left: 16rem">
+      <div class="form-box">
         <dil-form :formId="300" v-model="form"></dil-form>
       </div>
 <el-drawer
@@ -62,7 +62,7 @@
       <div v-show="a==2"><dilTable v-bind.sync="second1" @radio-change="currentRadioChange2" ></dilTable></div>
     </el-drawer>
     </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>
@@ -71,7 +71,6 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
@@ -105,7 +104,7 @@ export default {
   methods: {
        information() {
       //编辑
-      this.$axios
+      this.axios
         .post("/api/v1/ams/selectRequirement/" + this.$route.params.requirementId)
         .then((res) => {
           console.log(res.data.data)
@@ -176,7 +175,7 @@ export default {
         requirementWorkType:this.form.requirementWorkType,
       };
       console.log(requiremnet)
-      this.$axios
+      this.axios
         .post(
           "/api/v1/ams/updateTruckRequirement",
           requiremnet
@@ -203,4 +202,17 @@ export default {
 </script>
 
 <style lang="scss">
+.el-form-item{
+  display: flex;
+}
+.form-box,
+.button-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/truckOrder/decomposePlan.vue

@@ -2,34 +2,40 @@
 <template>
 	<div id="endMaintenance">
 		<page-title>分解计划</page-title>
-    <div class="main">
-			<span class="text">待分解的计划</span>
-			<span class="a"></span>
-		</div>
     <dilTable v-bind.sync="first" >
 		</dilTable>
-    <div class="main">
-			<span class="text">选择线路</span>
-			<span class="a"></span>
-		</div>
-    <dilTable v-bind.sync="zero" @radio-change="currentRadioChange1">
-		</dilTable>
-		<div class="main">
-			<span class="text">分解</span>
-			<span class="a"></span>
-		</div>
+    <div class="lineId from">
+      <span class="text">选择路线：</span>
+      <el-input class="input" v-model="lineName" disabled> </el-input>
+      <el-button type="primary" @click="drawerLine()">浏览</el-button>
+    </div>
+     <el-drawer
+      :visible.sync="linedrawer"
+      :direction="direction"
+      :before-close="handleClose"
+      size="40%"
+    >
+      <el-input placeholder="请输入内容" v-model="input"  style="margin-top: 10px;margin-right: 10px;width:250px;" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick()"  style="margin-bottom:15px">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+   <dilTable v-bind.sync="zero" @radio-change="currentRadioChange1" ></dilTable>    
+    </el-drawer>
+     <div class="form-box">
+        <dil-form :formId="318" v-model="form"></dil-form>
+    </div>
     <el-drawer
       :visible.sync="drawer"
       :direction="direction"
       :before-close="handleClose"
       size="30%"
     >
-      <el-input placeholder="请输入内容" v-model="input"  style="margin-top:10px;margin-left:20px" clearable> </el-input>
+      <el-input placeholder="请输入内容" v-model="input"  style="margin-top:10px;margin-right: 10px;width:250px;" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick()"  style="margin-bottom:15px">
         <i class="el-icon-search"></i>查询
       </el-button>
-     <dilTable v-bind.sync="second" @radio-change="currentRadioChange" ></dilTable>    
-</el-drawer>
+   <dilTable v-bind.sync="second" @radio-change="currentRadioChange" ></dilTable>    
+    </el-drawer>
 		<div style="margin-left:0.625rem">
 			<vxe-toolbar>
 				<template #buttons>
@@ -43,11 +49,6 @@
 			@edit-closed="editClosedEvent"
       @edit-actived="editActivedEvent">
 			<vxe-table-column type="seq" width="60" title="序号"></vxe-table-column>
-			<vxe-table-column field="purchaseOrderNo" title="采购订单号" >
-        <template #edit="{ row }">
-              <vxe-input v-model="row.purchaseOrderNo" type="text" disabled></vxe-input>
-        </template>
-			</vxe-table-column>
 			<vxe-table-column field="planNo" title="运输计划号">
           <template #edit="{ row }">
               <vxe-input v-model="row.planNo" type="text" disabled></vxe-input>
@@ -66,14 +67,14 @@
       <vxe-input v-model="row.materialName" type="text" disabled></vxe-input>
       </template>
 			</vxe-table-column>
-			<vxe-table-column field="materialWeight" title="物资重量"
+			<vxe-table-column field="materialWeight" title="物资重量" width="100"
 				:edit-render="{}"
 				>
        <template #edit="{ row }">
       <vxe-input v-model="row.materialWeight" type="text"></vxe-input>
       </template>  
 			</vxe-table-column>
-      <vxe-table-column field="materialNumber" title="物资数量"
+      <vxe-table-column field="materialNumber" title="物资数量" width="100"
 				:edit-render="{}"
 				>
        <template #edit="{ row }">
@@ -94,14 +95,7 @@
             </template>
           </vxe-column>
 		</vxe-table>
-    	<div class="main">
-			<span class="text">选择订单类型</span>
-			<span class="a"></span>
-		</div>
-    <div class="form-box" style="margin-left: 16rem">
-        <dil-form :formId="318" v-model="form"></dil-form>
-      </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>
@@ -116,6 +110,8 @@ export default {
   },
   data() {
     return {
+      lineName:null,
+      linedrawer:false,
       tableData:[],
       direction: "rtl",
       input:'',
@@ -154,6 +150,9 @@ export default {
       this.selectRow = row
       console.log(row.purchaseOrderNo)
     },
+    drawerLine(){
+      this.linedrawer = true
+    },
     onclick(){
         this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&con="+this.input
     },
@@ -163,6 +162,7 @@ export default {
     },
     currentRadioChange1(selection){
       this.mapList0=selection
+      this.lineName = this.mapList0.lineName
       console.log(this.mapList0.lineId)
     },
    handleClose(done){
@@ -177,12 +177,12 @@ export default {
     },
     information() {
       //查看需求详情
-      this.$axios
+      this.axios
         .post(
           "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=1&planId=" + this.$route.params.planId
         )
         .then((res) => {
-          console.log(res)
+            console.log(res)
             const planRow = res.data.data.list
             this.purchaseOrderNo = planRow[0].purchaseOrderNo,
             this.requirementNo = planRow[0].requirementNumber,
@@ -223,7 +223,7 @@ export default {
           mapList:this.$refs.xTable.getInsertRecords()
       };
       console.log(BmsTrainFreight)
-      this.$axios
+      this.axios
         .post("/api/v1/oms/addInwardOrder", BmsTrainFreight)
         .then((res) => {
           if (res.data.code == 200) {
@@ -241,11 +241,35 @@ export default {
     // 返回
     cancel() {
       console.log(this.sumNum(this.$refs.xTable.getInsertRecords(), 'materialWeight'))
-      // this.$router.go(-1);
     },
   },
 };
 </script>
 
 <style lang="scss">
+.el-form-item{
+  display: flex;
+}
+.form-box,
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+.lineId {
+  display: flex;
+  justify-content: center;
+  .text {
+    display: inline-block;
+    width: 170px;
+    text-align: right;
+  }
+  .input{
+    width: 250px;
+    margin-right: 20px;
+  }
+}
 </style>

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

@@ -67,7 +67,7 @@ export default {
         center: true,
       })
         .then(() => {
-          this.$axios
+          this.axios
             .post("/api/v1/oms/apportionInwardOrder", this.first.mapList)
             .then((res) => {
               if (res.data.code == 200) {
@@ -99,7 +99,7 @@ export default {
         center: true,
       })
         .then(() => {
-          this.$axios
+          this.axios
             .post(
               "/api/v1/bms/deleteTrainSettlement/" + scope.row.requirementId
             )
@@ -129,12 +129,13 @@ export default {
 };
 </script>
 <style lang="scss">
-.steel_inbound {
-  .sache {
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
+.steel_inbound{
+  .sache{
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
   }
-}
 </style>

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

@@ -88,8 +88,8 @@ export default {
         center: true,
       })
         .then(() => {
-          this.$axios
-            .post("/api/v1/ams//receiveInwardPlan/" + scope.row.planId)
+          this.axios
+            .post("/api/v1/ams/receiveInwardPlan/" + scope.row.planId)
             .then((res) => {
               if (res.data.code == 200) {
                 this.$message({
@@ -126,7 +126,7 @@ export default {
         center: true,
       })
         .then(() => {
-          this.$axios
+          this.axios
             .post(
               "/api/v1/bms/deleteTrainSettlement/" + scope.row.requirementId
             )
@@ -161,7 +161,7 @@ export default {
         center: true,
       })
         .then(() => {
-          this.$axios
+          this.axios
             .post(
               "/api/v1/ams/addFixedAmsDispatchSaleOrder",
               this.first.mapList
@@ -172,7 +172,7 @@ export default {
                   type: "success",
                   message: "下发成功!",
                 });
-                this.$router.go(0);
+                this.first.requestUrl = ""
               } else {
                 this.$message({
                   message: "下发失败",
@@ -192,12 +192,13 @@ export default {
 };
 </script>
 <style lang="scss">
-.steel_inbound {
-  .sache {
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
+.steel_inbound{
+  .sache{
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
   }
-}
 </style>