From 05b730c07f34b4392caa7ad877bf2b1964888253 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 25 六月 2024 08:06:17 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue | 2
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 1
north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml | 2 +
north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue | 1
north-glass-erp/northglass-erp/src/lang/zh.js | 2
north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue | 7 +--
north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java | 7 +++
north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue | 42 +++++++++++++++++---
8 files changed, 49 insertions(+), 15 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index ef90253..749d176 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -166,7 +166,7 @@
technology:'宸ヨ壓',
amountReset:'閲戦閲嶇疆',
OrderNum:'璁㈠崟搴忓彿',
- productId:'浜у搧Id',
+ productId:'浜у搧ID',
product:'浜у搧',
price:'鍗曚环',
quantity:'鏁伴噺',
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue
index 4e76d0a..2944574 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue
@@ -222,7 +222,7 @@
for (let i=0;i<BasicData.value.length;i++){
let aa={field: "json."+BasicData.value[i].OperateType, width: '150',title: BasicData.value[i].OperateTypeName, sortable: true,showOverflow:'ellipsis' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged}
- console.log(aa)
+
gridOptions.columns.push(aa)
}
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
index c4ed626..8df08ec 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -1361,6 +1361,7 @@
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
+ transform: translateZ(0);
}
:deep(#product .el-dialog__body){
height: 90%;
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue b/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
index 62da28a..69b9c92 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
@@ -2,7 +2,7 @@
import {computed, onMounted, reactive, ref, watch} from "vue"
import {useRouter,useRoute} from "vue-router"
import request from "@/utils/request"
-import {ElMessage} from "element-plus"
+import {ElMessage, ElMessageBox} from "element-plus"
import {changeFilterEvent,filterChanged} from "@/hook"
import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove"
import {useI18n} from "vue-i18n"
@@ -16,6 +16,7 @@
const xGrid = ref()
const trademarkLocation=ref([t('craft.upperLeft'),t('craft.upperRight'),t('craft.lowLeft'),t('craft.lowRight')])
const gridOptions = reactive({
+ loading:true,
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
@@ -25,7 +26,7 @@
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
+ scrollY:{ enabled: true,gt:13 },//寮�鍚櫄鎷熸粴鍔�
showOverflow:true,
columnConfig: {
resizable: true,
@@ -44,10 +45,10 @@
},//琛ㄥご鍙傛暟
columns:[
{title: t('basicData.operate'), width: 220, slots: { default: 'button_slot' },fixed:"left",},
- {field: 'orderNumber',width:120, title: t('order.OrderNum'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- //{field: 'orderDetail.buildingNumber',width:120, title: '妤煎彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'orderDetail.productName',width:120, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'glassAddress',width:120, title: t('craft.glassAddress'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'orderNumber',fixed:"left",width:120, title: t('order.OrderNum'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'orderDetail.productId',fixed:"left",width:120, title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'orderDetail.productName',fixed:"left",width:120, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'technologyNumber',width:120, title: t('craft.glassAddress'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'glassChild',width:120, title: t('craft.glassChild'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'orderDetail.width',width:120, title: t('craft.width'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'orderDetail.height',width:120, title: t('craft.height'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
@@ -79,6 +80,7 @@
{ code: 'copyChecked', name: t('basicData.selectSame'), prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
{ code: 'copyAll', name: t('basicData.sameAfterwards'), prefixIcon: 'vxe-icon-feedback', visible: true, disabled: false },
{ code: 'clearChecked', name: t('basicData.clearSelection'), prefixIcon: 'vxe-icon-indicator', visible: true, disabled: false },
+ { code: 'computedSize', name: '绉戝璁℃暟', prefixIcon: 'vxe-icon-chart-line', visible: true, disabled: false },
]
]
}
@@ -138,6 +140,30 @@
}
})
}
+ break
+ }
+ case 'computedSize' :{
+ let result = toolbarButtonClickEvent()
+ if(!result || result.cell!=='childWidth'){
+ break
+ }
+ ElMessageBox.prompt('', '', {
+ confirmButtonText: t('basicData.confirmButtonText'),
+ cancelButtonText: t('basicData.cancelButtonText'),
+ inputPattern:/^(-?\d{1,4}(\.\d{1,2})?|-?0(\.\d{1,2})?)$/,
+ inputErrorMessage: '-9999.99~9999.99',
+ })
+ .then(({ value }) => {
+ const value1 = value*1
+ $grid.getTableData().visibleData.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+
+ item[result.cell] = item[result.cell]*1+value1
+ }
+
+ })
+ })
+
break
}
case 'copyAll' :{
@@ -301,6 +327,7 @@
}
request.post(`/order/getOrderCraftById/${str}`).then((res) => {
if(res.code==200){
+ console.log(res.data)
titleUploadData.value = res.data.order
//鍙栨秷瀹℃牳鎸夐挳绂佺敤
@@ -317,6 +344,7 @@
}
xGrid.value.reloadData(res.data.orderGlassDetails)
+ gridOptions.loading = false
}else{
ElMessage.error(res.msg)
}
@@ -388,7 +416,7 @@
<div class="order-detail">
<vxe-grid
- max-height="97%"
+ height="100%"
class="mytable-scrollbar"
ref="xGrid"
v-bind="gridOptions"
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 190cfd0..6db6d57 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
@@ -73,7 +73,7 @@
})
let productGlassTypeStore = useProductGlassTypeStore()
-productGlassTypeStore.GlassType=['','']
+productGlassTypeStore.GlassType=[null,null]
//椤甸潰鍔犺浇璇锋眰
request.get(`/basicData/BasicDataByType/product`).then((res) => {
@@ -107,14 +107,14 @@
})
const saveProduct = () => {
- console.log(productDetailList.value)
+ console.log(productGlassTypeStore.GlassType);
if(productDetailList.value.length===0){
ElMessage.warning(t('product.msg.productLength'))
return
}else if(productDetailList.value[productDetailList.value.length-1].detailType!=='glass'){
ElMessage.warning(t('product.msg.lastGlass'))
return
- }else if(productGlassTypeStore.GlassType[1]==='' || productGlassTypeStore.GlassType[1]===null){
+ }else if(productGlassTypeStore.GlassType===null || productGlassTypeStore.GlassType[1]==='' || productGlassTypeStore.GlassType[1]===null){
ElMessage.warning(t('product.msg.glassType'))
return
}
@@ -133,7 +133,6 @@
}
case 'hollow' :{
productName+='*'+item.detail+"*"
- console.log(item.detail.slice(0,-2))
break
}
}
diff --git a/north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue b/north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue
index a449b36..057e4d7 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue
@@ -139,7 +139,6 @@
//绗竴娆″姞杞芥暟鎹�
request.post(`/product/1/100/${productGlassTypeStore.GlassType}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data.data)
pageTotal.value=res.data.total
produceList = produceList.value.concat(deepClone(res.data.data))
xGrid.value.reloadData(produceList)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java
index 982af9d..4dd26b8 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java
@@ -45,7 +45,12 @@
}
BasicOtherMoney basicOtherMoney = basicOtherMoneyList.get(0);
- String getColumn = basicOtherMoney.getColumn()==null?"0":basicOtherMoney.getColumn().replace("M","");
+ String getColumn = basicOtherMoney.getColumn()==null?
+ "0":
+ String.valueOf(basicOtherMoney.getId());
+// basicOtherMoney.getColumn().
+// replace("M","").
+// replace("S","");
int columnNum = Integer.parseInt(getColumn)+1;
BasicOtherMoney newBasicOtherMoney = new BasicOtherMoney();
newBasicOtherMoney.setColumn("M"+String.format("%02d", columnNum));
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
index 6f92c36..9b332f2 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
@@ -82,6 +82,7 @@
<association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
<result column="building_number" property="buildingNumber"/>
+ <result column="product_id" property="productId"/>
<result column="product_name" property="productName"/>
<result column="width" property="width"/>
<result column="height" property="height"/>
@@ -100,6 +101,7 @@
a.order_id,
a.order_number,
b.building_number,
+ b.product_id,
b.product_name,
a.glass_address,
a.technology_number,
--
Gitblit v1.8.0