tij

build/utils.js

@@ -16,6 +16,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 let devModules = ['all'];
+// let devModules = ['index','inward','RMS','SporadicManage']
 // let devModules = ['index','appoint','TMS'];
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;

src/views/RMS/components/addCapacity.vue

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

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

@@ -18,6 +18,7 @@
     </div>
 </template>
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
     data(){
         return{

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

@@ -17,13 +17,17 @@
       <el-input class="input" v-model="unloadPointName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
     </div>
-    <div class="forwardingUnit from">
+    <div class="purchaseOrderNo from">
+      <span class="text">采购订单号：</span>
+      <el-input class="input" v-model="purchaseOrderNo" disabled> </el-input>
+    </div>
+    <div class="carrier from">
        <el-form
         :inline="true"
         class="demo-form-inline"
         label-width="80px"
       >
-        <el-form-item label="选择承运商">
+        <el-form-item label="选择承运商:">
          <el-autocomplete
           class="inline-input"
           v-model="stateCarrier"
@@ -39,9 +43,6 @@
         </el-form-item>
     </el-form>
     </div>
-    <div class="contractTitle from">
-      <dil-form :formId="219" v-model="form1"></dil-form>
-    </div>
     <!-- 模态窗口 -->
     <el-drawer :visible.sync="drawer" :direction="direction" size="40%">
       <div style="margin-bottom: 10px">
@@ -109,6 +110,8 @@ export default {
 
       // 表单
       form1: {},
+      //采购订单号
+      purchaseOrderNo:"",
       //采购订单id
       purchaseOrderId: "",
       //物资名称
@@ -191,12 +194,7 @@ export default {
               console.log();
               this.remark = res.data.data.remark;
               this.purchaseOrderId = res.data.data.purchaseOrderId;
-              this.form1 = { purchaseOrderNo: res.data.data.purchaseOrderNo };
-              if (res.data.data.receiveUnitId == 1) {
-                this.orderType = 6;
-              } else {
-                this.orderType = 7;
-              }
+              this.purchaseOrderNo = res.data.data.purchaseOrderNo ;           
             }
           } else {
             this.$message.error("请求失败");
@@ -433,18 +431,23 @@ export default {
     margin-right: 20px;
   }
 }
-.truckList1 {
-  width: 100%;
-  .truckList {
-    width: 96%;
-    .text {
-      display: inline-block;
-      width: 120px;
-      text-align: right;
-    }
-    .truckBtn {
-      width: 250px;
-    }
+.purchaseOrderNo{
+  display: flex;
+  justify-content: center;
+  .text{
+    display: inline-block;
+    width: 170px;
+    text-align: right;
+  }
+  .input {
+    width: 250px;
+    margin-right: 90px;
+  }
+}
+.carrier{
+  display: flex;
+  .el-autocomplete{
+    width: 250px;
   }
 }
 .button_box {