切换分支备份

src/api/purchase/purApply.js

@@ -85,3 +85,6 @@ export function delApplyDetail(id) {
     })
 }
 
+
+
+

src/api/purchase/purPlan.js

@@ -83,4 +83,12 @@ export function delApplyDetail(id) {
         method: 'delete'
     })
 }
+export function selectApply(query) {
+    return axios({
+        url: "/purchase/plan/selectApply",
+        method: "post",
+        data: query
+    });
+}
+
 

src/views/basic/UdiInfoManage.vue

@@ -1209,6 +1209,7 @@ export default {
             let rlId = this.editQuery.rlId;
             this.editQuery = row;
             this.editQuery.rlId = rlId;
+            this.editQuery.id = rlId;
         },
 
 

src/views/purchase/purPlanEditDialog.vue

@@ -176,7 +176,7 @@
                         prop="spec"
                         show-overflow-tooltip
                     ></el-table-column>
-                    <el-table-column width="150" label="申购数量">
+                    <el-table-column width="150" label="采购数量">
                         <template slot-scope="scope">
                             <el-input size="small" v-model="scope.row.count"
                                       placeholder="请输入数量" style="width: 80%"
@@ -260,12 +260,13 @@
             :close-on-click-modal="false"
             :close-on-press-escape="false"
             width="85%"
+            append-to-body
             v-if="selectApplyVisible"
         >
-            <selectReceiveOrderDialog
-                :closeDialog="closeDialog"
+            <select-apply-list-dialog
                 :data="thisData"
-            ></selectReceiveOrderDialog>
+                :closeDialog="closeDialogC2"
+            ></select-apply-list-dialog>
         </el-dialog>
 
     </div>
@@ -278,6 +279,7 @@ import {inserThrOrderWeb, delApplyDetail, listApplyDetail} from "@/api/purchase/
 import {filterAllByUser} from "@/api/basic/invWarehouse";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 import {getBusChange} from "@/api/basic/busTypeChange";
+import SelectApplyListDialog from "@/views/purchase/selectApplyListDialog";
 
 export default {
     name: "idQuery",
@@ -344,6 +346,7 @@ export default {
         };
     },
     components: {
+        SelectApplyListDialog,
         draggable,
         stockOrderNewSelectProduct,
     },
