From a6ef9e2851d6c1e04bdad4de92b95efc35f61750 Mon Sep 17 00:00:00 2001
From: NNowhZzU <1539353356@qq.com>
Date: 星期二, 02 一月 2024 11:40:51 +0800
Subject: [PATCH] 采购入库、采购退货弹窗详情修改；库存报表页增加详情弹窗
---
north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Storage.vue | 14 +++-
north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Return.vue | 29 ++++++---
north-glass-erp/northglass-erp/src/views/mm/stockReport/WarehouseReport.vue | 132 ++++++++++++++++++++++++++++++++++++++------
3 files changed, 141 insertions(+), 34 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Return.vue b/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Return.vue
index 8b95252..4420a82 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Return.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Return.vue
@@ -37,7 +37,7 @@
ref="xGrid"
v-bind="gridOptions"
v-on="gridEvents"
- @cell-click="cellClickEvent"
+ @cell-dblclick="cellClickEvent"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -72,21 +72,26 @@
<!-- 璇︽儏妗� 閮ㄥ垎1-->
<vxe-modal v-model="showDetails" title="鏌ョ湅璇︽儏" width="600" height="80%" :mask="false" :lock-view="false" resize>
<el-container >
- <!-- <el-header height="35px"
- style="margin: 0;padding: 0">
- 杩欐槸澶�
- </el-header>-->
+ <el-header height="35px"
+ style="margin: 0;padding: 0">
+
+ <el-input v-model="showCGDH" placeholder="閲囪喘鍗曞彿" disabled >
+ <template #prepend>閲囪喘鍗曞彿锛�</template>
+ </el-input>
+ </el-header>
<el-main>
<template #default>
<vxe-table
- border="inner"
+ border="default"
auto-resize
show-overflow
- max-height="420"
+ max-height="400"
:row-config="{isHover: true}"
:show-header="false"
:sync-resize="showDetails"
- :data="detailData">
+ :data="detailData"
+
+ >
<vxe-column field="label" width="30%" class-name="v-column-label"></vxe-column>
<vxe-column field="value"></vxe-column>
</vxe-table>
@@ -108,9 +113,6 @@
</el-container>
</vxe-modal>
<!-- 璇︽儏妗� 閮ㄥ垎1 缁撴潫-->
-
-
-
</el-main>
</el-container>
</template>
@@ -348,14 +350,18 @@
})
+
//璇︽儏妗� 閮ㄥ垎2
+const showCGDH =ref();
const showDetails =ref(false);
let detailData =[];
const cellClickEvent = ({row}) => {
detailData = ['cgdh', 'thdh', 'h', 'xh', 'wlbh', 'wlmc', 'gys','w','g','dw','cgzt','rq','yl','sl','xsdh','je','6'].map(field => {
return { label: ModelColumnContent(field) , value: row[field] }
+
})
showDetails.value = true;
+ showCGDH.value = row['cgdh'];
}
const ModelColumnContent = (text) => {
@@ -450,5 +456,6 @@
<style scoped>
:deep(.v-column-label div span){
font-weight: bold;
+ font-align:center;
}
</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Storage.vue b/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Storage.vue
index c8b5979..2e394f9 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Storage.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Storage.vue
@@ -17,7 +17,6 @@
/>
</el-col>
-
<el-col :span="2">
<el-button
id="select"
@@ -78,10 +77,13 @@
<!-- 璇︽儏妗� 閮ㄥ垎1-->
<vxe-modal v-model="showDetails" title="鏌ョ湅璇︽儏" width="600" height="80%" :mask="false" :lock-view="false" resize>
<el-container >
-<!-- <el-header height="35px"
+ <el-header height="35px"
style="margin: 0;padding: 0">
- 杩欐槸澶�
- </el-header>-->
+
+ <el-input v-model="showCGDH" placeholder="閲囪喘鍗曞彿" disabled >
+ <template #prepend>閲囪喘鍗曞彿锛�</template>
+ </el-input>
+ </el-header>
<el-main>
<template #default>
<vxe-table
@@ -360,7 +362,7 @@
})
-
+const showCGDH = ref();
//璇︽儏妗� 閮ㄥ垎2
const showDetails =ref(false);
@@ -369,7 +371,9 @@
detailData = ['cgdh', 'rkdh', 'h', 'xh', 'wlbh', 'wlmc', 'gys','w','g','dw','cgzt','rq','yl','sl','xsdh','je','6'].map(field => {
return { label: ModelColumnContent(field) , value: row[field] }
})
+
showDetails.value = true;
+ showCGDH.value = row['cgdh'];
}
const ModelColumnContent = (text) => {
diff --git a/north-glass-erp/northglass-erp/src/views/mm/stockReport/WarehouseReport.vue b/north-glass-erp/northglass-erp/src/views/mm/stockReport/WarehouseReport.vue
index 0a4c51b..9db690a 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/stockReport/WarehouseReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/stockReport/WarehouseReport.vue
@@ -13,6 +13,7 @@
ref="xGrid"
v-bind="gridOptions"
v-on="gridEvents"
+ @cell-dblclick="cellClickEvent"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -42,6 +43,51 @@
</div>
</template>
</vxe-grid>
+
+ <!-- 璇︽儏妗� 閮ㄥ垎1-->
+ <vxe-modal v-model="showDetails" title="鏌ョ湅璇︽儏" width="600" height="80%" :mask="false" :lock-view="false" resize>
+ <el-container >
+ <el-header height="35px"
+ style="margin: 0;padding: 0">
+
+ <el-input v-model="showNum" placeholder="閲囪喘鍗曞彿" disabled >
+ <template #prepend>鐗╂枡缂栫爜</template>
+ </el-input>
+ </el-header>
+ <el-main>
+ <template #default>
+ <vxe-table
+ border="default"
+ auto-resize
+ show-overflow
+ max-height="400"
+ :row-config="{isHover: true}"
+ :show-header="false"
+ :sync-resize="showDetails"
+ :data="detailData"
+ >
+ <vxe-column field="label" width="30%" class-name="v-column-label"></vxe-column>
+ <vxe-column field="value"></vxe-column>
+ </vxe-table>
+ </template>
+ </el-main>
+ <el-footer height="40px">
+<!-- <el-row>
+ <el-col :offset="20" :span="4">
+ <el-button
+ id="Sure"
+ type="primary"
+ @click="SureReturn"
+ >纭閫�璐�
+ </el-button>
+ </el-col>
+
+ </el-row>-->
+ </el-footer>
+ </el-container>
+ </vxe-modal>
+ <!-- 璇︽儏妗� 閮ㄥ垎1 缁撴潫-->
+
</el-main>
</div>
</template>
@@ -117,7 +163,6 @@
/* {title: '鎿嶄綔', width: '8%', slots: {default: 'button_slot'}, fixed: "left"},*/
{type: 'seq', fixed: "left", title: ' ', width: 50},
/*{ type: 'checkbox',fixed:"left", title: '', width: 50 },*/
-
{field: 'kczz', width: '13%', title: '搴撳瓨缁勭粐', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
{field: 'wlbm', width: '10%', title: '鐗╂枡缂栫爜', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
{field: 'wlmc', width: '10%',title: '鐗╂枡鍚嶇О', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
@@ -175,6 +220,8 @@
},
})
+
+//鍒楄〃鎿嶄綔
const getTableRow = (row, type) => {
switch (type) {
case 'edit' : {
@@ -221,25 +268,8 @@
//VXETable.modal.message( '璇烽�夋嫨涓�鏉℃暟鎹紒')
return
} else {
- /* async ()=>{
- const type = await.VXETable.modal.confirm('鎮ㄩ�夋嫨浜�'+$grid.getCheckboxRecords().length+'鏉℃暟鎹紒,鏄惁纭閫�搴擄紵');
- }*/
const type = VXETable.modal.confirm('鎮ㄩ�夋嫨浜�' + $grid.getCheckboxRecords().length + '鏉℃暟鎹紒,鏄惁纭閫�搴擄紵');
-
- /* if(VXETable.modal.confirm('鎮ㄩ�夋嫨浜�'+$grid.getCheckboxRecords().length+'鏉℃暟鎹紒,鏄惁纭閫�搴擄紵' )){
- //openAlert({type:'message', content: '鎴愬姛閫�搴�'+$grid.getCheckboxRecords().length+'鏉℃暟鎹紒', status: 'success',lockView: false, mask: false })
-
-
- }*/
-
- /* if(type==='confirm'){
- openAlert({type:'message', content: '鎴愬姛閫�搴�'+$grid.getCheckboxRecords().length+'鏉℃暟鎹紒', status: 'success' })
- }
-
-*/
- //openAlert({type:'alert', content: '鎴愬姛閫�搴�'+$grid.getCheckboxRecords().length+'鏉℃暟鎹紒', status: 'success' })
- //VXETable.modal.message( '璇烽�夋嫨涓�鏉℃暟鎹紒')
return
}
break
@@ -260,6 +290,72 @@
},
}
+
+const showNum =ref();
+const showDetails =ref(false);
+let detailData =[];
+
+const cellClickEvent = ({row}) => {
+ detailData = cName.map(field => {
+ return { label: ModelColumnContent(field) , value: row[field] }
+
+ })
+
+
+ showDetails.value = true;
+ showNum.value = row['wlbm'];
+
+}
+const cName = ['kczz','wlbm','wlmc','cd','kcbh','w','g','h','zdw','aqkc','kcs','kykc','wlsl','zmj', 'dpmj','scrq','bzq','kq','kw','jykc','bz'];
+const ModelColumnContent = (text) => {
+ switch (text) {
+ case 'kczz':
+ return "搴撳瓨缁勭粐";
+ case 'wlbm':
+ return "鐗╂枡缂栫爜";
+ case 'wlmc':
+ return "鐗╂枡鍚嶇О";
+ case 'cd':
+ return "浜у湴";
+ case 'kcbh':
+ return "搴撳瓨缂栧彿";
+ case 'w':
+ return "瀹�";
+ case 'g':
+ return "楂�";
+ case 'h':
+ return "鍘�";
+ case 'zdw':
+ return "涓诲崟浣�";
+ case 'aqkc':
+ return "瀹夊叏搴撳瓨";
+ case 'kcs':
+ return "搴撳瓨鏁�";
+ case 'kykc':
+ return "鍙敤搴撳瓨";
+ case 'wlsl':
+ return "鏈鏁伴噺";
+ case 'zmj':
+ return "鎬婚潰绉�";
+ case 'dpmj':
+ return "鍗曠墖闈㈢Н";
+ case 'scrq':
+ return "鐢熶骇鏃ユ湡";
+ case 'bzq': return "淇濊川鏈�";
+ case 'kq': return "搴撳尯";
+ case 'kw': return "搴撲綅";
+ case 'jykc': return "绉帇搴撳瓨";
+ case 'bz':
+ return "澶囨敞";
+ default:
+ return text;
+
+ }
+
+}
+
+
+
const openAlert = (options) => {
if(options.type==='message'){
VXETable.modal.message(options)
--
Gitblit v1.8.0