From c67f38b68366fd30eb3b8512f49e68045d58b6d5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 26 六月 2024 15:14:33 +0800
Subject: [PATCH] 修改
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml | 2
north-glass-erp/northglass-erp/src/views/sd/customer/Customer.vue | 2
north-glass-erp/northglass-erp/src/views/sd/order/OrderProductSummaryReport.vue | 2
north-glass-erp/northglass-erp/src/lang/ru.js | 4 +
north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue | 12 ++
north-glass-erp/src/main/java/com/example/erp/entity/sd/Customer.java | 1
north-glass-erp/northglass-erp/src/lang/zh.js | 4 +
north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue | 2
north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue | 13 ++
north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue | 144 +++++++++++++++++++++++++++++++++++
north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml | 9 +
11 files changed, 183 insertions(+), 12 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index 30df218..7f6b65b 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -139,6 +139,8 @@
review:'袩褉芯胁械褉泻邪',
cancelReview:'袩械褉械褋屑芯褌褉',
theProductHasBeenReviewedAndCannotBeDeleted:'袩褉芯写褍泻褑懈褟 锌褉芯胁械褉械薪邪 懈 薪械 屑芯卸械褌 斜褘褌褜 褍写邪谢械薪邪',
+
+ productAbbreviation:'袩褉芯写褍泻褑懈褟',
}
},
order:{
@@ -596,6 +598,8 @@
customerOrders:'袟邪泻邪蟹褘 泻谢懈械薪褌芯胁',
orderAmount:'小褍屑屑邪 蟹邪泻邪蟹邪',
+ customerAbbreviation:'袣谢懈械薪褌褘 小芯泻褉邪褖械薪懈褟',
+ pleaseEnterTheCustomerAbbreviation:'袩芯卸邪谢褍泄褋褌邪, 胁胁械写懈褌械 褋芯泻褉邪褖械薪懈械 泻谢懈械薪褌邪.',
},
delivery:{
delivery:'袨褌锌褉邪胁泻邪',
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index d588d0c..7993bc3 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -139,6 +139,8 @@
review:'瀹℃牳',
cancelReview:'鍙嶅',
theProductHasBeenReviewedAndCannotBeDeleted:'浜у搧宸插鏍�,鏃犳硶鍒犻櫎',
+
+ productAbbreviation:'浜у搧绠�绉�',
}
},
order:{
@@ -596,6 +598,8 @@
customerOrders:'瀹㈡埛璁㈠崟',
orderAmount:'璁㈠崟閲戦',
+ customerAbbreviation:'瀹㈡埛绠�绉�',
+ pleaseEnterTheCustomerAbbreviation:'璇疯緭鍏ュ鎴风畝绉�',
},
delivery:{
delivery:'鍙戣揣',
diff --git a/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue b/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue
index 7c7ab4b..412978b 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue
@@ -6,10 +6,120 @@
import CreateBasicData from "@/views/sd/basicData/CreateBasicData.vue"
import {useRouter,useRoute} from "vue-router"
import {useI18n} from "vue-i18n"
+import {changeFilterEvent, filterChanged} from "@/hook";
const { t } = useI18n()
let dialogTableVisible = ref(false)
const router = useRouter()
+
+let basic = ref({
+ basicType : ['',''],
+})
+let options=ref([
+ { "label": t('orderBasicData.order'),
+ "value": "order",
+ "children": [
+ {
+ "label": t('orderBasicData.orderType'),
+ "value": "orderType"
+ },
+ {
+ "label": t('orderBasicData.orderClassify'),
+ "value": "orderClassify"
+ },
+ {
+ "label": t('orderBasicData.icon'),
+ "value": "icon"
+ },
+ {
+ "label": t('orderBasicData.packType'),
+ "value": "packType"
+ },
+ {
+ "label": t('orderBasicData.alType'),
+ "value": "alType"
+ },
+ {
+ "label": t('orderBasicData.saleMan'),
+ "value": "saleMan"
+ }
+ ]
+ },
+ {
+ "label": t('orderBasicData.product'),
+ "value": "product",
+ "children": [
+ {
+ "label": t('orderBasicData.stuffThickness'),
+ "value": "stuffThickness"
+ },
+ {
+ "label": t('orderBasicData.stuffColor'),
+ "value": "stuffColor"
+ },
+ {
+ "label": t('orderBasicData.stuffCraft'),
+ "value": "stuffCraft"
+ },
+ {
+ "label": t('orderBasicData.stuffPosition'),
+ "value": "stuffPosition"
+ },
+ {
+ "label": t('orderBasicData.stuffLowE'),
+ "value": "stuffLowE"
+ },
+ {
+ "label": t('orderBasicData.InterlayerThickness'),
+ "value": "InterlayerThickness"
+ },
+ {
+ "label": t('orderBasicData.InterlayerType'),
+ "value": "InterlayerType"
+ },
+ {
+ "label": t('orderBasicData.InterlayerColor'),
+ "value": "InterlayerColor"
+ },
+ {
+ "label": t('orderBasicData.process'),
+ "value": "process"
+ },
+ {
+ "label": t('orderBasicData.hollowThickness'),
+ "value": "hollowThickness"
+ },
+ {
+ "label": t('orderBasicData.hollowGasType'),
+ "value": "hollowGasType"
+ },
+ {
+ "label": t('orderBasicData.hollowType'),
+ "value": "hollowType"
+ },
+ {
+ "label": t('orderBasicData.hollowGlueDepth'),
+ "value": "hollowGlueDepth"
+ }
+ ]
+ },
+ {
+ "children": [
+ {
+ "label": t('orderBasicData.paymentTerms'),
+ "value": "paymentTerms"
+ },
+ {
+ "label": t('orderBasicData.payMethod'),
+ "value": "payMethod"
+ }
+ ],
+ "label": t('orderBasicData.delivery'),
+ "value": "delivery"
+ }
+])
+
+
const xGrid = ref()
const gridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
@@ -28,7 +138,7 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- remote: true
+ //remote: true
},
customConfig: {
storage: true
@@ -43,7 +153,7 @@
columns:[
{title: t('basicData.operate'), width: 110, slots: { default: 'button_slot' },fixed:"left",},
{type: 'seq', title: t('basicData.number'), width: 80 ,fixed:"left",},
- {field:'basicName',title: t('orderBasicData.name')},
+ {field:'basicName',title: t('orderBasicData.name'),filters: [{data: ''}],slots: {filter: 'num1_filter'},filterMethod: filterChanged},
{field:'nickname',title: t('orderBasicData.alias')},
{field:'createTime',title: t('basicData.creationTime')},
@@ -122,10 +232,31 @@
}
}
+const handleChange = () => {
+ console.log(basic.value.basicType[1])
+ request.get(`/basicData/BasicDataByType/${basic.value.basicType[0]}/${basic.value.basicType[1]}`).then(res => {
+ if(res.code==='200'){
+ xGrid.value.reloadData(res.data)
+ }
+ })
+
+}
+
</script>
<template>
<div>
+ <el-row>
+ <el-col :span="8">
+ <el-cascader
+ v-model="basic.basicType"
+ @change="handleChange"
+ :options="options"
+ clearable
+ placeholder=""
+ />
+ </el-col>
+ </el-row>
<vxe-grid
style="width: 40vw;"
class="mytable-scrollbar"
@@ -143,6 +274,15 @@
</el-popconfirm>
</template>
+ <template #num1_filter="{ column, $panel }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
+ </div>
+ </div>
+ </template>
+
+
</vxe-grid>
<el-dialog
v-model="dialogTableVisible"
diff --git a/north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue b/north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue
index a65de04..c16e71e 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue
@@ -18,6 +18,7 @@
let ruleForm = ref({
id:0,
customerName: '',
+ customerAbbreviation: '',
grade: '',
moneyLimit: '',
address: '',
@@ -34,9 +35,10 @@
const str = route.query.id
if (typeof str != 'undefined' && str != null && str !== '' && str !== '\n' && str !== '\r'){
ruleForm.value.id = Number(str)
-
+ console.log(ruleForm.value)
request.post(`/customer/getSelectCustomer/1/100`,ruleForm.value).then((res) => {
if(res.code==200){
+ console.log(res.data.data[0])
ruleForm.value=deepClone(res.data.data[0])
}else{
@@ -87,7 +89,7 @@
let flowData = ref({
customer: ruleForm
})
-
+ console.log()
request.post("/customer/insertCustomer", flowData.value).then((res) => {
if(res.code==200 && res.data===true){
resetForm()
@@ -104,7 +106,9 @@
}
//閲嶇疆杈撳叆妗�
const resetForm = () => {
+ ruleForm.value.id=0
ruleForm.value.customerName=""
+ ruleForm.value.customerAbbreviation=""
ruleForm.value.grade=""
ruleForm.value.moneyLimit=""
ruleForm.value.address=""
@@ -122,6 +126,10 @@
<el-col :span="5"><el-input style="font-size: large;color: #181818" v-model="ruleForm.customerName" ></el-input></el-col>
</el-row>
<el-row>
+ <el-col :span="2"><el-text>{{ $t('customer.customerAbbreviation') }}:</el-text></el-col>
+ <el-col :span="5"><el-input style="font-size: large;color: #181818" v-model="ruleForm.customerAbbreviation" ></el-input></el-col>
+ </el-row>
+ <el-row>
<el-col :span="2"><el-text>{{ $t('customer.customerGrade') }}:</el-text></el-col>
<el-col :span="5"><el-input style="font-size: large;color: #181818" v-model="ruleForm.grade" ></el-input></el-col>
</el-row>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/customer/Customer.vue b/north-glass-erp/northglass-erp/src/views/sd/customer/Customer.vue
index 3ca2860..4a71e65 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/customer/Customer.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/customer/Customer.vue
@@ -23,7 +23,7 @@
</div>
<div id="main-body">
- <router-view />
+ <router-view :key="route.fullPath" />
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue b/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue
index 48aa5f0..a190399 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue
@@ -91,6 +91,7 @@
request.post(`/customer/getSelectCustomer/1/${total.pageSize}`,filterData.value).then((res) => {
if(res.code==200){
+ console.log(res.data.data)
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
pageNum.value=1
@@ -200,6 +201,7 @@
{title: t('basicData.operate'), width: 180, slots: { default: 'button_slot' },fixed:"left"},
{field: 'id', title: t('customer.customerNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'customerName', title: t('customer.customerName'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'customerAbbreviation', title: t('customer.customerAbbreviation'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'grade', title: t('customer.customerGrade'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'moneyLimit', title: t('customer.moneyLimit'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'address', title: t('customer.address'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/OrderProductSummaryReport.vue b/north-glass-erp/northglass-erp/src/views/sd/order/OrderProductSummaryReport.vue
index 3b517d4..7e86cfc 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/OrderProductSummaryReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/OrderProductSummaryReport.vue
@@ -48,7 +48,7 @@
],//琛ㄦ牸琛ㄥご瀛楁
data:[],//琛ㄦ牸鏁版嵁
url :'/order/getOrderProductSummary',
- exportUrl :'/order/getOrderProductSummary',
+ exportUrl :'/order/exportOrderReport',
exportName:t('order.orderDetailsSummaryReport'),
footList:['quantity','grossArea','computeGrossArea','perimeter','price','grossAmount']
})
diff --git a/north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue b/north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue
index 6db6d57..014c06c 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue
@@ -138,7 +138,6 @@
}
})
productTotal.value.productName=productName
- productTotal.value.productAbbreviation=productName.split("mm").join("")
let product = {
title: productTotal.value,
detail:productDetailList.value
@@ -364,6 +363,7 @@
hollowFlag.value.flag=true
hollowFlag.value.index=null
}
+
const productName = computed(() =>{
let productName = ""
productDetailList.value.forEach(item =>{
@@ -697,6 +697,15 @@
<el-input v-model="productTotal.remarks" size="small" />
</div>
</el-col>
+ <el-col :span="8">
+ <div class="grid-content ep-bg-purple" >
+ <el-text class="mx-1"
+ style="margin-left: 0.5rem;text-align: center">
+ {{ $t('product.msg.productAbbreviation') }}锛�
+ </el-text>
+ <el-input v-model="productTotal.productAbbreviation" size="small" />
+ </div>
+ </el-col>
</el-row>
</div>
@@ -716,7 +725,7 @@
</el-col>
<el-col :span="20">
<div class="grid-content ep-bg-purple" >
- <el-input :value="productName" size="large" disabled />
+ <el-input :value="productName" size="large" />
</div>
</el-col>
</el-row>
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Customer.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Customer.java
index d60f17e..c632526 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Customer.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Customer.java
@@ -11,6 +11,7 @@
private Long id;
private String customerName;
+ private String customerAbbreviation;
private String grade;
private Double moneyLimit;
private String address;
diff --git a/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
index a947688..e988c89 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
@@ -198,6 +198,9 @@
<if test="customer.customerName != null and customer.customerName != ''">
and c.customer_name regexp #{customer.customerName}
</if>
+ <if test="customer.customerAbbreviation != null and customer.customerAbbreviation != ''">
+ and c.customer_abbreviation regexp #{customer.customerAbbreviation}
+ </if>
<if test="customer.grade != null and customer.grade != ''">
and c.grade regexp #{customer.grade}
</if>
@@ -252,15 +255,15 @@
</select>
<insert id="insertCustomer" useGeneratedKeys="true" >
- insert into sd.customer(customer_name,grade,money_limit,address,contact,phone)
+ insert into sd.customer(customer_name,customer_abbreviation,grade,money_limit,address,contact,phone)
values (
- #{customer.customerName},#{customer.grade},#{customer.moneyLimit},
+ #{customer.customerName},#{customer.customerAbbreviation},#{customer.grade},#{customer.moneyLimit},
#{customer.address},#{customer.contact},#{customer.phone}
)
</insert>
<update id="updateCustomer" useGeneratedKeys="true" >
- update sd.customer set customer_name=#{customer.customerName},grade=#{customer.grade},
+ update sd.customer set customer_name=#{customer.customerName},customer_abbreviation=#{customer.customerAbbreviation},grade=#{customer.grade},
money_limit=#{customer.moneyLimit},address= #{customer.address},
contact=#{customer.contact},phone=#{customer.phone} where id=#{customer.id}
</update>
diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
index 3d888f4..cb4c56c 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -927,7 +927,7 @@
od.gross_amount,
od.compute_gross_area,
ifnull(od.processing_note,"") as processingNote,
- ifnull(od.remarks,"") as buildingNumber,
+ ifnull(od.building_number,"") as buildingNumber,
od.price
from order_detail od
where od.order_id = #{orderId}
--
Gitblit v1.8.0