Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

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

@@ -12,9 +12,9 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" class="btn1" @click="btnclick(0)">
+      <!-- <el-button type="primary" class="btn1" @click="btnclick(0)">
         <i class="el-icon-success"></i>发送
-      </el-button>
+      </el-button> -->
     </div>
     <dilTable v-bind.sync="option" @selection-change="selectionChange">
     </dilTable>
@@ -39,7 +39,7 @@ export default {
   methods: {
     onclick() {
       this.option.requestUrl =
-        "/api/v1/tms/getLoadResultToSendMC?apiId=209&resultType=1&con=" +
+        "/api/v1/tms/getLoadResultToSendMC?apiId=209&resultType=3&con=" +
         this.input;
     },
 

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

@@ -6,6 +6,42 @@
       <el-divider content-position="left"></el-divider>
     </div>
     <div>
+      <div class="search" style="display:flex">
+        <div style="margin-top: 18px;margin-left:10px">
+          <el-label>车皮号：</el-label>
+        </div>
+        <el-input
+        placeholder="请输入"
+        v-model="wagon"
+        style="margin: 10px; width:10%"
+        clearable
+        ></el-input>
+        <div style="margin-top: 18px;margin-left:10px">
+          <el-label>订单号：</el-label>
+        </div>
+        <el-input
+        placeholder="请输入"
+        v-model="purchaseOrderNum"
+        style="margin: 10px; width:10%"
+        clearable
+        ></el-input>
+        <div style="margin-top: 18px;margin-left:10px">
+          <el-label>物资名：</el-label>
+        </div>
+        <el-input
+          placeholder="请输入"
+          v-model="materialName"
+          style="margin: 10px;width:10%"
+          clearable
+        ></el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="searchOrder()"
+        style="margin: 10px;">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      </div>
       <dilTable
         v-bind.sync="option"
         ref="table"
@@ -13,7 +49,11 @@
       >
       </dilTable>
     </div>
-    <!-- <el-divider content-position="left">车皮卸车实绩</el-divider> -->
+    <div class="forwardingUnit item">
+      <span class="text">卸货点：</span>
+      <el-input v-model="unloadPointName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(3)">浏览</el-button>
+    </div>
     <div class="form">
       <div class="form_box" style="margin-right: 10rem">
         <dil-form :formId="255" v-model="form1" ref="from1"></dil-form>
@@ -23,6 +63,28 @@
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
+    <!-- 模态窗口 -->
+    <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        style="margin-top: 0rem; margin-right: 0.1rem; width: 230px"
+        clearable
+      ></el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="searchUnLoadPoint()"
+        style="margin-bottom: 0.9375rem">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+       <div>
+        <dilTable
+          v-bind.sync="unloadPoint"
+          @radio-change="currentRadioChange"
+        ></dilTable>
+      </div>
+    </el-drawer>
   </div>
 </template>
 <script>
@@ -34,23 +96,64 @@ export default {
   data() {
     return {
       form1: {},
+      inputText:null,
+      drawer:false,
+      unloadPoint:null,
+      wagon:null,
+      purchaseOrderNum:null,
+      materialName:null,
+      direction: "rtl",
+      unloadPointId:null,
+      unloadPointName:null,
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/tms/getWagonNo/3?apiId=213",
         // 控制显示当选列
         selectionType: "select",
       },
+      unloadPoint: {
+        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        selectionType: "radio",
+      },
       value: undefined,
       list: [],
     };
   },
-  mounted() {},
+  mounted() {
+    this.form1.resultArrivalDate=new Date();
+    this.form1.resultUnloadTime=new Date();
+  },
   // created() {
   //   this.form1 = {
   //     arrivalStationId: 1,
   //   };
   // },
   methods: {
+    searchOrder(){
+      let requestUrl="/api/v1/tms/getWagonNo/3?apiId=213";
+      if(typeof this.wagon !='undefined' && this.wagon!=null){
+          requestUrl+=("&wagon="+this.wagon);
+      }
+      if(typeof this.purchaseOrderNum !='undefined' && this.purchaseOrderNum!=null){
+          requestUrl+=("&purchaseOrderNum="+this.purchaseOrderNum);
+      }
+      if(typeof this.materialName !='undefined' && this.materialName!=null){
+          requestUrl+=("&materialName="+this.materialName);
+      }
+      this.option.requestUrl=requestUrl;
+    },
+    ondrawer() {
+      this.drawer = true;
+    },
+    searchUnLoadPoint(){
+      this.unloadPoint.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.inputText;
+    },
+    currentRadioChange(selection){
+      this.unloadPointId = selection.warehouseId;
+      this.unloadPointName = selection.warehouseName;
+      console.log(this.unloadPointId);
+    },
     selectionChange(selection) {
       this.list = [];
       selection.forEach((e) => {
@@ -69,15 +172,18 @@ export default {
         resultArrivalDate: sjTime(this.form1.resultArrivalDate),
         resultUnloadTime: sjTime(this.form1.resultUnloadTime),
         resultRemark: this.form1.resultRemark,
+        unloadingPointId:this.unloadPointId,
         resultType: 3,
       };
       console.log(tmstrainWagonUnloadResult);
       if (
         tmstrainWagonUnloadResult.wagonNoList == null ||
+        tmstrainWagonUnloadResult.wagonNoList.length <=0 ||
         tmstrainWagonUnloadResult.resultArrivalDate == null ||
-        tmstrainWagonUnloadResult.resultUnloadTime == null
+        tmstrainWagonUnloadResult.resultUnloadTime == null ||
+        tmstrainWagonUnloadResult.unloadingPointId ==null
       )
-        this.$message.error("存在空值！");
+        this.$message.error("请填写完整信息！");
       else
         this.axios
           .post(
@@ -139,6 +245,19 @@ export default {
       }
     }
   }
+  .forwardingUnit {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 320px;
+    margin-left: 33%;
+    margin-top: 30px;
+    margin-right: 22px;
+    .text {
+      text-align: right;
+      width: 8.125rem;
+    }
+  }
   .button-box {
     margin-left: 42%;
     margin-top: 25px;

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

@@ -2,8 +2,43 @@
   <!-- 添加车皮卸车实绩 -->
   <div class="addWagonLoad">
     <page-title>返回</page-title>
-
     <div>
+      <div class="search" style="display:flex">
+        <div style="margin-top: 18px;margin-left:10px">
+          <el-label>车皮号：</el-label>
+        </div>
+        <el-input
+        placeholder="请输入"
+        v-model="wagon"
+        style="margin: 10px; width:10%"
+        clearable
+        ></el-input>
+        <div style="margin-top: 18px;margin-left:10px">
+          <el-label>订单号：</el-label>
+        </div>
+        <el-input
+        placeholder="请输入"
+        v-model="purchaseOrderNum"
+        style="margin: 10px; width:10%"
+        clearable
+        ></el-input>
+        <div style="margin-top: 18px;margin-left:10px">
+          <el-label>物资名：</el-label>
+        </div>
+        <el-input
+          placeholder="请输入"
+          v-model="materialName"
+          style="margin: 10px;width:10%"
+          clearable
+        ></el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="searchOrder()"
+        style="margin: 10px;">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      </div>
       <dilTable
         v-bind.sync="option"
         ref="table"
@@ -12,6 +47,35 @@
       </dilTable>
     </div>
 
+    <div class="forwardingUnit item">
+      <span class="text">卸货点：</span>
+      <el-input v-model="unloadPointName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(3)">浏览</el-button>
+    </div>
+
+    <!-- 模态窗口 -->
+    <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        style="margin-top: 0rem; margin-right: 0.1rem; width: 230px"
+        clearable
+      ></el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="searchUnLoadPoint()"
+        style="margin-bottom: 0.9375rem">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+       <div>
+        <dilTable
+          v-bind.sync="unloadPoint"
+          @radio-change="currentRadioChange"
+        ></dilTable>
+      </div>
+    </el-drawer>
+
   <div class="form">
       <div class="form_box">
          <dil-form :formId="255" v-model="form1" ></dil-form>
@@ -32,6 +96,19 @@ export default {
   data() {
     return {
       form1: {},
+      inputText:null,
+      drawer:false,
+      unloadPoint:null,
+      wagon:null,
+      purchaseOrderNum:null,
+      materialName:null,
+      direction: "rtl",
+      unloadPointId:null,
+      unloadPointName:null,
+      unloadPoint: {
+        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        selectionType: "radio",
+      },
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/tms/getWagonNo/2?apiId=213",
@@ -42,9 +119,36 @@ export default {
       list: [],
     };
   },
-  mounted() {},
+  mounted() {
+    this.form1.resultArrivalDate=new Date();
+    this.form1.resultUnloadTime=new Date();
+  },
   methods: {
-
+    searchOrder(){
+      let requestUrl="/api/v1/tms/getWagonNo/2?apiId=213";
+      if(typeof this.wagon !='undefined' && this.wagon!=null){
+          requestUrl+=("&wagon="+this.wagon);
+      }
+      if(typeof this.purchaseOrderNum !='undefined' && this.purchaseOrderNum!=null){
+          requestUrl+=("&purchaseOrderNum="+this.purchaseOrderNum);
+      }
+      if(typeof this.materialName !='undefined' && this.materialName!=null){
+          requestUrl+=("&materialName="+this.materialName);
+      }
+      this.option.requestUrl=requestUrl;
+    },
+    ondrawer() {
+      this.drawer = true;
+    },
+    searchUnLoadPoint(){
+      this.unloadPoint.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.inputText;
+    },
+    currentRadioChange(selection){
+      this.unloadPointId = selection.warehouseId;
+      this.unloadPointName = selection.warehouseName;
+      console.log(this.unloadPointId);
+    },
     selectionChange(selection) {
       this.list = [];
       selection.forEach((e) => {
@@ -64,15 +168,18 @@ export default {
         resultArrivalDate: sjTime(this.form1.resultArrivalDate),
         resultUnloadTime: sjTime(this.form1.resultUnloadTime),
         resultRemark: this.form1.resultRemark,
+        unloadingPointId:this.unloadPointId,
         resultType: 2,
       };
       console.log(tmstrainWagonUnloadResult);
       if (
         tmstrainWagonUnloadResult.wagonNoList == null ||
         tmstrainWagonUnloadResult.resultArrivalDate == null ||
-        tmstrainWagonUnloadResult.resultUnloadTime == null
+        tmstrainWagonUnloadResult.resultUnloadTime == null ||
+        tmstrainWagonUnloadResult.wagonNoList.length <=0 ||
+         tmstrainWagonUnloadResult.unloadingPointId ==null
       )
-        this.$message.error("存在空值！");
+        this.$message.error("请填写完整信息！");
       else
         this.axios
           .post(
@@ -144,4 +251,17 @@ export default {
     width: 300px;
   }
 }
+.forwardingUnit {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 320px;
+    margin-left: 33%;
+    margin-top: 30px;
+    margin-right: 22px;
+    .text {
+      text-align: right;
+      width: 8.125rem;
+    }
+  }
 </style>

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

@@ -12,9 +12,9 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" @click="btnclick(0)">
+      <!-- <el-button type="primary" @click="btnclick(0)">
         <i class="el-icon-s-promotion"></i>发送
-      </el-button>
+      </el-button> -->
     </div>
     <dilTable v-bind.sync="option" @selection-change="selectionChange">
     </dilTable>
@@ -37,7 +37,7 @@ export default {
   methods: {
     onclick() {
       this.option.requestUrl =
-        "/api/v1/tms/getTmstrainWagonLoad?apiId=58&resultType=1&con=" +
+        "/api/v1/tms/getTmstrainWagonLoad?apiId=58&resultType=2&con=" +
         this.input;
     },
     btnclick() {

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

@@ -5,6 +5,42 @@
     <page-title>返回</page-title>
 
     <div>
+      <div class="search" style="display:flex">
+        <div style="margin-top: 18px;margin-left:10px">
+          <el-label>车皮号：</el-label>
+        </div>
+        <el-input
+        placeholder="请输入"
+        v-model="wagon"
+        style="margin: 10px; width:10%"
+        clearable
+        ></el-input>
+        <div style="margin-top: 18px;margin-left:10px">
+          <el-label>订单号：</el-label>
+        </div>
+        <el-input
+        placeholder="请输入"
+        v-model="purchaseOrderNum"
+        style="margin: 10px; width:10%"
+        clearable
+        ></el-input>
+        <div style="margin-top: 18px;margin-left:10px">
+          <el-label>物资名：</el-label>
+        </div>
+        <el-input
+          placeholder="请输入"
+          v-model="materialName"
+          style="margin: 10px;width:10%"
+          clearable
+        ></el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="searchOrder()"
+        style="margin: 10px;">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      </div>
       <dilTable
         v-bind.sync="option"
         ref="table"
@@ -13,6 +49,35 @@
       </dilTable>
     </div>
 
+    <div class="forwardingUnit item">
+      <span class="text">卸货点：</span>
+      <el-input v-model="unloadPointName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(3)">浏览</el-button>
+    </div>
+
+    <!-- 模态窗口 -->
+    <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        style="margin-top: 0rem; margin-right: 0.1rem; width: 230px"
+        clearable
+      ></el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="searchUnLoadPoint()"
+        style="margin-bottom: 0.9375rem">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+       <div>
+        <dilTable
+          v-bind.sync="unloadPoint"
+          @radio-change="currentRadioChange"
+        ></dilTable>
+      </div>
+    </el-drawer>
+
     <div class="form">
       <div class="form_box">
         <dil-form :formId="116" v-model="form1"></dil-form>
@@ -34,6 +99,19 @@ export default {
   data() {
     return {
       form1: {},
+      inputText:null,
+      drawer:false,
+      unloadPoint:null,
+      wagon:null,
+      purchaseOrderNum:null,
+      materialName:null,
+      direction: "rtl",
+      unloadPointId:null,
+      unloadPointName:null,
+      unloadPoint: {
+        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        selectionType: "radio",
+      },
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/tms/getWagonNo/1?apiId=213",
@@ -44,8 +122,36 @@ export default {
       list: [],
     };
   },
-  mounted() {},
+  mounted() {
+     this.form1.resultArrivalDate=new Date();
+    this.form1.resultUnloadTime=new Date();
+  },
   methods: {
+    searchOrder(){
+      let requestUrl="/api/v1/tms/getWagonNo/1?apiId=213";
+      if(typeof this.wagon !='undefined' && this.wagon!=null){
+          requestUrl+=("&wagon="+this.wagon);
+      }
+      if(typeof this.purchaseOrderNum !='undefined' && this.purchaseOrderNum!=null){
+          requestUrl+=("&purchaseOrderNum="+this.purchaseOrderNum);
+      }
+      if(typeof this.materialName !='undefined' && this.materialName!=null){
+          requestUrl+=("&materialName="+this.materialName);
+      }
+      this.option.requestUrl=requestUrl;
+    },
+    ondrawer() {
+      this.drawer = true;
+    },
+    searchUnLoadPoint(){
+      this.unloadPoint.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.inputText;
+    },
+    currentRadioChange(selection){
+      this.unloadPointId = selection.warehouseId;
+      this.unloadPointName = selection.warehouseName;
+      console.log(this.unloadPointId);
+    },
     selectionChange(selection) {
       this.list = [];
       selection.forEach((e) => {
@@ -63,17 +169,19 @@ export default {
         wagonNoList: this.list,
         resultArrivalDate: sjTime(this.form1.resultArrivalDate),
         resultUnloadTime: sjTime(this.form1.resultUnloadTime),
-        unloadingPointId: this.form1.unloadingPointId,
         resultRemark: this.form1.resultRemark,
+        unloadingPointId:this.unloadPointId,
         resultType: 1,
       };
       console.log(tmstrainWagonUnloadResult);
       if (
         tmstrainWagonUnloadResult.wagonNoList == null ||
         tmstrainWagonUnloadResult.resultArrivalDate == null ||
-        tmstrainWagonUnloadResult.resultUnloadTime == null 
+        tmstrainWagonUnloadResult.resultUnloadTime == null ||
+        tmstrainWagonUnloadResult.wagonNoList.length <=0 ||
+         tmstrainWagonUnloadResult.unloadingPointId ==null
       )
-        this.$message.error("存在空值！");
+        this.$message.error("请填写完整信息！");
       else
         this.axios
           .post(
@@ -148,4 +256,17 @@ export default {
     width: 300px;
   }
 }
+.forwardingUnit {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 320px;
+    margin-left: 33%;
+    margin-top: 30px;
+    margin-right: 22px;
+    .text {
+      text-align: right;
+      width: 8.125rem;
+    }
+  }
 </style>

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

@@ -12,9 +12,9 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" @click="btnclick(0)">
+      <!-- <el-button type="primary" @click="btnclick(0)">
         <i class="el-icon-s-promotion"></i>发送
-      </el-button>
+      </el-button> -->
     </div>
     <dilTable v-bind.sync="option" @selection-change="selectionChange">
     </dilTable>