zhouzh 3 년 전
부모
커밋
aee95e27a2

+ 5 - 3
build/utils.js

@@ -16,9 +16,11 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 
- // let devModules = ['index','WMS','inward','statisticalReport']
-  let devModules = ['all']
- // let devModules = ['index','WMS','inward','SporadicManage','TMS','sale']
+
+
+ let devModules = ['all']
+// let devModules = ['index','inward','statisticalReport']
+//  let devModules = ['index','WMS','sale','TMS','inward','SporadicManage']
 // let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
 // let devModules = ['index','RMS'];
 

+ 8 - 2
src/views/TMS/components/importedFuel/transportReserveRanAdd.vue

@@ -2,7 +2,13 @@
   <!-- 新增运输作业页面 -->
   <div id="contractDetails">
     <page-title>运输预约</page-title>
-    <div class="orderType from">
+    <div style="text-align: center; font-size:20px; font-weight:bold; margin-top:15px; color:green">
+      <span>燃料预约界面</span>
+    </div>
+    <div style="text-align: center; font-size:15px; margin-top:15px; color:red">
+      <span>温馨提示:卸货到达钢请选择一厂,达兴二焦化请选择二厂<br>如选错厂区将会影响车辆上秤计量!!!</span>
+    </div>
+    <div class="orderType from" style="margin-top:15px">
       <span class="text">卸货厂区:</span>
       <el-select
         class="select"
@@ -49,7 +55,7 @@
     </div>
     <div class="remark from">
       <span class="text">船名:</span>
-      <el-input class="input" v-model="remark" @blur="onBlur"> </el-input>
+      <el-input class="input" v-model="remark" @blur="onBlur" :disabled="true"> </el-input>
       <span class="span"></span>
     </div>
     <div class="forwardingUnit from">

+ 4 - 1
src/views/TMS/components/importedIngredients/transportReserveFuAddIngredients.vue

@@ -2,6 +2,9 @@
   <!-- 新增运输作业页面 -->
   <div id="contractDetails">
     <page-title>运输预约</page-title>
+     <div style="text-align: center; font-size:20px; font-weight:bold; margin-top:15px; color:green">
+      <span>辅料预约界面</span>
+    </div>
     <div class="supplieUnit">
       <el-form
         :inline="true"
@@ -31,7 +34,7 @@
     </div>
     <div class="remark from">
       <span class="text">船名:</span>
-      <el-input class="input" v-model="remark" @blur="onBlur"> </el-input>
+      <el-input class="input" v-model="remark" @blur="onBlur" :disabled="true"> </el-input>
       <span class="span"></span>
     </div>
     <div class="forwardingUnit from">

+ 12 - 6
src/views/TMS/components/purchaseChemicalMaterials/transportationReservationAdd.vue

@@ -2,8 +2,14 @@
   <!-- 新增运输作业页面 -->
   <div id="contractDetails">
     <page-title>运输预约</page-title>
-    <div class="orderType from">
-      <span class="text">订单类别:</span>
+    <div style="text-align: center; font-size:20px; font-weight:bold; margin-top:15px; color:green">
+      <span>设备材料预约界面</span>
+    </div>
+    <div style="text-align: center; font-size:15px; margin-top:15px; color:red">
+      <span>温馨提示:卸货到达钢请选择一厂,达兴二焦化、化工厂请选择二厂<br>如选错厂区将会影响车辆上秤计量!!!</span>
+    </div>
+    <div class="orderType from" style="margin-top: 15px;">
+      <span class="text">卸货厂区:</span>
       <el-select
         class="select"
         v-model="orderType"
@@ -48,7 +54,7 @@
     </div>
     <div class="remark from">
       <span class="text">船名:</span>
-      <el-input class="input" v-model="remark" @blur="onBlur"> </el-input>
+      <el-input class="input" v-model="remark" @blur="onBlur" :disabled="true"> </el-input>
       <span class="span"></span>
     </div>
     <div class="forwardingUnit from">
@@ -243,11 +249,11 @@ export default {
       orderTypeList: [
         {
           value: 17,
-          label: "老厂区",
+          label: "一厂",
         },
         {
           value: 18,
-          label: "新厂区",
+          label: "二厂",
         },
       ],
       stateSupplier:null,
@@ -477,7 +483,7 @@ export default {
       } else if (num == 5) {
         this.line.requestUrl ="/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date() + "&con=化工材料";
       }else if (num == 6) {
-        this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&i=" + new Date();
+        this.purchaseOrder.requestUrl =  "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId="+this.supplierId+"&i="+new Date();
       }
       
     },