From ed6f35069824d71ee6da599a328d865eb0c58550 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 25 四月 2024 09:16:26 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue | 66 +++++++++++++++++++++++++++++----
1 files changed, 58 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue
index 6120ba2..d2cd57e 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue
@@ -2,8 +2,12 @@
import {computed, onMounted, reactive, ref, watch} from "vue"
import {filterChanged} from "@/hook"
import {useI18n} from "vue-i18n"
-import {ElMessage} from "element-plus";
+import {ElMessage, ElMessageBox,} from "element-plus"
+import request from "@/utils/request"
+import {useRouter,useRoute} from "vue-router"
const { t } = useI18n()
+const router = useRouter()
+const route = useRoute()
let rowClickIndex = ref(null)
const xGrid = ref()
const gridOptions = reactive({
@@ -34,7 +38,7 @@
},//琛ㄥご鍙傛暟
columns:[
// {field: 'buildingNumber',width:120, title: '妤煎彿',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
- {field: 'alias', title:'鍏朵粬鍔犲伐',editRender: { name: 'input'},minWith:'130'},
+ {field: 'alias', title:'鍏朵粬鍔犲伐',minWith:'130'},
{field: 'price', title:'鍗曚环',editRender: { name: 'input'}},
{field: 'quantity', title:'鏁伴噺' },
{field: 'money', slots:{default:'default'}, title:'閲戦'}
@@ -107,11 +111,7 @@
if ($grid) {
switch (code) {
case 'add': {
- if ($grid.getTableData().tableData.length >=240){
- ElMessage.error(t('order.msg.tableLengthMax'))
- return
- }
- $grid.insert({})
+ addColumn()
break
}
case 'delete': {
@@ -119,7 +119,7 @@
ElMessage.warning('璇峰厛鍗曞嚮閫夋嫨琛�')
return
}
- $grid.remove(rowClickIndex.value)
+ deleteColum(rowClickIndex.value.id)
rowClickIndex.value = null
break
}
@@ -169,6 +169,55 @@
validate
})
+
+const addColumn = () => {
+ ElMessageBox.prompt( '鏂板鍒楀悕:', {
+ confirmButtonText: '鏂板',
+ cancelButtonText: '鍙栨秷',
+ inputPattern:/^.{1,20}$/,
+ inputErrorMessage: '璇疯緭鍏�20涓瓧绗︿互鍐呯殑涓斾笉涓虹┖鐨勫瓧绗�',
+ })
+ .then(({ value }) => {
+ request.post('/basicOtherMoney/save',{alias:value}).then(res=>{
+ if (res.code==='200' && res.data!==false){
+ ElMessage.success('鏂板鎴愬姛')
+ setTimeout(()=>{
+ window.location.reload()
+ },1500)
+
+ }else{
+ ElMessage.error('鏂板澶辫触,涓嶈兘閲嶅娣诲姞鎴栬秴杩�100鏉″垪')
+ }
+ })
+ })
+
+}
+
+const deleteColum = (id) => {
+ ElMessageBox.confirm(
+ '纭鍒犻櫎姝ゅ垪鍚�?',
+ 'Warning',
+ {
+ confirmButtonText: '鍒犻櫎',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ }
+ )
+ .then(() => {
+ request.post(`/basicOtherMoney/deleteById/${id}`,).then(res=>{
+ if (res.code==='200' && res.data!==false){
+ ElMessage.success('鍒犻櫎鎴愬姛')
+ setTimeout(()=>{
+ window.location.reload()
+ },1500)
+ }else{
+ ElMessage.error('鍒犻櫎澶辫触')
+ }
+ })
+ })
+
+}
+
</script>
<template>
@@ -185,6 +234,7 @@
<span>{{ countAmount(row) }} </span>
</template>
</vxe-grid>
+
</div>
--
Gitblit v1.8.0