From b1dbfd44f6bafaa4d24e0c1c3a0f7ae548e77f60 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 27 十二月 2023 17:41:06 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/plan/manufacturingorder/index.vue | 131 ++++++++++++++++++-------------------------
1 files changed, 55 insertions(+), 76 deletions(-)
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index d760c3e..b9bfe77 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;"
@@ -199,7 +201,7 @@
</el-dialog>
</basic-container>
<!-- 鏍囩鎵撳嵃 -->
- <el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px" top="5vh">
+ <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
@@ -232,26 +234,28 @@
<vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
</el-col>
</el-row> -->
- <div style="display: flex;">
+ <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>
- <el-col :span="8" :offset="2">
+ <el-col :span="8" :offset="4">
<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>
+ <div style="margin-left: 50px;width: 100%;">
+ <el-row style="margin-top: 10px;">
+ <el-col style="font-weight: bold;font-size: 14px;"><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 style="margin-top: 9px;font-size: 14px;">
+ <el-col style="font-weight: bold;"><span>璁� 鍗� 鍙�: </span>{{ item.orderNo }}</el-col>
</el-row>
- <el-row style="margin-top: 5px;">
+ <el-row style="margin-top: 9px;font-size: 14px;">
<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>
</div>
</el-card>
</el-checkbox-group>
@@ -265,7 +269,7 @@
<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-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>
@@ -286,7 +290,28 @@
<el-col :span="10">
<vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
</el-col>
- </el-row>
+ </el-row> -->
+ <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>
+ </el-col>
+ </div>
+ <div style="margin-left: 50px;width: 100%;">
+ <el-row style="margin-top: 10px;">
+ <el-col style="font-weight: bold;font-size: 14px;"><span>鎵� 娆� 鍙�: </span>{{ item.code.moNo2 }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 9px;font-size: 14px;">
+ <el-col style="font-weight: bold;"><span>璁� 鍗� 鍙�: </span>{{ item.orderNo }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 9px;font-size: 14px;">
+ <el-col style="font-weight: bold;"><span>瀹㈡埛鍚嶇О: </span>{{ item.cName }}</el-col>
+ </el-row>
+ </div>
+ </div>
</el-card>
</div>
</div>
@@ -425,6 +450,16 @@
data: [],
// 鏍囬
column: [
+ {
+ minWidth: '120',
+ prop: 'moNo',
+ label: '杞﹂棿璁㈠崟鍙�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ render: { fun: this.addOrUpdateHandle }
+ },
{
minWidth: '140',
prop: 'state',
@@ -566,16 +601,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',
@@ -1017,21 +1043,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: '鏂板',
@@ -1045,28 +1056,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: '鎵嬪姩鏂板',
@@ -1083,21 +1072,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
@@ -1301,6 +1276,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