liyg 2 年 前
コミット
989f344251

+ 1 - 1
src/components/DilCommonUI/packages/table/src/table.vue

@@ -225,7 +225,7 @@ export default {
     // 每页显示个数选择器的选项设置
     pageSizes: {
       default() {
-        return [10, 20, 50, 100, 200, 1000, 50000];
+        return [5,10, 20, 50, 100, 200, 1000, 50000];
       }
     },
     // 每页显示条目个数,支持 .sync 修饰符

+ 21 - 14
src/views/TMS/components/domesticMine/wagonLoadbu.vue

@@ -38,10 +38,10 @@
      <div class="purchaseOrder_table">
       <div class="search" style="display:flex">
         <div style="margin-top: 18px;margin-left:10px">
-          <el-label>物资名:</el-label>
+          <el-label>物资名或订单号:</el-label>
         </div>
         <el-input
-        placeholder="请输入物资名"
+        placeholder="请输入"
         v-model="search1"
         style="margin: 10px; width:10%"
         clearable
@@ -50,7 +50,7 @@
           <el-label>外轮船名:</el-label>
         </div>
         <el-input
-          placeholder="请输入外轮船名"
+          placeholder="请输入"
           v-model="search2"
           style="margin: 10px;width:10%"
           clearable
@@ -62,6 +62,13 @@
         style="margin: 10px;">
         <i class="el-icon-search"></i>查询
       </el-button>
+      <el-button 
+      type="primary"
+      class="btn" 
+      @click="makeSure" 
+      style="margin: 10px;">确认配单
+      </el-button>
+
       </div>
       <dilTable
         v-bind.sync="purchaseOption"
@@ -69,7 +76,7 @@
       ></dilTable>
     </div>
 
-    <div class="material form">
+    <!-- <div class="material form">
       <span class="text">物资:</span>
       <el-input v-model="materialName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
@@ -80,11 +87,11 @@
       <el-input v-model="supplierName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
     </div>
-    <!-- <div class="forwardingUnit form">
+    <div class="forwardingUnit form">
       <span class="text">卸货点:</span>
       <el-input v-model="unloadPointName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(3)">浏览</el-button>
-    </div> -->
+    </div>
     <div class="remark form">
       <span class="text" >船名(备注):</span>
       <el-input v-model="remark" @blur="onBlur" > </el-input>
@@ -95,7 +102,7 @@
       <div class="form_box">  
       <dil-form :formId="361" v-model="form1" ref="from1"></dil-form>
       </div>
-    </div>
+    </div> -->
     <div class="wagonLoadbu_table">
       <dilTable
         v-bind.sync="option"
@@ -105,10 +112,7 @@
     </div>
     
     
-    <div class="button_box">
-      <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
@@ -160,14 +164,14 @@ export default {
         requestUrl: "/api/v1/tms/findPurchaseOrderList?apiId=81",
         // 控制选择单列
         selectionType: "radio",
-        map:[]
+        pageSize:5,
       },
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/tms/getTmstrainWagonLoad?apiId=209&resultType=10",
         // 控制显示多选列
         selectionType: "select",
-        pageSize:50,
+        pageSize:10,
       },
       //查询用数据
       search1:null,
@@ -238,6 +242,7 @@ export default {
           purchaseOrderId:this.purchaseOrderId,
           insertUpdateRemark: this.form1.insertUpdateRemark
         }
+        let that=this;
         this.axios.post('/api/v1/tms/updateDomesticLoadResult',map).then((res)=>{
           console.log(res.data.data)
           if(res.data.code == "200"){
@@ -245,7 +250,9 @@ export default {
               message: "配单成功!",
               type: "success",
             });
-            this.cancel();
+            that.purchaseOption.requestUrl += "&i="+new Date();
+            console.log();
+            // this.cancel();//不退出
           }
         })
       }

+ 2 - 2
src/views/TMS/components/importedShip/addShipmentInstructions.vue

@@ -56,7 +56,7 @@ export default {
       direction: "rtl",
       input: "",
       options: {
-        requestUrl: "/api/v1/tms/getBatchListForAttorney?apiId=383",
+        requestUrl: "/api/v1/tms/getBatchListForInstruction?apiId=383",
         selectionType: "radio",
         maplist: []
       },
@@ -72,7 +72,7 @@ export default {
     },
     onclick() {
       this.options.requestUrl =
-        "/api/v1/tms/getBatchList?apiId=383&con=" + this.input;
+        "/api/v1/tms/getBatchListForInstruction?apiId=383&con=" + this.input;
     },
     currentRadioChange1(selection) {
       this.maplist = selection;

+ 1 - 0
src/views/TMS/components/importedShip/instructionsCapacity.vue

@@ -87,6 +87,7 @@ export default {
         .get("/api/v1/uc/getCapacityTel?capacityId=" + item.capacityId)
         .then(res => {
           console.log(res.data);
+          this.capacityIds = "";
           if (res.data) {
             this.$set(this.form, "instructionContactInf", res.data.capacityTel);
           }