修改采购进口矿国产矿

config/index.js

@@ -66,14 +66,14 @@ let proxyTable = {
   "/api/v1": {
     // target: "http://192.168.1.106:8019",
     target: "http://172.16.33.166:8080",
-    // target: "http://192.168.1.114:8019",
+    // target: "http://192.168.1.103:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
     }
   },
   "/views/api/v1": {
-    target: "http:///172.16.33.166:8080",
+    target: "http://172.16.33.166:8080",
     // target: "http://192.168.1.115:8019",
     ws: true,
     pathRewrite: {

src/views/TMS/components/importedEmergency/addWagonLoadEmergency.vue

@@ -141,8 +141,8 @@ export default {
   },
   created(){
     this.form1 = {
-      sendStationId:1,
-      arrivalStationId:2,
+      sendStationId:4,
+      arrivalStationId:1,
     }
   },
   methods: {
@@ -512,7 +512,7 @@ export default {
               .el-textarea{
                 .el-textarea__inner{
                   width: 220px;
-                  margin-left: 65px;
+                
                   margin-top: 0.03rem;
                 }
               }

src/views/TMS/components/importedEmergency/addWagonUnLoadEmergency.vue

@@ -115,14 +115,14 @@ export default {
               .el-input {
                 width: 250px;
               }
-            }
-            .el-textarea {
+               .el-textarea {
                 .el-textarea__inner {
                   width: 230px;
-                  margin-left: 65px;
                   margin-top: 0.03rem;
                 }
               }
+            }
+           
           }
         }
       }

src/views/TMS/components/importedEmergency/editWagonLoadEmergency.vue

@@ -1,20 +1,15 @@
 <template>
   <!-- 修改车皮装车实绩 -->
-  <div id="contractDetails">
+  <div class="addWagonLoad">
     <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">车皮装车实绩</span>
-      <span class="a"></span>
-    </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
+
+      <div class="form">
+        <div class="form_box">
           <dil-form :formId="254" v-model="form1"></dil-form>
         </div>
-      </div>
     </div>
 
-    <div class="button-box">
+    <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
     </div>
@@ -36,15 +31,16 @@ export default {
   },
   methods: {
     information() {
+      console.log("add",this.$route.params);
       //编辑车皮装车作业
       this.axios
-        .post("/api/v1/tms/getTmstrainLoadingResultByResultId/" + this.$route.params.resultId)
+        .post("/api/v1/tms/getTmstrainLoadingResultByResultId/" + this.$route.params.unloadingId)
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
-            console.log(e);
-            console.log(this.form1);
-            console.log(this.$route.params.resultId);
+            // console.log(e);
+            // console.log(this.form1);
+            // console.log(this.$route.params.resultId);
           });
         });
     },
