From 328a2b06ffc095d45d36ac7ac0dc8a2907a3cab2 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期三, 03 四月 2024 16:41:10 +0800
Subject: [PATCH] 用户管理,权限管理页面
---
/dev/null | 207 -----------------------------------------
UI-Project/src/views/Returns/returns.vue | 3
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 2
UI-Project/src/router/index.js | 38 +++++--
4 files changed, 29 insertions(+), 221 deletions(-)
diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index 297bac1..8f8902c 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -22,18 +22,6 @@
children:[
- {
- path: 'Temperedlayout',
- name: 'Temperedlayout',
- component: () => import('../views/TL/Temperedlayout/Temperedlayout.vue'),
- children:[
- {
- path: 'selectLayout',
- name: 'selectLayout',
- component: () => import('../views/TL/Temperedlayout/SelectLayout.vue'),
- }
- ]
- },
/*----------- 涓婄墖鏈� ----------------*/
{
@@ -146,6 +134,32 @@
}
]
},
+ /*----------- 鐢ㄦ埛绠＄悊 ----------------*/
+ {
+ path: 'User',
+ name: 'userlist',
+ component: () => import('../views/User/userlist.vue'),
+ children:[
+ {
+ path: '/User/userlist',
+ name: 'userlist',
+ component: () => import('../views/User/userlist.vue')
+ },
+ ]
+ },
+ /*----------- 鏉冮檺绠＄悊 ----------------*/
+ {
+ path: 'Permissions',
+ name: 'permissionslist',
+ component: () => import('../views/Permissions/permissionslist.vue'),
+ children:[
+ {
+ path: '/Permissions/permissionslist',
+ name: 'permissionslist',
+ component: () => import('../views/Permissions/permissionslist.vue')
+ },
+ ]
+ },
{
path: '',
redirect:'/Slicecage/slicecage'
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index 11f2545..96323e9 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -66,7 +66,7 @@
<div style="margin-left: 150px;font-size: 20px;">鐗堝浘缂栧彿锛�1</div>
</div>
<div>
- <div id="boxa" style="width: 700px;height: 220px;margin-left: 260px;">
+ <div id="boxa" style="width: 700px;height: 220px;margin-left: 300px;">
<div style="margin-top: 85px;"> NG202405060798A01-1</div>
<div> 500脳1500</div>
</div>
diff --git a/UI-Project/src/views/Returns/CreateReturns.vue b/UI-Project/src/views/Returns/CreateReturns.vue
deleted file mode 100644
index 8e203da..0000000
--- a/UI-Project/src/views/Returns/CreateReturns.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<script setup>
-
-import {reactive} from "vue";
-
-
-
-const gridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
- keepSource: true,//淇濇寔婧愭暟鎹�
- align: 'center',//鏂囧瓧灞呬腑
- stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'OrderList',
- 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:[
- {type:'expand',slots: { content:'content' },width: 50,fixed:"left"},
- {type:'checkbox',title: '閫夊垯', width: 80,fixed:"left"},
- {type: 'seq', title: '鑷簭', width: 80 ,fixed:"left"},
- {field: '0',width:120, title: '鍙戣揣鍗曞彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '1',width:120, title: '鎵规',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '2',width:120, title: '鍙��鏁伴噺',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '3',width:120, title: '宸查��鏁伴噺',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '4',width:120, title: '鎬绘暟閲�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '5',width:120, title: '閫�璐ф暟閲�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '6',width:120, title: '妤煎彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '7',width:120, title: '浜у搧缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '8',width:120, title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '9',width:120, title: '鍗曚环',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '10',width:120, title: '搴撳尯',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '11',width:120, title: '閲戦',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '12',width:120, title: '瀹�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '13',width:120, title: '楂�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '14',width:120, title: '褰㈢姸',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '15',width:120, title: '鍗曠墖闈㈢Н',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '16',width:120, title: '鎬婚潰绉�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '17',width:120, title: '缁撶畻鍗曠墖闈㈢Н',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '18',width:120, title: '缁撶畻鎬婚潰绉�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '19',width:120, title: '鍔犲伐瑕佹眰',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '20',width:120, title: '澶囨敞',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '21',width:120, title: '纾ㄨ竟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '22',width:120, title: '鍛ㄩ暱',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-
-
- ],//琛ㄥご鎸夐挳
- toolbarConfig: {
- buttons: [
- {'code': 'add', 'name': '淇濆瓨',status: 'primary',icon: 'vxe-icon-save'}
- ],
- import: false,
- export: true,
- print: true,
- zoom: true,
- custom: true
- },
- data: [
- ],//table body瀹為檯鏁版嵁
- 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 ''
- })
- ]
- }
-
-})
-
-</script>
-
-<template>
- <div class="main-div">
- <div class="order-primary" style="background-color: white" >
- <el-row>
- <el-col :span="2"><el-text>瀹㈡埛缂栫爜:</el-text></el-col>
- <el-col :span="5"><el-text style="font-size: large;color: #181818">131</el-text></el-col>
- <el-col :span="2"><el-text>瀹㈡埛鍚嶇О:</el-text></el-col>
- <el-col :span="5"><el-text></el-text></el-col>
- <el-col :span="2"><el-text>椤圭洰鍚嶇О:</el-text></el-col>
- <el-col :span="5"><el-text></el-text></el-col>
- </el-row>
- <el-row>
- <el-col :span="2"><el-text>閫�璐ф柟寮�:</el-text></el-col>
- <el-col :span="5">
- <el-select clearable >
- <el-option/>
- </el-select>
- </el-col>
- <el-col :span="2"><el-text>閫�璐ф棩鏈�:</el-text></el-col>
- <el-col :span="5">
- <el-date-picker
- type="week"
- format="[Week] ww"
- placeholder="閫夋嫨鏃ユ湡"/>
- </el-col>
- <el-col :span="2"><el-text>澶囨敞:</el-text></el-col>
- <el-col :span="5"><el-text></el-text></el-col>
- </el-row>
- <el-row>
- <el-col :span="2"><el-text>涓氬姟鍛�:</el-text></el-col>
- <el-col :span="5"><el-text style="font-size: large;color: #181818"></el-text></el-col>
- <el-col :span="2"><el-text>鍙戣揣鍛�:</el-text></el-col>
- <el-col :span="5"><el-text style="font-size: large;color: #181818"></el-text></el-col>
- </el-row>
- </div>
- <div class="order-detail">
- <vxe-grid
- max-height="97%"
- class="mytable-scrollbar"
- ref="xGrid"
- v-bind="gridOptions"
-
- >
- <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>
- <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>
-
- </vxe-grid>
- </div>
- </div>
-
-</template>
-
-<style scoped>
-.main-div {
- width: 100%;
- height: 100%;
- text-align: center;
-}
-.el-col{
- border: #181818 1px solid;
-}
-: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: 70%;
-}
-</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/Returns/ReturnsReport.vue b/UI-Project/src/views/Returns/ReturnsReport.vue
deleted file mode 100644
index 883648d..0000000
--- a/UI-Project/src/views/Returns/ReturnsReport.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-<script setup>
-
-import {Folder, Search} from "@element-plus/icons-vue";
-import {reactive} from "vue";
-
-let titleList = [
- '搴忓彿',
- '閫�璐у崟鍙�',
- '鍙戣揣鍗曞彿',
- '璁㈠崟鍗曞彿',
- '椤圭洰鍚嶇О',
- '瀹㈡埛鍚嶇О',
- '涓氬姟鍛�',
- '閫佽揣鍦板潃',
- '鍙戣揣鍛�',
- '妤煎彿',
- '浜у搧缂栧彿',
- '浜у搧鍚嶇О',
- '閫�璐ф暟閲�',
- '鍛ㄩ暱',
- '瀹為檯闈㈢Н',
- '鍙戣揣闈㈢Н',
- '鍗曚环',
- '鍙戣揣閲戦',
- '瀹�',
- '楂�',
- '褰㈢姸',
- '纾ㄨ竟绫诲瀷',
- '澶囨敞',
- '鍔犲伐瑕佹眰',
- '寤虹珛鏃堕棿'
-
-
-
-
-]
-
-const gridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
- keepSource: true,//淇濇寔婧愭暟鎹�
- align: 'center',//鏂囧瓧灞呬腑
- stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'OrderList',
- 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:[
-
- {type:'expand',slots: { content:'content' },width: 50,fixed:"left"},
- {type: 'seq', title: '鑷簭', width: 80 ,fixed:"left"},
- {field: '0',width:120, title: '閫�璐у崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '1',width:120, title: '鍙戣揣鍗曞彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '2',width:120, title: '璁㈠崟鍗曞彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '3',width:120, title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '4',width:120, title: '瀹㈡埛鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '5',width:120, title: '涓氬姟鍛�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '6',width:120, title: '閫佽揣鍦板潃',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '7',width:120, title: '鍙戣揣鍛�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '8',width:120, title: '妤煎彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '9',width:120, title: '浜у搧缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '10',width:120, title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '11',width:120, title: '閫�璐ф暟閲�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '12',width:120, title: '鍛ㄩ暱',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '13',width:120, title: '瀹為檯闈㈢Н',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '14',width:120, title: '閫�璐ч潰绉�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '15',width:120, title: '鍗曚环',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '16',width:120, title: '閫�璐ч噾棰�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '17',width:120, title: '瀹�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '18',width:120, title: '楂�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '19',width:120, title: '褰㈢姸',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '20',width:120, title: '纾ㄨ竟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '21',width:120, title: '澶囨敞',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '22',width:120, title: '鍔犲伐瑕佹眰',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '22',width:120, title: '寤虹珛鏃堕棿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}
-
-
- ],//琛ㄥご鎸夐挳
- toolbarConfig: {
- buttons: [
- ],
- import: false,
- export: true,
- print: true,
- zoom: true,
- custom: true
- },
- data: [
- ],//table body瀹為檯鏁版嵁
- 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 ''
- })
- ]
- }
-
-})
-
-</script>
-
-<template>
- <div class="main-div">
- <el-date-picker
- v-model="value1"
- type="daterange"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿"
- />
- <el-button style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">鏌ヨ</el-button>
- <el-button style="margin-top: -5px" id="searchButton" type="primary" :icon="Folder">瀵煎嚭</el-button>
- <div class="order-detail">
- <vxe-grid
- max-height="97%"
- class="mytable-scrollbar"
- ref="xGrid"
- v-bind="gridOptions"
-
- >
- <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>
- <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>
-
- </vxe-grid>
- </div>
- </div>
-</template>
-
-<style scoped>
-.main-div {
- width: 100%;
- height: 100%;
-}
-.el-col{
- border: #181818 1px solid;
-}
-.order-primary{
- width: 100%;
-}
-.order-detail{
- width: 100%;
- height: 80%;
-}
-</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/Returns/SelectDeliveryList.vue b/UI-Project/src/views/Returns/SelectDeliveryList.vue
deleted file mode 100644
index f046fcd..0000000
--- a/UI-Project/src/views/Returns/SelectDeliveryList.vue
+++ /dev/null
@@ -1,205 +0,0 @@
-<script setup>
-import {Search} from "@element-plus/icons-vue"
-import {useRouter} from "vue-router"
-import {reactive, ref} from "vue";
-const router = useRouter()
-
-const getTableRow = (row,type) =>{
- switch (type) {
- case 'edit' :{
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/returns/createReturns', query: { deliveryID: 'JG24010101' }})
- break
- }
- case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
- }
-}
-const xGrid = ref()
-const gridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
- keepSource: true,//淇濇寔婧愭暟鎹�
- align: 'center',//鏂囧瓧灞呬腑
- stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'OrderList',
- 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:[
-
- {type:'expand',slots: { content:'content' },width: 50,fixed:"left"},
- {title: '鎿嶄綔',slots: { default: 'button_slot' }, width: 80,fixed:"left"},
- {type: 'seq', title: '鑷簭', width: 80 ,fixed:"left"},
-
- {title: '瀹℃牳', width: 40, slots: { default: 'state' }},
- {title: '鍑哄簱', width: 40, slots: { default: 'state' }},
-
- {field: '1',width:120, title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '2',width:120, title: '瀹㈡埛缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '3',width:120, title: '瀹㈡埛鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '4',width:120, title: '鎬绘暟閲�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '5',width:120, title: '鍙敤搴撳瓨',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '6',width:120, title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '7',width:120, title: '鎵规',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '8',width:120, title: '鎬婚噾棰�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '9',width:120, title: '缁撶畻鎬婚潰绉�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '10',width:120, title: '鎶ヨ〃鏃ユ湡',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '11',width:120, title: '鍖呰鏂瑰紡',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '12',width:120, title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '13',width:120, title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '14',width:120, title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}
-
-
- ],//琛ㄥご鎸夐挳
- toolbarConfig: {
- buttons: [
- ],
- import: false,
- export: true,
- print: true,
- zoom: true,
- custom: true
- },
- data: [
- {
- '0': '1',
- '1': 'NG23110102',
- '2': '11',
- '3': '涓缓',
- '4': '534',
- '5': '116',
- '6': '榛勭煶鏈夎建鐢佃溅',
- '7': '20鎵�',
- '8': '111100.02',
- '9': '1008.38',
- '10': '2023-10-30',
- '11': '鍙夎溅鏈ㄧ',
- '12': '鏅�氳鍗�',
- '13': '',
- '14': '鐜嬮緳'
- },
- {
- '0': '1',
- '1': 'NG23110101',
- '2': '11',
- '3': '涓缓',
- '4': '534',
- '5': '116',
- '6': '榛勭煶鏈夎建鐢佃溅',
- '7': '20鎵�',
- '8': '111100.02',
- '9': '1008.38',
- '10': '2023-10-30',
- '11': '鍙夎溅鏈ㄧ',
- '12': '鏅�氳鍗�',
- '13': '',
- '14': '鐜嬮緳'
- }
- ],//table body瀹為檯鏁版嵁
- 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 ''
- })
- ]
- }
-
-})
-const gridEvents = {
- toolbarButtonClick ({ code }) {
- const $grid = xGrid.value
- if ($grid) {
- switch (code) {
- case 'add': {
- router.push({path: '/main/delivery/createDelivery', params: { orderID: 'NG24010101' }})
- break
- }
- }
- }
- }
-}
-
-
-
-
-</script>
-
-<template>
- <div style="width: 100%;height: 100%">
- <el-date-picker
- v-model="value1"
- type="daterange"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿"
- />
- <el-button style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">鏌ヨ</el-button>
- <vxe-grid
- max-height="97%"
- class="mytable-scrollbar"
- ref="xGrid"
- v-bind="gridOptions"
- v-on="gridEvents"
-
- >
- <template #state="{ row}">
- <el-checkbox checked/>
- </template>
-
- <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row }">
- <ul class="expand-wrapper">
- <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
- <span style="font-weight: bold">{{item.title+': '}}</span>
- <span>{{ row[item.field] }}</span>
- </li>
- </ul>
- </template>
-
- <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" 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>
-
-
- </div>
-</template>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/Returns/SelectReturns.vue b/UI-Project/src/views/Returns/SelectReturns.vue
deleted file mode 100644
index e3fce3b..0000000
--- a/UI-Project/src/views/Returns/SelectReturns.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<script setup>
-import {Search} from "@element-plus/icons-vue";
-import {reactive} from "vue";
-import {useRouter} from "vue-router"
-const router = useRouter()
-
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-const dialogFormVisible = ref(false)
-const dialogFormVisiblea = ref(false)
-
-const tableData = [
- {
- id: '1',
- long: '1005',
- wide: '183.6',
- thick: '1991'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191'
- }
-]
-const tableDataa = [
- {
- long: '1005',
- wide: '183.6',
- thick: '1991',
- station: '1'
- },
- {
- long: '105',
- wide: '183',
- thick: '191',
- station: '2'
- }
-]
-const open = () => {
- ElMessageBox.confirm(
- '鏄惁鍒犻櫎璇ユ潯淇℃伅?',
- '鎻愮ず',
- {
- confirmButtonText: '鏄�',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- }
- )
- .then(() => {
- ElMessage({
- type: 'success',
- message: '鍒犻櫎鎴愬姛锛�',
- })
- })
- .catch(() => {
- ElMessage({
- type: 'info',
- message: '鍒犻櫎澶辫触',
- })
- })
-}
-const getTableRow = (row,type) =>{
- switch (type) {
- case 'edit' :{
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/returns/createReturns', query: { ReturnID: 'TH24010101' }})
- break
- }
- case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
- }
-}
-
-const gridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
- keepSource: true,//淇濇寔婧愭暟鎹�
- align: 'center',//鏂囧瓧灞呬腑
- stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'OrderList',
- 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:[
- // {type:'expand',slots: { content:'content' },width: 50},
- // // {title: '鎿嶄綔', width: 110, slots: { default: 'button_slot' }},
- // {type: 'seq', title: '鑷簭', width: 80 },
-
- // // {title: '瀹℃牳', width: 40, slots: { default: 'state' }},
- // {title: 'id', width: 140, slots: { default: 'state' }},
- // {title: '闀�', width: 160, slots: { default: 'state' }},
- // {title: '瀹�', width: 160, slots: { default: 'state' }},
- // {title: '鍘�', width: 160, slots: { default: 'state' }},
-
- // // {field: '3',width:120, title: '閫�璐у崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- // ],
- //琛ㄥご鎸夐挳
- // toolbarConfig: {
- // buttons: [],
- // import: false,
- // export: true,
- // print: true,
- // zoom: true,
- // custom: true
- // },
- data: [
- {
- 'id': '1',
- 'long': '5',
- 'wide': '1005',
- 'thick': '183.6',
- }
- ],
- //table body瀹為檯鏁版嵁
- // 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 ''
- // })
- // ]
- // }
-})
-</script>
-
-<template>
- <div>
- <!-- <el-date-picker
- v-model="value1"
- type="daterange"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿"
- /> -->
- <!-- <el-button style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">鏌ヨ</el-button> -->
- <el-button style="margin-top: -5px;margin-left: 5px;" id="searchButton" type="primary" @click="dialogFormVisible = true">涓婄墖杈撳叆</el-button>
- <el-button style="margin-top: -5px" id="searchButton" type="primary" @click="dialogFormVisiblea = true">鍘熺墖淇℃伅</el-button>
- <!-- <el-button style="margin-top: -5px" id="searchButton" type="danger">浜哄伐鎷胯蛋</el-button> -->
-
- <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
- <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto">
- <el-table height="100%" ref="table" :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="id" align="center" label="id" min-width="80" />
- <el-table-column prop="long" align="center" label="闀�" min-width="120" />
- <el-table-column prop="wide" align="center" label="瀹�" min-width="120" />
- <el-table-column prop="thick" align="center" label="鍘�" min-width="120" />
- <el-table-column fixed="right" label="鎿嶄綔" align="center" width="200">
- <template #default>
- <el-button size="mini" type="text" plain @click="open">浜哄伐鎷�111璧�</el-button>
- </template>
- </el-table-column>
- </el-table>
- </div>
- </el-card>
- </div>
-
-
- <el-dialog v-model="dialogFormVisible" top="21vh" width="40%" title="涓婄墖杈撳叆" >
- <div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="150px">
- <el-form >
- <el-row style="margin-top: -15px;margin-bottom: -2px;">
- <el-col :span="6">
- <div id="dt" style="font-size: 15px;">
- <div>
- <el-form-item label="宸ヤ綅锛�" :required="true" style="width: 14vw">
- <el-input autocomplete="off" />
- </el-form-item></div></div>
- </el-col>
- <el-col :span="9">
- <div id="dta" style="font-size: 15px;">
- <div>
- <el-form-item label="闀匡細" :required="true" style="width: 14vw">
- <el-input autocomplete="off" />
- </el-form-item></div>
- </div>
- </el-col>
- </el-row>
- <el-row style="margin-top: 10px;">
- <el-col :span="6">
- <div id="dt" style="font-size: 15px;">
- <div>
- <el-form-item label="瀹斤細" :required="true" style="width: 13.2vw;margin-left: 14px;">
- <el-input autocomplete="off" />
- </el-form-item></div></div>
- </el-col>
- <el-col :span="9">
- <div id="dta" style="font-size: 15px;">
- <div>
- <el-form-item label="鍘氾細" :required="true" style="width: 14vw">
- <el-input autocomplete="off" />
- </el-form-item></div></div>
- </el-col>
- </el-row>
- </el-form>
- </el-form>
- </div>
- <template #footer>
- <div id="dialog-footer">
- <el-button type="primary" @click="dialogFormVisible = false">
- 纭
- </el-button>
- <el-button @click="dialogFormVisible = false">鍙栨秷</el-button>
- </div>
- </template>
- </el-dialog>
- <el-dialog v-model="dialogFormVisiblea" top="21vh" width="40%" title="鍘熺墖淇℃伅">
- <el-table height="100%" ref="table" :data="tableDataa" @row-click="handle">
- <el-table-column
- prop="long"
- align="center"
- label="闀�"
- min-width="120"
- />
- <el-table-column
- prop="wide"
- align="center"
- label="瀹�"
- min-width="120"
- />
- <el-table-column
- prop="thick"
- align="center"
- label="鍘�"
- min-width="120"
- />
- <el-table-column
- prop="station"
- align="center"
- label="宸ヤ綅"
- min-width="120"
- />
- </el-table>
- <div style="text-align: center; height: 22px; margin-top: 30px;">
- <el-button @click="dialogFormVisiblea = false">鍏抽棴</el-button>
- </div>
- </el-dialog>
-</template>
-
-<style scoped>
-
-#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
-#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
-#dialog-footer{
- text-align: center;
- margin-top: -15px;
-}
-</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index a0a97f9..da8355f 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -233,7 +233,7 @@
</div>
</el-card>
<div id="parent">
- <img src="../../assets/shangpianji .png" alt="" style="max-width: 20%;max-height: 20%;margin-top: 20px;margin-left: 130px;">
+ <img src="../../assets/shangpianji .png" alt="" style="max-width: 20%;max-height: 20%;margin-top: 20px;margin-left: 510px;">
<el-button style="margin-top: -830px;margin-left: -40px;" size="mini" id="searchButton" @click="add = true">娣诲姞鍘熺墖</el-button>
<el-button style="margin-top: -10px;margin-left: -80px;" size="mini" id="searchButton" @click="adda = true">娣诲姞鍘熺墖</el-button>
<!-- <div id="overlay" v-show="state"></div> -->
@@ -404,6 +404,7 @@
}
#parent{
position: relative;
+ /* margin-left: 250px; */
}
#overlay{
position: absolute;
diff --git a/UI-Project/src/views/StockBasicData/Create.vue b/UI-Project/src/views/StockBasicData/Create.vue
deleted file mode 100644
index 0fc1826..0000000
--- a/UI-Project/src/views/StockBasicData/Create.vue
+++ /dev/null
@@ -1,724 +0,0 @@
-<template>
- <el-header height="auto">
- <el-descriptions
- class="margin-top"
- title=""
- :column="4"
- :size="'default'"
- border
- :rules="rules"
- :model="ruleForm"
- >
-
- <el-descriptions-item label-class-name="label-diy" class-name="content-diy" prop="name">
- <template #label>
- <span style="color:red">*</span>
- 閲囪喘绫诲瀷
- </template>
-<!-- <el-select v-model="form.buyType" class="m-2" placeholder="閫夋嫨閲囪喘绫诲瀷" clearable>-->
- <el-select v-model="ruleForm.name" class="m-2" placeholder="閫夋嫨閲囪喘绫诲瀷" clearable>
- <el-option
- v-for="item in CGTypeOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-descriptions-item >
-
- <el-descriptions-item label-class-name="label-diy" class-name="content-diy">
- <template #label>
- <span style="color:red">*</span>
- 閲囪喘缁勭粐
- </template>
- <el-input v-model="ruleForm.name" placeholder="閲囪喘缁勭粐" clearable prop="name"></el-input>
- </el-descriptions-item>
-
- <el-descriptions-item label-class-name="label-diy" class-name="content-diy">
- <template #label>
- <span style="color:red">*</span>
- 渚涘簲鍟�
- </template>
- <el-cascader
- placeholder="閫夋嫨渚涘簲鍟�"
- :options="buyerOptions"
- filterable
- clearable
- empty-text="empty-text"
- :v-model="form.supplier"
- >
- </el-cascader>
- </el-descriptions-item>
-
- <el-descriptions-item label-class-name="label-diy" class-name="content-diy">
- <template #label>
- <span style="color:red">*</span>
- 閲囪喘閮ㄩ棬
- </template>
- <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-descriptions-item>
-
-
-
- <el-descriptions-item label-class-name="label-diy" class-name="content-diy">
- <template #label>
- <span style="color:red">*</span>
- 閲囪喘鍛�
- </template>
- <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-descriptions-item>
-
- <el-descriptions-item label-class-name="label-diy" class-name="content-diy"
- >
- <template #label>
- <span style="color:red">*</span>
- 鍒惰〃鏃ユ湡
- </template>
- <el-date-picker
- v-model="form.date"
- type="date"
- placeholder="閫夋嫨鍒惰〃鏃ユ湡"
-
- />
- </el-descriptions-item>
-
- <el-descriptions-item label-class-name="label-diy" class-name="content-diy"></el-descriptions-item>
- </el-descriptions>
-
- </el-header>
-
- <el-main style="padding-top: 5px;height:100%">
- <!-- <el-button class="mt-4" style="width: 10%" @click="onAddItem"
- >娣诲姞
- </el-button>-->
-
- <vxe-grid
-
- max-height="500"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
- ref="xGrid"
- v-bind="gridOptions"
- @="gridEvents"
- >
-
- <!-- @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">
- <el-input v-model="option.data" @input="changeFilterEvent($event, option, $panel)" />
- </div>
- </div>
- </template>
- </vxe-grid>
-
- </el-main>
-
-</template>
-
-<script lang="ts" setup>
-import {ref, reactive} from 'vue'
-import {useRouter} from "vue-router";
-import {ElMessage, ElMessageBox} from "element-plus";
-
-let router = useRouter()
-
-//缁勪欢鎺ユ敹鍙傛暟
-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: [
- //{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,
- type: 'number'
- },
- {
- 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'},
- {
- 'name': '鏂板',
-
- 'code': 'Add',
- },
- {
- 'name': '绉婚櫎',
-
- 'code': 'Remove'
- },
- {
- 'name': '淇濆瓨璁㈠崟',
- status: 'primary',
- 'code': 'Save'
- }, {
- 'name': '鍏ュ簱',
- status: 'primary',
- 'code': 'Storage'
- }/*,
- {
- 'name': '閫�璐�',
- status: 'primary',
- 'code': 'Return'
- },
- {
- 'name': '杩斿洖鏌ヨ',
-
- 'code':'GoSelect'
- }*/],
- import: false,
- export: true,
- print: true,
- zoom: true,
- custom: true,
- tools: [],
-
- },//琛ㄥご鎸夐挳
- /*data: [{},{},{},{},{},{}],//table body瀹為檯鏁版嵁*/
- data: [{}, {}, {}],//table body瀹為檯鏁版嵁
- mergeFooterItems: [
- {row: 0, col: 0, rowspan: 1, colspan: 3}
- ],//鍚堝苟鑴�
- 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 ''
- })
- ]
- },
-
-})
-
-const xGrid = ref()
-const gridEvents = {
- toolbarButtonClick({code}) {
- const $grid = xGrid.value
- if ($grid) {
- switch (code) {
-//鏂板
- case 'Add': {
- const record = {
- checked: false
- }
- $grid.insertAt(record, 0).then(({row}) => {
- $grid.setEditRow(row)
- })
- break
- }
-//绉婚櫎
- case 'Remove': {
- if ($grid.getCheckboxRecords().length === 0) {
- MessageShow('璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�','warning');
- return
- } else {
-
- MessageConfirmShow('绉婚櫎','鏄惁纭绉婚櫎閫変腑鐨�' + $grid.getCheckboxRecords().length + '鏉℃暟鎹紒');
-
- }
- break
- }
-//淇濆瓨
- case 'Save': {
- /*if (form.buyItem === null || form.buyItem === '') {
- MessageShow('閲囪喘缁勭粐涓嶅彲涓虹┖','warning');
- return;
- }
-*/
- //閫変腑鏁版嵁
- /* const $table = this.$refs.xTable
- const selectRecords = $table.getCheckboxRecords()*/
-//+$grid.rows.number
- if ($grid.getCheckboxRecords().length === 0) {
- MessageShow('璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�','warning');
- return
- } else {
-
-
- MessageConfirmShow('淇濆瓨璁㈠崟','鏄惁纭畾淇濆瓨褰撳墠璁㈠崟淇℃伅');
- }
- break
- }
-//鍏ュ簱
- case 'Storage': {
- if ($grid.getCheckboxRecords().length === 0) {
- MessageShow('璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�','warning');
- return
- } else {
- MessageConfirmShow('鍏ュ簱','鎮ㄩ�夋嫨浜�' + $grid.getCheckboxRecords().length + '鏉℃暟鎹紒,鏄惁纭鍏ュ簱锛�')
- }
- break
- }
-//閫�搴�
- case 'Return': {
- if ($grid.getCheckboxRecords().length === 0) {
- MessageShow('璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�','warning');
- return
- } else {
-
-
- }
- break
- }
-
- }
- }
- },
- toolbarToolClick({code}) {
- const $grid = xGrid.value
- if ($grid) {
- switch (code) {
- case 'myPrint': {
- $grid.print()
- break
- }
- }
- }
- },
-}
-
-
-import type { FormInstance, FormRules } from 'element-plus'
-
-
-
-
-interface RuleForm {
- name: string
- region: string
- count: string
- date1: string
- date2: string
- delivery: boolean
- type: string[]
- resource: string
- desc: string
-}
-const ruleFormRef = ref<FormInstance>()
-const ruleForm = reactive<RuleForm>({
- name: '',
- region: '',
- count: '',
- date1: '',
- date2: '',
- delivery: false,
- type: [],
- resource: '',
- desc: '',
-})
-const rules = reactive<FormRules<RuleForm>>({
- name: [
- { required: true, message: 'Please input Activity name', trigger: 'blur' },
- { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
- ],
- region: [
- {
- required: true,
- message: 'Please select Activity zone',
- trigger: 'change',
- },
- ],
- count: [
- {
- required: true,
- message: 'Please select Activity count',
- trigger: 'change',
- },
- ],
- date1: [
- {
- type: 'date',
- required: true,
- message: 'Please pick a date',
- trigger: 'change',
- },
- ],
- date2: [
- {
- type: 'date',
- required: true,
- message: 'Please pick a time',
- trigger: 'change',
- },
- ],
- type: [
- {
- type: 'array',
- required: true,
- message: 'Please select at least one activity type',
- trigger: 'change',
- },
- ],
- resource: [
- {
- required: true,
- message: 'Please select activity resource',
- trigger: 'change',
- },
- ],
- desc: [
- { required: true, message: 'Please input activity form', trigger: 'blur' },
- ],
-})
-
-
-const form = reactive({
- name: '',
- region: '',
- date: '',
- delivery: false,
- type: [],
- resource: '',
- desc: '',
- supplier: '',
- buyer: '',
- buyItem: '',
- buyType: ''
-
-})
-
-//渚涘簲鍟�
-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',
- },
-
-]
-
-//椤甸潰閫昏緫浠ｇ爜鎵ц
-function logicExecute(type){
- const $grid = xGrid.value
- switch (type) {
- case '鍏ュ簱':
- //鍏ュ簱閫昏緫浠ｇ爜TODO
- MessageShow('鍏ュ簱鎴愬姛锛�', 'success');
- break;
- case '閫�璐�':
- //閫�璐ч�昏緫浠ｇ爜TODO
- MessageShow('閫�璐ф垚鍔燂紒', 'success');
- break;
- case '淇濆瓨璁㈠崟':
- //淇濆瓨璁㈠崟閫昏緫浠ｇ爜TODO
- const submitForm = async (formEl: FormInstance | undefined) => {
- if (!formEl) return
- await formEl.validate((valid, fields) => {
- if (valid) {
- console.log('submit!')
- } else {
- console.log('error submit!', fields)
- }
- })
- }
- MessageShow('璁㈠崟淇濆瓨鎴愬姛锛�', 'success');
- break;
- case '绉婚櫎':
- $grid.removeCheckboxRow();
- break;
- default:
- MessageShow('鏈煡鎿嶄綔锛�', 'error');
- break;
- }
- return true;
-
-}
-
-//鎻愮ず淇℃伅
-const MessageShow = (content, type ) => {
-
- ElMessage({
- message: content,
- type: type,
- showClose: true,
- })
-}
-
-//鎿嶄綔纭绫讳俊鎭細鎿嶄綔绫诲瀷锛屾彁绀哄唴瀹癸紝鎻愮ず鏍囧ご锛屾彁绀虹被鍨�
-const MessageConfirmShow = (czType, content, title='鎿嶄綔纭鎻愮ず', type='warning') => {
-
- ElMessageBox.confirm(
- content,
- title,
- {
- cancelButtonText: '鍙栨秷',
- confirmButtonText: '纭畾',
- type: type,
- center: true,
- }
- )
- //鐐瑰嚮浜嗙‘瀹�
- .then(() => {
- return logicExecute(czType);
- })
- //鐐瑰嚮浜嗗彇娑�
- .catch(() => {
- return false;
- })
-}
-
-
-</script>
-<style scoped>
-:deep(.el-descriptions__table .label-diy) {
- text-align: center;
- width: 100px;
- /*font-size: large;*/
-}
-</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/StockBasicData/Details.vue b/UI-Project/src/views/StockBasicData/Details.vue
deleted file mode 100644
index 04fa130..0000000
--- a/UI-Project/src/views/StockBasicData/Details.vue
+++ /dev/null
@@ -1,453 +0,0 @@
-<template>
- <el-header height="auto">
- <el-descriptions
- class="margin-top"
- title=""
- :column="4"
- :size="'default'"
- border
- >
- <el-descriptions-item label-class-name="label-diy" class-name="content-diy">
- <template #label>
- 鎿嶄綔鍗曞彿
- </template>
- <el-input v-model="form.buyItem" placeholder="鍗曞彿" disabled></el-input>
- </el-descriptions-item>
-
- <el-descriptions-item label-class-name="label-diy" class-name="content-diy">
- <template #label>
- 閲囪喘绫诲瀷
- </template>
- <el-input v-model="form.buyItem" placeholder="閲囪喘绫诲瀷" disabled></el-input>
- </el-descriptions-item>
-
- <el-descriptions-item label-class-name="label-diy" class-name="content-diy">
- <template #label>
- 閲囪喘閮ㄩ棬
- </template>
- <el-input v-model="form.buyItem" placeholder="閲囪喘閮ㄩ棬" disabled></el-input>
- </el-descriptions-item>
-
- <el-descriptions-item label-class-name="label-diy" class-name="content-diy">
- <template #label>
- 渚涘簲鍟�
- </template>
- <el-input v-model="form.buyItem" placeholder="渚涘簲鍟�" disabled></el-input>
- </el-descriptions-item>
-
- <el-descriptions-item label-class-name="label-diy" class-name="content-diy">
- <template #label>
- 閲囪喘鍛�
- </template>
- <el-input v-model="form.buyItem" placeholder="閲囪喘鍛�" disabled></el-input>
- </el-descriptions-item>
-
- <el-descriptions-item label-class-name="label-diy" class-name="content-diy">
- <template #label>
- 閲囪喘缁勭粐
- </template>
- <el-input v-model="form.buyItem" placeholder="閲囪喘缁勭粐" disabled></el-input>
- </el-descriptions-item>
-
- <el-descriptions-item label-class-name="label-diy" class-name="content-diy">
- <template #label>
- 鍒惰〃鏃ユ湡
- </template>
- <el-date-picker
- v-model="form.date"
- type="date"
- placeholder="閫夋嫨鍒惰〃鏃ユ湡"
- />
- </el-descriptions-item>
-
- <el-descriptions-item label-class-name="label-diy" class-name="content-diy"></el-descriptions-item>
-
- </el-descriptions>
- </el-header>
-
- <el-main style="padding-top: 5px;height:100%">
- <vxe-grid
- max-height="500"
- @filter-change="filterChanged"
- ref="xGrid"
- v-bind="gridOptions"
- v-on="gridEvents"
- >
-
- <!-- @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>
-
- </vxe-grid>
-
- </el-main>
-
-</template>
-
-<script setup>
-import {ref, reactive} from 'vue'
-
-let router = useRouter()
-import {useRouter} from "vue-router";
-import { ElMessage, ElMessageBox} from "element-plus";
-
-const value = ref('')
-
-//缁勪欢鎺ユ敹鍙傛暟
-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: [
- {type: 'seq', fixed: "left", title: ' ', width: 50},
- {type: 'checkbox', fixed: "left", title: '', width: 50},
- {
- field: 'cgdh',
- width: '10%',
- title: '鐗╂枡缂栫爜',
- filters: [{data: ''}],
- sortable: true
- },
- {
- field: 'cgzt',
- width: '10%',
- title: '鐗╂枡鍚嶇О',
- filters: [{data: ''}],
- sortable: true
- },
- {
- field: 'gys',
- width: '10%',
- title: '浜у湴',
-
- filters: [{data: ''}],
- sortable: true
- },
- {
- field: 'w',
- width: '8%',
- title: '瀹藉害',
- filters: [{data: ''}],
- sortable: true
- },
- {
- field: 'g',
- width: '8%',
- title: '楂樺害',
- filters: [{data: ''}],
- sortable: true,
-
- },
- {
- field: 'h',
- width: '8%',
- title: '鍘氬害',
- filters: [{data: ''}],
- sortable: true
- },
- {
- field: 'xh',
- width: '8%',
- title: '鍨嬪彿',
- filters: [{data: ''}],
- sortable: true
- },
- {
- field: 'dw',
- width: '8%',
- title: '鍗曚綅',
- filters: [{data: ''}],
- sortable: true
- },
- {
- field: 'sl',
- width: '8%',
- title: '鏁伴噺',
- filters: [{data: ''}],
- sortable: true
- },
- {
- field: 'czsl',
- width: '8%',
- title: '鎿嶄綔鏁伴噺',
- type: 'number',
- editRender: {name: 'input', type: 'number', attrs: {placeholder: ''}}
- },
- {
- field: 'sl',
- width: '12%',
- title: '绠辨暟',
- filters: [{data: ''}],
- sortable: true
- },
- {
- field: 'je',
- width: '8%',
- title: '鍗曠墖闈㈢Н',
- filters: [{data: ''}],
- sortable: true
- },
- {
- field: 'je',
- width: '12%',
- title: '鍗曚环',
- filters: [{data: ''}],
- sortable: true
- },
- {
- field: 'sl',
- width: '8%',
- title: '鎬婚潰绉�',
- filters: [{data: ''}],
- sortable: true
- },
- {
- field: 'yl',
- width: '10%',
- title: '鎬婚噾棰�',
- filters: [{data: ''}],
- sortable: true
- },
- {
- field: 'yl',
- width: '10%',
- title: '澶囨敞',
- filters: [{data: ''}],
- sortable: true
- }
- ],
- //琛ㄥご鎸夐挳
- toolbarConfig: {
- buttons: [
- {type: 'text'},
- {
- 'name': '淇濆瓨璁㈠崟',
- status: 'primary',
- 'code': 'Save'
- }, {
- 'name': '鍏ュ簱',
- status: 'primary',
- 'code': 'Storage'
- },
- {
- 'name': '閫�璐�',
- status: 'primary',
- 'code': 'Return'
- },
- {
- 'name': '鍙栨秷',
- status: '',
- 'code': 'Cancel'
- }],
- import: false,
- export: true,
- print: true,
- zoom: true,
- custom: true,
- tools: [],
-
- },
- //table body瀹為檯鏁版嵁
- data: [{}, {}, {}],
- //鑴氬悎骞�
- mergeFooterItems: [
- {row: 0, col: 0, rowspan: 1, colspan: 3}
- ],
- //鍚堝苟鑴�
- 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 ''
- })
- ]
- },
-
-})
-
-const xGrid = ref()
-const gridEvents = {
- toolbarButtonClick({code}) {
- const $grid = xGrid.value
- if ($grid) {
- switch (code) {
-//淇濆瓨
- case 'Save': {
- MessageAlertShow('鐐瑰嚮浜嗕繚瀛樿鍗�','鎿嶄綔鎻愮ず');
- //MessageShow('鐐瑰嚮浜嗕繚瀛樿鍗曪紒', 'error');
- break;
- }
-//鍙栨秷锛岃繑鍥炴煡璇㈤〉闈�
- case 'Cancel': {
- // router.push({path: '/main/purchaseOrder/StoragePurchaseOrder'})
- break
- }
-//鍏ュ簱
- case 'Storage': {
- if ($grid.getCheckboxRecords().length === 0) {
- MessageShow('璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹紒', 'warning');
- return
- } else {
- MessageConfirmShow('鍏ュ簱', '鏄惁纭瀵归�変腑鐨�' + $grid.getCheckboxRecords().length + '鐗╂枡杩涜鍏ュ簱鎿嶄綔锛�');
- }
- break
- }
-//閫�璐�
- case 'Return': {
- if ($grid.getCheckboxRecords().length === 0) {
- MessageShow('璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹紒', 'warning');
- return
- } else {
-
- MessageConfirmShow('閫�璐�', '鏄惁纭瀵归�変腑鐨�' + $grid.getCheckboxRecords().length + '鐗╂枡杩涜閫�璐ф搷浣滐紒');
- }
- break
- }
-
- }
- }
- },
- toolbarToolClick({code}) {
- const $grid = xGrid.value
- if ($grid) {
- switch (code) {
- case 'myPrint': {
- $grid.print()
- break
- }
- }
- }
- },
-}
-
-//琛ㄥ崟鏁版嵁
-const form = reactive({
- name: '',
- region: '',
- date: '',
- delivery: false,
- type: [],
- resource: '',
- desc: '',
- supplier: '',
- buyer: '',
- buyItem: '',
- buyType: ''
-
-})
-
-
-//椤甸潰閫昏緫浠ｇ爜鎵ц
-function logicExecute(type){
- const $grid = xGrid.value
- switch (type) {
- case '鍏ュ簱':
- //鍏ュ簱閫昏緫浠ｇ爜TODO
- MessageShow('鍏ュ簱鎴愬姛锛�', 'success');
- break;
- case '閫�璐�':
- //閫�璐ч�昏緫浠ｇ爜TODO
- MessageShow('閫�璐ф垚鍔燂紒', 'success');
- break;
- default:
- MessageShow('鏈煡鎿嶄綔锛�', 'error');
- break;
- }
- return true;
-}
-
-//鎻愮ず淇℃伅
-//淇℃伅鍐呭锛屾樉绀烘柟寮忥紝鏄剧ず鏍囬锛岀被鍨�
-const MessageShow = (content,type='success') => {
- ElMessage({
- message: content,
- type: type,
- showClose: true,
- })
-}
-
-//鎿嶄綔纭绫讳俊鎭細鎿嶄綔绫诲瀷锛屾彁绀哄唴瀹癸紝鎻愮ず鏍囧ご锛屾彁绀虹被鍨�
-const MessageConfirmShow = (czType, content, title='鎿嶄綔纭鎻愮ず', type='warning') => {
- ElMessageBox.confirm(
- content,
- title,
- {
- cancelButtonText: '鍙栨秷',
- confirmButtonText: '纭畾',
- type: type,
- center: true,
- }
- )
- //鐐瑰嚮浜嗙‘瀹�
- .then(() => {
-
- return logicExecute(czType);
- })
- //鐐瑰嚮浜嗗彇娑�
- .catch(() => {
- return false;
- })
-}
-
-//寮圭獥淇℃伅
-const MessageAlertShow=(content,title,type='info')=>{
-
- ElMessageBox.alert(content, title, {
- // 绂佹鑷姩瀵圭劍
- //autofocus: false,
- confirmButtonText: 'OK',
- /*callback: (action: Action) => {
- MessageShow(`action: ${action}`,type)
- },*/
- })
-}
-
-</script>
-
-
-<style scoped>
-:deep(.el-descriptions__table .label-diy) {
- text-align: center;
- width: 100px;
- /* font-size: large;*/
-}
-</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/StockBasicData/Payment.vue b/UI-Project/src/views/StockBasicData/Payment.vue
deleted file mode 100644
index 475da20..0000000
--- a/UI-Project/src/views/StockBasicData/Payment.vue
+++ /dev/null
@@ -1,354 +0,0 @@
-<template>
- <el-container>
- <el-header class="m-header" style="height: auto">
- <el-row :gutter="10" style="margin-bottom: 5px">
- <el-col :span="7">
- <el-date-picker
- v-model="datevalue"
- type="daterange"
- unlink-panels
- range-separator="鍒�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- :shortcuts="shortcuts"
- :size="size"
- format="YYYY/MM/DD"
- value-format="YYYY-MM-DD"
- />
- </el-col>
-
- <el-col :span="2">
- <el-button
- id="select"
- type="primary"
- :icon="Search"
- @click="autoAddRow">鏌ヨ
- </el-button>
- </el-col>
- </el-row>
-
- </el-header>
- <el-main style="padding-top: 5px">
- <vxe-grid
-
- max-height="600"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
- ref="xGrid"
- v-bind="PayOptions"
- @="gridEvents"
-
- >
-
- <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row }">
- <ul class="expand-wrapper">
- <li v-for="(item,index) in gridOptions.columns" v-show="item.field!==undefined ">
- <span style="font-weight: bold">{{item.title+': '}}</span>
- <span>{{ row[item.field] }}</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>
- </el-main>
- </el-container>
-</template>
-
-
-<script setup>
-import {ref} from 'vue'
-import {Search} from "@element-plus/icons-vue";
-import 'dayjs/locale/zh-cn'
-import {VXETable} from "vxe-table";
-import {reactive} from "vue";
-import {useRouter} from 'vue-router'
-import {ElMessage, ElMessageBox} from "element-plus";
-
-const datevalue = ref('')//鏃堕棿
-
-//缁勪欢鎺ユ敹鍙傛暟
-const PayOptions = 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: [
- /* {title: '鎿嶄綔', width: '8%', slots: {default: 'button_slot'}, fixed: "left"},*/
- {type: 'expand', title: '', fixed: "left", slots: {content: 'content'}, width: '5%'},//璇︽儏
- {type: 'checkbox', fixed: "left", title: '', width: '5%'},
- {type: 'seq', fixed: "left", title: ' ', width: '5%'},
- {
- field: 'cgdh',
- width: '10%',
- title: '閲囪喘鍗曞彿',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {field: 'cgzt', width: '10%', title: '鏈堜唤', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {
- field: 'gys',
- width: '10%',
- title: '渚涘簲鍟�',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {
- field: 'wlbh',
- 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: 'w',
- width: '10%',
- title: '鏈湡宸蹭粯',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {
- field: 'g',
- width: '10%',
- title: '鏈熸湯浣欓',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {field: 'h', width: '9%', title: '绋庣巼', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: '6', width: '10%', title: '澶囨敞', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true}
- ],//琛ㄥご鍙傛暟
- toolbarConfig: {
- buttons: [{type: 'text'}, {
- 'name': '搴斾粯纭',
- status: 'primary',
- 'code': 'Sure',
- }],
- import: false,
- export: true,
- print: true,
- zoom: true,
- custom: true,
- style: 'paddling-left:10px'
- },//琛ㄥご鎸夐挳
- data: [{}, {}, {}, {}],//table body瀹為檯鏁版嵁
- mergeFooterItems: [
- {row: 0, col: 0, rowspan: 1, colspan: 3}
- ],//鍚堝苟鑴�
- 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 ''
- })
- ]
- },
-
-})
-
-
-const xGrid = ref()
-const gridEvents = {
- toolbarButtonClick({code}) {
- const $grid = xGrid.value
- if ($grid) {
- switch (code) {
- //搴斾粯纭
- case 'Sure': {
- if ($grid.getCheckboxRecords().length === 0) {
- MessageShow("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�!", 'warning');
- return
- } else {
- MessageConfirmShow("纭搴斾粯", '鎮ㄩ�夋嫨浜�' + $grid.getCheckboxRecords().length + '鏉℃暟鎹紒,鏄惁纭搴斾粯锛�')
- }
- break
- }
- }
- }
- },
- toolbarToolClick({code}) {
- const $grid = xGrid.value
- if ($grid) {
- switch (code) {
- case 'myPrint': {
- $grid.print()
- break
- }
- }
- }
- },
-}
-
-
-
-const shortcuts = [
- {
- text: '杩戜竴鍛�',
- value: () => {
- const end = new Date()
- const start = new Date()
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
- return [start, end]
- },
- },
- {
- text: '杩戜竴涓湀',
- value: () => {
- const end = new Date()
- const start = new Date()
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
- return [start, end]
- },
- },
- {
- text: '杩戜笁涓湀',
- value: () => {
- const end = new Date()
- const start = new Date()
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
- return [start, end]
- },
- },
-]
-
-
-//椤甸潰閫昏緫浠ｇ爜鎵ц
-function logicExecute(type){
- const $grid = xGrid.value
- switch (type) {
- case '纭搴斾粯':
- //鍏ュ簱閫昏緫浠ｇ爜TODO
- MessageShow('鎿嶄綔鎴愬姛锛�', 'success');
- break;
-
- default:
- MessageShow('鏈煡鎿嶄綔锛�', 'error');
- break;
-
- }
- return true;
-}
-
-
-//鎻愮ず淇℃伅
-//淇℃伅鍐呭锛屾樉绀烘柟寮忥紝鏄剧ず鏍囬锛岀被鍨�
-const MessageShow = (content, type = 'success') => {
- ElMessage({
- message: content,
- type: type,
- showClose: true,
- })
-}
-
-//鎿嶄綔纭绫讳俊鎭細鎿嶄綔绫诲瀷锛屾彁绀哄唴瀹癸紝鎻愮ず鏍囧ご锛屾彁绀虹被鍨�
-const MessageConfirmShow = (czType, content, title = '鎿嶄綔纭鎻愮ず', type = 'warning') => {
- ElMessageBox.confirm(
- content,
- title,
- {
- cancelButtonText: '鍙栨秷',
- confirmButtonText: '纭畾',
- type: type,
- center: true,
- }
- )
- //鐐瑰嚮浜嗙‘瀹�
- .then(() => {
-
- return logicExecute(czType);
-
- })
- //鐐瑰嚮浜嗗彇娑�
- .catch(() => {
- return false;
- })
-}
-
-//寮圭獥淇℃伅
-const MessageAlertShow = (content, title, type = 'info') => {
-
- ElMessageBox.alert(content, title, {
- // 绂佹鑷姩瀵圭劍
- //autofocus: false,
- confirmButtonText: 'OK',
- /*callback: (action: Action) => {
- MessageShow(`action: ${action}`,type)
- },*/
- })
-}
-
-</script>
-
-
-<style scoped>
-.el-row {
- margin-bottom: 20px;
-}
-
-.el-row:last-child {
- margin-bottom: 0;
-}
-
-.el-col {
- border-radius: 4px;
-}
-
-.m-header {
- height: 32px;
-}
-</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/StockBasicData/Return.vue b/UI-Project/src/views/StockBasicData/Return.vue
deleted file mode 100644
index 354092d..0000000
--- a/UI-Project/src/views/StockBasicData/Return.vue
+++ /dev/null
@@ -1,593 +0,0 @@
-<template>
- <el-container>
- <el-header class="m-header" style="height: auto">
- <el-row :gutter="10" style="margin-bottom: 5px">
- <el-col :span="7">
- <el-date-picker
- v-model="datevalue"
- type="daterange"
- unlink-panels
- range-separator="鍒�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- :shortcuts="shortcuts"
- :size="size"
- format="YYYY/MM/DD"
- value-format="YYYY-MM-DD"
- />
-
- </el-col>
-
- <el-col :span="2">
- <el-button
- id="select"
- type="primary"
- :icon="Search"
- @click="BtnSearchPurchaseOrder">鏌ヨ
- </el-button>
- </el-col>
- </el-row>
- </el-header>
- <el-main style="padding-top: 5px;height:100%">
- <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,index) in gridOptions.columns" v-show="item.field!==undefined ">
- <span style="font-weight: bold">{{ item.title + ': ' }}</span>
- <span>{{ row[item.field] }}</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="showCGDH" 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>
- </el-container>
-</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 {ElMessage, ElMessageBox} from "element-plus";
-
-
-let router = useRouter()
-const getTableRow = (row, type) => {
- switch (type) {
- case 'edit' : {
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- // router.push({path: '/main/purchaseOrder/DetailsPurchaseOrder', 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 'Sure': {
- if ($grid.getCheckboxRecords().length === 0) {
-
- MessageShow('璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�!', 'warning');
-
- return
- } else {
-
- MessageConfirmShow('纭畾', '鎮ㄩ�夋嫨浜�' + $grid.getCheckboxRecords().length + '鏉℃暟鎹紒,鏄惁纭閫�璐э紵')
- }
- break
- }
- case 'Log': {
- MessageAlertShow('鐐瑰嚮浜嗛��璐ц褰�!', '鎿嶄綔鎻愮ず');
- break
- }
- }
- }
- },
- toolbarToolClick({code}) {
- const $grid = xGrid.value
- if ($grid) {
- switch (code) {
- case 'myPrint': {
- $grid.print()
- break
- }
- }
- }
- },
-}
-
-
-//鏌ヨ鎸夐挳鏂规硶
-const BtnSearchPurchaseOrder = () => {
-
- //寮�濮嬫椂闂达紝缁撴潫鏃堕棿鑾峰彇
- //MessageShow("寮�濮嬫椂闂�"+datevalue._rawValue[0]+"\r\n缁撴潫鏃堕棿\r\n"+datevalue._rawValue[1]);
-
- for (let i = 1; i < 6; i++) {
- const randomInt = Math.floor(Math.random() * 999) + 1000;//4浣嶆暟闅忔満鏁�
- const randomSumInt = Math.floor(Math.random() * 99) + 10;//2浣嶆暟闅忔満鏁�
- const randomOrderInt = Math.floor(Math.random() * 99) + 100;//3浣嶆暟闅忔満鏁�
- const t = i % 2 === 0 ? 5 : 6;
- const s = i % 2 === 0 ? '鍏ュ簱' : i % 3 === 0 ? '閫�璐�' : '閮ㄥ垎鍏ュ簱';
- const thdh = i % 2 === 0 ? '' : i % 3 === 0 ? 'THID' + randomOrderInt : '';
- const CGNo = 'NGCG231200' + randomOrderInt;//閲囪喘缂栧彿
- const wlNo = 'NGWL1000' + randomInt;
- const xh = 'NGXH' + randomSumInt;
- const wlmc = 'WLMC' + randomInt;
- const gys = '渚涘簲鍟�' + randomSumInt;
- const xhdh = 'NG231200' + randomOrderInt;
- const w = i % 2 === 0 ? '3300' : i % 3 === 0 ? '3660' : i % 4 === 0 ? '2250' : '2580';
- const h = i % 2 === 0 ? '2440' : i % 3 === 0 ? '2440' : i % 4 === 0 ? '2000' : '2300';
- const dw = i % 2 === 0 ? '鐗�' : i % 3 === 0 ? '骞崇背' : i % 4 === 0 ? '鍖�' : '鍚�';
- now.setDate(now.getDate() + 1);
- gridOptions.data.push({
- cgdh: CGNo,
- thdh: thdh,
- h: t,
- xh: xh,
- wlbh: wlNo,
- wlmc: wlmc,
- gys: gys,
- w: w,
- g: h,
- dw: dw,
- cgzt: s,
- rq: dayjs(now).format('YYYY-MM-DD'),
- yl: randomSumInt,
- sl: randomOrderInt,
- xsdh: xhdh,
- je: randomInt,
- 6: '139xxxxxxxx',
-
- })
- }
-
-}
-
-
-//缁勪欢鎺ユ敹鍙傛暟
-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: [
- {type: 'expand', title: '', fixed: "left", slots: {content: 'content'}, width: 50},//璇︽儏
- {title: '鎿嶄綔', width: '8%', slots: {default: 'button_slot'}, fixed: "left"},
- {type: 'checkbox', fixed: "left", title: '', width: 50},
- {type: 'seq', fixed: "left", title: ' ', width: 50},
-
-
- {
- field: 'thdh',
- width: '10%',
- title: '閫�璐у崟鍙�',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {
- field: 'cgdh',
- width: '10%',
- title: '閲囪喘鍗曞彿',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {field: 'cgzt', width: '10%', title: '鐘舵��', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {
- field: 'gys',
- width: '10%',
- title: '渚涘簲鍟�',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {
- field: 'wlbh',
- 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: '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: 'xh', width: '8%', title: '鍨嬪彿', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'dw', width: '8%', title: '鍗曚綅', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {
- field: '6',
- width: '12%',
- title: '涓嶅惈绋庡崟浠�',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {field: 'sl', width: '8%', title: '鏁伴噺', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {
- field: 'sl',
- width: '12%',
- title: '宸查噰璐暟閲�',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {field: 'je', width: '8%', title: '閲戦', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {
- field: 'je',
- width: '12%',
- title: '涓嶅惈绋庨噾棰�',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {field: '6', width: '8%', title: '绋庣巼', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'sl', width: '8%', title: '搴撳瓨', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'yl', width: '10%', title: '鍛ㄧ敤閲�', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'yl', width: '10%', title: '鏈堢敤閲�', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {
- field: 'cgzt',
- width: '10%',
- title: '鍗曟嵁鐘舵��',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {
- field: 'xsdh',
- width: '10%',
- title: '閿�鍞崟鍙�',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {
- field: 'rq',
- width: '10%',
- title: '鍒跺崟鏃ユ湡',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {field: '6', width: '10%', title: '鍒跺崟浜�', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {
- field: '6',
- width: '10%',
- title: '閲囪喘閮ㄩ棬',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {
- field: '6',
- width: '10%',
- title: '閲囪喘缁勭粐',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {field: '6', width: '10%', title: '澶囨敞', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true}
- ],//琛ㄥご鍙傛暟
- toolbarConfig: {
- buttons: [{type: 'text'}, {
- 'name': '閫�璐ц褰�',
-
- 'code': 'Log'
- },
- {
- 'name': '纭閫�璐�',
- status: 'primary',
- 'code': 'Sure'
- }],
- import: false,
- export: true,
- print: true,
- zoom: true,
- custom: true,
- style: 'paddling-left:10px'
- },//琛ㄥご鎸夐挳
- data: [],//table body瀹為檯鏁版嵁
- mergeFooterItems: [
- {row: 0, col: 0, rowspan: 1, colspan: 4}
- ],//鍚堝苟鑴�
- 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 ''
- })
- ]
- },
-
-})
-
-
-//璇︽儏妗� 閮ㄥ垎2
-const showCGDH = ref();
-const showDetails = ref(false);
-let detailData = [];
-const cellClickEvent = ({row}) => {
- if (isQueryColumnId === false) {
- queryColumnId();
- }
-
- detailData = list.map(field => {
- return {label: queryColumnsTitle(field), value: row[field]}
- })
- showDetails.value = true;
- showCGDH.value = row['cgdh'];
-}
-
-//鑾峰彇琛ㄥ垪
-let list = [];
-let columnIndex = 4;//鍒楁爣澶翠粠绗嚑鍒楀紑濮嬬殑
-let isQueryColumnId = false;
-const queryColumnId = () => {
-
- while (columnIndex < gridOptions.columns.length) {
- list.push(gridOptions.columns[columnIndex].field);
- columnIndex++;
- }
- isQueryColumnId = true;
- return list;
-}
-
-//鑾峰彇琛ㄥ垪鍚�
-function queryColumnsTitle(cn) {
- let i = 0;
- while (i < gridOptions.columns.length + 1) {
- if (gridOptions.columns[i].field === cn) {
- return gridOptions.columns[i].title;
- }
- i++;
- }
-}
-
-// 璇︽儏妗嗛儴鍒�2 缁撴潫
-
-const SureReturn = () => {
-
- MessageConfirmShow('閫�璐�', '鏄惁纭閫�璐э紵')
-
-}
-
-//璇︽儏妗� 閮ㄥ垎2 缁撴潫
-
-
-const now = new Date()
-
-//鏃堕棿蹇嵎閫夋嫨
-const datevalue = ref('')
-const shortcuts = [
- {
- text: '杩戜竴鍛�',
- value: () => {
- const end = new Date()
- const start = new Date()
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
- return [start, end]
- },
- },
- {
- text: '杩戜竴涓湀',
- value: () => {
- const end = new Date()
- const start = new Date()
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
- return [start, end]
- },
- },
- {
- text: '杩戜笁涓湀',
- value: () => {
- const end = new Date()
- const start = new Date()
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
- return [start, end]
- },
- },
-]
-
-
-//椤甸潰閫昏緫浠ｇ爜鎵ц
-function logicExecute(type) {
- const $grid = xGrid.value
- switch (type) {
- case '纭畾':
- //澶氶�夐��璐ч�昏緫浠ｇ爜TODO
- MessageShow('鎿嶄綔鎴愬姛锛�', 'success');
- break;
- case '閫�璐�':
- //鍗曢��璐ч�昏緫浠ｇ爜TODO
- MessageShow('鎿嶄綔鎴愬姛锛�', 'success');
- break;
- default:
- MessageShow('鏈煡鎿嶄綔锛�', 'error');
- break;
- }
- return true;
-}
-
-
-//鎻愮ず淇℃伅
-//淇℃伅鍐呭锛屾樉绀烘柟寮忥紝鏄剧ず鏍囬锛岀被鍨�
-const MessageShow = (content, type = 'success') => {
- ElMessage({
- message: content,
- type: type,
- showClose: true,
- })
-}
-
-//鎿嶄綔纭绫讳俊鎭細鎿嶄綔绫诲瀷锛屾彁绀哄唴瀹癸紝鎻愮ず鏍囧ご锛屾彁绀虹被鍨�
-const MessageConfirmShow = (czType, content, title = '鎿嶄綔纭鎻愮ず', type = 'warning') => {
- ElMessageBox.confirm(
- content,
- title,
- {
- cancelButtonText: '鍙栨秷',
- confirmButtonText: '纭畾',
- type: type,
- center: true,
- }
- )
- //鐐瑰嚮浜嗙‘瀹�
- .then(() => {
-
- logicExecute(czType);
-
- return true;
- })
- //鐐瑰嚮浜嗗彇娑�
- .catch(() => {
- return false;
- })
-}
-
-//寮圭獥淇℃伅
-const MessageAlertShow = (content, title, type = 'info') => {
-
- ElMessageBox.alert(content, title, {
- // 绂佹鑷姩瀵圭劍
- //autofocus: false,
- confirmButtonText: 'OK',
- /*callback: (action: Action) => {
- MessageShow(`action: ${action}`,type)
- },*/
- })
-}
-
-</script>
-
-
-<style scoped>
-:deep(.v-column-label div span) {
- font-weight: bold;
-}
-</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/StockBasicData/Storage.vue b/UI-Project/src/views/StockBasicData/Storage.vue
deleted file mode 100644
index 98a9156..0000000
--- a/UI-Project/src/views/StockBasicData/Storage.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<template>
- <el-container>
- <el-header class="m-header" style="height: auto">
- <el-row :gutter="10" style="margin-bottom: 5px">
- <el-col :span="7">
- <el-date-picker
- v-model="datevalue"
- type="daterange"
- unlink-panels
- range-separator="鍒�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- :shortcuts="shortcuts"
-
- format="YYYY/MM/DD"
- value-format="YYYY-MM-DD"
- />
-
- </el-col>
- <el-col :span="2">
- <el-button
- id="select"
- type="primary"
- :icon="Search"
- @click="BtnSearchPurchaseOrder">鏌ヨ
- </el-button>
- </el-col>
-
- </el-row>
-
-
- </el-header>
- <el-main style="padding-top: 5px;height:100%">
- <vxe-grid
-
- max-height="600"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
- ref="xGrid"
- v-bind="gridOptions"
- v-on="gridEvents"
-
- @cell-dblclick="cellClickEvent"
-
- >
-
- <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row }">
- <ul class="expand-wrapper">
- <li v-for="(item,index) in gridOptions.columns" v-show="item.field!==undefined ">
- <span style="font-weight: bold">{{ item.title + ': ' }}</span>
- <span>{{ row[item.field] }}</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,'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>
-
-
- <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="showCGDH" placeholder="閲囪喘鍗曞彿" disabled>
- <template #prepend>閲囪喘鍗曞彿锛�</template>
- </el-input>
- </el-header>
- <el-main>
- <template #default>
- <vxe-table
- border="inner"
- 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="SureStorage"
- >纭鍏ュ簱
- </el-button>
- </el-col>
-
- </el-row>
- </el-footer>
- </el-container>
- </vxe-modal>
- <!-- 璇︽儏妗� 閮ㄥ垎1 缁撴潫-->
-
-
- </el-main>
- </el-container>
-
-
-</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";
-import {ElMessage, ElMessageBox} from "element-plus";
-
-let router = useRouter()
-
-
-const getTableRow = (row, type) => {
- switch (type) {
- case 'edit' : {
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/purchaseOrder/DetailsPurchaseOrder', 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
- }
- }
-}
-
-const xGrid = ref()
-const gridEvents = {
- toolbarButtonClick({code}) {
- const $grid = xGrid.value
- if ($grid) {
- switch (code) {
- case 'Sure': {
- if ($grid.getCheckboxRecords().length === 0) {
- MessageShow('璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�', 'warning');
- //openAlert({type: 'message', content: '璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�', status: 'warning'})
- //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 'Log': {
-
- //openAlert({type: 'alert', content: '鐐瑰嚮浜嗛��璐ц褰�', status: 'success'})
- MessageConfirmShow("閫�璐ц褰�", "鐐瑰嚮浜嗛��璐ц褰�", "", 'success')
- break
- }
- }
- }
- },
- toolbarToolClick({code}) {
- const $grid = xGrid.value
- if ($grid) {
- switch (code) {
- case 'myPrint': {
- $grid.print()
- break
- }
- }
- }
- },
-}
-
-const openAlert = (options) => {
- if (options.type === 'message') {
- VXETable.modal.message(options)
- } else {
- VXETable.modal.alert(options)
- }
-
-}
-const closeAlert = (id) => {
- VXETable.modal.close(id)
-}
-
-
-//鏌ヨ璋冪敤浜嬩欢
-const BtnSearchPurchaseOrder = () => {
- //寮�濮嬫椂闂达紝缁撴潫鏃堕棿鑾峰彇
- //MessageShow(datevalue._rawValue[0]+"\r\n鏃堕棿2\r\n"+datevalue._rawValue[1]);
-
- for (let i = 1; i < 6; i++) {
- const randomInt = Math.floor(Math.random() * 999) + 1000;//4浣嶆暟闅忔満鏁�
- const randomSumInt = Math.floor(Math.random() * 99) + 10;//2浣嶆暟闅忔満鏁�
- const randomOrderInt = Math.floor(Math.random() * 99) + 100;//3浣嶆暟闅忔満鏁�
- const t = i % 2 === 0 ? 5 : 6;
- const s = i % 2 === 0 ? '鍏ュ簱' : i % 3 === 0 ? '寰呭鏍�' : '宸查噰璐�';
- const rkdh = i % 2 === 0 ? 'RKID' + randomOrderInt : i % 3 === 0 ? '' : '';
- const CGNo = 'NGCG231200' + randomOrderInt;//閲囪喘缂栧彿
- const wlNo = 'NGWL1000' + randomInt;
- const xh = 'NGXH' + randomSumInt;
- const wlmc = 'WLMC' + randomInt;
- const gys = '渚涘簲鍟�' + randomSumInt;
- const xhdh = 'NG231200' + randomOrderInt;
- const w = i % 2 === 0 ? '3300' : i % 3 === 0 ? '3660' : i % 4 === 0 ? '2250' : '2580';
- const h = i % 2 === 0 ? '2440' : i % 3 === 0 ? '2440' : i % 4 === 0 ? '2000' : '2300';
- const dw = i % 2 === 0 ? '鐗�' : i % 3 === 0 ? '骞崇背' : i % 4 === 0 ? '鍖�' : '鍚�';
- now.setDate(now.getDate() + 1);
- gridOptions.data.push({
- cgdh: CGNo,
- rkdh: rkdh,
- h: t,
- xh: xh,
- wlbh: wlNo,
- wlmc: wlmc,
- gys: gys,
- w: w,
- g: h,
- dw: dw,
- cgzt: s,
- rq: dayjs(now).format('YYYY-MM-DD'),
- yl: randomSumInt,
- sl: randomOrderInt,
- xsdh: xhdh,
- je: randomInt,
- 6: '139xxxxxxxx',
-
- })
- }
-
-}
-
-
-//缁勪欢鎺ユ敹鍙傛暟
-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,
- //showDetails: false,//寮圭獥 鏄惁鏄剧ず
- columnConfig: {
- resizable: true,
- useKey: true
- },
- filterConfig: { //绛涢�夐厤缃」
- remote: true
- },
- customConfig: {
- storage: true
- },
- editConfig: {
- trigger: 'click',
- mode: 'row',
- showStatus: true
- },
- columns: [
- {type: 'expand', title: '', fixed: "left", slots: {content: 'content'}, width: 50},//璇︽儏
- {title: '鎿嶄綔', width: '8%', slots: {default: 'button_slot'}, fixed: "left"},
- {type: 'checkbox', fixed: "left", title: '', width: 50},
- {type: 'seq', fixed: "left", title: ' ', width: 50},
-
-
- {
- field: 'rkdh',
- width: '10%',
- title: '鍏ュ簱鍗曞彿',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {
- field: 'cgdh',
- width: '10%',
- title: '閲囪喘鍗曞彿',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {field: 'cgzt', width: '10%', title: '鐘舵��', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {
- field: 'gys',
- width: '10%',
- title: '渚涘簲鍟�',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {
- field: 'wlbh',
- 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: '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: 'xh', width: '8%', title: '鍨嬪彿', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'dw', width: '8%', title: '鍗曚綅', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {
- field: '6',
- width: '12%',
- title: '涓嶅惈绋庡崟浠�',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {field: 'sl', width: '8%', title: '鏁伴噺', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {
- field: 'sl',
- width: '12%',
- title: '宸查噰璐暟閲�',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {field: 'je', width: '8%', title: '閲戦', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {
- field: 'je',
- width: '12%',
- title: '涓嶅惈绋庨噾棰�',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {field: '6', width: '8%', title: '绋庣巼', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'sl', width: '8%', title: '搴撳瓨', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'yl', width: '10%', title: '鍛ㄧ敤閲�', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'yl', width: '10%', title: '鏈堢敤閲�', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {
- field: 'cgzt',
- width: '10%',
- title: '鍗曟嵁鐘舵��',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {
- field: 'xsdh',
- width: '10%',
- title: '閿�鍞崟鍙�',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {
- field: 'rq',
- width: '10%',
- title: '鍒跺崟鏃ユ湡',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {field: '6', width: '10%', title: '鍒跺崟浜�', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {
- field: '6',
- width: '10%',
- title: '閲囪喘閮ㄩ棬',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {
- field: '7',
- width: '10%',
- title: '閲囪喘缁勭粐',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- sortable: true
- },
- {field: '8', width: '10%', title: '澶囨敞', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true}
- ],//琛ㄥご鍙傛暟
- toolbarConfig: {
- buttons: [{type: 'text'/*,name:'璁㈠崟鍏ュ簱'*/}, {
- 'name': '鍏ュ簱璁板綍',
-
- 'code': 'Log'
- },
- {
- 'name': '纭鍏ュ簱',
- status: 'primary',
- 'code': 'Sure'
- }],
- import: false,
- export: true,
- print: true,
- zoom: true,
- custom: true,
- style: 'paddling-left:10px'
- },//琛ㄥご鎸夐挳
- data: [],//table body瀹為檯鏁版嵁
- mergeFooterItems: [
- {row: 0, col: 0, rowspan: 1, colspan: 4}
- ],//鍚堝苟鑴�
- 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 ''
- })
- ]
- },
-
-})
-
-
-
-//璇︽儏妗� 閮ㄥ垎2
-const showCGDH = ref();
-const showDetails = ref(false);
-let detailData = [];
-const cellClickEvent = ({row}) => {
- if(isQueryColumnId===false){
- queryColumnId();
- }
-
- detailData = list.map(field => {
- return {label: queryColumnsTitle(field), value: row[field]}
- })
-
- showDetails.value = true;
- showCGDH.value = row['cgdh'];
-}
-
-//鑾峰彇琛ㄥ垪
-let list = [];
-let columnIndex = 4;//鍒楁爣澶翠粠绗嚑鍒楀紑濮嬬殑
-let isQueryColumnId = false;
-const queryColumnId = () => {
- while (columnIndex < gridOptions.columns.length) {
- list.push(gridOptions.columns[columnIndex].field);
- columnIndex++;
- }
- isQueryColumnId = true;
- return list;
-}
-
-//鑾峰彇琛ㄥ垪鍚�
-function queryColumnsTitle(cn) {
- let i = 0;
- while (i < gridOptions.columns.length + 1) {
- if (gridOptions.columns[i].field === cn) {
- return gridOptions.columns[i].title;
- }
- i++;
- }
-}
-//璇︽儏妗� 閮ㄥ垎2 缁撴潫
-
-
-const SureStorage = () => {
- MessageShow('纭鍏ュ簱鎴愬姛');
-
-}
-
-
-const now = new Date()
-
-//鏃堕棿蹇嵎閫夋嫨
-const datevalue = ref('')
-const shortcuts = [
- {
- text: '杩戜竴鍛�',
- value: () => {
- const end = new Date()
- const start = new Date()
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
- return [start, end]
- },
- },
- {
- text: '杩戜竴涓湀',
- value: () => {
- const end = new Date()
- const start = new Date()
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
- return [start, end]
- },
- },
- {
- text: '杩戜笁涓湀',
- value: () => {
- const end = new Date()
- const start = new Date()
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
- return [start, end]
- },
- },
-]
-
-
-//椤甸潰閫昏緫浠ｇ爜鎵ц
-function logicExecute(type) {
- const $grid = xGrid.value
- switch (type) {
- case '鍏ュ簱':
- //鍏ュ簱閫昏緫浠ｇ爜TODO
- MessageShow('鍏ュ簱鎴愬姛锛�', 'success');
- break;
- case '閫�璐�':
- //閫�璐ч�昏緫浠ｇ爜TODO
- MessageShow('閫�璐ф垚鍔燂紒', 'success');
- break;
- default:
- MessageShow('鏈煡鎿嶄綔锛�', 'error');
- break;
- }
- return true;
-}
-
-//鎻愮ず淇℃伅
-const MessageShow = (content, type = 'success') => {
- ElMessage({
- message: content,
- type: type,
- showClose: true,
- })
-}
-
-//鎿嶄綔纭绫讳俊鎭細鎿嶄綔绫诲瀷锛屾彁绀哄唴瀹癸紝鎻愮ず鏍囧ご锛屾彁绀虹被鍨�
-const MessageConfirmShow = (czType, content, title = '鎿嶄綔纭鎻愮ず', type = 'warning') => {
- ElMessageBox.confirm(
- content,
- title,
- {
- cancelButtonText: '鍙栨秷',
- confirmButtonText: '纭畾',
- type: type,
- center: true,
- }
- )
- //鐐瑰嚮浜嗙‘瀹�
- .then(() => {
- return logicExecute(czType);
-
- })
- //鐐瑰嚮浜嗗彇娑�
- .catch(() => {
- return false;
- })
-}
-
-</script>
-
-
-<style scoped>
-:deep(.v-column-label div span) {
- font-weight: bold;
-}
-
-
-</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/TL/Temperedlayout/SelectLayout.vue b/UI-Project/src/views/TL/Temperedlayout/SelectLayout.vue
deleted file mode 100644
index d53cd15..0000000
--- a/UI-Project/src/views/TL/Temperedlayout/SelectLayout.vue
+++ /dev/null
@@ -1,176 +0,0 @@
-<script setup>
-
-import {reactive} from "vue";
-import {useRouter} from 'vue-router'
-let router=useRouter()
-const getTableRow = (row,type) =>{
- switch (type) {
- case 'edit' :{
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/ingredients/CreateIngredients', query: { id: row.id }})
- break
- }
- case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
- }
-}
-
-
-
-//瀛愮粍浠舵帴鏀跺弬鏁�
-
-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:[
- {type:'expand',fixed:"left",slots: { content:'content' },width: '50'},
- // { type: 'checkbox',fixed:"left", title: '閫夋嫨', width: '80' },
- {title: '鎿嶄綔', width: '110', slots: { default: 'button_slot' },fixed:"left"},
- { type: 'seq',fixed:"left", title: '鑷簭', width: '80' },
- {field: 'materialCode', width:'150', title: '鐗╂枡缂栫爜', sortable: true,editRender: { name: 'input', attrs: { placeholder: '' } } },
- {field: 'materialName', width: '150',title: '鐗╂枡鍚嶇О', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'origin', width: '120',title: '浜у湴', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'width', width: '100',title: '瀹藉害', sortable: true},
- {field: 'height',width: '100', title: '楂樺害', sortable: true,showOverflow:"ellipsis"},
- {field: 'thickness', width: '80',title: '鍘氬害', sortable: true},
- {field: 'model',width: '100', title: '鍨嬪彿', sortable: true},
- {field: 'conversionRate', width: '100',title: '鎹㈢畻鐜�', sortable: true},
- {field: 'unit',width: '100', title: '鍗曚綅', sortable: true},
- {field: 'conversionUnit', width: '80',title: '鎹㈢畻鍗曚綅', sortable: true},
- {field: 'shelfLife',width: '100', title: '淇濊川鏈�', sortable: true},
- {field: 'weight', width: '100',title: ' 閲嶉噺', sortable: true},
- {field: 'quantity',width: '110', title: '鏁伴噺', sortable: true},
- {field: 'inventoryOrganization',width: '100', title: '搴撳瓨缁勭粐', sortable: true},
- {field: 'remark',width: '80', title: '澶囨敞', sortable: true},
-
- ],//琛ㄥご鎸夐挳
- toolbarConfig: {
-
- import: false,
- export: true,
- print: true,
- zoom: true,
- custom: true
- },
- data: [
- {
- "materialCode": 700900000000941,
- "materialName": "涓濊闃叉檼鎵嬪濂楄",
- "origin": "00",
- "width": "00",
- "height": "00",
- "thickness":'00',
- "model": "鏈嶉グ",
- "conversionRate": "1000",
- "unit": "鍙�",
- "conversionUnit": "1",
- "shelfLife": "12涓湀",
- "weight": "0.0000",
- "quantity": "10000",
- "inventoryOrganization": "浜哄伐搴�",
- "remark": "娴嬭瘯",
- },
- {
- "materialCode": 700900000000941,
- "materialName": "涓濊闃叉檼鎵嬪濂楄",
- "origin": "00",
- "width": "00",
- "height": "00",
- "thickness":'00',
- "model": "鏈嶉グ",
- "conversionRate": "1000",
- "unit": "鍙�",
- "conversionUnit": "1",
- "shelfLife": "12涓湀",
- "weight": "0.0000",
- "quantity": "10000",
- "inventoryOrganization": "浜哄伐搴�",
- "remark": "娴嬭瘯",
- },
- ],//table body瀹為檯鏁版嵁
- 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 ''
- })
- ]
- }
-
-})
-
-
-
-</script>
-
-<template>
- <div class="main-div-customer">
- <vxe-grid
- max-height="100%"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
- ref="xGrid"
- v-bind="gridOptions"
-
- >
- <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
- <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
-
-
- <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <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>
- </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>
- </div>
-</template>
-
-<style scoped>
-.main-div-customer{
- width: 99%;
- height: 100%;
-}
-</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue b/UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue
deleted file mode 100644
index a574308..0000000
--- a/UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue
+++ /dev/null
@@ -1,207 +0,0 @@
-<!-- 鐗╂枡璧勬枡 -->
-
-
-<script setup>
-import { ref } from "vue";
-import { ArrowLeftBold, ArrowRight, Search } from "@element-plus/icons-vue";
-import request from "@/utils/request";
-import deepClone from "@/utils/deepClone";
-import { ElMessage } from "element-plus";
-import { useRouter } from "vue-router";
-import GlassType from '@/components/basic/product/GlassType.vue'
-
-
-const router = useRouter()
-let indexFlag = $ref(1)
-function changeRouter(index) {
- indexFlag = index
-}
-
-
-</script>
-
-<script>
-export default {
- mounted() {
- //鑾峰彇鏁版嵁
- request.get("/Temper/Tindex").then((res) => {
- if (res.code == 200) {
- var StoveCount=0;
- var temperid;
- for(var i=0;i<res.data.length;i++){
- if (temperid != res.data[i].layoutid) {
- StoveCount++;
- temperid=res.data[i].layoutid;
- }
- }
- // console.log(res.data);
- this.CanvaDraws("mycanvas",res.data,StoveCount);
-
- } else {
- ElMessage.warning(res.msg)
- router.push("/login")
- }
- });
-
-
-
- },
- methods: {
- //Canva(id,鍩虹鏁版嵁,椤甸潰闀匡細瀹為檯闀匡紝鏄剧ず琛屽唴鐗堝浘鏁帮紝 )
- //鍩虹鏁版嵁锛氬疄闄呯倝闀�,瀹為檯鐐夊, 灏忕墖X杞�, 灏忕墖y杞�, 灏忕墖闀�, 灏忕墖瀹斤紝鏄剧ず鏁版嵁锛堝昂瀵�,ID,娴佺▼鍗″彿,鐗堝浘鍙凤級
- CanvaDraws(id,Datas,StoveCount) {
- //var StoveCount=43;//鐐夋暟
- var ArrangementMode='linefeed';//鎺掑竷鏂瑰紡锛歭inefeed(鎹㈣) /Wholeline 鏁磋
- var RowMaxCount=4;//姣忚鏈�澶氭樉绀虹殑鍥炬暟
- var StoveWidth=3000; //瀹為檯鐐夊 2850
- var StoveLength=5500;//瀹為檯鐐夐暱 5000
- var StoveColor='#CFC8C5';//鐐夊瓙鑳屾櫙棰滆壊
-
-
- var StoveIntervalX=30; //椤甸潰姣忎竴鐐変箣闂寸殑闂磋窛X px
- var StoveIntervalY=50; //椤甸潰姣忎竴鐐変箣闂寸殑闂磋窛Y px
-
- var HtmlWidth=1800; //椤甸潰妯悜
- //var actualWidth=12000;//椤甸潰妯悜鎵�瀵瑰簲鐨勫疄闄呴暱搴�
- var actualWidth=StoveWidth*RowMaxCount;//椤甸潰妯悜鎵�瀵瑰簲鐨勫疄闄呴暱搴�
-
- var Bli = actualWidth / (HtmlWidth-StoveIntervalX*RowMaxCount);//姣斾緥锛氬疄闄呴暱搴m/椤甸潰闀垮害px
-
- var StoveCross=StoveWidth/Bli; //椤甸潰鐐夊瓙妯悜 鍍忕礌
- var StoveVertical=StoveLength/Bli;//椤甸潰鐐夊瓙绾靛悜 鍍忕礌
-
- var Font1=(StoveCross*0.05);
- var Font2=(StoveCross*0.028);
- // var TerritoryWidth=dataTempered.loadwidth; //瀹為檯鐗堝浘瀹�
- // var TerritoryLength=dataTempered.loadlength;//瀹為檯鐗堝浘闀�
- // var TerritoryColor='#0DB637';//鐗堝浘鑳屾櫙棰滆壊
-
- // var TerritoryCross=TerritoryWidth/Bli; //椤甸潰鐗堝浘妯悜 鍍忕礌
- // var TerritoryVertical=TerritoryLength/Bli;//椤甸潰鐗堝浘绾靛悜 鍍忕礌
- console.log(Font1);
-
- var canva = this.$refs[id];
- var content = canva.getContext('2d');
- canva.width = HtmlWidth;
- canva.height = StoveCount%RowMaxCount==0?((StoveVertical+StoveIntervalY)*(StoveCount/RowMaxCount)):((StoveVertical+StoveIntervalY)*(StoveCount/RowMaxCount+1));
- //console.log(StoveCount%RowMaxCount==0?((StoveVertical+StoveIntervalY)*(StoveCount/RowMaxCount)):((StoveVertical+StoveIntervalY)*(StoveCount/RowMaxCount+1)) );
- var temperid;//鍒濆鐗堝浘
- var Xlayout = 0; //鐐夊瓙X杞磋捣鐐�
- var Ylayout = StoveIntervalY; //鐐夊瓙Y杞磋捣鐐�
- var layoutCount = 0;//鐗堝浘鏁�
- var row=0;
- for (var i = 0; i < Datas.length; i++) {
- var dataTempered = Datas[i];
-
- var TerritoryWidth=dataTempered.loadwidth; //瀹為檯鐗堝浘瀹�
- var TerritoryLength=dataTempered.loadlength;//瀹為檯鐗堝浘闀�
- var TerritoryColor='#0DB637';//鐗堝浘鑳屾櫙棰滆壊
-
- var TerritoryCross=TerritoryWidth/Bli; //椤甸潰鐗堝浘妯悜 鍍忕礌
- var TerritoryVertical=TerritoryLength/Bli;//椤甸潰鐗堝浘绾靛悜 鍍忕礌
-
- if (temperid != dataTempered.layoutid) {
- //鐢荤増鍥� 鏇存敼鍩虹鍊嶆暟
- if(layoutCount>0){
- Xlayout += StoveCross + StoveIntervalX;
- if (layoutCount %RowMaxCount== 0) {
- //鎹㈣
- Ylayout += StoveVertical+StoveIntervalY;
- Xlayout=0;
- row++;
- }
- }
- temperid=dataTempered.layoutid;
- layoutCount++;
- content.font ='bold '+Font1+'px Arial' ; //鏂囧瓧鏍峰紡锛氬姞绮� 16鍍忕礌 瀛椾綋Arial
- content.fillStyle = '#000000'; //瀛椾綋棰滆壊
- content.textAlign = 'center'; //鏂囧瓧灞呬腑
- content.fillText((dataTempered.layoutid), (StoveCross / 2+ Xlayout), 50/2+(StoveVertical+50)*row+10);
- //鐐夊瓙
- content.fillStyle = StoveColor;
- content.fillRect(Xlayout, Ylayout, StoveCross, StoveVertical);
- //鐗堝浘
- content.fillStyle = TerritoryColor;
- content.fillRect(Xlayout, Ylayout, TerritoryCross, TerritoryVertical);
- }
-
- var Rx = dataTempered.xaxis / Bli + Xlayout;
- var Ry = dataTempered.yaxis / Bli + Ylayout;
- var Rwidth = dataTempered.width / Bli;
- var Rheight = dataTempered.height / Bli;
- var Xwidth;
- var Xheight;
- content.fillStyle = '#5CADFE';
- if (dataTempered.rotateangle != 0) {
- Xwidth = Rwidth;
- Xheight = Rheight;
- } else {
- Xwidth = Rheight;
- Xheight = Rwidth;
- }
- content.fillRect(Rx, Ry, Xwidth, Xheight);
- content.font = 'bold '+Font2+'px Arial' ; //鏂囧瓧鏍峰紡锛氬姞绮� 16鍍忕礌 瀛椾綋Arial
- content.fillStyle = '#000000'; //瀛椾綋棰滆壊
- content.textAlign = 'center'; //鏂囧瓧灞呬腑
-
- content.fillText(('鐗堝浘:'+dataTempered.layoutid+'-'+dataTempered.sort), (Xwidth / 2) + Rx, (Xheight) / 2 + Ry-Font2);
- content.fillText((dataTempered.width + ' * ' + dataTempered.height), (Xwidth / 2) + Rx, (Xheight) / 2 + Ry); //fillText閲岄潰鐨勫彲濉啓鐨勫��(鏂囨湰鍐呭, x鍧愭爣, y鍧愭爣, 鏂囨湰鏈�澶у搴�)
- content.fillText((dataTempered.processid), (Xwidth / 2) + Rx, (Xheight) / 2 + Ry+Font2);
- //content.rotate(30*Math.PI/180);
- content.stroke();
- }
- }
- }
-}
-
-
-</script>
-
-
-
-<template>
- <div ref="content">
-
- </div>
- <canvas ref="mycanvas" >
-
- </canvas>
-</template>
-
-<style scoped>
-#main {
- width: 100%;
- height: 100%;
-}
-
-
-
-#div-title {
- height: 5%;
- width: 100%;
-}
-
-#searchButton {
- margin-top: -5px;
- margin-left: 1rem;
-}
-
-#searchButton1 {
- /* margin-left: 10rem; */
-}
-
-/*main-body鏍峰紡*/
-#main-body {
- width: 99%;
- height: 92%;
- margin-top: 1%;
-}
-
-#select {
- margin-left: 0.5rem;
-}
-
-:deep(.indexTag .el-breadcrumb__inner) {
- color: #5CADFE !important;
-}
-</style>
\ No newline at end of file
--
Gitblit v1.8.0