liyg 3 роки тому
батько
коміт
3f59a75129

+ 2 - 2
config/index.js

@@ -64,14 +64,14 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://localhost:8080",
+    target: "http://172.16.33.166:80",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
     }
   },
   "/views/api/v1": {
-    target: "http://localhost:8080",
+    target: "http://172.16.33.166:80",
     // target: "http://192.168.1.109:8080",
     ws: true,
     pathRewrite: {

+ 1 - 0
src/views/TMS/components/domesticMine/approveWagonPleaseAdd.vue

@@ -142,6 +142,7 @@ export default {
   .button_box {
     margin-left: 42%;
     margin-top: 55px;
+    width: 300px;
   }
 }
 </style>

+ 1 - 0
src/views/TMS/components/domesticMine/approveWagonPleaseEdit.vue

@@ -117,6 +117,7 @@ export default {
   .button_box {
     margin-left: 42%;
     margin-top: 55px;
+    width: 300px;
   }
 }
 </style>

+ 2 - 2
src/views/TMS/components/domesticMine/wagonLoadAdd.vue

@@ -635,7 +635,7 @@ export default {
   .form {
     display: flex;
     width: 340px;
-    margin-left:25rem; 
+    margin-left:37.5%; 
     margin-right: 20px;
     .form_box {
       
@@ -655,7 +655,7 @@ export default {
               }
               .el-textarea{
                 .el-textarea__inner{
-                  width: 220px;
+                  width: 250px;
                 
                   margin-top: 0.03rem;
                 }

+ 3 - 2
src/views/TMS/components/domesticMine/wagonLoadEdit.vue

@@ -8,7 +8,7 @@
         </div>
     </div>
     <div class="fromOther">
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:520px;">
+      <el-form :inline="true" class="demo-form-inline" label-width="70px" style="margin-left:35%;">
         <el-form-item label="发站:">
           <el-autocomplete
             class="inline-input"
@@ -24,7 +24,7 @@
           </el-autocomplete>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:520px;">
+      <el-form :inline="true" class="demo-form-inline" label-width="70px" style="margin-left:35%;">
         <el-form-item label="到站:">
           <el-autocomplete
             class="inline-input"
@@ -227,6 +227,7 @@ export default {
   .button_box {
     margin-left: 42%;
     margin-top: 55px;
+    width: 300px;
   }
 }
 </style>

+ 2 - 2
src/views/TMS/components/domesticMine/wagonLoadbu.vue

@@ -377,7 +377,7 @@ export default {
               }
               .el-textarea{
                 .el-textarea__inner{
-                  width: 240px;  
+                  width: 250px;  
                   margin-top: 0.03rem;
                 }
               }
@@ -390,7 +390,7 @@ export default {
   .button_box {
     display: flex;
     justify-content: center;
-    padding-top: 30px;
+    margin-top: 30px;
   }
 }
 </style>

+ 51 - 62
src/views/TMS/components/domesticMine/wagonPleaseAdd.vue

@@ -5,59 +5,57 @@
 
     <div class="form">
       <div class="form_box">
-        <dil-form :formId="122" v-model="form1"></dil-form>
+        <dil-form label-width="60px" :formId="122" v-model="form1"></dil-form>
       </div>
     </div>
 
     <div class="formOther">
       <div class="form_box">
-          <el-form
-        :inline="true"
-        class="demo-form-inline"
-        label-width="80px"
-      >
-        <el-form-item label="发货单位">
-          <el-autocomplete
-            class="inline-input"
-            v-model="stateSupplier"
-            :fetch-suggestions="querySearchSupplier"
-            placeholder="请输入发货单位名称"
-            :trigger-on-focus="false"
-            @select="handleSelectSupplier"
-          >
+        <el-form   label-width="70px"> 
+          <div class="preview-group">
+            <el-form-item label="发货单位">
+            <el-autocomplete
+              class="inline-input"
+              v-model="stateSupplier"
+              :fetch-suggestions="querySearchSupplier"
+              placeholder="请输入发货单位名称"
+              :trigger-on-focus="false"
+              @select="handleSelectSupplier"
+            >
+                <template slot-scope="{ item }">
+                  <div class="name">{{ item.supplierName }}</div>
+                </template>
+            </el-autocomplete>
+          </el-form-item>
+          <el-form-item label="发站">
+            <el-autocomplete
+              class="inline-input"
+              v-model="sendStation"
+              :fetch-suggestions="querySearchSendStation"
+              placeholder="请输入发站名称"
+              :trigger-on-focus="false"
+              @select="handleSelectSendStation"
+            >
               <template slot-scope="{ item }">
-                <div class="name">{{ item.supplierName }}</div>
+                <div class="name">{{ item.arrivalName }}</div>
               </template>
-          </el-autocomplete>
-        </el-form-item>
-        <el-form-item label="发站">
-          <el-autocomplete
-            class="inline-input"
-            v-model="sendStation"
-            :fetch-suggestions="querySearchSendStation"
-            placeholder="请输入发站名称"
-            :trigger-on-focus="false"
-            @select="handleSelectSendStation"
-          >
-            <template slot-scope="{ item }">
-              <div class="name">{{ item.arrivalName }}</div>
-            </template>
-          </el-autocomplete>
-        </el-form-item>
-        <el-form-item label="到站">
-          <el-autocomplete
-            class="inline-input"
-            v-model="toTheStation"
-            :fetch-suggestions="querySearchToTheStation"
-            placeholder="请输入到站名称"
-            :trigger-on-focus="false"
-            @select="handleSelectToTheStation"
-          >
-            <template slot-scope="{ item }">
-              <div class="name">{{ item.arrivalName }}</div>
-            </template>
-          </el-autocomplete>
-        </el-form-item>
+            </el-autocomplete>
+          </el-form-item>
+          <el-form-item label="到站">
+            <el-autocomplete
+              class="inline-input"
+              v-model="toTheStation"
+              :fetch-suggestions="querySearchToTheStation"
+              placeholder="请输入到站名称"
+              :trigger-on-focus="false"
+              @select="handleSelectToTheStation"
+            >
+              <template slot-scope="{ item }">
+                <div class="name">{{ item.arrivalName }}</div>
+              </template>
+            </el-autocomplete>
+          </el-form-item>
+        </div>
       </el-form>
     
       </div>
@@ -268,11 +266,8 @@ export default {
               width: 70px !important;
             }
             .el-form-item__content {
-              .el-select {
-                width: 250px;
-              }
-              .el-input {
-                width: 250px;
+              .inline-input{
+                width:270px;
               }
             }
             .button_box {
@@ -287,7 +282,8 @@ export default {
 }
 .trainTransport {
   margin-left: 41.25%;
-  width: 50%;
+  margin-top: 30px;
+  width: 300px;
   .inline-input {
     width: 300px;
     .button_box {
@@ -300,7 +296,7 @@ export default {
     display: flex;
     .form_box {
       width: 340px;
-      margin-left: 35%;
+      margin-left: 36%;
       margin-top: 30px;
       margin-right: 20px;
       .el-form {
@@ -311,17 +307,10 @@ export default {
               width: 70px !important;
             }
             .el-form-item__content {
-              .el-select {
-                width: 250px;
-              }
-              .el-input {
-                width: 250px;
+              .inline-input{
+                width:250px;
               }
             }
-            .button_box {
-              margin-left: 42%;
-              margin-top: 55px;
-            }
           }
         }
       }

+ 10 - 19
src/views/TMS/components/domesticMine/wagonPleaseEdit.vue

@@ -271,31 +271,22 @@ export default {
     margin-top: 55px;
   }
 }
-.formOther {
+.formOther {  
     display: flex;
     .form_box {
       width: 340px;
-      margin-left: 35%;
+      margin-left: 36%;
       margin-top: 30px;
       margin-right: 20px;
       .el-form {
-        .preview-group {
-          .el-form-item {
-            .el-form-item__label {
-              display: inline-block;
-              width: 70px !important;
-            }
-            .el-form-item__content {
-              .el-select {
-                width: 250px;
-              }
-              .el-input {
-                width: 250px;
-              }
-            }
-            .button_box {
-              margin-left: 42%;
-              margin-top: 55px;
+        .el-form-item {
+          .el-form-item__label {
+            display: inline-block;
+            width: 70px !important;
+          }
+          .el-form-item__content {
+            .inline-input{
+              width:250px;
             }
           }
         }

+ 3 - 2
src/views/TMS/components/domesticMine/wagonUnLoadAdd.vue

@@ -140,8 +140,9 @@ export default {
     }
   }
   .button-box {
-    margin-top: 50px;
-    margin-left: 600px;
+    margin-left: 42%;
+    margin-top: 25px;
+    width: 300px;
   }
 }
 </style>

+ 1 - 0
src/views/TMS/components/domesticMine/wagonUnLoadEdit.vue

@@ -127,6 +127,7 @@ export default {
   .button_box {
     margin-left: 42%;
     margin-top: 55px;
+    width: 300px;
   }
 }
 </style>