tijai

build/utils.js

@@ -19,7 +19,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 
 
 //  let devModules = ['all']
-let devModules = ['index','inward','SporadicManage']
+let devModules = ['index','inward','SporadicManage','RMS']
 // let devModules = ['index','inward']
 // let devModules = ['index','SporadicManage','RMS','statisticalReport']
 // let devModules = ['index','inward','statisticalReport']

config/index.js

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

src/views/RMS/components/addCapacity.vue

@@ -145,18 +145,18 @@ export default {
       var result = false;
       if (vehicleNumber.length == 7) {
         var express =
-          /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/;
+          /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使场领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/;
         result = express.test(vehicleNumber);
       }
       return result;
     },
     makeSure() {
       this.addLoading = true;
-      if (!this.isVehicleNumber(this.form1.capacityNumber.toUpperCase())) {
-        this.$message.error("车牌号格式不正确");
-        this.addLoading = false;
-        return;
-      }
+      // if (!this.isVehicleNumber(this.form1.capacityNumber.toUpperCase())) {
+      //   this.$message.error("车牌号格式不正确");
+      //   this.addLoading = false;
+      //   return;
+      // }
       if (this.carrierIds == null) {
         this.$message.error("请选择承运商");
         this.addLoading = false;
@@ -173,6 +173,7 @@ export default {
         carrierId: this.carrierIds,
         state: this.state,
       };
+      console.log(RmsCapacity)
       if (
         RmsCapacity.capacityNumber == null ||
         RmsCapacity.capacityCorlor == null ||

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

@@ -98,6 +98,22 @@
         :inline="true"
         class="demo-form-inline"
         label-width="80px"
+      >
+        <el-form-item label="趟次">
+         <el-input
+          class="inline-input"
+          v-model="materialTimes"
+          placeholder="趟次"
+          :trigger-on-focus="false"
+          @input="onInputTimes()"
+        >
+        </el-input>
+        </el-form-item>
+        </el-form>
+        <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
       >
         <el-form-item label="选择物资">      
         </el-form-item>
@@ -282,6 +298,10 @@ export default {
         {
           value:14,
           label:'中转'
+        },
+        {
+          value:19,
+          label:'退货'
         }
       ],
       orderType:null,
@@ -426,6 +446,9 @@ export default {
       if(this.orderType == 14){
         this.inputLine = "零星中转"
       }
+      if(this.orderType == 19){
+        this.inputLine = "零星退货"
+      }
     },
     drawTable(){
       this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395" +"&test=" + new Date()
@@ -517,7 +540,8 @@ export default {
             materialSpecification:e.materialSpecification,
             materialName:e.materialName,
             materialCode:e.materialCode,
-            materialId:e.materialId
+            materialId:e.materialId,
+            materialPriority:1
           }
           this.tableData.push(addmap)
         })
@@ -609,10 +633,13 @@ export default {
           orderType:this.orderType,
           receiveId: this.consigneeId,
           userId:getCookie("orgCode"),
+          orderTime:this.materialTimes,
           mapList: this.tableData,
           isMoreTrips:Number(this.isMoreTrips)
           
         };
+        console.log(amsOrder)
+        debugger
         this.axios.post("/api/v1/ams/addSporadicOrders", amsOrder).then((res) => {
           if (res.data.code == "200") {
             this.onClickCancel()

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

@@ -1,10 +1,11 @@
 // 制定计划
 <template>
   <div class="inwardPlan">
+    
     <div class="sache">
       <el-input placeholder="请输入内容" v-model="inputText" clearable>
       </el-input>
-      <el-button type="primary" class="btn">
+      <el-button type="primary" class="btn" @click="bofang">
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-badge :value="addPlanCount" class="item" v-if="activeName == 'second'">
@@ -17,7 +18,13 @@
         <i class="el-icon-plus"></i>制定计划
       </el-button>
       </el-badge>
-      
+      <!-- <audio 
+       id="audioId"
+       controls="controls"
+       preload="auto"
+       loop = "isloop"
+       src="/static/music/y682.mp3">
+      </audio> -->
       <el-button
         type="primary"
         class="btn"
@@ -26,6 +33,7 @@
       >
         <i class="el-icon-download"></i>下发
       </el-button>
+      
     </div>
     <template>
       <div>
@@ -219,6 +227,7 @@ export default {
     };
   },
   created(){
+      
       this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=257&planStatus=0",
       this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1",
       this.fourth.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4"  
@@ -240,6 +249,16 @@ export default {
     start(){
         this.timer = setInterval(this.getAddPlan,60000)
     },
+    bofang(){
+      let obj = new Object();
+      obj = document.getElementById('audioId');
+      console.log(obj)
+      if(obj.paused){
+        obj.play()
+      }else{
+        obj.paused
+      }
+    },
     getRequirementMaterial(row) {
       // 记录重复点击次数
       if (this.oldRow === row) {