From 089bc7381dde0a784bb62a1b87828bd742874293 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 20 一月 2026 15:31:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue | 22 ++
src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue | 22 ++
src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue | 46 +++++
src/views/component/ICInventory_Mould/index.vue | 272 ++++++++++++++++++++++++++++++++++
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue | 22 ++
src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue | 22 ++
src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue | 22 ++
src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue | 22 ++
8 files changed, 444 insertions(+), 6 deletions(-)
diff --git a/src/views/component/ICInventory_Mould/index.vue b/src/views/component/ICInventory_Mould/index.vue
new file mode 100644
index 0000000..7f6e1ea
--- /dev/null
+++ b/src/views/component/ICInventory_Mould/index.vue
@@ -0,0 +1,272 @@
+<template>
+ <div class="barcode-detail">
+ <el-dialog
+ :visible.sync="dialogVisible"
+ title="瀹瑰櫒搴撳瓨鍗虫椂鎶ヨ〃"
+ width="90%"
+ top="5vh"
+ :close-on-click-modal="false"
+ @closed="handleClosed"
+ >
+ <el-card>
+ <div class="dialog-content">
+ <div class="table-toolbar">
+ <el-button size="mini" @click="handleColumnSetting">
+ <i class="el-icon-setting"></i> 鍒楄缃�
+ </el-button>
+ </div>
+ <el-table ref="mainTable" border stripe style="width: 100%"
+ :data="tableData" @selection-change="handleSelectionChange" :loading="loading"
+ show-summary :summary-method="getSummaries"
+ >
+ <el-table-column type="selection" width="55" fixed="left" />
+ <el-table-column v-for="column in tableColumns"
+ :key="column.field"
+ :prop="column.field"
+ :label="column.title"
+ :width="column.width"
+ :align="column.align"
+ :fixed="column.fixed"
+ :sortable="column.sortable"
+ :show-overflow-tooltip="true"
+ >
+ <template v-if="column.editable" #default="scope">
+ <el-input v-model="scope.row[column.field]" size="mini" />
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-card>
+ </el-dialog>
+
+ <el-dialog :visible.sync="columnDialogVisible" title="闅愯棌鍒楄缃�" width="50%" >
+ <div class="column-setting">
+ <el-checkbox-group v-model="selectedColumns">
+ <el-checkbox v-for="column in allColumns" :key="column.field" :label="column.field" >
+ {{ column.title }}
+ </el-checkbox>
+ </el-checkbox-group>
+ </div>
+ <div slot="footer">
+ <el-button @click="columnDialogVisible = false">鍙栨秷</el-button>
+ <el-button type="primary" @click="applyColumnSettings">纭畾</el-button>
+ </div>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import axios from 'axios'
+
+export default {
+ name: 'Kf_ICInventory_Mould',
+ data() {
+ return {
+ baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛鍓嶇紑
+ dialogVisible: false, //寮圭獥鏄剧ず鏍囪
+ columnDialogVisible: false, //鍒楄缃樉绀烘爣璁�
+ loading: false, //table琛ㄦ牸鍔犺浇鏍囪
+ formData: { //琛ㄥご鏁版嵁
+ HInterID: '',
+ HBillNo: '',
+ HBillType: ''
+ },
+ tableData: [], //table琛ㄦ牸鏁版嵁
+ tableColumns: [], //table琛ㄦ牸鍒楁暟鎹�
+ allColumns: [], //鍒楄缃畉able琛ㄦ牸
+ selectedColumns: [],
+ selectedRows: [], //閫変腑琛岃褰曟暟鎹�
+ }
+ },
+ methods: {
+ open(record) {
+ if (!record) {
+ this.$message.warning('璇烽�夋嫨瑕佹煡鐪嬪簱瀛樼殑瀹瑰櫒')
+ return
+ }
+
+ const HMaterID = record.HMaterID; //瀹瑰櫒ID
+ const HWHID = record.HWHID; //浠撳簱ID
+ const HSPID = record.HSPID; //浠撲綅ID
+
+ this.dialogVisible = true
+ this.$nextTick(() => {
+ this.loadData(HMaterID, HWHID , HSPID);
+ })
+ },
+
+ //#region 鍚堣琛岃绠�
+ 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 (!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] = ''
+ }
+ })
+
+ return sums
+ },
+ //#endregion
+
+ //#region 椤甸潰鍒濆鍖� 鍔犺浇鏁版嵁
+ async loadData(HMaterID, HWHID , HSPID) {
+ this.loading = true
+ var sWhere = "' and HMaterID = " + HMaterID + " '";
+ var sql = "exec h_p_Kf_ICInventory_Mould " + sWhere;
+ var ModRightNameCheck = "";
+ axios.get(this.$baseUrl + "/CommonModel/searchMethod", {
+ params: {
+ "sql": sql
+ , "user": sessionStorage["HUserName"]
+ , "ModRightNameCheck": ModRightNameCheck
+ }
+ }).then(response => {
+ var data1 = response.data
+ if (data1.count == 1) {
+ this.generateTableColumns(data1.list);
+ this.tableData = data1.data || [];
+ this.applyColumnSettingsFromStorage();
+ this.loading = false;
+ }
+ else {
+ this.$message.error('鑾峰彇鏉＄爜鏄庣粏鏁版嵁澶辫触');
+ this.loading = false;
+ }
+ });
+ },
+ //#endregion
+
+ //#region 瀵规煡璇㈡暟鎹繘琛屽鐞嗭紝涓烘覆鏌搕able銆佸垪璁剧疆table鎻愪緵鏁版嵁
+ generateTableColumns(columnList) {
+ const columns = [] //table琛ㄦ牸鍒楁暟鎹�
+ const allColumns = [] //鍒楄缃畉able琛ㄦ牸鏁版嵁
+
+ //澧炲姞澶嶉�夋鍒�
+ columns.push({
+ type: 'selection',
+ width: 55,
+ fixed: 'left'
+ })
+
+ //閬嶅巻鍒楁暟鎹�
+ columnList.forEach((item, index) => {
+ const colName = item.ColmCols
+ let columnConfig = {
+ field: colName,
+ title: colName,
+ width: 200,
+ align: 'center',
+ sortable: true
+ }
+
+ //瀵规寚瀹氬垪杩涜璁剧疆
+ switch (colName) {
+ case '鏁伴噺':
+ columnConfig.total = true
+ break
+ }
+
+ columns.push(columnConfig) //table琛ㄦ牸鍒楁暟鎹� 娣诲姞鏁版嵁
+ allColumns.push({ ...columnConfig }) //鍒楄缃畉able琛ㄦ牸鏁版嵁 娣诲姞鏁版嵁
+ })
+
+ this.tableColumns = columns
+ this.allColumns = allColumns
+ this.selectedColumns = allColumns.map(col => col.field)
+ },
+ //#endregion
+
+ //#region table閫変腑琛岀洃鍚彉鏇达紝鑾峰彇閫変腑琛屾暟鎹�
+ handleSelectionChange(selection) {
+ this.selectedRows = selection
+ },
+ //#endregion
+
+ //#region 鍒楄缃寜閽偣鍑讳簨浠剁洃鍚�
+ handleColumnSetting() {
+ this.columnDialogVisible = true
+ },
+ //#endregion
+
+ //#region 鍒楄缃繚瀛�
+ saveColumnSettings() {
+
+ },
+ //#endregion
+
+ //#region 鍒楄缃‘瀹氭寜閽偣鍑讳簨浠剁洃鍚�
+ applyColumnSettings() {
+ this.tableColumns = [
+ this.tableColumns[0],
+ ...this.allColumns.filter(col => this.selectedColumns.includes(col.field))
+ ]
+ this.columnDialogVisible = false
+ this.saveColumnSettings()
+ },
+ //#endregion
+
+ //#region 鍒楄缃� 鏍规嵁鍒楄缃樉绀簍able鍒�
+ applyColumnSettingsFromStorage() {
+
+ },
+ //#endregion
+
+ //#region 椤甸潰鍏抽棴鐩戝惉浜嬩欢
+ handleClosed() {
+ this.tableData = []
+ this.tableColumns = []
+ this.selectedRows = []
+ }
+ //#endregion
+ }
+}
+</script>
+
+<style scoped>
+.barcode-detail {
+ font-family: "Microsoft YaHei", sans-serif;
+}
+
+.form-container {
+ margin-bottom: 16px;
+}
+
+.table-toolbar {
+ margin-bottom: 12px;
+}
+
+.column-setting {
+ max-height: 400px;
+ overflow-y: auto;
+}
+
+.column-setting .el-checkbox {
+ display: block;
+ margin-bottom: 8px;
+}
+
+:deep(.el-dialog__body) {
+ padding: 10px 20px;
+}
+
+:deep(.el-card__body) {
+ padding: 12px;
+}
+</style>
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
index 98320ee..70d9def 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
@@ -184,6 +184,7 @@
size="mini">涓婄Щ</el-button>
<el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
size="mini">涓嬬Щ</el-button>
+ <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">瀹瑰櫒搴撳瓨</el-button>
</div>
<el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
@selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
@@ -265,6 +266,8 @@
<el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
<RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
</el-dialog>
+ <!-- 瀹瑰櫒搴撳瓨 -->
+ <ICInventoryMould :visible.sync="ICInventoryMouldShow" ref="ICInventoryMould"/>
</div>
</template>
@@ -278,11 +281,12 @@
import GyCustomer from '@/views/GyCustomer'
import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
+import ICInventoryMould from '@/views/component/ICInventory_Mould' //瀹瑰櫒搴撳瓨缁勪欢
import moment from 'moment';
export default {
name: 'Sc_MouldInRequestBillEdit',
- components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace },
+ components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,ICInventoryMould },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -322,6 +326,7 @@
organizationList: [],//缁勭粐鍒楄〃
subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼2锛�
+ ICInventoryMouldShow:false, //瀹瑰櫒搴撳瓨缁勪欢鏄剧ず鏍囪
HInterID: 0,
baseURL: process.env.VUE_APP_BASE_API,
checkedSysZb: [],
@@ -889,6 +894,21 @@
this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
}
},
+
+ //#region 鏌ョ湅瀹瑰櫒搴撳瓨
+ get_ICInventoryMould(zbSelForm) {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ var index = zbSelForm.index-1;
+ this.ICInventoryMouldShow = true
+ this.$nextTick(() => {
+ this.$refs.ICInventoryMould.open(this.editData[index]);
+ })
+ }
+ },
+ //#endregion
+
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
this.$refs["form"].validate(valid => {
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
index 9895387..855a371 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
@@ -201,6 +201,7 @@
size="mini">涓婄Щ</el-button>
<el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
size="mini">涓嬬Щ</el-button>
+ <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">瀹瑰櫒搴撳瓨</el-button>
</div>
<el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
@selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
@@ -315,6 +316,8 @@
<el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
<RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
</el-dialog>
+ <!-- 瀹瑰櫒搴撳瓨 -->
+ <ICInventoryMould :visible.sync="ICInventoryMouldShow" ref="ICInventoryMould"/>
</div>
</template>
@@ -328,11 +331,12 @@
import GyCustomer from '@/views/GyCustomer'
import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
+import ICInventoryMould from '@/views/component/ICInventory_Mould' //瀹瑰櫒搴撳瓨缁勪欢
import moment from 'moment';
export default {
name: 'Sc_MouldMoveStockRequestBillEdit',
- components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace },
+ components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,ICInventoryMould},
props: {
OperationType: { type: Number, },//鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫銆�3澶嶅埗銆�4涓嬫帹锛�
linterid: { type: Number, },
@@ -372,6 +376,7 @@
organizationList: [],//缁勭粐鍒楄〃
subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼2锛�
+ ICInventoryMouldShow:false, //瀹瑰櫒搴撳瓨缁勪欢鏄剧ず鏍囪
HInterID: 0,
baseURL: process.env.VUE_APP_BASE_API,
checkedSysZb: [],
@@ -989,6 +994,21 @@
this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
}
},
+
+ //#region 鏌ョ湅瀹瑰櫒搴撳瓨
+ get_ICInventoryMould(zbSelForm) {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ var index = zbSelForm.index-1;
+ this.ICInventoryMouldShow = true
+ this.$nextTick(() => {
+ this.$refs.ICInventoryMould.open(this.editData[index]);
+ })
+ }
+ },
+ //#endregion
+
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
this.$refs["form"].validate(valid => {
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
index 1c3b982..96119ca 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
@@ -201,6 +201,7 @@
size="mini">涓婄Щ</el-button>
<el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
size="mini">涓嬬Щ</el-button>
+ <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">瀹瑰櫒搴撳瓨</el-button>
</div>
<el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
@selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
@@ -288,6 +289,8 @@
<el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
<RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
</el-dialog>
+ <!-- 瀹瑰櫒搴撳瓨 -->
+ <ICInventoryMould :visible.sync="ICInventoryMouldShow" ref="ICInventoryMould"/>
</div>
</template>
@@ -302,11 +305,12 @@
import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
import ScICMOBillList from '@/views/ICMO/ScICMOBillList.vue'
+import ICInventoryMould from '@/views/component/ICInventory_Mould' //瀹瑰櫒搴撳瓨缁勪欢
import moment from 'moment';
export default {
name: 'Sc_MouldOutRequestBillEdit',
- components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,ScICMOBillList },
+ components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,ScICMOBillList,ICInventoryMould },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -348,6 +352,7 @@
organizationList: [],//缁勭粐鍒楄〃
subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼2锛�
+ ICInventoryMouldShow:false, //瀹瑰櫒搴撳瓨缁勪欢鏄剧ず鏍囪
HInterID: 0,
baseURL: process.env.VUE_APP_BASE_API,
checkedSysZb: [],
@@ -982,6 +987,21 @@
this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
}
},
+
+ //#region 鏌ョ湅瀹瑰櫒搴撳瓨
+ get_ICInventoryMould(zbSelForm) {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ var index = zbSelForm.index-1;
+ this.ICInventoryMouldShow = true
+ this.$nextTick(() => {
+ this.$refs.ICInventoryMould.open(this.editData[index]);
+ })
+ }
+ },
+ //#endregion
+
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
this.$refs["form"].validate(valid => {
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
index a8851ce..30f927c 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
@@ -206,6 +206,7 @@
size="mini">涓婄Щ</el-button>
<el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
size="mini">涓嬬Щ</el-button>
+ <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">瀹瑰櫒搴撳瓨</el-button>
</div>
<el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
@selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
@@ -361,6 +362,8 @@
<el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
<RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
</el-dialog>
+ <!-- 瀹瑰櫒搴撳瓨 -->
+ <ICInventoryMould :visible.sync="ICInventoryMouldShow" ref="ICInventoryMould"/>
</div>
</template>
@@ -375,11 +378,12 @@
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 ICInventoryMould from '@/views/component/ICInventory_Mould' //瀹瑰櫒搴撳瓨缁勪欢
import moment from 'moment';
export default {
name: 'Sc_MouldProdBackBillEdit',
- components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,scMouldIn },
+ components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,scMouldIn,ICInventoryMould },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -422,6 +426,7 @@
ifOrganizationEdit: false,
subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+ ICInventoryMouldShow:false, //瀹瑰櫒搴撳瓨缁勪欢鏄剧ず鏍囪
HInterID: 0,
baseURL: process.env.VUE_APP_BASE_API,
checkedSysZb: [],
@@ -1133,6 +1138,21 @@
this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
}
},
+
+ //#region 鏌ョ湅瀹瑰櫒搴撳瓨
+ get_ICInventoryMould(zbSelForm) {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ var index = zbSelForm.index-1;
+ this.ICInventoryMouldShow = true
+ this.$nextTick(() => {
+ this.$refs.ICInventoryMould.open(this.editData[index]);
+ })
+ }
+ },
+ //#endregion
+
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
this.$refs["form"].validate(valid => {
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
index b03464f..a88e6fe 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
@@ -223,6 +223,7 @@
size="mini">涓婄Щ</el-button>
<el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
size="mini">涓嬬Щ</el-button>
+ <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">瀹瑰櫒搴撳瓨</el-button>
</div>
<el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
@selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
@@ -400,6 +401,8 @@
<el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
<RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
</el-dialog>
+ <!-- 瀹瑰櫒搴撳瓨 -->
+ <ICInventoryMould :visible.sync="ICInventoryMouldShow" ref="ICInventoryMould"/>
</div>
</template>
@@ -414,11 +417,12 @@
import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
import ScMouldMove from '@/views/scMould/warehouse/component/Sc_MouldMoveStockRequestBill.vue'
+import ICInventoryMould from '@/views/component/ICInventory_Mould' //瀹瑰櫒搴撳瓨缁勪欢
import moment from 'moment';
export default {
name: 'Sc_MouldProdMoveBillEdit',
- components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,ScMouldMove },
+ components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,ScMouldMove,ICInventoryMould },
props: {
OperationType: { type: Number, },//锛�1鏂板銆�2缂栬緫銆�3澶嶅埗銆�4涓嬫帹锛�
linterid: { type: Number, },
@@ -462,6 +466,7 @@
ifOrganizationEdit: false,
subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛�1鏂板銆�2缂栬緫銆�3澶嶅埗銆�4涓嬫帹锛�
+ ICInventoryMouldShow:false, //瀹瑰櫒搴撳瓨缁勪欢鏄剧ず鏍囪
HInterID: 0,
baseURL: process.env.VUE_APP_BASE_API,
checkedSysZb: [],
@@ -1210,6 +1215,21 @@
this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
}
},
+
+ //#region 鏌ョ湅瀹瑰櫒搴撳瓨
+ get_ICInventoryMould(zbSelForm) {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ var index = zbSelForm.index-1;
+ this.ICInventoryMouldShow = true
+ this.$nextTick(() => {
+ this.$refs.ICInventoryMould.open(this.editData[index]);
+ })
+ }
+ },
+ //#endregion
+
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
this.$refs["form"].validate(valid => {
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
index 8c9be7f..2c2f520 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
@@ -206,6 +206,7 @@
size="mini">涓婄Щ</el-button>
<el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
size="mini">涓嬬Щ</el-button>
+ <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">瀹瑰櫒搴撳瓨</el-button>
</div>
<el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
@selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
@@ -361,6 +362,8 @@
<el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
<RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
</el-dialog>
+ <!-- 瀹瑰櫒搴撳瓨 -->
+ <ICInventoryMould :visible.sync="ICInventoryMouldShow" ref="ICInventoryMould"/>
</div>
</template>
@@ -375,11 +378,12 @@
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 ICInventoryMould from '@/views/component/ICInventory_Mould' //瀹瑰櫒搴撳瓨缁勪欢
import moment from 'moment';
export default {
name: 'Sc_MouldProdOutBillEdit',
- components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,ScMouldOut },
+ components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,ScMouldOut,ICInventoryMould },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -422,6 +426,7 @@
ifOrganizationEdit: false,
subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼2锛�
+ ICInventoryMouldShow:false, //瀹瑰櫒搴撳瓨缁勪欢鏄剧ず鏍囪
HInterID: 0,
baseURL: process.env.VUE_APP_BASE_API,
checkedSysZb: [],
@@ -1131,6 +1136,21 @@
this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
}
},
+
+ //#region 鏌ョ湅瀹瑰櫒搴撳瓨
+ get_ICInventoryMould(zbSelForm) {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ var index = zbSelForm.index-1;
+ this.ICInventoryMouldShow = true
+ this.$nextTick(() => {
+ this.$refs.ICInventoryMould.open(this.editData[index]);
+ })
+ }
+ },
+ //#endregion
+
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
this.$refs["form"].validate(valid => {
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
index 99c74a4..36ee0f7 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
@@ -127,6 +127,14 @@
</el-button>
</el-col>
<el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" @click="handleBatchDelete(0)">鎵归噺浣滃簾
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" @click="handleBatchDelete(1)">鎵归噺鍙嶄綔搴�
+ </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">
@@ -610,6 +618,44 @@
},
//#endregion
+ //#region 鎵归噺浣滃簾
+ handleBatchDelete(num) {
+ if (this.checkDataList.length == 0) {
+ this.$modal.msgError("璇烽�夋嫨鏁版嵁");
+ }
+ else if(this.checkDataList.length >100){
+ this.$modal.msgError("閫夋嫨鏁版嵁涓嶅彲澶т簬100鏉★紒");
+ }
+ else {
+ var HInterIDListStr = "";
+ for(var i=0;i<this.checkDataList.length;i++){
+ if(i==this.checkDataList.length-1){
+ HInterIDListStr += this.checkDataList[i].hmainid.toString();
+ }else{
+ HInterIDListStr += this.checkDataList[i].hmainid.toString() + ",";
+ }
+ }
+ // 鍒楄〃鏌ヨ
+ axios.get(this.$baseUrl + '/Gy_BarCodeBillList/DeleteBatchGy_BarCodeBillList', {
+ params: {
+ "HInterID": HInterIDListStr,
+ "IsAudit": num,
+ "CurUserName": sessionStorage["HUserName"],
+ },
+ }).then(response => {
+ let data1 = response.data
+ if (data1.count == 1) {
+ this.handleQuery();
+ }else{
+ this.$modal.msgError(data1.Message);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ }
+ },
+ //#endregion
+
//#region 鍒楄缃�
handleRowHide() {
this.rowHideShow = true
--
Gitblit v1.9.1