@@ -426,6 +429,7 @@ export default {
 
         closeDialogC2(rData) {
             this.selectProductVisible = false;
+            this.selectApplyVisible = false;
             this.thisData = {};
             if (this.$isNotBlank(rData)) {
                 this.codeArray = [];

src/views/purchase/selectApplyListDialog.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <el-card class="el-card" style="margin-top: -15px">
-            <el-form :inline="true" :model="listQuery" style="display: flex;" size="mini">
+            <el-form :inline="true" :model="filterQuery" style="display: flex;" size="mini">
                 <el-row>
                     <el-form-item class="query-form-item">
                         <el-input
@@ -52,13 +52,6 @@
                 <el-table-column label="申购仓库" prop="invName"></el-table-column>
                 <el-table-column label="申购分库" prop="subInvName"></el-table-column>
                 <el-table-column label="申购说明" prop="remark"></el-table-column>
-                <el-table-column label="状态" prop="status">
-                    <template slot-scope="scope">
-                        <el-tag :type="(scope.row.status) | statusFilterType">
-                            {{ statusMap[scope.row.status] }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
             </el-table>
             <el-pagination
                 :page-size="filterQuery.limit"
@@ -86,6 +79,8 @@
 <script>
 import pureApplyDetail from "./pureApplyDetailDialog";
 import {delApply, auditOrder, listApplyDetail, auditListApply} from "@/api/purchase/purApply";
+import {selectApply} from "@/api/purchase/purPlan";
+import {getStockOrderDetailInstrumentById} from "@/api/warehouse/stockOrder";
 
 export default {
     name: "selectApplyListDialog",
@@ -107,24 +102,17 @@ export default {
                 billAction: null,
                 billNo: "",
                 originType: null,
-                thirdSysFk: "",
                 page: 1,
                 limit: 10,
-                corpName: null,
-                type: 1,
-                editStatus: 1,
             },
             formName: null,
-            formMap: {
-                add: "新增申购单据",
-                update: "申购单据详情",
-            },
             statusMap: {
                 1: "草稿",
                 2: "未审核",
                 3: "已审核",
                 4: "已拒绝"
             },
+            ids: [],
             idQuery: {},
             editType: 2,
             total: 0,
@@ -135,6 +123,7 @@ export default {
             list: [],
             detailList: [],
             loading: false,
+            currentRow: null,
             actDateRange: [],
             newSpDistributionVisible: false,
             pickerOptions: {
@@ -224,12 +213,12 @@ export default {
                 });
         },
         handleDetail(row) {
+            this.currentRow = row;
             let query = {orderIdFk: row.id};
             this.loading = true;
             listApplyDetail(query) //查找该单号下的所有条码
                 .then((response) => {
                     this.detailList = response.data.list || [];
-
                     this.loading = false;
                 })
                 .catch(() => {
@@ -288,24 +277,55 @@ export default {
             this.getList();
         },
 
-        closeDialog() {
-            this.newSpDistributionVisible = false;
-            this.getList();
-            this.detailList = [];
-        },
-
-
-        newDistributionForm(index, row) {
-            this.idQuery.id = '';
-            if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
-                this.idQuery.id = row.id;
-                this.idQuery.formData = row;
-                this.formName = "update";
+        combine() {
+            if (this.$isBlank(this.currentRow.id)) {
+                return;
+            }
+            if (this.ids.length > 0) {
+                for (var i = 0; i < this.ids.length; i++) {
+                    for (let j = 0; j < this.detailList.length; j++) {
+                        if (this.ids[i] == this.detailList[j].productId) {
+                            this.$message.error("该申购单已有产品被选入！");
+                            return;
+                        }
+                    }
+                }
+            }
+            let productDatas = [];
+            for (let j = 0; j < this.detailList.length; j++) {
+                let data = {
+                    relId: this.detailList[j].productId,
+                    supId: this.detailList[j].supId,
+                    zczbhhzbapzbh: this.detailList[j].zczbhhzbapzbh,
+                    count:this.detailList[j].count,
+                }
+                productDatas.push(data);
+            }
+            this.loading = true;
+            let tQuery = {
+                datas: productDatas,
+                stockOrderLists: this.data.stockOrderLists,
+                purType: 1,
+            };
+            getStockOrderDetailInstrumentById(tQuery).then((response) => {
+                this.loading = false;
+                if (response.code === 20000) {
+                    this.closeDialog(response.data);
+                } else {
+                    if (response.code == 601) {
+                        this.$alert(response.message, "提示", {
+                            confirmButtonText: "确定",
+                        });
                     } else
-                this.formName = "add";
-            this.newSpDistributionVisible = true;
+                        this.$message.error(response.message);
+                }
+            }).catch(() => {
+                this.loading = false;
+            });
+
         },
 
+
     },
     created() {
         let end = new Date();
@@ -313,6 +333,14 @@ export default {
         start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
         this.actDateRange = [start, end];
         this.getList();
+
+        this.ids = [];
+        if (this.data.stockOrderLists.length > 0) {
+            for (var i = 0; i < this.data.stockOrderLists.length; i++) {
+                this.ids.push(this.data.stockOrderLists[i].productId);
+            }
+        }
+
     },
     components: {
         pureApplyDetail

src/views/warehouse/stockOrderNewSelectProduct.vue

@@ -348,14 +348,14 @@ export default {
             let ids = [];
             let data = {
                 relId: this.multipleSelection.rlId,
-        supId: this.multipleSelection.customerId
+                supId: this.multipleSelection.customerId,
+                zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh,
             }
             ids.push(data);
             this.loading = true;
             let tQuery = {
                 datas: ids,
                 stockOrderLists: this.data.stockOrderLists,
-        zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh,
                 purType: this.purType
             };
             getStockOrderDetailInstrumentById(tQuery).then((response) => {