zs-mes-before.git

			@@ -108,27 +108,6 @@
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="外护颜色" prop="outerColor">
			<el-input
			readonly
			v-model="dataForm.outerColor"
			placeholder=""
			></el-input>
			</el-form-item>
			</el-col>

			<el-col :span="6">
			<el-form-item label="绝缘颜色" prop="insulationColor">
			<el-input
			v-model="dataForm.insulationColor"
			placeholder=""
			></el-input>
			</el-form-item>
			</el-col>
			</el-row>

			<el-row :gutter="10">
			<el-col :span="6">
			<el-form-item label="备注" prop="remark">
			<el-input v-model="dataForm.remark" placeholder=""></el-input>
			</el-form-item>
			@@ -151,6 +130,26 @@
			</el-select>
			</el-form-item>
			</el-col>
			<!-- <el-col :span="6">
			<el-form-item label="外护颜色" prop="outerColor">
			<el-input
			readonly
			v-model="dataForm.outerColor"
			placeholder=""
			></el-input>
			</el-form-item>
			</el-col>

			<el-col :span="6">
			<el-form-item label="绝缘颜色" prop="insulationColor">
			<el-input
			v-model="dataForm.insulationColor"
			placeholder=""
			></el-input>
			</el-form-item>
			</el-col> -->
			</el-row>
			<!-- <el-row :gutter="10">
			<el-col :span="8">
			<el-col
			:span="8"
			@@ -189,7 +188,7 @@
			</el-switch>
			</el-form-item>
			</el-col>
			<!-- <el-col :span="2">
			<el-col :span="2">
			<el-form-item label="BOM确认">
			<el-switch >
			</el-switch>
			@@ -206,8 +205,8 @@
			<el-switch >
			</el-switch>
			</el-form-item>
			</el-col> -->
			</el-row>
			</el-col>
			</el-row> -->
			</div>
			<div class="productorder-detail">
			<el-card class="productorder-list">
			@@ -244,13 +243,13 @@
			</el-select>
			</el-form-item>
			</el-col>
			<el-col :span="8">
			<!-- <el-col :span="8">
			<el-form-item label-width="0px">
			<el-checkbox v-model="currentRouting.master" disabled
			>默认工艺路线
			</el-checkbox>
			</el-form-item>
			</el-col>
			</el-col> -->
			</el-row>
			<el-row>
			<el-col :span="24">
			@@ -496,8 +495,8 @@
			<testStandardTable
			ref="moTestStandardTable"
			:editable="editable"
			:dataFormId="dataForm.id"
			:moRoutingOperationId="moRoutingOperationId"
			:dataFormId="Number(dataForm.id)"
			:moRoutingOperationId="Number(moRoutingOperationId)"
			@refreshTestStandardInfo="refreshTestStandardInfo"
			></testStandardTable>
			</el-tab-pane>
			@@ -854,7 +853,7 @@
			</el-row>
			</el-tab-pane>
			<el-tab-pane label="客户订单" id="ta3" key="ta3" name="ta3">
			<CustomerOrder :orderId="dataForm.id" />
			<CustomerOrder :orderId="Number(dataForm.id)" />
			</el-tab-pane>
			</el-tabs>
			</el-card>
			@@ -918,8 +917,8 @@
			/>
			<spotCheckRule
			:currshowlist.sync="spotCheckRuleShow"
			:moId="dataForm.id"
			:moRoutingOperationId="moRoutingOperationId"
			:moId="Number(dataForm.id)"
			:moRoutingOperationId="Number(moRoutingOperationId)"
			:moRoutingOperationName="moRoutingOperationName"
			@refreshSpotCheckRuleList="refreshSpotCheckRuleList"
			/>
			@@ -2110,7 +2109,7 @@
			} else {
			if (this.structSelection.length === 1) {
			this.selectedStruct = this.structSelection[0]
			this.moId = this.dataForm.id
			this.moId = Number(this.dataForm.id)
			this.showStructForm = true
			} else {
			this.$message.error('只能为单个节点添加元素')
			@@ -2127,7 +2126,7 @@
			refreshSpotCheckRuleList() {
			this.spotCheckRuleList = []
			qryMoSamplingRule({
			moId: this.dataForm.id,
			moId: Number(this.dataForm.id),
			moRoutingOperationId: this.moRoutingOperationId
			}).then((response) => {
			const resData = response.data