~jt/MES-PDA.git

			@@ -24,7 +24,6 @@
			</image>
			<checkbox-group @change="checkboxChange">
			<div class="dv-panel" v-for="(style,ii) in pageData.DefList" :key="ii"
			<div class="dv-panel" v-for="(style,ii) in pageData.DefList" :key="ii"
			@tap="onPanelClick(ii,style.form.htmlobjId)"
			:id="'dvpanel'+style.form.htmlobjId"
			:class="style.form.htmlobjId==active_id?'bk-active':''">
			@@ -1292,25 +1291,16 @@
			attr.value,
			attr.operation
			)
			if (ele2.name != 'Layout') {
			if (ele2.fieldId == attr.attr) {
			ele2.value = $this.operationNumber(
			ele2.value,
			attr.value,
			attr.operation
			)
			}
			} else if (ele2.name == 'Layout') {
			ele2.setting.colList.forEach(col => {
			if (col) {
			if (col.fieldId == attr
			.attr) {
			if (col.fieldId == attr.attr) {
			col.value = $this
			.operationNumber(
			col.value,
			attr.value,
			attr
			.operation
			attr.operation
			)
			}
			}
			@@ -1320,80 +1310,74 @@
			});
			}
			} else if (rowData.condition) {
			const conditions = rowData.condition \|\| [];
			if (conditions.length > 0) {
			let bFindCondition = true;
			for (let i in conditions) {
			const condition = conditions[i];
			let bFind = false;
			for (let i2 in ele.form.items) {
			const ele2 = ele.form.items[i2];
			if (ele2.name != "Layout") {
			if (ele2.fieldId == condition.attr) {
			if (condition.value == ele2.value) {
			const conditions = rowData.condition
			let bFindCondition = true;
			for (let i in conditions) {
			const condition = conditions[i];
			let bFind = false;
			for (let i2 in ele.form.items) {
			const ele2 = ele.form.items[i2];
			if (ele2.name != "Layout") {
			if (ele2.fieldId == condition.attr) {
			if (condition.value == ele2.value) {
			bFind = true;
			}
			break;
			}
			} else {
			const colList = ele2.setting.colList \|\| [];
			for (let i3 in colList) {
			const col = colList[i3];
			if (col.fieldId == condition.attr) {
			if (condition.value == col.value) {
			bFind = true;
			}
			break;
			}
			} else {
			const colList = ele2.setting.colList \|\| [];
			for (let i3 in colList) {
			const col = colList[i3];
			if (col.fieldId == condition.attr) {
			if (condition.value == col.value) {
			bFind = true;
			}
			break;
			}
			}
			if (bFind) break;
			}
			}
			if (!bFind) {
			bFindCondition = false;
			break;
			if (bFind) break;
			}
			}
			if (bFindCondition) {
			rowData.attrs.forEach(attr => {
			ele.form.items.forEach(ele2 => {
			if (ele2.name != 'Layout') {
			if (ele2.fieldId == attr.attr) {
			ele2.value =
			$this.operationNumber(
			ele2.value,
			attr.value,
			attr.operation
			)
			}
			} else if (ele2.name == 'Layout') {
			ele2.setting.colList.forEach(col => {
			if (col) {
			if (col.fieldId == attr
			.attr) {
			col.value =
			$this
			.operationNumber(
			col.value,
			attr
			.value,
			attr
			.operation)
			}
			}
			})
			}
			});
			});

			if (!bFind) {
			bFindCondition = false;
			break;
			}
			}
			if (bFindCondition) {
			rowData.attrs.forEach(attr => {
			ele.form.items.forEach(ele2 => {
			if (ele2.name != 'Layout') {
			if (ele2.fieldId == attr.attr) {
			ele2.value =
			$this.operationNumber(
			ele2.value,
			attr.value,
			attr.operation
			)
			}
			} else if (ele2.name == 'Layout') {
			ele2.setting.colList.forEach(col => {
			if (col) {
			if (col.fieldId == attr.attr) {
			col.value =
			$this.operationNumber(
			col.value, attr
			.value, attr
			.operation)
			}
			}
			})
			}
			});
			});

			}

			}
			})
			});
			pageData.DefList = detailStyleDefList
			pageData.DefList = detailStyleDefList
			$this.$set(this.pageDetail, pageIndex, pageData)

			},
			//加载正在码盘内容
			viewAceionRow(data) {
			@@ -1424,15 +1408,7 @@
			if (ele.name != 'Layout') {
			if (ele.fieldId == attr.attr)
			ele.value = attr.value;
			if (ele.fieldId == attr.attr)
			ele.value = attr.value;
			} else if (ele.name == 'Layout') {
			ele.setting.colList.forEach(col => {
			if (col) {
			if (col.fieldId == attr.attr)
			col.value = attr.value;
			}
			});
			ele.setting.colList.forEach(col => {
			if (col) {
			if (col.fieldId == attr.attr)
			@@ -1499,7 +1475,6 @@
			if (data.clear == false) {
			var isflag = true;
			pageData.DefList.forEach((style, index) => {
			if (style.form.objId == detailStyle.form.objId) {
			if (style.form.objId == detailStyle.form.objId) {
			cont.attrs.forEach(attr => {
			style.form.items.forEach(ele => {
			@@ -3103,36 +3078,6 @@
			margin: 0;


			.uni-forms-item {
			padding-bottom: 5rpx;
			margin-bottom: 0;

			.uni-forms-item__label {
			height: 20px !important;
			padding: 0 10rpx 0 0 !important;
			}

			.uni-input {
			width: calc(100% - 12rpx);
			padding: 5rpx;
			border: 1px solid #d5d5d5;
			color: #2d8cf0;
			height: 20px;
			background: #FFF;
			line-height: 20px;
			border-radius: 6px !important;
			font-size: 14px;
			font-family: inherit;
			box-shadow: none !important;
			transition-duration: 0.1s;
			vertical-align: middle;
			}

			.uni-input:hover {
			border: 1px solid rgb(41, 121, 255);
			}
			}


			}

			@@ -3254,14 +3199,6 @@
			.input-disabled {
			background-color: #f3f3f3 !important;
			}

			// ::v-deep .uni-row {
			// margin-bottom: 0px;
			// }

			// .view-tabpage ::v-deep .uni-row {
			// margin-bottom: 5px;
			// }

			.demo-uni-col {
			height: 36px;