修改

build/utils.js

@@ -17,11 +17,11 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 
  // let devModules = ['index','WMS']
-//  let devModules = ['all']
+ let devModules = ['all']
 // let devModules = ['index','statisticalReport','appoint','sale','RMS','TMS'];
 // let devModules = ['index','appoint','WMS'];
 // let devModules = ['index','inward','SporadicManage']
-let devModules = ['index','sale','RMS']
+// let devModules = ['index','sale','RMS']
 // let devModules = ['index','SporadicManage','RMS','statisticalReport']
 // let devModules = ['index','inward','statisticalReport']
 //  let devModules = ['index','WMS','sale','TMS','inward','SporadicManage']

config/index.js

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

src/views/TMS/components/domesticMine/approveWagonPlease.vue

@@ -27,7 +27,6 @@
   </div>
 </template>
 
-
 <script>
 export default {
   name: "wagonPlease",

src/views/TMS/components/domesticMine/approveWagonPleaseAdd.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 新增批车作业页面 -->
-  <div id="contractDetails">
+  <div id="trainTransport">
     <page-title>返回</page-title>
     <div>
       <dilTable
@@ -19,7 +19,7 @@
         </div>
       </div>
     </div>
-    <div class="button-box">
+    <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
@@ -52,6 +52,11 @@ export default {
   mounted() {
     // this.unit();
   },
+  created() {
+    this.form1 = {
+      arrivalStationId: 1,
+    };
+  },
   methods: {
     handleCheckedCitiesChange(value) {
       console.log(value);
@@ -104,39 +109,37 @@ export default {
 </script>
 <style lang="scss">
 // @import "@/styles/appoint/contract/ContractInsert.scss";
-#contractDetails {
+#trainTransport {
   .form {
     display: flex;
     .form_box {
-      width: 240px;
+      width: 340px;
       margin-left: 35%;
       margin-top: 30px;
-      margin-right: 22px;
-     
-    }
-    .el-form-item {
-      .el-form-item__label {
-        display: inline-block;
-        width: 70px !important;
-        padding-right: 200px;
-        margin-bottom: 0px;
-      }
-      .el-form-item__content {
-        .el-select {
-          width: 230px;
-        }
-        .el-input {
-          width: 160px;
-          margin-left: -300px;
-          padding-bottom: 0%;
+      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-top: 50px;
-    margin-left: 550px;
+  .button_box {
+    margin-left: 42%;
+    margin-top: 55px;
   }
 }
 </style>

src/views/TMS/components/domesticMine/approveWagonPleaseEdit.vue

@@ -1,35 +1,27 @@
 <template>
   <!-- 修改批车作业页面 -->
-  <div id="contractDetails">
-    <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">
-          <dil-form :formId="140" v-model="form1"></dil-form>
-        </div>
+  <div class="contractDetails">
+    <div class="form">
+      <div class="form_box">
+        <dil-form :formId="140" v-model="form1"></dil-form>
       </div>
-    </div>  
- 
-    <div class="button-box">
+    </div>
+    <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
   </div>
 </template>
-
 <script>
 import PageTitle from "@/components/Page/Title";
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
-    data(){
-          return {
-          form1: {},
-        }
-    },
+  data() {
+    return {
+      form1: {},
+    };
+  },
   mounted() {
     this.information();
   },
@@ -37,14 +29,16 @@ export default {
     information() {
       //编辑批车作业 渲染数据
       this.axios
-        .post("/api/v1/tms/getApproveWagonPleaseById/" + this.$route.params.resultId)
+        .post(
+          "/api/v1/tms/getApproveWagonPleaseById/" + this.$route.params.resultId
+        )
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
           });
         });
     },
-     // 返回
+    // 返回
     onClickCancel() {
       this.$router.go(-1);
     },
@@ -52,12 +46,12 @@ export default {
     onClickConfirm() {
       let approveWagonPlease = {
         resultId: this.$route.params.resultId,
-        resultApproveDate: this.form1.resultApproveDate,
+        resultApproveDate: sjTime(this.form1.resultApproveDate),
         resultApproveNumber: this.form1.resultApproveNumber,
         shipperId: this.form1.shipperId,
         resultCategory: this.form1.resultCategory,
         sendStationId: this.form1.sendStationId,
-        toTheStationId: this.form1.toTheStationId
+        toTheStationId: this.form1.toTheStationId,
       };
       function isNumber() {
         var value = approveWagonPlease.resultApproveNumber;
@@ -71,29 +65,61 @@ export default {
       }
       var val = this.value;
       if (
-        approveWagonPlease.resultApproveDate==null||
-        approveWagonPlease.resultApproveNumber==null||
-        approveWagonPlease.shipperId==null||
-        approveWagonPlease.resultCategory==null||
-        approveWagonPlease.sendStationId==null||
-        approveWagonPlease.toTheStationId==null
-      ) this.$message.error("存在空值！");
+        approveWagonPlease.resultApproveDate == null ||
+        approveWagonPlease.resultApproveNumber == null ||
+        approveWagonPlease.shipperId == null ||
+        approveWagonPlease.resultCategory == null ||
+        approveWagonPlease.sendStationId == null ||
+        approveWagonPlease.toTheStationId == null
+      )
+        this.$message.error("存在空值！");
+      else if (!isNumber(val)) this.$message.error("请车数必须是数字！");
       else
-      if (!isNumber(val)) this.$message.error("请车数必须是数字！");
-      else
-      this.axios
-        .post("/api/v1/tms/updateApproveWagonPlease", approveWagonPlease)
-        .then(() => {
-          this.$message({
-            type: "success",  
-            message: "修改成功!",
+        this.axios
+          .post("/api/v1/tms/updateApproveWagonPlease", approveWagonPlease)
+          .then(() => {
+            this.$message({
+              type: "success",
+              message: "修改成功!",
+            });
+            this.$router.go(-1);
           });
-          this.$router.go(-1);
-        });
     },
   },
 };
 </script>
-<style lang="scss" scoped>
-// @import "@/styles/appoint/contract/ContractInsert.scss";
+<style lang="scss">
+.contractDetails {
+  .form {
+    display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 35%;
+      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;
+  }
+}
 </style>

src/views/TMS/components/domesticMine/entrustMine.vue

@@ -2,7 +2,13 @@
   <!-- 计量委托 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input
+        class="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>
@@ -36,7 +42,12 @@ export default {
         "/api/v1/tms/getLoadResultToSendMC?apiId=209&resultType=1&con=" +
         this.input;
     },
+
     btnclick() {
+      let map = {
+        resultIdList: this.selectionListMap,
+      };
+      console.log("map" + map);
       if (this.selectionListMap.length == 0) {
         this.$message({
           message: "请勾选要发送计量委托的实绩!",
@@ -44,9 +55,7 @@ export default {
         });
       } else {
         this.axios
-          .post("/api/v1/tms/batchSendMeasureCommission", {
-            resultIdList: this.selectionListMap,
-          })
+          .post("/api/v1/tms/batchSendMeasureCommission", map)
           .then((res) => {
             if (res.data.code == "200") {
               this.$message({
@@ -61,9 +70,8 @@ export default {
     },
     selectionChange(selection) {
       this.selectionListMap = [];
-      selection.forEach((element) => {
-        this.selectionListMap.push(element.resultId);
-      });
+      console.log(selection);
+      this.selectionListMap = selection;
     },
   },
 };
@@ -71,19 +79,19 @@ export default {
 <style lang='scss'>
 .homeworkPath {
   .top {
-     padding: 1.25rem 0.375rem;
-     .el-input{
-       width: 20%;
-       margin-right: 40rpx;
-     }
-     .btn{
-       width: 5.5%;
-       margin-left: 0.25rem;
-     }
-     .btn1{
-       width: 7%;
-       margin-left: 00.375rem;
-     }
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 40rpx;
+    }
+    .btn {
+      width: 5.5%;
+      margin-left: 0.25rem;
+    }
+    .btn1 {
+      width: 7%;
+      margin-left: 00.375rem;
+    }
   }
 }
 </style>

src/views/TMS/components/domesticMine/wagonLoadAdd.vue

@@ -52,8 +52,8 @@
       </el-input>
       <span class="span"></span>
     </div>
-    <div class="purchaseOrder from" v-if="matching">
-      <span class="text">采购订单号：</span>
+    <div class="purchaseOrder from" v-if="matching" style="width:330px;margin-left:544px;padding-bottom:15px">
+      <span class="text" style="width:140px">采购订单号：</span>
       <el-input
         v-model="purchaseOrderNo"
         placeholder="请选择物资和发货单位"
@@ -64,11 +64,12 @@
     </div>
 
     <div class="form">
-      <div class="form-box" style="margin-right: 10rem">
+      <div class="form_box" style="margin-right: 10rem">
         <dil-form :formId="364" v-model="form1" ref="from1"></dil-form>
       </div>
     </div>
-    <div class="button-box">
+
+    <div class="button_box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
@@ -163,7 +164,7 @@ export default {
   },
   created() {
     this.form1 = {
-      arrivalStationId: 2,
+      arrivalStationId: 1,
     };
   },
   methods: {
@@ -493,6 +494,10 @@ export default {
       width: 1.875rem;
       height: 1.25rem;
     }
+    .el-input{
+      width: 13.5rem;
+      margin-right: 2.375rem;
+    }
   }
   .purchaseOrder {
     display: flex;
@@ -505,12 +510,39 @@ export default {
     }
   }
   .form {
-    margin-top: 1.25rem;
-    display: flex;
-    justify-content: center;
-    padding-left: 9.375rem;
+   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 {
+  .button_box {
     display: flex;
     justify-content: center;
     padding-top: 30px;

src/views/TMS/components/domesticMine/wagonLoadEdit.vue

@@ -1,20 +1,12 @@
 <template>
   <!-- 修改车皮装车实绩 -->
-  <div id="contractDetails">
-    <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="contractDetails"> 
+      <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>
@@ -23,7 +15,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
  data(){
@@ -42,9 +34,6 @@ 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);
           });
         });
     },
@@ -99,5 +88,37 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-// @import "@/styles/TMS/addwagonload.scss";
+.contractDetails {
+  .form {
+    display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 35%;
+      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;
+  }
+}
 </style>

src/views/TMS/components/domesticMine/wagonLoadbu.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="wagonLoadbu">
-    <el-divider content-position="left">选择需要补录的装车信息</el-divider>
+    <span> </span>
     <div class="wagonLoadbu_table">
       <dilTable
         v-bind.sync="option"
@@ -20,13 +20,15 @@
       <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
     </div>
     <div class="remark from">
-      <span class="text">船名(备注)：</span>
-      <el-input v-model="remark" @blur="onBlur"> </el-input>
+      <span class="text" style="margin-left: 60px; ">船名(备注)：</span>
+      <el-input v-model="remark" @blur="onBlur" style="width: 230px; margin-right:140px"> </el-input>
       <span class="span"></span>
     </div>
 
     <div class="form">
+      <div class="form_box">
       <dil-form :formId="361" v-model="form1" ref="from1"></dil-form>
+      </div>
     </div>
     <div class="button_box">
       <el-button @click="cancel">取消</el-button>
@@ -226,14 +228,79 @@ export default {
 
 <style lang="scss">
 .wagonLoadbu {
+  color: #606266;
+  font-size: 0.675rem;
+  font-weight: 500;
+  .cp {
+    width: 49%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding-top: 0.625rem;
+    padding-bottom: 0.625rem;
+    margin-left: 364px;
+    .cp_title {
+      .cp_top {
+        width: 3.125rem;
+        padding-right: 1.55rem;
+      }
+    }
+  }
+  .cpList {
+    display: flex;
+    justify-content: center;
+    width: 100%;
+    height: 10rem;
+    .list {
+      width: 45%;
+      border: #000 0.0625rem solid;
+      padding: 0.625rem;
+      display: flex;
+      flex-wrap: wrap;
+      .cpList1 {
+        background-color: #c9c7c7;
+        height: 1.875rem;
+        margin-right: 0.5rem;
+        padding: 0.625rem;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        position: relative;
+        .itu {
+          position: absolute;
+          top: -0.125rem;
+          right: 0.0625rem;
+          width: 0.625rem;
+          height: 0.625rem;
+        }
+      }
+    }
+  }
+  .matching {
+    width: 100%;
+    height: 3.125rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .text {
+      width: 8.75rem;
+    }
+    .span {
+      display: inline-block;
+      width: 310px;
+      height: 0.0625rem;
+    }
+  }
   .material {
     display: flex;
     justify-content: center;
     align-items: center;
     height: 3.75rem;
+    margin-left: 27rem;
+    width: 20rem;
     .text {
       text-align: right;
-      width: 150px;
+      width: 8.125rem;
     }
   }
   .forwardingUnit {
@@ -241,9 +308,11 @@ export default {
     justify-content: center;
     align-items: center;
     height: 3.75rem;
+    margin-left: 27rem;
+    width: 20rem;
     .text {
       text-align: right;
-      width: 9.375rem;
+      width: 8.125rem;
     }
   }
   .remark {
@@ -253,20 +322,64 @@ export default {
     height: 3.75rem;
     .text {
       text-align: right;
-      width: 80px;
+      width: 5.625rem;
+    }
+    .span {
+      display: inline-block;
+      width: 1.875rem;
+      height: 1.25rem;
+    }
+    .el-input{
+      width: 13.5rem;
+      margin-right: 2.375rem;
     }
   }
-  .form {
-    margin-top: 1.25rem;
+  .purchaseOrder {
     display: flex;
     justify-content: center;
+    align-items: center;
+    .span {
+      display: inline-block;
+      width: 1.875rem;
+      height: 0.0625rem;
+    }
+  }
+  .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: 240px;  
+                  margin-top: 0.03rem;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
   }
   .button_box {
-    width: 100%;
-    height: 6.25rem;
     display: flex;
     justify-content: center;
-    align-items: center;
+    padding-top: 30px;
   }
 }
 </style>

src/views/TMS/components/domesticMine/wagonPleaseAdd.vue

@@ -1,44 +1,45 @@
 <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
+    <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 +60,11 @@ export default {
   mounted() {
     // this.unit();
   },
+  created() {
+    this.form1 = {
+      toTheStationId: 1,
+    };
+  },
   methods: {
     handleCheckedCitiesChange(value) {
       console.log(value);
@@ -174,19 +180,19 @@ export default {
               margin-top: 55px;
             }
           }
-          .fromOther {
-            margin-left: 34.5%;
-            width: 50%;
-            .inline-input {
-              width: 300px;
-              .button_box {
-                margin-left: 45%;
-              }
-            }
-          }
         }
       }
     }
   }
 }
+.trainTransport {
+  margin-left: 41.25%;
+  width: 50%;
+  .inline-input {
+    width: 300px;
+    .button_box {
+      margin-left: 52.5%;
+    }
+  }
+}
 </style>

src/views/TMS/components/domesticMine/wagonPleaseEdit.vue

@@ -1,29 +1,20 @@
 <template>
   <!-- 修改请车作业页面 -->
-  <div id="contractDetails">
-    <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="contractDetails">
+      <div class="form">
+        <div class="form_box">
           <dil-form :formId="117" v-model="form1"></dil-form>
         </div>
-      </div>
     </div>  
- 
-    <div class="button-box">
+    <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
   </div>
 </template>
-
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
     data(){
@@ -95,6 +86,39 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-// @import "@/styles/appoint/contract/ContractInsert.scss";
+<style lang="scss">
+.contractDetails {
+  .form {
+    display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 35%;
+      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;
+  }
+}
+</style>
 </style>

src/views/TMS/components/domesticMine/wagonPleaseMine.vue

@@ -115,7 +115,6 @@ export default {
             type: "success",
             message: "下发成功!",
           });
-          // console.log(this.arr[0].text_prop);
           this.axios
             .post("/api/v1/tms/sendWagonPlease/" + resultId)
             .then(() => {

src/views/TMS/components/domesticMine/wagonUnLoadAdd.vue

@@ -46,6 +46,11 @@ export default {
     };
   },
   mounted() {},
+  // created() {
+  //   this.form1 = {
+  //     arrivalStationId: 1,
+  //   };
+  // },
   methods: {
     selectionChange(selection) {
       this.list = [];
@@ -73,7 +78,7 @@ export default {
         tmstrainWagonUnloadResult.resultArrivalDate == null ||
         tmstrainWagonUnloadResult.resultUnloadTime == null
       )
-       this.$message.error("存在空值！");
+        this.$message.error("存在空值！");
       else
         this.axios
           .post(
@@ -87,11 +92,9 @@ export default {
                 message: "新增成功!",
               });
               this.$router.go(-1);
-            }else{
-               ({ type: "failed", message: "新增失败!" });
+            } else {
+              ({ type: "failed", message: "新增失败!" });
             }
-
-            
           });
     },
     // 取消
@@ -126,14 +129,9 @@ export default {
               }
               .el-textarea {
                 .el-textarea__inner {
-                  display: block;
-                  resize: vertical;
-                  padding: 5px 13px;
-                  line-height: 1.5;
-                  width: 70%;
-                  border-radius: 4px;
-                  margin-left: 56px;
-                  margin-top: -25px;
+                  width: 230px;
+                  // margin-left: 45px;
+                  margin-top: 0.03rem;
                 }
               }
             }

src/views/TMS/components/domesticMine/wagonUnLoadEdit.vue

@@ -1,29 +1,20 @@
 <template>
   <!-- 修改车皮装车实绩 -->
   <div id="contractDetails">
-    <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="118" 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>
   </div>
 </template>
-
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
  data(){
@@ -96,4 +87,37 @@ export default {
 </script>
 <style lang="scss" scoped>
 // @import "@/styles/TMS/addwagonload.scss";
+.contractDetails {
+  .form {
+    display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 35%;
+      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;
+  }
+}
 </style>

src/views/TMS/components/domesticMine/wagonUnLoadMine.vue

@@ -17,12 +17,12 @@
           <el-button @click="click(scope.row.unloadingId)" type="text" size="small"
             >修改</el-button
           >
-          <el-button
+          <!-- <el-button
             type="text"
             size="small"
             @click="deleteclick(scope.row.unloadingId)"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </dilTable>
@@ -52,34 +52,34 @@ export default {
     click(unloadingId) {
       this.$router.push("/wagonUnLoadEdit/" + unloadingId);
     },
-    deleteclick(scope) {
-      let unloadingId = scope;
-      this.$confirm("是否删除", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      })
-        .then(() => {
-          this.$message({
-            type: "success",
-            message: "删除成功!",
-          });
-          this.axios
-            .post(
-             "/api/v1/tms/deleteTmstrainWagonUnLoadResultByUnLoadingId?unloadingId=" + unloadingId
-            )
-            .then(() => {
-               this.$router.go(0);
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消删除!",
-          });
-        });
-    },
+    // deleteclick(scope) {
+    //   let unloadingId = scope;
+    //   this.$confirm("是否删除", "提示", {
+    //     confirmButtonText: "确定",
+    //     cancelButtonText: "取消",
+    //     type: "warning",
+    //     center: true,
+    //   })
+    //     .then(() => {
+    //       this.$message({
+    //         type: "success",
+    //         message: "删除成功!",
+    //       });
+    //       this.axios
+    //         .post(
+    //          "/api/v1/tms/deleteTmstrainWagonUnLoadResultByUnLoadingId?unloadingId=" + unloadingId
+    //         )
+    //         .then(() => {
+    //            this.$router.go(0);
+    //         });
+    //     })
+    //     .catch(() => {
+    //       this.$message({
+    //         type: "info",
+    //         message: "取消删除!",
+    //       });
+    //     });
+    // },
   },
 };
 </script>

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

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

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

@@ -44,17 +44,21 @@ export default {
   },
   mounted() {},
   methods: {
+
     selectionChange(selection) {
       this.list = [];
       selection.forEach((e) => {
         this.list.push({
           resultWagonNo: e.resultWagonNo,
           resultId: e.resultId,
+          purchaseOrderId: e.purchaseOrderId,
+          unloadingPointId: e.unloadingPointId,
         });
       });
     },
     // 确定
     makeSure() {
+      console.log("wagonNoList" +this.list)
       let tmstrainWagonUnloadResult = {
         wagonNoList: this.list,
         resultArrivalDate: sjTime(this.form1.resultArrivalDate),
@@ -115,14 +119,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">
-          <dil-form :formId="254" v-model="form1"></dil-form>
-        </div>
+
+    <div class="form">
+      <div class="form_box">
+        <dil-form :formId="254" v-model="form1"></dil-form>
       </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>
@@ -23,28 +18,37 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
- data(){
-     return {
+  data() {
+    return {
       form1: {},
-  }
- },
+    };
+  },
+  created() {
+    this.form1 = {
+      arrivalStationId: 1,
+    };
+  },
   mounted() {
     this.information();
   },
   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 +65,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,
@@ -72,31 +76,77 @@ export default {
         capacityId: this.form1.capacityId,
         resultMaterialNumber: this.form1.resultMaterialNumber,
         resultMaterialTheoryweight: this.form1.resultMaterialTheoryweight,
-        resultRemarks: this.form1.resultRemarks
+        resultRemarks: this.form1.resultRemarks,
       };
       if (
-      tmstrainLoadingResult.resultWagonNo==null||
-      tmstrainLoadingResult.resultBillableTonnage==null||
-      tmstrainLoadingResult.resultClass==null||
-      tmstrainLoadingResult.sendStationId==null||
-      tmstrainLoadingResult.arrivalStationId==null||
-      tmstrainLoadingResult.resultLoadingDate==null||
-      tmstrainLoadingResult.batchId==null
-      ) this.$message.error("必填项存在空值！");
+        tmstrainLoadingResult.resultWagonNo == null ||
+        tmstrainLoadingResult.resultBillableTonnage == null ||
+        tmstrainLoadingResult.resultClass == null ||
+        tmstrainLoadingResult.sendStationId == null ||
+        tmstrainLoadingResult.arrivalStationId == null ||
+        tmstrainLoadingResult.resultLoadingDate == null ||
+        tmstrainLoadingResult.batchId == null
+      )
+        this.$message.error("必填项存在空值！");
       else
-      this.axios
-        .post("/api/v1/tms/upadteTmstrainLoadingResultByResultId",tmstrainLoadingResult)
-        .then(() => {
-          this.$message({
-            type: "success",  
-            message: "修改成功!",
+        this.axios
+          .post(
+            "/api/v1/tms/upadteTmstrainLoadingResultByResultId",
+            tmstrainLoadingResult
+          )
+          .then(() => {
+            this.$message({
+              type: "success",
+              message: "修改成功!",
+            });
+            this.$router.go(-1);
           });
-          this.$router.go(-1);
-        });
     },
   },
 };
 </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/editWagonUnLoadEmergency.vue

@@ -1,20 +1,14 @@
 <template>
   <!-- 修改车皮装车实绩 -->
-  <div id="contractDetails">
-    <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="contractDetails">
+      <div class="form">
+        <div class="form_box">
           <dil-form :formId="118" 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>
@@ -23,7 +17,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
  data(){
@@ -31,6 +25,7 @@ export default {
       form1: {},
   }
  },
+
   mounted() {
     this.information();
   },
@@ -42,9 +37,6 @@ export default {
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
-            console.log(e);
-            console.log(this.form1);
-            console.log(this.$route.params.unloadingId);
           });
         });
     },
@@ -96,5 +88,47 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-// @import "@/styles/TMS/addwagonload.scss";
+.contractDetails {
+  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/entrustEmergency.vue

@@ -2,7 +2,13 @@
   <!-- 计量委托 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input
+        class="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>
@@ -14,8 +20,6 @@
     </dilTable>
   </div>
 </template>
-
-
 <script>
 export default {
   data() {
@@ -27,29 +31,44 @@ export default {
         // 控制显示多选列
         selectionType: "select",
       },
-      selectionListMap:[],
+      selectionListMap: [],
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getTmstrainWagonLoad?apiId=58&resultType=1&con="+this.input;
+      this.option.requestUrl =
+        "/api/v1/tms/getTmstrainWagonLoad?apiId=58&resultType=1&con=" +
+        this.input;
     },
     btnclick() {
-      this.axios.post('/api/v1/tms/batchSendMeasureCommission',{resultIdList:this.selectionListMap}).then((res)=>{
-        if(res.data.code == "200"){
-          this.$message({
-            type: "success",
-            message: "发送成功",
+      let map = {
+        resultIdList: this.selectionListMap,
+      };
+      if (this.selectionListMap.length == 0) {
+        this.$message({
+          message: "请勾选要发送计量委托的实绩!",
+          type: "warning",
+        });
+      } else {
+        this.axios
+          .post("/api/v1/tms/batchSendMeasureCommission", map)
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$message({
+                type: "success",
+                message: "发送成功",
+              });
+              this.option.requestUrl =
+                "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=2&i=" +
+                new Date();
+            }
           });
-          this.option.requestUrl = "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=2&i=" + new Date();
-        }
-      })
+      }
     },
     selectionChange(selection) {
-      this.selectionListMap = [] 
-      selection.forEach(element => {
-        this.selectionListMap.push(element.resultId);
-      });
+      this.selectionListMap = [];
+      console.log(selection);
+      this.selectionListMap = selection;
     },
   },
 };
@@ -57,19 +76,19 @@ export default {
 <style lang='scss'>
 .homeworkPath {
   .top {
-     padding: 1.25rem 0.375rem;
-     .el-input{
-       width: 20%;
-       margin-right: 40rpx;
-     }
-     .btn{
-       width: 5.5%;
-       margin-left: 0.25rem;
-     }
-     .btn1{
-       width: 7%;
-       margin-left: 00.375rem;
-     }
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 40rpx;
+    }
+    .btn {
+      width: 5.5%;
+      margin-left: 0.25rem;
+    }
+    .btn1 {
+      width: 7%;
+      margin-left: 00.375rem;
+    }
   }
 }
 </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

@@ -20,12 +20,12 @@
             size="small"
             >修改</el-button
           >
-          <el-button
+          <!-- <el-button
             type="text"
             size="small"
             @click="deleteclick(scope.row.unloadingId)"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </dilTable>
@@ -56,42 +56,50 @@ export default {
         this.$router.push("/editWagonUnLoadEmergency/" + unloadingId);
       }
     },
-    deleteclick(scope) {
-      let unloadingId = scope;
-      this.$confirm("是否删除", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      })
-        .then(() => {
-          this.$message({
-            type: "success",
-            message: "删除成功!",
-          });
-          this.axios
-            .post(
-              "/api/v1/tms/deleteTmstrainWagonUnLoadResultByUnLoadingId?unloadingId=" +
-                unloadingId
-            )
-            .then(() => {
-              this.$router.go(0);
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消删除!",
-          });
-        });
-    },
+    // deleteclick(scope) {
+    //   let unloadingId = scope;
+    //   this.$confirm("是否删除", "提示", {
+    //     confirmButtonText: "确定",
+    //     cancelButtonText: "取消",
+    //     type: "warning",
+    //     center: true,
+    //   })
+    //     .then(() => {
+    //       this.$message({
+    //         type: "success",
+    //         message: "删除成功!",
+    //       });
+    //       this.axios
+    //         .post(
+    //           "/api/v1/tms/deleteTmstrainWagonUnLoadResultByUnLoadingId?unloadingId=" +
+    //             unloadingId
+    //         )
+    //         .then(() => {
+    //           this.$router.go(0);
+    //         });
+    //     })
+    //     .catch(() => {
+    //       this.$message({
+    //         type: "info",
+    //         message: "取消删除!",
+    //       });
+    //     });
+    // },
   },
 };
 </script>
 <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:1,
     }
   },
   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,11 @@ export default {
   mounted() {
     // this.unit();
   },
+  created() {
+    this.form1 = {
+      toTheStationId: 1,
+    };
+  },
   methods: {
     handleCheckedCitiesChange(value) {
       console.log(value);
@@ -174,19 +175,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;
               }
             }
+            }
+          
           }
         }
       }

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

