From b986f1b0139aea6d486c9c623803fe5a68f8da3a Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期四, 27 十一月 2025 16:20:15 +0800
Subject: [PATCH] 采购退料单

---
 /dev/null                                                           | 1088 ----------------------
 src/views/purchase/postockInBack/Kf_POStockInBackBill.vue           |  646 ++++++++----
 src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue  |   88 +
 src/views/component/printList/hBarPlanPrint.vue                     |   79 -
 src/views/gyMaterial/GyMaterial.vue                                 |    9 
 src/views/scMould/basicModeling/Gy_MaterialPackingRelation_Edit.vue |  830 ++++++++++++++++
 src/views/purchase/postockInBack/Kf_POStockInBackBillList.vue       |  143 ++
 src/views/warehouse/shipment/Kf_StockOutRequestBill.vue             |    6 
 8 files changed, 1,535 insertions(+), 1,354 deletions(-)

diff --git a/src/views/component/printList/hBarPlanPrint copy.vue b/src/views/component/printList/hBarPlanPrint copy.vue
deleted file mode 100644
index cdd16ff..0000000
--- a/src/views/component/printList/hBarPlanPrint copy.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-<template>
-    <div>
-        <div id="report_holder"> </div>
-    </div>
-</template>
-<script>
-import { webapp_ws_ajax_run, webapp_urlprotocol_startup, urlAddRandomNo } from "@/utils/grwebapp";
-import axios from 'axios'
-
-export default {
-    name: 'HBarPlanPrint',
-    data() {
-        return {
-            handleMessage: this.$route.query,
-            baseURL: 'http://47.96.97.237/API',
-            //瀹為檯搴旂敤涓紝data搴旇涓虹▼搴忎腑閫氳繃鍚勭閫斿緞鑾峰彇鍒扮殑鏁版嵁锛屾渶鍚庤灏嗘暟鎹浆鎹负鎶ヨ〃闇�瑕佺殑XML鎴朖SON鏍煎紡鐨勫瓧绗︿覆鏁版嵁
-            json_data: {
-                recordset: []
-            },
-
-        }
-    },
-    mounted() {
-        this.ws_both_from_object()
-
-    },
-    // created() {
-    //     this.ws_both_from_object()
-    // },
-    methods: {
-        // 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
-        getUrlVars_JSON() {
-            var datajson;
-            var str = this.propsData; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
-            var arr = str.substring(str.lastIndexOf("=") + 1);
-            datajson = JSON.parse(decodeURI(arr));
-            return datajson;
-        },
-        ws_both_from_object() {
-            let OpenTmp=decodeURIComponent(this.$route.query.OpenTmp)
-            let apIUrl=''
-            if(this.$route.query.Type=='Kf_SellOutBillList'){
-                apIUrl='/Kf_SellOutBill/cx'
-            }else if(this.$route.query.Type=='HGy_BarCodeBill'){
-                
-            }
-            axios.get(this.baseURL + apIUrl, {
-                params: {
-                    "HInterID": this.handleMessage.linterid
-                    // , "HSubID": data[i].hsubid
-                },
-            }).then(response => {
-                let result = response.data
-                this.json_data.recordset = result.data
-                //鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗d腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�
-                var args = {
-                    type: "preview", //璁剧疆涓嶅悓鐨勫睘鎬у彲浠ユ墽琛屼笉鍚岀殑浠诲姟锛屽锛歱review print pdf xls csv txt rtf img grd
-                    // report: this.json_report, //report: JSON.stringify(json_report),
-                    report: urlAddRandomNo('./static/grf/'+OpenTmp+'.grf'),
-                    data: this.json_data //data: JSON.stringify(json_data)
-                };
-                webapp_ws_ajax_run(args);
-                // var reportViewer = rubylong.grhtml5.insertReportViewer("report_holder", "./static/grf/閿�鍞嚭搴撳崟.grf", this.json_data);
-                // reportViewer.start();
-            }).catch(error => {
-                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-            });
-        }
-    },
-}
-
-</script>
\ No newline at end of file
diff --git a/src/views/component/printList/hBarPlanPrint.vue b/src/views/component/printList/hBarPlanPrint.vue
index a50b1a4..d16ae41 100644
--- a/src/views/component/printList/hBarPlanPrint.vue
+++ b/src/views/component/printList/hBarPlanPrint.vue
@@ -38,58 +38,39 @@
         },
         ws_both_from_object() {
             let OpenTmp = decodeURIComponent(this.$route.query.OpenTmp)
-            let apIUrl = ''
+            let sql = ''
             if (this.$route.query.Type == 'Kf_SellOutBillList') {
-                apIUrl = '/Kf_SellOutBill/cx'
-                axios.get(this.baseURL + apIUrl, {
-                    params: {
-                        "HInterID": this.handleMessage.linterid
-                        // , "HSubID": data[i].hsubid
-                    },
-                }).then(response => {
-                    let result = response.data
-                    this.json_data.recordset = result.data
-                    //鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗d腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�
-                    var args = {
-                        type: "preview", //璁剧疆涓嶅悓鐨勫睘鎬у彲浠ユ墽琛屼笉鍚岀殑浠诲姟锛屽锛歱review print pdf xls csv txt rtf img grd
-                        // report: this.json_report, //report: JSON.stringify(json_report),
-                        report: urlAddRandomNo('./static/grf/' + OpenTmp + '.grf'),
-                        data: this.json_data //data: JSON.stringify(json_data)
-                    };
-                    webapp_ws_ajax_run(args);
-                    // var reportViewer = rubylong.grhtml5.insertReportViewer("report_holder", "./static/grf/閿�鍞嚭搴撳崟.grf", this.json_data);
-                    // reportViewer.start();
-                }).catch(error => {
-                    this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-                });
+                sql = "exec h_p_Kf_SellOutBillList_PrintSellOutBill " + this.handleMessage.linterid.toString()
             } else if (this.$route.query.Type == 'HGy_BarCodeBill') {
-                apIUrl = '/CommonModel/searchMethod'
-                axios.get(this.baseURL + apIUrl, {
-                    params: {
-                        "sql": "select * from h_v_IF_BarCodeBillList where hmainid in(" + this.handleMessage.linterid.toString() + ") order by hmainid desc",
-                        "user": sessionStorage["HUserName"],
-                        "ModRightNameCheck": ''
-                        // , "HSubID": data[i].hsubid
-                    },
-                }).then(response => {
-                    let result = response.data
-                    this.json_data.recordset = result.data
-                    //鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗d腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�
-                    var args = {
-                        type: "preview", //璁剧疆涓嶅悓鐨勫睘鎬у彲浠ユ墽琛屼笉鍚岀殑浠诲姟锛屽锛歱review print pdf xls csv txt rtf img grd
-                        // report: this.json_report, //report: JSON.stringify(json_report),
-                        report: urlAddRandomNo('./static/grf/' + OpenTmp + '.grf'),
-                        data: this.json_data //data: JSON.stringify(json_data)
-                    };
-                    console.log(args,this.json_data)
-                    webapp_ws_ajax_run(args);
-                    // var reportViewer = rubylong.grhtml5.insertReportViewer("report_holder", "./static/grf/閿�鍞嚭搴撳崟.grf", this.json_data);
-                    // reportViewer.start();
-                }).catch(error => {
-                    console.log(22222, error)
-                    this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-                });
+                sql = "select * from h_v_IF_BarCodeBillList where hmainid in(" + this.handleMessage.linterid.toString() + ") order by hmainid desc"
+            }else if (this.$route.query.Type == 'HPOInStockBill') {
+                sql = "select * from h_v_Sc_PrintMouldProdOutBillList where hmainid=" + this.handleMessage.linterid.toString()+ " order by hmainid"
             }
+            axios.get(this.baseURL + '/CommonModel/searchMethod', {
+                params: {
+                    "sql": sql,
+                    "user": sessionStorage["HUserName"],
+                    "ModRightNameCheck": ''
+                    // , "HSubID": data[i].hsubid
+                },
+            }).then(response => {
+                let result = response.data
+                this.json_data.recordset = result.data
+                //鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗d腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�
+                var args = {
+                    type: "preview", //璁剧疆涓嶅悓鐨勫睘鎬у彲浠ユ墽琛屼笉鍚岀殑浠诲姟锛屽锛歱review print pdf xls csv txt rtf img grd
+                    // report: this.json_report, //report: JSON.stringify(json_report),
+                    report: urlAddRandomNo('./static/grf/' + OpenTmp + '.grf'),
+                    data: this.json_data //data: JSON.stringify(json_data)
+                };
+                console.log(args, this.json_data)
+                webapp_ws_ajax_run(args);
+                // var reportViewer = rubylong.grhtml5.insertReportViewer("report_holder", "./static/grf/閿�鍞嚭搴撳崟.grf", this.json_data);
+                // reportViewer.start();
+            }).catch(error => {
+                console.log(22222, error)
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
 
         }
     },
diff --git a/src/views/component/printList/index copy.vue b/src/views/component/printList/index copy.vue
deleted file mode 100644
index 185cdf5..0000000
--- a/src/views/component/printList/index copy.vue
+++ /dev/null
@@ -1,211 +0,0 @@
-<template>
-    <div style="margin-top: -40px;">
-        <el-form ref="formData" :model="formData" label-width="100px">
-            <div style="padding: 10px; ">
-                <el-button type="primary" size="small" @click="printClick">鎶ヨ〃鎵撳嵃</el-button>
-            </div>
-            <el-table v-loading="loading" :data="printdata" ref="printTable" max-height="540"
-                @selection-change="handleSelectionChange" :row-class-name="rowSysIndex" border>
-                <el-table-column type="selection" width="55" align="center" />
-                <el-table-column align="center" label="妯″潡浠g爜" prop="HNumber" />
-                <el-table-column align="center" label="妯℃澘鍚嶇О" prop="妯℃澘鍚嶇О" />
-            </el-table>
-        </el-form>
-        <el-dialog title="鎶ヨ〃鎵撳嵃" :visible.sync="openPrint" width="800px" append-to-body>
-            <div ref="print" id="printId">111</div>
-            <el-button type="primary" size="small" @click="printClick">鎵撳嵃</el-button>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-import axios from 'axios'
-
-export default {
-    name: 'PrintList',
-    props: {
-        linterid: { type: Number, },
-        MyMsg: { type: Number, },
-        Type: { type: String, },
-        HModName: { type: String, }
-    },
-    data() {
-        return {
-            openPrint: false,
-            selRowData: [],
-            baseURL: 'http://47.96.97.237/API',
-            user: 'admin',//鐧诲綍鐢ㄦ埛鍚�
-            // 琛ㄦ牸鏁版嵁
-            printdata: [],
-            // 閫変腑鏁扮粍index
-            selIndex: [],
-            // 闈炲崟涓鐢�
-            single: true,
-            // 闈炲涓鐢�
-            multiple: true,
-            // 閬僵灞�
-            loading: true,
-            formData: {
-                HFixCols: '',
-                HFontSize: '',
-                HColumnWidth: '',
-                HPageSize: '',
-                HSortFlag: '',
-                HSelTotal: ''
-            },
-            colTitleName: '',
-            tableIns: null,
-            option: {},
-            tableData: []
-        }
-    },
-    created() {
-        this.getDisplay()
-    },
-    methods: {
-        handlePrint() {
-            this.openPrint = true
-        },
-        printClick() {
-            const routeUrl = this.$router.resolve({ path: '/hBarPlanPrint',query:{linterid:this.linterid.toString(),Type:this.Type.toString(),OpenTmp: encodeURIComponent(this.rowForm.妯℃澘鍚嶇О)} });
-            window.open(routeUrl.href, '_blank');
-        },
-        getDisplay() {
-            this.loading = true
-            axios.get(this.baseURL + '/Open_PrintTem/GetOpenTmpList_Json', {
-                params: { "HNumber": this.Type },
-            }).then(response => {
-                 console.log(response)
-                var result = response.data
-                this.printdata = result.data
-                this.loading = false
-            }).catch(error => {
-                console.log(error)
-                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-            });
-        },
-        //涓婁竴琛�
-        handleMoveRowUp(row) {
-            if (this.selRowData.length != 1) {
-                this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紒")
-            } else {
-                let num = row.index - 1
-                if (num == 0) {
-                    this.$modal.msgError("绗竴琛屾暟鎹棤娉曚笂绉�");
-                } else { // 纭繚涓嶆槸绗竴琛�
-                    const record = this.rowTitleData.splice(num, 1)[0];
-                    this.rowTitleData.splice(num - 1, 0, record);
-                }
-            }
-            console.log(this.rowTitleData)
-        },
-        //涓嬩竴琛�
-        handleMoveRowDown(row) {
-            if (this.selRowData.length != 1) {
-                this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
-            } else {
-                let num = row.index - 1
-                if (num == this.rowTitleData.length - 1) {
-                    this.$modal.msgError("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉�");
-                } else { // 纭繚涓嶆槸绗竴琛�
-                    const record = this.rowTitleData.splice(num, 1)[0];
-                    this.rowTitleData.splice(num + 1, 0, record);
-                }
-            }
-        },
-        // 澶氶�夋閫変腑鏁版嵁
-        handleSelectionChange(selection) {
-            //鍗曢��
-            if (selection.length > 1) {
-                const del_row = selection.shift()
-                this.$refs.printTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
-            }
-            this.rowForm = {}
-            this.ids = selection.map(item => item.HItemID)
-            this.rowForm = selection[0]
-        },
-        //琛ㄦ牸琛岀储寮�
-        rowSysIndex({ row, rowIndex }) {
-            row.index = rowIndex + 1;
-        },
-        //鍏ㄩ��
-        handleCheckAll() {
-            for (var i = 0; i < this.rowTitleData.length; i++) {
-                this.rowTitleData[i].IsHide = true;
-            }
-        },
-        //鍏ㄦ竻
-        handleClearBill() {
-            for (var i = 0; i < this.rowTitleData.length; i++) {
-                this.rowTitleData[i].IsHide = false;
-            }
-        },
-        //鍏ㄥ眳涓�
-        handleCenter() {
-            for (var i = 0; i < this.rowTitleData.length; i++) {
-                this.rowTitleData[i].Alignment = 'M';
-            }
-        },
-        //淇濆瓨
-        handleSave() {
-            const cache = this.rowTitleData
-            const num = cache.filter(item => item !== "").map((item, i) => {
-                item.LAY_TABLE_INDEX = i
-                return item
-            })
-            // 楠岃瘉鍒嗛〉鍙傛暟
-            const HPageSize = this.formData.HPageSize
-            if (HPageSize && !/^[0-9]+$/.test(HPageSize)) {
-                this.$modal.msgError("榛樿鍒嗛〉涓嶄负姝f暣鏁�!")
-                return
-            }
-            const sMainStr = JSON.stringify(this.formData)
-            const sSubStr = JSON.stringify(num)
-            const OperationType = "1"
-            const sMainSub = `${sMainStr};${sSubStr};${this.HModName};${OperationType};${this.user}`
-            axios({
-                method: 'post',
-                url: this.baseURL + "/Xt_grdAlignment_WMES/AddgrdAlignmentWMES",
-                data: {
-                    'sMainSub': sMainSub
-                },
-            }).then(response => {
-                console.log(1, response)
-                if (response.data.count == 1) {
-                    this.$modal.msgSuccess("鎻愪氦鎴愬姛")
-                } else {
-                    this.$modal.msgError(response.data.Message);
-                }
-            }).catch(error => {
-                console.log(2, error)
-
-                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-            });
-        },
-        //閫�鍑�
-        handleExit() {
-            this.$emit('rowEditClose', false)
-        },
-        // 鍒犻櫎
-        handleDel() {
-            this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
-                console.log(this.rowForm.hmainid.toString())
-                axios.get(this.baseURL + "/Xt_grdAlignment_WMES/DelgrdAlignmentWMES", {
-                    params: { "HModName": this.HModName, "user": this.user }
-                }).then(response => {
-                    let result = response.data
-                    if (response.data.count == 1) {
-                        this.getList()
-                        this.$modal.msgSuccess(result.Message)
-                    } else {
-                        this.$modal.msgError("閿欒:" + result.code + result.Message);
-                    }
-                }).catch(error => {
-                    console.log(error)
-                    this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-                });
-            }).catch(() => { })
-        },
-    }
-}
-</script>
\ No newline at end of file
diff --git a/src/views/gyMaterial/GyMaterial.vue b/src/views/gyMaterial/GyMaterial.vue
index 881e575..4436702 100644
--- a/src/views/gyMaterial/GyMaterial.vue
+++ b/src/views/gyMaterial/GyMaterial.vue
@@ -1201,6 +1201,9 @@
     
 
     handleRowClick(row, column, event) {
+        if(this.openPage){
+        this.$emit('deptEmit', row, 3)
+      }
       if (this.checkIsIframe()) {
         // 灏嗗綋鍓嶉�変腑鐨勬暟鎹毚闇插埌window涓�
         window.selectedRow = row;
@@ -1273,6 +1276,9 @@
     
     // 鍙屽嚮琛�
     handleDblclick(row, column, cell, event) {
+      if(this.openPage){
+        this.$emit('deptEmitDb', row, 3)
+      }
       if (this.checkIsIframe()) {
         // IFrame 鍙屽嚮 杩斿洖褰撳墠鍙屽嚮鐨勬暟鎹�
         window.parent.iFrameMaterialCallback(row);
@@ -1288,6 +1294,9 @@
       if (!this.single) {
         this.selectedRow = selection[0];
       }
+      //   if(this.openPage){
+      //   this.$emit('deptEmit', this.selectedRow, 3)
+      // }
     },
       // 缂栬緫鍏抽棴鍥炶皟
   handleEditClose() {
diff --git a/src/views/purchase/postockInBack/Kf_POStockInBackBill.vue b/src/views/purchase/postockInBack/Kf_POStockInBackBill.vue
index 358ea5b..91a2356 100644
--- a/src/views/purchase/postockInBack/Kf_POStockInBackBill.vue
+++ b/src/views/purchase/postockInBack/Kf_POStockInBackBill.vue
@@ -2,11 +2,12 @@
     <div v-loading="formLoading" v-if="formShow">
         <div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
             <el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
+            <el-button type="primary" @click="set_CheckBill(0)" :disabled="checkDisabled">瀹� 鏍�</el-button>
             <el-button type="primary" @click="close">閫� 鍑�</el-button>
             <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
         </div>
         <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">閲囪喘閫�鏂欏崟</div>
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="100px">
             <el-tabs v-model="activeName" type="card">
                 <el-tab-pane label="鍩烘湰淇℃伅" name="first">
                     <el-row>
@@ -23,8 +24,8 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="6">
-                            <el-form-item label="杈呭姪瀛楁" prop="HInnerBillNo">
-                                <el-input v-model="form.HInnerBillNo" placeholder="璇疯緭鍏ヨ緟鍔╁瓧娈�" />
+                            <el-form-item label="鍐呴儴鍗曟嵁鍙�" prop="HInnerBillNo">
+                                <el-input v-model="form.HInnerBillNo" placeholder="璇疯緭鍏ュ唴閮ㄥ崟鎹彿" />
                             </el-form-item>
                         </el-col>
                         <el-col :span="6">
@@ -32,40 +33,6 @@
                                 <el-input v-model="form.HEmpName" placeholder="璇疯緭鍏ヤ笟鍔″憳" disabled>
                                     <el-button slot="append" icon="el-icon-search"
                                         @click="openDataDialog(4, zhiyuanType = 'yewuyuan')"></el-button>
-                                </el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="6">
-                            <el-form-item label="淇濈鍛�" prop="HKeeperName">
-                                <el-input v-model="form.HKeeperName" placeholder="璇疯緭鍏ヤ繚绠″憳" disabled>
-                                    <el-button slot="append" icon="el-icon-search"
-                                        @click="openDataDialog(4, zhiyuanType = 'baoguanyuan')"></el-button>
-                                </el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="6">
-                            <el-form-item label="涓荤" prop="HMangerName">
-                                <el-input v-model="form.HMangerName" placeholder="璇疯緭鍏ヤ富绠�" disabled>
-                                    <el-button slot="append" icon="el-icon-search"
-                                        @click="openDataDialog(4, zhiyuanType = 'zhuguan')"></el-button>
-                                </el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="6">
-                            <el-form-item label="楠屾敹" prop="HSecManagerName">
-                                <el-input v-model="form.HSecManagerName" placeholder="璇疯緭鍏ラ獙鏀�" disabled>
-                                    <el-button slot="append" icon="el-icon-search"
-                                        @click="openDataDialog(4, zhiyuanType = 'yanshou')"></el-button>
-                                </el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="6">
-                            <el-form-item label="浠撳簱" prop="HWHName">
-                                <el-input v-model="form.HWHName" placeholder="璇疯緭鍏ヤ粨搴�" disabled>
-                                    <el-button slot="append" icon="el-icon-search"
-                                        @click="openDataDialog(2, ckType = 'form')"></el-button>
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -80,11 +47,69 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="6">
-                            <el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
+                            <el-form-item label="渚涘簲鍟�" prop="HSupName">
                                 <el-input v-model="form.HSupName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" disabled>
                                     <el-button slot="append" icon="el-icon-search"
                                         @click="openDataDialog(6)"></el-button>
                                 </el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="浠撳簱" prop="HWHName">
+                                <el-input v-model="form.HWHName" placeholder="璇疯緭鍏ヤ粨搴�" disabled>
+                                    <el-button slot="append" icon="el-icon-search"
+                                        @click="openDataDialog(2, ckType = 'form')"></el-button>
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="閫�鏂欏憳" prop="HSecManagerName">
+                                <el-input v-model="form.HSecManagerName" placeholder="璇疯緭鍏ラ��鏂欏憳" disabled>
+                                    <el-button slot="append" icon="el-icon-search"
+                                        @click="openDataDialog(4, zhiyuanType = 'tuiliaoyuan')"></el-button>
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="6">
+                            <el-form-item label="淇濈鍛�" prop="HKeeperName">
+                                <el-input v-model="form.HKeeperName" placeholder="璇疯緭鍏ヤ繚绠″憳" disabled>
+                                    <el-button slot="append" icon="el-icon-search"
+                                        @click="openDataDialog(4, zhiyuanType = 'baoguanyuan')"></el-button>
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="璐熻矗浜�" prop="HManagerName">
+                                <el-input v-model="form.HManagerName" placeholder="璇疯緭鍏ヨ礋璐d汉" disabled>
+                                    <el-button slot="append" icon="el-icon-search"
+                                        @click="openDataDialog(4, zhiyuanType = 'zhuguan')"></el-button>
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="婧愬崟绫诲瀷" prop="HSourceBillType">
+                                <el-select v-model="form.HSourceBillType" placeholder="璇烽�夋嫨" style="width: 100%">
+                                    <!-- <el-option v-for="(item, index) in HSourceBillTypeList" :key="index"
+                                        :label="item.label" :value="item.value">
+                                    </el-option> -->
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="閫夊崟鍙�" prop="HSourceBillNo">
+                                <el-input v-model="form.HSourceBillNo" placeholder="璇疯緭鍏ラ�夊崟鍙�" disabled>
+                                    <el-button slot="append" icon="el-icon-search"
+                                        @click="openDataDialog(openNum)"></el-button>
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="12">
+                            <el-form-item label="鎽樿" prop="HExplanation">
+                                <el-input v-model="form.HExplanation" placeholder="璇疯緭鍏ユ憳瑕�" />
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
@@ -195,55 +220,18 @@
                 </el-table-column>
                 <el-table-column align="center" label="璁¢噺鍗曚綅" width="120">
                     <template slot-scope="scope">
-                        <el-input v-model="scope.row.璁¢噺鍗曚綅" placeholder="璇疯緭鍏ヨ閲忓崟浣�"
-                            @keyup.native.f7="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'jldw')"
-                            @dblclick.native="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'jldw')" />
+                        <span>{{ scope.row.璁¢噺鍗曚綅 }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column align="center" label="浠撳簱" width="120">
+                <el-table-column align="center" label="瀹為��鏁伴噺" width="120">
                     <template slot-scope="scope">
-                        <el-input v-model="scope.row.浠撳簱" placeholder="璇疯緭鍏ヤ粨搴�"
-                            @keyup.native.f7="openDataDialog(2, scope.row, ckType = 'zb')"
-                            @dblclick.native="openDataDialog(2, scope.row, ckType = 'zb')" />
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" label="浠撲綅" width="120">
-                    <template slot-scope="scope">
-                        <el-input v-model="scope.row.浠撲綅" placeholder="璇疯緭鍏ヤ粨浣�"
-                            @keyup.native.f7="openDataDialog(9, scope.row)"
-                            @dblclick.native="openDataDialog(9, scope.row)" />
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" label="搴撳瓨杈呭崟浣�" width="120">
-                    <template slot-scope="scope">
-                        <el-input v-model="scope.row.搴撳瓨杈呭崟浣�" placeholder="璇疯緭鍏ュ簱瀛樿緟鍗曚綅"
-                            @keyup.native.f7="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'kcfdw')"
-                            @dblclick.native="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'kcfdw')" />
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" label="鍩烘湰鍗曚綅" width="120">
-                    <template slot-scope="scope">
-                        <el-input v-model="scope.row.鍩烘湰鍗曚綅" placeholder="璇疯緭鍏ュ熀鏈崟浣�"
-                            @keyup.native.f7="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'jbdw')"
-                            @dblclick.native="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'jbdw')" />
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" label="杈呭崟浣�" width="120">
-                    <template slot-scope="scope">
-                        <el-input v-model="scope.row.杈呭崟浣�" placeholder="璇疯緭鍏ヨ緟鍗曚綅"
-                            @keyup.native.f7="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'fdw')"
-                            @dblclick.native="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'fdw')" />
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" label="搴旀敹鏁伴噺" width="120">
-                    <template slot-scope="scope">
-                        <el-input-number v-model="scope.row.HQtyMust" :min="1" style="width: 90px;"
+                        <el-input-number v-model="scope.row.HQty" :min="1" style="width: 90px;"
                             controls-position="right"></el-input-number>
                     </template>
                 </el-table-column>
-                <el-table-column align="center" label="瀹炴敹鏁伴噺" width="120">
+                <el-table-column align="center" label="搴旈��鏁伴噺" width="120">
                     <template slot-scope="scope">
-                        <el-input-number v-model="scope.row.HQty" :min="1" style="width: 90px;"
+                        <el-input-number v-model="scope.row.HQtyMust" :min="1" style="width: 90px;"
                             controls-position="right"></el-input-number>
                     </template>
                 </el-table-column>
@@ -256,6 +244,35 @@
                 <el-table-column align="center" label="閲戦" width="120">
                     <template slot-scope="scope">
                         <span>{{ scope.row.HMoney }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" label="閲囪喘閲戦" width="120">
+                    <template slot-scope="scope">
+                        <span>{{ scope.row.HOrderPrice }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" label="鍙戞枡浠撳簱" width="120">
+                    <template slot-scope="scope">
+                        <el-input v-model="scope.row.鍙戞枡浠撳簱" placeholder="璇疯緭鍏ュ彂鏂欎粨搴�"
+                            @keyup.native.f7="openDataDialog(2, scope.row, ckType = 'zb')"
+                            @dblclick.native="openDataDialog(2, scope.row, ckType = 'zb')" />
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" label="浠撲綅鍚嶇О" width="120">
+                    <template slot-scope="scope">
+                        <el-input v-model="scope.row.浠撲綅鍚嶇О" placeholder="璇疯緭鍏ヤ粨浣嶅悕绉�"
+                            @keyup.native.f7="openDataDialog(9, scope.row)"
+                            @dblclick.native="openDataDialog(9, scope.row)" />
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" label="鎵规" width="120">
+                    <template slot-scope="scope">
+                        <el-input v-model="scope.row.HBatchNo" />
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" label="澶囨敞" width="120">
+                    <template slot-scope="scope">
+                        <el-input v-model="scope.row.HRemark" />
                     </template>
                 </el-table-column>
                 <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
@@ -297,7 +314,7 @@
 import moment from 'moment';
 
 export default {
-    name: 'Kf_StockOutRequestBill',
+    name: 'Kf_POStockInBackBill',
     components: { Dept, Warehouse, Material, RowSettings, GyEmployee, GySupplier, GyStockPlace },
     props: {
         OperationType: { type: Number, },
@@ -308,7 +325,8 @@
     },
     data() {
         return {
-            HModName: "Kf_StockOutRequestBill",
+            HModName: "Kf_POStockInBackBill",
+            checkDisabled: true,
             allVal: undefined,
             zhiyuanType: '',
             ckType: '',
@@ -332,7 +350,7 @@
             deptform: {},//寮圭獥閫変腑鏁版嵁
             openData: false,//鏁版嵁寮圭獥
             dialogTitle: '',
-            organizationList: [],//缁勭粐鍒楄〃
+            organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
             subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
             // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
             HInterID: null,
@@ -380,40 +398,204 @@
             form: {},
             // 琛ㄥ崟鏍¢獙
             rules: {
-
-                HDate: [
-                    { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
+                HEmpName: [
+                    { required: true, message: "璇烽�夋嫨涓氬姟鍛橈紒", trigger: "blur" }
                 ],
-                HExRate: [
-                    { required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }
+                HDeptName: [
+                    { required: true, message: "璇烽�夋嫨閮ㄩ棬", trigger: "blur" }
+                ],
+                HSupName: [
+                    { required: true, message: "璇烽�夋嫨渚涘簲鍟嗭紒", trigger: "blur" }
+                ],
+                HWHName: [
+                    { required: true, message: "璇烽�夋嫨浠撳簱锛�", trigger: "blur" }
+                ],
+                HSecManagerName: [
+                    { required: true, message: "璇烽�夋嫨閫�鏂欏憳锛�", trigger: "blur" }
                 ]
             }
         };
     },
     created() {
-        this.fetchData()
+        this.getHSourceBillType()
         this.getdata()
     },
     methods: {
-        fetchData() {
-            axios.get(this.baseURL + "/Web/GetOrganizations", {
+        getHSourceBillType() {
+            axios.get(this.baseURL + "/Web/GetHSourceBillType", {
+                "HName": '閲囪喘閫�鏂欏崟', "Num": 2
             }).then(response => {
+                console.log(response)
+                var HSourceBillTypes = "";
                 if (response.data.count == 1) {
-                    this.organizationList = response.data.data;//缁勭粐鍒楄〃
+                    let data = response.data.data
+                    for (var i = 0; i < data.length; i++) {
+                        HSourceBillTypes += data[i].HSourceBillType + data[i].HSourceBillTypeName;
+                    }
+                    console.log(111, HSourceBillTypes)
                 }
             }).catch(error => {
+                console.log(error)
+
                 this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
             });
         },
         getdata() {
             this.formShow = false
             this.formLoading = true
-            if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
+            if (this.OperationType == 4) {
+                this.reset()
+                //鏂板鑾峰彇鍗曟嵁鍙�
+                this.getHBillNo()
+                if (this.HSouceBillType == "1105") {
+                    this.setInit_PushBill_ByPOInStockBackBill();
+                } else if (this.HSouceBillType == "1201") {
+                    this.setInit_PushBill_ByPOStockInBillInit();
+                }
+            } else if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
                 this.handleAdd()
             } else if (this.OperationType == 3 || this.copyType == 1) {
                 this.handleUpdate()
             }
         },
+        //#region 涓嬫帹椤甸潰鍒濆鍖�-閫�鏂欓�氱煡鍗�
+        setInit_PushBill_ByPOInStockBackBill() {
+            //鑾峰彇
+            var data = getUrlVars_JSON().data;
+            var dataArray = [];
+            for (var i = 0; i < data.length; i++) {
+                var temp = this.getPushSource_POInStockBackInit(data[i].hmainid, data[i].hsubid);
+                if (temp != "none") {
+                    dataArray.push(temp);
+                } else {
+                    return;
+                }
+            }
+            this.form.HMainSourceInterID = 0
+            this.form.HMainSourceEntryID = 0
+            this.form.HMainSourceBillNo = ""
+            this.form.HMainSourceBillType = this.HSouceBillType
+            this.form.HDeptID = dataArray[0].HDeptID
+            this.form.HDeptName = dataArray[0].閮ㄩ棬
+            this.form.HManagerID = dataArray[0].HManagerID
+            this.form.HManagerName = dataArray[0].涓荤
+            this.form.HWHID = dataArray[0].涓昏〃浠撳簱ID == null ? 0 : dataArray[0].涓昏〃浠撳簱ID
+            this.form.HWHName = dataArray[0].涓昏〃浠撳簱
+            this.form.HEmpID = dataArray[0].HEmpID
+            this.form.HEmpName = dataArray[0].涓氬姟鍛�
+            this.form.HSupID = dataArray[0].HSupID
+            this.form.HSupName = dataArray[0].渚涘簲鍟�
+            this.form.HCurID = dataArray[0].HCurID
+            this.form.HCurName = dataArray[0].甯佸埆
+            this.form.HExRate = dataArray[0].姹囩巼
+            this.form.HAddress = data.浜よ揣鍦扮偣
+            this.form.HRemark = data.琛ㄥご澶囨敞
+            this.form.HInnerBillNo = data.鍐呴儴鍗曟嵁鍙�
+            //瀛愯〃  璧嬪��
+            this.editData = [];
+            for (var i = 0; i < dataArray.length; i++) {
+                this.editData.push(
+                    {
+                        "HMaterID": dataArray[i].HMaterID
+                        , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
+                        , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+                        , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+                        , "HUnitID": dataArray[i].HUnitID
+                        , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
+                        , "HWHID": dataArray[i].HWHID
+                        , "鍙戞枡浠撳簱": dataArray[i].鏀舵枡浠撳簱
+                        , "HSPID": dataArray[i].HSPID
+                        , "浠撲綅鍚嶇О": dataArray[i].浠撲綅鍚嶇О
+                        , "HSecUnitID": dataArray[i].HSecUnitID
+                        , "杈呭姪鍗曚綅": dataArray[i].杈呭姪鍗曚綅
+                        , "HQty": dataArray[i].鏁伴噺.toFixed(6)
+                        , "HQtyMust": dataArray[i].鏁伴噺.toFixed(6)
+                        , "HPrice": dataArray[i].鍗曚环.toFixed(4)
+                        , 'HDiscountRate': dataArray[i].鎶樻墸鐜�                                                    //
+                        , 'HRelTaxPrice': "0"
+                        , "HTaxRate": dataArray[i].绋庣巼
+                        , 'HTaxMoney': dataArray[i].绋庨                                                     //
+                        , "HMoney": dataArray[i].閲戦.toFixed(2)
+                        , "HRemark": dataArray[i].琛ㄤ綋澶囨敞
+                        , "HSourceInterID": dataArray[i].hmainid
+                        , "HSourceEntryID": dataArray[i].hsubid
+                        , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+                        , "HSourceBillType": dataArray[i].HBillType
+                        , "HRelationQty": "0"
+                        , "HRelationMoney": "0"
+                        , 'HPOOrderInterID': "0"
+                        , 'HPOOrderEntryID': "0"
+                        , 'HPOOrderBillNo': ""
+                        , 'HSeOrderTaxPrice': dataArray[i].鍚◣鍗曚环.toFixed(4)
+                        , "HSeOrderInterID": dataArray[i].hmainid
+                        , "HSeOrderEntryID": dataArray[i].hsubid
+                        , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+                    }
+                );
+            }
+        },
+        //#endregion
+        //#region 涓嬫帹椤甸潰鍒濆鍖�-閲囪喘鍏ュ簱鍗�
+        setInit_PushBill_ByPOStockInBillInit() {
+            //鑾峰彇
+            var data = getUrlVars_JSON().data;
+            var dataArray = [];
+            for (var i = 0; i < data.length; i++) {
+                var temp = getPushSource_POStockInBillInit(data[i].hmainid, data[i].hsubid);
+                if (temp != "none") {
+                    dataArray.push(temp);
+                } else {
+                    return;
+                }
+            }
+            this.form.HInnerBillNo = dataArray[0].鍐呴儴鍗曟嵁鍙�
+            this.form.HSupID = dataArray[0].HSupID
+            this.form.HSupName = dataArray[0].渚涘簲鍟�
+            this.form.HEmpID = dataArray[0].HEmpID
+            this.form.HEmpName = dataArray[0].涓氬姟鍛�
+            this.form.HWHID = dataArray[0].涓昏〃浠撳簱ID
+            this.form.HWHName = dataArray[0].涓昏〃浠撳簱
+            this.form.HKeeperID = dataArray[0].HKeeperID
+            this.form.HKeeperName = dataArray[0].淇濈鍛�
+            this.form.HDeptName = dataArray[0].閮ㄩ棬
+            this.form.HDeptID = dataArray[0].HDeptID
+            this.form.HManagerID = dataArray[0].HManagerID
+            this.form.HManagerName = dataArray[0].璐熻矗浜�
+            this.form.HExRate = dataArray[0].姹囩巼
+            this.form.HSourceBillType = this.HSouceBillType
+            //瀛愯〃  璧嬪��
+            this.editData = [];
+            for (var i = 0; i < dataArray.length; i++) {
+                this.editData.push(
+                    {
+                        "HMaterID": dataArray[i].HMaterID
+                        , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
+                        , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+                        , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+                        , "HUnitID": dataArray[i].HUnitID
+                        , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
+                        , "HWHID": dataArray[i].HWHID
+                        , "鍙戞枡浠撳簱": dataArray[i].鏀舵枡浠撳簱
+                        , "HSPID": dataArray[i].HSPID
+                        , "浠撲綅鍚嶇О": dataArray[i].浠撲綅鍚嶇О
+                        , "HQty": dataArray[i].瀹炴敹鏁伴噺.toFixed(6) - dataArray[i].鍏宠仈鏁伴噺.toFixed(6)
+                        , "HQtyMust": dataArray[i].瀹炴敹鏁伴噺.toFixed(6) - dataArray[i].鍏宠仈鏁伴噺.toFixed(6)
+                        , "HPrice": dataArray[i].鍗曚环.toFixed(4)
+                        , "HMoney": dataArray[i].閲戦.toFixed(2)
+                        , "HOrderPrice": dataArray[i].閲囪喘閲戦
+                        , "HRemark": dataArray[i].琛ㄤ綋澶囨敞
+                        , "HBatchNo": dataArray[i].鎵规
+                        , "HSourceInterID": dataArray[i].hmainid
+                        , "HSourceEntryID": dataArray[i].hsubid
+                        , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+                        , "HSourceBillType": dataArray[i].HBillType
+                        , "HRelationQty": "0"
+                        , "HRelationMoney": "0"
+                    }
+                );
+            }
+        },
+        //#endregion
         // 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
         getUrlVars_JSON() {
             var datajson;
@@ -422,9 +604,10 @@
             datajson = JSON.parse(decodeURI(arr));
             return datajson;
         },
-        //鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢攢鍞鍗曟暟鎹�
-        getPushSourceBillInit(HSourceInterID, HSourceEntryID) {
-            axios.get(this.baseURL + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
+        //鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢��鏂欓�氱煡鍗曟暟鎹�
+        getPushSource_POInStockBackInit(HSourceInterID, HSourceEntryID) {
+            var res = "none";
+            axios.get(this.baseURL + '/Cg_POInStockBackBill/loadCg_POInStockBackBill_Push', {
                 params: {
                     "HInterID": HSourceInterID
                     , "HSubID": HSourceEntryID
@@ -432,13 +615,36 @@
             }).then(response => {
                 let result = response.data
                 if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                    this.temp = result.data[0];
+                    res = result.data[0];
                 } else {
-                    this.temp = result.data;
+                    res = result.data;
                 }
             }).catch(error => {
+                res = "none";
                 this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
             });
+            return res;
+        },
+        // 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢噰璐叆搴撳崟鏁版嵁
+        getPushSource_POStockInBillInit(HSourceInterID, HSourceEntryID) {
+            var res = "none";
+            axios.get(this.baseURL + '/Kf_POStockInBill/loadKf_POStockInBillEdit_Push', {
+                params: {
+                    "HInterID": HSourceInterID
+                    , "HSubID": HSourceEntryID
+                },
+            }).then(response => {
+                let result = response.data
+                if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                    res = result.data[0];
+                } else {
+                    res = result.data;
+                }
+            }).catch(error => {
+                res = "none";
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
+            return res;
         },
         handleRowHide() {
             this.rowHideShow = true
@@ -468,19 +674,19 @@
                         this.form.HWHName = deptRow.浠撳簱鍚嶇О;
                     } else if (this.ckType == 'zb') {
                         this.editData[this.zbIndex].HWHID = deptRow.HItemID;
-                        this.editData[this.zbIndex].浠撳簱 = deptRow.浠撳簱鍚嶇О;
+                        this.editData[this.zbIndex].鍙戞枡浠撳簱 = deptRow.浠撳簱鍚嶇О;
                     }
                     this.warehouseShow = false
                     this.openData = false
                 } else if (num == 3) {
+                    console.log(deptRow)
+                    console.log(deptRow.璁¢噺鍗曚綅鍚嶇О)
                     this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
                     this.editData[this.zbIndex].鐗╂枡浠g爜 = deptRow.鐗╂枡浠g爜;
                     this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О;
-                    this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
                     this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿
+                    this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
                     this.editData[this.zbIndex].璁¢噺鍗曚綅 = deptRow.璁¢噺鍗曚綅鍚嶇О
-                    this.editData[this.zbIndex].HTaxPrice = deptRow.鍚◣鎴愭湰浠�
-                    this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼
                     this.materialShow = false
                     this.openData = false
                 } else if (num == 4) {
@@ -491,9 +697,9 @@
                         this.form.HKeeperName = deptRow.鑱屽憳鍚嶇О
                         this.form.HKeeperID = deptRow.HItemID
                     } else if (this.zhiyuanType == 'zhuguan') {
-                        this.form.HMangerName = deptRow.鑱屽憳鍚嶇О
-                        this.form.HMangerID = deptRow.HItemID
-                    } else if (this.zhiyuanType == 'yanshou') {
+                        this.form.HManagerName = deptRow.鑱屽憳鍚嶇О
+                        this.form.HManagerID = deptRow.HItemID
+                    } else if (this.zhiyuanType == 'tuiliaoyuan') {
                         this.form.HSecManagerName = deptRow.鑱屽憳鍚嶇О
                         this.form.HSecManagerID = deptRow.HItemID
                     }
@@ -506,7 +712,7 @@
                     this.openData = false
                 } else if (num == 9) {
                     this.editData[this.zbIndex].HSPID = deptRow.HMainID;
-                    this.editData[this.zbIndex].浠撲綅 = deptRow.浠撲綅鍚嶇О;
+                    this.editData[this.zbIndex].浠撲綅鍚嶇О = deptRow.浠撲綅鍚嶇О;
                     this.gyStockPlaceShow = false
                     this.openData = false
                 }
@@ -531,37 +737,39 @@
         //閿�鍞嚭搴撳崟鏂板缂栬緫琛ㄥ崟鍒濆鍖�
         reset() {
             this.form = {
-                HBillNo:'',
+                HInterID: 0,
+                HBillNo: '',
                 HDate: moment(new Date()).format('YYYY-MM-DD'),
-                HSSDate:moment(new Date()).format('YYYY-MM-DD'),
-                HAddress:'',
-                HDeptName:'',
-                HDeptID:0,
-                HSupID:0,
-                HSupName:'',
-                HEmpID:0,
-                HEmpName:'',
-                HCurID:0,
-                HCurName:'',
-                HExRate:'',
-                HManagerName:'',
-                HManagerID:0,
-                HPSStyleID:0,
-                HPSStyleName:'',
-                HSSID:0,
-                HSSName:'',
-                HLinkMan:'',
-                HLinkPhone:'',
-                HInnerBillNo:'',
-                HRemark:'',
-                HMaker:sessionStorage["HSupName"],
-                HChecker:'',
-                HCloseMan:'',
-                HMakeDate:'',
-                HCheckDate:'',
-                HCloseDate:'',
-                HUpDateDate:'',
-                HDeleteDate:'',
+                HReceiveDate: moment(new Date()).format('YYYY-MM-DD'),
+                HAddress: '',
+                HInnerBillNo: '',
+                HEmpID: 0,
+                HEmpName: '',
+                HDeptName: '',
+                HDeptID: 0,
+                HSupID: 0,
+                HSupName: '',
+                HWHName: '',
+                HWHID: 0,
+                HSecManagerName: '',
+                HSecManagerID: 0,
+                HKeeperName: '',
+                HKeeperID: 0,
+                HManagerName: '',
+                HManagerID: 0,
+                HSourceBillType: '',
+                HExplanation: '',
+                HRemark: '',
+                HMaker: sessionStorage["HSupName"],
+                HChecker: '',
+                HCloseMan: '',
+                HUpDater: '',
+                HDeleteMan: '',
+                HMakeDate: moment(new Date()).format('YYYY-MM-DD'),
+                HCheckDate: '',
+                HCloseDate: '',
+                HUpDateDate: '',
+                HDeleteDate: '',
 
             }
             this.editData = []
@@ -626,16 +834,13 @@
             })
         },
         getHBillNo() {
-            axios.get(this.baseURL + "/Web/GetMAXNum", {
+            axios.get(this.baseURL + "/WEBSController/GetMaxBillNoAndID_Json", {
                 params: {
-                    HBillType: '1242'
+                    HBillType: '1239'
                 }
             }).then(response => {
-                this.form.HMaker = sessionStorage["HUserName"]
                 this.form.HBillNo = response.data.data[0].HBillNo
                 this.form.HInterID = response.data.data[0].HInterID
-                // this.copyType = 0
-                // this.getCzyglByUser()
             }).catch(error => {
                 this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
             });
@@ -646,74 +851,55 @@
         handleUpdate() {
             this.reset()
             let rowHmainid = this.linterid
-            axios.get(this.baseURL + "/Kf_StockOutRequestBill/cx", {
+            axios.get(this.baseURL + "/Kf_POStockInBackBill/cx", {
                 params: { 'HInterID': rowHmainid }
             }).then(response => {
                 if (response.data.count == 1) {
                     var result = response.data
                     var data = response.data.data[0]
                     this.allVal = data
-                    this.form.BillType = data.HSourceBillType
-                    if (this.copyType == 1) {
-                        this.getHBillNo()
-                        let date = new Date()
-                        this.form.HDate = moment(date).format('YYYY-MM-DD')
-                    } else {
-                        this.form.HBillNo = data.鍗曟嵁鍙�
-                        // this.form.HInterID = data.HInterID
-                        this.form.HDate = data.鏃ユ湡
-                        this.form.HMaker = data.鍒跺崟浜�
-                        this.form.HUpDater = data.淇敼浜�
-                        this.form.HChecker = data.瀹℃牳浜�
-                        this.form.HMakeDate = data.鍒跺崟鏃ユ湡
-                        this.form.HUpDateDate = data.淇敼鏃ユ湡
-                        this.form.HCheckDate = data.瀹℃牳鏃ユ湡
-                        this.form.HCloseMan = data.鍏抽棴浜�
-                        this.form.HDeleteMan = data.浣滃簾浜�
-                        this.form.HCloseDate = data.鍏抽棴鏃ユ湡
-                        this.form.HDeleteDate = data.浣滃簾鏃ユ湡
-                    }
-                    this.form.HAddress = data.浜よ揣鍦扮偣
-                    this.form.HDeptName = data.閮ㄩ棬
-                    this.form.HDeptID = data.HDeptID
+                    this.form.HBillNo = data.鍗曟嵁鍙�
+                    this.form.HDate = moment(data.鏃ユ湡).format('YYYY-MM-DD')
+                    this.form.HInnerBillNo = data.鍐呴儴鍗曟嵁鍙�
                     this.form.HSupID = data.HSupID
                     this.form.HSupName = data.渚涘簲鍟�
                     this.form.HEmpID = data.HEmpID
                     this.form.HEmpName = data.涓氬姟鍛�
-                    this.form.HCurID = data.HCurID
-                    this.form.HCurName = data.甯佸埆
-                    this.form.HExRate = data.姹囩巼
-                    this.form.HManagerName = data.涓荤
+                    this.form.HWHID = data.涓昏〃浠撳簱ID
+                    this.form.HWHName = data.涓昏〃浠撳簱
+                    this.form.HSecManagerID = data.HSecManagerID
+                    this.form.HSecManagerName = data.楠屾敹鍛�
+                    this.form.HKeeperID = data.HKeeperID
+                    this.form.HKeeperName = data.淇濈鍛�
+                    this.form.HDeptName = data.閮ㄩ棬
+                    this.form.HDeptID = data.HDeptID
+                    this.form.HSourceBillType = data.婧愬崟绫诲瀷
                     this.form.HManagerID = data.HManagerID
-                    this.form.HPSStyleID = data.HPSStyleID
-                    this.form.HPSStyleName = data.閲囪喘鏂瑰紡
-                    this.form.HSSID = data.HSSID
-                    this.form.HSSName = data.缁撶畻鏂瑰紡
-                    this.form.HLinkMan = data.鑱旂郴浜�
-                    this.form.HLinkPhone = data.鑱旂郴鐢佃瘽
-                    this.form.HInnerBillNo = data.杈呭姪瀛楁
+                    this.form.HManagerName = data.璐熻矗浜�
+                    this.form.HExRate = data.姹囩巼
+                    this.form.HExplanation = data.鎽樿
                     this.form.HRemark = data.琛ㄥご澶囨敞
+                    this.form.HMaker = data.鍒跺崟浜�
+                    this.form.HChecker = data.瀹℃牳浜�
+                    this.form.HCloseMan = data.鍏抽棴浜�
+                    this.form.HUpDater = data.淇敼浜�
+                    this.form.HDeleteDate = data.浣滃簾浜�
+                    this.form.HMakeDate = data.鍒跺崟鏃ユ湡 == null ? "" : moment(data.鍒跺崟鏃ユ湡).format('YYYY-MM-DD hh:mm:ss')
+                    this.form.HCheckDate = data.瀹℃牳鏃ユ湡 == null ? "" : moment(data.瀹℃牳鏃ユ湡).format('YYYY-MM-DD hh:mm:ss')
+                    this.form.HCloseDate = data.鍏抽棴鏃ユ湡 == null ? "" : moment(data.鍏抽棴鏃ユ湡).format('YYYY-MM-DD hh:mm:ss')
+                    this.form.HUpDateDate = data.淇敼鏃ユ湡 == null ? "" : moment(data.淇敼鏃ユ湡).format('YYYY-MM-DD hh:mm:ss')
+                    this.form.HDeleteDate = data.浣滃簾鏃ユ湡 == null ? "" : moment(data.浣滃簾鏃ユ湡).format('YYYY-MM-DD hh:mm:ss')
                     for (var i = 0; i < result.data.length; i++) {
                         this.editData.push(
                             {
-                                "HMaterID": result.data[i].HMaterID,
-                                "鐗╂枡浠g爜": result.data[i].鐗╂枡浠g爜,
-                                "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О,
-                                "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿,
-                                "HUnitID": result.data[i].HUnitID,
-                                "璁¢噺鍗曚綅": result.data[i].璁¢噺鍗曚綅,
-                                "HQty": result.data[i].鏁伴噺,
-                                "HRemark": result.data[i].琛ㄤ綋澶囨敞,
-                                "HPrice": result.data[i].鍗曚环,
-                                "HMoney": result.data[i].閲戦,
-                                "HTaxRate": result.data[i].绋庣巼,
-                                "HTaxMoney": result.data[i].閲戦 * result.data[i].绋庣巼,
-                                "HlineTotal": result.data[i].閲戦 + result.data[i].绋庨,
-                                "HlineTotalBB": (result.data[i].閲戦 + result.data[i].绋庨) * result.data[i].姹囩巼, 
-                                "HTaxPrice": result.data[i].鍚◣鍗曚环,
-                                "HDiscountRate": result.data[i].鎶樻墸鐜�,
-                                "HRelTaxPrice": data.瀹為檯鍚◣鍗曚环,
-                                "HDate": moment(result.data[i].浜よ揣鏃ユ湡).format('YYYY-MM-DD')
+                                "HMaterID": result.data[i].HMaterID, "鐗╂枡浠g爜": result.data[i].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿, "HUnitID": result.data[i].HUnitID, "璁¢噺鍗曚綅": result.data[i].璁¢噺鍗曚綅,
+                                "HQty": result.data[i].瀹炴敹鏁伴噺, "HQtyMust": result.data[i].搴旀敹鏁伴噺, "HRemark": result.data[i].琛ㄤ綋澶囨敞, "HPrice": result.data[i].鍗曚环, "HMoney": result.data[i].閲戦, "HOrderPrice": result.data[i].閲囪喘閲戦, "HWHID": result.data[i].HWHID, "鍙戞枡浠撳簱": result.data[i].鏀舵枡浠撳簱, "HSPID": result.data[i].HSPID, "浠撲綅鍚嶇О": result.data[i].浠撲綅鍚嶇О,
+                                "HBatchNo": result.data[i].鎵规,
+                                "HSourceBillNo": result.data[i].婧愬崟鍗曞彿,    //婧愬崟鍙�
+                                "HSourceBillType": result.data[i].婧愬崟绫诲瀷,   //婧愬崟绫诲瀷
+                                "HSourceInterID": result.data[i].婧愬崟涓诲唴鐮�,   //婧愬崟涓诲唴鐮�
+                                "HSourceEntryID": result.data[i].婧愬崟瀛愬唴鐮�     //婧愬崟瀛愬唴鐮�
+
                             }
                         );
                     }
@@ -734,9 +920,11 @@
                 this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
             } else {
                 let obj = {
-                    "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 1, "璁¢噺鍗曚綅": "", "HWHID": "0", "浠撳簱": "",
-                    "HSPID": "0", "浠撲綅": "", "HSecUnitID": "1", "搴撳瓨杈呭崟浣�": "", "HBASEUNITID": "1", "鍩烘湰鍗曚綅": "",
-                    "HEXTAUXUNITID": "1", "杈呭崟浣�": "", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": ""
+                    "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HQty": "", "HRemark": "",
+                    "HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "鍙戞枡浠撳簱": "",
+                    "HSPID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
+                    "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
+                    "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
                 }
                 if (index) {
                     this.editData.splice(index, 0, obj);
@@ -805,15 +993,60 @@
             }
         },
 
-        // 缂栬緫鎻愪氦淇濆瓨
+        //#region 淇濆瓨鎸夐挳
         submitForm() {
+            //#region 鍒ゆ柇婧愬崟鐘舵��
+            if (this.OperationType == 1 || this.OperationType == 4) {
+                if (this.form.HSourceBillType == "1105") {
+                    for (var i = 0; i < this.editData.length; i++) {
+                        var HSourceBillData = "";
+                        var HSourceBillData = this.getPushSource_POInStockBackInit(this.editData[i].HSourceInterID, this.editData[i].HSourceEntryID);            //鑾峰彇婧愬崟鏁版嵁
+                        if (HSourceBillData != "none") {
+                            if (HSourceBillData == null) {
+                                this.$modal.msgError("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!");
+                                return;
+                            } else if (HSourceBillData.鐘舵�� != "宸插鏍�") {
+                                var err = "淇濆瓨澶辫触!鍘熷洜锛氱" + (i + 1) + "琛�-婧愬崟鍗曟嵁鐘舵�佷负鈥�" + HSourceBillData.鐘舵�� + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
+                                this.$modal.msgError(err);
+                                return;
+                            } else if (HSourceBillData.琛岀姸鎬� == "宸插叧闂�") {
+                                this.$modal.msgError("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細璇ヨ璁板綍琛岀姸鎬佷负'宸插叧闂�'鐘舵��!");
+                                return;
+                            }
+                        } else {
+                            return;
+                        }
+                    }
+                } else if (this.form.HSourceBillType == "1201") {
+                    for (var i = 0; i < this.editData.length; i++) {
+                        var HSourceBillData = "";
+                        var HSourceBillData = this.getPushSource_POStockInBillInit(this.editData[i].HSourceInterID, this.editData[i].HSourceEntryID);            //鑾峰彇婧愬崟鏁版嵁
+                        if (HSourceBillData != "none") {
+                            if (HSourceBillData == null) {
+                                this.$modal.msgError("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!");
+                                return;
+                            }
+                        } else {
+                            return;
+                        }
+                    }
+                }
+                else {
+                    this.$modal.msgError('褰撳墠涓嶆敮鎸佽婧愬崟锛侊紒')
+                    return  
+                }
+            }
+            this.set_SaveBill();
+        },
+        // 缂栬緫鎻愪氦淇濆瓨
+        set_SaveBill() {
             this.$refs["form"].validate(valid => {
                 if (valid) {
                     let fhck = false
                     this.editData.map((item, index) => {
-                        if (!item.浠撳簱) {
+                        if (!item.鐗╂枡浠g爜) {
                             fhck = true
-                            this.$modal.msgError("绗�" + (index + 1) + "琛岋細浠撳簱鏈�夋嫨锛�");
+                            this.$modal.msgError("绗�" + (index + 1) + "琛岋細鐗╂枡浠g爜涓嶈兘涓虹┖锛�");
                         }
                     })
                     this.$nextTick(() => {
@@ -824,15 +1057,16 @@
                             var sMainSub = sMainStr + ';' + sSubStr + ';' + this.OperationType + ";" + sessionStorage["HUserName"] + ';' + sAllStr;
                             axios({
                                 method: 'post',
-                                url: this.baseURL + "/Kf_StockOutRequestBill/StockOutRequestBillEdit",
+                                url: this.baseURL + "/Kf_POStockInBackBill/POStockInBackBillEdit",
                                 data: {
                                     'sMainSub': sMainSub
                                 },
                             }).then(response => {
                                 if (response.data.count == 1) {
-                                    this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�                                   
+                                    this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢� 
+                                    this.checkDisabled = false
                                     this.$modal.msgSuccess(response.data.Message);
-                                    this.close()
+                                    // this.close()
                                 } else {
                                     this.$modal.msgError(response.data.Message);
                                 }
@@ -845,15 +1079,15 @@
             });
         },
         // 鍙嶅鏍�/瀹℃牳鏁版嵁
-        set_CheckBill(num, form) {
-            var InterID = form.hmainid || form.HInterID
+        set_CheckBill(num) {
             //閫昏緫瀹℃牳鏂规硶
-            axios.get(this.baseURL + "/Kf_SellOutBill/AuditKf_SellOutBill", {
+            axios.get(this.baseURL + "/Kf_POStockInBackBill/AuditProcessReportList", {
                 params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
             }).then(response => {
                 let result = response.data
                 if (result.code == 1) {
                     this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+                    this.close()
                 }
                 else {
                     this.$modal.msgError("閿欒:" + result.code + result.Message,);
diff --git a/src/views/purchase/postockInBack/Kf_POStockInBackBillList.vue b/src/views/purchase/postockInBack/Kf_POStockInBackBillList.vue
index f07e780..061e5c7 100644
--- a/src/views/purchase/postockInBack/Kf_POStockInBackBillList.vue
+++ b/src/views/purchase/postockInBack/Kf_POStockInBackBillList.vue
@@ -148,10 +148,10 @@
             </el-collapse>
         </el-form>
         <el-row :gutter="10" class="mb8" style="margin-top: 10px">
-            <el-col :span="1.5">
+              <!-- <el-col :span="1.5">
                 <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit((OperationType = 1))"
                     id="btn-Add">鏂板</el-button>
-            </el-col>
+            </el-col> -->
             <el-col :span="1.5">
                 <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
                     @click="handleEdit((row = rowForm), (OperationType = 3))">缂栬緫</el-button>
@@ -161,7 +161,44 @@
                 </el-button>
             </el-col>
             <el-col :span="1.5">
+                <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single"
+                    @click="set_CheckBill(0)">瀹℃牳
+                </el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single"
+                    @click="set_CheckBill(1)">鍙嶅鏍�
+                </el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single"
+                    @click="set_CloseBill(0)">鍏抽棴
+                </el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single"
+                    @click="set_CloseBill(1)">鍙嶅叧闂�
+                </el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single"
+                    @click="set_DropBill(0)">浣滃簾
+                </el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single"
+                    @click="set_DropBill(1)">鍙嶄綔搴�
+                </el-button>
+            </el-col>
+            <el-col :span="1.5">
                 <el-button type="primary" icon="el-icon-date" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="primary" icon="el-icon-printer" size="mini" @click="get_PrintReport">鎵撳嵃</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single"
+                    @click="get_BarCodeDetail">鏉$爜鏄庣粏</el-button>
             </el-col>
         </el-row>
         <div class="tableBox" v-loading="loading">
@@ -179,7 +216,7 @@
                             <div :style="item.style">
                                 <span v-if="column.property.includes('鏃ユ湡')">{{
                                     parseTime(row[column.property], "{y}-{m}-{d}")
-                                    }}</span>
+                                }}</span>
                                 <el-button type="text" @click="handleEdit(row, (OperationType = 3))"
                                     v-else-if="column.property == '鍗曟嵁鍙�'">{{ row.鍗曟嵁鍙� }}</el-button>
                                 <span v-else>{{ row[column.label] }}</span>
@@ -197,9 +234,12 @@
             <el-dialog title="缂栬緫" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
                 @close="close">
                 <edit :OperationType="OperationType" :linterid="this.rowForm.hmainid"
-                    :HSouceBillType="this.rowForm.HSourceBillType" :copyType="copyType" @editClose="editClose"
+                    HSouceBillType="0" :copyType="copyType" @editClose="editClose"
                     v-if="editShow" />
             </el-dialog>
+            <PrintList :linterid="this.rowForm.hmainid" :MyMsg="this.rowForm.hmainid" Type="HPOInStockBill"
+                HModName="HPOInStockBill" @rowEditClose="rowSetClose" v-if="printListShow" />
+            <BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail" />
         </div>
     </div>
 </template>
@@ -207,7 +247,7 @@
 <script>
 import axios from "axios";
 import RowSettings from "@/views/component/rowSettings";
-import Edit from "@/views/warehouse/shipment/Kf_StockOutRequestBill.vue";
+import Edit from "@/views/purchase/postockInBack/Kf_POStockInBackBill.vue";
 import PrintList from "@/views/component/printList";
 import BarCodeDetail from '@/views/component/BarCodeDetail'               //鏉$爜鏄庣粏缁勪欢
 import moment from "moment";
@@ -410,7 +450,7 @@
                         this.total = data1.count;
                         var data = []; //鍒楀瓧娈垫暟鎹�
                         var col = [];
-                        var totalArray = ["閲戦","閲囪喘閲戦","搴旈��鏁伴噺","瀹為��鏁伴噺"];
+                        var totalArray = ["閲戦", "閲囪喘閲戦", "搴旈��鏁伴噺", "瀹為��鏁伴噺"];
                         //缁欑┖鐨勬暟缁勮祴鍊�
                         for (var key in data1.list) {
                             //寰簭閬嶅巻鏁扮粍
@@ -857,6 +897,97 @@
                 });
             }).catch(() => { });
         },
+        set_CheckBill(num) {
+            //閫昏緫瀹℃牳鏂规硶
+            axios.get(this.baseURL + "/Kf_POStockInBackBill/AuditProcessReportList", {
+                params: { "HInterID": this.rowForm.hmainid, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
+            }).then(response => {
+                let result = response.data
+                if (result.code == 1) {
+                    this.checkDisabled = true
+                    this.abandoncheckDisabled = false
+                    this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+                }
+                else {
+                    this.$modal.msgError("閿欒:" + result.code + result.Message,);
+                }
+            }).catch(error => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
+        },
+        set_CloseBill(num) {
+            //閫昏緫鍏抽棴鏂规硶
+            axios.get(this.baseURL + "/Kf_POStockInBackBill/CloseKf_POStockInBackBill", {
+                params: { "HInterID": this.rowForm.hmainid, "Type": num, "CurUserName": sessionStorage["HUserName"] }
+            }).then(response => {
+                let result = response.data
+                if (result.code == 1) {
+                    this.checkDisabled = true
+                    this.abandoncheckDisabled = false
+                    this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+                }
+                else {
+                    this.$modal.msgError("閿欒:" + result.code + result.Message,);
+                }
+            }).catch(error => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
+        },
+        set_DropBill(num) {
+            //閫昏緫浣滃簾鏂规硶
+            axios.get(this.baseURL + "/Kf_POStockInBackBill/DropKf_POStockInBackBill", {
+                params: { "HInterID": this.rowForm.hmainid, "Type": num, "CurUserName": sessionStorage["HUserName"] }
+            }).then(response => {
+                let result = response.data
+                if (result.code == 1) {
+                    this.checkDisabled = true
+                    this.abandoncheckDisabled = false
+                    this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+                }
+                else {
+                    this.$modal.msgError("閿欒:" + result.code + result.Message,);
+                }
+            }).catch(error => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
+        },
+        //鎵撳嵃
+        get_PrintReport() {
+            if (this.ids.length != 1) {
+                this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�");
+            } else {
+                 this.printListShow = true;
+                            this.openPrintList = true;
+                // axios.get(this.baseURL + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
+                //         params: { HInterID: this.rowForm.hmainid },
+                //     })
+                //     .then((response) => {
+                //         var result = response.data;
+                //         if (result.count == 1) {
+                //             this.printListShow = true;
+                //             this.openPrintList = true;
+                //             // this.$router.push({ path:'/printList', query: { linterid: this.rowForm.hmainid,MyMsg:this.rowForm.hmainid,Type:'Kf_SellOutBillList' }})
+                //         } else {
+                //             this.$modal.msgError(result.code + result.Message);
+                //         }
+                //     })
+                //     .catch((error) => {
+                //         this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+                //     });
+            }
+            //  var content= ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
+        },
+        //#region 鏉$爜鏄庣粏
+        get_BarCodeDetail() {
+            // if (this.selectedRow.length !== 1) {
+            //   this.$message.warning('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬫潯鐮佹槑缁嗭紒')
+            //   return
+            // }
+            this.barCodeDetailShow = true
+            this.$nextTick(() => {
+                this.$refs.barcodeDetail.open(this.rowForm)
+            })
+        },
     },
 };
 </script>
diff --git a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
index 710cc10..b584641 100644
--- a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
+++ b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
@@ -131,6 +131,36 @@
                 </el-button>
             </el-col>
             <el-col :span="1.5">
+                <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single"
+                    @click="set_CheckBill(0)">瀹℃牳
+                </el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single"
+                    @click="set_CheckBill(1)">鍙嶅鏍�
+                </el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single"
+                    @click="set_CloseBill(0)">鍏抽棴
+                </el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single"
+                    @click="set_CloseBill(1)">鍙嶅叧闂�
+                </el-button>
+            </el-col>
+    <el-col :span="1.5">
+                <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single"
+                    @click="set_DropBill(0)">浣滃簾
+                </el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single"
+                    @click="set_DropBill(1)">鍙嶄綔搴�
+                </el-button>
+            </el-col>
+            <el-col :span="1.5">
                 <el-button type="primary" icon="el-icon-date" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
             </el-col>
         </el-row>
@@ -149,7 +179,7 @@
                             <div :style="item.style">
                                 <span v-if="column.property.includes('鏃ユ湡')">{{
                                     parseTime(row[column.property], "{y}-{m}-{d}")
-                                }}</span>
+                                    }}</span>
                                 <el-button type="text" @click="handleEdit(row, (OperationType = 3))"
                                     v-else-if="column.property == '鍗曟嵁鍙�'">{{ row.鍗曟嵁鍙� }}</el-button>
                                 <span v-else>{{ row[column.label] }}</span>
@@ -177,7 +207,7 @@
 <script>
 import axios from "axios";
 import RowSettings from "@/views/component/rowSettings";
-import Edit from "@/views/warehouse/shipment/Kf_StockOutRequestBill.vue";
+import Edit from "@/views/scMould/basicModeling/Gy_MaterialPackingRelation_Edit.vue";
 import PrintList from "@/views/component/printList";
 import BarCodeDetail from '@/views/component/BarCodeDetail'               //鏉$爜鏄庣粏缁勪欢
 import moment from "moment";
@@ -825,6 +855,60 @@
                 });
             }).catch(() => { });
         },
+        set_CheckBill(num) {
+            //閫昏緫瀹℃牳鏂规硶
+            axios.get(this.baseURL + "/Sc_MouldinventoryBill/CheckGy_MaterialMouldBillMain", {
+                params: { "HInterID": this.rowForm.hmainid, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
+            }).then(response => {
+                let result = response.data
+                if (result.code == 1) {
+                    this.checkDisabled = true
+                    this.abandoncheckDisabled = false
+                    this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+                }
+                else {
+                    this.$modal.msgError("閿欒:" + result.code + result.Message,);
+                }
+            }).catch(error => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
+        },
+        set_CloseBill(num) {
+            //閫昏緫鍏抽棴鏂规硶
+            axios.get(this.baseURL + "/Gy_MaterialPackingRelation/CloseGy_MaterialPackingRelation", {
+                params: { "HInterID": this.rowForm.hmainid, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
+            }).then(response => {
+                let result = response.data
+                if (result.code == 1) {
+                    this.checkDisabled = true
+                    this.abandoncheckDisabled = false
+                    this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+                }
+                else {
+                    this.$modal.msgError("閿欒:" + result.code + result.Message,);
+                }
+            }).catch(error => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
+        },
+        set_DropBill(num) {
+            //閫昏緫浣滃簾鏂规硶
+            axios.get(this.baseURL + "/Gy_MaterialPackingRelation/DeleteGy_MaterialPackingRelation", {
+                params: { "HInterID": this.rowForm.hmainid, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
+            }).then(response => {
+                let result = response.data
+                if (result.code == 1) {
+                    this.checkDisabled = true
+                    this.abandoncheckDisabled = false
+                    this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+                }
+                else {
+                    this.$modal.msgError("閿欒:" + result.code + result.Message,);
+                }
+            }).catch(error => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
+        },
     },
 };
 </script>
diff --git a/src/views/scMould/basicModeling/Gy_MaterialPackingRelation_Edit.vue b/src/views/scMould/basicModeling/Gy_MaterialPackingRelation_Edit.vue
new file mode 100644
index 0000000..a5f41c5
--- /dev/null
+++ b/src/views/scMould/basicModeling/Gy_MaterialPackingRelation_Edit.vue
@@ -0,0 +1,830 @@
+<template>
+    <div v-loading="formLoading" v-if="formShow">
+        <div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
+            <el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
+            <el-button type="primary" @click="close">閫� 鍑�</el-button>
+            <el-button type="primary" @click="set_CheckBill(0)" :disabled="checkDisabled">瀹� 鏍�</el-button>
+            <el-button type="primary" @click="set_CheckBill(1)" :disabled="abandoncheckDisabled">鍙嶅鏍�</el-button>
+        </div>
+        <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">浜у搧鍖呰鍏宠仈淇℃伅</div>
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+            <el-tabs v-model="activeName" type="card">
+                <el-tab-pane label="鍩烘湰淇℃伅" name="first">
+                    <el-row>
+                        <el-col :span="6">
+                            <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+                                <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" disabled />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="鏃ユ湡" prop="HDate">
+                                <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡"
+                                    value-format="yyyy-MM-ddT">
+                                </el-date-picker>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="椤圭洰鍚嶇О" prop="HProjectName">
+                                <el-input v-model="form.HProjectName" placeholder="璇疯緭鍏ラ」鐩悕绉�" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="瀹㈡埛" prop="HCusName">
+                                <el-input v-model="form.HCusName" placeholder="璇疯緭鍏ュ鎴�" disabled>
+                                    <el-button slot="append" icon="el-icon-search"
+                                        @click="openDataDialog(7)"></el-button>
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="6">
+                            <el-form-item label="鐗╂枡浠g爜" prop="HMaterNumber">
+                                <el-input v-model="form.HMaterNumber" placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�" disabled>
+                                    <el-button slot="append" icon="el-icon-search"
+                                        @click="openDataDialog(3)"></el-button>
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="鐗╂枡鍚嶇О" prop="HMaterName">
+                                <el-input v-model="form.HMaterName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" disabled />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="瑙勬牸鍨嬪彿" prop="HMaterModel">
+                                <el-input v-model="form.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" disabled />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="澶囨敞" prop="HRemark">
+                                <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="6">
+                            <el-form-item label="缁勭粐" prop="HOrgID" label-width="128px">
+                                <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨" disabled>
+                                    <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name"
+                                        :value="item.ID">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-tab-pane>
+                <el-tab-pane label="鍒跺崟淇℃伅" name="third">
+                    <el-row>
+                        <el-col :span="6">
+                            <el-form-item label="鍒跺崟浜�" prop="HMaker">
+                                <el-input v-model="form.HMaker" placeholder="璇疯緭鍏ュ埗鍗曚汉" disabled />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="淇敼浜�" prop="HUpDater">
+                                <el-input v-model="form.HUpDater" placeholder="璇疯緭鍏ヤ慨鏀逛汉" disabled />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="瀹℃牳浜�" prop="HChecker">
+                                <el-input v-model="form.HChecker" placeholder="璇疯緭鍏ュ鏍镐汉" disabled />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="鍏抽棴浜�" prop="HCloseMan">
+                                <el-input v-model="form.HCloseMan" placeholder="璇疯緭鍏ュ叧闂汉" disabled />
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="6">
+                            <el-form-item label="鍒跺崟鏃ユ湡" prop="HMakeDate">
+                                <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" disabled>
+                                </el-date-picker>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="淇敼鏃ユ湡" prop="HUpDateDate">
+                                <el-date-picker v-model="form.HUpDateDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+                                </el-date-picker>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="瀹℃牳鏃ユ湡" prop="HCheckDate">
+                                <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+                                </el-date-picker>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="鍏抽棴鏃ユ湡" prop="HCloseDate">
+                                <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" disabled>
+                                </el-date-picker>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="6">
+                            <el-form-item label="浣滃簾浜�" prop="HDeleteMan">
+                                <el-input v-model="form.HDeleteMan" placeholder="璇疯緭鍏ヤ綔搴熶汉" disabled />
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="6">
+                            <el-form-item label="浣滃簾鏃ユ湡" prop="HDeleteDate">
+                                <el-date-picker v-model="form.HDeleteDate" type="date" placeholder="閫夋嫨浣滃簾鏃ユ湡" disabled>
+                                </el-date-picker>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-tab-pane>
+            </el-tabs>
+            <div style="margin-bottom: 10px;">
+                <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb()"
+                    size="mini">澧炲姞涓�琛�</el-button>
+                <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(zbIndex, 1)"
+                    size="mini">鎻掑叆涓�琛�</el-button>
+                <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow"
+                    size="mini">澶嶅埗涓�琛�</el-button>
+                <el-button type="success" plain icon="el-icon-arrow-up" @click="handleMoveRowUp(zbSelForm)"
+                    size="mini">涓婄Щ</el-button>
+                <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
+                    size="mini">涓嬬Щ</el-button>
+            </div>
+            <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
+                @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
+                <el-table-column type="selection" width="55" align="center" />
+                <el-table-column align="center" label="搴忓彿" type="index" width="80" />
+                <el-table-column align="center" label="鍖呰瀹瑰櫒浠g爜" width="120">
+                    <template slot-scope="scope">
+                        <el-input v-model="scope.row.HMouldNumber" placeholder="璇疯緭鍏ュ寘瑁呭鍣ㄤ唬鐮�"
+                            @keyup.native.f7="openDataDialog(8, scope.row)"
+                            @dblclick.native="openDataDialog(8, scope.row)" />
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" label="鍖呰瀹瑰櫒鍚嶇О" width="120">
+                    <template slot-scope="scope">
+                        <span>{{ scope.row.HMouldName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" label="鍖呰瀹瑰櫒鍒嗙被" width="120">
+                    <template slot-scope="scope">
+                        <span>{{ scope.row.HMouldType }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" label="鍖呰瀹瑰櫒鐢ㄩ��" width="120">
+                    <template slot-scope="scope">
+                        <span>{{ scope.row.HMouldPurpose }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" label="鍖呰瀹瑰櫒闀垮害" width="120">
+                    <template slot-scope="scope">
+                        <span>{{ scope.row.HMouldLength }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" label="鍖呰瀹瑰櫒楂樺害" width="120">
+                    <template slot-scope="scope">
+                        <span>{{ scope.row.HMouldHeight }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" label="鎶樺彔楂樺害" width="120">
+                    <template slot-scope="scope">
+                        <span>{{ scope.row.HMouldFoldHeight }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" label="瀹瑰櫒鍖呰浜у搧鏁伴噺" width="130">
+                    <template slot-scope="scope">
+                        <el-input-number v-model="scope.row.HSNP" :min="0" style="width: 90px;"
+                            controls-position="right"></el-input-number>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" label="鍛ㄨ浆瀹瑰櫒鏍囪" width="120">
+                    <template slot-scope="scope">
+                        <el-select v-model="scope.row.HTransPackFlag" placeholder="璇烽�夋嫨" style="width: 100%">
+                            <el-option label="鍚�" :value='0' />
+                            <el-option label="鏄�" :value='1' />
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" label="鍙戣揣瀹瑰櫒鏍囪" width="120">
+                    <template slot-scope="scope">
+                        <el-select v-model="scope.row.HSendPackFlag" placeholder="璇烽�夋嫨" style="width: 100%">
+                            <el-option label="鍚�" :value='0' />
+                            <el-option label="鏄�" :value='1' />
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" label="榛樿鍛ㄨ浆瀹瑰櫒鏍囪" width="130">
+                    <template slot-scope="scope">
+                        <el-select v-model="scope.row.HDefaultTransPackFlag" placeholder="璇烽�夋嫨" style="width: 100%">
+                            <el-option label="鍚�" :value='0' />
+                            <el-option label="鏄�" :value='1' />
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" label="榛樿鍙戣揣瀹瑰櫒鏍囪" width="130">
+                    <template slot-scope="scope">
+                        <el-select v-model="scope.row.HDefaultSendPackFlag" placeholder="璇烽�夋嫨" style="width: 100%">
+                            <el-option label="鍚�" :value='0' />
+                            <el-option label="鏄�" :value='1' />
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" label="鍚敤鏍囪" width="120">
+                    <template slot-scope="scope">
+                        <el-select v-model="scope.row.HUseFlag" placeholder="璇烽�夋嫨" style="width: 100%">
+                            <el-option label="鍚�" :value='0' />
+                            <el-option label="鏄�" :value='1' />
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" label="澶囨敞" width="120">
+                    <template slot-scope="scope">
+                        <el-input v-model="scope.row.HRemark" />
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button type="danger" icon="el-icon-delete" size="mini" circle
+                            @click="handleDeleteSysZb(scope.row)"></el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-form>
+        <!-- 寮圭獥 -->
+        <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
+            <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="deptShow" />
+            <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="warehouseShow" />
+            <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="materialShow" />
+            <GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
+            <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
+            <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
+            <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
+            <GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
+
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
+                <el-button @click="deptClose">鍙� 娑�</el-button>
+            </div>
+        </el-dialog>
+        <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+            <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import axios from 'axios'
+import RowSettings from '@/views/component/rowSettings'
+import Dept from '@/views/basic/gy/gyDepartment.vue'
+import Warehouse from '@/views/basic/gyWarehouse/gyWarehouse.vue'
+import Material from '@/views/gyMaterial/GyMaterial.vue'
+import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
+import GySupplier from '@/views/basic/gy/gySupplier.vue'
+import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
+import GyCustomer from '@/views/GyCustomer'
+import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
+import moment from 'moment';
+export default {
+    name: 'Kf_StockOutRequestBill',
+    components: { Dept, Warehouse, Material, RowSettings, GyEmployee, GySupplier, GyStockPlace, GyCustomer, GyMould },
+    props: {
+        OperationType: { type: Number, },
+        linterid: { type: Number, },
+        HSouceBillType: { type: String, },
+        propsData: { type: String, },
+        copyType: { type: Number, },
+    },
+    data() {
+        return {
+            HModName: "Kf_StockOutRequestBill",
+            checkDisabled: true,
+            abandoncheckDisabled: true,
+            allVal: undefined,
+            zhiyuanType: '',
+            ckType: '',
+            formShow: false,
+            temp: undefined,
+            formLoading: true,
+            zzSelDis: false,
+            rowHideShow: false,
+            openRowHide: false,
+            hPriceTypeList: ['鎴愭湰浠�', '缁撶畻浠�'],
+            addBtnShow: false,
+            zbIndex: null,
+            zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
+            dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+            deptShow: false,//閮ㄩ棬鏁版嵁缁勪欢
+            warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
+            materialShow: false,//鐗╂枡鏁版嵁缁勪欢
+            gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
+            gySupplierShow: false,
+            gyStockPlaceShow: false,
+            gyCustomerShow: false,
+            gyMouldShow: false,
+            deptform: {},//寮圭獥閫変腑鏁版嵁
+            openData: false,//鏁版嵁寮圭獥
+            dialogTitle: '',
+            organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
+            subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+            // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+            HInterID: null,
+            baseURL: process.env.VUE_APP_BASE_API,
+            checkedSysZb: [],
+            editData: [],//閿�鍞嚭搴撳崟瀛愯〃
+            editBtData: [],//瀛愯〃琛ㄥご
+            activeName: 'first',
+            // 寮瑰嚭灞傛爣棰�
+            title: "",
+            // 鏄惁鏄剧ず寮瑰嚭灞�
+            open: false,
+            // 鏃ユ湡鑼冨洿
+            dateRange: [],
+            // 鏌ヨ鍙傛暟
+            queryParams: {
+                HBillNo: '',
+                HInitTimeCycle: 29,
+                HProjectNumber: '',
+                HCusID: null,
+                HMaterNumber: '',
+                HMaterName: '',
+                ColName1: '',
+                ColName2: '',
+                ColName: '',
+                Comparator1: '',
+                Comparator2: '',
+                Comparator: '',
+                ColContent1: '',
+                ColContent2: '',
+                ColContent: '',
+            },
+            // 鏄剧ず鎼滅储鏉′欢
+            showSearch: true,
+            // 閫変腑鏁扮粍
+            ids: [],
+            // 闈炲崟涓鐢�
+            single: true,
+            // 闈炲涓鐢�
+            multiple: true,
+            // 閬僵灞�
+            loading: true,
+            btResList: [],
+            // 琛ㄥ崟鍙傛暟
+            form: {},
+            // 琛ㄥ崟鏍¢獙
+            rules: {
+                HCusName: [
+                    { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
+                ],
+                HMaterNumber: [
+                    { required: true, message: "鐗╂枡淇℃伅涓嶈兘涓虹┖", trigger: "blur" }
+                ]
+            }
+        };
+    },
+    created() {
+        this.getdata()
+    },
+    methods: {
+        getdata() {
+            this.formShow = false
+            this.formLoading = true
+            if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
+                this.handleAdd()
+            } else if (this.OperationType == 3 || this.copyType == 1) {
+                this.handleUpdate()
+            }
+        },
+        // 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
+        getUrlVars_JSON() {
+            var datajson;
+            var str = this.propsData; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
+            var arr = str.substring(str.lastIndexOf("=") + 1);
+            datajson = JSON.parse(decodeURI(arr));
+            return datajson;
+        },
+        //鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢攢鍞鍗曟暟鎹�
+        getPushSourceBillInit(HSourceInterID, HSourceEntryID) {
+            axios.get(this.baseURL + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
+                params: {
+                    "HInterID": HSourceInterID
+                    , "HSubID": HSourceEntryID
+                },
+            }).then(response => {
+                let result = response.data
+                if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                    this.temp = result.data[0];
+                } else {
+                    this.temp = result.data;
+                }
+            }).catch(error => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
+        },
+        handleRowHide() {
+            this.rowHideShow = true
+            this.openRowHide = true
+        },
+        rowSetClose(val) {
+            this.rowHideShow = false
+            this.openRowHide = val
+        },
+
+        organizationChange(val) {
+            // let options=undefined
+            //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+        },
+        //閮ㄩ棬寮圭獥璧嬪��
+        dbEmitData(deptRow, num) {
+            // num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
+            if (deptRow.HItemID||deptRow.hmainid) {
+                if (num == 3) {
+                    this.form.HMaterID = deptRow.HItemID;
+                    this.form.HMaterNumber = deptRow.鐗╂枡浠g爜;
+                    this.form.HMaterName = deptRow.鐗╂枡鍚嶇О;
+                    this.form.HMaterModel = deptRow.瑙勬牸鍨嬪彿
+                    this.materialShow = false
+                    this.openData = false
+                } else if (num == 7) {
+                    this.form.HCusName = deptRow.瀹㈡埛鍚嶇О
+                    this.form.HCusID = deptRow.HItemID
+                    this.gyCustomerShow = false
+                    this.openData = false
+                } else if (num == 8) {
+                    this.editData[this.zbIndex].HMouldID = deptRow.hmainid;
+                    this.editData[this.zbIndex].HMouldNumber = deptRow.妯″叿缂栧彿;
+                    this.editData[this.zbIndex].HMouldName = deptRow.妯″叿鍚嶇О;
+                    this.gyMouldShow = false
+                    this.openData = false
+                }
+            } else {
+                this.$modal.msgError("璇烽�夋嫨鍗曟潯鏁版嵁!");
+            }
+
+        },
+        emitData(deptRow, num) {
+            this.dialogTypeNum = num
+            this.deptform = deptRow
+        },
+        deptClickSub() {
+            this.dbEmitData(this.deptform, this.dialogTypeNum)
+            this.deptform = {}
+        },
+        deptClose() {
+            this.deptform = {}
+            this.openData = false
+        },
+
+        //閿�鍞嚭搴撳崟鏂板缂栬緫琛ㄥ崟鍒濆鍖�
+        reset() {
+            this.form = {
+                HInterID: 0,
+                HBillNo: '',
+                HDate: moment(new Date()).format('YYYY-MM-DD'),
+                HProjectName: '',
+                HCusName: '',
+                HCusID: 0,
+                HMaterNumber: '',
+                HMaterID: 0,
+                HMaterName: '',
+                HMaterModel: '',
+                HOrgID: sessionStorage["OrganizationID"] - 0,
+                HRemark: '',
+                HMaker: sessionStorage["HSupName"],
+                HChecker: '',
+                HDeleteMan: '',
+                HUpDater: '',
+                HCloseMan: '',
+                HMakerDate: moment(new Date()).format('YYYY-MM-DD'),
+                HCheckDate: '',
+                HCloseDate: '',
+                HUpDateDate: '',
+                HDeleteDate: '',
+            }
+            this.editData = []
+            this.editBtData = []
+            this.ids = []
+            this.subDisabled = false
+            this.addBtnShow = false
+            // this.$refs.tableData.clearSelection()
+            this.activeName = 'first'
+            this.resetForm("form");
+        },
+        //閫�鍑�
+        close() {
+            this.reset()
+            if (!this.OperationType && !this.copyType) {
+                const obj = { fullPath: this.$route.path, path: this.$route.path, name: this.$route.name, };
+                this.$tab.closePage(obj).then(res => {
+                    const latestView = res.visitedViews.slice(-1)[0]
+                    if (latestView) {
+                        this.$router.push(latestView.fullPath)
+                    } else {
+                        if (obj.name === 'Dashboard') {
+                            this.$router.replace({ path: '/redirect' + obj.fullPath })
+                        } else {
+                            this.$router.push('/')
+                        }
+                    }
+                });
+            } else {
+                this.formShow = false
+                this.$emit('editClose', false)
+            }
+        },
+        //鏍规嵁鐢ㄦ埛鑾峰彇瀵瑰簲鑱屽憳銆侀儴闂ㄣ�侀攢鍞富绠�
+        getCzyglByUser() {
+            axios.get(this.baseURL + '/Xs_SeOrderBill/getCzyglByUser', {
+                params: { "CurUserName": sessionStorage["HUserName"] }
+            }).then(response => {
+                let dataForm = response.data.data[0]
+                this.form.HDeptID = dataForm.HDeptID
+                this.form.HDeptName = dataForm.HDeptName
+                this.form.HEmpID = dataForm.HEmpID
+                this.form.HEmpName = dataForm.HEmpName
+                this.form.HManagerID = dataForm.HManagerID
+                this.form.HManagerName = dataForm.HManagerName
+            }).catch(error => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
+        },
+        /** 鏂板鎸夐挳鎿嶄綔 */
+        handleAdd() {
+            this.reset()
+            //鏂板鑾峰彇鍗曟嵁鍙�
+            this.getHBillNo()
+            this.form.HDate = moment(new Date()).format('YYYY-MM-DDTHH:mm:ss')
+            if (this.OperationType == 1) {
+                this.handleAddSysZb()
+            }
+            this.$nextTick(() => {
+                this.formShow = true
+                this.formLoading = false
+            })
+        },
+        getHBillNo() {
+            axios.get(this.baseURL + "/Web/GetMAXNum", {
+                params: {
+                    HBillType: '3339'
+                }
+            }).then(response => {
+                this.form.HMaker = sessionStorage["HUserName"]
+                this.form.HBillNo = response.data.data[0].HBillNo
+                this.form.HInterID = response.data.data[0].HInterID
+                // this.copyType = 0
+                // this.getCzyglByUser()
+            }).catch(error => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
+        },
+        /** 淇敼鎸夐挳鎿嶄綔 */
+        handleUpdate() {
+            this.reset()
+            let rowHmainid = this.linterid.toString()
+            axios.get(this.baseURL + "/Gy_MaterialPackingRelation/Gy_MaterialPackingRelationEditList", {
+                params: { 'HInterID': rowHmainid, "user": sessionStorage["HUserName"] }
+            }).then(response => {
+                if (response.data.count == 1) {
+                    var result = response.data
+                    var data = response.data.data[0]
+                    this.allVal = data
+                    this.form.BillType = data.HSourceBillType
+                    if (this.copyType == 1) {
+                        this.getHBillNo()
+                    } else {
+                        this.form.HInterID = data.HInterID
+                        this.form.HBillNo = data.鍗曟嵁鍙�
+                        this.form.HDate = data.鏃ユ湡
+                        this.form.HMaker = data.鍒跺崟浜�
+                        this.form.HUpDater = data.淇敼浜�
+                        this.form.HChecker = data.瀹℃牳浜�
+                        this.form.HMakeDate = data.鍒跺崟鏃ユ湡
+                        this.form.HUpDateDate = data.淇敼鏃ユ湡
+                        this.form.HCheckDate = data.瀹℃牳鏃ユ湡
+                        this.form.HCloseMan = data.鍏抽棴浜�
+                        this.form.HDeleteMan = data.浣滃簾浜�
+                        this.form.HCloseDate = data.鍏抽棴鏃ユ湡
+                        this.form.HDeleteDate = data.浣滃簾鏃ユ湡
+                        this.checkDisabled = false
+                        this.abandoncheckDisabled = false
+                    }
+                    this.form.HCusID = data.HCusID
+                    this.form.HCusName = data.瀹㈡埛
+                    this.form.HProjectName = data.椤圭洰鍚嶇О
+                    this.form.HMaterID = data.HMaterID
+                    this.form.HMaterNumber = data.鐗╂枡浠g爜
+                    this.form.HMaterName = data.鐗╂枡鍚嶇О
+                    this.form.HMaterModel = data.鐗╂枡鍨嬪彿
+                    this.form.HRemark = data.澶囨敞
+                    this.form.HOrgID = data.HOrgID
+                    this.editData = result.data
+                }
+                this.formShow = true
+                this.formLoading = false
+            }).catch(error => {
+                console.log(error)
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
+        },
+        /** 瀛愯〃鏄庣粏搴忓彿 */
+        rowSysZbIndex({ row, rowIndex }) {
+            row.index = rowIndex + 1;
+        },
+        /** 缂栬緫椤靛瓙琛ㄦ坊鍔犳寜閽搷浣� */
+        handleAddSysZb(index, num) {
+            if (num == 1 && !index) {
+                this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
+            } else {
+                let obj = {
+                    "HMouldID": 0,
+                    "HMouldNumber": "",
+                    "HMouldName": "",
+                    "HMouldType": "",
+                    "HMouldPurpose": "",
+                    "HMouldLength": 0,
+                    "HMouldWidth": 0,
+                    "HMouldHeight": 0,
+                    "HMouldFoldHeight": 0,
+                    "HSNP": 0,
+                    "HTransPackFlag": 0,
+                    "HSendPackFlag": 0,
+                    "HDefaultTransPackFlag": 0,
+                    "HDefaultSendPackFlag": 0,
+                    "HUseFlag": 0,
+                    "HRemark": ""
+                }
+                if (index) {
+                    this.editData.splice(index, 0, obj);
+                    this.$set(this.editData, index, obj)
+                } else {
+                    this.editData.push(obj);
+                }
+            }
+        },
+        handleCopyZbRow() {
+            if (!this.zbIndex) {
+                this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+            } else {
+                let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
+                this.editData.push(copyRow);
+            }
+        },
+        handleMoveRowUp(zbSelForm) {
+            if (!this.zbIndex) {
+                this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+            } else {
+                if (zbSelForm.index == 1) {
+                    this.$modal.msgError("绗竴琛屾暟鎹棤娉曚笂绉�");
+                } else { // 纭繚涓嶆槸绗竴琛�
+                    let num = zbSelForm.index - 1
+                    const record = this.editData.splice(num, 1)[0];
+                    this.editData.splice(num - 1, 0, record);
+                }
+            }
+        },
+        handleMoveRowDown(zbSelForm) {
+            if (!this.zbIndex) {
+                this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+            } else {
+                if (zbSelForm.index == this.editData.length) {
+                    this.$modal.msgError("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉�");
+                } else { // 纭繚涓嶆槸绗竴琛�
+                    let num = zbSelForm.index - 1
+                    const record = this.editData.splice(num, 1)[0];
+                    this.editData.splice(num + 1, 0, record);
+                }
+            }
+        },
+        /** 缂栬緫椤靛瓙琛ㄥ垹闄ゆ寜閽搷浣� */
+        handleDeleteSysZb(row) {
+            this.checkedSysZb = []
+            this.checkedSysZb.push(row.index)
+            if (this.checkedSysZb.length == 0) {
+                this.$modal.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑鍟嗗搧璁㈠崟鏄庣粏鏁版嵁");
+            } else {
+                const editData = this.editData;
+                const checkedSysZb = this.checkedSysZb;
+                this.editData = editData.filter(function (item) {
+                    return checkedSysZb.indexOf(item.index) == -1
+                });
+            }
+        },
+        /** 缂栬緫椤靛瓙琛ㄥ閫夋閫変腑鏁版嵁 */
+        handleTableZbEdit(selection) {
+            this.checkedSysZb = selection.map(item => item.index)
+            this.zbSelForm = selection[0]
+            this.zbIndex = this.checkedSysZb[0]
+            if (selection.length > 1) {
+                const del_row = selection.shift()
+                this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+            }
+        },
+
+        // 缂栬緫鎻愪氦淇濆瓨
+        submitForm() {
+            this.$refs["form"].validate(valid => {
+                if (valid) {
+                    let fhck = false
+                    this.editData.map((item, index) => {
+                        if (!item.HMouldID) {
+                            fhck = true
+                            this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍖呰瀹瑰櫒涓嶈兘涓虹┖锛�");
+                        }
+                    })
+                    var refSav = "";
+                    if (this.OperationType == 1 || this.OperationType == 2) {
+                        refSav = "Add";
+                    }
+                    if (this.OperationType == 3) {
+                        refSav = "Update";
+                        this.form.HUpdater = sessionStorage["HUserName"];
+                        this.form.HUpdaterDate = moment(new Date()).format('YYYY-MM-DD')
+                    }
+                    this.$nextTick(() => {
+                        if (!fhck) {
+                            var sMainStr = JSON.stringify(this.form);
+                            var sSubStr = JSON.stringify(this.editData);
+                            var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ";" + sessionStorage["HUserName"];
+                            axios({
+                                method: 'post',
+                                url: this.baseURL + "/Gy_MaterialPackingRelation/SaveGy_MaterialPackingRelation",
+                                data: {
+                                    'sMainSub': sMainSub
+                                },
+                            }).then(response => {
+                                if (response.data.count == 1) {
+                                    this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�    
+                                    this.checkDisabled = false
+                                    this.$modal.msgSuccess(response.data.Message);
+                                    // this.close()
+                                } else {
+                                    this.$modal.msgError(response.data.Message);
+                                }
+                            }).catch(error => {
+                                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+                            });
+                        }
+                    })
+                }
+            });
+        },
+        // 鍙嶅鏍�/瀹℃牳鏁版嵁
+        set_CheckBill(num) {
+            //閫昏緫瀹℃牳鏂规硶
+            axios.get(this.baseURL + "/Sc_MouldinventoryBill/CheckGy_MaterialMouldBillMain", {
+                params: { "HInterID": this.form.HInterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
+            }).then(response => {
+                let result = response.data
+                if (result.code == 1) {
+                    this.checkDisabled = true
+                    this.abandoncheckDisabled = false
+                    this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+                }
+                else {
+                    this.$modal.msgError("閿欒:" + result.code + result.Message,);
+                }
+            }).catch(error => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
+        },
+        showReset() {
+            this.deptShow = false
+            this.warehouseShow = false
+            this.materialShow = false
+            this.gyEmployeeShow = false
+            this.gySupplierShow = false
+            this.gyStockPlaceShow = false
+            this.gyCustomerShow = false
+            this.gyMouldShow = false
+        },
+        //  鎵撳紑鏁版嵁鍒楄〃寮圭獥
+        openDataDialog(num, row) {
+            //num1閮ㄩ棬锛�2鍑哄簱浠撳簱锛�3鐗╂枡锛�4閿�鍞憳
+            if (row) {
+                this.zbIndex = row.index - 1
+            }
+            this.showReset()
+            if (num == 3) {
+                this.dialogTitle = '鐗╂枡鍒楄〃'
+                this.materialShow = true
+                this.openData = true
+            } else if (num == 7) {
+                this.dialogTitle = '瀹㈡埛鍒楄〃'
+                this.gyCustomerShow = true
+                this.openData = true
+            } else if (num == 8) {
+                this.dialogTitle = '鍣ㄥ叿鍒楄〃'
+                this.gyMouldShow = true
+                this.openData = true
+            }
+
+        },
+    }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+    width: 100%;
+}
+</style>
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill copy.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill copy.vue
deleted file mode 100644
index 3331bf6..0000000
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill copy.vue
+++ /dev/null
@@ -1,1088 +0,0 @@
-<template>
-    <div v-loading="formLoading" v-if="formShow" style="margin: 10px;">
-        <div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
-            <el-button type="primary">棰勮鎵撳嵃</el-button>
-            <el-button type="primary">鐢熸垚</el-button>
-            <el-button type="primary">閲嶇疆</el-button>
-            <el-button type="primary">搴撳瓨</el-button>
-            <el-button type="primary">鍚屾璧勬枡</el-button>
-            <el-button type="primary">鎵规</el-button>
-            <el-button type="primary" @click="close">閫� 鍑�</el-button>
-        </div>
-        <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鍣ㄥ叿妗f缂栬緫</div>
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-            <el-row>
-                <el-col :span="6">
-                    <el-form-item label="缁勭粐" prop="HOrgID">
-                        <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐" @change="organizationChange"
-                            style="width: 100%">
-                            <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name"
-                                :value="item.ID">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="宸ュ巶浠g爜" prop="HWorksNumber">
-                        <el-select v-model="form.HWorksNumber" placeholder="璇烽�夋嫨缁勭粐" style="width: 100%">
-                            <el-option v-for="(item, index) in HWorksNumberList" :key="index" :label="item"
-                                :value="item">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="鏃ユ湡" prop="HDate">
-                        <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT"
-                            style="width: 100%"> </el-date-picker>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="6">
-                    <el-form-item label="婧愬崟绫诲瀷" prop="HSourceBillType">
-                        <el-select v-model="form.HSourceBillType" placeholder="璇烽�夋嫨" style="width: 100%"
-                            @change="HSourceBillTypeChange">
-                            <el-option v-for="(item, index) in HSourceBillTypeList" :key="index" :label="item.label"
-                                :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="閫夊崟鍙�" prop="HSourceBillNo">
-                        <el-input v-model="form.HSourceBillNo" placeholder="璇疯緭鍏ラ�夊崟鍙�" disabled>
-                            <el-button slot="append" icon="el-icon-search" @click="openDataDialog(openNum)"></el-button>
-                        </el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="鏉$爜绫诲瀷" prop="HBarCodeType">
-                        <el-select v-model="form.HBarCodeType" placeholder="璇烽�夋嫨" style="width: 100%">
-                            <el-option v-for="(item, index) in HBarCodeTypeList" :key="index" :label="item"
-                                :value="item">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-tabs type="border-card">
-                <el-tab-pane label="鐗╂枡淇℃伅">
-                    <div style="margin-bottom: 10px;">
-                        <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb()"
-                            size="mini">澧炲姞涓�琛�</el-button>
-                        <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow"
-                            size="mini">澶嶅埗涓�琛�</el-button>
-                    </div>
-                    <el-table :data="editWlxxData" style="width: 100%" height="480" width="100%" ref="wlxxzbTable"
-                        @selection-change="handleTableWlxxZbEdit" :row-class-name="wlxxzbRowSysZbIndex" border>
-                        <el-table-column type="selection" width="55" align="center" />
-                        <el-table-column align="center" label="搴忓彿" type="index" width="80" fixed />
-                        <template v-for="(item, index) in wlxxBtList">
-                            <el-table-column align="center" :prop="item.field" :label="item.title" :width="item.width"
-                                :key="index" show-overflow-tooltip v-if="!item.hide">
-                                <template slot-scope="{row,  column }">
-                                    <div :style="item.style">
-                                        <el-input v-if="item.edit == 'text'" v-model="row[column.label]" />
-                                        <el-input-number v-else-if="item.edit == 'number'" v-model="row[column.label]"
-                                            :min="0" controls-position="right" style="width: 100%;" />
-                                        <el-date-picker v-else-if="item.edit == 'date'" v-model="row[column.label]"
-                                            type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT"
-                                            style="width: 100%"> </el-date-picker>
-                                        <el-checkbox v-else-if="item.edit == 'checkbox'"
-                                            v-model="row[column.label]"></el-checkbox>
-                                        <span v-else>{{ row[column.label] }}</span>
-                                    </div>
-                                </template>
-                            </el-table-column>
-                        </template>
-                        <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
-                            <template slot-scope="scope">
-                                <el-button type="danger" icon="el-icon-delete" size="mini" circle
-                                    @click="handleDeleteSysZb(scope.row)"></el-button>
-                            </template>
-                        </el-table-column>
-                    </el-table>
-                </el-tab-pane>
-                <el-tab-pane label="鏉$爜淇℃伅">
-                    <el-table :data="editTmData" style="width: 100%" height="480" width="100%" ref="tbzbTable"
-                        @selection-change="handleTableWlxxZbEdit" :row-class-name="wlxxzbRowSysZbIndex" border>
-                        <el-table-column type="selection" width="55" align="center" />
-                        <el-table-column align="center" label="搴忓彿" type="index" width="80" fixed />
-                        <template v-for="(item, index) in tmBtList">
-                            <el-table-column align="center" :prop="item.field" :label="item.title" :width="item.width"
-                                :key="index" show-overflow-tooltip v-if="!item.hide">
-                                <template slot-scope="{row,  column }">
-                                    <div :style="item.style">
-                                        <el-input v-if="item.edit == 'text'" v-model="row[column.label]" />
-                                        <el-input-number v-else-if="item.edit == 'number'" v-model="row[column.label]"
-                                            :min="0" controls-position="right" style="width: 100%;" />
-                                        <el-date-picker v-else-if="item.edit == 'date'" v-model="row[column.label]"
-                                            type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT"
-                                            style="width: 100%"> </el-date-picker>
-                                        <el-checkbox v-else-if="item.edit == 'checkbox'"
-                                            v-model="row[column.label]"></el-checkbox>
-                                        <span v-else>{{ row[column.label] }}</span>
-                                    </div>
-                                </template>
-                            </el-table-column>
-                        </template>
-                        <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
-                            <template slot-scope="scope">
-                                <el-button type="danger" icon="el-icon-delete" size="mini" circle
-                                    @click="handleDeleteSysZb(scope.row)"></el-button>
-                            </template>
-                        </el-table-column>
-                    </el-table>
-                </el-tab-pane>
-                <el-tab-pane label="妗f鍒楄〃"><el-table :data="editDaData" style="width: 100%" height="480" width="100%"
-                        ref="dazbTable" @selection-change="handleTableWlxxZbEdit" :row-class-name="wlxxzbRowSysZbIndex"
-                        border>
-                        <el-table-column type="selection" width="55" align="center" />
-                        <el-table-column align="center" label="搴忓彿" type="index" width="80" fixed />
-                        <template v-for="(item, index) in daBtList">
-                            <el-table-column align="center" :prop="item.field" :label="item.title" :width="item.width"
-                                :key="index" show-overflow-tooltip v-if="!item.hide">
-                                <template slot-scope="{row,  column }">
-                                    <div :style="item.style">
-                                        <el-input v-if="item.edit == 'text'" v-model="row[column.label]" />
-                                        <el-input-number v-else-if="item.edit == 'number'" v-model="row[column.label]"
-                                            :min="0" controls-position="right" style="width: 100%;" />
-                                        <el-date-picker v-else-if="item.edit == 'date'" v-model="row[column.label]"
-                                            type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT"
-                                            style="width: 100%"> </el-date-picker>
-                                        <el-checkbox v-else-if="item.edit == 'checkbox'"
-                                            v-model="row[column.label]"></el-checkbox>
-                                        <span v-else>{{ row[column.label] }}</span>
-                                    </div>
-                                </template>
-                            </el-table-column>
-                        </template>
-                        <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
-                            <template slot-scope="scope">
-                                <el-button type="danger" icon="el-icon-delete" size="mini" circle
-                                    @click="handleDeleteSysZb(scope.row)"></el-button>
-                            </template>
-                        </el-table-column>
-                    </el-table></el-tab-pane>
-            </el-tabs>
-        </el-form>
-        <!-- 閮ㄩ棬寮圭獥 -->
-        <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
-            <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
-            <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
-            <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
-            <GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
-            <ScICMOBillList @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="ScICMOBillShow" />
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
-                <el-button @click="deptClose">鍙� 娑�</el-button>
-            </div>
-        </el-dialog>
-    </div>
-</template>
-<script>
-import axios from 'axios'
-import Dept from '@/views/component/dept'
-import Warehouse from '@/views/component/warehouse'
-import Material from '@/views/component/material'
-import RowSettings from '@/views/component/rowSettings'
-import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
-import ScICMOBillList from '@/views/ICMO/ScICMOBillList.vue'
-import moment from 'moment';
-
-export default {
-    name: 'Gy_BarCodeBill',
-    components: { Dept, Warehouse, Material, RowSettings, GyEmployee, ScICMOBillList },
-    props: {
-        OperationType: { type: Number, },
-        linterid: { type: Number, },
-        HSouceBillType: { type: String, },
-        propsData: { type: String, },
-        copyType: { type: Number, },
-    },
-    data() {
-        return {
-            HModName: "Gy_BarCodeBill",
-            openNum: 10,
-            zbDataShow:true,
-            HSourceBillTypeList: [
-                { value: 1, label: '鐢熶骇璁㈠崟', },
-                { value: 2, label: '鐢熶骇姹囨姤鍗�', },
-                { value: 3, label: '閲囪喘璁㈠崟', },
-                { value: 4, label: '鏀舵枡閫氱煡鍗�', },
-                { value: 5, label: '濮斿璁㈠崟', },
-                { value: 6, label: '鐢熶骇鍏ュ簱鍗�', },
-                { value: 7, label: '閲囪喘鍏ュ簱鍗�', },
-                { value: 8, label: '閿�鍞��璐у崟', },
-                { value: 9, label: '鐢熶骇閫�鏂欏崟', },
-                { value: 10, label: '宸ュ簭娴佽浆鍗�', },
-                { value: 11, label: '閿�鍞嚭搴撳崟', },
-                { value: 12, label: '棰嗘枡鍑哄簱鍗�', }
-            ],
-            wlxxBtList: [{ field: 'HMainID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }
-                , { field: 'HSubID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true }
-                , { field: 'HSourceBillSEQ', title: '婧愬崟琛屽彿', width: 100, hide: true }
-                , { field: 'HBillNo', title: '婧愬崟鍗曞彿', width: 200 }
-                , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
-                , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterNumber', width: 200 }
-                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 200 }
-                , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 200 }
-                , { field: 'HCusModel', title: '瀹㈡埛瑙勬牸鍨嬪彿', edit: 'text', width: 200 }
-                , { field: 'HCusMaterName', title: '瀹㈡埛鐗╂枡鍚嶇О', edit: 'text', width: 200 }
-                , { field: 'HEmpID', title: '鎿嶄綔鍛業D', width: 100, hide: true }
-                , { field: 'HEmpNumber', title: '鎿嶄綔鍛樹唬鐮�', edit: 'text', width: 200, event: 'HEmpNumber' }
-                , { field: 'HEmpName', title: '鎿嶄綔鍛�', width: 200 }
-                , { field: 'HGroupID', title: '鐝粍ID', width: 100, hide: true }
-                , { field: 'HGroupNumber', title: '鐝粍浠g爜', edit: 'text', width: 200, event: 'HGroupNumber' }
-                , { field: 'HGroupName', title: '鐝粍鍚嶇О', width: 200 }
-                , { field: 'HCheckEmpName', title: '妫�楠屽憳', width: 200, edit: 'text' }
-                , { field: 'HBatchNo', title: '鎵瑰彿', edit: 'text', width: 100 }
-                , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100, edit: 'text' }
-                , { field: 'HQty', title: '鏁伴噺', edit: 'number', width: 100, totalRow: true }
-                , { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'number', totalRow: true, width: 100 }
-                , { field: 'HBQty', title: '绠辨暟', width: 100, totalRow: true }
-                , { field: 'HPackQty', title: '澶栫鏁�', edit: 'text', width: 100, totalRow: true }
-                , { field: 'HCoilNO', title: '閽㈠嵎鎹嗗寘鍙�', edit: 'text', width: 100 }
-                , { field: 'HFurnaceNO', title: '鐐夊彿', edit: 'text', width: 100 }
-                , { field: 'HFactory', title: '鍘傚晢', edit: 'text', width: 100 }
-                , { field: 'HCusID', title: '瀹㈡埛ID', width: 100, hide: true }
-                , { field: 'HCusNumber', title: '瀹㈡埛浠g爜', edit: 'text', event: 'HCusNumber', width: 120 }
-                , { field: 'HCusName', title: '瀹㈡埛鍚嶇О', width: 120 }
-                , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 200 }
-                , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
-                , { field: 'HProduceDate', title: '鐢熶骇鏃ユ湡', edit: 'date', event: 'HProduceDate', width: 160 }
-                , { field: 'HExpiryDate', title: '淇濊川鏈熻嚦', edit: 'date', event: 'HExpiryDate', width: 160 }
-                , { field: 'HheatNO', title: '鐑鐞�', edit: 'text', width: 100 }
-                , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 100, hide: true }
-                , { field: 'HAuxPropNumber', title: '杈呭姪灞炴�т唬鐮�', edit: 'text', event: 'HAuxPropNumber', width: 100 }
-                , { field: 'HAuxPropName', title: '杈呭姪灞炴�у悕绉�', width: 100 }
-                , { field: 'HUnitID', title: '璁¢噺鍗曚綅ID', width: 100, hide: true }
-                , { field: 'HUnitNumber', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HUnitNumber', width: 100 }
-                , { field: 'HUnitName', title: '璁¢噺鍗曚綅', width: 100 }
-                , { field: 'HAuxQty', title: '杈呭崟浣嶆暟閲�', edit: 'text', width: 100, totalRow: true }
-                , { field: 'HExpirationDateFlag', title: '鏄惁鍚敤淇濊川鏈�', width: 120, edit: 'checkbox', templet: '#switchTp3', unresize: false }
-                , { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', width: 100, edit: 'checkbox', templet: '#switchTpl', unresize: false }
-                , { field: 'HDate', title: '鏉$爜鏃ユ湡', width: 100, hide: true }
-            ],
-            tmBtList: [
-                { field: 'HBarCode2', title: '鏉$爜缂栧彿', width: 100 }
-                , { field: 'HMaterNumber2', title: '鐗╂枡浠g爜', width: 100 }
-                , { field: 'HMaterName2', title: '鐗╂枡鍚嶇О', width: 100 }
-                , { field: 'HMaterModel2', title: '瑙勬牸鍨嬪彿', width: 100 }
-                , { field: 'HAuxPropNumber2', title: '杈呭姪灞炴�т唬鐮�', width: 100 }
-                , { field: 'HAuxPropName2', title: '杈呭姪灞炴��', event: 'HWHCode', width: 120 }
-                , { field: 'HGiveAwayFlag2', title: '鏄惁璧犲搧', width: 120, templet: '#switchTpl', unresize: false }
-                , { field: 'HUnitCode2', title: '璁¢噺鍗曚綅浠g爜', width: 120 }
-                , { field: 'HUnitName2', title: '璁¢噺鍗曚綅', width: 120 }
-                , { field: 'HQty2', title: '鏁伴噺', width: 120 }
-                , { field: 'HDate2', title: '杩涙枡鏃ユ湡', width: 120 }
-                , { field: 'HCusNumber2', title: '瀹㈡埛浠g爜', width: 120 }
-                , { field: 'HCusName2', title: '瀹㈡埛', width: 120 }
-                , { field: 'HSourceBillNo2', title: '婧愬崟鍗曞彿', width: 120 }
-                , { field: 'HSeOrderBillNo2', title: '閿�鍞鍗曞彿', width: 120 }
-                , { field: 'HRemark2', title: '澶囨敞', width: 120 }
-                , { field: 'HMTONo2', title: '璁″垝璺熻釜鍙�', width: 120 }
-                , { field: 'HShowDate2', title: '鏃ユ湡', width: 100 }
-                , { field: 'HInnerBillNo2', title: '鍐呴儴閲囪喘璁㈠崟鍙�', width: 100 }
-                , { field: 'HMaker2', title: '鍒跺崟浜�', width: 100 }
-            ],
-            daBtList: [
-                { field: 'HItemID', title: 'HItemID', width: 100, hide: true }
-                , { field: 'hmainid', title: 'hmainid', width: 100, hide: true }
-                , { field: 'hsubid', title: 'hsubid', width: 100, hide: true }
-                , { field: 'HinterID', title: 'HinterID', width: 100, hide: true }
-                , { field: '鏉$爜绫诲瀷', title: '鏉$爜绫诲瀷', width: 100 }
-                , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿', width: 120 }
-                , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
-                , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 120 }
-                , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120 }
-                , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120 }
-                , { field: 'HUnitID', title: '璁¢噺鍗曚綅ID', width: 100, hide: true }
-                , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 120 }
-                , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 120 }
-                , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 100, hide: true }
-                , { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�', width: 120 }
-                , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 120 }
-                , { field: '鎵瑰彿', title: '鎵瑰彿', width: 120 }
-                , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
-                , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 120 }
-                , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', width: 120 }
-                , { field: '鏄惁璧犲搧', title: '鏄惁璧犲搧', width: 100 }
-                , { field: 'DeptID', title: '杞﹂棿ID', width: 100, hide: true }
-                , { field: '杞﹂棿', title: '杞﹂棿', width: 120 }
-                , { field: 'HSupID', title: '渚涘簲鍟咺D', width: 100, hide: true }
-                , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 120 }
-                , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 120 }
-                , { field: '瀹㈡埛鏉$爜缂栧彿', title: '瀹㈡埛鏉$爜缂栧彿', width: 120 }
-                , { field: '瀹㈡埛鍨嬪彿', title: '瀹㈡埛鍨嬪彿', width: 120 }
-                , { field: '寰�鏉ュ崟浣�', title: '寰�鏉ュ崟浣�', width: 120 }
-                , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 120 }
-                , { field: '閿�鍞鍗曡鍙�', title: '閿�鍞鍗曡鍙�', width: 120 }
-                , { field: '鎵樺彿', title: '鎵樺彿', width: 120 }
-                , { field: '鎬绘墭鏁�', title: '鎬绘墭鏁�', width: 100 }
-                , { field: '鏉$爜鏃ユ湡', title: '鏉$爜鏃ユ湡', width: 120 }
-                , { field: '鐢熶骇鍏ュ簱鏃ユ湡', title: '鐢熶骇鍏ュ簱鏃ユ湡', width: 120 }
-                , { field: '鐢熶骇鍏ュ簱鍗曞彿', title: '鐢熶骇鍏ュ簱鍗曞彿', width: 120 }
-                , { field: '鐢熶骇鍏ュ簱娆℃暟', title: '鐢熶骇鍏ュ簱娆℃暟', width: 100 }
-                , { field: '閿�鍞嚭搴撴棩鏈�', title: '閿�鍞嚭搴撴棩鏈�', width: 120 }
-                , { field: '閿�鍞嚭搴撳崟鍙�', title: '閿�鍞嚭搴撳崟鍙�', width: 120 }
-                , { field: '閿�鍞嚭搴撴鏁�', title: '閿�鍞嚭搴撴鏁�', width: 100 }
-                , { field: '浣滃簾鏍囪', title: '浣滃簾鏍囪', width: 100 }
-                , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 100 }
-                , { field: '澶囨敞', title: '澶囨敞', width: 120 }
-                , { field: '鍒朵綔浜�', title: '鍒朵綔浜�', width: 100 }
-                , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120 }
-                , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', width: 120 }
-                , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟', width: 100 }
-                , { field: 'HSTOCKORGID', title: 'HSTOCKORGID', width: 100, hide: true }
-                , { field: '鐢熸垚缁勭粐', title: '鐢熸垚缁勭粐', width: 120 }
-            ],
-            HBarCodeTypeList: [],
-            HWorksNumberList: [],
-            formShow: false,
-            temp: undefined,
-            formLoading: true,
-            zzSelDis: false,
-            rowHideShow: false,
-            openRowHide: false,
-            hPriceTypeList: ['鎴愭湰浠�', '缁撶畻浠�'],
-            addBtnShow: false,
-            zbIndex: null,
-            zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
-            dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
-            deptShow: false,//閮ㄩ棬鏁版嵁缁勪欢
-            warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
-            materialShow: false,//鐗╂枡鏁版嵁缁勪欢
-            gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
-            ScICMOBillShow: false,
-            deptform: {},//寮圭獥閫変腑鏁版嵁
-            openData: false,//鏁版嵁寮圭獥
-            dialogTitle: '',
-            organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
-            subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
-            // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
-            HInterID: null,
-            baseURL: process.env.VUE_APP_BASE_API,
-            checkedSysZb: [],
-            editWlxxData: [],//瀛愯〃
-            editTmData: [],
-            editDaData: [],
-            editBtData: [],//瀛愯〃琛ㄥご
-            activeName: 'first',
-            // 寮瑰嚭灞傛爣棰�
-            title: "",
-            // 鏄惁鏄剧ず寮瑰嚭灞�
-            open: false,
-            // 鏃ユ湡鑼冨洿
-            dateRange: [],
-            // 鏌ヨ鍙傛暟
-            queryParams: {
-                HBillNo: '',
-                HInitTimeCycle: 29,
-                HProjectNumber: '',
-                HCusID: null,
-                HMaterNumber: '',
-                HMaterName: '',
-                ColName1: '',
-                ColName2: '',
-                ColName: '',
-                Comparator1: '',
-                Comparator2: '',
-                Comparator: '',
-                ColContent1: '',
-                ColContent2: '',
-                ColContent: '',
-            },
-            // 鏄剧ず鎼滅储鏉′欢
-            showSearch: true,
-            // 閫変腑鏁扮粍
-            ids: [],
-            // 闈炲崟涓鐢�
-            single: true,
-            // 闈炲涓鐢�
-            multiple: true,
-            // 閬僵灞�
-            loading: true,
-            btResList: [],
-            // 琛ㄥ崟鍙傛暟
-            form: {},
-            // 琛ㄥ崟鏍¢獙
-            rules: {
-                HSupName: [
-                    { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
-                ],
-                HDate: [
-                    { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
-                ],
-                HExRate: [
-                    { required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }
-                ]
-            }
-        };
-    },
-    created() {
-        this.set_HBarCodeType()
-        this.getdata()
-    },
-    methods: {
-        HSourceBillTypeChange(val) {
-            if (val == 1) {
-                this.openNum == 10
-            }
-        },
-        set_HBarCodeType() {
-            //鑾峰彇鏉$爜绫诲瀷浠g爜
-            axios.get(this.baseURL + '/Sc_BarCode/GetHBarCodeTypeBill').then(response => {
-                console.log(response)
-                let result = response.data
-                if (result.count == 1) {
-                    this.HBarCodeTypeList = result.list
-                }
-            }).catch(error => {
-                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-            });
-            axios.get(this.baseURL + '/Sc_BarCode/GetHWorksNumberBill').then(response => {
-                console.log(response)
-                let result = response.data
-                if (result.count == 1) {
-                    this.HWorksNumberList = result.list
-                }
-            }).catch(error => {
-                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-            });
-
-        },
-        getdata() {
-            console.log(this.copyType, this.OperationType)
-            this.formShow = false
-            this.formLoading = true
-            if (this.OperationType == 4) {
-                this.zzSelDis = true
-                this.handleAdd()
-                var data = this.getUrlVars_JSON();
-                var dataArray = [];
-                for (var i = 0; i < data.length; i++) {
-                    // this.getPushSourceBillInit(data[i].hmainid, data[i].hsubid);
-                    axios.get(this.baseURL + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
-                        params: {
-                            "HInterID": data[i].hmainid
-                            , "HSubID": data[i].hsubid
-                        },
-                    }).then(response => {
-                        let result = response.data
-                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            this.temp = result.data[0];
-                        } else {
-                            this.temp = result.data;
-                        }
-                        if (this.temp) {
-                            dataArray.push(this.temp);
-                            this.form.HDeptID = dataArray[0].HDeptID
-                            this.form.HDeptName = dataArray[0].閮ㄩ棬
-                            this.form.HEmpID = dataArray[0].HEmpID
-                            this.form.HEmpName = dataArray[0].涓氬姟鍛�
-                            this.form.HManagerID = dataArray[0].HManagerID
-                            this.form.HManagerName = dataArray[0].涓荤
-                            this.form.HMainSourceInterID = "0"
-                            this.form.HMainSourceEntryID = "0"
-                            this.form.HMainSourceBillNo = ""
-                            this.form.HMainSourceBillType = dataArray[0].HBillType
-                            this.form.HSupID = dataArray[0].HCusID
-                            this.form.HSupName = dataArray[0].瀹㈡埛
-                            this.form.HLinkMan = dataArray[0].鑱旂郴浜�
-                            this.form.HLinkPhone = dataArray[0].鑱旂郴鐢佃瘽
-                            this.form.HSellSID = dataArray[0].HSellSID
-                            this.form.HSellSName = dataArray[0].閿�鍞柟寮�
-                            this.form.HCurID = dataArray[0].HCurID
-                            this.form.HCurName = dataArray[0].甯佸埆
-                            this.form.HExRate = dataArray[0].姹囩巼
-                            for (var i = 0; i < dataArray.length; i++) {
-                                this.editWlxxData.push(
-                                    {
-                                        "HMaterID": dataArray[i].HMaterID
-                                        , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
-                                        , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
-                                        , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
-                                        , "HUnitID": dataArray[i].HUnitID
-                                        , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
-                                        , "HQtyMust": dataArray[i].鏁伴噺.toFixed(6)
-                                        , "HQty": dataArray[i].鏁伴噺.toFixed(6)
-                                        , "HPieceQty": "0"
-                                        , "HPrice": dataArray[i].鍗曚环.toFixed(4)
-                                        , "HTaxPrice": dataArray[i].瀹為檯鍚◣鍗曚环.toFixed(4)
-                                        , "HTaxRate": dataArray[i].绋庣巼
-                                        , "HMoney": dataArray[i].閲戦.toFixed(2)
-                                        , "HTaxMoney": dataArray[i].浠风◣鍚堣.toFixed(2)
-                                        , "HWHID": dataArray[i].HWHID
-                                        , "鍙戣揣浠撳簱": dataArray[i].HWHName
-                                        , "HRemark": ""
-                                        , "HQty_Full": "0"
-                                        , "HQty_Empty": "0"
-                                        , "HQty_Back": "0"
-                                        , "HCostPrice": "0"
-                                        , "HCostMoney": "0"
-                                        , "HSalePrice": "0"
-                                        , "HSeOrderInterID": dataArray[i].hmainid
-                                        , "HSeOrderEntryID": dataArray[i].hsubid
-                                        , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
-                                        , "HSourceInterID": dataArray[i].hmainid
-                                        , "HSourceEntryID": dataArray[i].hsubid
-                                        , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
-                                        , "HSourceBillType": dataArray[i].HBillType
-                                        , "HRelationQty": "0"
-                                        , "HRelationMoney": "0"
-                                        , 'HSPID': "0"
-                                        , 'HSPName': ""
-                                        , 'HSPGroupID': "0"
-                                        , "HSPGroupName": ""
-                                        , 'HSCWHID': "0"
-                                        , 'HSCWHName': ""
-                                        , 'HSCSPID': "0"
-                                        , 'HSCSPName': ""
-                                        , 'HBatchNo': ""
-                                        , 'HPOOrderInterID': "0"
-                                        , 'HPOOrderEntryID': "0"
-                                        , 'HPOOrderBillNo': ""
-                                        , 'HPropertyID': "0"
-                                        , 'HPropertyName': ""
-                                        , 'HSecUnitID': "0"
-                                        , 'HSecUnitName': ""
-                                        , 'HSecUnitRate': "0"
-                                        , 'HEngineNum': ""
-                                        , 'HUnderPanNum': ""
-                                        , 'HLeaveFactCard': ""
-                                        , 'HReqBuyQty': "0"
-                                        , 'HReqOutQty': "0"
-                                        , 'HCurrentInventory': "0"
-                                    }
-                                );
-                            }
-                        }
-                        this.$nextTick(() => {
-                            this.formShow = true
-                            this.formLoading = false
-                        })
-                    }).catch(error => {
-                        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-                    });
-                }
-            } else if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
-                this.handleAdd()
-            } else if (this.OperationType == 3 || this.copyType == 1) {
-                this.handleUpdate()
-            }
-        },
-        // 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
-        getUrlVars_JSON() {
-            var datajson;
-            var str = this.propsData; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
-            var arr = str.substring(str.lastIndexOf("=") + 1);
-            datajson = JSON.parse(decodeURI(arr));
-            return datajson;
-        },
-        //鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢攢鍞鍗曟暟鎹�
-        getPushSourceBillInit(HSourceInterID, HSourceEntryID) {
-            axios.get(this.baseURL + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
-                params: {
-                    "HInterID": HSourceInterID
-                    , "HSubID": HSourceEntryID
-                },
-            }).then(response => {
-                let result = response.data
-                if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                    this.temp = result.data[0];
-                } else {
-                    this.temp = result.data;
-                }
-            }).catch(error => {
-                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-            });
-        },
-        handleRowHide() {
-            this.rowHideShow = true
-            this.openRowHide = true
-        },
-        rowSetClose(val) {
-            this.rowHideShow = false
-            this.openRowHide = val
-        },
-
-        organizationChange(val) {
-            // let options=undefined
-            //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
-        },
-        //閮ㄩ棬寮圭獥璧嬪��
-        dbEmitData(deptRow, num) {
-            // num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
-            console.log(deptRow)
-            if (deptRow.length>0) {
-                if (num == 1) {
-                    this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
-                    this.form.HDeptID = deptRow.HItemID
-                    this.form.HManagerName = deptRow.璐熻矗浜�
-                    this.deptShow = false
-                    this.openData = false
-                } else if (num == 2) {
-                    this.editData[this.zbIndex].HWHID = deptRow.HItemID;
-                    this.editData[this.zbIndex].鍙戣揣浠撳簱 = deptRow.浠撳簱鍚嶇О;
-                    this.warehouseShow = false
-                    this.openData = false
-                } else if (num == 3) {
-                    this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
-                    this.editData[this.zbIndex].鐗╂枡浠g爜 = deptRow.鐗╂枡浠g爜;
-                    this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О;
-                    this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
-                    this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿
-                    this.editData[this.zbIndex].璁¢噺鍗曚綅 = deptRow.璁¢噺鍗曚綅鍚嶇О
-                    this.editData[this.zbIndex].HTaxPrice = deptRow.鍚◣鎴愭湰浠�
-                    this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼
-                    this.materialShow = false
-                    this.openData = false
-                } else if (num == 4) {
-                    this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
-                    this.form.HEmpID = deptRow.HItemID
-                    this.gyEmployeeShow = false
-                    this.openData = false
-                } else if (num == 10) {
-                    this.zbDataShow=false
-                    let data=deptRow
-                    this.editWlxxData=[]
-                    for (var i = 0; i < data.length; i++) {                        
-                        this.editWlxxData.push({
-                            "HMaterID": data[i].HMaterID, "HMaterCode": "", "HMaterNumber": data[i].鐗╂枡浠g爜, "HMaterName": data[i].鐗╂枡鍚嶇О
-                            , "HMaterModel": data[i].瑙勬牸鍨嬪彿, "HMaterSpec": "", "HBatchNo": data[i].鎵规, "HUnitID": data[i].HUnitID
-                            , "HUnitNumber": data[i].璁¢噺鍗曚綅浠g爜, "HUnitName": data[i].璁¢噺鍗曚綅, "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0
-                            , "HQtyMust": 0, "HQty": data[i].鏁伴噺, "HBQty": 1, "HMinQty": data[i].鏁伴噺, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0
-                            , "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"]
-                            , "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "", "HAuxQty": 0, "HheatNO": "", "HProduceDate": moment(new Date()).format('YYYY-MM-DD')
-                            , "HExpiryDate": moment(new Date()).format('YYYY-MM-DD'), "HExpirationDateFlag": data[i].HISKFPERIOD == false ? 0 : 1
-                            , "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"]
-                            , "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": data[i].璁″垝璺熻釜鍙�, "HCusModel": "", "HCusMaterName": ""
-                            , "HCheckEmpName": ""
-                        })
-                    }
-                    console.log( this.editWlxxData)
-                    this.ScICMOBillShow = false
-                    this.zbDataShow=true
-                    this.openData = false
-                }
-            } else {
-                this.$modal.msgError("璇烽�夋嫨鏁版嵁!");
-            }
-
-        },
-        emitData(deptRow, num) {
-            this.dialogTypeNum = num
-            this.deptform = deptRow
-        },
-        deptClickSub() {
-            this.dbEmitData(this.deptform, this.dialogTypeNum)
-            this.deptform = {}
-        },
-        deptClose() {
-            this.deptform = {}
-            this.openData = false
-        },
-
-        //鏂板缂栬緫琛ㄥ崟鍒濆鍖�
-        reset() {
-            this.form = {
-                HOrgID: sessionStorage["OrganizationID"] - 0,
-                HWorksNumber: '',
-                HDate: moment(new Date()).format('YYYY-MM-DD'),
-                HSourceBillType: 1,
-                HSourceBillNo: '',
-                HBarCodeType: '',
-            }
-            this.editWlxxData = []
-            this.editBtData = []
-            this.ids = []
-            this.subDisabled = false
-            this.addBtnShow = false
-            // this.$refs.tableData.clearSelection()
-            this.activeName = 'first'
-            this.resetForm("form");
-        },
-        //閫�鍑�
-        close() {
-            this.reset()
-            console.log(1111)
-            console.log(this.$route.path)
-            if (!this.OperationType && !this.copyType) {
-                console.log(this.$route.path)
-                const obj = { fullPath: this.$route.path, path: this.$route.path, name: this.$route.name, };
-                this.$tab.closePage(obj).then(res => {
-                    const latestView = res.visitedViews.slice(-1)[0]
-                    if (latestView) {
-                        this.$router.push(latestView.fullPath)
-                    } else {
-                        if (obj.name === 'Dashboard') {
-                            this.$router.replace({ path: '/redirect' + obj.fullPath })
-                        } else {
-                            this.$router.push('/')
-                        }
-                    }
-                });
-            } else {
-                this.formShow = false
-                this.$emit('editClose', false)
-            }
-        },
-        //鏍规嵁鐢ㄦ埛鑾峰彇瀵瑰簲鑱屽憳銆侀儴闂ㄣ�侀攢鍞富绠�
-        getCzyglByUser() {
-            axios.get(this.baseURL + '/Xs_SeOrderBill/getCzyglByUser', {
-                params: { "CurUserName": sessionStorage["HUserName"] }
-            }).then(response => {
-                let dataForm = response.data.data[0]
-                this.form.HDeptID = dataForm.HDeptID
-                this.form.HDeptName = dataForm.HDeptName
-                this.form.HEmpID = dataForm.HEmpID
-                this.form.HEmpName = dataForm.HEmpName
-                this.form.HManagerID = dataForm.HManagerID
-                this.form.HManagerName = dataForm.HManagerName
-            }).catch(error => {
-                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-            });
-        },
-        /** 鏂板鎸夐挳鎿嶄綔 */
-        handleAdd() {
-            this.reset()
-            this.handleAddSysZb()
-            this.$nextTick(() => {
-                this.formShow = true
-                this.formLoading = false
-            })
-        },
-        //鑾峰彇瀵瑰簲鐨勬潯鐮佹槑缁�
-        getBarCodeNoteBySellOutBill(rowHmainid) {
-            axios.get(this.baseURL + '/Kf_SellOutBill/BarCodeNote', {
-                params: { "HInterID": rowHmainid }
-            }).then(response => {
-                if (response.data.count == 1) {
-                    if (response.data.data[2].length > 0) {
-                        this.$modal.msgError("褰撳墠鍗曟嵁鐢辨壂鐮佺敓鎴愶紝涓嶅彲浠ョ紪杈戯紒");
-                        this.subDisabled = true
-                    }
-                } else { }
-            }).catch(error => {
-                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-            });
-        },
-        //#region 鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
-        getCustomerBalance(HCusID) {
-            axios.get(this.baseURL + '/Xs_CusRatingChangeBill/getCustomerBalance', {
-                params: { "HCusID": HCusID, 'CurUserName': sessionStorage["HUserName"] }
-            }).then(response => {
-                var data = response.data.data[0];
-                this.form.HCusBalance = data.HCusBalance
-                this.form.HCreditRating_Now = data.HCreditRating_Now
-                this.form.HAvailableBalance = data.HAvailableBalance
-            }).catch(error => {
-                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-            });
-        },
-        /** 淇敼鎸夐挳鎿嶄綔 */
-        handleUpdate() {
-            this.reset()
-            let rowHmainid = this.linterid
-            console.log(this.linterid)
-            axios.get(this.baseURL + "/Kf_SellOutBill/cx", {
-                params: { 'HInterID': rowHmainid }
-            }).then(response => {
-                if (response.data.count == 1) {
-                    var result = response.data
-                    var data = response.data.data[0]
-                    this.form.BillType = data.HSourceBillType
-                    if (this.copyType == 1) {
-                        let date = new Date()
-                        this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
-                    } else {
-                        this.form.HBillNo = data.鍗曟嵁鍙�
-                        this.form.HInterID = data.hmainid
-                        this.form.HDate = data.鏃ユ湡
-                        this.form.HMaker = data.鍒跺崟浜�
-                        this.form.HUpDater = data.淇敼浜�
-                        this.form.HChecker = data.瀹℃牳浜�
-                        this.form.HMakeDate = data.鍒跺崟鏃ユ湡
-                        this.form.HUpDateDate = data.淇敼鏃ユ湡
-                        this.form.HCheckDate = data.瀹℃牳鏃ユ湡
-                        this.form.HCloseMan = data.鍏抽棴浜�
-                        this.form.HDeleteMan = data.浣滃簾浜�
-                        this.form.HCloseDate = data.鍏抽棴鏃ユ湡
-                        this.form.HDeleteDate = data.浣滃簾鏃ユ湡
-                    }
-                    this.form.HBillSubType = data.HBillSubType
-                    this.form.HMainSourceInterID = data.HMainSourceInterID
-                    this.form.HMainSourceEntryID = data.HMainSourceEntryID
-                    this.form.HMainSourceBillType = data.HMainSourceBillType
-                    this.form.HMainSourceBillNo = data.HMainSourceBillNo
-                    this.form.HEmpName = data.涓氬姟鍛�
-                    this.form.HEmpID = data.HEmpID
-                    this.form.HDeptName = data.閮ㄩ棬
-                    this.form.HDeptID = data.HDeptID
-                    this.form.HManagerName = data.涓荤
-                    this.form.HManagerID = data.HManagerID
-                    this.form.HSupName = data.瀹㈡埛
-                    this.form.HSupID = data.HSupID
-                    this.form.HLinkMan = data.鑱旂郴浜�
-                    this.form.HLinkPhone = data.鑱旂郴鐢佃瘽
-                    this.form.HSecManagerName = data.鍙戣揣浜�
-                    this.form.HSecManagerID = data.HSecManagerID
-                    this.form.HKeeperName = data.淇濈鍛�
-                    this.form.HKeeperID = data.HKeeperID
-                    this.form.HRemark = data.琛ㄥご澶囨敞
-                    this.form.HProjectNumber = data.椤圭洰缂栫爜
-                    this.form.HProjectID = data.HProjectID
-                    this.form.HProjectName = data.椤圭洰鍚嶇О
-                    this.form.HGroupName = data.鐝粍
-                    this.form.HGroupID = data.HGroupID
-                    this.form.HWHName = data.涓昏〃浠撳簱
-                    this.form.HWHID = data.HWHID_Main
-                    this.form.HConveyCompName = data.杩愯緭鍏徃
-                    this.form.HConveyCompID = data.HConveyCompID
-                    this.form.HConveyTypeName = data.杩愯緭鏂瑰紡
-                    this.form.HConveyTypeID = data.HConveyTypeID
-                    this.form.HConveyMoney = data.HConveyMoney
-                    this.form.HCarriage = data.杩愯垂
-                    this.form.HSTOCKORGID = data.HSTOCKORGID
-                    this.form.HOWNERID = data.HOWNERID
-                    this.form.HSCWHName = data.涓昏〃璋冨嚭浠撳簱
-                    this.form.HSCWHID = data.HSCWHID
-                    this.form.HCheckStatusMan = data.鏍搁攢浜�
-                    this.form.HExplanation = data.鎽樿
-                    this.form.HInnerBillNo = data.鍐呴儴鍗曟嵁鍙�
-                    this.form.HCurName = data.甯佸埆
-                    this.form.HCurID = data.HCurID
-                    this.form.HExRate = data.姹囩巼
-                    this.form.HSellSName = data.閿�鍞柟寮�
-                    this.form.HSellSID = data.HSellSID
-                    //  this.form.HCusBalance=data
-                    //  this.form.HCreditRating_Now=HConveyMoney
-                    //  this.form.HAvailableBalance=data
-                    this.form.HPriceType = data.鍗曚环绫诲瀷
-                    this.form.HOrgID = data.HOrgID
-                    this.getCustomerByCusID(response.data.data[0].HSupID)//鏍规嵁瀹㈡埛鑾峰彇鑱旂郴浜猴紝鑱旂郴浜虹數璇�
-                    this.getBarCodeNoteBySellOutBill(rowHmainid)//鑾峰彇瀵瑰簲鐨勬潯鐮佹槑缁嗘槸鍚﹀彲缂栬緫
-                    for (var i = 0; i < result.data.length; i++) {
-                        this.editWlxxData.push(
-                            {
-                                "HMaterID": result.data[i].HMaterID
-                                , "鐗╂枡浠g爜": result.data[i].鐗╂枡浠g爜
-                                , "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О
-                                , "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿
-                                , "HUnitID": result.data[i].HUnitID
-                                , "璁¢噺鍗曚綅": result.data[i].璁¢噺鍗曚綅
-                                , "HQtyMust": result.data[i].搴斿彂鏁伴噺.toFixed(6)
-                                , "HQty": result.data[i].鏁伴噺.toFixed(6)
-                                , "HPieceQty": result.data[i].浠舵暟.toFixed(0)
-                                , "HPrice": result.data[i].鍗曚环.toFixed(4)
-                                , "HTaxPrice": result.data[i].鍚◣鍗曚环.toFixed(4)
-                                , "HTaxRate": result.data[i].绋庣巼
-                                , "HMoney": (result.data[i].鏁伴噺 * result.data[i].鍗曚环).toFixed(2)
-                                , "HTaxMoney": (result.data[i].鏁伴噺 * result.data[i].鍚◣鍗曚环, 2).toFixed(2)
-                                , "HWHID": result.data[i].hwhid
-                                , "鍙戣揣浠撳簱": result.data[i].鍙戣揣浠撳簱
-                                , "HRemark": result.data[i].琛ㄤ綋澶囨敞
-                                , "HQty_Full": result.data[i].婊¤溅閲嶉噺
-                                , "HQty_Empty": result.data[i].绌鸿溅閲嶉噺
-                                , "HQty_Back": result.data[i].鍥炶溅閲嶉噺
-                                , "HCostPrice": result.data[i].鎴愭湰鍗曚环
-                                , "HCostMoney": result.data[i].鎴愭湰閲戦
-                                , "HSalePrice": result.data[i].閿�鍞崟浠�
-                                , "HSeOrderInterID": result.data[i].HSeOrderInterID
-                                , "HSeOrderEntryID": result.data[i].HSeOrderEntryID
-                                , "HSeOrderBillNo": result.data[i].閿�鍞鍗曞彿
-                                , "HSourceInterID": result.data[i].HSourceInterID
-                                , "HSourceEntryID": result.data[i].HSourceEntryID
-                                , "HSourceBillNo": result.data[i].婧愬崟鍗曞彿
-                                , "HSourceBillType": result.data[i].HSourceBillType
-                                , "HRelationQty": result.data[i].鍏宠仈鏁伴噺
-                                , "HRelationMoney": result.data[i].鍏宠仈閲戦
-                                , 'HSPID': result.data[i].HSPID
-                                , 'HSPName': result.data[i].浠撲綅
-                                , 'HSPGroupID': result.data[i].HSPGroupID
-                                , "HSPGroupName": result.data[i].浠撲綅缁�
-                                , 'HSCWHID': result.data[i].HSCWHID
-                                , 'HSCWHName': result.data[i].璋冨嚭浠撳簱
-                                , 'HSCSPID': result.data[i].HSCSPID
-                                , 'HSCSPName': result.data[i].璋冨嚭浠撲綅
-                                , 'HBatchNo': result.data[i].鎵规
-                                , 'HPOOrderInterID': result.data[i].閲囪喘璁㈠崟鍐呯爜
-                                , 'HPOOrderEntryID': result.data[i].閲囪喘璁㈠崟瀛愬唴鐮�
-                                , 'HPOOrderBillNo': result.data[i].閲囪喘璁㈠崟鍙�
-                                , 'HPropertyID': result.data[i].HPropertyID
-                                , 'HPropertyName': result.data[i].杈呭姪灞炴��
-                                , 'HSecUnitID': result.data[i].HSecUnitID
-                                , 'HSecUnitName': result.data[i].杈呭姪璁¢噺鍗曚綅
-                                , 'HSecUnitRate': result.data[i].鎹㈢畻鐜�
-                                , 'HEngineNum': result.data[i].鍙戝姩鏈哄彿
-                                , 'HUnderPanNum': result.data[i].鍦扮洏鍙�
-                                , 'HLeaveFactCard': result.data[i].鍑哄巶璇�
-                                , 'HReqBuyQty': result.data[i].鐢宠閲囪喘鏁伴噺
-                                , 'HReqOutQty': result.data[i].鐢宠鍑哄簱鏁伴噺
-                                , 'HCurrentInventory': result.data[i].褰撳墠搴撳瓨
-                            }
-                        );
-                    }
-                    if (data.鐘舵�� != '鍒涘缓' && this.copyType != 1) {
-                        this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵�侊紝涓嶈兘淇敼");
-                        this.subDisabled = true
-                    }
-                    this.formShow = true
-                    this.formLoading = false
-
-                }
-            }).catch(error => {
-                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-            });
-        },
-        //鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
-        getCustomerByCusID(HCusID) {
-            axios.get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
-                params: {
-                    HCusID: HCusID
-                }
-            }).then(response => {
-                this.form.鑱旂郴浜� = response.data.data[0].HLinkMan
-                this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone
-                // this.form = response.data.data[0]
-
-            }).catch(error => {
-                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-            });
-        },
-        /** 閿�鍞嚭搴撳瓙琛ㄦ槑缁嗗簭鍙� */
-        wlxxzbRowSysZbIndex({ row, rowIndex }) {
-            row.index = rowIndex + 1;
-        },
-        /** 缂栬緫椤靛瓙琛ㄦ坊鍔犳寜閽搷浣� */
-        handleAddSysZb(index, num) {
-            if (num == 1 && !index) {
-                this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
-            } else {
-                let obj = {
-                    HMainID: 0,
-                    HSubID: 0,
-                    HSourceBillSEQ: '',
-                    HBillNo: '',
-                    HMaterID: '',
-                    HMaterNumber: '',
-                    HMaterName: '',
-                    HMaterModel: '',
-                    HCusModel: '',
-                    HCusMaterName: '',
-                    HEmpID: 0,
-                    HEmpNumber: '',
-                    HEmpName: '',
-                    HGroupID: 0,
-                    HGroupNumber: '',
-                    HGroupName: '',
-                    HCheckEmpName: '',
-                    HBatchNo: '',
-                    HMTONo: '',
-                    HQty: 0,
-                    HMinQty: 0,
-                    HBQty: 0,
-                    HPackQty: '',
-                    HCoilNO: '',
-                    HFurnaceNO: '',
-                    HFactory: '',
-                    HCusID: 0,
-                    HCusNumber: '',
-                    HCusName: '',
-                    HSeOrderBillNo: '',
-                    HRemark: '',
-                    HProduceDate: this.form.HDate,
-                    HExpiryDate: this.form.HDate,
-                    HheatNO: '',
-                    HAuxPropID: 0,
-                    HAuxPropNumber: '',
-                    HAuxPropName: '',
-                    HUnitID: 0,
-                    HUnitNumber: '',
-                    HUnitName: '',
-                    HAuxQty: '',
-                    HExpirationDateFlag: '',
-                    HGiveAwayFlag: '',
-                    HDate: this.form.HDate,
-                }
-                if (index) {
-                    this.editWlxxData.splice(index, 0, obj);
-                    this.$set(this.editWlxxData, index, obj)
-                } else {
-                    this.editWlxxData.push(obj);
-                }
-            }
-        },
-        handleCopyZbRow() {
-            if (!this.zbIndex) {
-                this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
-            } else {
-                let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
-                this.editWlxxData.push(copyRow);
-            }
-        },
-        /** 缂栬緫椤靛瓙琛ㄥ垹闄ゆ寜閽搷浣� */
-        handleDeleteSysZb(row) {
-            this.checkedSysZb = []
-            this.checkedSysZb.push(row.index)
-            if (this.checkedSysZb.length == 0) {
-                this.$modal.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑鍟嗗搧璁㈠崟鏄庣粏鏁版嵁");
-            } else {
-                const editWlxxData = this.editWlxxData;
-                const checkedSysZb = this.checkedSysZb;
-                this.editWlxxData = editWlxxData.filter(function (item) {
-                    return checkedSysZb.indexOf(item.index) == -1
-                });
-            }
-        },
-        /** 缂栬緫椤靛瓙琛ㄥ閫夋閫変腑鏁版嵁 */
-        handleTableWlxxZbEdit(selection) {
-            this.checkedSysZb = selection.map(item => item.index)
-            this.zbSelForm = selection[0]
-            this.zbIndex = this.checkedSysZb[0]
-            if (selection.length > 1) {
-                const del_row = selection.shift()
-                this.$refs.wlxxzbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
-            }
-        },
-        showReset() {
-            this.deptShow = false
-            this.warehouseShow = false
-            this.materialShow = false
-            this.gyEmployeeShow = false
-            this.ScICMOBillShow = false
-        },
-        //  鎵撳紑鏁版嵁鍒楄〃寮圭獥
-        openDataDialog(num, row) {
-            //num1閮ㄩ棬锛�2鍑哄簱浠撳簱锛�3鐗╂枡锛�4閿�鍞憳
-            if (row) {
-                this.zbIndex = row.index - 1
-            }
-            this.showReset()
-            if (num == 1) {
-                this.dialogTitle = '閮ㄩ棬鍒楄〃'
-                this.deptShow = true
-                this.openData = true
-            } else if (num == 2) {
-                this.dialogTitle = '鍑哄簱浠撳簱鍒楄〃'
-                this.warehouseShow = true
-                this.openData = true
-            } else if (num == 3) {
-                this.dialogTitle = '鐗╂枡鍒楄〃'
-                this.materialShow = true
-                this.openData = true
-            } else if (num == 4) {
-                this.dialogTitle = '閿�鍞憳鍒楄〃'
-                this.gyEmployeeShow = true
-                this.openData = true
-            } else if (num == 10) {
-                this.dialogTitle = '鐢熶骇璁㈠崟鍒楄〃'
-                this.ScICMOBillShow = true
-                this.openData = true
-            }
-        },
-    }
-};
-</script>
\ No newline at end of file
diff --git a/src/views/warehouse/shipment/Kf_StockOutRequestBill.vue b/src/views/warehouse/shipment/Kf_StockOutRequestBill.vue
index 3fbe2ac..e9900b4 100644
--- a/src/views/warehouse/shipment/Kf_StockOutRequestBill.vue
+++ b/src/views/warehouse/shipment/Kf_StockOutRequestBill.vue
@@ -733,9 +733,9 @@
                 this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
             } else {
                 let obj = {
-                    "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 1, "璁¢噺鍗曚綅": "", "HWHID": "0", "浠撳簱": "",
-                    "HSPID": "0", "浠撲綅": "", "HSecUnitID": "1", "搴撳瓨杈呭崟浣�": "", "HBASEUNITID": "1", "鍩烘湰鍗曚綅": "",
-                    "HEXTAUXUNITID": "1", "杈呭崟浣�": "", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": ""
+                    "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HWHID": 0, "浠撳簱": "",
+                    "HSPID": 0, "浠撲綅": "", "HSecUnitID": 0, "搴撳瓨杈呭崟浣�": "", "HBASEUNITID": 0, "鍩烘湰鍗曚綅": "",
+                    "HEXTAUXUNITID": 0, "杈呭崟浣�": "", "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HRemark": ""
                 }
                 if (index) {
                     this.editData.splice(index, 0, obj);

--
Gitblit v1.9.1