~admin/ERP_override.git

			@@ -513,7 +513,7 @@
			</el-row>

			<el-row>
			<el-col :span="4">二维码打印:</el-col>
			<el-col :span="4">二维码打印1:</el-col>
			<el-col :span="6">
			<el-select v-model="trademarkAttr.tag2">
			<el-option :value="true" :label="'是'"/>
			@@ -523,7 +523,7 @@
			</el-row>

			<el-row>
			<el-col :span="4">标签3使能:</el-col>
			<el-col :span="4">二维码打印2:</el-col>
			<el-col :span="6">
			<el-select v-model="trademarkAttr.tag3">
			<el-option :value="true" :label="'是'"/>

			@@ -39,6 +39,7 @@
			customConfig: {
			storage: true
			},

			editConfig: {
			trigger: 'click',
			mode: 'row',
			@@ -70,7 +71,7 @@
			keepSource: true,//保持源数据
			align: 'center',//文字居中
			stripe:true,//斑马纹
			rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
			rowConfig: {isCurrent: true, isHover: true,height: 30,keyField:'id'},//鼠标移动或选择高亮
			id: 'permissionList',
			showFooter: false,//显示脚
			printConfig: {},
			@@ -89,6 +90,7 @@
			},
			checkboxConfig: {
			checkField:'checked',
			reserve: true,
			},
			editConfig: {
			trigger: 'click',
			@@ -219,6 +221,8 @@
			type: 'warning',
			}
			).then(() => {
			selectValue.value = [null,null]
			pGrid.value.clearFilter()
			const permission = {
			id: checkId.value,
			detail: $grid.getCheckboxRecords()

	north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/system/role/RoleList.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史