From 550b1fc6a640d09b93d2115799b5871634524ef1 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 17 十一月 2023 18:32:42 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before
---
src/views/plan/manufacturingorder/productorder-form.vue | 65 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 33 deletions(-)
diff --git a/src/views/plan/manufacturingorder/productorder-form.vue b/src/views/plan/manufacturingorder/productorder-form.vue
index 212ad12..5a1225b 100644
--- a/src/views/plan/manufacturingorder/productorder-form.vue
+++ b/src/views/plan/manufacturingorder/productorder-form.vue
@@ -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
--
Gitblit v1.9.3