@@ -61,7 +57,7 @@ export default {
     // 确认
     onClickConfirm() {
       let tmstrainLoadingResult = {
-        resultId: this.$route.params.resultId,
+        resultId: this.$route.params.unloadingId,
         resultWagonNo: this.form1.resultWagonNo,
         resultBillableTonnage: this.form1.resultBillableTonnage,
         resultClass: this.form1.resultClass,
@@ -98,5 +94,47 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-// @import "@/styles/TMS/addwagonload.scss";
+.addWagonLoad {
+  color: #606266;
+  font-size: 0.675rem;
+  font-weight: 500;
+  .form {
+   display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 37%;   
+      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;
+              }
+              .el-textarea{
+                .el-textarea__inner{
+                  width: 220px;
+                  margin-top: 0.03rem;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .button_box{
+    display: flex;
+    justify-content: center;
+    padding-top: 30px;
+    margin-left: 3.5%;
+  }
+}
 </style>

src/views/TMS/components/importedEmergency/wagonLoadEmergency.vue

@@ -46,6 +46,7 @@ export default {
       } else if (num == 1) {
         this.$router.push("/addWagonLoadEmergency")
       } else if (num == 2) {
+        // console.log("resultId",resultId);
          this.$router.push("/editWagonLoadEmergency/" + resultId)
       }
     },

src/views/TMS/components/importedEmergency/wagonUnLoadEmergency.vue

@@ -91,7 +91,15 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+     padding: 1.25rem 0.375rem;
+     .el-input{
+       width: 20%;
+       margin-right: 40rpx;
+     }
+     .btn{
+       width: 5.5%;
+       margin-left: 0.25rem;
+     }
   }
 }
 </style>

src/views/TMS/components/importedMine/addApproveWagonPlease.vue

@@ -1,44 +1,7 @@
 <template>
   <!-- 新增批车作业页面 -->
   <div id="trainTransport">
-    <!-- <page-title>批车作业</page-title>
-    <div class="main">
-      <span class="text">选择已下发请车作业</span>
-      <span class="a"></span>
-    </div>
-    <div>
-      <dilTable
-        v-bind.sync="option"
-        v-model="table1"
-        @change="handleCheckedCitiesChange"
-        ref="table"
-        @radio-change="currentRadioChange"
-      >
-      </dilTable>
-    </div>
-    <div class="main">
-      <span class="text">填写批车信息</span>
-      <span class="a"></span>
-    </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="105" v-model="form1"></dil-form>
-        </div>
-      </div>
-    </div>
-    <div class="button-box">
-      <el-button @click="onClickCancel">返回</el-button>
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
-    </div> -->
     <page-title>返回</page-title>
-    <!-- 第一部分 -->
-      <div class="top">
-        <el-input placeholder="请输入内容" v-model="input" clearable> </el-input> 
-        <el-button type="primary" class="btn" @click="onclick()">
-          <i class="el-icon-search"></i>查询
-        </el-button>   
-      </div>
       <dilTable v-bind.sync="option" v-model="table1" @change="handleCheckedCitiesChange" 
       ref="table" @radio-change="currentRadioChange">
       </dilTable>
@@ -133,43 +96,40 @@ export default {
 };
 </script>
 <style lang="scss">
-.shipTransport{
-  .form{
+#trainTransport {
+  .form {
     display: flex;
-    .form_box{
-      width: 320px;
+    .form_box {
+      width: 340px;
       margin-left: 35%;
       margin-top: 30px;
       margin-right: 20px;
-      .el-form{
-        .preview-group{
-          .el-form-item{
-            .el-form-item__label{
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
               display: inline-block;
               width: 70px !important;
             }
-            .el-form-item__content{
-              .el-select{
+            .el-form-item__content {
+              .el-select {
                 width: 250px;
               }
-              .el-input{
+              .el-input {
                 width: 250px;
               }
             }
+           
           }
+      
         }
       }
     }
+     
   }
-  .top {
-    padding: 1.25rem 0.375rem;
-    .el-input {
-      width: 20%;
-      margin-right: 1.25rem;
-    }
-  }
-  .button_box{
-    margin-left: 45%;
-  }
+  .button_box {
+         margin-left: 42%;
+         margin-top: 55px;
+      }
 }
 </style>

src/views/TMS/components/importedMine/addWagonLoad.vue

@@ -141,8 +141,8 @@ export default {
   },
   created(){
     this.form1 = {
-      sendStationId:1,
-      arrivalStationId:2,
+      // sendStationId:1,
+      arrivalStationId:3,
     }
   },
   methods: {
@@ -527,8 +527,7 @@ export default {
               }
               .el-textarea{
                 .el-textarea__inner{
-                  width: 220px;
-                  margin-left: 65px;
+                  width: 225px;     
                   margin-top: 0.03rem;
                 }
               }

src/views/TMS/components/importedMine/addWagonPlease.vue

@@ -1,44 +1,40 @@
 <template>
   <!-- 新增请作业页面 -->
- <div class="contractDetails">
+  <div class="contractDetails">
     <page-title>返回</page-title>
 
     <div class="form">
       <div class="form_box">
-         <dil-form :formId="122" v-model="form1" ></dil-form>
+        <dil-form :formId="122" v-model="form1"></dil-form>
       </div>
     </div>
 
-     <div class="fromOther">
-          <el-form
-        :inline="true"
-        class="demo-form-inline"
-        label-width="80px"
-        >
+    <div class="fromOther">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:525px;">
         <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-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>
+      </el-form>
     </div>
-  <div class="trainTransport">
-    <!-- 确定和取消 -->
-    <div class="button_box">
-      <el-button @click="onClickCancel">返回</el-button>
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+    <div class="trainTransport">
+      <!-- 确定和取消 -->
+      <div class="button_box">
+        <el-button @click="onClickCancel">返回</el-button>
+        <el-button type="primary" @click="onClickConfirm">确认</el-button>
+      </div>
     </div>
   </div>
- </div>
 </template>
 
 <script>
@@ -59,6 +55,12 @@ export default {
   mounted() {
     // this.unit();
   },
+  created() {
+    this.form1 = {
+      sendStationId: 4,
+      toTheStationId: 1,
+    };
+  },
   methods: {
     handleCheckedCitiesChange(value) {
       console.log(value);
@@ -174,19 +176,16 @@ export default {
               margin-top: 55px;
             }
           }
-          .fromOther {
-            margin-left: 34.5%;
-            width: 50%;
-            .inline-input {
-              width: 300px;
-              .button_box {
-                margin-left: 45%;
-              }
-            }
-          }
         }
       }
     }
   }
+  .trainTransport{
+    .button_box{
+      margin-left: 40%;
+      margin-bottom: 2px;
+
+    }
+  }
 }
 </style>

src/views/TMS/components/importedMine/addWagonUnLoad.vue

@@ -123,15 +123,15 @@ export default {
               .el-input {
                 width: 250px;
               }
-            }
             .el-textarea {
               .el-textarea__inner {
                 width: 230px;
-                margin-left: 65px;
+                // margin-left: 45px;
                 margin-top: 0.03rem;
               }
             }
-          }
+           }
+         }
         }
       }
     }

src/views/TMS/components/importedMine/editWagonLoad.vue

@@ -32,6 +32,7 @@ export default {
   },
   methods: {
     information() {
+      console.log("resultId"+this.$route.params.resultId);
       //编辑车皮装车作业
       this.axios
         .post(
@@ -41,9 +42,9 @@ export default {
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
-            console.log(e);
-            console.log(this.form1);
-            console.log(this.$route.params.resultId);
+            // console.log(e);
+            // console.log(this.form1);
+            // console.log(this.$route.params.resultId);
           });
         });
     },

src/views/TMS/components/importedMine/editWagonUnLoad.vue

@@ -120,14 +120,14 @@ export default {
               .el-input {
                 width: 250px;
               }
-            }
-            .el-textarea {
+               .el-textarea {
               .el-textarea__inner {
                 width: 230px;
-                margin-left: 65px;
                 margin-top: 0.03rem;
               }
             }
+            }
+          
           }
         }
       }