From 8c44ebfa4643b44215e15753c4ec93552f71c213 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 17 六月 2024 15:56:04 +0800
Subject: [PATCH] 提交组件中文变量
---
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/OrderAllocation.vue | 2
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/MaterialOutbound.vue | 2
north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue | 2
north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue | 2
north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue | 32 ++++----
north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue | 2
north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue | 2
north-glass-erp/northglass-erp/src/lang/zh.js | 17 ++++
north-glass-erp/northglass-erp/src/components/BasicTable.vue | 12 +-
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue | 4
north-glass-erp/northglass-erp/src/components/sd/order/OrderCraftDetail.vue | 2
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductReturn.vue | 2
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue | 2
north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue | 2
north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue | 4
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue | 2
north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue | 38 ++++----
north-glass-erp/northglass-erp/src/components/sd/order/OrderSizeCheck.vue | 14 +-
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorage.vue | 2
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedGoodsIssue.vue | 2
north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue | 22 ++--
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue | 2
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue | 2
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TransferRecord.vue | 2
north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue | 2
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductRework.vue | 2
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ReworkRecord.vue | 2
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStockList.vue | 2
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/CreateOutBound.vue | 2
north-glass-erp/northglass-erp/src/components/sd/product/BasicTable.vue | 13 +-
north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue | 4
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue | 2
north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue | 2
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/StorageRecord.vue | 2
north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue | 2
north-glass-erp/northglass-erp/src/views/pp/Replenish/AddReplenish.vue | 2
north-glass-erp/northglass-erp/src/components/sd/product/GlassType.vue | 4
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue | 2
38 files changed, 118 insertions(+), 100 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/BasicTable.vue b/north-glass-erp/northglass-erp/src/components/BasicTable.vue
index 7ceaba3..76d5f79 100644
--- a/north-glass-erp/northglass-erp/src/components/BasicTable.vue
+++ b/north-glass-erp/northglass-erp/src/components/BasicTable.vue
@@ -47,7 +47,7 @@
options: [
[
- { code: 'exportExcelChecked', name: '瀵煎嚭閫変腑', prefixIcon: 'vxe-icon-download', visible: true }
+ { code: 'exportExcelChecked', name: t('components.exportSelected'), prefixIcon: 'vxe-icon-download', visible: true }
]
]
}
@@ -72,7 +72,7 @@
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')
}
if (props.childrenData.footList.includes(column.field)) {
return sumNum(data, column.field)
@@ -191,8 +191,8 @@
<el-date-picker
v-model="basicProp.selectDate"
type="daterange"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿"
+ :start-placeholder="$t('basicData.startDate')"
+ :end-placeholder="$t('basicData.endDate')"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
/>
@@ -201,7 +201,7 @@
id="searchButton"
type="primary"
style="margin-top: -5px"
- :icon="Search">鏌ヨ</el-button>
+ :icon="Search">{{$t('basicData.search')}}</el-button>
<div class="order-detail">
<vxe-grid
@filter-change="filterChanged"
@@ -234,7 +234,7 @@
@click="exportExcel(props.childrenData.exportUrl,
props.childrenData.exportName,
basicProp.selectDate)">
- 瀵煎嚭</vxe-button>
+ {{$t('basicData.export')}}</vxe-button>
</template>
<template #pager>
diff --git a/north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue b/north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue
index 331b65a..f63d8fe 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue
@@ -61,11 +61,11 @@
})
const saveTag = () => {
- ElMessageBox.prompt( '鏂板鏍囩鍚�:', {
- confirmButtonText: '淇濆瓨',
- cancelButtonText: '鍙栨秷',
+ ElMessageBox.prompt( t('components.addNewSignature')+':', {
+ confirmButtonText: t('basicData.save'),
+ cancelButtonText: t('basicData.cancelButtonText'),
inputPattern:/^.{1,20}$/,
- inputErrorMessage: '璇疯緭鍏�20涓瓧绗︿互鍐呯殑涓斾笉涓虹┖鐨勫瓧绗�',
+ inputErrorMessage: t('components.message'),
inputValue:tag.value.name
}).then(({ value }) => {
tag.value.name = value
@@ -73,7 +73,7 @@
tag.value.size = JSON.stringify(size.value)
request.post('tagStyle/saveTag',tag.value).then(res => {
if(res.code === '200' && res.data===true){
- ElMessage.success("淇濆瓨鎴愬姛")
+ ElMessage.success(t('basicData.msg.saveSuccess'))
getTags()
}
})
@@ -130,7 +130,7 @@
const deleteTag = () => {
request.post(`tagStyle/deleteTag/${tag.value.id}`).then(res => {
if(res.code === '200' && res.data===true){
- ElMessage.success("鍒犻櫎鎴愬姛")
+ ElMessage.success(t('basicData.msg.deleteSuccess'))
getTags()
close()
}
@@ -159,7 +159,7 @@
<el-container style="width: 100%;height: 100%;">
<el-aside width="200px">
<el-collapse v-model="activeName" accordion>
- <el-collapse-item title="鏍囩鍒楄〃" name="1">
+ <el-collapse-item :title="$t('components.orderHeader')" name="1">
<div v-for="(tag,index) in tags"
:class="{'tag-active':index===clickIndex}"
@dblclick="searchTag(tag,index)">
@@ -176,8 +176,8 @@
v-model="tag.type"
@change="changeType"
placeholder="" >
- <el-option label="鎴愬搧" :value="1"/>
- <el-option label="鍗婃垚鍝�" :value="2"/>
+ <el-option :label="$t('components.finishedProduct')" :value="1"/>
+ <el-option :label="$t('components.semiFinishedProducts')" :value="2"/>
</el-select>
<el-select placeholder="璁㈠崟琛ㄥご">
<el-option @click="addList(keys,item)"
@@ -230,22 +230,22 @@
<el-footer style="padding-top: 0.5rem">
<el-popconfirm
width="220"
- confirm-button-text="纭畾"
- cancel-button-text="鍙栨秷"
+ :confirm-button-text="$t('basicData.confirmButtonText')"
+ :cancel-button-text="$t('basicData.cancelButtonText')"
:icon="InfoFilled"
icon-color="#626AEF"
- title="纭畾鍒犻櫎?"
+ :title="$t('searchOrder.deleteConfirm')"
@confirm="deleteTag"
v-if="tag.id!==null"
>
<template #reference>
- <el-button type="primary" style="float: left" >鍒犻櫎</el-button>
+ <el-button type="primary" style="float: left" >{{ $t('basicData.delete') }}</el-button>
</template>
</el-popconfirm>
- <el-button type="primary" @click="clearList">娓呯┖</el-button>
- <el-button v-if="tag.id===null" type="primary" @click="saveTag" >鏂板</el-button>
- <el-button v-else type="primary" @click="saveTag" >淇敼</el-button>
+ <el-button type="primary" @click="clearList">{{ $t('basicData.empty') }}</el-button>
+ <el-button v-if="tag.id===null" type="primary" @click="saveTag" >{{ $t('basicData.insert') }}</el-button>
+ <el-button v-else type="primary" @click="saveTag" >{{ $t('basicData.update') }}</el-button>
</el-footer>
</el-container>
</el-container>
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderCraftDetail.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderCraftDetail.vue
index e6b3b98..1e06987 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderCraftDetail.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderCraftDetail.vue
@@ -91,7 +91,7 @@
</template>
<template #default_shape="{ row }">
- <span>{{ row.shape==='1'?'鏅舰':row.shape==='2'?'寮傚舰':null }}</span>
+ <span>{{ row.shape==='1'?$t('order.universalShape'):row.shape==='2'?$t('order.alien'):null }}</span>
</template>
</vxe-grid>
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue
index 23a7d0a..39ed303 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue
@@ -93,7 +93,7 @@
</template>
<template #default_shape="{ row }">
- <span>{{ row.shape==='1'?'鏅舰':row.shape==='2'?'寮傚舰':null }}</span>
+ <span>{{ row.shape==='1'?$t('order.universalShape'):row.shape==='2'?$t('order.alien'):null }}</span>
</template>
</vxe-grid>
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 622e4a3..5d00ac4 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
@@ -38,10 +38,10 @@
},//琛ㄥご鍙傛暟
columns:[
// {field: 'buildingNumber',width:120, title: '妤煎彿',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
- {field: 'alias', title:'鍏朵粬鍔犲伐',minWith:'130'},
- {field: 'price', title:'鍗曚环',editRender: { name: 'input'}},
- {field: 'quantity', title:'鏁伴噺' },
- {field: 'money', slots:{default:'default'}, title:'閲戦'}
+ {field: 'alias', title:t('components.otherProcessing'),minWith:'130'},
+ {field: 'price', title:t('order.price'),editRender: { name: 'input'}},
+ {field: 'quantity', title:t('order.quantity')},
+ {field: 'money', slots:{default:'default'}, title:t('delivery.money')}
],
//琛ㄥ崟楠岃瘉
editRules: {
@@ -69,8 +69,8 @@
},
toolbarConfig: {
buttons: [
- {'code': 'add', 'name': '鏂板',status: 'primary'},
- {'code': 'delete', 'name': '鍒犻櫎',status: 'primary'}
+ {'code': 'add', 'name': t('basicData.insert'),status: 'primary'},
+ {'code': 'delete', 'name': t('basicData.delete'),status: 'primary'}
],
@@ -116,7 +116,7 @@
}
case 'delete': {
if(rowClickIndex.value === null){
- ElMessage.warning('璇峰厛鍗曞嚮閫夋嫨琛�')
+ ElMessage.warning(t('components.pleaseClickToSelectARowFirst'))
return
}
deleteColum(rowClickIndex.value.id)
@@ -160,7 +160,7 @@
const validate = async () => {
const errMap = await xGrid.value.validate(true)
if (errMap) {
- ElMessage.error(`鏍￠獙涓嶉�氳繃锛乣)
+ ElMessage.error(t('basicData.msg.checkoutLose'))
return false
}
return true
@@ -171,22 +171,22 @@
const addColumn = () => {
- ElMessageBox.prompt( '鏂板鍒楀悕:', {
- confirmButtonText: '鏂板',
- cancelButtonText: '鍙栨秷',
+ ElMessageBox.prompt( t('components.addColumnNames')+':', {
+ confirmButtonText: t('basicData.insert'),
+ cancelButtonText: t('basicData.cancelButtonText'),
inputPattern:/^.{1,20}$/,
- inputErrorMessage: '璇疯緭鍏�20涓瓧绗︿互鍐呯殑涓斾笉涓虹┖鐨勫瓧绗�',
+ inputErrorMessage: t('components.message'),
})
.then(({ value }) => {
request.post('/basicOtherMoney/save',{alias:value}).then(res=>{
if (res.code==='200' && res.data!==false){
- ElMessage.success('鏂板鎴愬姛')
+ ElMessage.success(t('basicData.msg.saveSuccess'))
setTimeout(()=>{
window.location.reload()
},1500)
}else{
- ElMessage.error('鏂板澶辫触,涓嶈兘閲嶅娣诲姞鎴栬秴杩�100鏉″垪')
+ ElMessage.error(t('basicData.msg.saveFail'))
}
})
})
@@ -195,23 +195,23 @@
const deleteColum = (id) => {
ElMessageBox.confirm(
- '纭鍒犻櫎姝ゅ垪鍚�?',
+ t('searchOrder.deleteConfirm'),
'Warning',
{
- confirmButtonText: '鍒犻櫎',
- cancelButtonText: '鍙栨秷',
+ confirmButtonText: t('basicData.confirmButtonText'),
+ cancelButtonText: t('basicData.cancelButtonText'),
type: 'warning',
}
)
.then(() => {
request.post(`/basicOtherMoney/deleteById/${id}`,).then(res=>{
if (res.code==='200' && res.data!==false){
- ElMessage.success('鍒犻櫎鎴愬姛')
+ ElMessage.success(t('basicData.msg.deleteSuccess'))
setTimeout(()=>{
window.location.reload()
},1500)
}else{
- ElMessage.error('鍒犻櫎澶辫触')
+ ElMessage.error(t('basicData.msg.deleteFail'))
}
})
})
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
index c9436c7..82570e0 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
@@ -44,19 +44,19 @@
orderId:null
})
const columns = [
- {field: 'order_number',fixed:"left", width: 90,title: '璁㈠崟搴忓彿',showOverflow:"ellipsis"},
+ {field: 'order_number',fixed:"left", width: 90,title: t('order.OrderNum'),showOverflow:"ellipsis"},
// {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- {field: 'product_name', width: 150, title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
- {field: 'glass_child',width: 130, title: '鍗曠墖鍚嶇О' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
- {field: 'order_type', width: 120,title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
- {field: 'process_id',width: 110, title: '娴佺▼鍗″彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+ {field: 'product_name', width: 150, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+ {field: 'glass_child',width: 130, title: t('reportingWorks.glassChild') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+ {field: 'order_type', width: 120,title: t('order.orderType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+ {field: 'process_id',width: 110, title: t('processCard.processId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
- {field: 'technology_number', width: 90,title: '灏忕墖椤哄簭',showOverflow:"ellipsis"},
- {field: 'quantity', width: 90,title: '鏁伴噺'},
- {field: 'shippedQuantity',width: 120, title: '鍙戣揣鏁伴噺'},
- {field: 'inventory',width: 120, title: '搴撳瓨鏁伴噺'},
- {field: 'inventoryArea',width: 120, title: '搴撳瓨闈㈢Н'},
- {field: 'broken_num',width: 90, title: '娆＄牬鏁伴噺'},
+ {field: 'technology_number', width: 90,title: t('processCard.technologyNumber'),showOverflow:"ellipsis"},
+ {field: 'quantity', width: 90,title: t('order.quantity')},
+ {field: 'shippedQuantity',width: 120, title: t('delivery.deliveryQuantity')},
+ {field: 'inventory',width: 120, title: t('productStock.inventoryQuantity')},
+ {field: 'inventoryArea',width: 120, title: t('report.inventoryArea')},
+ {field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
]
let column = [0,1,3,6,7,8,9]
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderSizeCheck.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderSizeCheck.vue
index ca27479..74c0da1 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderSizeCheck.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderSizeCheck.vue
@@ -16,7 +16,7 @@
id:'sizeCheck',
toolbarConfig: {
buttons: [
- {'code': 'review', 'name': '瀹℃牳',status: 'primary'},
+ {'code': 'review', 'name': t('basicData.review'),status: 'primary'},
]
},
@@ -49,19 +49,19 @@
storage: true
},
columns:[
- {field: 'width', title: '瀹�',editRender: { name: 'input'}},
- {field: 'height', title:'楂�', editRender: { name: 'input'}},
- {field: 'quantity', title: '鏁伴噺' ,editRender: { name: 'input'}, },
+ {field: 'width', title: t('order.width'),editRender: { name: 'input'}},
+ {field: 'height', title:t('order.height'), editRender: { name: 'input'}},
+ {field: 'quantity', title: t('order.quantity') ,editRender: { name: 'input'}, },
],
editRules: {
width: [
- { required: true, message: '蹇呭～,鍙傛暟涓嶄竴鑷�' }
+ { required: true, message: t('components.inconsistentParameters') }
],
height: [
- { required: true, message: '蹇呭～,鍙傛暟涓嶄竴鑷�' }
+ { required: true, message:t('components.inconsistentParameters') }
],
quantity: [
- { required: true, message: '蹇呭～,鍙傛暟涓嶄竴鑷�' }
+ { required: true, message:t('components.inconsistentParameters') }
]
}
})
diff --git a/north-glass-erp/northglass-erp/src/components/sd/product/BasicTable.vue b/north-glass-erp/northglass-erp/src/components/sd/product/BasicTable.vue
index 9a15137..b870edd 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/product/BasicTable.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/product/BasicTable.vue
@@ -28,8 +28,8 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button @click="gaveParent(row,'edit')" link type="primary" size="small">缂栬緫</el-button>
- <el-button @click="gaveParent(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>
+ <el-button @click="gaveParent(row,'edit')" link type="primary" size="small">{{ $t('basicData.edit') }}</el-button>
+ <el-button @click="gaveParent(row,'delete')" link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
</template>
<template #num1_filter="{ column, $panel }">
@@ -52,9 +52,10 @@
import deepClone from "@/utils/deepClone";
import {ElMessage} from "element-plus";
import router from "@/router";
+import {useI18n} from "vue-i18n";
//prop鎺ユ敹鐖剁粍浠跺嚱鏁�
-
+const { t } = useI18n()
let props = defineProps({
tableProp:{
@@ -154,7 +155,7 @@
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')
}
if (props.tableProp.footList.includes(column.field)) {
return sumNum(data, column.field)
@@ -172,7 +173,7 @@
switch (code) {
case 'checkList': {
if($grid.getCheckboxRecords().length==0){
- VXETable.modal.message( '璇烽�夋嫨涓�鏉℃暟鎹紒')
+ VXETable.modal.message( t('searchOrder.msg'))
return
}
emit('getCheckList',$grid.getCheckboxRecords())
@@ -188,7 +189,7 @@
}
case 'mySave': {
const { insertRecords, removeRecords, updateRecords } = $grid.getRecordset()
- VXETable.modal.message({ content: `鏂板 ${insertRecords.length} 鏉★紝鍒犻櫎 ${removeRecords.length} 鏉★紝鏇存柊 ${updateRecords.length} 鏉, status: 'success' })
+ VXETable.modal.message({ content: `${t('basicData.insert')} ${insertRecords.length} ${t('components.strip')}锛�${t('basicData.delete')} ${removeRecords.length} ${t('components.strip')}锛�${t('basicData.update')} ${updateRecords.length} ${t('components.strip')}`, status: 'success' })
break
}
case 'myExport': {
diff --git a/north-glass-erp/northglass-erp/src/components/sd/product/GlassType.vue b/north-glass-erp/northglass-erp/src/components/sd/product/GlassType.vue
index 0424c7f..cf0b761 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/product/GlassType.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/product/GlassType.vue
@@ -3,6 +3,8 @@
import deepClone from "@/utils/deepClone";
import {ElMessage} from "element-plus";
import useProductGlassTypeStore from "@/stores/sd/product/productGlassType"
+import {useI18n} from "vue-i18n";
+const { t } = useI18n()
let productGlassTypeStore = useProductGlassTypeStore()
let options=$ref([])
@@ -25,7 +27,7 @@
v-model="productGlassTypeStore.GlassType"
:options="options"
clearable
- placeholder="鐜荤拑绫诲埆"
+ :placeholder="$t('orderBasicData.glassCategory')"
/>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 50cfeaa..4c5c6ed 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -56,6 +56,7 @@
reportForms:'鎶ヨ〃',
print:'鎵撳嵃',
export:'瀵煎嚭',
+ empty:'娓呯┖',
msg:{
max255:"鏈�澶氳緭鍏�255涓瓧绗�",
range99999Dec2:
@@ -240,7 +241,7 @@
msgDelete:'宸插鏍哥殑璁㈠崟涓嶈兘鍒犻櫎',
msgDeleteFail:'鍒犻櫎澶辫触',
msgDeleteSuccess:'鍒犻櫎鎴愬姛',
- deleteConfirm:'纭鍒犻櫎璁㈠崟?',
+ deleteConfirm:'纭鍒犻櫎?',
orderType:'璁㈠崟绫诲瀷',
processFlows:'娴佺▼鍗¤繘搴�',
copy:'澶嶅埗璁㈠崟',
@@ -855,6 +856,20 @@
operateType :'鍒О',
type :'绫诲瀷',
takeOut :'棰嗗嚭',
+ },
+ components:{
+ addNewSignature :'鏂板鏍囩鍚�',
+ addColumnNames :'鏂板鍒楀悕',
+ message :'璇疯緭鍏�20涓瓧绗︿互鍐呯殑涓斾笉涓虹┖鐨勫瓧绗�',
+ activeName :'鏍囩鍒楄〃',
+ orderHeader :'璁㈠崟琛ㄥご',
+ finishedProduct :'鎴愬搧',
+ semiFinishedProducts :'鍗婃垚鍝�',
+ pleaseClickToSelectARowFirst :'璇峰厛鍗曞嚮閫夋嫨琛�',
+ otherProcessing :'鍏朵粬鍔犲伐',
+ inconsistentParameters :'蹇呭～,鍙傛暟涓嶄竴鑷�',
+ strip :'鏉�',
+ exportSelected :'瀵煎嚭閫変腑',
}
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue
index d6b4359..a95dc65 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue
@@ -236,7 +236,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'SelectIngredients',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/CreateOutBound.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/CreateOutBound.vue
index c92152c..f6f38a8 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/CreateOutBound.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/CreateOutBound.vue
@@ -418,7 +418,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'CreateOutBound',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/MaterialOutbound.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/MaterialOutbound.vue
index 4741bc1..f4b7fd3 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/MaterialOutbound.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/MaterialOutbound.vue
@@ -173,7 +173,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'MaterialOutbound',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorage.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorage.vue
index 278bd9d..9913f75 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorage.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorage.vue
@@ -177,7 +177,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'ReturnToStorage',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue
index e43ded8..daedfdc 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue
@@ -444,7 +444,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'OrderList',
+ id: 'ReturnToStorageCreate',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
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 01ff989..4e76d0a 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
@@ -259,7 +259,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'SelectIngredientsStock',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -442,7 +442,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'SelectIngredientsStocks',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue
index 91c8389..346e67e 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue
@@ -177,7 +177,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'CreateProductStock',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedGoodsIssue.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedGoodsIssue.vue
index 0cf4cfc..c5e4354 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedGoodsIssue.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedGoodsIssue.vue
@@ -261,7 +261,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'FinishedGoodsIssue',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
index c500a3e..25ae591 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
@@ -181,7 +181,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'FinishedProductOut',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductReturn.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductReturn.vue
index cd81683..1c928b4 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductReturn.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductReturn.vue
@@ -29,7 +29,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'FinishedProductReturn',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductRework.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductRework.vue
index 394d804..b88c4eb 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductRework.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductRework.vue
@@ -258,7 +258,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'FinishedProductRework',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/OrderAllocation.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/OrderAllocation.vue
index c8b3d1e..ca29bf8 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/OrderAllocation.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/OrderAllocation.vue
@@ -172,7 +172,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'OrderAllocation',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStockList.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStockList.vue
index 03a6ac6..ca1e2ae 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStockList.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStockList.vue
@@ -165,7 +165,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'ProductStockList',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ReworkRecord.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ReworkRecord.vue
index e3dcd64..e3992ab 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ReworkRecord.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ReworkRecord.vue
@@ -168,7 +168,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'ReworkRecord',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/StorageRecord.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/StorageRecord.vue
index 68000ab..fde30a8 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/StorageRecord.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/StorageRecord.vue
@@ -178,7 +178,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'StorageRecord',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue
index 7138452..de88ba7 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue
@@ -168,7 +168,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'TakeOutRecord',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TransferRecord.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TransferRecord.vue
index eefd263..dcb357b 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TransferRecord.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TransferRecord.vue
@@ -172,7 +172,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'TransferRecord',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/Replenish/AddReplenish.vue b/north-glass-erp/northglass-erp/src/views/pp/Replenish/AddReplenish.vue
index e44c4de..477c0bf 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/Replenish/AddReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/Replenish/AddReplenish.vue
@@ -58,7 +58,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'AddReplenish',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue b/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue
index d9cfbaa..307b7a2 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue
@@ -84,7 +84,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'SelectReplenish',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue b/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
index 5f158f4..ed3c235 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
@@ -68,7 +68,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'AddRework',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue b/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue
index 3a2c7c3..6ddeeec 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue
@@ -92,7 +92,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'SelectRework',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
index 675bfbe..001dd58 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
@@ -255,8 +255,8 @@
{field: 'order.batch', title: t('order.batch'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
{field: 'order.project', title: t('order.project'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 210},
{field: 'order.orderType', title: t('order.orderType'), showOverflow: "ellipsis", width: 110},
- {field: 'orderDetail.grossArea', title: t('order.orderType'), width: 70},
- {field: 'orderDetail.quantity', title: t('order.grossArea'),},
+ {field: 'orderDetail.grossArea', title: t('order.grossArea'), width: 70},
+ {field: 'orderDetail.quantity', title: t('order.quantity'),},
{field: 'order.creator', title: t('order.creator'),},
],//琛ㄥご鎸夐挳
data: null,//琛ㄦ牸鏁版嵁
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 1945d2c..a65de04 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
@@ -58,7 +58,7 @@
ElMessage.error(t('customer.pleaseEnterTheCustomerName'))
return
}
- const grade = ruleForm.value.grade
+ /*const grade = ruleForm.value.grade
if(grade === null || grade === undefined || grade === ''){
ElMessage.error(t('customer.pleaseEnterCustomerLevel'))
return
@@ -67,7 +67,7 @@
if(moneyLimit === null || moneyLimit === undefined || moneyLimit === ''){
ElMessage.error(t('customer.pleaseEnterTheAmountOfFunds'))
return
- }
+ }*/
const address = ruleForm.value.address
if(address === null || address === undefined || address === ''){
ElMessage.error(t('customer.pleaseEnterTheContactAddress'))
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 072d87d..48aa5f0 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
@@ -172,7 +172,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'SelectCustomer',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue
index cd94656..2a78b0d 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue
@@ -164,7 +164,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'OrderList',
+ id: 'SelectCustomerOrder',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
index 6120917..1c606f4 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
@@ -253,7 +253,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'OrderList',
+ id: 'CreateDelivery',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
index 53fb105..9f86dc8 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
@@ -202,7 +202,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'OrderList',
+ id: 'SelectDelivery',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue
index ac09b09..f2b6540 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue
@@ -159,7 +159,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'OrderList',
+ id: 'SelectOrderList',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
--
Gitblit v1.8.0