From 741eea3ed05c978c21ec4048c0bb45a721ff615a Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期六, 11 五月 2024 15:42:20 +0800 Subject: [PATCH] 车间订单的导出去掉 --- src/views/plan/manufacturingorder/index.vue | 142 +++++++++-------------------------------------- 1 files changed, 27 insertions(+), 115 deletions(-) diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue index bac33c6..e3a8654 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,36 +204,14 @@ <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> @@ -266,29 +246,7 @@ </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> --> + <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> @@ -449,6 +407,16 @@ // 鏍囬 column: [ { + minWidth: '120', + prop: 'moNo', + label: '杞﹂棿璁㈠崟鍙�', + sort: true, + isTrue: true, + isSearch: true, + searchInfoType: 'text', + render: { fun: this.addOrUpdateHandle } + }, + { minWidth: '140', prop: 'state', label: '鐘舵��', @@ -589,16 +557,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', @@ -1040,21 +999,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: '鏂板', @@ -1068,28 +1012,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: '鎵嬪姩鏂板', @@ -1106,21 +1028,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 @@ -1190,10 +1098,10 @@ printable: 'printMOrder',//椤甸潰 type: "html",//鏂囨。绫诲瀷 maxWidth:450, - targetStyles:['*'], + targetStyles:['*'], style: `@page { margin:0; - size: 360px 175px; + size: 360px 175px landscape; } html{ zoom:100%; @@ -1215,7 +1123,7 @@ console.log(data); let index = Number(data.qtyRequired) + Number(data.scrapQty) if(index>0){ - for(var i=1;i<= index;i++){ + for(var i=index;i>= 1;i--){ let obj = { orderNo: data.customerOrderNo, cName: data.customerName, @@ -1324,6 +1232,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