@@ -2,7 +2,13 @@
   <!-- 发送计量委托界面 -->
   <div class="trainTransport">
     <div class="top">
-      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input
+        class="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>
@@ -27,29 +33,46 @@ export default {
         // 控制显示多选列
         selectionType: "select",
       },
-      selectionListMap:[],
+      selectionListMap: [],
+      resultIdList: [],
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=1&con="+this.input;
+      this.option.requestUrl =
+        "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=1&con=" +
+        this.input;
     },
     btnclick() {
-      this.axios.post('/api/v1/tms/batchSendMeasureCommission',{resultIdList:this.selectionListMap}).then((res)=>{
-        if(res.data.code == "200"){
-          this.$message({
-            type: "success",
-            message: "发送成功",
+      let map = {
+        resultIdList: this.selectionListMap,
+      };
+      if (this.selectionListMap.length == 0) {
+        this.$message({
+          message: "请勾选要发送计量委托的实绩!",
+          type: "warning",
+        });
+      } else {
+        this.axios
+          .post("/api/v1/tms/batchSendMeasureCommission", map)
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$message({
+                type: "success",
+                message: "发送成功",
+              });
+              this.option.requestUrl =
+                "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=1" +
+                "&i=" +
+                new Date();
+            }
           });
-          this.option.requestUrl = "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=1"+"&i=" + new Date();
-        }
-      })
+      }
     },
     selectionChange(selection) {
-      this.selectionListMap = [] 
-      selection.forEach(element => {
-        this.selectionListMap.push(element.resultId);
-      });
+      this.selectionListMap = [];
+      console.log(selection);
+      this.selectionListMap = selection;
     },
   },
 };

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

