From 400150d4499e3a27be10c7b5ca1f76b5ab37ccff Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 12 四月 2024 15:45:03 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/mm/stockReport/WarehouseReport.vue | 408 ++++-----------------------------------------------------
1 files changed, 33 insertions(+), 375 deletions(-)
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 9db690a..a7ed662 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
@@ -1,387 +1,45 @@
-<template>
- <div style="padding: 0;width: 100%;height: 100%">
-
- <el-header class="m-header" style="height: auto">
-
- </el-header>
-
- <el-main style="padding-top: 5px">
- <vxe-grid
- max-height="600"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
- ref="xGrid"
- v-bind="gridOptions"
- v-on="gridEvents"
- @cell-dblclick="cellClickEvent"
- >
-
- <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
- <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row}">
- <ul class="expand-wrapper">
- <li v-for="(item,key,index) in row">
- <span style="font-weight: bold">{{ key + ': ' }}</span>
- <span>{{ item }}</span>
- </li>
- </ul>
- </template>
-
- <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" 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>
-
-
- <template #num1_filter="{ column, $panel }">
- <div>
- <div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
- </div>
- </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>
-
-
<script setup>
-import {ref} from 'vue'
-import {reactive} from "vue";
-import {useRouter} from 'vue-router'
-import {Search} from "@element-plus/icons-vue";
-import dayjs from "dayjs";
-import {VXETable} from "vxe-table";
-let router = useRouter()
-const list = (i) => {
- return {
- 'kczz':'浜哄伐搴�',
- 'wlbm':'NGWL202312000'+i,
- 'wlmc':'杩欐槸鐗╂枡鍚嶇О',
- 'cd':'鍦扮悆鏉�',
- 'kcbh':'KC202300'+i,
- 'w':'0',
- 'g':'0',
- 'h':'0',
- 'zdw':'浠�',
- 'aqkc':'0',
- 'kcs':'20',
- 'kykc':'30',
- 'wlsl':'20',
- 'zmj':'0',
- 'dpmj':'0',
- 'scrq':'2023-12-20',
- 'bzq':'2025-12-20',
- 'kq':'2000',
- 'kw':'23',
- 'jykc':'5',
- 'bz':'杩欐槸澶囨敞*10086'
- }
-}
+import BasicTable from "@/components/BasicTable.vue"
+import request from "@/utils/request"
+import { ref} from "vue"
+import { useI18n } from 'vue-i18n'
-//缁勪欢鎺ユ敹鍙傛暟
-const gridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
- keepSource: true,//淇濇寔婧愭暟鎹�
- align: 'center',//鏂囧瓧灞呬腑
- stripe: true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true, height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
- showFooter: true,//鏄剧ず鑴�
- printConfig: {},
- importConfig: {},
- exportConfig: {},
- scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
- showOverflow: true,
- columnConfig: {
- resizable: true,
- useKey: true
- },
- filterConfig: { //绛涢�夐厤缃」
- remote: true
- },
- customConfig: {
- storage: true
- },
- editConfig: {
- trigger: 'click',
- mode: 'row',
- showStatus: true
- },
- columns: [
+//璇█鑾峰彇
+const { t } = useI18n()
- {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 },*/
- {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},
- {field: 'cd', width: '10%',title: '浜у湴', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'kcbh', width: '10%', title: '搴撳瓨缂栧彿', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'w', width: '8%',title: '瀹藉害', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'g', width: '8%',title: '楂樺害', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'h', width: '8%',title: '鍘氬害', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'zdw', width: '8%',title: '涓诲崟浣�', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'aqkc', width: '8%',title: '瀹夊叏搴撳瓨', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'kcs', width: '12%',title: '搴撳瓨鏁�', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'kykc', width: '8%',title: '鍙敤搴撳瓨', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'wlsl', width: '12%',title: '鏈鏁伴噺', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'zmj', width: '8%',title: '鎬婚潰绉�', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'dpmj', width: '12%',title: '鍗曠墖闈㈢Н', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'scrq', width: '8%',title: '鐢熶骇鏃ユ湡', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'bzq', width: '8%',title: '淇濊川鏈�', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- /*{field: 'kcbh', width: '10%',title: '搴撳瓨缂栧彿', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},*/
- {field: 'kq', width: '10%',title: '搴撳尯', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'kw', width: '10%',title: '搴撲綅', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'jykc', width: '10%',title: '绉帇搴撳瓨', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'bz', width: '10%',title: '澶囨敞', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true}
- ],//琛ㄥご鍙傛暟
- toolbarConfig: {
- buttons: [{type:'text'},{
- 'name': '鍏ュ簱璁板綍',
- 'code': 'StorageRecord',
- }],
- import: false,
- export: true,
- print: true,
- zoom: true,
- custom: true,
- style: 'paddling-left:10px'
- },//琛ㄥご鎸夐挳
- data: [
- list(0),list(1),list(2),list(3),list(4),list(5),list(6),list(7),list(8),list(9),
+const childrenData = ref({
+ columns:[
+ {type: 'seq',fixed:"left", title: t('basicData.Number'), width: '80' },
+ {field: 'operationOrderNumber', width:'150', title: t('productStock.operationOrderNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'orderId', width: '150',title: t('order.orderId'),showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'operationNumber', width: '100',title: t('order.OrderNum'), showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'operateType', width: '120',title:'绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'quantity', width: '140',title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'orderDetail.productId',width: '100', title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'orderDetail.productName',width: '140', title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'orderDetail.width', width: '100',title: t('order.width'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'orderDetail.height',width: '100', title: t('order.height'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'staterOperationOrderNumber', width: '150',title: '璋冩嫧閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'endOperationOrderNumber', width: '100',title: '璋冩嫧搴忓彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'operator', width: '100',title: t('productStock.creator'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'operateTime', width:'140', title: t('productStock.productionDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'reviewed', width: '100',title: t('productStock.reviewed'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'reviewedTime', width: '140',title: t('productStock.approvedDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'remarks', width: '140',title: t('productStock.remarks'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- ],//table body瀹為檯鏁版嵁
- mergeFooterItems: [
- {row: 0, col: 0, rowspan: 1, colspan: 2}
- ],//鍚堝苟鑴�
- footerMethod({columns, data}) {//椤佃剼鍑芥暟
- return [
- columns.map((column, columnIndex) => {
- if (columnIndex === 0) {
- return '鍚堣:'
- }
- /* if (props.tableProp.footList.includes(column.field)) {
- return sumNum(data, column.field)
- }*/
- return ''
- })
- ]
- },
+ ],//琛ㄦ牸琛ㄥご瀛楁
+ data:[],//琛ㄦ牸鏁版嵁
+ url :'/FinishedGoodsInventory/getSelectFinishedOperateLogReport',
+ footList:['quantity']
})
-
-
-//鍒楄〃鎿嶄綔
-const getTableRow = (row, type) => {
- switch (type) {
- case 'edit' : {
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/purchaseOrder/CreatePurchaseOrder', query: {id: row.id}})
- break
- }
- case 'delete': {
-
-
-
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅'+row.id)
- break
- }
- }
-}
-
-const xGrid = ref()
-const gridEvents = {
- toolbarButtonClick({code}) {
- const $grid = xGrid.value
- if ($grid) {
- switch (code) {
- case 'ProductStockList': {//鏂板
- router.push({path: '/main/productStock/ProductStockList'})
- break
- }
- case 'StorageRecord': {//鍏ュ簱
- if ($grid.getCheckboxRecords().length === 0) {
- openAlert({type: 'alert', content: '鎮ㄧ偣鍑讳簡鏌ョ湅鍏ュ簱璁板綍', status: 'success'})
- //VXETable.modal.message( '璇烽�夋嫨涓�鏉℃暟鎹紒')
- return
- } else {
- const type = VXETable.modal.confirm('鎮ㄩ�夋嫨浜�' + $grid.getCheckboxRecords().length + '鏉℃暟鎹紒,鏄惁纭鍏ュ簱锛�');
- //openAlert({type:'alert', content: '鎴愬姛鍏ュ簱'+$grid.getCheckboxRecords().length+'鏉℃暟鎹紒', status: 'success' })
- //VXETable.modal.message( '璇烽�夋嫨涓�鏉℃暟鎹紒')
- return
- }
- break
- }
- case 'Return': {//閫�搴�
- if ($grid.getCheckboxRecords().length === 0) {
- openAlert({type: 'message', content: '璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�', status: 'warning'})
- //VXETable.modal.message( '璇烽�夋嫨涓�鏉℃暟鎹紒')
- return
- } else {
- const type = VXETable.modal.confirm('鎮ㄩ�夋嫨浜�' + $grid.getCheckboxRecords().length + '鏉℃暟鎹紒,鏄惁纭閫�搴擄紵');
-
- return
- }
- break
- }
- }
- }
- },
- toolbarToolClick({code}) {
- const $grid = xGrid.value
- if ($grid) {
- switch (code) {
- case 'myPrint': {
- $grid.print()
- break
- }
- }
- }
- },
-}
-
-
-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)
- }else{
- VXETable.modal.alert(options)
- }
-}
-
</script>
+<template>
+ <basic-table
+ :childrenData="childrenData"/>
+</template>
<style scoped>
-.el-row {
- margin-bottom: 20px;
-}
-
-.el-row:last-child {
- margin-bottom: 0;
-}
-
-.el-col {
- border-radius: 4px;
-}
-
-.m-header {
- height: 64px;
-}
</style>
\ No newline at end of file
--
Gitblit v1.8.0