From 47cf5518f0f61dbf8066c2273b9f77c2cd7b1751 Mon Sep 17 00:00:00 2001
From: YLouie <929705085@qq.com>
Date: 星期五, 19 九月 2025 17:56:03 +0800
Subject: [PATCH] 销售订单plm同步
---
src/views/plan/manufacturingorder/index.vue | 207 ++++++++++++++++++---------------------------------
1 files changed, 75 insertions(+), 132 deletions(-)
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index 3301064..4afae3b 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -100,14 +100,16 @@
>鍒锋柊ifs杞﹂棿璁㈠崟鍙�
</el-button> -->
- <el-button
+ <!-- <el-button
+ v-if="permissions.manufacturingorder_export"
@click="exportExcel"
type="primary"
style="margin-left:10px;"
:loading="loadingExcel"
>瀵煎嚭
- </el-button>
+ </el-button> -->
<el-button
+ v-if="permissions.manufacturingorder_label_print"
@click="labelPrint"
type="primary"
style="margin-left:10px;"
@@ -202,41 +204,56 @@
<el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="28%" top="5vh">
<div style="width:100%;height: 400px;overflow-y: auto;">
<div class="dia_body">
- <el-checkbox
+ <el-checkbox
style="margin: 10px 5px;"
- :indeterminate="isIndeterminate"
- v-model="checkAll"
+ :indeterminate="isIndeterminate"
+ v-model="checkAll"
@change="handleCheckAllChange">鍏ㄩ��</el-checkbox>
<el-checkbox-group @change="changePrintCode()" v-model="checkIndexList">
<el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px; font-size: 16px !important;">
<el-checkbox :label="i" :key="i" style="position: relative;top:-20px;left:5px"><br></el-checkbox>
- <!-- <el-row>
- <el-col :span="10" :offset="3">鎵规鍙�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.code.moNo2 }}</el-col>
- </el-row>
- <el-row>
- <el-col :span="10" :offset="3">璁㈠崟鍙凤細</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.orderNo }}</el-col>
- </el-row>
- <el-row>
- <el-col :span="10" :offset="3">瀹㈡埛鍚嶇О锛�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.cName }}</el-col>
- </el-row>
- <el-row>
- <el-col :span="10" :offset="3">闆朵欢鍚嶇О锛�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.pName }}</el-col>
- </el-row>
- <el-row>
- <el-col :span="10" :offset="3">杞﹂棿璁㈠崟浜岀淮鐮侊細</el-col>
- <el-col :span="10">
- <vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
- </el-col>
- </el-row> -->
<div>
<el-row style="font-size: 14px;padding-left: 20px;">
<el-col style="font-weight: bold;">{{ item.pName }}</el-col>
</el-row>
- <div style="display: flex;">
+ <div style="display: flex;">
+ <div>
+ <el-col :span="8" :offset="4">
+ <vueQr :text="JSON.stringify(item.code)" :size="120" :margin="2"></vueQr>
+ </el-col>
+ </div>
+ <div style="margin-left: 50px;width: 100%;">
+ <el-row>
+ <el-col style="font-weight: bold;font-size: 14px;"><span>鎵� 娆� 鍙�: </span>{{ item.code.moNo2 }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 6px;font-size: 14px;">
+ <el-col style="font-weight: bold;"><span>璁� 鍗� 鍙�: </span>{{ item.orderNo }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 6px;font-size: 14px;">
+ <el-col style="font-weight: bold;"><span>瀹㈡埛鍚嶇О: </span>{{ item.cName }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 6px;font-size: 14px;">
+ <el-col style="font-weight: bold;"><span>闆� 浠� 鍙�: </span>{{ item.partNo }}</el-col>
+ </el-row>
+ </div>
+ </div>
+ </div>
+ </el-card>
+ </el-checkbox-group>
+ </div>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="diaPrintTab = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="printFun">鎵� 鍗�</el-button>
+ </span>
+ </el-dialog>
+ <div class="el-dialog__body" style="width:448.8px;overflow-y: auto;position: absolute;top:9999px;margin-top: 0;">
+ <div id="printMOrder">
+ <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="margin-top-top:0px;margin-bottom:10px;font-size: 10px !important;page-break-before:always;page-break-after: always;">
+ <el-row style="font-size: 14px;padding-left: 20px;">
+ <el-col style="font-weight: bold;">{{ item.pName }}</el-col>
+ </el-row>
+ <div style="display: flex;">
<div>
<el-col :span="8" :offset="4">
<vueQr :text="JSON.stringify(item.code)" :size="120" :margin="2"></vueQr>
@@ -253,42 +270,7 @@
<el-col style="font-weight: bold;"><span>瀹㈡埛鍚嶇О: </span>{{ item.cName }}</el-col>
</el-row>
</div>
- </div>
- </div>
- </el-card>
- </el-checkbox-group>
- </div>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="diaPrintTab = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="printFun">鎵� 鍗�</el-button>
- </span>
- </el-dialog>
- <div class="el-dialog__body" style="width:448.8px;overflow-y: auto;position: absolute;top:9999px;margin-top: 0;">
- <div id="printMOrder">
- <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="margin-top-top:0px;margin-bottom:10px;font-size: 16px !important;">
- <el-row style="font-size:12px;">
- <el-col :span="10" :offset="3">鎵规鍙�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.code.moNo2 }}</el-col>
- </el-row>
- <el-row style="font-size:12px;">
- <el-col :span="10" :offset="3">璁㈠崟鍙凤細</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.orderNo }}</el-col>
- </el-row>
- <el-row style="font-size:12px;">
- <el-col :span="10" :offset="3">瀹㈡埛鍚嶇О锛�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.cName }}</el-col>
- </el-row>
- <el-row style="font-size:12px;">
- <el-col :span="10" :offset="3">闆朵欢鍚嶇О锛�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.pName }}</el-col>
- </el-row>
- <el-row style="font-size:12px;">
- <el-col :span="10" :offset="3">璁㈠崟浜岀淮鐮侊細</el-col>
- <el-col :span="10">
- <vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
- </el-col>
- </el-row>
+ </div>
</el-card>
</div>
</div>
@@ -427,6 +409,16 @@
data: [],
// 鏍囬
column: [
+ {
+ minWidth: '120',
+ prop: 'moNo',
+ label: '杞﹂棿璁㈠崟鍙�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ render: { fun: this.addOrUpdateHandle }
+ },
{
minWidth: '140',
prop: 'state',
@@ -568,16 +560,7 @@
return this.bomTypeDbOptions
}
},
- {
- minWidth: '120',
- prop: 'moNo',
- label: '杞﹂棿璁㈠崟鍙�',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- render: { fun: this.addOrUpdateHandle }
- },
+
{
minWidth: '120',
prop: 'manufactureAttr',
@@ -1019,21 +1002,6 @@
},
created() {
this.getManufactureAttrs()
- /**
- * {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- },
- {
- text: '鎸夊鎴疯鍗曟煡璇�',
- fun: this.getOperationTaskByCustomer
- },
- {
- text: '璁㈠崟鍚堝苟',
- fun: this.openOrderMerge
- }
- */
if (this.permissions.plan_manufacturingorder_add) {
this.table.toolbar.push({
text: '鏂板',
@@ -1047,28 +1015,6 @@
fun: this.getOperationTaskByCustomer
})
}
- // if (this.permissions.manufacturingorder_order_merge) {
- // this.table.toolbar.push({
- // text: '璁㈠崟鍚堝苟',
- // fun: this.openOrderMerge
- // })
- // }
-
- /**
- * {
- label: '鎵嬪姩鏂板',
- command: 'MANUAL',
- disabled: false,
- permitArr: ['01planned', '02issued']
- },
- {
- label: '鑷姩鏂板',
- command: 'AUTO',
- disabled: false,
- permitArr: ['01planned', '02issued']
- }
- */
-
if (this.permissions.manufacturingorder_create_task_manual) {
this.taskTypeArr.push({
label: '鎵嬪姩鏂板',
@@ -1085,21 +1031,7 @@
permitArr: ['01planned', '02issued']
})
}
- // 鍒濆鍖杚ueryParam
- // this.initSearchCondition()
- // if (!this.options.cancelRunCreated) {
- // this.getDataList()
- // }
- // const queryParam = []
- // queryParam.push(
- // Object.assign({
- // prop: 'state',
- // searchInfoType: 'select',
- // propVal: '01planned'
- // })
- // )
- // this.$refs.manufacturingOrderTable.setQueryParam(queryParam)
- // this.getData()
+
this.getBomTypeDbOptions()
// 杞﹂棿璁㈠崟鏄惁鍚屾IFS
@@ -1169,10 +1101,10 @@
printable: 'printMOrder',//椤甸潰
type: "html",//鏂囨。绫诲瀷
maxWidth:450,
- targetStyles:['*'],
+ targetStyles:['*'],
style: `@page {
margin:0;
- size: 360px 175px;
+ size: 360px 175px landscape;
}
html{
zoom:100%;
@@ -1188,13 +1120,18 @@
});
},
//鍒濆鍖栦簩缁寸爜鏍囩鏁版嵁
- initQrData(data){
+ initQrData(data) {
this.qrData = []
if(data){
- console.log(data);
+ console.log(data)
+ let str = null
+ if (data.partDescription) {
+ let splitData = data.partDescription.split(' ')
+ str = splitData[splitData.length - 1] // 鑾峰彇鏈�鍚庝竴椤�
+ }
let index = Number(data.qtyRequired) + Number(data.scrapQty)
- if(index>0){
- for(var i=1;i<= index;i++){
+ if (index > 0) {
+ for(var i=index;i>= 1;i--){
let obj = {
orderNo: data.customerOrderNo,
cName: data.customerName,
@@ -1202,10 +1139,12 @@
code: {
moNo: data.moNo,
moNo2: null,
+ moNo3: str
}
}
let no = (i+"").padStart(3,'0')
obj.code.moNo2 = data.moNo + no
+ obj.partNo = data.partNo
this.qrData.push(obj)
}
}
@@ -1303,6 +1242,10 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
+ if(!this.permissions.plan_manufacturingorder_edit && row.id!=null){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$router.push({
name: 'productorderForm',
query: { id: row == null ? null : row.id }
--
Gitblit v1.9.3