From a48ded866d223f581944ea9043df1b296b3425e3 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 21 十二月 2023 13:17:46 +0800
Subject: [PATCH] modified: src/views/basic/company/index.vue modified: src/views/basic/customizeparamtemplatetype/index.vue modified: src/views/basic/division/index.vue modified: src/views/basic/factory/index.vue modified: src/views/basic/location/index.vue modified: src/views/basic/param/index.vue modified: src/views/basic/part/index.vue modified: src/views/basic/post/index.vue modified: src/views/basic/shift/index.vue modified: src/views/basic/staff/index.vue modified: src/views/basic/template/index.vue modified: src/views/basic/warehouse/index.vue modified: src/views/basic/workstation/index.vue modified: src/views/plan/manufacturingorder/index.vue modified: src/views/plan/masterproductionschedule/index.vue modified: src/views/plan/operationtask/index.vue modified: src/views/plan/productionschedul/index.vue modified: src/views/quality/finishedProductInspection/index.vue modified: src/views/quality/rawMaterial/index.vue modified: src/views/technology/completeproductstructure/index.vue modified: src/views/technology/document/index.vue modified: src/views/technology/operation/index.vue modified: src/views/technology/routing/index.vue modified: src/views/technology/structure/index.vue modified: src/views/warehouse/FinishedWarehousing/index.vue modified: src/views/warehouse/changestock/index.vue modified: src/views/warehouse/pallettransports/index.vue
---
src/views/plan/manufacturingorder/index.vue | 158 ++++++++++++++++++++++++++--------------------------
1 files changed, 78 insertions(+), 80 deletions(-)
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index a501a00..0337ab1 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -101,6 +101,7 @@
</el-button> -->
<el-button
+ v-if="permissions.manufacturingorder_export"
@click="exportExcel"
type="primary"
style="margin-left:10px;"
@@ -108,6 +109,7 @@
>瀵煎嚭
</el-button>
<el-button
+ v-if="permissions.manufacturingorder_label_print"
@click="labelPrint"
type="primary"
style="margin-left:10px;"
@@ -211,19 +213,48 @@
<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;">{{ i + 1 }}</el-col>
- </el-row> -->
- <el-row>
- <el-col :span="10" :offset="3">鎵规鍙凤細</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.moNo2 }}</el-col>
+ <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" :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)" :size="80" :margin="2"></vueQr>
+ <vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
</el-col>
- </el-row>
+ </el-row> -->
+ <div style="display: flex;">
+ <div>
+ <el-col :span="8" :offset="2">
+ <vueQr :text="JSON.stringify(item.code)" :size="120" :margin="2"></vueQr>
+ </el-col>
+ </div>
+ <div style="margin-left: 20px;width: 100%;">
+ <el-row >
+ <el-col style="font-weight: bold;"><span>鎵规鍙�: </span>{{ item.code.moNo2 }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 5px;">
+ <el-col style="font-weight: bold;"><span>璁㈠崟鍙�: </span>{{ item.orderNo }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 5px;">
+ <el-col style="font-weight: bold;"><span>瀹㈡埛鍚嶇О: </span>{{ item.cName }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 5px;">
+ <el-col style="font-weight: bold;">{{ item.pName }}</el-col>
+ </el-row>
+ </div>
+ </div>
</el-card>
</el-checkbox-group>
</div>
@@ -233,23 +264,31 @@
<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;padding: 0;">
+ <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-bottom:10px;font-size: 16px !important;">
- <!-- <el-row>
- <el-col :span="10" :offset="3">搴忓彿锛�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
- </el-row> -->
- <el-row>
- <el-col :span="10" :offset="3">鎵规鍙凤細</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.moNo2 }}</el-col>
- </el-row>
- <el-row>
- <el-col :span="10" :offset="3">璁㈠崟浜岀淮鐮侊細</el-col>
- <el-col :span="10">
- <vueQr :text="JSON.stringify(item)" :size="110" :margin="2"></vueQr>
- </el-col>
- </el-row>
+ <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>
</el-card>
</div>
</div>
@@ -980,21 +1019,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: '鏂板',
@@ -1008,28 +1032,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: '鎵嬪姩鏂板',
@@ -1046,21 +1048,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
@@ -1152,15 +1140,21 @@
initQrData(data){
this.qrData = []
if(data){
+ console.log(data);
let index = Number(data.qtyRequired) + Number(data.scrapQty)
if(index>0){
for(var i=1;i<= index;i++){
let obj = {
- moNo: data.moNo,
- moNo2: null,
+ orderNo: data.customerOrderNo,
+ cName: data.customerName,
+ pName: data.partName,
+ code: {
+ moNo: data.moNo,
+ moNo2: null,
+ }
}
let no = (i+"").padStart(3,'0')
- obj.moNo2 = data.moNo + no
+ obj.code.moNo2 = data.moNo + no
this.qrData.push(obj)
}
}
@@ -1258,6 +1252,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