From 626fe9c93a7f504976adbc2c42eabcd5595b4202 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 05 十二月 2025 16:53:33 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

---
 src/views/scMould/warehouse/component/Sc_MouldInRequestBill.vue        |  959 ++++++++++++
 src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue             |   79 
 src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue               |  673 ++++++--
 src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue                |  684 ++++++--
 src/views/scMould/warehouse/component/Sc_MouldMoveStockRequestBill.vue |  920 ++++++++++++
 src/views/ICMO/ScICMOBillList.vue                                      |    7 
 src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue       |   48 
 src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue              |   79 
 src/views/scMould/warehouse/component/Sc_MouldOutRequestBill.vue       |  965 ++++++++++++
 src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue              |    9 
 src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue             |    9 
 src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue               |  108 
 12 files changed, 4,042 insertions(+), 498 deletions(-)

diff --git a/src/views/ICMO/ScICMOBillList.vue b/src/views/ICMO/ScICMOBillList.vue
index 6ec0c9d..cc7ad56 100644
--- a/src/views/ICMO/ScICMOBillList.vue
+++ b/src/views/ICMO/ScICMOBillList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="padding: 10px">
+  <div style="padding: 10px; position: relative;">
     <el-form
       :model="queryParams"
       ref="queryForm"
@@ -738,6 +738,7 @@
       iframeUrl: "",
       activeSeach: "",
       HModName: "Sc_ICMOBillList",
+      rowList:[],
       editShow: false,
       openEdit: false,
       totalNameList: [],
@@ -1344,6 +1345,9 @@
       this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
       this.lastSelectedRowIndex = this.tableData.indexOf(row);
       this.$refs.tableData.toggleRowSelection(row);
