From 07cb7d6d0009768efaf5cf48465627b3cdd21571 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 28 十月 2024 15:13:15 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/glassPrice/GlassPriceSet.vue | 2 +-
north-glass-erp/northglass-erp/src/lang/en.js | 2 +-
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 6 +++---
north-glass-erp/northglass-erp/src/lang/ru.js | 2 +-
north-glass-erp/northglass-erp/src/views/sd/glassPrice/GlassPriceList.vue | 12 ++++++++----
north-glass-erp/northglass-erp/src/lang/zh.js | 2 +-
6 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 02d6ffe..5ee8385 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -1127,7 +1127,7 @@
glass:'鐜荤拑',
interlayer:'澶硅兌',
hollow:'涓┖',
- craft:'宸ヨ壓',
+ process:'宸ヨ壓',
addProduce:'閫夋嫨浜у搧',
reorder:'杞鍗�'
}
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index 0c578d2..86812eb 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -1128,7 +1128,7 @@
glass:'鐜荤拑',
interlayer:'澶硅兌',
hollow:'涓┖',
- craft:'宸ヨ壓',
+ process:'宸ヨ壓',
addProduce:'閫夋嫨浜у搧',
reorder:'杞鍗�'
}
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 57d5a6d..14a81b4 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -1128,7 +1128,7 @@
glass:'鐜荤拑',
interlayer:'澶硅兌',
hollow:'涓┖',
- craft:'宸ヨ壓',
+ process:'宸ヨ壓',
addProduce:'閫夋嫨浜у搧',
reorder:'杞鍗�'
}
diff --git a/north-glass-erp/northglass-erp/src/views/sd/glassPrice/GlassPriceList.vue b/north-glass-erp/northglass-erp/src/views/sd/glassPrice/GlassPriceList.vue
index d0cdc18..c03ca0b 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/glassPrice/GlassPriceList.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/glassPrice/GlassPriceList.vue
@@ -54,10 +54,10 @@
columns:[
{title: t('basicData.operate'), width: 110, slots: { default: 'button_slot' },fixed:"left",},
{type: 'seq',fixed:"left", title: t('basicData.Number'), width: 80 },
- {field: 'type', title: t('product.msg.interlayerType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'name', title: t('orderBasicData.name'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'price', title: t('menu.glassPrice') ,editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'createTime', title: t('basicData.creationTime'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged}
+ {field: 'type', title: t('product.msg.interlayerType'),filters:[{ data: '' }],slots: { filter: 'num1_filter',default:'default_shape' }, sortable: true,filterMethod:filterChanged},
+ {field: 'name', title: t('orderBasicData.name'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'price', title: t('menu.glassPrice') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'createTime', title: t('basicData.creationTime'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged}
],
@@ -150,6 +150,10 @@
</el-popconfirm>
</template>
+ <template #default_shape="{ row }">
+ <span>{{ $t('glassPrice.'+row.type) }}</span>
+ </template>
+
</vxe-grid>
</div>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/glassPrice/GlassPriceSet.vue b/north-glass-erp/northglass-erp/src/views/sd/glassPrice/GlassPriceSet.vue
index 035b6d6..e8bdaf0 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/glassPrice/GlassPriceSet.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/glassPrice/GlassPriceSet.vue
@@ -74,7 +74,7 @@
<el-tab-pane :name="3" :label="t('glassPrice.hollow')">
<hollow @getChild="getChild" v-if="tabsValue===3" :basicData="BasicData"/>
</el-tab-pane>
- <el-tab-pane :name="4" :label="t('glassPrice.craft')">
+ <el-tab-pane :name="4" :label="t('glassPrice.process')">
<process @getChild="getChild" v-if="tabsValue===4" :basicData="BasicData"/>
</el-tab-pane>
</el-tabs>
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 6b550b5..f86e40f 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
@@ -323,11 +323,11 @@
return
}
- const project = titleUploadData.value.project
+ /*const project = titleUploadData.value.project
if(project === null || project === undefined || project === ''){
ElMessage.error(t('order.msg.projectCheck'))
return
- }
+ }*/
const customer = titleUploadData.value.customerId
if(customer === null || customer === undefined || customer === ''){
ElMessage.error(t('order.msg.customerCheck'))
@@ -1402,7 +1402,7 @@
<div class="order-primary" style="background-color: white">
<el-row>
<el-col :span="2"><el-text>*{{$t('order.project')}}锛�</el-text></el-col>
- <el-col :span="2"><el-input v-model="titleUploadData.project"/></el-col>
+ <el-col :span="2"><el-input v-model.trim="titleUploadData.project"/></el-col>
<el-col :span="2"><el-text>*{{$t('order.customers')}}锛�</el-text></el-col>
<el-col :span="2">
<el-select v-model="titleUploadData.customerId"
--
Gitblit v1.8.0