mes-ocea-before.git

			@@ -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>
			@@ -1017,21 +1042,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 +1055,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 +1071,7 @@
			permitArr: ['01planned', '02issued']
			})
			}
			// 初始化queryParam
			// 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 +1275,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 }