Merge remote-tracking branch 'origin/master'

src/views/inout/DialogCreateOrder.vue

@@ -468,6 +468,26 @@
       ></DialogSelectUnit>
     </el-dialog>
 
+
+    <!--    绑定产品-->
+    <el-dialog
+      :title="selectRlTitle"
+      :visible.sync="selectRlVisible"
+      width="80%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="selectRlVisible"
+      append-to-body
+    >
+      <selectRlDialog
+        :curRow="codeFormData"
+        :type="1"
+        :fromCorp="orderFormData.fromCorp"
+        v-on:selectBindRl="selectBindRl"
+      ></selectRlDialog>
+    </el-dialog>
+
+
     <el-dialog
       title="请指定当前产品所在货位"
       :visible.sync="selectSpaceVisible"
@@ -510,6 +530,7 @@ import A from "../../plugins/KeyScaner";
 import {findByInvUser} from "@/api/basic/busType";
 import {getInvSpaceList} from "@/api/inventory/invSpace";
 import DialogSelectUnit from "./DialogSelectUnit";
+import selectRlDialog from "./DialogSelectRl";
 import DialogSelectSpace from "./DialogSelectSpace";
 import {isBlank} from "@/utils/strUtil";
 
@@ -625,6 +646,7 @@ export default {
       fromStorageOptions: [],
       curRow: null,
       dialogTableVisible: false,
+      selectRlVisible: false,
       selectSpaceVisible: false,
       sitcomScan: false,
       selectRlTitle: "绑定产品",
@@ -654,7 +676,7 @@ export default {
     bizDetailPanel,
     editCodeDialog,
     DialogCreateOrderSelect,
-    DialogSelectUnit, DialogSelectSpace
+    DialogSelectUnit, DialogSelectSpace, selectRlDialog
   },
   methods: {
     //获取用户仓库列表
@@ -992,6 +1014,10 @@ export default {
       }
 
 
+      if (this.checkPreInArray != null) {
+        this.orderFormData.checkPreInOrders = this.checkPreInArray.join(",");
+      }
+
       if (this.$isBlank(this.orderFormData.corpOrderId)) {
         let date = new Date();
         this.orderFormData.corpOrderId =
@@ -1052,11 +1078,12 @@ export default {
             this.refreshCodesPanel();
             this.$message.error(response.message);
             this.selectRlTitle = response.message;
+            this.selectRlVisible = true;
           } else if (response.code == 503) {
             //该产品绑定多个供应商处理
             this.curRow = response.data;
             this.orderFormData.billNo = this.curRow.orderId;
-            this.codeFormData.relId = this.curRow.relId,
+            this.codeFormData.relId = this.curRow.relId;
             this.refreshCodesPanel();
             this.selectUnitTitle = response.message;
             this.$message.error(response.message);
@@ -1310,6 +1337,13 @@ export default {
       this.addCode();
     },
 
+    selectBindRl(row) {
+      this.selectRlVisible = false;
+      this.orderFormData.relId = row.id;
+      this.addCode();
+    },
+
+
     selectSpaceBind(val) {
       if (this.curAction.scanPreIn) {
         this.orderFormData.checkPreInSpaceCode = val;

src/views/inout/DialogCreateOrderSelect.vue

@@ -37,7 +37,11 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="往来单位:">
-              <el-select v-model="filterQuery.fromCorp" filterable placeholder="请选择往来仓库"  clearable style="width: 90%">
+              <el-select v-model="filterQuery.fromCorp"
+                         filterable
+                         remote
+                         reserve-keyword
+                         placeholder="请选择往来单位" clearable style="width: 90%">
                 <el-option
                   v-for="item in fromInvOptions"
                   :key="item.erpId"
@@ -45,7 +49,7 @@
                   :value="item.erpId"
                 >
                   <span style="float: left">{{ item.name }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{item.code}}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
                 </el-option>
               </el-select>
             </el-form-item>
@@ -729,8 +733,7 @@ export default {
       this.getResultDetailList();
     },
     findFromInvList(val) {
-      let cQuery = {
-      };
+      let cQuery = {};
       selectCorpList(cQuery)
         .then((response) => {
           this.fromInvOptions = response.data || [];

src/views/inout/DialogSelectRl.vue

@@ -573,6 +573,7 @@ export default {
         path: "",
       });
       this.filterQuery = {
+        udiCode: null,
         nameCode: null,
         unitFk: null,
         page: 1,
@@ -582,6 +583,7 @@ export default {
     },
     getList() {
       this.loading = true;
+      this.filterQuery.udiCode = this.curRow.code;
       this.filterQuery.nameCode = this.curRow.nameCode;
       this.filterQuery.bindRlIds = this.curRow.bindRlIds;
       this.filterQuery.unitFk = this.fromCorp;
@@ -710,10 +712,8 @@ export default {
     }
     ,
     bindId(val) {
-
       if (this.curRow.code != null || this.type == 1) {
         this.$emit("selectBindRl", val);
-        // this.$emit("closeBindDialog", true);
       } else {
         let query = {
           id: this.curRow.id,

src/views/purchase/purApply/purApplyEditDiaolog.vue

@@ -150,6 +150,7 @@
         :data="thisData"
         :pId="pId"
         :purType="1"
+        :codeArray="codeArray"
       ></purApplyProducts>
     </el-dialog>
 

src/views/purchase/purApply/purOrderSelectProduct.vue

@@ -75,14 +75,14 @@
       <el-divider style="margin: 15px"></el-divider>
 
       <el-table :data="dataList" style="width: 100%" v-loading="loading" border highlight-current-row
-                :row-class-name="tableRowClassName" @current-change="handleChange"
+                :row-class-name="tableRowClassName" @current-change="handleChange" :row-key="row=>row.id"
                 @selection-change="handleSelectionChange" ref="multipleTable">
         <!--<el-table-column label width="45">-->
         <!--  <template slot-scope="scope">-->
         <!--    <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>-->
         <!--  </template>-->
         <!--</el-table-column>-->
-        <el-table-column type="selection"></el-table-column>
+        <el-table-column type="selection" :reserve-selection="true"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
         <el-table-column label="第三方物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>
@@ -164,6 +164,10 @@ export default {
       type: Object,
       required: true,
     },
+    codeArray: {
+      type: Object,
+      required: true,
+    },
   },
 
   data() {