From 00d9fec5ce60e626fadceebcb2b657fc17e04285 Mon Sep 17 00:00:00 2001
From: NNowhZzU <1539353356@qq.com>
Date: 星期五, 29 十二月 2023 11:45:33 +0800
Subject: [PATCH] 入库，退货增加弹窗
---
north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/CreateHeader.vue | 739 ++++++++++++++++++++++++++++++++
north-glass-erp/northglass-erp/src/views/mm/stockReport/StockReport.vue | 31
north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Create.vue | 254 ++++++----
north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/PurchaseOrder.vue | 41 +
north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Storage.vue | 159 +++++-
north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Return.vue | 125 ++++-
north-glass-erp/northglass-erp/src/views/mm/stockReport/WarehouseReport.vue | 5
7 files changed, 1,174 insertions(+), 180 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Create.vue b/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Create.vue
index 7478cd3..932c4b1 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Create.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Create.vue
@@ -75,16 +75,14 @@
<el-col :span="6"></el-col>
</el-row>
-
-
</el-form>
</el-header>
<el-main style="padding-top: 5px;height:100%">
-<!-- <el-button class="mt-4" style="width: 10%" @click="onAddItem"
- >娣诲姞
- </el-button>-->
+ <!-- <el-button class="mt-4" style="width: 10%" @click="onAddItem"
+ >娣诲姞
+ </el-button>-->
<vxe-grid
@@ -129,6 +127,7 @@
<script setup>
import {ref, reactive} from 'vue'
+
let router = useRouter()
//缁勪欢鎺ユ敹鍙傛暟
@@ -163,52 +162,159 @@
columns: [
//{title: '鎿嶄綔', width: '8%', slots: {default: 'button_slot'}, fixed: "left"},
{type: 'seq', fixed: "left", title: ' ', width: 50},
- {type: 'checkbox',fixed:"left", title: '', width: 50 },
- {type: 'expand', title:'璇︽儏', fixed: "left", slots: {content: 'content'}, width: 50},
- {field: 'cgdh', width: '10%', title: '鐗╂枡缂栫爜', filters: [{data: ''}], slots: {filter: 'num1_filter'}, editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'cgzt', width: '10%', title: '鐗╂枡鍚嶇О', filters: [{data: ''}], slots: {filter: 'num1_filter'},editRender: { name: 'input', attrs: { placeholder: '' } }, sortable: true},
- {field: 'gys', width: '10%',title: '浜у湴', filters: [{data: ''}], slots: {filter: 'num1_filter'}, editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'w', width: '8%',title: '瀹藉害', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } }, sortable: true},
- {field: 'g', width: '8%',title: '楂樺害', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'h', width: '8%',title: '鍘氬害', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'xh', width: '8%',title: '鍨嬪彿',/*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'dw', width: '8%',title: '鍗曚綅', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'sl', width: '8%',title: '鏁伴噺', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'sl', width: '8%',title: '鎿嶄綔鏁伴噺', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } }},
- {field: 'sl', width: '12%',title: '绠辨暟', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'je', width: '8%',title: '鍗曠墖闈㈢Н', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'je', width: '12%',title: '鍗曚环', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: '6', width: '8%',title: '鎬绘暟閲�', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'sl', width: '8%',title: '鎬婚潰绉�', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'yl', width: '10%',title: '鎬婚噾棰�',/*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'yl', width: '10%',title: '澶囨敞', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } }, sortable: true}
+ {type: 'checkbox', fixed: "left", title: '', width: 50},
+ {type: 'expand', title: '璇︽儏', fixed: "left", slots: {content: 'content'}, width: 50},
+ {
+ field: 'cgdh',
+ width: '10%',
+ title: '鐗╂枡缂栫爜',
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ sortable: true
+ },
+ {
+ field: 'cgzt',
+ width: '10%',
+ title: '鐗╂枡鍚嶇О',
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ sortable: true
+ },
+ {
+ field: 'gys',
+ width: '10%',
+ title: '浜у湴',
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ sortable: true
+ },
+ {
+ field: 'w',
+ width: '8%',
+ title: '瀹藉害', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ sortable: true
+ },
+ {
+ field: 'g',
+ width: '8%',
+ title: '楂樺害', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ sortable: true
+ },
+ {
+ field: 'h',
+ width: '8%',
+ title: '鍘氬害', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ sortable: true
+ },
+ {
+ field: 'xh',
+ width: '8%',
+ title: '鍨嬪彿',/*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ sortable: true
+ },
+ {
+ field: 'dw',
+ width: '8%',
+ title: '鍗曚綅', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ sortable: true
+ },
+ {
+ field: 'sl',
+ width: '8%',
+ title: '鏁伴噺', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ sortable: true
+ },
+ {
+ field: 'sl',
+ width: '8%',
+ title: '鎿嶄綔鏁伴噺', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/
+ editRender: {name: 'input', attrs: {placeholder: ''}}
+ },
+ {
+ field: 'sl',
+ width: '12%',
+ title: '绠辨暟', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ sortable: true
+ },
+ {
+ field: 'je',
+ width: '8%',
+ title: '鍗曠墖闈㈢Н', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ sortable: true
+ },
+ {
+ field: 'je',
+ width: '12%',
+ title: '鍗曚环', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ sortable: true
+ },
+ {
+ field: '6',
+ width: '8%',
+ title: '鎬绘暟閲�', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ sortable: true
+ },
+ {
+ field: 'sl',
+ width: '8%',
+ title: '鎬婚潰绉�', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ sortable: true
+ },
+ {
+ field: 'yl',
+ width: '10%',
+ title: '鎬婚噾棰�',/*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ sortable: true
+ },
+ {
+ field: 'yl',
+ width: '10%',
+ title: '澶囨敞', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ sortable: true
+ }
],//琛ㄥご鍙傛暟
toolbarConfig: {
buttons: [
- {type:'text'},
+ {type: 'text'},
{
- 'name': '鏂板',
+ 'name': '鏂板',
- 'code':'Add',
- },
+ 'code': 'Add',
+ },
{
'name': '绉婚櫎',
- 'code':'Remove'
+ 'code': 'Remove'
},
{
'name': '淇濆瓨璁㈠崟',
- status:'primary',
- 'code':'Save'
- },{
+ status: 'primary',
+ 'code': 'Save'
+ }, {
'name': '鍏ュ簱',
- status:'primary',
- 'code':'Storage'
+ status: 'primary',
+ 'code': 'Storage'
},
{
'name': '閫�璐�',
- status:'primary',
- 'code':'Return'
+ status: 'primary',
+ 'code': 'Return'
}/*,
{
'name': '杩斿洖鏌ヨ',
@@ -220,13 +326,11 @@
print: true,
zoom: true,
custom: true,
- tools: [
-
- ],
+ tools: [],
},//琛ㄥご鎸夐挳
/*data: [{},{},{},{},{},{}],//table body瀹為檯鏁版嵁*/
- data: [{},{},{}],//table body瀹為檯鏁版嵁
+ data: [{}, {}, {}],//table body瀹為檯鏁版嵁
mergeFooterItems: [
{row: 0, col: 0, rowspan: 1, colspan: 3}
],//鍚堝苟鑴�
@@ -277,23 +381,23 @@
case 'Save': {//淇濆瓨
- if(form.buyItem === null || form.buyItem === ''){
+ if (form.buyItem === null || form.buyItem === '') {
openAlert({type: 'message', content: '閲囪喘缁勭粐涓嶅彲涓虹┖', status: 'warning'})
}
-return
+ return
- if(buyerOptions.values() <= 0){
+ if (buyerOptions.values() <= 0) {
}
- const type = VXETable.modal.confirm('鏄惁纭畾淇濆瓨褰撳墠璁㈠崟淇℃伅锛�');
- openAlert({type: 'message', content: $grid.rows.number+'', status: 'warning'})
- return
+ const type = VXETable.modal.confirm('鏄惁纭畾淇濆瓨褰撳墠璁㈠崟淇℃伅锛�');
+ openAlert({type: 'message', content: $grid.rows.number + '', status: 'warning'})
+ return
break
}
- case 'GoSelect':{
+ case 'GoSelect': {
router.push({path: '/main/purchaseOrder/SelectPurchaseOrder'})
break
@@ -360,16 +464,13 @@
const openAlert = (options) => {
- if(options.type==='message'){
+ if (options.type === 'message') {
VXETable.modal.message(options)
- }else{
+ } else {
VXETable.modal.alert(options)
}
}
-
-
-
const form = reactive({
@@ -476,55 +577,6 @@
import {VXETable} from "vxe-table";
import {useRouter} from "vue-router";
-const now = new Date()
-
-const tableData = ref([
- {
- wlcode: '202312205101',
- wlname: '杩欐槸涓�涓墿鏂欏悕绉�',
- cd: '浜у湴12',
- hd: '8',
- gd: '2440',
- kd: '3660',
- xh: 'CN10P'
- },
- {
- wlcode: '202312305101',
- wlname: '杩欐槸涓�涓墿鏂欏悕绉�',
- cd: '浜у湴1',
- gd: '2440',
- kd: '3660',
- hd: '5',
- xh: 'CN10P'
- },
- {
- wlcode: '202312405101',
- wlname: '杩欐槸涓�涓墿鏂欏悕绉�',
- cd: '浜у湴13',
- hd: '12',
- gd: '2440',
- kd: '3660',
- xh: 'CN10P'
- },
-])
-
-
-const onAddItem = () => {
- now.setDate(now.getDate() + 1)
- tableData.value.push({
- wlcode: dayjs(now).format('YYYYMMDDss') + '01',
- wlname: '杩欐槸涓�涓墿鏂欏悕绉�',
- cd: '浜у湴1',
- hd: '6',
- xh: 'CN10P',
- gd: '2440',
- kd: '3660',
- })
-}
-
-/*const deleteRow = (index: number) => {
- tableData.value.splice(index, 1)
-}*/
</script>
diff --git a/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/CreateHeader.vue b/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/CreateHeader.vue
new file mode 100644
index 0000000..dce1027
--- /dev/null
+++ b/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/CreateHeader.vue
@@ -0,0 +1,739 @@
+<template>
+ <el-header height="auto">
+
+
+ </el-header>
+
+ <el-main style="padding-top: 5px;height:100%">
+
+ <!-- 鍒涘缓琛ㄥご妯℃嫙鏍峰紡涓�-->
+ <div>鍒涘缓琛ㄥご绫讳竴</div>
+ <el-form label-width="100px" :inline="true" :model="formInline" class="demo-form-inline">
+ <div class="order-primary" style="background-color: white; border: #181818 1px solid">
+ <el-row>
+ <el-col class="elcolStyle" :span="2">
+ <el-text>*椤圭洰鍚嶇О锛�</el-text>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-input/>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-text>*瀹㈡埛閫夋嫨锛�</el-text>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-select clearable placeholder=" ">
+ <el-option/>
+ </el-select>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-text>*璁㈠崟绫诲瀷锛�</el-text>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-select clearable placeholder=" ">
+ <el-option/>
+ </el-select>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-text>璁㈠崟鍒嗙被锛�</el-text>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-select clearable placeholder=" ">
+ <el-option/>
+ </el-select>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-text>鍟嗘爣閫夐」锛�</el-text>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-select clearable placeholder=" ">
+ <el-option/>
+ </el-select>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-text>鍖呰鏂瑰紡锛�</el-text>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-select clearable placeholder=" ">
+ <el-option/>
+ </el-select>
+ </el-col>
+ <!-- <el-col :span="2"><el-text /></el-col>-->
+ </el-row>
+ <el-row>
+ <el-col class="elcolStyle" :span="2">
+ <el-text>閿�鍞崟鍙凤細</el-text>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-text/>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-text>浜よ揣鏃ユ湡锛�</el-text>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-date-picker
+ type="week"
+ format="[Week] ww"
+ placeholder="閫夋嫨鏃ユ湡" style="width: 100%"/>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-text>鎵规锛�</el-text>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-input/>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-text>璁＄畻鏂瑰紡锛�</el-text>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-select clearable placeholder=" ">
+ <el-option/>
+ </el-select>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-text>*涓氬姟鍛橈細</el-text>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-select clearable placeholder=" ">
+ <el-option/>
+ </el-select>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-text>閾濇潯鏂瑰紡锛�</el-text>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-select clearable placeholder=" ">
+ <el-option/>
+ </el-select>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col class="elcolStyle" :span="2">
+ <el-text>鎬婚噾棰濓細</el-text>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-text/>
+ </el-col>
+
+ <el-col class="elcolStyle" :span="2">
+ <el-text>鍚堝悓缂栧彿锛�</el-text>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-input/>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-text>瀹㈡埛鎵规锛�</el-text>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-text/>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-text>鑱旂郴浜猴細</el-text>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-input/>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-text>鑱旂郴鐢佃瘽锛�</el-text>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-input/>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-text>閫佽揣鍦板潃锛�</el-text>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-input/>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col class="elcolStyle" :span="2">
+ <el-text>鍏朵粬閲戦锛�</el-text>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-text/>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-text>鍏朵粬閲戦澶囨敞锛�</el-text>
+ </el-col>
+ <el-col class="elcolStyle" :span="2">
+ <el-text/>
+ </el-col>
+
+ </el-row>
+ </div>
+ </el-form>
+
+ <br/>
+ <div>鍒涘缓琛ㄥご绫讳簩</div>
+ <!-- 鍒涘缓琛ㄥご妯℃嫙鏍峰紡浜�-->
+ <!-- <el-form label-width="80px" :inline="true" :model="formInline2" class="demo-form-inline">-->
+ <div class="header2">
+ <el-row :gutter="10" style="height: 35px">
+ <el-col :span="4">
+ <el-form-item label="椤圭洰鍚嶇О" class="item-style">
+ <el-input></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="瀹㈡埛閫夋嫨" class="item-style" prop="name">
+ <el-select v-model="cgBuMen" class="m-2" placeholder="閫夋嫨閲囪喘閮ㄩ棬" clearable>
+ <el-option
+ v-for="item in CGBuMenOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="璁㈠崟绫诲瀷" class="item-style">
+ <el-cascader
+ placeholder="璁㈠崟绫诲瀷"
+ :options="buyerOptions"
+ filterable
+ clearable
+ empty-text="empty-text"
+ :v-model="form.supplier"
+ >
+ </el-cascader>
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="璁㈠崟鍒嗙被" class="item-style">
+ <el-select v-model="form.buyer" class="m-2" placeholder="璁㈠崟鍒嗙被" clearable>
+ <el-option
+ v-for="item in BuyerOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="鍟嗗搧閫夐」" class="item-style">
+ <el-select v-model="form.buyer" class="m-2" placeholder="鍟嗗搧閫夐」" clearable>
+ <el-option
+ v-for="item in BuyerOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="鍖呰鏂瑰紡" class="item-style">
+ <el-select v-model="form.buyer" class="m-2" placeholder="鍖呰鏂瑰紡" clearable>
+ <el-option
+ v-for="item in BuyerOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="10" style="height: 35px">
+ <el-col :span="4">
+ <el-form-item label="閿�鍞崟鍙�" class="item-style">
+ <el-input></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="浜よ揣鏃ユ湡" class="item-style">
+ <el-date-picker
+ type="week"
+ format="[Week] ww"
+ placeholder="閫夋嫨鏃ユ湡" style="width: 100%"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="璁㈠崟鎵规" class="item-style">
+ <el-input></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="璁＄畻鏂瑰紡" class="item-style">
+ <el-select v-model="form.buyer" class="m-2" placeholder="璁＄畻鏂瑰紡" clearable>
+ <el-option
+ v-for="item in BuyerOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="涓氬姟鍛�" class="item-style">
+ <el-select v-model="form.buyer" class="m-2" placeholder="涓氬姟鍛�" clearable>
+ <el-option
+ v-for="item in BuyerOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="閾濇潯鏂瑰紡" class="item-style">
+ <el-select v-model="form.buyer" class="m-2" placeholder="閾濇潯鏂瑰紡" clearable>
+ <el-option
+ v-for="item in BuyerOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="10" style="height: 35px">
+ <el-col :span="4">
+ <el-form-item label="鎬婚噾棰�" class="item-style">
+ <el-input></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="鍚堝悓缂栧彿" class="item-style">
+ <el-input></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="瀹㈡埛鎵规" class="item-style">
+ <el-input></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="鑱旂郴浜�" class="item-style">
+ <el-input></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="鑱旂郴鐢佃瘽" class="item-style">
+ <el-input></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="閫佽揣鍦板潃" class="item-style">
+ <el-input></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="10" style="height: 35px">
+ <el-col :span="4">
+ <el-form-item label="鍏朵粬閲戦" class="item-style">
+ <el-input></el-input>
+ </el-form-item>
+ </el-col>
+ <!-- <el-col :span="4">
+ <span>鍏朵粬閲戦澶囨敞</span>
+ <el-input ></el-input>
+ </el-col>-->
+ <el-col :span="4">
+ <el-form-item label="鍏朵粬閲戦澶囨敞" class="item-style">
+ <el-input></el-input>
+ </el-form-item>
+ </el-col>
+
+ </el-row>
+
+ </div>
+ <!-- </el-form>-->
+
+ <!-- 鍒涘缓琛ㄥご妯℃嫙鏍峰紡涓�-->
+ <br/>
+ <div>鍒涘缓琛ㄥご绫讳笁</div>
+ <!-- <el-form label-width="100px" :inline="true" :model="formInline3" class="demo-form-inline">-->
+ <el-descriptions
+ class="margin-top"
+ title=""
+ :column="6"
+ :size="'small'"
+ border
+ >
+
+ <el-descriptions-item>
+ <template #label>
+ <span style="color:red">*</span>
+ 椤圭洰鍚嶇О
+ </template>
+ <el-input></el-input>
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template #label>
+ <span style="color:red">*</span>
+ 瀹㈡埛閫夋嫨
+ </template>
+ <el-select></el-select>
+
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template #label>
+ <span style="color:red">*</span>
+ 璁㈠崟绫诲瀷
+ </template>
+ <el-select></el-select>
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template #label>
+ <span style="color:red">*</span>
+ 璁㈠崟鍒嗙被
+ </template>
+ <el-select></el-select>
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template #label>
+ <span style="color:red">*</span>
+ 鍟嗘爣閫夐」
+ </template>
+ <el-select></el-select>
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template #label>
+ <span style="color:red">*</span>
+ 鍖呰鏂瑰紡
+ </template>
+ <el-select></el-select>
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template #label>
+ <span style="color:red">*</span>
+ 閿�鍞崟鍙�
+ </template>
+ <el-input></el-input>
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template #label>
+ <span style="color:red">*</span>
+ 浜よ揣鏃ユ湡
+ </template>
+ <el-date-picker
+ type="week"
+ format="[Week] ww"
+ placeholder="閫夋嫨鏃ユ湡" style="width: 100%"/>
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template #label>
+ <span style="color:red">*</span>
+ 鎵规
+ </template>
+ <el-input></el-input>
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template #label>
+ <span style="color:red">*</span>
+ 璁＄畻鏂瑰紡
+ </template>
+ <el-select></el-select>
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template #label>
+ <span style="color:red">*</span>
+ 涓氬姟鍛�
+ </template>
+ <el-select></el-select>
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template #label>
+ 閾濇潯鏂瑰紡
+ </template>
+ <el-select></el-select>
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template #label>
+ 鎬婚噾棰�
+ </template>
+ <el-input></el-input>
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template #label>
+ 鍚堝悓缂栧彿
+ </template>
+ <el-input></el-input>
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template #label>
+ 瀹㈡埛鎵规
+ </template>
+ <el-input></el-input>
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template #label>
+ 鑱旂郴浜�
+ </template>
+ <el-input></el-input>
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template #label>
+ 鑱旂郴鐢佃瘽
+ </template>
+ <el-input></el-input>
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template #label>
+ 閫佽揣鍦板潃
+ </template>
+ <el-input></el-input>
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template #label>
+
+ 鍏朵粬閲戦
+ </template>
+ <el-input></el-input>
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template #label>
+ 鍏朵粬閲戦澶囨敞
+ </template>
+ <el-input />
+ </el-descriptions-item>
+
+ <el-descriptions-item></el-descriptions-item>
+<!-- <el-descriptions-item></el-descriptions-item>
+ <el-descriptions-item></el-descriptions-item>
+ <el-descriptions-item></el-descriptions-item>
+ <el-descriptions-item></el-descriptions-item>-->
+ </el-descriptions>
+
+ <!-- </el-form>-->
+ </el-main>
+
+</template>
+
+<script setup>
+import {ref, reactive} from 'vue'
+
+let router = useRouter()
+
+
+const openAlert = (options) => {
+ if (options.type === 'message') {
+ VXETable.modal.message(options)
+ } else {
+ VXETable.modal.alert(options)
+ }
+
+}
+
+
+const form = reactive({
+ name: '',
+ region: '',
+ date: '',
+ delivery: false,
+ type: [],
+ resource: '',
+ desc: '',
+ supplier: '',
+ buyer: '',
+ buyItem: '',
+ buyType: ''
+
+})
+
+const onSubmit = () => {
+ console.log('submit!')
+}
+
+//渚涘簲鍟�
+const buyerOptions = [
+ {value: '0', label: '渚涘簲鍟�1'},
+ {value: '1', label: '渚涘簲鍟�2'},
+ {value: '2', label: '渚涘簲鍟�3'},
+ {value: '3', label: '渚涘簲鍟�4'},
+ {value: '4', label: '渚涘簲鍟�5'},
+ {value: '5', label: '渚涘簲鍟�6'},
+]
+
+
+const value = ref('')
+const cgBuMen = ref('')
+
+//閲囪喘绫诲瀷
+const CGTypeOptions = [
+ {
+ value: '1',
+ label: '鏍囧噯绫诲瀷',
+ },
+ {
+ value: '2',
+ label: '闈炴爣鍑嗙被鍨�',
+ },
+ {
+ value: '3',
+ label: '杩藉姞閲囪喘',
+ },
+
+]
+
+//閲囪喘閮ㄩ棬
+const CGBuMenOptions = [
+ {
+ value: '0',
+ label: '閲囪喘鍗庡寳閮�',
+ },
+ {
+ value: '1',
+ label: '閲囪喘涓滃崡閮�',
+ },
+ {
+ value: '2',
+ label: '閲囪喘瑗垮寳閮�',
+ },
+ {
+ value: '3',
+ label: '閲囪喘涓師閮�',
+ },
+ {
+ value: '4',
+ label: '閲囪喘澶栧浗閮�',
+ },
+
+]
+
+//閲囪喘浜�
+const BuyerOptions = [
+ {
+ value: '0',
+ label: '閲囪喘鍛�1',
+ },
+ {
+ value: '1',
+ label: '閲囪喘鍛�2',
+ },
+ {
+ value: '2',
+ label: '閲囪喘鍛�3',
+ },
+ {
+ value: '3',
+ label: '閲囪喘鍛�4',
+ },
+ {
+ value: '4',
+ label: '閲囪喘鍛�5',
+ },
+
+]
+
+import dayjs from 'dayjs'
+import {VXETable} from "vxe-table";
+import {useRouter} from "vue-router";
+import {User} from "@element-plus/icons-vue";
+
+const now = new Date()
+
+const tableData = ref([
+ {
+ wlcode: '202312205101',
+ wlname: '杩欐槸涓�涓墿鏂欏悕绉�',
+ cd: '浜у湴12',
+ hd: '8',
+ gd: '2440',
+ kd: '3660',
+ xh: 'CN10P'
+ },
+ {
+ wlcode: '202312305101',
+ wlname: '杩欐槸涓�涓墿鏂欏悕绉�',
+ cd: '浜у湴1',
+ gd: '2440',
+ kd: '3660',
+ hd: '5',
+ xh: 'CN10P'
+ },
+ {
+ wlcode: '202312405101',
+ wlname: '杩欐槸涓�涓墿鏂欏悕绉�',
+ cd: '浜у湴13',
+ hd: '12',
+ gd: '2440',
+ kd: '3660',
+ xh: 'CN10P'
+ },
+])
+
+
+const onAddItem = () => {
+ now.setDate(now.getDate() + 1)
+ tableData.value.push({
+ wlcode: dayjs(now).format('YYYYMMDDss') + '01',
+ wlname: '杩欐槸涓�涓墿鏂欏悕绉�',
+ cd: '浜у湴1',
+ hd: '6',
+ xh: 'CN10P',
+ gd: '2440',
+ kd: '3660',
+ })
+}
+
+
+</script>
+
+
+<style scoped>
+.custom-header {
+ .el-checkbox {
+ display: flex;
+ height: unset;
+ }
+}
+
+.item-style {
+ width: 92%;
+}
+
+
+.main-div {
+ width: 100%;
+ height: 100%;
+ text-align: center;
+}
+
+/*.el-col{
+ border: #181818 1px solid;
+}*/
+
+.elcolStyle {
+ border: #181818 1px solid;
+}
+
+header2 :deep(.el-col) {
+ padding: 0;
+ margin: 0;
+//height: 35px; color: red;
+
+}
+
+order-primary :deep(.el-input__wrapper) {
+ box-shadow: 0 0 0 0 var(--el-input-border-color, var(--el-border-color)) inset;
+ cursor: default;
+ border: none !important;
+ background-color: transparent;
+}
+
+.order-primary {
+ width: 100%;
+}
+
+.order-detail {
+ width: 100%;
+ height: 80%;
+}
+
+/*.cell-item {
+ display: flex;
+ align-items: center;
+}*/
+
+:deep(.el-descriptions__label) {
+ width: 90px;
+ text-align: center;
+}
+</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/PurchaseOrder.vue b/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/PurchaseOrder.vue
index 470db4c..dceff81 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/PurchaseOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/PurchaseOrder.vue
@@ -1,28 +1,33 @@
<template>
<div class="common-layout">
- <el-container>
+ <el-container>
<el-header style="height: 30px">
- <el-breadcrumb :separator-icon="ArrowRight" >
-<!-- <el-breadcrumb-item>閲囪喘涓庣墿璧�</el-breadcrumb-item>
- <el-breadcrumb-item>閲囪喘璁㈠崟
- </el-breadcrumb-item>-->
- <el-breadcrumb-item :to="{path:'/main/purchaseOrder/SelectPurchaseOrder'}">鏌ヨ閲囪喘璁㈠崟
+ <el-breadcrumb :separator-icon="ArrowRight">
+ <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''"
+ :to="{path:'/main/purchaseOrder/SelectPurchaseOrder'}">鏌ヨ閲囪喘璁㈠崟
</el-breadcrumb-item>
- <el-breadcrumb-item :to="{path:'/main/purchaseOrder/CreatePurchaseOrder'}">鍒涘缓閲囪喘璁㈠崟
+ <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''"
+ :to="{path:'/main/purchaseOrder/CreatePurchaseOrder'}">鍒涘缓閲囪喘璁㈠崟
</el-breadcrumb-item>
- <el-breadcrumb-item :to="{path:'/main/purchaseOrder/StoragePurchaseOrder'}">閲囪喘鍏ュ簱
+ <el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''"
+ :to="{path:'/main/purchaseOrder/StoragePurchaseOrder'}">閲囪喘鍏ュ簱
</el-breadcrumb-item>
- <el-breadcrumb-item :to="{path:'/main/purchaseOrder/ReturnPurchaseOrder'}">閲囪喘閫�璐�
+ <el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''"
+ :to="{path:'/main/purchaseOrder/ReturnPurchaseOrder'}">閲囪喘閫�璐�
</el-breadcrumb-item>
- <el-breadcrumb-item :to="{path:'/main/purchaseOrder/PaymentPurchaseOrder'}">搴斾粯閲囪喘璁㈠崟
+ <el-breadcrumb-item @click="changeRouter(5)" :class="indexFlag===5?'indexTag':''"
+ :to="{path:'/main/purchaseOrder/PaymentPurchaseOrder'}">搴斾粯閲囪喘璁㈠崟
+ </el-breadcrumb-item>
+ <el-breadcrumb-item @click="changeRouter(6)" :class="indexFlag===6?'indexTag':''"
+ :to="{path:'/main/purchaseOrder/CreateHeader'}">鍒涘缓澶存ā鎷�
</el-breadcrumb-item>
<el-breadcrumb-item style="display: none"></el-breadcrumb-item>
</el-breadcrumb>
</el-header>
<el-main style="padding: 0">
-<router-view/>
+ <router-view/>
</el-main>
-<!-- <el-footer>Footer</el-footer>-->
+ <!-- <el-footer>Footer</el-footer>-->
</el-container>
@@ -34,9 +39,19 @@
<script setup>
import {nextTick, ref} from 'vue'
import {ArrowRight, Search} from "@element-plus/icons-vue";
+
+let indexFlag = $ref(1)
+
+function changeRouter(index) {
+ indexFlag = index
+}
+
</script>
<style scoped>
-
+:deep(.indexTag .el-breadcrumb__inner) {
+ color: #5CADFE !important;
+ font-weight: 900;
+}
</style>
\ No newline at end of file
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 8e9c01e..8b95252 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,6 +37,7 @@
ref="xGrid"
v-bind="gridOptions"
v-on="gridEvents"
+ @cell-click="cellClickEvent"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -68,22 +69,46 @@
</vxe-grid>
- <vxe-modal v-model="showDetails" title="鏌ョ湅璇︽儏" width="600" height="400" :mask="false" :lock-view="false" resize>
- <template #default>
- <vxe-table
- border="inner"
- auto-resize
- show-overflow
- height="auto"
- :row-config="{isHover: true}"
- :show-header="false"
- :sync-resize="showDetails"
- :data="detailData">
- <vxe-column field="label" width="40%"></vxe-column>
- <vxe-column field="value"></vxe-column>
- </vxe-table>
- </template>
+ <!-- 璇︽儏妗� 閮ㄥ垎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-main>
+ <template #default>
+ <vxe-table
+ border="inner"
+ auto-resize
+ show-overflow
+ max-height="420"
+ :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>
@@ -323,14 +348,66 @@
})
-/*const showDetails = ref(false)
-const detailData = ref([])
-const cellClickEvent = ({ row }) => {
- detailData.value = ['閲囪喘鍗曞彿', 'wlbh', 'wlmc', 'gys', 'h', 'k', 'g'].map(field => {
- return { label: field, value: row[field] }
+//璇︽儏妗� 閮ㄥ垎2
+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
-}*/
+ showDetails.value = true;
+}
+
+const ModelColumnContent = (text) => {
+ switch (text) {
+ case 'cgdh':
+ return "閲囪喘鍗曞彿";
+ case 'thdh':
+ return "閫�璐у崟鍙�";
+ case 'h':
+ return "鍘�";
+ case 'xh':
+ return "鍨嬪彿";
+ case 'wlbh':
+ return "鐗╂枡缂栫爜";
+ case 'wlmc':
+ return "鐗╂枡鍚嶇О";
+ case 'gys':
+ return "渚涘簲鍟�";
+ case 'w':
+ return "瀹�";
+ case 'g':
+ return "楂�";
+ case 'dw':
+ return "鍗曚綅";
+ case 'cgzt':
+ return "閲囪喘鐘舵��";
+ case 'rq':
+ return "鏃ユ湡";
+ case 'yl':
+ return "浣欓噺";
+ case 'sl':
+ return "鏁伴噺";
+ case 'xsdh':
+ return "閿�鍞崟鍙�";
+ case 'je':
+ return "閲戦";
+ case '6':
+ return "鍏朵粬";
+
+ default:
+ return text;
+
+ }
+
+}
+
+const SureReturn=()=>{
+
+ const type = VXETable.modal.confirm('鏄惁纭閫�璐э紵');
+}
+
+//璇︽儏妗� 閮ㄥ垎2 缁撴潫
const now = new Date()
@@ -371,5 +448,7 @@
<style scoped>
-
+:deep(.v-column-label div span){
+ font-weight: bold;
+}
</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 ffe36de..c8b5979 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
@@ -11,7 +11,7 @@
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
:shortcuts="shortcuts"
- :size="size"
+
format="YYYY/MM/DD"
value-format="YYYY-MM-DD"
/>
@@ -26,7 +26,12 @@
@click="BtnSearchPurchaseOrder">鏌ヨ
</el-button>
</el-col>
+
</el-row>
+
+
+
+
</el-header>
<el-main style="padding-top: 5px;height:100%">
<vxe-grid
@@ -37,6 +42,8 @@
ref="xGrid"
v-bind="gridOptions"
v-on="gridEvents"
+
+ @cell-click ="cellClickEvent"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -53,6 +60,7 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
<el-button @click="getTableRow(row,'edit')" link type="primary" size="small">缂栬緫</el-button>
+ <el-button @click="getTableRow(row,'look')" link type="primary" size="small">鏌ョ湅</el-button>
<!-- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>-->
<!-- <el-button @click="cellClickEvent" link type="primary" size="small">璇︽儏</el-button>-->
</template>
@@ -67,27 +75,53 @@
</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-header>-->
+ <el-main>
+ <template #default>
+ <vxe-table
+ border="inner"
+ auto-resize
+ show-overflow
+ max-height="420"
+ :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="SureStorage"
+ >纭鍏ュ簱
+ </el-button>
+ </el-col>
- <vxe-modal v-model="showDetails" title="鏌ョ湅璇︽儏" width="600" height="400" :mask="false" :lock-view="false" resize>
- <template #default>
- <vxe-table
- border="inner"
- auto-resize
- show-overflow
- height="auto"
- :row-config="{isHover: true}"
- :show-header="false"
- :sync-resize="showDetails"
- :data="detailData">
- <vxe-column field="label" width="40%"></vxe-column>
- <vxe-column field="value"></vxe-column>
- </vxe-table>
- </template>
+ </el-row>
+ </el-footer>
+ </el-container>
</vxe-modal>
+ <!-- 璇︽儏妗� 閮ㄥ垎1 缁撴潫-->
</el-main>
</el-container>
+
+
+
+
</template>
@@ -98,19 +132,26 @@
import {Search} from "@element-plus/icons-vue";
import dayjs from "dayjs";
import {VXETable} from "vxe-table";
-
let router = useRouter()
+
+
+
const getTableRow = (row, type) => {
switch (type) {
case 'edit' : {
//alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/purchaseOrder/CreatePurchaseOrder', query: {id: row.id}})
+ router.push({path: '/main/purchaseOrder/CreatePurchaseOrder', query: {id: row.id}});
+
break
}
+ case 'look':{
+ /*this.detailData = ['name', 'nickname', 'role', 'sex', 'age', 'amount', 'address'].map(field => {
+ return { label: field, value: row[field] }
+ })*/
+ //this.showDetails = true
+break
+ }
case 'delete': {
-
-
-
alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅'+row.id)
break
}
@@ -232,6 +273,7 @@
exportConfig: {},
scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
showOverflow: true,
+ //showDetails: false,//寮圭獥 鏄惁鏄剧ず
columnConfig: {
resizable: true,
useKey: true
@@ -318,15 +360,68 @@
})
-/*const showDetails = ref(false)
-const detailData = ref([])
-const cellClickEvent = ({ row }) => {
- detailData.value = ['閲囪喘鍗曞彿', 'wlbh', 'wlmc', 'gys', 'h', 'k', 'g'].map(field => {
- return { label: field, value: row[field] }
- })
- showDetails.value = true
-}*/
+
+//璇︽儏妗� 閮ㄥ垎2
+const showDetails =ref(false);
+let detailData =[];
+const cellClickEvent = ({row}) => {
+ 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;
+}
+
+const ModelColumnContent = (text) => {
+ switch (text) {
+ case 'cgdh':
+ return "閲囪喘鍗曞彿";
+ case 'rkdh':
+ return "鍏ュ簱鍗曞彿";
+ case 'h':
+ return "鍘�";
+ case 'xh':
+ return "鍨嬪彿";
+ case 'wlbh':
+ return "鐗╂枡缂栫爜";
+ case 'wlmc':
+ return "鐗╂枡鍚嶇О";
+ case 'gys':
+ return "渚涘簲鍟�";
+ case 'w':
+ return "瀹�";
+ case 'g':
+ return "楂�";
+ case 'dw':
+ return "鍗曚綅";
+ case 'cgzt':
+ return "閲囪喘鐘舵��";
+ case 'rq':
+ return "鏃ユ湡";
+ case 'yl':
+ return "浣欓噺";
+ case 'sl':
+ return "鏁伴噺";
+ case 'xsdh':
+ return "閿�鍞崟鍙�";
+ case 'je':
+ return "閲戦";
+ case '6':
+ return "鍏朵粬";
+
+ default:
+ return text;
+
+ }
+
+}
+//璇︽儏妗� 閮ㄥ垎2 缁撴潫
+
+const SureStorage=()=>{
+
+ openAlert({type: 'alert', content: '纭鍏ュ簱鎴愬姛', status: 'success'})
+
+}
const now = new Date()
@@ -366,5 +461,11 @@
<style scoped>
+:deep(.v-column-label div span){
+ font-weight: bold;
+}
+
+
+
</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/mm/stockReport/StockReport.vue b/north-glass-erp/northglass-erp/src/views/mm/stockReport/StockReport.vue
index 631737d..845b896 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/stockReport/StockReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/stockReport/StockReport.vue
@@ -3,16 +3,17 @@
<el-container>
<el-header style="height: 30px">
<el-breadcrumb :separator-icon="ArrowRight">
-<!-- <el-breadcrumb-item>閲囪喘涓庣墿璧�</el-breadcrumb-item>
- <el-breadcrumb-item>浠撳偍鎶ヨ〃
- </el-breadcrumb-item>-->
- <el-breadcrumb-item :to="{path:'/main/stockReport/WarehouseReport'}">鍘熸潗鏂欐姤琛�
+ <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''"
+ :to="{path:'/main/stockReport/WarehouseReport'}">鍘熸潗鏂欐姤琛�
</el-breadcrumb-item>
- <el-breadcrumb-item :to="{path:'/main/stockReport/StockWarehouseReport'}">鎴愬搧鎶ヨ〃
+ <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''"
+ :to="{path:'/main/stockReport/StockWarehouseReport'}">鎴愬搧鎶ヨ〃
</el-breadcrumb-item>
- <el-breadcrumb-item :to="{path:'/main/stockReport/StockMonthReport'}">鍘熺墖鏈堢粨
+ <el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''"
+ :to="{path:'/main/stockReport/StockMonthReport'}">鍘熺墖鏈堢粨
</el-breadcrumb-item>
- <el-breadcrumb-item :to="{path:'/main/stockReport/SubsidiaryMonthReport'}">
+ <el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''"
+ :to="{path:'/main/stockReport/SubsidiaryMonthReport'}">
杈呮枡鏈堢粨
</el-breadcrumb-item>
<el-breadcrumb-item style="display: none"></el-breadcrumb-item>
@@ -26,19 +27,23 @@
</div>
</template>
+
<script setup>
+import {nextTick, ref} from 'vue'
+import {ArrowRight, Search} from "@element-plus/icons-vue";
-import {ArrowRight} from "@element-plus/icons-vue";
+let indexFlag = $ref(1)
-import {useRouter} from "vue-router";
+function changeRouter(index) {
+ indexFlag = index
+}
-const router = useRouter();
</script>
<style scoped>
-.ei-1 {
- font-weight: 500;
+:deep(.indexTag .el-breadcrumb__inner) {
+ color: #5CADFE !important;
+ font-weight: 900;
}
-
</style>
\ No newline at end of file
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 11774ea..0a4c51b 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
@@ -4,6 +4,7 @@
<el-header class="m-header" style="height: auto">
</el-header>
+
<el-main style="padding-top: 5px">
<vxe-grid
max-height="600"
@@ -111,10 +112,12 @@
showStatus: true
},
columns: [
+
+ {type: 'expand', title:'', fixed: "left", slots: {content: 'content'}, width: 50},/* 璇︽儏 */
/* {title: '鎿嶄綔', width: '8%', slots: {default: 'button_slot'}, fixed: "left"},*/
{type: 'seq', fixed: "left", title: ' ', width: 50},
/*{ type: 'checkbox',fixed:"left", title: '', width: 50 },*/
- {type: 'expand', title:'璇︽儏', fixed: "left", slots: {content: 'content'}, 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},
--
Gitblit v1.8.0