zx il y a 2 ans
Parent
commit
2c08f0c87f

+ 1 - 1
build/utils.js

@@ -21,7 +21,7 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 
 
 // let devModules = ["index", "appoint", "statisticalReport"];
-let devModules = ["all"];
+let devModules = ["index","appoint","TMS","WMS"];
 // let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS','WMS']
 // let devModules = ["index", "ADMINISTRATORS", "RMS"];
 // let devModules = ["index", "inward", "statisticalReport"];

+ 1 - 1
config/index.js

@@ -66,7 +66,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
     // target: "http://localhost:8080",
-    target: "http://172.16.33.166:80",
+    target: "http://localhost:8080",
     // target: "http://192.168.1.105:8080",
     // target: "http://192.168.1.106:8080",
     ws: true,

+ 1 - 1
src/views/TMS/components/importedShip/addShipmentInstructions.vue

@@ -28,7 +28,7 @@
       :visible.sync="drawer"
       :direction="direction"
       :before-close="handleClose"
-      size="35%"
+      size="45%"
     >
       <el-input
         placeholder="请输入内容"

+ 17 - 2
src/views/TMS/components/importedShip/updateShipmentInstructions.vue

@@ -5,6 +5,14 @@
     <div class="form">
       <div class="form_box">
         <dil-form :formId="114" v-model="form1" ref="from1"></dil-form>
+        <span> 二程:海港-江港</span>
+        <el-switch
+          v-model="status"
+          active-color="#13ce66"
+          inactive-color="#909399"
+          @change="changeStatus"
+        >
+        </el-switch>
       </div>
     </div>
     <!-- 确定和取消 -->
@@ -23,6 +31,7 @@ export default {
   data() {
     return {
       form1: {},
+      status: false,
     };
   },
   mounted() {
@@ -45,6 +54,11 @@ export default {
     handleCheckedCitiesChange(value) {
       console.log(value);
     },
+    
+    //改变二程状态
+    changeStatus() {
+      console.log(this.status);
+    },
     // 返回
     onClickCancel() {
       this.$router.go(-1);
@@ -58,6 +72,7 @@ export default {
         shipmentInstructionsId: this.$route.params.instructionsId,
         instructionsTotalTonnage: this.form1.instructionsTotalTonnage,
         instructionTime: sjTime(this.form1.instructionTime),
+        statu: this.status,
       };
 
       //判断合计吨位是否为数字
@@ -72,10 +87,10 @@ export default {
         }
       }
       var val = this.value;
-    
+
       if (
         omsshipShipmentInstructions.instructionsTotalTonnage == null ||
-        omsshipShipmentInstructions.instructionTime==null
+        omsshipShipmentInstructions.instructionTime == null
       )
         this.$message.error("存在空值!");
       else if (!isNumber(val)) this.$message.warning("合计吨位请填写数字");

+ 2 - 2
src/views/appoint/components/ship/attorneytext.vue

@@ -24,7 +24,7 @@
           >
             <tr>
               <td style="width: 100%; font-family: FangSong">
-                {{ item.portAllName }}:
+                {{ item.pickupAllName }}:
               </td>
             </tr>
           </table>
@@ -53,7 +53,7 @@
                   item.purchaseOrderMaterialNum
                 }}
                 湿吨(如遇该轮最后一批提货请清场),物流流向:{{
-                  item.portName
+                  item.portName1
                 }}。望贵公司予以支持为盼。
               </td>
             </tr>