@@ -20,12 +20,12 @@
             size="small"
             >修改</el-button
           >
-          <el-button
+          <!-- <el-button
             type="text"
             size="small"
             @click="deleteclick(scope.row.unloadingId)"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </dilTable>
@@ -55,35 +55,35 @@ export default {
     click(unloadingId) {
       this.$router.push("/editWagonUnLoad/" + unloadingId);
     },
-    deleteclick(scope) {
-      let unloadingId = scope;
-      this.$confirm("是否删除", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      })
-        .then(() => {
-          this.$message({
-            type: "success",
-            message: "删除成功!",
-          });
-          this.axios
-            .post(
-              "/api/v1/tms/deleteTmstrainWagonUnLoadResultByUnLoadingId?unloadingId=" +
-                unloadingId
-            )
-            .then(() => {
-              this.$router.go(0);
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消删除!",
-          });
-        });
-    },
+    // deleteclick(scope) {
+    //   let unloadingId = scope;
+    //   this.$confirm("是否删除", "提示", {
+    //     confirmButtonText: "确定",
+    //     cancelButtonText: "取消",
+    //     type: "warning",
+    //     center: true,
+    //   })
+    //     .then(() => {
+    //       this.$message({
+    //         type: "success",
+    //         message: "删除成功!",
+    //       });
+    //       this.axios
+    //         .post(
+    //           "/api/v1/tms/deleteTmstrainWagonUnLoadResultByUnLoadingId?unloadingId=" +
+    //             unloadingId
+    //         )
+    //         .then(() => {
+    //           this.$router.go(0);
+    //         });
+    //     })
+    //     .catch(() => {
+    //       this.$message({
+    //         type: "info",
+    //         message: "取消删除!",
+    //       });
+    //     });
+    // },
   },
 };
 </script>

