From 5545a0d9d5a33592591ba2089d4c095356bdba09 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 25 六月 2024 10:58:58 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue | 6 +
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 8 -
north-glass-erp/northglass-erp/src/lang/ru.js | 2
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi.vue | 9 ++
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue | 2
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 10 ++
north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue | 2
north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue | 29 +++---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue | 44 ----------
north-glass-erp/northglass-erp/src/lang/zh.js | 4
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 109 ++++++++++++++++++++++++---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 4
12 files changed, 143 insertions(+), 86 deletions(-)
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 af39437..474b774 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue
@@ -16,25 +16,26 @@
{column:'height',title:null}
])
const order = ref({
- orderId:'order',
- project:'order',
- orderType:'order',
- customers:'order',
- icon:'order',
- orderClassify:'order',
- packType:'order',
- deliveryDate:'order',
- batch:'order',
- calculateType:'order',
- salesman:'order',
- alType:'order',
- money:'order',
+ orderId:'order.orderId',
+ project:'order.project',
+ orderType:'order.orderType',
+ customerName:'order.customers',
+ icon:'order.icon',
+ orderClassify:'order.orderClassify',
+ packType:'order.packType',
+ deliveryDate:'order.deliveryDate',
+ batch:'order.batch',
+ salesman:'order.salesman',
+ alType:'order.alType',
+ money:'order.money',
contractId:'order',
customerBatch:'order',
contacts:'order',
contactNumber:'order',
deliveryAddress:'order',
processingNote:'order',
+ verifier:'order',
+ productName:'order.orderDetail',
})
const tags = ref([])
@@ -182,7 +183,7 @@
<el-select :placeholder="$t('components.orderHeader')">
<el-option @click="addList(keys,item)"
v-for="(item,keys,index) in order"
- :label="$t(item+'.'+keys)" :value="keys"/>
+ :label="$t(item)" :value="keys"/>
</el-select>
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 eb29571..96f00fe 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
@@ -33,7 +33,7 @@
columns:[
{type: 'seq', title: t('basicData.Number'), width: 80 },
- {field: 'buildingNumber',width:120, title: t('order.floorNumber'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
+ {field: 'buildingNumber',width:120, title: t('order.buildingNumber'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
{field: 'productId',width:140, title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'productName',width:300, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
//{field: 'price',width:140, title: t('order.price'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index 9a59ef2..30df218 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -202,7 +202,7 @@
levelTwo:'袙褌芯褉芯泄 褍褉芯胁械薪褜',
orderDetailsReport:'袨褌褔械褌 芯 写械褌邪谢褟褏 蟹邪泻邪蟹邪',
orderDetailsSummaryReport:'小胁芯写薪褘泄 芯褌褔械褌 芯 蟹邪泻邪蟹邪褏',
- floorNumber:'袧芯屑械褉 褝褌邪卸邪',
+ buildingNumber:'袧芯屑械褉 褝褌邪卸邪',
saveHeader:'袠蟹屑械薪懈褌褜 蟹邪谐芯谢芯胁芯泻 褌邪斜谢懈褑褘',
msg:{
productCheck:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 锌褉芯写褍泻褌',
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 749d176..d588d0c 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -147,7 +147,7 @@
project:'椤圭洰鍚嶇О',
orderId:'閿�鍞崟鍙�',
money:'鎬婚噾棰�',
- customers:"瀹㈡埛閫夋嫨",
+ customers:"瀹㈡埛淇℃伅",
deliveryDate:"浜よ揣鏃ユ湡",
contractId:'鍚堝悓缂栧彿',
orderType:'璁㈠崟绫诲瀷',
@@ -202,7 +202,7 @@
levelTwo:'浜у搧灏忕被',
orderDetailsReport:'璁㈠崟鏄庣粏鎶ヨ〃',
orderDetailsSummaryReport:'璁㈠崟鏄庣粏姹囨�绘姤琛�',
- floorNumber:'妤煎眰缂栧彿',
+ buildingNumber:'妤煎眰缂栧彿',
saveHeader:'淇濆瓨琛ㄥご',
msg:{
productCheck:'璇烽�夋嫨浜у搧',
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
index 939fe77..6a06007 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
@@ -207,7 +207,7 @@
{field: 'computeGrossArea', title: t('processCard.areaToDivided'), width: '60px'},
{field: 'totalThickness', title: t('processCard.totalThickness'), width: '80px'},
{field: 'thickness', title: t('processCard.glassThickness'), width: '60px'},
- {field: 'weight', title: t('processCard.weight')}
+ {field: 'weight', title: t('processCard.weight'),slots:{default:'weight_sum'}}
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -681,6 +681,10 @@
},
}
+const weightSum = (row) =>{
+ return parseFloat((row.baiscQuantity*row.thickness*row.width*row.height*2.5/1000000).toFixed(2))
+}
+
</script>
<template>
@@ -739,6 +743,7 @@
</template>
+
</vxe-grid>
</el-aside>
@@ -785,6 +790,9 @@
</li>
</ul>
</template>
+ <template #weight_sum="{ row }">
+ <span>{{ weightSum(row) }} </span>
+ </template>
<template #num1_filter="{ column, $panel }">
<div>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue
index ed79f96..6e6c272 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue
@@ -136,7 +136,9 @@
/*鎴�*/
.printFlowCard_finished {
+ /*
font-family: 'Microsoft YaHei', '寰蒋闆呴粦', sans-serif;
+ */
flex-wrap: wrap;
font-size: 12pt;
display: flex;
@@ -149,6 +151,7 @@
display: flex;
text-align: center;
flex-direction:column;
+ margin-left: 10px;
width: 100%;
height: 100%;
@@ -191,6 +194,7 @@
.row4{
font-weight: bolder;
text-align: right;
+ margin-right: 10px;
}
.row1,.row2{
@@ -201,7 +205,7 @@
@page {
size: auto; /* auto is the initial value */
- margin: 13mm 0mm 0mm 6mm; /* this affects the margin in the printer settings */
+ margin: 13mm 4mm 0mm 6mm; /* this affects the margin in the printer settings */
}
@media print {
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi.vue
index 6e4a041..672534b 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi.vue
@@ -107,7 +107,11 @@
<div class="row2">{{ item1.order[item.name] }}</div>
</div>
- <div class="row3"><label>W:</label>{{ item1.width }} <label>H:</label>{{ item1.height }}</div>
+ <div class="row3">
+ <label>W:{{ item1.width }}</label>
+
+ <label>H:{{ item1.height }}</label>
+ </div>
</div>
</div>
@@ -122,6 +126,8 @@
body{
overflow: hidden;
+ font-family: 'Microsoft YaHei', '寰蒋闆呴粦', sans-serif;
+
}
#printButton {
@@ -175,6 +181,7 @@
.row1,.row2{
text-align: left;
+ font-weight: bolder;
}
@page {
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue
index fbd9d5b..78e0d09 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue
@@ -106,7 +106,7 @@
<tr v-for="(itemFlow,index) in item.detail" :key="index">
<td colspan="24">
<div id="bj" style="float: right;font-size: 28px">{{ id + 1 }}</div>
- <div>甯稿窞甯傚悏鍒╃幓鐠冩湁闄愬叕鍙�</div>
+ <div>澶╂触鍖楁柟鐜荤拑鎶�鏈偂浠芥湁闄愬叕鍙�</div>
<div>鐢熶骇娴佺▼鍗�</div>
<div style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
itemFlow.process_id
@@ -228,25 +228,6 @@
<td></td>
<td></td>
</tr>
-<!-- <tr>-->
-<!-- <td>鎺ュ彈绛惧悕</td>-->
-<!-- <td></td>-->
-<!-- <td></td>-->
-<!-- <td></td>-->
-<!-- <td></td>-->
-<!-- <td></td>-->
-<!-- <td></td>-->
-<!-- <td></td>-->
-<!-- <td></td>-->
-<!-- <td></td>-->
-<!-- <td></td>-->
-<!-- <td></td>-->
-<!-- <td></td>-->
-<!-- <td></td>-->
-<!-- <td></td>-->
-<!-- <td></td>-->
-<!-- <td></td>-->
-<!-- </tr>-->
<tr>
<td>鐢熶骇鏃ユ湡</td>
<td></td>
@@ -285,33 +266,10 @@
<td></td>
<td></td>
</tr>
- <!-- <tr>-->
- <!-- <td>鏋跺瓙缂栧彿</td>-->
- <!-- <td></td>-->
- <!-- <td></td>-->
- <!-- <td></td>-->
- <!-- <td></td>-->
- <!-- <td></td>-->
- <!-- <td></td>-->
- <!-- <td></td>-->
- <!-- <td></td>-->
- <!-- <td></td>-->
- <!-- <td></td>-->
- <!-- <td></td>-->
- <!-- <td></td>-->
- <!-- <td></td>-->
- <!-- <td></td>-->
- <!-- <td></td>-->
- <!-- <td></td>-->
- <!-- </tr>-->
<tr v-for="(qrCodeItem,index) in item.detail" :key="index">
<td rowspan="2">
<div class='qrCode' style="width: 80px;height: 80px;">
<img :src= qrCodeItem.qrcode>
-<!-- {{-->
-<!-- getUrl(qrCodeItem.process_id)-->
-<!-- }}-->
-
</div>
</td>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
index 95d652c..7b5a29b 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
@@ -56,7 +56,7 @@
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 10)
.toISOString()
.replace('T', ' ')
.slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
index 953e4f2..8517983 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -82,6 +82,11 @@
})
+/*onMounted(() => {
+ //鍚敤琛ㄦ牸鎷栧姩閫変腑
+ addListener(xGrid.value, gridOptions)
+})*/
+
let inputDisabled = ref(false)
onMounted(() =>{
if(route.query.processId !== undefined && route.query.processId!=='' && route.query.processId!=null ){
@@ -172,7 +177,37 @@
trigger: 'click',
mode: 'row',
showStatus: true
- },//琛ㄥご鍙傛暟
+ },
+ /*menuConfig: {
+ body: {
+ options: [
+ [
+ {
+ 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
+ },
+ ]
+ ]
+ }
+ },*/
+ //琛ㄥご鍙傛暟
columns: [
// {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
{
@@ -359,7 +394,59 @@
//鏀瑰彉brokenVisible鐨勫�艰Е鍙憃penedBrokenTable锛堬級鏂规硶
brokenVisible.value = true
- }
+ },
+ /*menuClick({menu, row, column}) {
+ const $grid = xGrid.value
+ if ($grid) {
+ switch (menu.code) {
+ case 'copyChecked' : {
+ let result = toolbarButtonClickEvent()
+ if (result.cell === "completedQuantity"){
+ if (result) {
+ const dataList = xGrid.value.getTableData().visibleData
+ const val = dataList[result.start][result.cell]
+ dataList.forEach((item, index) => {
+ if (index >= result.start && index <= result.end) {
+ item[result.cell] = val
+ }
+ })
+ }
+ }
+
+ break
+ }
+ case 'copyAll' : {
+ let result = toolbarButtonClickEvent()
+ if (result.cell === "completedQuantity" ) {
+ if (result) {
+ const dataList = xGrid.value.getTableData().visibleData
+ const val = dataList[result.start][result.cell]
+ dataList.forEach((item, index) => {
+ if (index >= result.start) {
+ item[result.cell] = val
+ }
+ })
+ }
+ }
+ break
+ }
+ case 'clearChecked' : {
+ let result = toolbarButtonClickEvent()
+ if (result.cell === "completedQuantity" ) {
+ if (result) {
+ const dataList = xGrid.value.getTableData().visibleData
+ dataList.forEach((item, index) => {
+ if (index >= result.start && index <= result.end) {
+ item[result.cell] = ''
+ }
+ })
+ }
+ }
+ break
+ }
+ }
+ }
+ },*/
}
@@ -820,11 +907,13 @@
ElMessage.warning(t('reportingWorks.selectProcess'))
return
}
-
- if (titleSelectJson.value.thisProcessType.indexOf(process) === -1 && process !== t('machine.cutting') && titleSelectJson.value.thisProcessType !== "") {
- ElMessage.warning(t('reportingWorks.thisProcessNotProcessCard'))
- return
+ if (titleSelectJson.value.thisProcessType.length!=0){
+ if (titleSelectJson.value.thisProcessType.indexOf(process) === -1 && process !== t('machine.cutting')) {
+ ElMessage.warning(t('reportingWorks.thisProcessNotProcessCard'))
+ return
+ }
}
+
//鍖归厤鈥�/鈥濆墠鍚庡瓧绗︿覆
const regex = /([^\/]+)\/([^\/]+)/;
//鏌ユ壘鍖归厤鐨勫瓧绗︿覆
@@ -1192,9 +1281,7 @@
<!-- 鍒虹牬绫诲瀷breakageType -->
<template #breakageType="{ row }">
<vxe-select v-model="row.breakageType "
- filterable
- clearable
- placeholder="">
+ clearable placeholder=" " allow-create filterable>
<vxe-option v-for="item in titleSelectJson.breakageType" :key="item.id" :label="item.basic_name" :value="item.basic_name"/>
</vxe-select>
</template>
@@ -1205,9 +1292,7 @@
<!--娆＄牬鍘熷洜-->
<template #breakageReason="{ row }">
<vxe-select v-model="row.breakageReason "
- filterable
- clearable
- placeholder="">
+ clearable placeholder=" " allow-create filterable>
<vxe-option v-for="item in titleSelectJson.breakageReason" :key="item.id" :label="item.basic_name" :value="item.basic_name"/>
</vxe-select>
</template>
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 8df08ec..1b1da57 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
@@ -143,7 +143,7 @@
{type: 'seq',fixed:"left", title: t('basicData.Number'), width: 80 },
{field: 'productId',width:140, title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'productName',width:300, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'buildingNumber',width:120, title: t('order.floorNumber'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
+ {field: 'buildingNumber',width:120, title: t('order.buildingNumber'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
{field: 'price',width:140, title: t('order.price'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'grossAmount',width:160, title: t('order.grossAmount'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'width',width:120, title: t('order.width') ,editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
@@ -427,12 +427,6 @@
)
saveOrderTitle(order)
-
-
-
-
-
-
}
break
}
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index b7cef34..3fad827 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -637,8 +637,8 @@
od.order_number = fc.order_number
where fc.process_id = #{processId}
and fc.technology_number=#{technologyNumber}
- group by od.order_number,width,height
-
+ group by od.order_number,width,height
+ order by IF(fc.sort!=NULL||fc.sort!='',fc.sort,fc.order_number)
</select>
<select id="getPrintLabelCount">
--
Gitblit v1.8.0