From db79796f5d19d403b9c32503e71488609ae35985 Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期四, 25 一月 2024 09:17:01 +0800
Subject: [PATCH] 更新配瓦规则设置必填字段
---
jcdm-ui/src/views/main/da/tileMatchRules/index.vue | 50 ++++++++++++++++++++-----
jcdm-ui/src/views/main/bs/orderScheduling/index.vue | 27 +++++++------
jcdm-ui/src/views/main/da/collectionParamConf/index.vue | 2
3 files changed, 55 insertions(+), 24 deletions(-)
diff --git a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
index d14ee27..c3ff07b 100644
--- a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
+++ b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
@@ -301,33 +301,34 @@
<el-form-item label="鏈哄瀷" prop="model">
<el-input v-model="form.model" placeholder="璇疯緭鍏ユ満鍨�" />
</el-form-item>
- <el-form-item label="鐢熶骇鐘舵��" prop="productionStatus">
- <el-radio-group v-model="form.productionStatus">
-<!-- <el-radio-->
-<!-- v-for="dict in dict.type.${dictType}"-->
-<!-- :key="dict.value"-->
-<!-- :label="dict.value"-->
-<!-- >{{dict.label}}</el-radio>-->
- </el-radio-group>
- </el-form-item>
+<!-- <el-form-item label="鐢熶骇鐘舵��" prop="productionStatus">-->
+<!-- <el-radio-group v-model="form.productionStatus">-->
+<!--<!– <el-radio–>-->
+<!--<!– v-for="dict in dict.type.${dictType}"–>-->
+<!--<!– :key="dict.value"–>-->
+<!--<!– :label="dict.value"–>-->
+<!--<!– >{{dict.label}}</el-radio>–>-->
+<!-- </el-radio-group>-->
+<!-- </el-form-item>-->
<el-form-item label="宸ユ椂" prop="workingHours">
<el-input v-model="form.workingHours" placeholder="璇疯緭鍏ュ伐鏃�" />
</el-form-item>
<el-form-item label="褰撳墠宸ヤ綅" prop="currentWorkstation">
<el-input v-model="form.currentWorkstation" placeholder="璇疯緭鍏ュ綋鍓嶅伐浣�" />
</el-form-item>
- <el-form-item label="璐ㄩ噺鐘舵��" prop="qualityStatus">
- <el-radio-group v-model="form.qualityStatus">
+<!-- <el-form-item label="璐ㄩ噺鐘舵��" prop="qualityStatus">-->
+<!-- <el-radio-group v-model="form.qualityStatus">-->
<!-- <el-radio-->
<!-- v-for="dict in dict.type.${dictType}"-->
<!-- :key="dict.value"-->
<!-- :label="dict.value"-->
<!-- >{{dict.label}}</el-radio>-->
- </el-radio-group>
- </el-form-item>
+<!-- </el-radio-group>-->
+<!-- </el-form-item>-->
<el-form-item label="鏄惁鎵撳嵃" prop="whetherOrPrint">
<el-input v-model="form.whetherOrPrint" placeholder="璇疯緭鍏ユ槸鍚︽墦鍗�" />
</el-form-item>
+
<el-form-item label="鍚堢鎶ュ伐" prop="report10">
<el-input v-model="form.report10" placeholder="璇疯緭鍏ュ悎绠辨姤宸�" />
</el-form-item>
diff --git a/jcdm-ui/src/views/main/da/collectionParamConf/index.vue b/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
index 79e1b0e..e927a1d 100644
--- a/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
+++ b/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
@@ -223,7 +223,7 @@
<el-form-item label="閲囬泦鍙傛暟鍚嶇О" prop="collectParameterName">
<el-input v-model="form.collectParameterName" placeholder="璇疯緭鍏ラ噰闆嗗弬鏁板悕绉�" />
</el-form-item>
- <el-form-item label="鏄惁浣滀负瀵规瘮鍙傛暟" prop="contrastParameterFlag">
+ <el-form-item label="鏄惁浣滀负瀵规瘮鍙傛暟" label-width="140" prop="contrastParameterFlag">
<el-input v-model="form.contrastParameterFlag" placeholder="璇疯緭鍏ユ槸鍚︿綔涓哄姣斿弬鏁�" />
</el-form-item>
<!-- <el-form-item label="閲囬泦鍙傛暟绫诲瀷" prop="collectParameterType">-->
diff --git a/jcdm-ui/src/views/main/da/tileMatchRules/index.vue b/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
index e8ec77e..fa51d6d 100644
--- a/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
+++ b/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
@@ -249,7 +249,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀归厤鐡﹁鍒欏璇濇 -->
- <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="1000px" append-to-body>
+ <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="650px" append-to-body>
<span slot="title">
<i class="el-icon-s-order"></i>
{{titleName}}
@@ -273,10 +273,10 @@
<el-form-item label="鐡﹀悕绉�" prop="tileName">
<el-input v-model="form.tileName" placeholder="璇疯緭鍏ョ摝鍚嶇О" />
</el-form-item>
- <el-form-item label="杞村弬鏁颁綅缃�" prop="axisParameterNoPosition">
- <el-input v-model="form.axisParameterNoPosition" placeholder="璇疯緭鍏ヨ酱鍙傛暟浣嶇疆" />
+ <el-form-item label="杞村弬鏁颁綅缃�" prop="axisParameterNoPosition" label-width="120">
+ <el-input v-model="form.axisParameterNoPosition" placeholder="璇疯緭鍏ヨ酱鍙傛暟浣嶇疆" />
</el-form-item>
- <el-form-item label="棰堝弬鏁颁綅缃�" prop="neckParameterPosition">
+ <el-form-item label="棰堝弬鏁颁綅缃�" prop="neckParameterPosition" label-width="120">
<el-input v-model="form.neckParameterPosition" placeholder="璇疯緭鍏ラ鍙傛暟浣嶇疆" />
</el-form-item>
<el-form-item label="杞村��" prop="axisValue">
@@ -288,12 +288,12 @@
<el-form-item label="鐡﹂鑹�" prop="tileColor">
<el-input v-model="form.tileColor" placeholder="璇疯緭鍏ョ摝棰滆壊" />
</el-form-item>
- <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">
- <el-input v-model="form.createUser" placeholder="璇疯緭鍏ュ垱寤虹敤鎴�" />
- </el-form-item>
- <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">
- <el-input v-model="form.updateUser" placeholder="璇疯緭鍏ユ洿鏀圭敤鎴�" />
- </el-form-item>
+<!-- <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">-->
+<!-- <el-input v-model="form.createUser" placeholder="璇疯緭鍏ュ垱寤虹敤鎴�" />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">-->
+<!-- <el-input v-model="form.updateUser" placeholder="璇疯緭鍏ユ洿鏀圭敤鎴�" />-->
+<!-- </el-form-item>-->
<el-form-item label="鐘舵��" prop="state">
<el-select v-model="form.state" placeholder="璇烽�夋嫨鐘舵��" >
<el-option
@@ -366,6 +366,36 @@
id: [
{ required: true, message: "涓婚敭id涓嶈兘涓虹┖", trigger: "blur" }
],
+ productSeries: [
+ { required: true, message: "浜у搧绯诲垪涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ axisName: [
+ { required: true, message: "杞村悕绉颁笉鑳戒负绌�", trigger: "blur" }
+ ],
+ neckName: [
+ { required: true, message: "棰堝悕绉颁笉鑳戒负绌�", trigger: "blur" }
+ ],
+ tileName: [
+ { required: true, message: "鐡﹀悕绉颁笉鑳戒负绌�", trigger: "blur" }
+ ],
+ axisParameterNoPosition: [
+ { required: true, message: "杞村弬鏁颁綅缃笉鑳戒负绌�", trigger: "blur" }
+ ],
+ neckParameterPosition: [
+ { required: true, message: "棰堝弬鏁颁綅缃笉鑳戒负绌�", trigger: "blur" }
+ ],
+ axisValue: [
+ { required: true, message: "杞村�间笉鑳戒负绌�", trigger: "blur" }
+ ],
+ neckValue: [
+ { required: true, message: "棰堝�间笉鑳戒负绌�", trigger: "blur" }
+ ],
+ tileColor: [
+ { required: true, message: "鐡﹀�间笉鑳戒负绌�", trigger: "blur" }
+ ],
+ state: [
+ { required: true, message: "鐘舵�佷笉鑳戒负绌�", trigger: "blur" }
+ ]
}
};
},
--
Gitblit v1.9.3