Your Name 3 years ago
parent
commit
4aa54a7cec

+ 2 - 2
build/utils.js

@@ -19,8 +19,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // let devModules = ['index', 'qualityControl', 'standard', 'basicconfig'];
 // let devModules = ['index','devops','workFlow','systemConfig', 'microService'];
 // let devModules = ['all'];
-// let devModules = ['index','inward','TMS','RMS']
-let devModules = ['index','SporadicManage']
+let devModules = ['index','inward',,'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'];

+ 10 - 10
config/index.js

@@ -56,26 +56,26 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://192.168.1.104:8081",
-    ws: true,
-    pathRewrite: {
-      "^/api/v1": "/api/v1"
-    }
-  },
-  "/views/api/v1": {
-    target: "http://192.168.1.104:8081",
+    target: "http://192.168.1.115:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
     }
   },
   // "/views/api/v1": {
-  //   target: "http://172.16.33.166:8080",
+  //   target: "http://192.168.1.115:8080",
   //   ws: true,
   //   pathRewrite: {
-  //     "^/views/api/v1": "/api/v1"
+  //     "^/api/v1": "/api/v1"
   //   }
   // },
+  "/views/api/v1": {
+    target: "http://172.16.33.166:8080",
+    ws: true,
+    pathRewrite: {
+      "^/views/api/v1": "/api/v1"
+    }
+  },
   '/icore.icp.web/pass/logout': {
     target: 'http://172.16.33.161:9001/logout',
     changeOrigin: true,

+ 3 - 0
src/views/RMS/components/addPortStorageYard.vue

@@ -63,6 +63,9 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
+.el-input{
+  display: flex;
+}
 .form-box,
 .button-box{
   display: flex;

+ 60 - 31
src/views/SporadicManage/components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue

@@ -509,58 +509,91 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
+  margin-top: 5px;
+  margin-bottom: 20px;
 }
 .remark {
+  display: flex;
+  justify-content: center;
   .text {
     display: inline-block;
-    width: 5.625rem;
+    width: 100px;
     text-align: right;
   }
+  .input{
+    width: 250px;
+    margin-right: 20px;
+  }
 }
 .lineId {
+  display: flex;
+  justify-content: center;
   .text {
-    display: flex;
-    width: 10rem;
+    display: inline-block;
+    width: 170px;
     text-align: right;
   }
-  .el-input{
-    width: 20%;
+  .input{
+    width: 250px;
+    margin-right: 20px;
   }
 }
 .material {
+  display: flex;
+  justify-content: center;
+  margin-top: 20px;
   .text {
     display: inline-block;
-    width: 10rem;
+    width: 170px;
     text-align: right;
   }
+  .input{
+    width: 250px;
+    margin-right: 20px;
+  }
 }
 .orderType{
-  .text{
-    display: flex;
-    width: 5.625rem;
+  display: flex;
+  justify-content: center;
+  .text {
+    display: inline-block;
+    width: 110px;
     text-align: right;
   }
-  .el-select{
-  width: 100%;
-}
+  .select{
+    width: 250px;
+  }
+  .span{
+    display: inline-block;
+    width: 30px;height: 10px;
+  }
 }
-.switch {
-  width: 100%;
-  height: 2.5rem;
+.contractTitle{
   display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  padding-right: 6.875rem;
+  justify-content: center;
+  .el-form-item{
+    display: flex;
+    justify-content: center;
+    .el-form-item__label{
+      display: flex;
+      align-items: center;
+    }
+    .el-input{
+      width: 250px;
+    }
+  }
 }
 .forwardingUnit {
+  display: flex;
+  justify-content: center;
   .text {
     display: inline-block;
-    text-align: center;
-    align-items: center;
-    justify-content: center;
-    width: 20%;
+    width: 170px;
+    text-align: right;
+  }
+  .input{
+    width: 250px;
+    margin-right: 20px;
   }
 }
 .truckList1 {
@@ -569,23 +602,19 @@ export default {
     width: 96%;
     .text {
       display: inline-block;
-      width: 9.375rem;
+      width: 120px;
       text-align: right;
     }
     .truckBtn {
-      width: 17.5rem;
+      width: 250px;
     }
   }
 }
-.el-input{
-  width: 20%;
-}
-
 .button_box {
   display: flex;
   justify-content: center;
   align-items: center;
   width: 100%;
-  height: 6.25rem;
+  height: 100px;
 }
 </style>

+ 1 - 1
src/views/inward/components/inwardImport/oldAreaRailScale/addTruckLoad.vue

@@ -66,7 +66,7 @@ export default {
         loadingId: 10002,
       };
       console.log(obj);
-      this.$axios
+      this.axios
         .post("/api/v1/tms/addDaZhouToDaGangLoadResult", obj)
         .then((res) => {
           console.log(res);

+ 2 - 0
src/views/inward/components/truckAppoint/addRequirement.vue

@@ -162,12 +162,14 @@ export default {
     ondrawer(num) {
       this.drawer = true;
       this.a = num;
+      console.log(this.a)
     },
     handleClose(done) {
       done();
     },
     onclick(a) {
       if (a == 1) {
+        console.log(a);
         this.second.requestUrl =
           "/api/v1/ams/getPurchaseIdByBatch?apiId=252&con=" + this.input;
       } else {