src/views/TMS/components/importedShip/updateShipmentInstructions.vue

@@ -56,7 +56,7 @@ export default {
     onClickConfirm() {
       let omsshipShipmentInstructions = {
         shipmentInstructionsId:this.$route.params.instructionsId,
-        batchId: this.form1.batchId,
+        // batchId: this.form1.batchId,
         instructionsTotalTonnage: this.form1.instructionsTotalTonnage,
         instructionTime: sjTime(
           this.form1.instructionTime

src/views/appoint/components/ship/modifyDeliveryAttroney.vue

@@ -4,7 +4,7 @@
     <page-title>返回</page-title>
     <div class="form">
       <div class="form_box">
-          <dil-form :formId="228" v-model="form1"></dil-form>
+          <dil-form :formId="113" v-model="form1"></dil-form>
       </div>        
     </div>
     <!-- 确定和取消 -->
@@ -17,6 +17,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
+import { sjTime } from '../../../ADMINISTRATORS/app';
 export default {
   components: { PageTitle },
     data(){
@@ -44,33 +45,17 @@ export default {
     },
      // 确认
     onClickConfirm() {
-      let mes = {
-        resultId: this.$route.params.resultId,
-        batchId: this.form1.batchId,
+      let AmsshipDeliveryAttorney = {
+        resultId: this.$route.params.attorneyId,
         portId: this.form1.portId,
-        resultMaterialNumber: this.form1.resultMaterialNumber
+        attorneyContactTelephone:this.form1.attorneyContactTelephone,
+        attorenyPickupIdcard:this.form1.attorenyPickupIdcard,
+        attorneyPickupContactPerson:this.form1.attorneyPickupContactPerson,
+        downSwimPortId:this.form1.downSwimPortId,
+        attorneyTime:sjTime(this.form1.attorneyTime),
       };
-      function isNumber() {
-        var value = mes.resultMaterialNumber;
-        //验证是否为数字
-        var patrn = /^(-)?\d+(\.\d+)?$/;
-        if (patrn.exec(value) == null || value == "") {
-          return false;
-        } else {
-          return true;
-        }
-      }
-      var val = this.value;
-      if (
-        mes.batchId==null||
-        mes.portId==null||
-        mes.resultMaterialNumber==null
-      ) this.$message.error("存在空值！");
-      else
-      if (!isNumber(val)) this.$message.error("物资件数必须是数字");
-      else
       this.axios
-        .post("/api/v1/tms/editDeliveryAttroney" , AmsshipDeliveryAttorney
+        .post("/api/v1/tms/editDeliveryAttroney",AmsshipDeliveryAttorney
         )
         .then(() => {
           this.$message({

src/views/appoint/components/ship/modifyDeliveryNotice.vue

@@ -17,6 +17,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
     data(){
@@ -36,7 +37,7 @@ export default {
           res.data.data.forEach((e) => {
             this.form1 = e;
             console.log(e);
-            console.log(this.form1);
+            console.log("aaa" +this.form1);
             console.log(this.$route.params.pathId);
           });
           
@@ -88,7 +89,7 @@ export default {
       // else
       // if (!isNumber(val)) this.$message.error("联系电话必须是数字！");
       // else
-      
+      console.log("AmsshipDeliveryNotice",AmsshipDeliveryNotice);
       this.axios
         .post("/api/v1/tms/editDeliveryNotice" ,AmsshipDeliveryNotice
         )

src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -333,6 +333,12 @@ export default {
         }, {
           value: '烧结矿',
           label: '烧结矿'
+        },{
+          value: '打堆、装车',
+          label: '打堆、装车'
+        },{
+          value: '回收废旧物资',
+          label: '回收废旧物资'
         }],
         installremark: '',
       options: [],