+      if (this.openPage) {
+        this.$emit('deptEmit', this.rowList, 10)
+      }
     },
     //閫変腑琛岄珮浜牱寮�
     rowStyle({ row, rowIndex }) {
@@ -1359,6 +1363,7 @@
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
       // this.rowForm = {}
+      this.rowList=selection
       this.ids = selection.map((item) => item.hmainid);
       this.single = selection.length != 1;
       this.multiple = !selection.length;
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
index 33a7ad1..34dbef5 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
@@ -3,7 +3,7 @@
     <div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
       <!-- <el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button> -->
       <el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
-      <!-- <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button> -->
+      <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button>
       <el-button type="primary" @click="close">閫� 鍑�</el-button>
       <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
     </div>
@@ -697,7 +697,7 @@
                     , "HMaterNumber": result.data[i].HMaterNumber
                     , "HMaterName": result.data[i].HMaterName
                     , "HMaterModel": result.data[i].HMaterModel
-                    , "HPropertyID": result.data[i].HProcID
+                    , "HPropertyID": result.data[i].HPropertyID
                     , "HSecUnitID": result.data[i].HSecUnitID
                     , "HSecUnitRate": result.data[i].HSecUnitRate
                     , "HUnitID": result.data[i].HUnitID
@@ -932,12 +932,13 @@
     set_CheckBill(num, form) {
       var InterID = form.hmainid || form.HInterID
       //閫昏緫瀹℃牳鏂规硶
-      axios.get(this.baseURL + "/Sc_MouldProdMoveBill/AuditMouldProdMoveBill", {
-        params: { "HInterID": InterID, "flag": num, "user": sessionStorage["HUserName"] }
+      axios.get(this.baseURL + "/Sc_MouldInRequestBillController/GetSc_MouldInRequestBill_Check_Json", {
+        params: { "HInterID": InterID, "Type": num, "HMaker": 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/scMould/warehouse/Sc_MouldInRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
index 3e4dbd2..2c09244 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
@@ -136,6 +136,10 @@
           @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">澶嶅埗</el-button>
       </el-col>
       <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-tickets" size="mini"
+          @click="handlePush(row = rowForm, OperationType = 4)">涓嬫帹锛堝櫒鍏烽鐢ㄩ��搴撳崟锛�</el-button>
+      </el-col>
+      <el-col :span="1.5">
         <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
         </el-button>
       </el-col>
@@ -199,6 +203,11 @@
         <edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
           :copyType="copyType" @editClose="editClose" v-if="editShow" />
       </el-dialog>
+      <!-- 涓嬫帹 -->
+      <el-dialog title="涓嬫帹鍣ㄥ叿棰嗙敤閫�搴撳崟" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox" @close="close">
+        <push :OperationType='4' :propsData='pushData' :HSouceBillType=BillType
+         @editClose="pushClose" v-if="pushShow" />
+      </el-dialog>
       <el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
         <PrintList :linterid=this.rowForm.hmainid :MyMsg=this.rowForm.hmainid :Type='HModName'
           :HModName='HModName' @rowEditClose="rowSetClose" v-if="printListShow" />
@@ -212,18 +221,27 @@
 import axios from 'axios'
 import RowSettings from '@/views/component/rowSettings'
 import Edit from '@/views/scMould/warehouse/Sc_MouldInRequestBillEdit'
+import Push from '@/views/scMould/warehouse/Sc_MouldProdBackBillEdit'
 import PrintList from '@/views/component/printList'
 import moment from 'moment';
 
 export default {
   name: 'Sc_MouldInRequestBillList',
-  components: { RowSettings, Edit, PrintList },
+  components: { RowSettings, Edit, Push,PrintList },
+  props: {
+    openPage: { type: String, },
+    HOrgID: { type: String, },
+  },
   data() {
     return {
       HModName: "Sc_MouldInRequestBillList",
+      rowList:[],
       activeSeach: '',
       editShow: false,
       openEdit: false,
+      pushShow: false,
+      openPush: false,
+      pushData:'',
       totalNameList: [],
       tableShow: true,
       openPrintList: false,
@@ -312,10 +330,14 @@
       page: 1,
       pageSize: 0,
       total: 0,
+      BillType:'3851',
     };
   },
   created() {
     // this.fetchData()
+    if(this.openPage && this.HOrgID){
+      this.queryParams.HStockOrgID = this.HOrgID
+    }
     this.riqiChange()
     this.getList();
   },
@@ -397,7 +419,7 @@
           "user": sessionStorage["HUserName"],
           "page": this.page,
           "size": this.pageSize,
-          "Type": '3851'
+          "Type": this.BillType,
         },
       }).then(response => {
         this.tyResList = response.data.data//鎬绘暟鎹�
@@ -583,10 +605,13 @@
       this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
       this.lastSelectedRowIndex = this.tableData.indexOf(row);
       this.$refs.tableData.toggleRowSelection(row);
+      if (this.openPage) {
+        this.$emit('deptEmit', this.rowList, this.BillType)
+      }
     },
     //閫変腑琛岄珮浜牱寮�
     rowStyle({ row, rowIndex }) {
-      if (this.ids.includes(row.hmainid)) {
+      if (this.ids.includes(row.sorderid)) {
         return { "background": "#ecf5ff" }
       }
     },
@@ -598,7 +623,8 @@
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
       // this.rowForm = {}
-      this.ids = selection.map(item => item.hmainid)
+      this.rowList=selection
+      this.ids = selection.map(item => item.sorderid)
       this.single = selection.length != 1
       this.multiple = !selection.length
       if (!this.single) {
@@ -743,6 +769,8 @@
       this.tableShow = true
       this.openEdit = false
       this.editShow = false
+      this.openPush = false
+      this.pushShow = false
       this.clearData()
       this.getList()
     },
@@ -758,6 +786,41 @@
       this.editShow = true
       this.openEdit = true
     },
+    //鎵撳紑涓嬫帹缁勪欢寮圭獥
+    handlePush() {
+      if (this.rowList && this.rowList.length > 0) {
+        var dataArray = [];
+        var HSupTypeID_Temp = this.rowList[0].HSupTypeID
+        for (var i = 0; i < this.rowList.length; i++) {
+            if (this.rowList[i].鍗曟嵁鐘舵�� != "宸插鏍�") {
+                this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戜笉涓哄凡瀹℃牳鐘舵��,涓嶅厑璁镐笅鎺紒")
+                return;
+            }
+            if (this.rowList[i].HQtyMust <= 0) {
+                this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戝搴斿彲涓嬫帹鏁伴噺蹇呴』澶т簬 0 锛�")
+                return;
+            }
+            if (this.rowList[i].HSupTypeID != HSupTypeID_Temp) {
+                this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹搴斿線鏉ョ被鍨嬪繀椤讳竴鑷达紒")
+                return;
+            }
+            var temp = {
+                "hmainid": this.rowList[i].hmainid
+                , "hsubid": this.rowList[i].hsubid
+                , "HBillType": this.rowList[i].HBillType
+            }
+            dataArray.push(temp);
+        }
+        var datajson = {
+            "data": dataArray
+        };
+        this.pushData = JSON.stringify(datajson)
+        this.pushShow = true
+        this.openPush = true
+      } else {
+          this.$modal.msgError("璇烽�夋嫨鏁版嵁涓嬫帹锛�")
+      }
+    },
     //鍏抽棴缂栬緫椤甸潰
     editClose(val) {
       this.open = val
@@ -766,6 +829,14 @@
       this.clearData()
       this.getList()
     },
+    //鍏抽棴涓嬫帹椤甸潰
+    pushClose(val) {
+      this.open = val
+      this.pushShow = false
+      this.openPush = val
+      this.clearData()
+      this.getList()
+    },
     //娓呴櫎閫変腑鏁版嵁鐨勭紦瀛�
     clearData(){
       this.ids = []
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
index 6a3b616..5b94043 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
@@ -136,8 +136,8 @@
           @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">澶嶅埗</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-tickets" size="mini" :disabled="single"
-          @click="handleMove(row = rowForm, OperationType = 4)">涓嬫帹锛堝櫒鍏风洿鎺ヨ皟鎷ㄥ崟锛�</el-button>
+        <el-button type="primary" icon="el-icon-tickets" size="mini"
+          @click="handlePush(row = rowForm, OperationType = 4)">涓嬫帹锛堝櫒鍏风洿鎺ヨ皟鎷ㄥ崟锛�</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
@@ -194,9 +194,9 @@
           :copyType="copyType" @editClose="editClose" v-if="editShow" />
       </el-dialog>
       <!-- 涓嬫帹 -->
-      <el-dialog title="涓嬫帹鍣ㄥ叿鐩存帴璋冩嫧鍗�" :visible.sync="openMove" width="1480px" append-to-body class="xsckdBox" @close="close">
-        <move :OperationType='4' :propsData='moveData' :HSouceBillType=BillType
-         @editClose="moveClose" v-if="moveShow" />
+      <el-dialog title="涓嬫帹鍣ㄥ叿鐩存帴璋冩嫧鍗�" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox" @close="close">
+        <push :OperationType='4' :propsData='pushData' :HSouceBillType=BillType
+         @editClose="pushClose" v-if="pushShow" />
       </el-dialog>
       <el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
         <PrintList :linterid=this.rowForm.hmainid :MyMsg=this.rowForm.hmainid :Type='HModName'
@@ -211,13 +211,13 @@
 import axios from 'axios'
 import RowSettings from '@/views/component/rowSettings'
 import Edit from '@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit'
-import Move from '@/views/scMould/warehouse/Sc_MouldProdMoveBillEdit'
+import Push from '@/views/scMould/warehouse/Sc_MouldProdMoveBillEdit'
 import PrintList from '@/views/component/printList'
 import moment from 'moment';
 
 export default {
   name: 'Sc_MouldMoveStockRequestBillList',
-  components: { RowSettings, Edit, Move,PrintList },
+  components: { RowSettings, Edit, Push,PrintList },
   props: {
     openPage: { type: String, },
     HOrgID: { type: String, },
@@ -229,9 +229,9 @@
       activeSeach: '',
       editShow: false,
       openEdit: false,
-      moveShow: false,
-      openMove: false,
-      moveData:'',
+      pushShow: false,
+      openPush: false,
+      pushData:'',
       totalNameList: [],
       tableShow: true,
       openPrintList: false,
@@ -759,6 +759,8 @@
       this.tableShow = true
       this.openEdit = false
       this.editShow = false
+      this.openPush = false
+      this.pushShow = false
       this.clearData()
       this.getList()
     },
@@ -775,26 +777,26 @@
       this.openEdit = true
     },
     //鎵撳紑涓嬫帹缁勪欢寮圭獥
-    handleMove() {
-      if (this.rowList.length > 0) {
+    handlePush() {
+      if (this.rowList && this.rowList.length > 0) {
         var dataArray = [];
         var HSupTypeID_Temp = this.rowList[0].HSupTypeID
         var HStockInOrgID_Temp = this.rowList[0].HSTOCKORGINID
         for (var i = 0; i < this.rowList.length; i++) {
             if (this.rowList[i].鍗曟嵁鐘舵�� != "宸插鏍�") {
-                this.$modal.msgSuccess("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戜笉涓哄凡瀹℃牳鐘舵��,涓嶅厑璁镐笅鎺紒")
+                this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戜笉涓哄凡瀹℃牳鐘舵��,涓嶅厑璁镐笅鎺紒")
                 return;
             }
             if (this.rowList[i].HQtyMust <= 0) {
-                this.$modal.msgSuccess("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戝搴斿彲涓嬫帹鏁伴噺蹇呴』澶т簬 0 锛�")
+                this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戝搴斿彲涓嬫帹鏁伴噺蹇呴』澶т簬 0 锛�")
                 return;
             }
             if (this.rowList[i].HSupTypeID != HSupTypeID_Temp) {
-                this.$modal.msgSuccess("涓嬫帹澶辫触锛佹墍閫夊崟鎹搴斿線鏉ョ被鍨嬪繀椤讳竴鑷达紒")
+                this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹搴斿線鏉ョ被鍨嬪繀椤讳竴鑷达紒")
                 return;
             }
             if (this.rowList[i].HSTOCKORGINID != HStockInOrgID_Temp) {
-                this.$modal.msgSuccess("涓嬫帹澶辫触锛佹墍閫夊崟鎹搴旇皟鍏ョ粍缁囧繀椤讳竴鑷达紒")
+                this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹搴旇皟鍏ョ粍缁囧繀椤讳竴鑷达紒")
                 return;
             }
             var temp = {
@@ -807,11 +809,11 @@
         var datajson = {
             "data": dataArray
         };
-        this.moveData = JSON.stringify(datajson)
-        this.moveShow = true
-        this.openMove = true
+        this.pushData = JSON.stringify(datajson)
+        this.pushShow = true
+        this.openPush = true
       } else {
-          layer.msg('璇烽�夋嫨鏁版嵁涓嬫帹锛�');
+          this.$modal.msgError("璇烽�夋嫨鏁版嵁涓嬫帹锛�")
       }
     },
     //鍏抽棴缂栬緫椤甸潰
@@ -823,10 +825,10 @@
       this.getList()
     },
     //鍏抽棴涓嬫帹椤甸潰
-    moveClose(val) {
+    pushClose(val) {
       this.open = val
-      this.editShow = false
-      this.openEdit = val
+      this.pushShow = false
+      this.openPush = val
       this.clearData()
       this.getList()
     },
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
index c0154ae..e62a2d6 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
@@ -3,7 +3,7 @@
     <div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
       <!-- <el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button> -->
       <el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
-      <!-- <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button> -->
+      <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button>
       <el-button type="primary" @click="close">閫� 鍑�</el-button>
       <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
     </div>
@@ -788,7 +788,7 @@
                     , "HMaterNumber": result.data[i].HMaterNumber
                     , "HMaterName": result.data[i].HMaterName
                     , "HMaterModel": result.data[i].HMaterModel
-                    , "HPropertyID": result.data[i].HProcID
+                    , "HPropertyID": result.data[i].HPropertyID
                     , "HSecUnitID": result.data[i].HSecUnitID
                     , "HSecUnitRate": result.data[i].HSecUnitRate
                     , "HUnitID": result.data[i].HUnitID
@@ -1023,12 +1023,13 @@
     set_CheckBill(num, form) {
       var InterID = form.hmainid || form.HInterID
       //閫昏緫瀹℃牳鏂规硶
-      axios.get(this.baseURL + "/Sc_MouldProdMoveBill/AuditMouldProdMoveBill", {
-        params: { "HInterID": InterID, "flag": num, "user": sessionStorage["HUserName"] }
+      axios.get(this.baseURL + "/Sc_MouldOutRequestBillController/GetSc_MouldOutRequestBill_Check_Json", {
+        params: { "HInterID": InterID, "Type": num, "HMaker": 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/scMould/warehouse/Sc_MouldOutRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
index f84ab8f..430c829 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
@@ -136,6 +136,10 @@
           @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">澶嶅埗</el-button>
       </el-col>
       <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-tickets" size="mini"
+          @click="handlePush(row = rowForm, OperationType = 4)">涓嬫帹锛堝櫒鍏烽鐢ㄥ嚭搴撳崟锛�</el-button>
+      </el-col>
+      <el-col :span="1.5">
         <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
         </el-button>
       </el-col>
@@ -199,6 +203,11 @@
         <edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
           :copyType="copyType" @editClose="editClose" v-if="editShow" />
       </el-dialog>
+      <!-- 涓嬫帹 -->
+      <el-dialog title="涓嬫帹鍣ㄥ叿棰嗙敤鍑哄簱鍗�" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox" @close="close">
+        <push :OperationType='4' :propsData='pushData' :HSouceBillType=BillType
+         @editClose="pushClose" v-if="pushShow" />
+      </el-dialog>
       <el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
         <PrintList :linterid=this.rowForm.hmainid :MyMsg=this.rowForm.hmainid :Type='HModName'
           :HModName='HModName' @rowEditClose="rowSetClose" v-if="printListShow" />
@@ -212,18 +221,27 @@
 import axios from 'axios'
 import RowSettings from '@/views/component/rowSettings'
 import Edit from '@/views/scMould/warehouse/Sc_MouldOutRequestBillEdit'
+import Push from '@/views/scMould/warehouse/Sc_MouldProdOutBillEdit'
 import PrintList from '@/views/component/printList'
 import moment from 'moment';
 
 export default {
   name: 'Sc_MouldOutRequestBillList',
-  components: { RowSettings, Edit, PrintList },
+  components: { RowSettings, Edit,Push, PrintList },
+  props: {
+    openPage: { type: String, },
+    HOrgID: { type: String, },
+  },
   data() {
     return {
       HModName: "Sc_MouldOutRequestBillList",
+      rowList:[],
       activeSeach: '',
       editShow: false,
       openEdit: false,
+      pushShow: false,
+      openPush: false,
+      pushData:'',
       totalNameList: [],
       tableShow: true,
       openPrintList: false,
@@ -312,10 +330,14 @@
       page: 1,
       pageSize: 0,
       total: 0,
+      BillType:'3849',
     };
   },
   created() {
     // this.fetchData()
+    if(this.openPage && this.HOrgID){
+      this.queryParams.HStockOrgID = this.HOrgID
+    }
     this.riqiChange()
     this.getList();
   },
@@ -397,7 +419,7 @@
           "user": sessionStorage["HUserName"],
           "page": this.page,
           "size": this.pageSize,
-          "Type":"3849",
+          "Type": this.BillType,
         },
       }).then(response => {
         this.tyResList = response.data.data//鎬绘暟鎹�
@@ -583,10 +605,13 @@
       this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
       this.lastSelectedRowIndex = this.tableData.indexOf(row);
       this.$refs.tableData.toggleRowSelection(row);
+      if (this.openPage) {
+        this.$emit('deptEmit', this.rowList, this.BillType)
+      }
     },
     //閫変腑琛岄珮浜牱寮�
     rowStyle({ row, rowIndex }) {
-      if (this.ids.includes(row.hmainid)) {
+      if (this.ids.includes(row.sorderid)) {
         return { "background": "#ecf5ff" }
       }
     },
@@ -598,7 +623,8 @@
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
       // this.rowForm = {}
-      this.ids = selection.map(item => item.hmainid)
+      this.rowList=selection
+      this.ids = selection.map(item => item.sorderid)
       this.single = selection.length != 1
       this.multiple = !selection.length
       if (!this.single) {
@@ -743,6 +769,8 @@
       this.tableShow = true
       this.openEdit = false
       this.editShow = false
+      this.openPush = false
+      this.pushShow = false
       this.clearData()
       this.getList()
     },
@@ -758,6 +786,41 @@
       this.editShow = true
       this.openEdit = true
     },
+    //鎵撳紑涓嬫帹缁勪欢寮圭獥
+    handlePush() {
+      if (this.rowList && this.rowList.length > 0) {
+        var dataArray = [];
+        var HSupTypeID_Temp = this.rowList[0].HSupTypeID
+        for (var i = 0; i < this.rowList.length; i++) {
+            if (this.rowList[i].鍗曟嵁鐘舵�� != "宸插鏍�") {
+                this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戜笉涓哄凡瀹℃牳鐘舵��,涓嶅厑璁镐笅鎺紒")
+                return;
+            }
+            if (this.rowList[i].HQtyMust <= 0) {
+                this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戝搴斿彲涓嬫帹鏁伴噺蹇呴』澶т簬 0 锛�")
+                return;
+            }
+            if (this.rowList[i].HSupTypeID != HSupTypeID_Temp) {
+                this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹搴斿線鏉ョ被鍨嬪繀椤讳竴鑷达紒")
+                return;
+            }
+            var temp = {
+                "hmainid": this.rowList[i].hmainid
+                , "hsubid": this.rowList[i].hsubid
+                , "HBillType": this.rowList[i].HBillType
+            }
+            dataArray.push(temp);
+        }
+        var datajson = {
+            "data": dataArray
+        };
+        this.pushData = JSON.stringify(datajson)
+        this.pushShow = true
+        this.openPush = true
+      } else {
+          this.$modal.msgError("璇烽�夋嫨鏁版嵁涓嬫帹锛�")
+      }
+    },
     //鍏抽棴缂栬緫椤甸潰
     editClose(val) {
       this.open = val
@@ -766,6 +829,14 @@
       this.clearData()
       this.getList()
     },
+    //鍏抽棴涓嬫帹椤甸潰
+    pushClose(val) {
+      this.open = val
+      this.pushShow = false
+      this.openPush = val
+      this.clearData()
+      this.getList()
+    },
     //娓呴櫎閫変腑鏁版嵁鐨勭紦瀛�
     clearData(){
       this.ids = []
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
index 8610292..0618b05 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
@@ -23,39 +23,12 @@
                 </el-date-picker>
               </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>
-            </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,eHWHType=1)"></el-button>
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <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,empType=1)"></el-button>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <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,empType=2)"></el-button>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="閮ㄩ棬" prop="HDeptName">
-                <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" disabled>
-                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1,deptType=1)"></el-button>
-                </el-input>
+            <el-col :span="12">
+              <el-form-item label="缁勭粐" prop="HStockOrgID">
+                <el-select v-model="form.HStockOrgID" placeholder="璇烽�夋嫨缁勭粐" :disabled="ifOrganizationEdit">
+                  <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>
@@ -76,16 +49,69 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
+              <el-form-item label="閮ㄩ棬" prop="HDeptName">
+                <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1,deptType=1)"></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,eHWHType=1)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="涓氬姟鍛�" prop="HEmpName">
+                <el-input v-model="form.HEmpName" placeholder="璇烽�夋嫨" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=1)"></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,empType=2)"></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,empType=3)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <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,empType=4)"></el-button>
+                </el-input>
+              </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="璇烽�夋嫨">
-                  <el-option label="鐢熶骇浠诲姟鍗�" value="鐢熶骇浠诲姟鍗�" />
-                  <el-option label="鎵嬪伐褰曞叆" value="鎵嬪伐褰曞叆" />
+                  <el-option v-for="(item, index) in HSourceBillTypes" :key="index" :label="item.HSourceBillTypeName" :value="item.HSourceBillType">
+                  </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="閫夊崟鍙�" prop="XDH">
-                <el-input v-model="form.XDH" placeholder="璇疯緭鍏ラ�夊崟鍙�" />
+              <el-form-item label="婧愬崟鍗曞彿" prop="HSourceBillNo">
+                <el-input placeholder="璇烽�夋嫨婧愬崟鍗曞彿" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="get_checkMainSource()"></el-button>
+                </el-input>
+              </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>
             </el-col>
           </el-row>
@@ -211,24 +237,24 @@
                 <span>{{ scope.row.HUnitName }}</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">
                 <span>{{ scope.row.HQtyMust }}</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-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="鍙戞枡浠撳簱浠g爜" width="120">
+            <el-table-column align="center" label="浠撳簱浠g爜" width="120">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.HWHCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=2)"
                   @dblclick.native="openDataDialog(2, scope.row ,eHWHType=2)" />
               </template>
             </el-table-column>
-            <el-table-column align="center" label="鍙戞枡浠撳簱" width="120">
+            <el-table-column align="center" label="浠撳簱鍚嶇О" width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.HWHName }}</span>
               </template>
@@ -239,9 +265,14 @@
                   @dblclick.native="openDataDialog(9, scope.row)" />
               </template>
             </el-table-column>
-            <el-table-column align="center" label="浠撲綅" width="120">
+            <el-table-column align="center" label="浠撲綅鍚嶇О" width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.HSPName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="婧愬崟鍗曞彿" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HSourceBillNo }}</span>
               </template>
             </el-table-column>
             <el-table-column align="center" label="澶囨敞" width="120">
@@ -321,6 +352,7 @@
       <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
       <GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
       <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
+      <scMouldIn @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :HOrgID="form.HStockOutOrgID" v-if="scMouldInShow" />
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
         <el-button @click="deptClose">鍙� 娑�</el-button>
@@ -342,11 +374,12 @@
 import GyCustomer from '@/views/GyCustomer'
 import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
 import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
+import scMouldIn from '@/views/scMould/warehouse/component/Sc_MouldInRequestBill.vue'
 import moment from 'moment';
 
 export default {
   name: 'Sc_MouldProdBackBillEdit',
-  components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace },
+  components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,scMouldIn },
   props: {
     OperationType: { type: Number, },
     linterid: { type: Number, },
@@ -364,6 +397,7 @@
       rowHideShow: false,
       openRowHide: false,
       hSupTypeList: [{name:'渚涘簲鍟�',id:1,},{name:'瀹㈡埛',id:2},{name:'杞﹂棿閮ㄩ棬',id:3}],
+      HSourceBillTypes:[],
       addBtnShow: false,
       zbIndex: null,
       zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
@@ -375,6 +409,7 @@
       gyCustomerShow: false,//瀹㈡埛鏁版嵁缁勪欢
       gyMouldShow: false,//鍣ㄥ叿鏁版嵁缁勪欢
       gyStockPlaceShow: false,//浠撲綅鏁版嵁缁勪欢
+      scMouldInShow:false,//婧愬崟缁勪欢
       eHWHType:1,//浠撳簱寮圭獥鍖哄垎鏍囧織
       empType:1,//鑱屽憳寮圭獥鍖哄垎鏍囧織
       deptType:1,//閮ㄩ棬寮圭獥鍖哄垎鏍囧織
@@ -382,6 +417,7 @@
       openData: false,//鏁版嵁寮圭獥
       dialogTitle: '',
       organizationList: [],//缁勭粐鍒楄〃
+      ifOrganizationEdit: false,
       subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
       // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
       HInterID: 0,
@@ -431,26 +467,27 @@
       form: {},
       // 琛ㄥ崟鏍¢獙
       rules: {
+        HBillNo: [
+          { required: true, message: "鍗曟嵁鍙蜂笉鑳戒负绌�", trigger: "blur" }
+        ],
         HDate: [
           { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
         ],
-        HWHName: [
-          { required: true, message: "鍣ㄥ叿浠撳簱涓嶈兘涓虹┖", trigger: "blur" }
+        HStockOrgID: [
+          { required: true, message: "缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
         ],
         HSecManagerName: [
           { required: true, message: "楠屾敹鍛樹笉鑳戒负绌�", trigger: "blur" }
         ],
         HKeeperName: [
           { required: true, message: "淇濈鍛樹笉鑳戒负绌�", trigger: "blur" }
-        ],
-        HDeptName: [
-          { required: true, message: "閮ㄩ棬涓嶈兘涓虹┖", trigger: "blur" }
         ]
       }
     };
   },
   created() {
     this.fetchData()
+    this.SourceBillType()
     this.getdata()
   },
   methods: {
@@ -464,14 +501,29 @@
         this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
       });
     },
+    SourceBillType(){
+      axios.get(this.baseURL + "/Web/GetHSourceBillType", {
+        params: { "HName": '鍣ㄥ叿棰嗙敤閫�搴撳崟', "Num": 2 }//0钃濆崟 1绾㈠崟 2涓嶅垎绾㈣摑鍗�
+      }).then(response => {
+        if (response.data.count == 1) {
+          this.HSourceBillTypes = response.data.data
+          this.form.HSourceBillType = this.HSourceBillTypes[0].HSourceBillType
+          this.form.HSourceBillTypeName = this.HSourceBillTypes[0].HSourceBillTypeName
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
     getdata() {
       console.log(this.copyType, this.OperationType)
       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) {
+      } else if (this.OperationType == 2 || this.copyType == 1) {
         this.handleUpdate()
+      } else if (this.OperationType == 4) {
+        this.handleMove()
       }
     },
     // 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
@@ -495,74 +547,203 @@
       // let options=undefined
       //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
     },
+    //鑾峰彇婧愬崟鏁版嵁
+    GetSourceBillList(HSourceInterID, HSourceEntryID, HSourceBillType) { 
+        return new Promise((resolve, reject) => {
+            axios.get(this.baseURL + "/Sc_MouldProdBackBillController/GetSourceBill_MouldProdBack_Json", { 
+                params: { "HInterID": HSourceInterID, "HEntryID": HSourceEntryID, "HBillType": HSourceBillType } 
+            }).then(response => { 
+                if (response.data.count == 1) { 
+                    resolve(response.data.data[0]);
+                } else { 
+                    this.$modal.msgError("鏈煡璇㈠埌鏁版嵁!");
+                }
+            }).catch(error => { 
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
+        });
+    },
+    //鍐欏叆婧愬崟鏁版嵁
+    setInitBySourceBill(dataArray){
+      var data = dataArray[0]
+      this.form.HSupTypeID = data.HSupTypeID
+      this.form.HSupID = data.HSupID
+      this.form.HSupName = data.HSupName
+      this.form.HDeptID = data.HDeptID
+      this.form.HDeptName = data.HDeptName
+      this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID
+      this.ifOrganizationEdit = true
+      //瀛愯〃  璧嬪��
+      var rowdata = [];
+      for (let i = 0; i < dataArray.length; i++) {
+          rowdata.push(
+              {
+                "HMaterID": dataArray[i].HMaterID == null ? 0 : dataArray[i].HMaterID
+                , "HMaterNumber": dataArray[i].HMaterNumber == null ? "" : dataArray[i].HMaterNumber
+                , "HMaterName": dataArray[i].HMaterName == null ? "" : dataArray[i].HMaterName
+                , "HMaterModel": dataArray[i].HMaterModel == null ? "" : dataArray[i].HMaterModel
+                , "HUnitID": dataArray[i].HUnitID == null ? 0 : dataArray[i].HUnitID
+                , "HUnitNumber": dataArray[i].HUnitNumber == null ? "" : dataArray[i].HUnitNumber
+                , "HUnitName": dataArray[i].HUnitName == null ? "" : dataArray[i].HUnitName
+                , "HBatchNo": ""
+                , "HQty": dataArray[i].HQty == null ? 0 : dataArray[i].HQty
+                , "HWHID": dataArray[i].HWHID == null ? 0 : dataArray[i].HWHID
+                , "HWHNumber": dataArray[i].HWHNumber == null ? "" : dataArray[i].HWHNumber
+                , "HWHName": dataArray[i].HWHName == null ? "" : dataArray[i].HWHName
+                , "HSPID": "0"
+                , "HSPNumber": ""
+                , "HSPName": ""
+                , "HSCWHID": "0"
+                , "HSCWHNumber": ""
+                , "HSCWHName": ""
+                , "HSCSPID": "0"
+                , "HSCSPNumber": ""
+                , "HSCSPName": ""
+                , "HSourceInterID": dataArray[i].HInterID == null ? 0 : dataArray[i].HInterID
+                , "HSourceEntryID": dataArray[i].HEntryID == null ? 0 : dataArray[i].HEntryID
+                , "HSourceBillType": dataArray[i].HBillType == null ? "" : dataArray[i].HBillType
+                , "HSourceBillNo": dataArray[i].HBillNo == null ? "" : dataArray[i].HBillNo
+                , "HRelationQty": "0"
+                , "HRelationMoney": "0"
+                , "HRemark": ""
+                , "HPropertyID": "0"
+                , "HSecUnitID": "0"
+                , "HSecUnitRate": "0"
+                , "HQtyMust": dataArray[i].HQty == null ? 0 : dataArray[i].HQty
+                , "HPrice": "0"
+                , "HMoney": "0"
+                , "HDesignLife": "0"
+                , "HLeaveLife": "0"
+                , "HPOOrderInterID": "0"
+                , "HPOOrderEntryID": "0"
+                , "HPOOrderBillNo": ""
+                , "HSeOrderInterID": "0"
+                , "HSeOrderEntryID": "0"
+                , "HSeOrderBillNo": ""
+                , "HSTOCKORGID": dataArray[i].HStockOrgID == null ? 0 : dataArray[i].HStockOrgID
+                , "HOtherOrgID": dataArray[i].HStockOrgID == null ? 0 : dataArray[i].HStockOrgID
+                , "HOWNERID": dataArray[i].HStockOrgID == null ? 0 : dataArray[i].HStockOrgID
+                , "HOWNERTYPEID": ""
+                , "HUseLife": "0"
+                , "HUseLifeQty": "0"
+                , "HNewLifeQty": "0"
+                , "HQtyRel": "0"
+                , "HSPGroupID": "0"
+                , "HNewModel": ""
+                , "HWallThickness": ""
+                , "HHardness": ""
+                , "HLastProdModel": ""
+                , "HDiameter": ""
+                , "HBackFlag": ""
+                , "HBarCode": ""
+                , "HMouldType": "0"
+                , "HInitModel": ""
+                , "HInitDesignLife": "0"
+                , "HLifeUnitID": "0"
+                , "HNowModel": ""
+                , "HNowLife": "0"
+                , "HCorrespondentTypeID": "0"
+                , "HCorrespondentID": "0"
+              }
+          )
+      }
+      this.editData = rowdata
+    },
     //寮圭獥璧嬪��
     dbEmitData(deptRow, num) {
       // num=1閮ㄩ棬 num=2浠撳簱
       console.log(deptRow)
-      if (deptRow.HItemID || deptRow.hmainid) {
-        if (num == 1) {
-          if(this.deptType == 1){
-            this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
-            this.form.HDeptID = deptRow.HItemID
-          }else{
-            this.form.HSupName = deptRow.閮ㄩ棬鍚嶇О
-            this.form.HSupID = deptRow.HItemID
+      if(num == 3851){
+        if (deptRow.length > 0) {
+          var HSupTypeID_Temp = deptRow[0].HSupTypeID
+          for (var i = 0; i < deptRow.length; i++) {
+            if (deptRow[i].HSupTypeID != HSupTypeID_Temp) {
+              this.$modal.msgError("鎵�閫夊崟鎹搴斿線鏉ョ被鍨嬪繀椤讳竴鑷达紒");
+              this.deptClose()
+              return;
+            }
           }
-          this.deptShow = false
+          this.processSourceBills(deptRow)
+          this.scMouldInShow = false
           this.openData = false
-        } else if (num == 2) {
-          if(this.eHWHType == 1){
-            this.form.HWHName = deptRow.浠撳簱鍚嶇О
-            this.form.HWHID = deptRow.HItemID
-            this.form.HWHNumber = deptRow.浠撳簱浠g爜
-          }else{
-            this.editData[this.zbIndex].HWHID = deptRow.HItemID
-            this.editData[this.zbIndex].HWHCode = deptRow.浠撳簱浠g爜
-            this.editData[this.zbIndex].HWHName = deptRow.浠撳簱鍚嶇О
-          }
-          this.warehouseShow = false
-          this.openData = false
-        } else if (num == 4) {
-          if(this.empType == 1){
-            this.form.HSecManagerName = deptRow.鑱屽憳鍚嶇О
-            this.form.HSecManagerID = deptRow.HItemID
-          }else{
-            this.form.HKeeperName = deptRow.鑱屽憳鍚嶇О
-            this.form.HKeeperID = deptRow.HItemID
-          }
-          this.gyEmployeeShow = false
-          this.openData = false
-        } else if (num == 6) {
-          this.form.HSupName = deptRow.渚涘簲鍟嗗悕绉�
-          this.form.HSupID = deptRow.HItemID
-          this.gySupplierShow = false
-          this.openData = false
-        } else if (num == 7) {
-          this.form.HSupName = deptRow.瀹㈡埛鍚嶇О
-          this.form.HSupID = deptRow.HItemID
-          this.gyCustomerShow = false
-          this.openData = false
-        } else if (num == 8){
-          this.editData[this.zbIndex].HMaterID = deptRow.hmainid
-          this.editData[this.zbIndex].HMaterCode = deptRow.妯″叿缂栧彿
-          this.editData[this.zbIndex].HMaterName = deptRow.妯″叿鍚嶇О
-          this.editData[this.zbIndex].HMaterSpec = deptRow.妯″叿鍨嬪彿
-          this.editData[this.zbIndex].HUnitID = deptRow.HUnitID
-          this.editData[this.zbIndex].HUnitCode = deptRow.璁¢噺鍗曚綅浠g爜
-          this.editData[this.zbIndex].HUnitName = deptRow.璁¢噺鍗曚綅
-          this.gyMouldShow = false
-          this.openData = false
-        } else if (num == 9){
-          this.editData[this.zbIndex].HSPID = deptRow.HMainID
-          this.editData[this.zbIndex].HSPCode = deptRow.浠撲綅浠g爜
-          this.editData[this.zbIndex].HSPName = deptRow.浠撲綅鍚嶇О
-          this.gyStockPlaceShow = false
-          this.openData = false
+        } else {
+          this.$modal.msgError("璇烽�夋嫨鏁版嵁!");
         }
-      } else {
-        this.$modal.msgError("璇烽�夋嫨鍗曟潯鏁版嵁!");
+      }else{
+        if (deptRow.HItemID || deptRow.hmainid) {
+          if (num == 1) {
+            if(this.deptType == 1){
+              this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
+              this.form.HDeptID = deptRow.HItemID
+            }else{
+              this.form.HSupName = deptRow.閮ㄩ棬鍚嶇О
+              this.form.HSupID = deptRow.HItemID
+            }
+            this.deptShow = false
+            this.openData = false
+          } else if (num == 2) {
+            if(this.eHWHType == 1){
+              this.form.HWHName = deptRow.浠撳簱鍚嶇О
+              this.form.HWHID = deptRow.HItemID
+              this.form.HWHNumber = deptRow.浠撳簱浠g爜
+            }else{
+              this.editData[this.zbIndex].HWHID = deptRow.HItemID
+              this.editData[this.zbIndex].HWHCode = deptRow.浠撳簱浠g爜
+              this.editData[this.zbIndex].HWHName = deptRow.浠撳簱鍚嶇О
+            }
+            this.warehouseShow = false
+            this.openData = false
+          } else if (num == 4) {
+            if(this.empType == 1){
+              this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
+              this.form.HEmpID = deptRow.HItemID
+            }else if(this.empType == 2){
+              this.form.HMangerName = deptRow.鑱屽憳鍚嶇О
+              this.form.HMangerID = deptRow.HItemID
+            }else if(this.empType == 3){
+              this.form.HSecManagerName = deptRow.鑱屽憳鍚嶇О
+              this.form.HSecManagerID = deptRow.HItemID
+            }else if(this.empType == 4){
+              this.form.HKeeperName = deptRow.鑱屽憳鍚嶇О
+              this.form.HKeeperID = deptRow.HItemID
+            }else
+            this.gyEmployeeShow = false
+            this.openData = false
+          } else if (num == 6) {
+            this.form.HSupName = deptRow.渚涘簲鍟嗗悕绉�
+            this.form.HSupID = deptRow.HItemID
+            this.gySupplierShow = false
+            this.openData = false
+          } else if (num == 7) {
+            this.form.HSupName = deptRow.瀹㈡埛鍚嶇О
+            this.form.HSupID = deptRow.HItemID
+            this.gyCustomerShow = false
+            this.openData = false
+          } else if (num == 8){
+            this.editData[this.zbIndex].HMaterID = deptRow.hmainid
+            this.editData[this.zbIndex].HMaterNumber = deptRow.妯″叿缂栧彿
+            this.editData[this.zbIndex].HMaterName = deptRow.妯″叿鍚嶇О
+            this.editData[this.zbIndex].HMaterModel = deptRow.妯″叿鍨嬪彿
+            this.editData[this.zbIndex].HUnitID = deptRow.HUnitID
+            this.editData[this.zbIndex].HUnitNumber = deptRow.璁¢噺鍗曚綅浠g爜
+            this.editData[this.zbIndex].HUnitName = deptRow.璁¢噺鍗曚綅
+            this.editData[this.zbIndex].HQty = 1
+            this.editData[this.zbIndex].HDesignLife = 0
+            this.editData[this.zbIndex].HLeaveLife = 0
+            this.editData[this.zbIndex].HMoney = 0
+            this.gyMouldShow = false
+            this.openData = false
+          } else if (num == 9){
+            this.editData[this.zbIndex].HSPID = deptRow.HMainID
+            this.editData[this.zbIndex].HSPCode = deptRow.浠撲綅浠g爜
+            this.editData[this.zbIndex].HSPName = deptRow.浠撲綅鍚嶇О
+            this.gyStockPlaceShow = false
+            this.openData = false
+          }
+        } else {
+          this.$modal.msgError("璇烽�夋嫨鍗曟潯鏁版嵁!");
+        }
       }
-
     },
     emitData(deptRow, num) {
       this.dialogTypeNum = num
@@ -583,21 +764,25 @@
         HBillNo: '',
         HInterID: 0,
         HDate: new Date(),
-        HInnerBillNo:'',
+        HStockOrgID:sessionStorage["OrganizationID"] - 0,
+        HSupTypeID: 1,
+        HSupName:'',
+        HSupID:0,
+        HDeptName: '',
+        HDeptID: 0,
         HWHName:'',
         HWHNumber:'',
         HWHID:0,
+        HEmpName:'',
+        HEmpID:0,
+        HManagerName:'',
+        HManagerID:0,
         HSecManagerName:'',
         HSecManagerID:0,
         HKeeperName:'',
         HKeeperID:0,
-        HDeptName: '',
-        HDeptID: 0,
-        HSupTypeID: 1,
-        HSupName:'',
-        HSupID:0,
         HSourceBillType:'',
-        XDH:'',
+        HInnerBillNo:'',
         HExplanation:'',
         HRemark:'',
 
@@ -677,7 +862,7 @@
       })
     },
     getHBillNo() {
-      axios.get(this.baseURL + "/Web/GetMAXNum", {
+      axios.get(this.baseURL + "/WEBSController/GetMaxBillNo_Json", {
         params: {
           HBillType: '3803'
         }
@@ -691,71 +876,95 @@
         this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
       });
     },
+    /** 涓嬫帹鎵撳紑 */
+    handleMove() {
+      this.reset()
+      //鏂板鑾峰彇鍗曟嵁鍙�
+      this.getHBillNo()
+      let date = new Date()
+      this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+
+      //璁剧疆婧愬崟绫诲瀷
+      this.form.HSourceBillType = this.HSouceBillType
+      //鑾峰彇婧愬崟鏁版嵁
+      var data = this.getUrlVars_JSON().data;
+      this.processSourceBills(data)
+      this.$nextTick(() => {
+        this.formShow = true
+        this.formLoading = false
+      })
+    },
+    async processSourceBills(data) {
+        const dataArray = [];
+        try {
+            for (var i = 0; i < data.length; i++) { 
+                const result = await this.GetSourceBillList(data[i].hmainid, data[i].hsubid, data[i].HBillType);
+                dataArray.push(result);
+            }
+            // 鎵�鏈夊紓姝ユ搷浣滃畬鎴愬悗鎵ц
+            this.setInitBySourceBill(dataArray);
+        } catch (error) {
+            console.error("澶勭悊鍑洪敊:", error);
+        }
+    },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate() {
       this.reset()
       let rowHmainid = this.linterid
       console.log(this.linterid)
       //涓昏〃
-      axios.get(this.baseURL + "/Sc_MouldProdBackBill/Sc_MouldProdBackBillListCheckDetai", {
-        params: { 'HID': rowHmainid }
+      axios.get(this.baseURL + "/Sc_MouldStockBillController/GetSc_MouldStockBill_Json", {
+        params: { 'HInterID': rowHmainid,"HMaker": sessionStorage["HUserName"]}
       }).then(response => {
-        if (response.data.code == 1) {
-          var data = response.data.data.h_v_Sc_MouldProdBackBill_Edit[0]
+        if (response.data.count == 1) {
+          var data = response.data.data[0]
           console.log(data)
           if (this.copyType == 1) {
             this.getHBillNo()
             let date = new Date()
             this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
           } else {
-            this.form = {
-                  "HBillNo": data.鍗曟嵁鍙�
-                , "HDate": data.鏃ユ湡
-                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
-                , "HWHID": data.HWHID                    //浠撳簱ID
-                , "HWHName": data.浠撳簱                   //浠撳簱鍚嶇О
-                , "HSecManagerID": data.hsecmanagerid    //楠屾敹鍛業D
-                , "HSecManagerName": data.棰嗘枡浜�         //楠屾敹鍛樺悕绉�
-                , "HKeeperID": data.hkeeperid            //淇濈鍛業D
-                , "HKeeperName": data.鍙戞枡浜�            //淇濈鍛樺悕绉�
-                , "HDeptID": data.HDeptID                 //閮ㄩ棬ID
-                , "HDeptName": data.閮ㄩ棬                //閮ㄩ棬鍚嶇О
-                , "HSourceBillType": ""                   //婧愬崟绫诲瀷
-                , "XDH": ""                               //閫夊崟鍙�
-                , "HExplanation": data.鎽樿              //鎽樿
-                , "HRemark": data.琛ㄥご澶囨敞                    //澶囨敞
-                , "HSupTypeID": data.寰�鏉ョ被鍨�                             //閫夊崟鍙�
-                , "HSupName": data.寰�鏉ュ崟浣�              
-                , "HSupID": data.HSupID                    
-
-                , "HMaker": data.鍒跺崟浜�
-                , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : data.鍒跺崟鏃ユ湡
-                , "HChecker": data.瀹℃牳浜�
-                , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : data.瀹℃牳鏃ユ湡
-                , "HUpDater": data.淇敼浜�
-                , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : data.淇敼鏃ユ湡
-                , "HCloseMan": data.鍏抽棴浜�
-                , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : data.鍏抽棴鏃ユ湡
-                , "HDeleteMan": data.浣滃簾浜�
-                , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : data.浣滃簾鏃ユ湡
+            if (data[0].HSourceInterID != "0") {
+              this.ifOrganizationEdit = true
             }
+            this.form = {
+                "HBillNo": data[0].鍗曟嵁鍙�
+                , "HDate": data[0].鏃ユ湡
+                , "HSupTypeID": data[0].HSupTypeID
+                , "HSupID": data[0].HSupID
+                , "HSupName": data[0].寰�鏉ュ崟浣�
+                , "HDeptID": data[0].HDeptID
+                , "HDeptName": data[0].閮ㄩ棬
+                , "HWHID": data[0].HMainWHID
+                , "HWHName": data[0].璋冨叆浠撳簱
+                , "HEmpID": data[0].HEmpID
+                , "HEmpName": data[0].涓氬姟鍛�
+                , "HManagerID": data[0].HManagerID
+                , "HManagerName": data[0].璐熻矗浜�
+                , "HSecManagerID": data[0].HSecManagerID
+                , "HSecManagerName": data[0].楠屾敹鍛�
+                , "HKeeperID": data[0].HKeeperID
+                , "HKeeperName": data[0].淇濈鍛�
+                , "HExplanation": data[0].鎽樿
+                , "HRemark": data[0].琛ㄥご澶囨敞
+                , "HInnerBillNo": data[0].鍐呴儴鍗曟嵁鍙�
+                , "HStockOrgID": data[0].HMainStockOrgID
+                , "HMaker": data[0].鍒跺崟浜�
+                , "HChecker": data[0].瀹℃牳浜�
+                , "HCloseMan": data[0].鍏抽棴浜�
+                , "HUpDater": data[0].淇敼浜�
+                , "HDeleteMan": data[0].浣滃簾浜�
+                , "HMakeDate": data[0].鍒跺崟鏃ユ湡 == null ? "" : data[0].鍒跺崟鏃ユ湡
+                , "HCheckDate": data[0].瀹℃牳鏃ユ湡 == null ? "" : data[0].瀹℃牳鏃ユ湡
+                , "HCloseDate": data[0].鍏抽棴鏃ユ湡 == null ? "" : data[0].鍏抽棴鏃ユ湡
+                , "HUpDateDate": data[0].淇敼鏃ユ湡 == null ? "" : data[0].淇敼鏃ユ湡
+                , "HDeleteDate": data[0].浣滃簾鏃ユ湡 == null ? "" : data[0].浣滃簾鏃ユ湡
+            }
+            this.form.HStockOrgID = data[0].HMainStockOrgID == null ? 0 : data[0].HMainStockOrgID;
+            //瀛愯〃  璧嬪��
+            this.editData = response.data.data[0];
+            this.editData1 = response.data.data[1];
           }
-          this.formShow = true
-          this.formLoading = false
-        }
-      }).catch(error => {
-        console.log(error)
-        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-      });
-      //瀛愯〃
-      axios.get(this.baseURL + "/Sc_MouldProdBackBill/Sc_MouldProdBackBillListProjectDetai", {
-        params: { 'sqlWhere': "and hmainid=" + rowHmainid }
-      }).then(response => {
-        if (response.data.count == 1) {
-          var data = response.data
-          console.log(data)
-          this.editData = data.list[0]
-          this.editData1 = data.list[1]
           this.formShow = true
           this.formLoading = false
         }
@@ -774,29 +983,72 @@
         this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
       } else {
         let obj = {
-          HBatchNo: "",
-          HDesignLife: 0,
-          HLeaveLife: 0,
-          HMaterCode:"",
-          HMaterID:0,
-          HMaterName:"",
-          HMaterSpec:"",
-          HMoney:0,
-          HPrice:0,
-          HQty:0,
-          HQtyMust:0,
-          HSPCode:"",
-          HSPID:0,
-          HSPName:"",
-          HStockOrgID:sessionStorage["OrganizationID"] - 0,//缁勭粐id
-          HUnitCode:"",
-          HUnitID:0,
-          HUnitName:"",
-          HUseLife:0,
-          HWHCode:"",
-          HWHID:0,
-          HWHName:"",
-          HRemark:"",
+         "HMaterID": "0"
+          , "HMaterNumber": ""
+          , "HMaterName": ""
+          , "HMaterModel": ""
+          , "HUnitID": "0"
+          , "HUnitNumber": ""
+          , "HUnitName": ""
+          , "HBatchNo": ""
+          , "HQty": "0"
+          , "HWHID": "0"
+          , "HWHNumber": ""
+          , "HWHName": ""
+          , "HSPID": "0"
+          , "HSPNumber": ""
+          , "HSPName": ""
+          , "HSCWHID": "0"
+          , "HSCWHNumber": ""
+          , "HSCWHName": ""
+          , "HSCSPID": "0"
+          , "HSCSPNumber": ""
+          , "HSCSPName": ""
+          , "HSourceInterID": "0"
+          , "HSourceEntryID": "0"
+          , "HSourceBillType": ""
+          , "HSourceBillNo": ""
+          , "HRelationQty": "0"
+          , "HRelationMoney": "0"
+          , "HRemark": ""
+          , "HPropertyID": "0"
+          , "HSecUnitID": "0"
+          , "HSecUnitRate": "0"
+          , "HQtyMust": "0"
+          , "HPrice": "0"
+          , "HMoney": "0"
+          , "HDesignLife": "0"
+          , "HLeaveLife": "0"
+          , "HPOOrderInterID": "0"
+          , "HPOOrderEntryID": "0"
+          , "HPOOrderBillNo": ""
+          , "HSeOrderInterID": "0"
+          , "HSeOrderEntryID": "0"
+          , "HSeOrderBillNo": ""
+          , "HSTOCKORGID": sessionStorage["OrganizationID"] - 0
+          , "HOtherOrgID": sessionStorage["OrganizationID"] - 0
+          , "HOWNERID": sessionStorage["OrganizationID"] - 0
+          , "HOWNERTYPEID": ""
+          , "HUseLife": "0"
+          , "HUseLifeQty": "0"
+          , "HNewLifeQty": "0"
+          , "HQtyRel": "0"
+          , "HSPGroupID": "0"
+          , "HNewModel": ""
+          , "HWallThickness": ""
+          , "HHardness": ""
+          , "HLastProdModel": ""
+          , "HDiameter": ""
+          , "HBackFlag": ""
+          , "HBarCode": ""
+          , "HMouldType": "0"
+          , "HInitModel": ""
+          , "HInitDesignLife": "0"
+          , "HLifeUnitID": "0"
+          , "HNowModel": ""
+          , "HNowLife": "0"
+          , "HCorrespondentTypeID": "0"
+          , "HCorrespondentID": "0"
         }
         if (index) {
           this.editData.splice(index, 0, obj);
@@ -879,23 +1131,32 @@
               this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍣ㄥ叿鏈�夋嫨锛�");
             }else if(!item.HWHID){
               fhck = true
-              this.$modal.msgError("绗�" + (index + 1) + "琛岋細浠撳簱鏈�夋嫨锛�");
+              this.$modal.msgError("绗�" + (index + 1) + "琛岋細璋冨叆浠撳簱鏈�夋嫨锛�");
+            }else if(!item.HUnitID){
+              fhck = true
+              this.$modal.msgError("绗�" + (index + 1) + "琛岋細璁¢噺鍗曚綅涓虹┖锛�");
             }else if(item.HQty == 0){
               fhck = true
-              this.$modal.msgError("绗�" + (index + 1) + "琛岋細浜у搧鍏ュ簱璁板綍鏈壂鐮侊紙瀹炲彂鏁伴噺涓�0锛�");
+              this.$modal.msgError("绗�" + (index + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
             }
           })
           this.$nextTick(() => {
             if (!fhck) {
-              if(this.OperationType == 3){
-                this.form.HInterID = this.linterid
+              var Operation = null
+              if(!this.OperationType || this.OperationType == 4){
+                Operation = 1
+              }else{
+                Operation = this.OperationType
+                if(Operation == 2){
+                  this.form.HInterID = this.linterid
+                }
               }
               var sMainStr = JSON.stringify(this.form);
               var sSubStr = JSON.stringify(this.editData);
-              var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+              var sMainSub = sMainStr + ';' + sSubStr + ';' + Operation + ";" + sessionStorage["HUserName"];
               axios({
                 method: 'post',
-                url: this.baseURL + "/Sc_MouldProdBackBill/SaveGetMouldProdBackBillList",
+                url: this.baseURL + "/Sc_MouldProdBackBillController/GetSc_MouldProdBackBill_Save_Json",
                 data: {
                   'msg': sMainSub
                 },
@@ -924,12 +1185,13 @@
     set_CheckBill(num, form) {
       var InterID = form.hmainid || form.HInterID
       //閫昏緫瀹℃牳鏂规硶
-      axios.get(this.baseURL + "/Sc_MouldProdBackBill/AuditMouldProdBackBill", {
-        params: { "HInterID": InterID, "flag": num, "user": sessionStorage["HUserName"] }
+      axios.get(this.baseURL + "/Sc_MouldProdBackBillController/GetSc_MouldProdBackBill_Check_Json", {
+        params: { "HInterID": InterID, "Type": num, "HMaker": 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,);
@@ -946,6 +1208,7 @@
       this.gyCustomerShow = false
       this.gyMouldShow = false
       this.gyStockPlaceShow = false
+      this.scMouldInShow = false
     },
     //  鎵撳紑鏁版嵁鍒楄〃寮圭獥
     openDataDialog(num, row) {
@@ -986,6 +1249,10 @@
         this.dialogTitle = '浠撲綅鍒楄〃'
         this.gyStockPlaceShow = true
         this.openData = true
+      }  else if (num == 3851) {
+        this.dialogTitle = '鍣ㄥ叿鍏ュ簱鐢宠鍗曞垪琛�'
+        this.scMouldInShow = true
+        this.openData = true
       } 
     },
     //鏍规嵁寰�鏉ョ被鍨嬪垽鏂線鏉ュ崟浣�
@@ -998,7 +1265,15 @@
         this.deptType = 2
         this.openDataDialog(1)
       }
-    }
+    },
+    //閫夋嫨婧愬崟
+    get_checkMainSource(){
+      if(this.form.HSourceBillType == "3851"){
+        this.openDataDialog(3851)
+      }else{
+        this.$modal.msgError("鏈煡璇㈠埌鎵�閫夋簮鍗曠被鍨嬬浉鍏冲崟鎹俊鎭�!");
+      }
+    },
   }
 };
 </script>
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
index 372db09..78bbce7 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
@@ -309,6 +309,11 @@
                 <span>{{ scope.row.HSCSPName }}</span>
               </template>
             </el-table-column>
+            <el-table-column align="center" label="婧愬崟鍗曞彿" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HSourceBillNo }}</span>
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="澶囨敞" width="120">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
@@ -408,7 +413,7 @@
 import GyCustomer from '@/views/GyCustomer'
 import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
 import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
-import ScMouldMove from '@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue'
+import ScMouldMove from '@/views/scMould/warehouse/component/Sc_MouldMoveStockRequestBill.vue'
 import moment from 'moment';
 
 export default {
@@ -589,20 +594,20 @@
       //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
     },
     //鑾峰彇婧愬崟鏁版嵁
-    GetSourceBillList(HSourceInterID, HSourceEntryID, HSourceBillType) {
-        var res = "none"
-        axios.get(this.baseURL + "/Sc_MouldProdMoveBillController/GetSourceBill_MouldProdMove_Json", {
-          params: { "HInterID": HSourceInterID, "HEntryID": HSourceEntryID, "HBillType": HSourceBillType }
-        }).then(response => {
-          if (response.data.count == 1) {
-            res = response.data.data[0]
-          }else {
-            res = "none";
-          }
-        }).catch(error => {
-          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+    GetSourceBillList(HSourceInterID, HSourceEntryID, HSourceBillType) { 
+        return new Promise((resolve, reject) => {
+            axios.get(this.baseURL + "/Sc_MouldProdMoveBillController/GetSourceBill_MouldProdMove_Json", { 
+                params: { "HInterID": HSourceInterID, "HEntryID": HSourceEntryID, "HBillType": HSourceBillType } 
+            }).then(response => { 
+                if (response.data.count == 1) { 
+                    resolve(response.data.data[0]);
+                } else { 
+                    this.$modal.msgError("鏈煡璇㈠埌鏁版嵁!");
+                }
+            }).catch(error => { 
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
         });
-        return res;
     },
     //鍐欏叆婧愬崟鏁版嵁
     setInitBySourceBill(dataArray){
@@ -612,8 +617,6 @@
       this.form.HSupName = data.HSupName
       this.form.HDeptID = data.HDeptID
       this.form.HDeptName = data.HDeptName
-      this.form.HStockInOrgID = data.HStockInOrgID
-      this.form.HStockOutOrgID = data.HStockOutOrgID
       this.form.HStockOrgID = data.HStockOutOrgID
       this.form.HStockInOrgID = data.HStockInOrgID == null ? 0 : data.HStockInOrgID
       this.form.HStockOutOrgID = data.HStockOutOrgID == null ? 0 : data.HStockOutOrgID
@@ -705,24 +708,16 @@
           for (var i = 0; i < deptRow.length; i++) {
             if (deptRow[i].HSupTypeID != HSupTypeID_Temp) {
               this.$modal.msgError("鎵�閫夊崟鎹搴斿線鏉ョ被鍨嬪繀椤讳竴鑷达紒");
+              this.deptClose()
+              return;
             }
             if (deptRow[i].HStockInOrgID != HStockInOrgID_Temp) {
               this.$modal.msgError("鎵�閫夊崟鎹搴旇皟鍏ョ粍缁囧繀椤讳竴鑷达紒");
+              this.deptClose()
+              return;
             }
           }
-
-          var dataArray = [];
-          for (var i = 0; i < deptRow.length; i++) {
-              var temp = this.GetSourceBillList(deptRow[i].hmainid, deptRow[i].hsubid, deptRow[i].HBillType)
-              console.log(718,temp)
-              if (temp != "none") {
-                  dataArray.push(temp);
-              } else {
-                this.$modal.msgError("鏈煡璇㈠埌婧愬崟淇℃伅锛岃鍒锋柊婧愬崟鍒楄〃鍚庨噸鏂伴�夋嫨瀵瑰簲婧愬崟锛�");
-              }
-          }
-          this.setInitBySourceBill(dataArray)
-
+          this.processSourceBills(deptRow)
           this.scMouldMoveShow = false
           this.openData = false
         } else {
@@ -829,6 +824,7 @@
     deptClose() {
       this.deptform = {}
       this.openData = false
+      this.showReset()
     },
 
     //琛ㄥ崟鍒濆鍖�
@@ -837,20 +833,27 @@
         HBillNo: '',
         HInterID: 0,
         HDate: new Date(),
-        HInnerBillNo:'',
+        HStockInOrgID:sessionStorage["OrganizationID"] - 0,
+        HSupTypeID:1,
+        HSupName:'',
+        HSupID:0,
+        HStockOutOrgID:sessionStorage["OrganizationID"] - 0,
+        HDeptName: '',
+        HDeptID: 0,
         HWHName:'',
         HWHNumber:'',
         HWHID:0,
+        HSCWHName:'',
+        HSCWHNumber:'',
+        HSCWHID:0,
+        HEmpName:'',
+        HEmpID:'',
+        HMangerName:'',
+        HMangerID:'',
         HSecManagerName:'',
-        HSecManagerID:0,
+        HSecManagerID:'',
         HKeeperName:'',
-        HKeeperID:0,
-        HDeptName: '',
-        HDeptID: 0,
-        HStockStyle:'鍚岀粍缁囪皟鎷�',
-        HOrgID:sessionStorage["OrganizationID"] - 0,
-        HSourceBillType:'',
-        XDH:'',
+        HKeeperID:'',
         HExplanation:'',
         HRemark:'',
 
@@ -956,23 +959,24 @@
       this.form.HSourceBillType = this.HSouceBillType
       //鑾峰彇婧愬崟鏁版嵁
       var data = this.getUrlVars_JSON().data;
-      var dataArray = [];
-      for (var i = 0; i < data.length; i++) {
-          var temp = this.GetSourceBillList(data[i].hmainid, data[i].hsubid, data[i].HBillType)
-          console.log(temp)
-          if (temp != "none") {
-              dataArray.push(temp);
-          } else {
-              this.$modal.msgError("鏈煡璇㈠埌鍗曟嵁鍙笅鎺ㄦ暟鎹紝璇峰埛鏂板崟鎹垪琛ㄥ悗閲嶆柊閫夋嫨鍗曟嵁涓嬫帹锛�");
-              return;
-          }
-      }
+      this.processSourceBills(data)
       this.$nextTick(() => {
-        this.setInitBySourceBill(dataArray);
-        this.OperationType = 1;
         this.formShow = true
         this.formLoading = false
       })
+    },
+    async processSourceBills(data) {
+        const dataArray = [];
+        try {
+            for (var i = 0; i < data.length; i++) { 
+                const result = await this.GetSourceBillList(data[i].hmainid, data[i].hsubid, data[i].HBillType);
+                dataArray.push(result);
+            }
+            // 鎵�鏈夊紓姝ユ搷浣滃畬鎴愬悗鎵ц
+            this.setInitBySourceBill(dataArray);
+        } catch (error) {
+            console.error("澶勭悊鍑洪敊:", error);
+        }
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate() {
@@ -1217,7 +1221,7 @@
           this.$nextTick(() => {
             if (!fhck) {
               var Operation = null
-              if(!this.OperationType){
+              if(!this.OperationType || this.OperationType == 4){
                 Operation = 1
               }else{
                 Operation = this.OperationType
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
index b40720e..84d859e 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
@@ -23,47 +23,12 @@
                 </el-date-picker>
               </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>
-            </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,eHWHType=1)"></el-button>
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="6">
-              <el-form-item label="缁勭粐" prop="HOrgID">
-                <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐" @change="organizationChange" :disabled="zzSelDis">
+            <el-col :span="12">
+              <el-form-item label="缁勭粐" prop="HStockOrgID">
+                <el-select v-model="form.HStockOrgID" placeholder="璇烽�夋嫨缁勭粐" :disabled="ifOrganizationEdit">
                   <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="楠屾敹鍛�" prop="HSecManagerName">
-                <el-input v-model="form.HSecManagerName" placeholder="璇烽�夋嫨楠屾敹鍛�" disabled>
-                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=1)"></el-button>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <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,empType=2)"></el-button>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="閮ㄩ棬" prop="HDeptName">
-                <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" disabled>
-                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1,deptType=1)"></el-button>
-                </el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -83,16 +48,74 @@
                 </el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="閮ㄩ棬" prop="HDeptName">
+                <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1,deptType=1)"></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,eHWHType=1)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
-            <!-- <el-col :span="6">
-              <el-form-item label="婧愬崟绫诲瀷" prop="BillType">
-                <el-select v-model="form.BillType" placeholder="璇烽�夋嫨">
-                  <el-option label="閿�鍞鍗�" value="1401" />
-                  <el-option label="鍙戣揣閫氱煡鍗�" value="1402" />
+            <el-col :span="6">
+              <el-form-item label="涓氬姟鍛�" prop="HEmpName">
+                <el-input v-model="form.HEmpName" placeholder="璇烽�夋嫨" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=1)"></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,empType=2)"></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,empType=3)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <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,empType=4)"></el-button>
+                </el-input>
+              </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="璇烽�夋嫨">
+                  <el-option v-for="(item, index) in HSourceBillTypes" :key="index" :label="item.HSourceBillTypeName" :value="item.HSourceBillType">
+                  </el-option>
                 </el-select>
               </el-form-item>
-            </el-col> -->
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="婧愬崟鍗曞彿" prop="HSourceBillNo">
+                <el-input placeholder="璇烽�夋嫨婧愬崟鍗曞彿" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="get_checkMainSource()"></el-button>
+                </el-input>
+              </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>
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="12">
               <el-form-item label="鎽樿" prop="HExplanation">
                 <el-input v-model="form.HExplanation" placeholder="璇疯緭鍏ユ憳瑕�" />
@@ -225,13 +248,13 @@
                   controls-position="right"></el-input-number>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="鍙戞枡浠撳簱浠g爜" width="120">
+            <el-table-column align="center" label="浠撳簱浠g爜" width="120">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.HWHCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=2)"
                   @dblclick.native="openDataDialog(2, scope.row ,eHWHType=2)" />
               </template>
             </el-table-column>
-            <el-table-column align="center" label="鍙戞枡浠撳簱" width="120">
+            <el-table-column align="center" label="浠撳簱鍚嶇О" width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.HWHName }}</span>
               </template>
@@ -242,9 +265,14 @@
                   @dblclick.native="openDataDialog(9, scope.row)" />
               </template>
             </el-table-column>
-            <el-table-column align="center" label="浠撲綅" width="120">
+            <el-table-column align="center" label="浠撲綅鍚嶇О" width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.HSPName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="婧愬崟鍗曞彿" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HSourceBillNo }}</span>
               </template>
             </el-table-column>
             <el-table-column align="center" label="澶囨敞" width="120">
@@ -324,6 +352,7 @@
       <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
       <GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
       <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
+      <ScMouldOut @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :HOrgID="form.HStockOutOrgID" v-if="scMouldOutShow" />
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
         <el-button @click="deptClose">鍙� 娑�</el-button>
@@ -345,11 +374,12 @@
 import GyCustomer from '@/views/GyCustomer'
 import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
 import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
+import ScMouldOut from '@/views/scMould/warehouse/component/Sc_MouldOutRequestBill.vue'
 import moment from 'moment';
 
 export default {
   name: 'Sc_MouldProdOutBillEdit',
-  components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace },
+  components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,ScMouldOut },
   props: {
     OperationType: { type: Number, },
     linterid: { type: Number, },
@@ -367,6 +397,7 @@
       rowHideShow: false,
       openRowHide: false,
       hSupTypeList: [{name:'渚涘簲鍟�',id:1,},{name:'瀹㈡埛',id:2},{name:'杞﹂棿閮ㄩ棬',id:3}],
+      HSourceBillTypes:[],
       addBtnShow: false,
       zbIndex: null,
       zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
@@ -378,6 +409,7 @@
       gyCustomerShow: false,//瀹㈡埛鏁版嵁缁勪欢
       gyMouldShow: false,//鍣ㄥ叿鏁版嵁缁勪欢
       gyStockPlaceShow: false,//浠撲綅鏁版嵁缁勪欢
+      scMouldOutShow:false,//婧愬崟缁勪欢
       eHWHType:1,//浠撳簱寮圭獥鍖哄垎鏍囧織
       empType:1,//鑱屽憳寮圭獥鍖哄垎鏍囧織
       deptType:1,//閮ㄩ棬寮圭獥鍖哄垎鏍囧織
@@ -385,8 +417,9 @@
       openData: false,//鏁版嵁寮圭獥
       dialogTitle: '',
       organizationList: [],//缁勭粐鍒楄〃
+      ifOrganizationEdit: false,
       subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
-      // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+      // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼2锛�
       HInterID: 0,
       baseURL: process.env.VUE_APP_BASE_API,
       checkedSysZb: [],
@@ -434,26 +467,27 @@
       form: {},
       // 琛ㄥ崟鏍¢獙
       rules: {
+        HBillNo: [
+          { required: true, message: "鍗曟嵁鍙蜂笉鑳戒负绌�", trigger: "blur" }
+        ],
         HDate: [
           { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
         ],
-        HWHName: [
-          { required: true, message: "鍣ㄥ叿浠撳簱涓嶈兘涓虹┖", trigger: "blur" }
+        HStockOrgID: [
+          { required: true, message: "缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
         ],
         HSecManagerName: [
           { required: true, message: "楠屾敹鍛樹笉鑳戒负绌�", trigger: "blur" }
         ],
         HKeeperName: [
           { required: true, message: "淇濈鍛樹笉鑳戒负绌�", trigger: "blur" }
-        ],
-        HDeptName: [
-          { required: true, message: "閮ㄩ棬涓嶈兘涓虹┖", trigger: "blur" }
         ]
       }
     };
   },
   created() {
     this.fetchData()
+    this.SourceBillType()
     this.getdata()
   },
   methods: {
@@ -467,14 +501,29 @@
         this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
       });
     },
+    SourceBillType(){
+      axios.get(this.baseURL + "/Web/GetHSourceBillType", {
+        params: { "HName": '鍣ㄥ叿棰嗙敤鍑哄簱鍗�', "Num": 2 }//0钃濆崟 1绾㈠崟 2涓嶅垎绾㈣摑鍗�
+      }).then(response => {
+        if (response.data.count == 1) {
+          this.HSourceBillTypes = response.data.data
+          this.form.HSourceBillType = this.HSourceBillTypes[0].HSourceBillType
+          this.form.HSourceBillTypeName = this.HSourceBillTypes[0].HSourceBillTypeName
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
     getdata() {
       console.log(this.copyType, this.OperationType)
       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) {
+      } else if (this.OperationType == 2 || this.copyType == 1) {
         this.handleUpdate()
+      } else if (this.OperationType == 4) {
+        this.handleMove()
       }
     },
     // 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
@@ -498,74 +547,203 @@
       // let options=undefined
       //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
     },
+    //鑾峰彇婧愬崟鏁版嵁
+    GetSourceBillList(HSourceInterID, HSourceEntryID, HSourceBillType) { 
+        return new Promise((resolve, reject) => {
+            axios.get(this.baseURL + "/Sc_MouldProdOutBillController/GetSourceBill_MouldProdOut_Json", { 
+                params: { "HInterID": HSourceInterID, "HEntryID": HSourceEntryID, "HBillType": HSourceBillType } 
+            }).then(response => { 
+                if (response.data.count == 1) { 
+                    resolve(response.data.data[0]);
+                } else { 
+                    this.$modal.msgError("鏈煡璇㈠埌鏁版嵁!");
+                }
+            }).catch(error => { 
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
+        });
+    },
+    //鍐欏叆婧愬崟鏁版嵁
+    setInitBySourceBill(dataArray){
+      var data = dataArray[0]
+      this.form.HSupTypeID = data.HSupTypeID
+      this.form.HSupID = data.HSupID
+      this.form.HSupName = data.HSupName
+      this.form.HDeptID = data.HDeptID
+      this.form.HDeptName = data.HDeptName
+      this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID
+      this.ifOrganizationEdit = true
+      //瀛愯〃  璧嬪��
+      var rowdata = [];
+      for (let i = 0; i < dataArray.length; i++) {
+          rowdata.push(
+              {
+                "HMaterID": dataArray[i].HMaterID == null ? 0 : dataArray[i].HMaterID
+                , "HMaterNumber": dataArray[i].HMaterNumber == null ? "" : dataArray[i].HMaterNumber
+                , "HMaterName": dataArray[i].HMaterName == null ? "" : dataArray[i].HMaterName
+                , "HMaterModel": dataArray[i].HMaterModel == null ? "" : dataArray[i].HMaterModel
+                , "HUnitID": dataArray[i].HUnitID == null ? 0 : dataArray[i].HUnitID
+                , "HUnitNumber": dataArray[i].HUnitNumber == null ? "" : dataArray[i].HUnitNumber
+                , "HUnitName": dataArray[i].HUnitName == null ? "" : dataArray[i].HUnitName
+                , "HBatchNo": ""
+                , "HQty": dataArray[i].HQty == null ? 0 : dataArray[i].HQty
+                , "HWHID": dataArray[i].HWHID == null ? 0 : dataArray[i].HWHID
+                , "HWHNumber": dataArray[i].HWHNumber == null ? "" : dataArray[i].HWHNumber
+                , "HWHName": dataArray[i].HWHName == null ? "" : dataArray[i].HWHName
+                , "HSPID": "0"
+                , "HSPNumber": ""
+                , "HSPName": ""
+                , "HSCWHID": "0"
+                , "HSCWHNumber": ""
+                , "HSCWHName": ""
+                , "HSCSPID": "0"
+                , "HSCSPNumber": ""
+                , "HSCSPName": ""
+                , "HSourceInterID": dataArray[i].HInterID == null ? 0 : dataArray[i].HInterID
+                , "HSourceEntryID": dataArray[i].HEntryID == null ? 0 : dataArray[i].HEntryID
+                , "HSourceBillType": dataArray[i].HBillType == null ? "" : dataArray[i].HBillType
+                , "HSourceBillNo": dataArray[i].HBillNo == null ? "" : dataArray[i].HBillNo
+                , "HRelationQty": "0"
+                , "HRelationMoney": "0"
+                , "HRemark": ""
+                , "HPropertyID": "0"
+                , "HSecUnitID": "0"
+                , "HSecUnitRate": "0"
+                , "HQtyMust": dataArray[i].HQty == null ? 0 : dataArray[i].HQty
+                , "HPrice": "0"
+                , "HMoney": "0"
+                , "HDesignLife": "0"
+                , "HLeaveLife": "0"
+                , "HPOOrderInterID": "0"
+                , "HPOOrderEntryID": "0"
+                , "HPOOrderBillNo": ""
+                , "HSeOrderInterID": "0"
+                , "HSeOrderEntryID": "0"
+                , "HSeOrderBillNo": ""
+                , "HSTOCKORGID": dataArray[i].HStockOrgID == null ? 0 : dataArray[i].HStockOrgID
+                , "HOtherOrgID": dataArray[i].HStockOrgID == null ? 0 : dataArray[i].HStockOrgID
+                , "HOWNERID": dataArray[i].HStockOrgID == null ? 0 : dataArray[i].HStockOrgID
+                , "HOWNERTYPEID": ""
+                , "HUseLife": "0"
+                , "HUseLifeQty": "0"
+                , "HNewLifeQty": "0"
+                , "HQtyRel": "0"
+                , "HSPGroupID": "0"
+                , "HNewModel": ""
+                , "HWallThickness": ""
+                , "HHardness": ""
+                , "HLastProdModel": ""
+                , "HDiameter": ""
+                , "HBackFlag": ""
+                , "HBarCode": ""
+                , "HMouldType": "0"
+                , "HInitModel": ""
+                , "HInitDesignLife": "0"
+                , "HLifeUnitID": "0"
+                , "HNowModel": ""
+                , "HNowLife": "0"
+                , "HCorrespondentTypeID": "0"
+                , "HCorrespondentID": "0"
+              }
+          )
+      }
+      this.editData = rowdata
+    },
     //寮圭獥璧嬪��
     dbEmitData(deptRow, num) {
       // num=1閮ㄩ棬 num=2浠撳簱
       console.log(deptRow)
-      if (deptRow.HItemID || deptRow.hmainid) {
-        if (num == 1) {
-          if(this.deptType == 1){
-            this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
-            this.form.HDeptID = deptRow.HItemID
-          }else{
-            this.form.HSupName = deptRow.閮ㄩ棬鍚嶇О
-            this.form.HSupID = deptRow.HItemID
+      if(num == 3849){
+        if (deptRow.length > 0) {
+          var HSupTypeID_Temp = deptRow[0].HSupTypeID
+          for (var i = 0; i < deptRow.length; i++) {
+            if (deptRow[i].HSupTypeID != HSupTypeID_Temp) {
+              this.$modal.msgError("鎵�閫夊崟鎹搴斿線鏉ョ被鍨嬪繀椤讳竴鑷达紒");
+              this.deptClose()
+              return;
+            }
           }
-          this.deptShow = false
+          this.processSourceBills(deptRow)
+          this.scMouldOutShow = false
           this.openData = false
-        } else if (num == 2) {
-          if(this.eHWHType == 1){
-            this.form.HWHName = deptRow.浠撳簱鍚嶇О
-            this.form.HWHID = deptRow.HItemID
-            this.form.HWHNumber = deptRow.浠撳簱浠g爜
-          }else{
-            this.editData[this.zbIndex].HWHID = deptRow.HItemID
-            this.editData[this.zbIndex].HWHCode = deptRow.浠撳簱浠g爜
-            this.editData[this.zbIndex].HWHName = deptRow.浠撳簱鍚嶇О
-          }
-          this.warehouseShow = false
-          this.openData = false
-        } else if (num == 4) {
-          if(this.empType == 1){
-            this.form.HSecManagerName = deptRow.鑱屽憳鍚嶇О
-            this.form.HSecManagerID = deptRow.HItemID
-          }else{
-            this.form.HKeeperName = deptRow.鑱屽憳鍚嶇О
-            this.form.HKeeperID = deptRow.HItemID
-          }
-          this.gyEmployeeShow = false
-          this.openData = false
-        } else if (num == 6) {
-          this.form.HSupName = deptRow.渚涘簲鍟嗗悕绉�
-          this.form.HSupID = deptRow.HItemID
-          this.gySupplierShow = false
-          this.openData = false
-        } else if (num == 7) {
-          this.form.HSupName = deptRow.瀹㈡埛鍚嶇О
-          this.form.HSupID = deptRow.HItemID
-          this.gyCustomerShow = false
-          this.openData = false
-        } else if (num == 8){
-          this.editData[this.zbIndex].HMaterID = deptRow.hmainid
-          this.editData[this.zbIndex].HMaterCode = deptRow.妯″叿缂栧彿
-          this.editData[this.zbIndex].HMaterName = deptRow.妯″叿鍚嶇О
-          this.editData[this.zbIndex].HMaterSpec = deptRow.妯″叿鍨嬪彿
-          this.editData[this.zbIndex].HUnitID = deptRow.HUnitID
-          this.editData[this.zbIndex].HUnitCode = deptRow.璁¢噺鍗曚綅浠g爜
-          this.editData[this.zbIndex].HUnitName = deptRow.璁¢噺鍗曚綅
-          this.gyMouldShow = false
-          this.openData = false
-        } else if (num == 9){
-          this.editData[this.zbIndex].HSPID = deptRow.HMainID
-          this.editData[this.zbIndex].HSPCode = deptRow.浠撲綅浠g爜
-          this.editData[this.zbIndex].HSPName = deptRow.浠撲綅鍚嶇О
-          this.gyStockPlaceShow = false
-          this.openData = false
+        } else {
+          this.$modal.msgError("璇烽�夋嫨鏁版嵁!");
         }
-      } else {
-        this.$modal.msgError("璇烽�夋嫨鍗曟潯鏁版嵁!");
+      }else{
+        if (deptRow.HItemID || deptRow.hmainid) {
+          if (num == 1) {
+            if(this.deptType == 1){
+              this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
+              this.form.HDeptID = deptRow.HItemID
+            }else{
+              this.form.HSupName = deptRow.閮ㄩ棬鍚嶇О
+              this.form.HSupID = deptRow.HItemID
+            }
+            this.deptShow = false
+            this.openData = false
+          } else if (num == 2) {
+            if(this.eHWHType == 1){
+              this.form.HWHName = deptRow.浠撳簱鍚嶇О
+              this.form.HWHID = deptRow.HItemID
+              this.form.HWHNumber = deptRow.浠撳簱浠g爜
+            }else{
+              this.editData[this.zbIndex].HWHID = deptRow.HItemID
+              this.editData[this.zbIndex].HWHCode = deptRow.浠撳簱浠g爜
+              this.editData[this.zbIndex].HWHName = deptRow.浠撳簱鍚嶇О
+            }
+            this.warehouseShow = false
+            this.openData = false
+          } else if (num == 4) {
+            if(this.empType == 1){
+              this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
+              this.form.HEmpID = deptRow.HItemID
+            }else if(this.empType == 2){
+              this.form.HMangerName = deptRow.鑱屽憳鍚嶇О
+              this.form.HMangerID = deptRow.HItemID
+            }else if(this.empType == 3){
+              this.form.HSecManagerName = deptRow.鑱屽憳鍚嶇О
+              this.form.HSecManagerID = deptRow.HItemID
+            }else if(this.empType == 4){
+              this.form.HKeeperName = deptRow.鑱屽憳鍚嶇О
+              this.form.HKeeperID = deptRow.HItemID
+            }else
+            this.gyEmployeeShow = false
+            this.openData = false
+          } else if (num == 6) {
+            this.form.HSupName = deptRow.渚涘簲鍟嗗悕绉�
+            this.form.HSupID = deptRow.HItemID
+            this.gySupplierShow = false
+            this.openData = false
+          } else if (num == 7) {
+            this.form.HSupName = deptRow.瀹㈡埛鍚嶇О
+            this.form.HSupID = deptRow.HItemID
+            this.gyCustomerShow = false
+            this.openData = false
+          } else if (num == 8){
+            this.editData[this.zbIndex].HMaterID = deptRow.hmainid
+            this.editData[this.zbIndex].HMaterNumber = deptRow.妯″叿缂栧彿
+            this.editData[this.zbIndex].HMaterName = deptRow.妯″叿鍚嶇О
+            this.editData[this.zbIndex].HMaterModel = deptRow.妯″叿鍨嬪彿
+            this.editData[this.zbIndex].HUnitID = deptRow.HUnitID
+            this.editData[this.zbIndex].HUnitNumber = deptRow.璁¢噺鍗曚綅浠g爜
+            this.editData[this.zbIndex].HUnitName = deptRow.璁¢噺鍗曚綅
+            this.editData[this.zbIndex].HQty = 1
+            this.editData[this.zbIndex].HDesignLife = 0
+            this.editData[this.zbIndex].HLeaveLife = 0
+            this.editData[this.zbIndex].HMoney = 0
+            this.gyMouldShow = false
+            this.openData = false
+          } else if (num == 9){
+            this.editData[this.zbIndex].HSPID = deptRow.HMainID
+            this.editData[this.zbIndex].HSPCode = deptRow.浠撲綅浠g爜
+            this.editData[this.zbIndex].HSPName = deptRow.浠撲綅鍚嶇О
+            this.gyStockPlaceShow = false
+            this.openData = false
+          }
+        } else {
+          this.$modal.msgError("璇烽�夋嫨鍗曟潯鏁版嵁!");
+        }
       }
-
     },
     emitData(deptRow, num) {
       this.dialogTypeNum = num
@@ -586,25 +764,27 @@
         HBillNo: '',
         HInterID: 0,
         HDate: new Date(),
-        HInnerBillNo:'',
+        HStockOrgID:sessionStorage["OrganizationID"] - 0,
+        HSupTypeID: 1,
+        HSupName:'',
+        HSupID:0,
+        HDeptName: '',
+        HDeptID: 0,
         HWHName:'',
         HWHNumber:'',
         HWHID:0,
-        HOrgID:sessionStorage["OrganizationID"] - 0,
+        HEmpName:'',
+        HEmpID:0,
+        HManagerName:'',
+        HManagerID:0,
         HSecManagerName:'',
         HSecManagerID:0,
         HKeeperName:'',
         HKeeperID:0,
-        HDeptName: '',
-        HDeptID: 0,
-        HSupTypeID: 1,
-        HSupName:'',
-        HSupID:0,
         HSourceBillType:'',
-        XDH:'',
+        HInnerBillNo:'',
         HExplanation:'',
         HRemark:'',
-
         HMaker: '',
         HUpDater: '',
         HChecker: '',
@@ -681,7 +861,7 @@
       })
     },
     getHBillNo() {
-      axios.get(this.baseURL + "/Web/GetMAXNum", {
+      axios.get(this.baseURL + "/WEBSController/GetMaxBillNo_Json", {
         params: {
           HBillType: '3802'
         }
@@ -695,71 +875,95 @@
         this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
       });
     },
+    /** 涓嬫帹鎵撳紑 */
+    handleMove() {
+      this.reset()
+      //鏂板鑾峰彇鍗曟嵁鍙�
+      this.getHBillNo()
+      let date = new Date()
+      this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+
+      //璁剧疆婧愬崟绫诲瀷
+      this.form.HSourceBillType = this.HSouceBillType
+      //鑾峰彇婧愬崟鏁版嵁
+      var data = this.getUrlVars_JSON().data;
+      this.processSourceBills(data)
+      this.$nextTick(() => {
+        this.formShow = true
+        this.formLoading = false
+      })
+    },
+    async processSourceBills(data) {
+        const dataArray = [];
+        try {
+            for (var i = 0; i < data.length; i++) { 
+                const result = await this.GetSourceBillList(data[i].hmainid, data[i].hsubid, data[i].HBillType);
+                dataArray.push(result);
+            }
+            // 鎵�鏈夊紓姝ユ搷浣滃畬鎴愬悗鎵ц
+            this.setInitBySourceBill(dataArray);
+        } catch (error) {
+            console.error("澶勭悊鍑洪敊:", error);
+        }
+    },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate() {
       this.reset()
       let rowHmainid = this.linterid
       console.log(this.linterid)
       //涓昏〃
-      axios.get(this.baseURL + "/Sc_MouldProdOutBill/Sc_MouldProdOutBillListCheckDetai", {
-        params: { 'HID': rowHmainid }
+      axios.get(this.baseURL + "/Sc_MouldStockBillController/GetSc_MouldStockBill_Json", {
+        params: { 'HInterID': rowHmainid,"HMaker": sessionStorage["HUserName"] }
       }).then(response => {
-        if (response.data.code == 1) {
-          var data = response.data.data.h_v_Sc_MouldProdOutHouseBill_Edit[0]
+        if (response.data.count == 1) {
+          var data = response.data.data[0]
           console.log(data)
           if (this.copyType == 1) {
             this.getHBillNo()
             let date = new Date()
             this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
           } else {
-            this.form = {
-                  "HBillNo": data.鍗曟嵁鍙�
-                , "HDate": data.鏃ユ湡
-                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
-                , "HWHID": data.HWHID                    //浠撳簱ID
-                , "HWHName": data.浠撳簱                   //浠撳簱鍚嶇О
-                , "HSecManagerID": data.hsecmanagerid    //楠屾敹鍛業D
-                , "HSecManagerName": data.棰嗘枡浜�         //楠屾敹鍛樺悕绉�
-                , "HKeeperID": data.hkeeperid            //淇濈鍛業D
-                , "HKeeperName": data.鍙戞枡浜�            //淇濈鍛樺悕绉�
-                , "HDeptID": data.HDeptID                 //閮ㄩ棬ID
-                , "HDeptName": data.閮ㄩ棬                //閮ㄩ棬鍚嶇О
-                , "HSourceBillType": ""                   //婧愬崟绫诲瀷
-                , "XDH": ""                               //閫夊崟鍙�
-                , "HExplanation": data.鎽樿              //鎽樿
-                , "HRemark": data.琛ㄥご澶囨敞                    //澶囨敞
-                , "HSupTypeID": data.寰�鏉ョ被鍨�                             //閫夊崟鍙�
-                , "HSupName": data.寰�鏉ュ崟浣�              
-                , "HSupID": data.HSupID                    
-
-                , "HMaker": data.鍒跺崟浜�
-                , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : data.鍒跺崟鏃ユ湡
-                , "HChecker": data.瀹℃牳浜�
-                , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : data.瀹℃牳鏃ユ湡
-                , "HUpDater": data.淇敼浜�
-                , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : data.淇敼鏃ユ湡
-                , "HCloseMan": data.鍏抽棴浜�
-                , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : data.鍏抽棴鏃ユ湡
-                , "HDeleteMan": data.浣滃簾浜�
-                , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : data.浣滃簾鏃ユ湡
+            if (data[0].HSourceInterID != "0") {
+              this.ifOrganizationEdit = true
             }
+            this.form = {
+                "HBillNo": data[0].鍗曟嵁鍙�
+                , "HDate": data[0].鏃ユ湡
+                , "HSupTypeID": data[0].HSupTypeID
+                , "HSupID": data[0].HSupID
+                , "HSupName": data[0].寰�鏉ュ崟浣�
+                , "HDeptID": data[0].HDeptID
+                , "HDeptName": data[0].閮ㄩ棬
+                , "HWHID": data[0].HMainWHID
+                , "HWHName": data[0].璋冨叆浠撳簱
+                , "HEmpID": data[0].HEmpID
+                , "HEmpName": data[0].涓氬姟鍛�
+                , "HManagerID": data[0].HManagerID
+                , "HManagerName": data[0].璐熻矗浜�
+                , "HSecManagerID": data[0].HSecManagerID
+                , "HSecManagerName": data[0].楠屾敹鍛�
+                , "HKeeperID": data[0].HKeeperID
+                , "HKeeperName": data[0].淇濈鍛�
+                , "HExplanation": data[0].鎽樿
+                , "HRemark": data[0].琛ㄥご澶囨敞
+                , "HInnerBillNo": data[0].鍐呴儴鍗曟嵁鍙�
+                , "HStockOrgID": data[0].HMainStockOrgID
+                , "HMaker": data[0].鍒跺崟浜�
+                , "HChecker": data[0].瀹℃牳浜�
+                , "HCloseMan": data[0].鍏抽棴浜�
+                , "HUpDater": data[0].淇敼浜�
+                , "HDeleteMan": data[0].浣滃簾浜�
+                , "HMakeDate": data[0].鍒跺崟鏃ユ湡 == null ? "" : data[0].鍒跺崟鏃ユ湡
+                , "HCheckDate": data[0].瀹℃牳鏃ユ湡 == null ? "" : data[0].瀹℃牳鏃ユ湡
+                , "HCloseDate": data[0].鍏抽棴鏃ユ湡 == null ? "" : data[0].鍏抽棴鏃ユ湡
+                , "HUpDateDate": data[0].淇敼鏃ユ湡 == null ? "" : data[0].淇敼鏃ユ湡
+                , "HDeleteDate": data[0].浣滃簾鏃ユ湡 == null ? "" : data[0].浣滃簾鏃ユ湡
+            }
+            this.form.HStockOrgID = data[0].HMainStockOrgID == null ? 0 : data[0].HMainStockOrgID;
+            //瀛愯〃  璧嬪��
+            this.editData = response.data.data[0];
+            this.editData1 = response.data.data[1];
           }
-          this.formShow = true
-          this.formLoading = false
-        }
-      }).catch(error => {
-        console.log(error)
-        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-      });
-      //瀛愯〃
-      axios.get(this.baseURL + "/Sc_MouldProdOutBill/Sc_MouldProdOutBillListProjectDetai", {
-        params: { 'sqlWhere': "and hmainid=" + rowHmainid }
-      }).then(response => {
-        if (response.data.count == 1) {
-          var data = response.data
-          console.log(data)
-          this.editData = data.list[0]
-          this.editData1 = data.list[1]
           this.formShow = true
           this.formLoading = false
         }
@@ -778,29 +982,72 @@
         this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
       } else {
         let obj = {
-          HBatchNo: "",
-          HDesignLife: 0,
-          HLeaveLife: 0,
-          HMaterCode:"",
-          HMaterID:0,
-          HMaterName:"",
-          HMaterSpec:"",
-          HMoney:0,
-          HPrice:0,
-          HQty:0,
-          HQtyMust:0,
-          HSPCode:"",
-          HSPID:0,
-          HSPName:"",
-          HStockOrgID:sessionStorage["OrganizationID"] - 0,//缁勭粐id
-          HUnitCode:"",
-          HUnitID:0,
-          HUnitName:"",
-          HUseLife:0,
-          HWHCode:"",
-          HWHID:0,
-          HWHName:"",
-          HRemark:"",
+          "HMaterID": "0"
+          , "HMaterNumber": ""
+          , "HMaterName": ""
+          , "HMaterModel": ""
+          , "HUnitID": "0"
+          , "HUnitNumber": ""
+          , "HUnitName": ""
+          , "HBatchNo": ""
+          , "HQty": "0"
+          , "HWHID": "0"
+          , "HWHNumber": ""
+          , "HWHName": ""
+          , "HSPID": "0"
+          , "HSPNumber": ""
+          , "HSPName": ""
+          , "HSCWHID": "0"
+          , "HSCWHNumber": ""
+          , "HSCWHName": ""
+          , "HSCSPID": "0"
+          , "HSCSPNumber": ""
+          , "HSCSPName": ""
+          , "HSourceInterID": "0"
+          , "HSourceEntryID": "0"
+          , "HSourceBillType": ""
+          , "HSourceBillNo": ""
+          , "HRelationQty": "0"
+          , "HRelationMoney": "0"
+          , "HRemark": ""
+          , "HPropertyID": "0"
+          , "HSecUnitID": "0"
+          , "HSecUnitRate": "0"
+          , "HQtyMust": "0"
+          , "HPrice": "0"
+          , "HMoney": "0"
+          , "HDesignLife": "0"
+          , "HLeaveLife": "0"
+          , "HPOOrderInterID": "0"
+          , "HPOOrderEntryID": "0"
+          , "HPOOrderBillNo": ""
+          , "HSeOrderInterID": "0"
+          , "HSeOrderEntryID": "0"
+          , "HSeOrderBillNo": ""
+          , "HSTOCKORGID": sessionStorage["OrganizationID"] - 0
+          , "HOtherOrgID": sessionStorage["OrganizationID"] - 0
+          , "HOWNERID": sessionStorage["OrganizationID"] - 0
+          , "HOWNERTYPEID": ""
+          , "HUseLife": "0"
+          , "HUseLifeQty": "0"
+          , "HNewLifeQty": "0"
+          , "HQtyRel": "0"
+          , "HSPGroupID": "0"
+          , "HNewModel": ""
+          , "HWallThickness": ""
+          , "HHardness": ""
+          , "HLastProdModel": ""
+          , "HDiameter": ""
+          , "HBackFlag": ""
+          , "HBarCode": ""
+          , "HMouldType": "0"
+          , "HInitModel": ""
+          , "HInitDesignLife": "0"
+          , "HLifeUnitID": "0"
+          , "HNowModel": ""
+          , "HNowLife": "0"
+          , "HCorrespondentTypeID": "0"
+          , "HCorrespondentID": "0"
         }
         if (index) {
           this.editData.splice(index, 0, obj);
@@ -883,23 +1130,32 @@
               this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍣ㄥ叿鏈�夋嫨锛�");
             }else if(!item.HWHID){
               fhck = true
-              this.$modal.msgError("绗�" + (index + 1) + "琛岋細浠撳簱鏈�夋嫨锛�");
+              this.$modal.msgError("绗�" + (index + 1) + "琛岋細璋冨叆浠撳簱鏈�夋嫨锛�");
+            }else if(!item.HUnitID){
+              fhck = true
+              this.$modal.msgError("绗�" + (index + 1) + "琛岋細璁¢噺鍗曚綅涓虹┖锛�");
             }else if(item.HQty == 0){
               fhck = true
-              this.$modal.msgError("绗�" + (index + 1) + "琛岋細浜у搧鍏ュ簱璁板綍鏈壂鐮侊紙瀹炲彂鏁伴噺涓�0锛�");
+              this.$modal.msgError("绗�" + (index + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
             }
           })
           this.$nextTick(() => {
             if (!fhck) {
-              if(this.OperationType == 3){
-                this.form.HInterID = this.linterid
+              var Operation = null
+              if(!this.OperationType || this.OperationType == 4){
+                Operation = 1
+              }else{
+                Operation = this.OperationType
+                if(Operation == 2){
+                  this.form.HInterID = this.linterid
+                }
               }
               var sMainStr = JSON.stringify(this.form);
               var sSubStr = JSON.stringify(this.editData);
-              var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+              var sMainSub = sMainStr + ';' + sSubStr + ';' + Operation + ";" + sessionStorage["HUserName"];
               axios({
                 method: 'post',
-                url: this.baseURL + "/Sc_MouldProdOutBill/SaveGetMouldProdOutBillList",
+                url: this.baseURL + "/Sc_MouldProdOutBillController/GetSc_MouldProdOutBill_Save_Json",
                 data: {
                   'msg': sMainSub
                 },
@@ -928,12 +1184,13 @@
     set_CheckBill(num, form) {
       var InterID = form.hmainid || form.HInterID
       //閫昏緫瀹℃牳鏂规硶
-      axios.get(this.baseURL + "/Sc_MouldProdOutBill/AuditMouldProdOutBill", {
-        params: { "HInterID": InterID, "flag": num, "user": sessionStorage["HUserName"] }
+      axios.get(this.baseURL + "/Sc_MouldProdOutBillController/GetSc_MouldProdOutBill_Check_Json", {
+        params: { "HInterID": InterID, "Type": num, "HMaker": 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,);
@@ -950,6 +1207,7 @@
       this.gyCustomerShow = false
       this.gyMouldShow = false
       this.gyStockPlaceShow = false
+      this.scMouldOutShow = false
     },
     //  鎵撳紑鏁版嵁鍒楄〃寮圭獥
     openDataDialog(num, row) {
@@ -990,6 +1248,10 @@
         this.dialogTitle = '浠撲綅鍒楄〃'
         this.gyStockPlaceShow = true
         this.openData = true
+      } else if (num == 3849) {
+        this.dialogTitle = '鍣ㄥ叿棰嗙敤鍑哄簱鍗曞垪琛�'
+        this.scMouldOutShow = true
+        this.openData = true
       } 
     },
     //鏍规嵁寰�鏉ョ被鍨嬪垽鏂線鏉ュ崟浣�
@@ -1002,7 +1264,15 @@
         this.deptType = 2
         this.openDataDialog(1)
       }
-    }
+    },
+    //閫夋嫨婧愬崟
+    get_checkMainSource(){
+      if(this.form.HSourceBillType == "3849"){
+        this.openDataDialog(3849)
+      }else{
+        this.$modal.msgError("鏈煡璇㈠埌鎵�閫夋簮鍗曠被鍨嬬浉鍏冲崟鎹俊鎭�!");
+      }
+    },
   }
 };
 </script>
diff --git a/src/views/scMould/warehouse/component/Sc_MouldInRequestBill.vue b/src/views/scMould/warehouse/component/Sc_MouldInRequestBill.vue
new file mode 100644
index 0000000..2cb2515
--- /dev/null
+++ b/src/views/scMould/warehouse/component/Sc_MouldInRequestBill.vue
@@ -0,0 +1,959 @@
+<template>
+  <div style="padding: 10px; position: relative;">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
+      <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px;">
+        <el-date-picker v-model="sTime" type="date" placeholder="寮�濮嬫棩鏈�" style="width: 150px;">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="缁撴潫鏃ユ湡">
+        <el-date-picker v-model="eTime" type="date" placeholder="缁撴潫鏃ユ湡" style="width: 150px;">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="鏃ユ湡闂撮殧">
+        <el-select v-model="queryParams.HInitTimeCycle" placeholder="璇烽�夋嫨" @change="riqiChange" style="width: 150px;">
+          <el-option v-for="(item, index) in rqsgList" :key="index" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+        <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label-width="78px">
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"> 鎼� 绱�</el-button>
+        <el-button icon="el-icon-circle-close" @click="resetQuery">閲� 缃�</el-button>
+      </el-form-item>
+      <el-collapse v-model="activeSeach">
+        <el-collapse-item title="鏇村" name="1">
+          <el-card class="box-card">
+            <el-form-item label="鐘舵��" prop="HStatus">
+              <el-select v-model="queryParams.HStatus" placeholder="璇烽�夋嫨鐘舵��">
+                <el-option v-for="(item, index) in HStatusList" :key="index" :label="item.name" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="缁勭粐">
+              <el-select v-model="queryParams.HStockOrgID" placeholder="璇烽�夋嫨">
+                <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="閮ㄩ棬淇℃伅" prop="HDept">
+              <el-input v-model="queryParams.HDept" placeholder="璇疯緭鍏ラ儴闂ㄤ俊鎭�" @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="鍣ㄥ叿浠g爜" prop="HModelNumber">
+              <el-input v-model="queryParams.HModelNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�" @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
+              <el-input v-model="queryParams.HSupName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <div slot="header" class="clearfix"><span>鍏朵粬鏉′欢</span></div>
+            <div>
+              <el-row>
+                <el-form-item label-width="0">
+                  <el-row>
+                    <el-col :span="2"><span>杩囨护</span></el-col>
+                    <el-col :span="6">
+                      <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <span v-for="(item, index) in btList" :key="index">
+                          <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+                        </span>
+                      </el-select>
+                    </el-col>
+                    <el-col :span="6" style="padding: 0 10px;">
+                      <el-select v-model="queryParams.Comparator1" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+                          :value="item.value"></el-option>
+                      </el-select>
+                    </el-col>
+                    <el-col :span="10">
+                      <el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
+                        @keyup.enter.native="handleQuery" />
+                    </el-col>
+                  </el-row>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label-width="0">
+                  <el-row>
+                    <el-col :span="2"><span>杩囨护</span></el-col>
+                    <el-col :span="6">
+                      <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <span v-for="(item, index) in btList" :key="index">
+                          <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+                        </span>
+                      </el-select>
+                    </el-col>
+                    <el-col :span="6" style="padding: 0 10px;">
+                      <el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+                          :value="item.value"></el-option>
+                      </el-select>
+                    </el-col>
+                    <el-col :span="10">
+                      <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
+                        @keyup.enter.native="handleQuery" />
+                    </el-col>
+                  </el-row>
+                </el-form-item>
+              </el-row>
+              <el-form-item label-width="0">
+                <el-row>
+                  <el-col :span="2"><span>杩囨护</span></el-col>
+                  <el-col :span="6">
+                    <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange">
+                      <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
+                        :value="item.field"></el-option>
+                    </el-select>
+                  </el-col>
+                  <el-col :span="6" style="padding: 0 10px;">
+                    <el-select v-model="queryParams.Comparator" placeholder="璇烽�夋嫨" @change="riqiChange">
+                      <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+                        :value="item.value"></el-option>
+                    </el-select>
+                  </el-col>
+                  <el-col :span="10">
+                    <el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
+                      @keyup.enter.native="handleQuery" />
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </div>
+          </el-card>
+        </el-collapse-item>
+      </el-collapse>
+    </el-form>
+    <el-row :gutter="10" class="mb8" style="margin-top: 10px;">
+      <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 :span="1.5">
+        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+          @click="handleEdit(row = rowForm, OperationType = 2)">缂栬緫</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
+          @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">澶嶅埗</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-tickets" size="mini"
+          @click="handlePush(row = rowForm, OperationType = 4)">涓嬫帹锛堝櫒鍏烽鐢ㄩ��搴撳崟锛�</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+          @click="set_CheckBill(1, form = rowForm)">瀹℃牳</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+          @click="set_CheckBill(2, form = rowForm)">杩斿鏍�</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="multiple"
+          @click="set_CheckBillAll(1, ids)">瀹℃牳(鎵归噺)</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="multiple"
+          @click="set_CheckBillAll(2, ids)">杩斿鏍�(鎵归噺)</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</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-row>
+    <div class="tableBox" v-loading="loading">
+      <el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
+        @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick" :row-style="rowStyle"
+        @cell-dblclick="handleDblclick" v-if="tableShow">
+        <template v-for="(item, index) in btList">
+          <el-table-column type="selection" width="55" align="center" :fixed="item.fixed" v-if="item.type == 'checkbox'"
+            :key="index" />
+          <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width" :key="item.id"
+            v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort" show-overflow-tooltip
+            :fixed="item.fixed">
+            <template slot-scope="{row,  column }">
+              <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
+              <div :style="item.style">
+                <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
+                <el-button type="text" @click="handleEdit(row, OperationType = 2)"
+                  v-else-if="column.property == '鍗曟嵁鍙�'">{{
+                    row.鍗曟嵁鍙�
+                  }}</el-button>
+                <span v-else>{{ row[column.label] }}</span>
+              </div>
+            </template>
+          </el-table-column>
+        </template>
+      </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes" @pagination="getList" />
+      <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+        <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose"
+          v-if="rowHideShow" />
+      </el-dialog>
+      <!-- 缂栬緫 -->
+      <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" v-if="editShow" />
+      </el-dialog>
+      <!-- 涓嬫帹 -->
+      <el-dialog title="涓嬫帹鍣ㄥ叿棰嗙敤閫�搴撳崟" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox" @close="close">
+        <push :OperationType='4' :propsData='pushData' :HSouceBillType=BillType
+         @editClose="pushClose" v-if="pushShow" />
+      </el-dialog>
+      <el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
+        <PrintList :linterid=this.rowForm.hmainid :MyMsg=this.rowForm.hmainid :Type='HModName'
+          :HModName='HModName' @rowEditClose="rowSetClose" v-if="printListShow" />
+        <!-- <div>111</div> -->
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+import RowSettings from '@/views/component/rowSettings'
+import Edit from '@/views/scMould/warehouse/Sc_MouldInRequestBillEdit'
+import Push from '@/views/scMould/warehouse/Sc_MouldProdBackBillEdit'
+import PrintList from '@/views/component/printList'
+import moment from 'moment';
+
+export default {
+  name: 'Sc_MouldInRequestBill',
+  components: { RowSettings, Edit, Push,PrintList },
+  props: {
+    openPage: { type: String, },
+    HOrgID: { type: String, },
+  },
+  data() {
+    return {
+      HModName: "Sc_MouldInRequestBill",
+      rowList:[],
+      activeSeach: '',
+      editShow: false,
+      openEdit: false,
+      pushShow: false,
+      openPush: false,
+      pushData:'',
+      totalNameList: [],
+      tableShow: true,
+      openPrintList: false,
+      printListShow: false,
+      openBtnHide: false,
+      btnHideShow: false,
+      rowHideShow: false,
+      openRowHide: false,
+      copyType: 0,
+      comparatorList: [
+        { label: '=', value: '=' },
+        { label: '>=', value: '>=' },
+        { label: '>', value: '>' },
+        { label: '<=', value: '<=' },
+        { label: '<', value: '<' },
+        { label: '<>', value: '<>' },
+        { label: '鍖呭惈', value: '7' },
+        { label: '宸﹀寘鍚�', value: '8' },
+        { label: '鍙冲寘鍚�', value: '9' },
+        { label: '涓嶅寘鍚�', value: '10' },
+      ],
+      sWhere: '',
+      sTime: '',
+      eTime: '',
+      rqsgList: [
+        { label: '浠婂ぉ', value: 0 },
+        { label: '杩戜袱澶�', value: 1 },
+        { label: '杩戜笁澶�', value: 2 },
+        { label: '杩戝洓澶�', value: 3 },
+        { label: '杩戜簲澶�', value: 4 },
+        { label: '杩戝叚澶�', value: 5 },
+        { label: '杩戜竷澶�', value: 6 },
+        { label: '杩�30澶�', value: 29 },
+        { label: '杩戝崐骞�', value: 180 },
+        { label: '杩戜竴骞�', value: 365 },
+      ],
+      organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
+      HStatusList: [{name:'鍏ㄩ儴',value:'-1'},{name:'鏈鏍�',value:'0'},{name:'宸插鏍�',value:'1'},{name:'宸插叧闂�',value:'2'}],
+      addBtnShow: false,
+      dialogTitle: '',
+      OperationType: null,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼2锛�
+      HInterID: null,
+      baseURL: process.env.VUE_APP_BASE_API,
+      lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+      lastSelectedRow: null, // 涓婁竴娆¢�変腑鐨勮
+      selectedRow: null, // 褰撳墠閫変腑鐨勮
+      rowForm: {},
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        HBillNo: '',
+        HInitTimeCycle: 29,
+        HStockOrgID: sessionStorage["OrganizationID"] - 0,
+        HStatus:'-1',
+        HDept:'',
+        HModelNumber:'',
+        HSupName:'',
+        ColName1: '',
+        ColName2: '',
+        ColName: '',
+        Comparator1: '',
+        Comparator2: '',
+        Comparator: '',
+        ColContent1: '',
+        ColContent2: '',
+        ColContent: '',
+      },
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 閬僵灞�
+      loading: true,
+      tyResList: [],//鍒楄〃锛堟帴鍙f暟鎹級
+      btList: [],//琛ㄥご鍒楄〃鏄剧ず
+      btResList: [],
+      tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
+      dataList: [],
+      titleData: [],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+      pageSizes: [50, 100, 500, 5000, 50000],
+      page: 1,
+      pageSize: 0,
+      total: 0,
+      BillType:'3851',
+    };
+  },
+  created() {
+    // this.fetchData()
+    if(this.openPage && this.HOrgID){
+      this.queryParams.HStockOrgID = this.HOrgID
+    }
+    this.riqiChange()
+    this.getList();
+  },
+
+  methods: {
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '鍚堣';
+          return;
+        }
+        const values = data.map(item => Number(item[column.property]));
+        if (this.totalNameList[index].totalRow) {
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0)
+
+          } else {
+            sums[index] = '';
+          }
+        }
+      }, 1000);
+      return sums;
+    },
+
+    handleBtnHide() {
+      this.btnHideShow = true
+      this.openBtnHide = true
+    },
+    handleRowHide() {
+      this.rowHideShow = true
+      this.openRowHide = true
+    },
+    rowSetClose(val) {
+      this.rowHideShow = false
+      this.tableShow = true
+      this.openRowHide = val
+      this.getList()
+    },
+    riqiChange() {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
+      const yyyyS = start.getFullYear();
+      const mmS = String(start.getMonth() + 1).padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑
+      const ddS = String(start.getDate()).padStart(2, '0');
+      const yyyyE = end.getFullYear();
+      const mmE = String(end.getMonth() + 1).padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑
+      const ddE = String(end.getDate()).padStart(2, '0');
+      this.sTime = yyyyS + '-' + mmS + '-' + ddS
+      this.eTime = yyyyE + '-' + mmE + '-' + ddE
+    },
+    getList() {
+      this.pageSize = 50
+      this.tableShow = false
+      this.loading = true
+      if (this.sTime && !this.sWhere) {
+        this.sTime = moment(this.sTime).format('YYYY-MM-DD')
+        this.eTime = moment(this.eTime).format('YYYY-MM-DD')
+        this.sWhere += " and 鏃ユ湡 >= '" + this.sTime + "'";
+        this.sWhere += " and 鏃ユ湡 <= '" + this.eTime + "'";
+      }
+      this.sWhere += " and HSTOCKORGID=" + this.queryParams.HStockOrgID;
+      if (this.pageSize == 0) {
+        this.pageSize = 50
+      }
+      // 閿�鍞嚭搴撳崟鍒楄〃
+      axios.get(this.baseURL + '/Sc_MouldInRequestBillController/page', {
+        params: {
+          "sWhere": this.sWhere,
+          "user": sessionStorage["HUserName"],
+          "page": this.page,
+          "size": this.pageSize,
+          "Type": this.BillType,
+        },
+      }).then(response => {
+        this.tyResList = response.data.data//鎬绘暟鎹�
+        let data1 = response.data
+        let option = []
+        if (data1.code == 1) {
+          this.btResList = data1.list//閿�鍞嚭搴撳崟鎺ュ彛琛ㄥご鏁版嵁
+          this.total = data1.count;
+          var data = [];//鍒楀瓧娈垫暟鎹�
+          var col = [];
+          var totalArray = ["浠舵暟"];
+          //缁欑┖鐨勬暟缁勮祴鍊�
+          for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+            var patrn = new RegExp(/^h/i);
+            if (patrn.test(data1.list[key].ColmCols)) {
+                this.titleData[key] = data1.list[key].ColmCols;
+            }
+          }
+          //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+          col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+          for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+            if (this.titleData.indexOf(data[i].name) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑  //璁$畻鍒�
+              col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+            } else if (totalArray.indexOf(data[i].name) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //璁$畻鍒�
+              col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+            }
+            else {
+              col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+            }
+
+          }
+          option.cols = [col]
+          option.data = data1.data
+          this.dataList = option
+          this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    DisPlay_HideColumn(HModName, user, option, dataOption) {
+      this.totalNameList = []
+      axios.get(this.baseURL + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
+        params: {
+          "HModName": HModName,
+          "user": user,
+        },
+      }).then(res => {        
+        let data1 = res.data
+        if (data1.data.length != 0) {       
+          var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+          var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+          newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+          dataCol = data1.data[0].HGridString.split(',');
+          //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+          if (dataCol.length == option.cols[0].length - 1) {                
+            //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+            for (var j = 0; j < option.cols[0].length - 1; j++) {
+              for (var i = 0; i < option.cols[0].length - 1; i++) {
+                var dataCols = dataCol[j].split('|');
+                //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+                if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+                  //闅愯棌鍒�
+                  if (dataCols[1] == 1) {
+                    option.cols[0][i + 1]["hide"] = true;
+                  }
+                  //璁剧疆鍒楀
+                  if (dataCols[3] > 0) {
+                    option.cols[0][i + 1]["width"] = dataCols[3];
+                  }
+                  //璁剧疆鍐呭瀛椾綋澶у皬
+                  if (data1.data[0].HFontSize != 0) {
+                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                  } else {
+                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                  }
+                  //鏄剧ず鍒�
+                  if (dataCols[1] == 0 && this.titleData.indexOf(option.cols[0][i + 1]["title"]) == -1) {
+                    option.cols[0][i + 1]["hide"] = false;
+                  }
+                  //缁熻鍒�
+                  if (dataCols[6] == 1) {
+                    option.cols[0][i + 1]["totalRow"] = true;
+                  } else {
+                    option.cols[0][i + 1]["totalRow"] = false;
+                  }
+                  //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                  switch (dataCols[2]) {
+                    case "L":
+                      option.cols[0][i + 1]["align"] = "left";
+                      break;
+                    case "M":
+                      option.cols[0][i + 1]["align"] = "center";
+                      break;
+                    case "R":
+                      option.cols[0][i + 1]["align"] = "right";
+                      break;
+                  }
+                  //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+                  if (dataCols[4] != null && dataCols[4] != "") {
+                    option.cols[0][i + 1]["title"] = dataCols[4];
+                  }
+                  newCols[0].push(option.cols[0][i + 1]);
+                  break;
+                }
+              }
+            }
+            //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+            if (dataCol.length == newCols[0].length - 1) {
+              option.cols = newCols;
+              //鍙栨秷鍐荤粨鍒�
+              for (var i = 1; i < option.cols[0].length - 1; i++) {
+                if (option.cols[0][i + 1]["fixed"] != null) {
+                  option.cols[0][i + 1]["fixed"] = null;
+                }
+                else {
+                  break;
+                }
+              }
+              //鍐荤粨鍒�
+              if (data1.data[0].HFixCols != 0) {
+                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                  if (dataOption.cols[0].indexOf(option.cols[0][i + 1]["title"]) != -1) {
+                    data1.data[0].HFixCols += 1;
+                  }
+
+                  option.cols[0][i + 1]["fixed"] = "left";
+                }
+              }
+              //璁剧疆鍒楁帓搴�
+              for (var i = 1; i < option.cols[0].length; i++) {
+                if (data1.data[0].HSortFlag == "鏄�") {
+                  option.cols[0][i]["sort"] = true;
+                }
+                else {
+                  option.cols[0][i]["sort"] = false;
+                }
+              }
+            }
+          }
+          this.btList = option.cols[0]
+          this.btList.map(item => {
+            if (!item.hide) {
+              this.totalNameList.push(item)
+            }
+          })
+          if (data1.data[0].HPageSize == 0) {
+            this.pageSize = 50
+          } else {
+            this.pageSize = data1.data[0].HPageSize
+          }
+          this.tableData = option.data
+          this.tableShow = true
+          this.loading = false
+        } else {
+          this.btList = dataOption.cols[0]
+          this.btList.map(item => {
+            if (!item.hide) {
+              this.totalNameList.push(item)
+            }
+          })
+          this.tableData = dataOption.data
+          this.tableShow = true
+          this.loading = false
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    renderHeader(h, { column, $index }) {// 鏂板缓涓�涓� span
+      let span = document.createElement(span)// 璁剧疆琛ㄥご鍚嶇О
+      span.innerText = column.label
+      //涓存椂鎻掑叆 document
+      document.body.appendChild(span)// 閲嶇偣:鑾峰彇 span 鏈�灏忓搴︼紝璁剧疆褰撳墠鍒楋紝娉ㄦ剰杩欓噷鍔犱簡 20锛屽瓧娈佃緝澶氭椂column.minWidth=span.getBoundingClientRect().width + 50.//绉婚櫎 document 涓复鏃剁殑 span
+      document.body.removeChild(span)
+      return h(span, column.label)
+    },
+    //鐐瑰嚮琛�
+    handleRowClick(row, column, event) {
+      this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆¢�変腑鐨勮
+      this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
+      this.lastSelectedRowIndex = this.tableData.indexOf(row);
+      this.$refs.tableData.toggleRowSelection(row);
+      if (this.openPage) {
+        this.$emit('deptEmit', this.rowList, this.BillType)
+      }
+    },
+    //閫変腑琛岄珮浜牱寮�
+    rowStyle({ row, rowIndex }) {
+      if (this.ids.includes(row.sorderid)) {
+        return { "background": "#ecf5ff" }
+      }
+    },
+    //鍙屽嚮琛�
+    handleDblclick(row, column, cell, event) {
+      this.OperationType = 2
+      this.handleEdit(row)
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      // this.rowForm = {}
+      this.rowList=selection
+      this.ids = selection.map(item => item.sorderid)
+      this.single = selection.length != 1
+      this.multiple = !selection.length
+      if (!this.single) {
+        this.rowForm = selection[0]
+      }
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.sWhere = ''
+      if (this.queryParams.ColName && this.queryParams.Comparator) {
+        var com = "";
+        switch (this.queryParams.Comparator) {
+          case "7":
+            com = "like'%" + this.queryParams.ColContent + "%'";
+            break;
+          case "8":
+            com = "like'%" + this.queryParams.ColContent + "'";
+            break;
+          case "9":
+            com = "like'" + this.queryParams.ColContent + "%'";
+            break;
+          case "10":
+            com = "not like'%" + this.queryParams.ColContent + "%'";
+            break;
+          default:
+            com = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName + " " + com;
+      }
+      if (this.queryParams.ColName1 && this.queryParams.Comparator1) {
+        var com1 = "";
+        switch (this.queryParams.Comparator1) {
+          case "7":
+            com1 = "like'%" + this.queryParams.ColContent1 + "%'";
+            break;
+          case "8":
+            com1 = "like'%" + this.queryParams.ColContent1 + "'";
+            break;
+          case "9":
+            com1 = "like'" + this.queryParams.ColContent1 + "%'";
+            break;
+          case "10":
+            com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
+            break;
+          default:
+            com1 = "" + this.queryParams.Comparator1 + "'" + this.queryParams.ColContent1 + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
+      }
+      if (this.queryParams.ColName2 && this.queryParams.Comparator2) {
+        var com2 = "";
+        switch (this.queryParams.Comparator2) {
+          case "7":
+            com2 = "like'%" + this.queryParams.ColContent2 + "%'";
+            break;
+          case "8":
+            com2 = "like'%" + this.queryParams.ColContent2 + "'";
+            break;
+          case "9":
+            com2 = "like'" + this.queryParams.ColContent2 + "%'";
+            break;
+          case "10":
+            com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
+            break;
+          default:
+            com2 = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
+      }
+      if (this.queryParams.HStatus) {
+          switch (this.queryParams.HStatus) {
+              case '-1':   //鍏ㄩ儴
+                  this.sWhere += "";
+                  break;
+              case '0':    //鏈鏍�
+                  this.sWhere += " and 瀹℃牳浜�=''";
+                  break;
+              case '1':    //宸插鏍�
+                  this.sWhere += " and 瀹℃牳浜�<>''";
+                  break;
+              case '2':    //宸插叧闂�
+                  this.sWhere += " and 鍏抽棴浜�<>''";
+              default:
+          }
+      }
+      if (this.sTime) {
+          this.sTime = moment(this.sTime).format('YYYY-MM-DD')
+          this.sWhere += " and 鏃ユ湡 >= '" + this.sTime + "'";
+      }
+      if (this.eTime) {
+          this.eTime = moment(this.eTime).format('YYYY-MM-DD')
+          this.sWhere += " and 鏃ユ湡 <= '" + this.eTime + "'";
+      }
+      if (this.queryParams.HBillNo) {
+        this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
+      }
+      if (this.queryParams.HDept) {
+          this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDept + "%'";
+      }
+      if (this.queryParams.HModelNumber) {
+          this.sWhere += " and 妯″叿浠g爜 like '%" + this.queryParams.HModelNumber + "%'";
+      }
+      if (this.queryParams.HSupName) {
+          this.sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
+      }
+      this.clearData()
+      this.getList()
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.sWhere = ''
+      this.queryParams = {
+        HBillNo: '',
+        HInitTimeCycle: 29,
+        HStockOrgID: sessionStorage["OrganizationID"] - 0,
+        HStatus:'-1',
+        HDept:'',
+        HModelNumber:'',
+        HSupName:'',
+        ColName1: '',
+        ColName2: '',
+        ColName: '',
+        Comparator1: '',
+        Comparator2: '',
+        Comparator: '',
+        ColContent1: '',
+        ColContent2: '',
+        ColContent: '',
+      }
+      this.riqiChange()
+      this.resetForm("queryForm")
+      this.clearData()
+      this.getList()
+    },
+
+    //閫�鍑�
+    close() {
+      // this.reset()
+      this.tableShow = true
+      this.openEdit = false
+      this.editShow = false
+      this.openPush = false
+      this.pushShow = false
+      this.clearData()
+      this.getList()
+    },
+    //鎵撳紑鏂板缁勪欢寮圭獥
+    handleAddEdit() {
+      this.rowForm.hmainid = 0
+      this.editShow = true
+      this.openEdit = true
+    },
+    //鎵撳紑淇敼缁勪欢寮圭獥
+    handleEdit(row) {
+      this.rowForm = row
+      this.editShow = true
+      this.openEdit = true
+    },
+    //鎵撳紑涓嬫帹缁勪欢寮圭獥
+    handlePush() {
+      if (this.rowList && this.rowList.length > 0) {
+        var dataArray = [];
+        var HSupTypeID_Temp = this.rowList[0].HSupTypeID
+        for (var i = 0; i < this.rowList.length; i++) {
+            if (this.rowList[i].鍗曟嵁鐘舵�� != "宸插鏍�") {
+                this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戜笉涓哄凡瀹℃牳鐘舵��,涓嶅厑璁镐笅鎺紒")
+                return;
+            }
+            if (this.rowList[i].HQtyMust <= 0) {
+                this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戝搴斿彲涓嬫帹鏁伴噺蹇呴』澶т簬 0 锛�")
+                return;
+            }
+            if (this.rowList[i].HSupTypeID != HSupTypeID_Temp) {
+                this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹搴斿線鏉ョ被鍨嬪繀椤讳竴鑷达紒")
+                return;
+            }
+            var temp = {
+                "hmainid": this.rowList[i].hmainid
+                , "hsubid": this.rowList[i].hsubid
+                , "HBillType": this.rowList[i].HBillType
+            }
+            dataArray.push(temp);
+        }
+        var datajson = {
+            "data": dataArray
+        };
+        this.pushData = JSON.stringify(datajson)
+        this.pushShow = true
+        this.openPush = true
+      } else {
+          this.$modal.msgError("璇烽�夋嫨鏁版嵁涓嬫帹锛�")
+      }
+    },
+    //鍏抽棴缂栬緫椤甸潰
+    editClose(val) {
+      this.open = val
+      this.editShow = false
+      this.openEdit = val
+      this.clearData()
+      this.getList()
+    },
+    //鍏抽棴涓嬫帹椤甸潰
+    pushClose(val) {
+      this.open = val
+      this.pushShow = false
+      this.openPush = val
+      this.clearData()
+      this.getList()
+    },
+    //娓呴櫎閫変腑鏁版嵁鐨勭紦瀛�
+    clearData(){
+      this.ids = []
+      this.multiple = true
+      this.single = true
+      this.OperationType = 0
+      this.copyType = 0
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete() {
+      this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
+        axios.get(this.baseURL + "/Sc_MouldInRequestBillController/GetSc_MouldInRequestBill_Delete_Json", {
+            params: { 'HInterID': this.rowForm.hmainid.toString(), 'HMaker': sessionStorage["HUserName"] }
+          }).then(response => {
+            if (response.data.count == 1) {
+              this.getList()
+              this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+            } else {
+              this.$modal.msgError("閿欒:" + result.code + result.Message);
+            }
+          }).catch(error => {
+            this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+          });
+      }).catch(() => { })
+    },
+    // 鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBill(num, form) {
+      var InterID = form.hmainid || form.HInterID
+      //閫昏緫瀹℃牳鏂规硶
+      axios.get(this.baseURL + "/Sc_MouldInRequestBillController/GetSc_MouldInRequestBill_Check_Json", {
+        params: { "HInterID": InterID, "Type": num, "HMaker": sessionStorage["HUserName"] }
+      }).then(response => {
+        let result = response.data
+        if (result.count == 1) {
+          this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+          this.clearData()
+          this.getList();
+        }
+        else {
+          this.$modal.msgError("閿欒:" + result.code + result.Message,);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    // 鎵归噺鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBillAll(num, ids) {
+      //閫昏緫瀹℃牳鏂规硶
+      axios.get(this.baseURL + "/Sc_MouldInRequestBillController/CheckAll", {
+        params: { "ids": ids, "Type": num, "HMaker": sessionStorage["HUserName"] }
+      }).then(response => {
+        let result = response.data
+        if (result.count == 1) {
+          this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+          this.getList();
+        }
+        else {
+          this.$modal.msgError("閿欒:" + result.code + result.Message,);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //瀵煎嚭
+    handleExport() {
+      const ws = this.$XLSX.utils.json_to_sheet(this.tyResList); // 灏嗘暟鎹浆鎹负宸ヤ綔琛�
+      const wb = this.$XLSX.utils.book_new(); // 鍒涘缓涓�涓柊鐨勫伐浣滅翱
+      this.$XLSX.utils.book_append_sheet(wb, ws, "Sheet1"); // 灏嗗伐浣滆〃娣诲姞鍒板伐浣滅翱涓紝骞跺懡鍚嶄负"Sheet1"
+      this.$XLSX.writeFile(wb, `sellOutBill_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢      
+    },
+    //鎵撳嵃
+    get_PrintReport() {
+      if (this.ids.length != 1) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+      } else if (this.rowForm.鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
+        this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
+      } else {
+        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 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
+    defaintOperationByCompanyName() {
+      var result = false;
+      axios.get(this.baseURL + '/Xt_getInfo/getCompanyName').then(response => {
+        var data1 = response.data
+        if (data1.count == 1) {
+          if (data1.data == "姘村姟") {
+            result = true;
+          }
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+      return result;
+    },
+  }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+</style>
diff --git a/src/views/scMould/warehouse/component/Sc_MouldMoveStockRequestBill.vue b/src/views/scMould/warehouse/component/Sc_MouldMoveStockRequestBill.vue
new file mode 100644
index 0000000..c4d9258
--- /dev/null
+++ b/src/views/scMould/warehouse/component/Sc_MouldMoveStockRequestBill.vue
@@ -0,0 +1,920 @@
+<template>
+  <div style="padding: 10px; position: relative;">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
+      <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px;">
+        <el-date-picker v-model="sTime" type="date" placeholder="寮�濮嬫棩鏈�" style="width: 150px;">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="缁撴潫鏃ユ湡">
+        <el-date-picker v-model="eTime" type="date" placeholder="缁撴潫鏃ユ湡" style="width: 150px;">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="鏃ユ湡闂撮殧">
+        <el-select v-model="queryParams.HInitTimeCycle" placeholder="璇烽�夋嫨" @change="riqiChange" style="width: 150px;">
+          <el-option v-for="(item, index) in rqsgList" :key="index" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+        <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label-width="78px">
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"> 鎼� 绱�</el-button>
+        <el-button icon="el-icon-circle-close" @click="resetQuery">閲� 缃�</el-button>
+      </el-form-item>
+      <el-collapse v-model="activeSeach">
+        <el-collapse-item title="鏇村" name="1">
+          <el-card class="box-card">
+            <el-form-item label="鐘舵��" prop="HStatus">
+              <el-select v-model="queryParams.HStatus" placeholder="璇烽�夋嫨鐘舵��">
+                <el-option v-for="(item, index) in HStatusList" :key="index" :label="item.name" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="璋冨嚭缁勭粐">
+              <el-select v-model="queryParams.HStockOutOrgID" placeholder="璇烽�夋嫨">
+                <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="閮ㄩ棬淇℃伅" prop="HDept">
+              <el-input v-model="queryParams.HDept" placeholder="璇疯緭鍏ラ儴闂ㄤ俊鎭�" @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="鍣ㄥ叿浠g爜" prop="HModelNumber">
+              <el-input v-model="queryParams.HModelNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�" @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
+              <el-input v-model="queryParams.HSupName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <div slot="header" class="clearfix"><span>鍏朵粬鏉′欢</span></div>
+            <div>
+              <el-row>
+                <el-form-item label-width="0">
+                  <el-row>
+                    <el-col :span="2"><span>杩囨护</span></el-col>
+                    <el-col :span="6">
+                      <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <span v-for="(item, index) in btList" :key="index">
+                          <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+                        </span>
+                      </el-select>
+                    </el-col>
+                    <el-col :span="6" style="padding: 0 10px;">
+                      <el-select v-model="queryParams.Comparator1" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+                          :value="item.value"></el-option>
+                      </el-select>
+                    </el-col>
+                    <el-col :span="10">
+                      <el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
+                        @keyup.enter.native="handleQuery" />
+                    </el-col>
+                  </el-row>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label-width="0">
+                  <el-row>
+                    <el-col :span="2"><span>杩囨护</span></el-col>
+                    <el-col :span="6">
+                      <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <span v-for="(item, index) in btList" :key="index">
+                          <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+                        </span>
+                      </el-select>
+                    </el-col>
+                    <el-col :span="6" style="padding: 0 10px;">
+                      <el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+                          :value="item.value"></el-option>
+                      </el-select>
+                    </el-col>
+                    <el-col :span="10">
+                      <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
+                        @keyup.enter.native="handleQuery" />
+                    </el-col>
+                  </el-row>
+                </el-form-item>
+              </el-row>
+              <el-form-item label-width="0">
+                <el-row>
+                  <el-col :span="2"><span>杩囨护</span></el-col>
+                  <el-col :span="6">
+                    <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange">
+                      <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
+                        :value="item.field"></el-option>
+                    </el-select>
+                  </el-col>
+                  <el-col :span="6" style="padding: 0 10px;">
+                    <el-select v-model="queryParams.Comparator" placeholder="璇烽�夋嫨" @change="riqiChange">
+                      <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+                        :value="item.value"></el-option>
+                    </el-select>
+                  </el-col>
+                  <el-col :span="10">
+                    <el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
+                      @keyup.enter.native="handleQuery" />
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </div>
+          </el-card>
+        </el-collapse-item>
+      </el-collapse>
+    </el-form>
+    <el-row :gutter="10" class="mb8" style="margin-top: 10px;">
+      <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 :span="1.5">
+        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+          @click="handleEdit(row = rowForm, OperationType = 2)">缂栬緫</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
+          @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">澶嶅埗</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-tickets" size="mini"
+          @click="handleMove(row = rowForm, OperationType = 4)">涓嬫帹锛堝櫒鍏风洿鎺ヨ皟鎷ㄥ崟锛�</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+          @click="set_CheckBill(1, form = rowForm)">瀹℃牳</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+          @click="set_CheckBill(2, form = rowForm)">杩斿鏍�</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</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-row>
+    <div class="tableBox" v-loading="loading">
+      <el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
+        @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick" :row-style="rowStyle"
+        @cell-dblclick="handleDblclick" v-if="tableShow">
+        <template v-for="(item, index) in btList">
+          <el-table-column type="selection" width="55" align="center" :fixed="item.fixed" v-if="item.type == 'checkbox'"
+            :key="index" />
+          <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width" :key="item.id"
+            v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort" show-overflow-tooltip
+            :fixed="item.fixed">
+            <template slot-scope="{row,  column }">
+              <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
+              <div :style="item.style">
+                <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
+                <el-button type="text" @click="handleEdit(row, OperationType = 2)"
+                  v-else-if="column.property == '鍗曟嵁鍙�'">{{row.鍗曟嵁鍙穧}</el-button>
+                <span v-else>{{ row[column.label] }}</span>
+              </div>
+            </template>
+          </el-table-column>
+        </template>
+      </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes" @pagination="getList" />
+      <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+        <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose"
+          v-if="rowHideShow" />
+      </el-dialog>
+      <!-- 缂栬緫 -->
+      <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" v-if="editShow" />
+      </el-dialog>
+      <!-- 涓嬫帹 -->
+      <!-- <el-dialog title="涓嬫帹鍣ㄥ叿鐩存帴璋冩嫧鍗�" :visible.sync="openMove" width="1480px" append-to-body class="xsckdBox" @close="close">
+        <move :OperationType='4' :propsData='moveData' :HSouceBillType=BillType
+         @editClose="moveClose" v-if="moveShow" />
+      </el-dialog> -->
+      <el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
+        <PrintList :linterid=this.rowForm.hmainid :MyMsg=this.rowForm.hmainid :Type='HModName'
+          :HModName='HModName' @rowEditClose="rowSetClose" v-if="printListShow" />
+        <!-- <div>111</div> -->
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+import RowSettings from '@/views/component/rowSettings'
+import Edit from '@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit'
+// import Move from '@/views/scMould/warehouse/Sc_MouldProdMoveBillEdit'
+import PrintList from '@/views/component/printList'
+import moment from 'moment';
+
+export default {
+  name: 'Sc_MouldMoveStockRequestBill',
+  components: { RowSettings, Edit,PrintList },
+  props: {
+    openPage: { type: String, },
+    HOrgID: { type: Number, },
+  },
+  data() {
+    return {
+      HModName: "Sc_MouldMoveStockRequestBill",
+      rowList:[],
+      activeSeach: '',
+      editShow: false,
+      openEdit: false,
+      moveShow: false,
+      openMove: false,
+      moveData:'',
+      totalNameList: [],
+      tableShow: true,
+      openPrintList: false,
+      printListShow: false,
+      openBtnHide: false,
+      btnHideShow: false,
+      rowHideShow: false,
+      openRowHide: false,
+      copyType: 0,
+      comparatorList: [
+        { label: '=', value: '=' },
+        { label: '>=', value: '>=' },
+        { label: '>', value: '>' },
+        { label: '<=', value: '<=' },
+        { label: '<', value: '<' },
+        { label: '<>', value: '<>' },
+        { label: '鍖呭惈', value: '7' },
+        { label: '宸﹀寘鍚�', value: '8' },
+        { label: '鍙冲寘鍚�', value: '9' },
+        { label: '涓嶅寘鍚�', value: '10' },
+      ],
+      sWhere: '',
+      sTime: '',
+      eTime: '',
+      rqsgList: [
+        { label: '浠婂ぉ', value: 0 },
+        { label: '杩戜袱澶�', value: 1 },
+        { label: '杩戜笁澶�', value: 2 },
+        { label: '杩戝洓澶�', value: 3 },
+        { label: '杩戜簲澶�', value: 4 },
+        { label: '杩戝叚澶�', value: 5 },
+        { label: '杩戜竷澶�', value: 6 },
+        { label: '杩�30澶�', value: 29 },
+        { label: '杩戝崐骞�', value: 180 },
+        { label: '杩戜竴骞�', value: 365 },
+      ],
+      organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
+      HStatusList: [{name:'鍏ㄩ儴',value:'-1'},{name:'鏈鏍�',value:'0'},{name:'宸插鏍�',value:'1'},{name:'宸插叧闂�',value:'2'}],
+      addBtnShow: false,
+      dialogTitle: '',
+      OperationType: null,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼2锛�
+      HInterID: null,
+      baseURL: process.env.VUE_APP_BASE_API,
+      lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+      lastSelectedRow: null, // 涓婁竴娆¢�変腑鐨勮
+      selectedRow: null, // 褰撳墠閫変腑鐨勮
+      rowForm: {},
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        HBillNo: '',
+        HInitTimeCycle: 29,
+        HStockOutOrgID: sessionStorage["OrganizationID"] - 0,
+        HStatus:'-1',
+        HDept:'',
+        HModelNumber:'',
+        HSupName:'',
+        ColName1: '',
+        ColName2: '',
+        ColName: '',
+        Comparator1: '',
+        Comparator2: '',
+        Comparator: '',
+        ColContent1: '',
+        ColContent2: '',
+        ColContent: '',
+      },
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 閬僵灞�
+      loading: true,
+      tyResList: [],//鍒楄〃锛堟帴鍙f暟鎹級
+      btList: [],//琛ㄥご鍒楄〃鏄剧ず
+      btResList: [],
+      tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
+      dataList: [],
+      titleData: [],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+      pageSizes: [50, 100, 500, 5000, 50000],
+      page: 1,
+      pageSize: 0,
+      total: 0,
+      BillType:'3850',
+    };
+  },
+  created() {
+    // this.fetchData()
+    if(this.openPage && this.HOrgID){
+      this.queryParams.HStockOutOrgID = this.HOrgID
+    }
+    this.riqiChange()
+    this.getList();
+  },
+
+  methods: {
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '鍚堣';
+          return;
+        }
+        const values = data.map(item => Number(item[column.property]));
+        if (this.totalNameList[index].totalRow) {
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0)
+
+          } else {
+            sums[index] = '';
+          }
+        }
+      }, 1000);
+      return sums;
+    },
+
+    handleBtnHide() {
+      this.btnHideShow = true
+      this.openBtnHide = true
+    },
+    handleRowHide() {
+      this.rowHideShow = true
+      this.openRowHide = true
+    },
+    rowSetClose(val) {
+      this.rowHideShow = false
+      this.tableShow = true
+      this.openRowHide = val
+      this.getList()
+    },
+    riqiChange() {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
+      const yyyyS = start.getFullYear();
+      const mmS = String(start.getMonth() + 1).padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑
+      const ddS = String(start.getDate()).padStart(2, '0');
+      const yyyyE = end.getFullYear();
+      const mmE = String(end.getMonth() + 1).padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑
+      const ddE = String(end.getDate()).padStart(2, '0');
+      this.sTime = yyyyS + '-' + mmS + '-' + ddS
+      this.eTime = yyyyE + '-' + mmE + '-' + ddE
+    },
+    getList() {
+      this.pageSize = 50
+      this.tableShow = false
+      this.loading = true
+      if (this.sTime && !this.sWhere) {
+        this.sTime = moment(this.sTime).format('YYYY-MM-DD')
+        this.eTime = moment(this.eTime).format('YYYY-MM-DD')
+        this.sWhere += " and 鏃ユ湡 >= '" + this.sTime + "'";
+        this.sWhere += " and 鏃ユ湡 <= '" + this.eTime + "'";
+      }
+      this.sWhere += " and HSTOCKORGID=" + this.queryParams.HStockOutOrgID;
+      if (this.pageSize == 0) {
+        this.pageSize = 50
+      }
+      // 鍒楄〃
+      axios.get(this.baseURL + '/Sc_MouldMoveStockRequestBillController/page', {
+        params: {
+          "sWhere": this.sWhere,
+          "user": sessionStorage["HUserName"],
+          "page": this.page,
+          "size": this.pageSize,
+          "Type": this.BillType,
+        },
+      }).then(response => {
+        this.tyResList = response.data.data//鎬绘暟鎹�
+        let data1 = response.data
+        let option = []
+        if (data1.code == 1) {
+          this.btResList = data1.list//閿�鍞嚭搴撳崟鎺ュ彛琛ㄥご鏁版嵁
+          this.total = data1.count;
+          var data = [];//鍒楀瓧娈垫暟鎹�
+          var col = [];
+          var totalArray = ["浠舵暟"];
+          //缁欑┖鐨勬暟缁勮祴鍊�
+          for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+            var patrn = new RegExp(/^h/i);
+            if (patrn.test(data1.list[key].ColmCols)) {
+                this.titleData[key] = data1.list[key].ColmCols;
+            }
+          }
+          //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+          col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+          for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+            if (this.titleData.indexOf(data[i].name) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑  //璁$畻鍒�
+              col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+            } else if (totalArray.indexOf(data[i].name) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //璁$畻鍒�
+              col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+            }
+            else {
+              col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+            }
+
+          }
+          option.cols = [col]
+          option.data = data1.data
+          this.dataList = option
+          this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    DisPlay_HideColumn(HModName, user, option, dataOption) {
+      this.totalNameList = []
+      axios.get(this.baseURL + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
+        params: {
+          "HModName": HModName,
+          "user": user,
+        },
+      }).then(res => {        
+        let data1 = res.data
+        if (data1.data.length != 0) {       
+          var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+          var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+          newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+          dataCol = data1.data[0].HGridString.split(',');
+          //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+          if (dataCol.length == option.cols[0].length - 1) {                
+            //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+            for (var j = 0; j < option.cols[0].length - 1; j++) {
+              for (var i = 0; i < option.cols[0].length - 1; i++) {
+                var dataCols = dataCol[j].split('|');
+                //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+                if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+                  //闅愯棌鍒�
+                  if (dataCols[1] == 1) {
+                    option.cols[0][i + 1]["hide"] = true;
+                  }
+                  //璁剧疆鍒楀
+                  if (dataCols[3] > 0) {
+                    option.cols[0][i + 1]["width"] = dataCols[3];
+                  }
+                  //璁剧疆鍐呭瀛椾綋澶у皬
+                  if (data1.data[0].HFontSize != 0) {
+                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                  } else {
+                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                  }
+                  //鏄剧ず鍒�
+                  if (dataCols[1] == 0 && this.titleData.indexOf(option.cols[0][i + 1]["title"]) == -1) {
+                    option.cols[0][i + 1]["hide"] = false;
+                  }
+                  //缁熻鍒�
+                  if (dataCols[6] == 1) {
+                    option.cols[0][i + 1]["totalRow"] = true;
+                  } else {
+                    option.cols[0][i + 1]["totalRow"] = false;
+                  }
+                  //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                  switch (dataCols[2]) {
+                    case "L":
+                      option.cols[0][i + 1]["align"] = "left";
+                      break;
+                    case "M":
+                      option.cols[0][i + 1]["align"] = "center";
+                      break;
+                    case "R":
+                      option.cols[0][i + 1]["align"] = "right";
+                      break;
+                  }
+                  //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+                  if (dataCols[4] != null && dataCols[4] != "") {
+                    option.cols[0][i + 1]["title"] = dataCols[4];
+                  }
+                  newCols[0].push(option.cols[0][i + 1]);
+                  break;
+                }
+              }
+            }
+            //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+            if (dataCol.length == newCols[0].length - 1) {
+              option.cols = newCols;
+              //鍙栨秷鍐荤粨鍒�
+              for (var i = 1; i < option.cols[0].length - 1; i++) {
+                if (option.cols[0][i + 1]["fixed"] != null) {
+                  option.cols[0][i + 1]["fixed"] = null;
+                }
+                else {
+                  break;
+                }
+              }
+              //鍐荤粨鍒�
+              if (data1.data[0].HFixCols != 0) {
+                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                  if (dataOption.cols[0].indexOf(option.cols[0][i + 1]["title"]) != -1) {
+                    data1.data[0].HFixCols += 1;
+                  }
+
+                  option.cols[0][i + 1]["fixed"] = "left";
+                }
+              }
+              //璁剧疆鍒楁帓搴�
+              for (var i = 1; i < option.cols[0].length; i++) {
+                if (data1.data[0].HSortFlag == "鏄�") {
+                  option.cols[0][i]["sort"] = true;
+                }
+                else {
+                  option.cols[0][i]["sort"] = false;
+                }
+              }
+            }
+          }
+          this.btList = option.cols[0]
+          this.btList.map(item => {
+            if (!item.hide) {
+              this.totalNameList.push(item)
+            }
+          })
+          if (data1.data[0].HPageSize == 0) {
+            this.pageSize = 50
+          } else {
+            this.pageSize = data1.data[0].HPageSize
+          }
+          this.tableData = option.data
+          this.tableShow = true
+          this.loading = false
+        } else {
+          this.btList = dataOption.cols[0]
+          this.btList.map(item => {
+            if (!item.hide) {
+              this.totalNameList.push(item)
+            }
+          })
+          this.tableData = dataOption.data
+          this.tableShow = true
+          this.loading = false
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    renderHeader(h, { column, $index }) {// 鏂板缓涓�涓� span
+      let span = document.createElement(span)// 璁剧疆琛ㄥご鍚嶇О
+      span.innerText = column.label
+      //涓存椂鎻掑叆 document
+      document.body.appendChild(span)// 閲嶇偣:鑾峰彇 span 鏈�灏忓搴︼紝璁剧疆褰撳墠鍒楋紝娉ㄦ剰杩欓噷鍔犱簡 20锛屽瓧娈佃緝澶氭椂column.minWidth=span.getBoundingClientRect().width + 50.//绉婚櫎 document 涓复鏃剁殑 span
+      document.body.removeChild(span)
+      return h(span, column.label)
+    },
+    //鐐瑰嚮琛�
+    handleRowClick(row, column, event) {
+      this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆¢�変腑鐨勮
+      this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
+      this.lastSelectedRowIndex = this.tableData.indexOf(row);
+      this.$refs.tableData.toggleRowSelection(row);
+      if (this.openPage) {
+        this.$emit('deptEmit', this.rowList, this.BillType)
+      }
+    },
+    //閫変腑琛岄珮浜牱寮�
+    rowStyle({ row, rowIndex }) {
+      if (this.ids.includes(row.sorderid)) {
+        return { "background": "#ecf5ff" }
+      }
+    },
+    //鍙屽嚮琛�
+    handleDblclick(row, column, cell, event) {
+      this.OperationType = 2
+      this.handleEdit(row);
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      // this.rowForm = {}
+      this.rowList=selection
+      this.ids = selection.map(item => item.sorderid)
+      this.single = selection.length != 1
+      this.multiple = !selection.length
+      if (!this.single) {
+        this.rowForm = selection[0]
+      }
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.sWhere = ''
+      if (this.queryParams.ColName && this.queryParams.Comparator) {
+        var com = "";
+        switch (this.queryParams.Comparator) {
+          case "7":
+            com = "like'%" + this.queryParams.ColContent + "%'";
+            break;
+          case "8":
+            com = "like'%" + this.queryParams.ColContent + "'";
+            break;
+          case "9":
+            com = "like'" + this.queryParams.ColContent + "%'";
+            break;
+          case "10":
+            com = "not like'%" + this.queryParams.ColContent + "%'";
+            break;
+          default:
+            com = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName + " " + com;
+      }
+      if (this.queryParams.ColName1 && this.queryParams.Comparator1) {
+        var com1 = "";
+        switch (this.queryParams.Comparator1) {
+          case "7":
+            com1 = "like'%" + this.queryParams.ColContent1 + "%'";
+            break;
+          case "8":
+            com1 = "like'%" + this.queryParams.ColContent1 + "'";
+            break;
+          case "9":
+            com1 = "like'" + this.queryParams.ColContent1 + "%'";
+            break;
+          case "10":
+            com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
+            break;
+          default:
+            com1 = "" + this.queryParams.Comparator1 + "'" + this.queryParams.ColContent1 + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
+      }
+      if (this.queryParams.ColName2 && this.queryParams.Comparator2) {
+        var com2 = "";
+        switch (this.queryParams.Comparator2) {
+          case "7":
+            com2 = "like'%" + this.queryParams.ColContent2 + "%'";
+            break;
+          case "8":
+            com2 = "like'%" + this.queryParams.ColContent2 + "'";
+            break;
+          case "9":
+            com2 = "like'" + this.queryParams.ColContent2 + "%'";
+            break;
+          case "10":
+            com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
+            break;
+          default:
+            com2 = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
+      }
+      if (this.queryParams.HStatus) {
+          switch (this.queryParams.HStatus) {
+              case '-1':   //鍏ㄩ儴
+                  this.sWhere += "";
+                  break;
+              case '0':    //鏈鏍�
+                  this.sWhere += " and 瀹℃牳浜�=''";
+                  break;
+              case '1':    //宸插鏍�
+                  this.sWhere += " and 瀹℃牳浜�<>''";
+                  break;
+              case '2':    //宸插叧闂�
+                  this.sWhere += " and 鍏抽棴浜�<>''";
+              default:
+          }
+      }
+      if (this.sTime) {
+          this.sTime = moment(this.sTime).format('YYYY-MM-DD')
+          this.sWhere += " and 鏃ユ湡 >= '" + this.sTime + "'";
+      }
+      if (this.eTime) {
+          this.eTime = moment(this.eTime).format('YYYY-MM-DD')
+          this.sWhere += " and 鏃ユ湡 <= '" + this.eTime + "'";
+      }
+      if (this.queryParams.HBillNo) {
+        this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
+      }
+      if (this.queryParams.HDept) {
+          this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDept + "%'";
+      }
+      if (this.queryParams.HModelNumber) {
+          this.sWhere += " and 鍣ㄥ叿浠g爜 like '%" + this.queryParams.HModelNumber + "%'";
+      }
+      if (this.queryParams.HSupName) {
+          this.sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
+      }
+      this.clearData()
+      this.getList()
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.sWhere = ''
+      this.queryParams = {
+        HBillNo: '',
+        HInitTimeCycle: 29,
+        HStockOutOrgID: sessionStorage["OrganizationID"] - 0,
+        HStatus:'-1',
+        HDept:'',
+        HModelNumber:'',
+        HSupName:'',
+        ColName1: '',
+        ColName2: '',
+        ColName: '',
+        Comparator1: '',
+        Comparator2: '',
+        Comparator: '',
+        ColContent1: '',
+        ColContent2: '',
+        ColContent: '',
+      }
+      this.clearData()
+      this.riqiChange()
+      this.resetForm("queryForm")
+      this.getList()
+    },
+
+    //閫�鍑�
+    close() {
+      // this.reset()
+      this.tableShow = true
+      this.openEdit = false
+      this.editShow = false
+      this.openMove = false
+      this.moveShow = false
+      this.clearData()
+      this.getList()
+    },
+    //鎵撳紑鏂板缁勪欢寮圭獥
+    handleAddEdit() {
+      this.rowForm.hmainid = 0
+      this.editShow = true
+      this.openEdit = true
+    },
+    //鎵撳紑淇敼缁勪欢寮圭獥
+    handleEdit(row) {
+      this.rowForm = row
+      this.editShow = true
+      this.openEdit = true
+    },
+    //鎵撳紑涓嬫帹缁勪欢寮圭獥
+    handleMove() {
+      if (this.rowList && this.rowList.length > 0) {
+        var dataArray = [];
+        var HSupTypeID_Temp = this.rowList[0].HSupTypeID
+        var HStockInOrgID_Temp = this.rowList[0].HSTOCKORGINID
+        for (var i = 0; i < this.rowList.length; i++) {
+            if (this.rowList[i].鍗曟嵁鐘舵�� != "宸插鏍�") {
+                this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戜笉涓哄凡瀹℃牳鐘舵��,涓嶅厑璁镐笅鎺紒")
+                return;
+            }
+            if (this.rowList[i].HQtyMust <= 0) {
+                this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戝搴斿彲涓嬫帹鏁伴噺蹇呴』澶т簬 0 锛�")
+                return;
+            }
+            if (this.rowList[i].HSupTypeID != HSupTypeID_Temp) {
+                this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹搴斿線鏉ョ被鍨嬪繀椤讳竴鑷达紒")
+                return;
+            }
+            if (this.rowList[i].HSTOCKORGINID != HStockInOrgID_Temp) {
+                this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹搴旇皟鍏ョ粍缁囧繀椤讳竴鑷达紒")
+                return;
+            }
+            var temp = {
+                "hmainid": this.rowList[i].hmainid
+                , "hsubid": this.rowList[i].hsubid
+                , "HBillType": this.rowList[i].HBillType
+            }
+            dataArray.push(temp);
+        }
+        var datajson = {
+            "data": dataArray
+        };
+        this.moveData = JSON.stringify(datajson)
+        this.moveShow = true
+        this.openMove = true
+      } else {
+          this.$modal.msgError("璇烽�夋嫨鏁版嵁涓嬫帹锛�")
+      }
+    },
+    //鍏抽棴缂栬緫椤甸潰
+    editClose(val) {
+      this.open = val
+      this.editShow = false
+      this.openEdit = val
+      this.clearData()
+      this.getList()
+    },
+    //鍏抽棴涓嬫帹椤甸潰
+    moveClose(val) {
+      this.open = val
+      this.moveShow = false
+      this.openMove = val
+      this.clearData()
+      this.getList()
+    },
+    //娓呴櫎閫変腑鏁版嵁鐨勭紦瀛�
+    clearData(){
+      this.ids = []
+      this.multiple = true
+      this.single = true
+      this.OperationType = 0
+      this.copyType = 0
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete() {
+      this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
+        axios.get(this.baseURL + "/Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Delete_Json", {
+            params: { 'HInterID': this.rowForm.hmainid.toString(), 'HMaker': sessionStorage["HUserName"] }
+          }).then(response => {
+            if (response.data.count == 1) {
+              this.getList()
+              this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+            } else {
+              this.$modal.msgError("閿欒:" + result.code + result.Message);
+            }
+          }).catch(error => {
+            this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+          });
+      }).catch(() => { })
+    },
+    // 鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBill(num, form) {
+      var InterID = form.hmainid || form.HInterID
+      //閫昏緫瀹℃牳鏂规硶
+      axios.get(this.baseURL + "/Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Check_Json", {
+        params: { "HInterID": InterID, "Type": num, "HMaker": sessionStorage["HUserName"] }
+      }).then(response => {
+        let result = response.data
+        if (result.count == 1) {
+          this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+          this.clearData()
+          this.getList();
+        }
+        else {
+          this.$modal.msgError("閿欒:" + result.code + result.Message,);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //瀵煎嚭
+    handleExport() {
+      const ws = this.$XLSX.utils.json_to_sheet(this.tyResList); // 灏嗘暟鎹浆鎹负宸ヤ綔琛�
+      const wb = this.$XLSX.utils.book_new(); // 鍒涘缓涓�涓柊鐨勫伐浣滅翱
+      this.$XLSX.utils.book_append_sheet(wb, ws, "Sheet1"); // 灏嗗伐浣滆〃娣诲姞鍒板伐浣滅翱涓紝骞跺懡鍚嶄负"Sheet1"
+      this.$XLSX.writeFile(wb, `sellOutBill_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢      
+    },
+    //鎵撳嵃
+    get_PrintReport() {
+      if (this.ids.length != 1) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+      } else if (this.rowForm.鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
+        this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
+      } else {
+        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']
+    },
+  }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+</style>
diff --git a/src/views/scMould/warehouse/component/Sc_MouldOutRequestBill.vue b/src/views/scMould/warehouse/component/Sc_MouldOutRequestBill.vue
new file mode 100644
index 0000000..7a8e133
--- /dev/null
+++ b/src/views/scMould/warehouse/component/Sc_MouldOutRequestBill.vue
@@ -0,0 +1,965 @@
+<template>
+  <div style="padding: 10px; position: relative;">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
+      <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px;">
+        <el-date-picker v-model="sTime" type="date" placeholder="寮�濮嬫棩鏈�" style="width: 150px;">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="缁撴潫鏃ユ湡">
+        <el-date-picker v-model="eTime" type="date" placeholder="缁撴潫鏃ユ湡" style="width: 150px;">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="鏃ユ湡闂撮殧">
+        <el-select v-model="queryParams.HInitTimeCycle" placeholder="璇烽�夋嫨" @change="riqiChange" style="width: 150px;">
+          <el-option v-for="(item, index) in rqsgList" :key="index" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+        <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label-width="78px">
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"> 鎼� 绱�</el-button>
+        <el-button icon="el-icon-circle-close" @click="resetQuery">閲� 缃�</el-button>
+      </el-form-item>
+      <el-collapse v-model="activeSeach">
+        <el-collapse-item title="鏇村" name="1">
+          <el-card class="box-card">
+            <el-form-item label="鐘舵��" prop="HStatus">
+              <el-select v-model="queryParams.HStatus" placeholder="璇烽�夋嫨鐘舵��">
+                <el-option v-for="(item, index) in HStatusList" :key="index" :label="item.name" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="缁勭粐">
+              <el-select v-model="queryParams.HStockOrgID" placeholder="璇烽�夋嫨">
+                <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="閮ㄩ棬淇℃伅" prop="HDept">
+              <el-input v-model="queryParams.HDept" placeholder="璇疯緭鍏ラ儴闂ㄤ俊鎭�" @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="鍣ㄥ叿浠g爜" prop="HModelNumber">
+              <el-input v-model="queryParams.HModelNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�" @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
+              <el-input v-model="queryParams.HSupName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <div slot="header" class="clearfix"><span>鍏朵粬鏉′欢</span></div>
+            <div>
+              <el-row>
+                <el-form-item label-width="0">
+                  <el-row>
+                    <el-col :span="2"><span>杩囨护</span></el-col>
+                    <el-col :span="6">
+                      <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <span v-for="(item, index) in btList" :key="index">
+                          <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+                        </span>
+                      </el-select>
+                    </el-col>
+                    <el-col :span="6" style="padding: 0 10px;">
+                      <el-select v-model="queryParams.Comparator1" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+                          :value="item.value"></el-option>
+                      </el-select>
+                    </el-col>
+                    <el-col :span="10">
+                      <el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
+                        @keyup.enter.native="handleQuery" />
+                    </el-col>
+                  </el-row>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label-width="0">
+                  <el-row>
+                    <el-col :span="2"><span>杩囨护</span></el-col>
+                    <el-col :span="6">
+                      <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <span v-for="(item, index) in btList" :key="index">
+                          <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+                        </span>
+                      </el-select>
+                    </el-col>
+                    <el-col :span="6" style="padding: 0 10px;">
+                      <el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+                          :value="item.value"></el-option>
+                      </el-select>
+                    </el-col>
+                    <el-col :span="10">
+                      <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
+                        @keyup.enter.native="handleQuery" />
+                    </el-col>
+                  </el-row>
+                </el-form-item>
+              </el-row>
+              <el-form-item label-width="0">
+                <el-row>
+                  <el-col :span="2"><span>杩囨护</span></el-col>
+                  <el-col :span="6">
+                    <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange">
+                      <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
+                        :value="item.field"></el-option>
+                    </el-select>
+                  </el-col>
+                  <el-col :span="6" style="padding: 0 10px;">
+                    <el-select v-model="queryParams.Comparator" placeholder="璇烽�夋嫨" @change="riqiChange">
+                      <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+                        :value="item.value"></el-option>
+                    </el-select>
+                  </el-col>
+                  <el-col :span="10">
+                    <el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
+                      @keyup.enter.native="handleQuery" />
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </div>
+          </el-card>
+        </el-collapse-item>
+      </el-collapse>
+    </el-form>
+    <el-row :gutter="10" class="mb8" style="margin-top: 10px;">
+      <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 :span="1.5">
+        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+          @click="handleEdit(row = rowForm, OperationType = 2)">缂栬緫</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
+          @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">澶嶅埗</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-tickets" size="mini"
+          @click="handlePush(row = rowForm, OperationType = 4)">涓嬫帹锛堝櫒鍏烽鐢ㄥ嚭搴撳崟锛�</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+          @click="set_CheckBill(1, form = rowForm)">瀹℃牳</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+          @click="set_CheckBill(2, form = rowForm)">杩斿鏍�</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="multiple"
+          @click="set_CheckBillAll(1, ids)">瀹℃牳(鎵归噺)</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="multiple"
+          @click="set_CheckBillAll(2, ids)">杩斿鏍�(鎵归噺)</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</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-row>
+    <div class="tableBox" v-loading="loading">
+      <el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
+        @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick" :row-style="rowStyle"
+        @cell-dblclick="handleDblclick" v-if="tableShow">
+        <template v-for="(item, index) in btList">
+          <el-table-column type="selection" width="55" align="center" :fixed="item.fixed" v-if="item.type == 'checkbox'"
+            :key="index" />
+          <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width" :key="item.id"
+            v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort" show-overflow-tooltip
+            :fixed="item.fixed">
+            <template slot-scope="{row,  column }">
+              <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
+              <div :style="item.style">
+                <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
+                <el-button type="text" @click="handleEdit(row, OperationType = 2)"
+                  v-else-if="column.property == '鍗曟嵁鍙�'">{{
+                    row.鍗曟嵁鍙�
+                  }}</el-button>
+                <span v-else>{{ row[column.label] }}</span>
+              </div>
+            </template>
+          </el-table-column>
+        </template>
+      </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes" @pagination="getList" />
+      <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+        <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose"
+          v-if="rowHideShow" />
+      </el-dialog>
+      <!-- 缂栬緫 -->
+      <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" v-if="editShow" />
+      </el-dialog>
+      <!-- 涓嬫帹 -->
+      <el-dialog title="涓嬫帹鍣ㄥ叿棰嗙敤鍑哄簱鍗�" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox" @close="close">
+        <push :OperationType='4' :propsData='pushData' :HSouceBillType=BillType
+         @editClose="pushClose" v-if="pushShow" />
+      </el-dialog>
+      <el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
+        <PrintList :linterid=this.rowForm.hmainid :MyMsg=this.rowForm.hmainid :Type='HModName'
+          :HModName='HModName' @rowEditClose="rowSetClose" v-if="printListShow" />
+        <!-- <div>111</div> -->
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+import RowSettings from '@/views/component/rowSettings'
+import Edit from '@/views/scMould/warehouse/Sc_MouldOutRequestBillEdit'
+import Push from '@/views/scMould/warehouse/Sc_MouldProdOutBillEdit'
+import PrintList from '@/views/component/printList'
+import moment from 'moment';
+
+export default {
+  name: 'Sc_MouldOutRequestBill',
+  components: { RowSettings, Edit,Push, PrintList },
+  props: {
+    openPage: { type: String, },
+    HOrgID: { type: String, },
+  },
+  data() {
+    return {
+      HModName: "Sc_MouldOutRequestBill",
+      rowList:[],
+      activeSeach: '',
+      editShow: false,
+      openEdit: false,
+      pushShow: false,
+      openPush: false,
+      pushData:'',
+      totalNameList: [],
+      tableShow: true,
+      openPrintList: false,
+      printListShow: false,
+      openBtnHide: false,
+      btnHideShow: false,
+      rowHideShow: false,
+      openRowHide: false,
+      copyType: 0,
+      comparatorList: [
+        { label: '=', value: '=' },
+        { label: '>=', value: '>=' },
+        { label: '>', value: '>' },
+        { label: '<=', value: '<=' },
+        { label: '<', value: '<' },
+        { label: '<>', value: '<>' },
+        { label: '鍖呭惈', value: '7' },
+        { label: '宸﹀寘鍚�', value: '8' },
+        { label: '鍙冲寘鍚�', value: '9' },
+        { label: '涓嶅寘鍚�', value: '10' },
+      ],
+      sWhere: '',
+      sTime: '',
+      eTime: '',
+      rqsgList: [
+        { label: '浠婂ぉ', value: 0 },
+        { label: '杩戜袱澶�', value: 1 },
+        { label: '杩戜笁澶�', value: 2 },
+        { label: '杩戝洓澶�', value: 3 },
+        { label: '杩戜簲澶�', value: 4 },
+        { label: '杩戝叚澶�', value: 5 },
+        { label: '杩戜竷澶�', value: 6 },
+        { label: '杩�30澶�', value: 29 },
+        { label: '杩戝崐骞�', value: 180 },
+        { label: '杩戜竴骞�', value: 365 },
+      ],
+      organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
+      HStatusList: [{name:'鍏ㄩ儴',value:'-1'},{name:'鏈鏍�',value:'0'},{name:'宸插鏍�',value:'1'},{name:'宸插叧闂�',value:'2'}],
+      addBtnShow: false,
+      dialogTitle: '',
+      OperationType: null,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼2锛�
+      HInterID: null,
+      baseURL: process.env.VUE_APP_BASE_API,
+      lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+      lastSelectedRow: null, // 涓婁竴娆¢�変腑鐨勮
+      selectedRow: null, // 褰撳墠閫変腑鐨勮
+      rowForm: {},
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        HBillNo: '',
+        HInitTimeCycle: 29,
+        HStockOrgID: sessionStorage["OrganizationID"] - 0,
+        HStatus:'-1',
+        HDept:'',
+        HModelNumber:'',
+        HSupName:'',
+        ColName1: '',
+        ColName2: '',
+        ColName: '',
+        Comparator1: '',
+        Comparator2: '',
+        Comparator: '',
+        ColContent1: '',
+        ColContent2: '',
+        ColContent: '',
+      },
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 閬僵灞�
+      loading: true,
+      tyResList: [],//鍒楄〃锛堟帴鍙f暟鎹級
+      btList: [],//琛ㄥご鍒楄〃鏄剧ず
+      btResList: [],
+      tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
+      dataList: [],
+      titleData: [],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+      pageSizes: [50, 100, 500, 5000, 50000],
+      page: 1,
+      pageSize: 0,
+      total: 0,
+      BillType:'3849',
+    };
+  },
+  created() {
+    // this.fetchData()
+    if(this.openPage && this.HOrgID){
+      this.queryParams.HStockOrgID = this.HOrgID
+    }
+    this.riqiChange()
+    this.getList();
+  },
+
+  methods: {
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '鍚堣';
+          return;
+        }
+        const values = data.map(item => Number(item[column.property]));
+        if (this.totalNameList[index].totalRow) {
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0)
+
+          } else {
+            sums[index] = '';
+          }
+        }
+      }, 1000);
+      return sums;
+    },
+
+    handleBtnHide() {
+      this.btnHideShow = true
+      this.openBtnHide = true
+    },
+    handleRowHide() {
+      this.rowHideShow = true
+      this.openRowHide = true
+    },
+    rowSetClose(val) {
+      this.rowHideShow = false
+      this.tableShow = true
+      this.openRowHide = val
+      this.getList()
+    },
+    riqiChange() {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
+      const yyyyS = start.getFullYear();
+      const mmS = String(start.getMonth() + 1).padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑
+      const ddS = String(start.getDate()).padStart(2, '0');
+      const yyyyE = end.getFullYear();
+      const mmE = String(end.getMonth() + 1).padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑
+      const ddE = String(end.getDate()).padStart(2, '0');
+      this.sTime = yyyyS + '-' + mmS + '-' + ddS
+      this.eTime = yyyyE + '-' + mmE + '-' + ddE
+    },
+    getList() {
+      this.pageSize = 50
+      this.tableShow = false
+      this.loading = true
+      if (this.sTime && !this.sWhere) {
+        this.sTime = moment(this.sTime).format('YYYY-MM-DD')
+        this.eTime = moment(this.eTime).format('YYYY-MM-DD')
+        this.sWhere += " and 鏃ユ湡 >= '" + this.sTime + "'";
+        this.sWhere += " and 鏃ユ湡 <= '" + this.eTime + "'";
+      }
+      this.sWhere += " and HSTOCKORGID=" + this.queryParams.HStockOrgID;
+      if (this.pageSize == 0) {
+        this.pageSize = 50
+      }
+      // 閿�鍞嚭搴撳崟鍒楄〃
+      axios.get(this.baseURL + '/Sc_MouldOutRequestBillController/page', {
+        params: {
+          "sWhere": this.sWhere,
+          "user": sessionStorage["HUserName"],
+          "page": this.page,
+          "size": this.pageSize,
+          "Type": this.BillType,
+        },
+      }).then(response => {
+        this.tyResList = response.data.data//鎬绘暟鎹�
+        let data1 = response.data
+        let option = []
+        if (data1.code == 1) {
+          this.btResList = data1.list//閿�鍞嚭搴撳崟鎺ュ彛琛ㄥご鏁版嵁
+          this.total = data1.count;
+          var data = [];//鍒楀瓧娈垫暟鎹�
+          var col = [];
+          var totalArray = ["浠舵暟"];
+          //缁欑┖鐨勬暟缁勮祴鍊�
+          for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+            var patrn = new RegExp(/^h/i);
+            if (patrn.test(data1.list[key].ColmCols)) {
+                this.titleData[key] = data1.list[key].ColmCols;
+            }
+          }
+          //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+          col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+          for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+            if (this.titleData.indexOf(data[i].name) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑  //璁$畻鍒�
+              col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+            } else if (totalArray.indexOf(data[i].name) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //璁$畻鍒�
+              col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+            }
+            else {
+              col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+            }
+
+          }
+          option.cols = [col]
+          option.data = data1.data
+          this.dataList = option
+          this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    DisPlay_HideColumn(HModName, user, option, dataOption) {
+      this.totalNameList = []
+      axios.get(this.baseURL + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
+        params: {
+          "HModName": HModName,
+          "user": user,
+        },
+      }).then(res => {        
+        let data1 = res.data
+        if (data1.data.length != 0) {       
+          var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+          var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+          newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+          dataCol = data1.data[0].HGridString.split(',');
+          //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+          if (dataCol.length == option.cols[0].length - 1) {                
+            //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+            for (var j = 0; j < option.cols[0].length - 1; j++) {
+              for (var i = 0; i < option.cols[0].length - 1; i++) {
+                var dataCols = dataCol[j].split('|');
+                //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+                if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+                  //闅愯棌鍒�
+                  if (dataCols[1] == 1) {
+                    option.cols[0][i + 1]["hide"] = true;
+                  }
+                  //璁剧疆鍒楀
+                  if (dataCols[3] > 0) {
+                    option.cols[0][i + 1]["width"] = dataCols[3];
+                  }
+                  //璁剧疆鍐呭瀛椾綋澶у皬
+                  if (data1.data[0].HFontSize != 0) {
+                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                  } else {
+                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                  }
+                  //鏄剧ず鍒�
+                  if (dataCols[1] == 0 && this.titleData.indexOf(option.cols[0][i + 1]["title"]) == -1) {
+                    option.cols[0][i + 1]["hide"] = false;
+                  }
+                  //缁熻鍒�
+                  if (dataCols[6] == 1) {
+                    option.cols[0][i + 1]["totalRow"] = true;
+                  } else {
+                    option.cols[0][i + 1]["totalRow"] = false;
+                  }
+                  //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                  switch (dataCols[2]) {
+                    case "L":
+                      option.cols[0][i + 1]["align"] = "left";
+                      break;
+                    case "M":
+                      option.cols[0][i + 1]["align"] = "center";
+                      break;
+                    case "R":
+                      option.cols[0][i + 1]["align"] = "right";
+                      break;
+                  }
+                  //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+                  if (dataCols[4] != null && dataCols[4] != "") {
+                    option.cols[0][i + 1]["title"] = dataCols[4];
+                  }
+                  newCols[0].push(option.cols[0][i + 1]);
+                  break;
+                }
+              }
+            }
+            //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+            if (dataCol.length == newCols[0].length - 1) {
+              option.cols = newCols;
+              //鍙栨秷鍐荤粨鍒�
+              for (var i = 1; i < option.cols[0].length - 1; i++) {
+                if (option.cols[0][i + 1]["fixed"] != null) {
+                  option.cols[0][i + 1]["fixed"] = null;
+                }
+                else {
+                  break;
+                }
+              }
+              //鍐荤粨鍒�
+              if (data1.data[0].HFixCols != 0) {
+                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                  if (dataOption.cols[0].indexOf(option.cols[0][i + 1]["title"]) != -1) {
+                    data1.data[0].HFixCols += 1;
+                  }
+
+                  option.cols[0][i + 1]["fixed"] = "left";
+                }
+              }
+              //璁剧疆鍒楁帓搴�
+              for (var i = 1; i < option.cols[0].length; i++) {
+                if (data1.data[0].HSortFlag == "鏄�") {
+                  option.cols[0][i]["sort"] = true;
+                }
+                else {
+                  option.cols[0][i]["sort"] = false;
+                }
+              }
+            }
+          }
+          this.btList = option.cols[0]
+          this.btList.map(item => {
+            if (!item.hide) {
+              this.totalNameList.push(item)
+            }
+          })
+          if (data1.data[0].HPageSize == 0) {
+            this.pageSize = 50
+          } else {
+            this.pageSize = data1.data[0].HPageSize
+          }
+          this.tableData = option.data
+          this.tableShow = true
+          this.loading = false
+        } else {
+          this.btList = dataOption.cols[0]
+          this.btList.map(item => {
+            if (!item.hide) {
+              this.totalNameList.push(item)
+            }
+          })
+          this.tableData = dataOption.data
+          this.tableShow = true
+          this.loading = false
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    renderHeader(h, { column, $index }) {// 鏂板缓涓�涓� span
+      let span = document.createElement(span)// 璁剧疆琛ㄥご鍚嶇О
+      span.innerText = column.label
+      //涓存椂鎻掑叆 document
+      document.body.appendChild(span)// 閲嶇偣:鑾峰彇 span 鏈�灏忓搴︼紝璁剧疆褰撳墠鍒楋紝娉ㄦ剰杩欓噷鍔犱簡 20锛屽瓧娈佃緝澶氭椂column.minWidth=span.getBoundingClientRect().width + 50.//绉婚櫎 document 涓复鏃剁殑 span
+      document.body.removeChild(span)
+      return h(span, column.label)
+    },
+    //鐐瑰嚮琛�
+    handleRowClick(row, column, event) {
+      this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆¢�変腑鐨勮
+      this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
+      this.lastSelectedRowIndex = this.tableData.indexOf(row);
+      this.$refs.tableData.toggleRowSelection(row);
+      if (this.openPage) {
+        this.$emit('deptEmit', this.rowList, this.BillType)
+      }
+    },
+    //閫変腑琛岄珮浜牱寮�
+    rowStyle({ row, rowIndex }) {
+      if (this.ids.includes(row.sorderid)) {
+        return { "background": "#ecf5ff" }
+      }
+    },
+    //鍙屽嚮琛�
+    handleDblclick(row, column, cell, event) {
+      this.OperationType = 2
+      this.handleEdit(row)
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      // this.rowForm = {}
+      this.rowList=selection
+      this.ids = selection.map(item => item.sorderid)
+      this.single = selection.length != 1
+      this.multiple = !selection.length
+      if (!this.single) {
+        this.rowForm = selection[0]
+      }
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.sWhere = ''
+      if (this.queryParams.ColName && this.queryParams.Comparator) {
+        var com = "";
+        switch (this.queryParams.Comparator) {
+          case "7":
+            com = "like'%" + this.queryParams.ColContent + "%'";
+            break;
+          case "8":
+            com = "like'%" + this.queryParams.ColContent + "'";
+            break;
+          case "9":
+            com = "like'" + this.queryParams.ColContent + "%'";
+            break;
+          case "10":
+            com = "not like'%" + this.queryParams.ColContent + "%'";
+            break;
+          default:
+            com = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName + " " + com;
+      }
+      if (this.queryParams.ColName1 && this.queryParams.Comparator1) {
+        var com1 = "";
+        switch (this.queryParams.Comparator1) {
+          case "7":
+            com1 = "like'%" + this.queryParams.ColContent1 + "%'";
+            break;
+          case "8":
+            com1 = "like'%" + this.queryParams.ColContent1 + "'";
+            break;
+          case "9":
+            com1 = "like'" + this.queryParams.ColContent1 + "%'";
+            break;
+          case "10":
+            com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
+            break;
+          default:
+            com1 = "" + this.queryParams.Comparator1 + "'" + this.queryParams.ColContent1 + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
+      }
+      if (this.queryParams.ColName2 && this.queryParams.Comparator2) {
+        var com2 = "";
+        switch (this.queryParams.Comparator2) {
+          case "7":
+            com2 = "like'%" + this.queryParams.ColContent2 + "%'";
+            break;
+          case "8":
+            com2 = "like'%" + this.queryParams.ColContent2 + "'";
+            break;
+          case "9":
+            com2 = "like'" + this.queryParams.ColContent2 + "%'";
+            break;
+          case "10":
+            com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
+            break;
+          default:
+            com2 = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
+      }
+      if (this.queryParams.HStatus) {
+          switch (this.queryParams.HStatus) {
+              case '-1':   //鍏ㄩ儴
+                  this.sWhere += "";
+                  break;
+              case '0':    //鏈鏍�
+                  this.sWhere += " and 瀹℃牳浜�=''";
+                  break;
+              case '1':    //宸插鏍�
+                  this.sWhere += " and 瀹℃牳浜�<>''";
+                  break;
+              case '2':    //宸插叧闂�
+                  this.sWhere += " and 鍏抽棴浜�<>''";
+              default:
+          }
+      }
+      if (this.sTime) {
+        this.sTime = moment(this.sTime).format('YYYY-MM-DD')
+        this.sWhere += " and 鏃ユ湡 >= '" + this.sTime + "'";
+      }
+      if (this.eTime) {
+        this.eTime = moment(this.eTime).format('YYYY-MM-DD')
+        this.sWhere += " and 鏃ユ湡 <= '" + this.eTime + "'";
+      }
+      if (this.queryParams.HBillNo) {
+        this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
+      }
+      if (this.queryParams.HDept) {
+        this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDept + "%'";
+      }
+      if (this.queryParams.HModelNumber) {
+        this.sWhere += " and 鍣ㄥ叿浠g爜 like '%" + this.queryParams.HModelNumber + "%'";
+      }
+      if (this.queryParams.HSupName) {
+        this.sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
+      }
+      this.clearData()
+      this.getList()
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.sWhere = ''
+      this.queryParams = {
+        HBillNo: '',
+        HInitTimeCycle: 29,
+        HStockOrgID: sessionStorage["OrganizationID"] - 0,
+        HStatus:'-1',
+        HDept:'',
+        HModelNumber:'',
+        HSupName:'',
+        ColName1: '',
+        ColName2: '',
+        ColName: '',
+        Comparator1: '',
+        Comparator2: '',
+        Comparator: '',
+        ColContent1: '',
+        ColContent2: '',
+        ColContent: '',
+      }
+      this.riqiChange()
+      this.resetForm("queryForm")
+      this.clearData()
+      this.getList()
+    },
+
+    //閫�鍑�
+    close() {
+      // this.reset()
+      this.tableShow = true
+      this.openEdit = false
+      this.editShow = false
+      this.openPush = false
+      this.pushShow = false
+      this.clearData()
+      this.getList()
+    },
+    //鎵撳紑鏂板缁勪欢寮圭獥
+    handleAddEdit() {
+      this.rowForm.hmainid = 0
+      this.editShow = true
+      this.openEdit = true
+    },
+    //鎵撳紑淇敼缁勪欢寮圭獥
+    handleEdit(row) {
+      this.rowForm = row
+      this.editShow = true
+      this.openEdit = true
+    },
+    //鎵撳紑淇敼缁勪欢寮圭獥
+    handleEdit(row) {
+      this.rowForm = row
+      this.editShow = true
+      this.openEdit = true
+    },
+    //鎵撳紑涓嬫帹缁勪欢寮圭獥
+    handlePush() {
+      if (this.rowList && this.rowList.length > 0) {
+        var dataArray = [];
+        var HSupTypeID_Temp = this.rowList[0].HSupTypeID
+        for (var i = 0; i < this.rowList.length; i++) {
+            if (this.rowList[i].鍗曟嵁鐘舵�� != "宸插鏍�") {
+                this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戜笉涓哄凡瀹℃牳鐘舵��,涓嶅厑璁镐笅鎺紒")
+                return;
+            }
+            if (this.rowList[i].HQtyMust <= 0) {
+                this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戝搴斿彲涓嬫帹鏁伴噺蹇呴』澶т簬 0 锛�")
+                return;
+            }
+            if (this.rowList[i].HSupTypeID != HSupTypeID_Temp) {
+                this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹搴斿線鏉ョ被鍨嬪繀椤讳竴鑷达紒")
+                return;
+            }
+            var temp = {
+                "hmainid": this.rowList[i].hmainid
+                , "hsubid": this.rowList[i].hsubid
+                , "HBillType": this.rowList[i].HBillType
+            }
+            dataArray.push(temp);
+        }
+        var datajson = {
+            "data": dataArray
+        };
+        this.pushData = JSON.stringify(datajson)
+        this.pushShow = true
+        this.openPush = true
+      } else {
+          this.$modal.msgError("璇烽�夋嫨鏁版嵁涓嬫帹锛�")
+      }
+    },
+    //鍏抽棴缂栬緫椤甸潰
+    editClose(val) {
+      this.open = val
+      this.editShow = false
+      this.openEdit = val
+      this.clearData()
+      this.getList()
+    },
+    //鍏抽棴涓嬫帹椤甸潰
+    pushClose(val) {
+      this.open = val
+      this.pushShow = false
+      this.openPush = val
+      this.clearData()
+      this.getList()
+    },
+    //娓呴櫎閫変腑鏁版嵁鐨勭紦瀛�
+    clearData(){
+      this.ids = []
+      this.multiple = true
+      this.single = true
+      this.OperationType = 0
+      this.copyType = 0
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete() {
+      this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
+        axios.get(this.baseURL + "/Sc_MouldOutRequestBillController/GetSc_MouldOutRequestBill_Delete_Json", {
+            params: { 'HInterID': this.rowForm.hmainid.toString(), 'HMaker': sessionStorage["HUserName"] }
+          }).then(response => {
+            if (response.data.count == 1) {
+              this.getList()
+              this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+            } else {
+              this.$modal.msgError("閿欒:" + result.code + result.Message);
+            }
+          }).catch(error => {
+            this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+          });
+      }).catch(() => { })
+    },
+    // 鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBill(num, form) {
+      var InterID = form.hmainid || form.HInterID
+      //閫昏緫瀹℃牳鏂规硶
+      axios.get(this.baseURL + "/Sc_MouldOutRequestBillController/GetSc_MouldOutRequestBill_Check_Json", {
+        params: { "HInterID": InterID, "Type": num, "HMaker": sessionStorage["HUserName"] }
+      }).then(response => {
+        let result = response.data
+        if (result.count == 1) {
+          this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+          this.clearData()
+          this.getList();
+        }
+        else {
+          this.$modal.msgError("閿欒:" + result.code + result.Message,);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    // 鎵归噺鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBillAll(num, ids) {
+      //閫昏緫瀹℃牳鏂规硶
+      axios.get(this.baseURL + "/Sc_MouldOutRequestBillController/CheckAll", {
+        params: { "ids": ids, "Type": num, "HMaker": sessionStorage["HUserName"] }
+      }).then(response => {
+        let result = response.data
+        if (result.count == 1) {
+          this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+          this.getList();
+        }
+        else {
+          this.$modal.msgError("閿欒:" + result.code + result.Message,);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //瀵煎嚭
+    handleExport() {
+      const ws = this.$XLSX.utils.json_to_sheet(this.tyResList); // 灏嗘暟鎹浆鎹负宸ヤ綔琛�
+      const wb = this.$XLSX.utils.book_new(); // 鍒涘缓涓�涓柊鐨勫伐浣滅翱
+      this.$XLSX.utils.book_append_sheet(wb, ws, "Sheet1"); // 灏嗗伐浣滆〃娣诲姞鍒板伐浣滅翱涓紝骞跺懡鍚嶄负"Sheet1"
+      this.$XLSX.writeFile(wb, `sellOutBill_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢      
+    },
+    //鎵撳嵃
+    get_PrintReport() {
+      if (this.ids.length != 1) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+      } else if (this.rowForm.鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
+        this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
+      } else {
+        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 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
+    defaintOperationByCompanyName() {
+      var result = false;
+      axios.get(this.baseURL + '/Xt_getInfo/getCompanyName').then(response => {
+        var data1 = response.data
+        if (data1.count == 1) {
+          if (data1.data == "姘村姟") {
+            result = true;
+          }
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+      return result;
+    },
+  }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+</style>

--
Gitblit v1.9.1