From 99ab4aec18489e874ce25b96d3644a8ac5feef21 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期五, 22 三月 2024 15:36:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/om/productionOrde/index.vue | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/jcdm-ui/src/views/main/om/productionOrde/index.vue b/jcdm-ui/src/views/main/om/productionOrde/index.vue
index ffaab36..56eb2ec 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/index.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -148,9 +148,13 @@
</el-table-column>
<el-table-column label="璁㈠崟缂栧彿" width="140" align="center" prop="salesOrderCode">
</el-table-column>
- <el-table-column label="浜у搧搴忓垪鍙�" width="110" align="center" prop="productCode">
+ <el-table-column label="浜у搧缂栧彿" width="110" align="center" prop="productCode">
</el-table-column>
<el-table-column label="浜у搧鍚嶇О" width="120" align="center" prop="productName">
+ </el-table-column>
+ <el-table-column label="浜у搧搴忓垪鍙�" width="110" align="center" prop="productNum">
+ </el-table-column>
+ <el-table-column label="浜у搧鍨嬪彿" align="center" prop="productModel">
</el-table-column>
<el-table-column label="宸ュ崟鐘舵��" width="100" align="center" prop="orderStatus">
<template slot-scope="scope">
@@ -243,6 +247,9 @@
<el-form-item label="浜у搧鍚嶇О" prop="productName">
<el-input style="width: 265px" v-model="form.productName" disabled placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
</el-form-item>
+ <el-form-item label="浜у搧鍨嬪彿" prop="productModel">
+ <el-input v-model="form.productModel" placeholder="璇疯緭鍏ヤ骇鍝佸瀷鍙�" />
+ </el-form-item>
<el-form-item label="宸ュ巶缂栧彿" prop="siteCode">
<el-input style="width: 265px" v-model="form.siteCode" placeholder="璇疯緭鍏ュ伐鍘傜紪鍙�" />
</el-form-item>
@@ -328,12 +335,14 @@
frontEndId: 0,
idNums: null,
flag: null,
- siteCode: null,
- productNum: null,
- stationCode: null,
- resultText: null,
- resultCode: null,
- sfResult: null
+ siteCode: null,
+ productNum: null,
+ stationCode: null,
+ resultText: null,
+ resultCode: null,
+ sfResult: null,
+ productModel: null
+
},
// 琛ㄥ崟鍙傛暟
form: {},
--
Gitblit v1.9.3