mes-ocea-before.git

			@@ -33,6 +33,7 @@
			</el-col>
			<el-col :span="2">
			<el-button
			v-if="permissions.quality_packaging_ledger_info_save"
			style="float: right; padding: 3px 0"
			type="text"
			@click="addpreserve"
			@@ -41,7 +42,7 @@
			</el-col>
			<el-col :span="2">
			<el-button
			v-if="!isCheck"
			v-if="!isCheck && permissions.quality_packaging_ledger_info_add"
			style="float: right; padding: 3px 0"
			type="text"
			@click="relateOperationParam()"
			@@ -110,6 +111,7 @@
			width="80"
			></el-table-column>
			<el-table-column
			v-if="permissions.quality_packaging_ledger_info_operate"
			fixed="right"
			label="操作"
			align="center"
			@@ -150,7 +152,7 @@
			<el-row>
			<el-col :span="10" :offset="3">包装台账二维码：</el-col>
			<el-col :span="10">
			<vueQr :text="JSON.stringify(item)" :size="110" :margin="1"></vueQr>
			<vueQr :text=str+item.packageBoxId :size="110" :margin="1"></vueQr>
			</el-col>
			</el-row>
			</el-card>
			@@ -171,9 +173,11 @@
			import packfromadd from './pack-fromadd.vue'
			import vueQr from 'vue-qr'
			import PrintJS from 'print-js'
			import { mapGetters } from 'vuex'
			export default {
			data(){
			return {
			str:"http://192.168.2.213:8080/#/pack?id=",
			qrData:[],
			diaPrintTab: false,
			multipleSelection: [],
			@@ -269,33 +273,8 @@
			searchInfoType: 'datetimerange',
			},
			],
			toolbar: [
			{
			text: '新增',
			type: 'primary',
			fun: this.addOrUpdateHandle
			},
			{
			text: '标签打印',
			type: 'primary',
			fun: this.printLabel
			},
			],
			operator: [
			{
			text: '检验',
			icon: 'el-icon-position',
			type: 'text',
			size: 'small',
			fun: this.check
			},{
			text: '删除',
			icon: 'el-icon-delete',
			type: 'text',
			size: 'small',
			fun: this.deleteHandle
			}
			],
			toolbar: [],
			operator: null,
			operatorConfig: {
			fixed: 'right',
			label: '操作',
			@@ -310,6 +289,45 @@
			packfrom,
			packfromadd,
			vueQr
			},
			created(){
			if(this.permissions.quality_packaging_ledger_add){
			this.table.toolbar.push({
			text: '新增',
			type: 'primary',
			fun: this.addOrUpdateHandle
			})
			}
			if(this.permissions.quality_packaging_ledger_labelprint){
			this.table.toolbar.push({
			text: '标签打印',
			type: 'primary',
			fun: this.printLabel
			})
			}
			let arr = []
			if(this.permissions.quality_packaging_ledger_inspect){
			arr.push({
			text: '检验',
			icon: 'el-icon-position',
			type: 'text',
			size: 'small',
			fun: this.check
			})
			}
			if(this.permissions.quality_packaging_ledger_del){
			arr.push({
			text: '删除',
			icon: 'el-icon-delete',
			type: 'text',
			size: 'small',
			fun: this.deleteHandle
			})
			}
			this.table.operator = arr.length>0 ? arr : null
			},
			computed:{
			...mapGetters(['permissions'])
			},
			watch: {
			diaPrintTab(newVal){
			@@ -348,6 +366,7 @@
			},
			handleSelectionChange(val){
			this.multipleSelection = val
			console.log(this.multipleSelection[0].id,"数据");
			let lastRow = val[val.length - 1]
			this.handleCurrentChange(lastRow)
			},