From 2af08fca38af19482703b870762434bf6ff1bb79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Sun, 22 Oct 2023 18:06:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=AE=A1=E7=90=86=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0problemPriority?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectNonConformance/index.vue           | 14 +----------
 .../moudles/addModel.vue                      | 24 +++++++++++++++++++
 .../moudles/detilModel.vue                    | 17 +++++++++++++
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
index 8163a3d0d..ef660d37e 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
@@ -165,17 +165,6 @@
               {{result.problemState ? result.problemState : ''}}
              </span>
         </div>
-        <span slot="problemPriority" slot-scope="text,result">
-            <span v-if="result.problemState == $t('red')">
-                  {{$t('high')}}
-            </span>
-           <span v-else-if="result.problemState == $t('yellow')">
-                  {{$t('centre')}}
-            </span>
-           <span v-else-if="result.problemState == $t('green')">
-                  {{$t('low')}}
-            </span>
-        </span>
 <!--                <span slot="problemType" slot-scope="text,result">-->
 <!--                   <span>{{result.flag== 'NEW'?result.problemType_dictText:result.problemType}}</span>-->
 <!--                </span>-->
@@ -310,10 +299,9 @@
           {
             title: this.$t('problemPriority'),
             align: 'left',
-            dataIndex: 'problemPriority',
+            dataIndex: 'problemPriority_dictText',
             width: 120,
             ellipsis: true,
-            scopedSlots: { customRender: 'problemPriority' }
           },
           {
             title: this.$t('createTime'),
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
index 3af6b2024..c85a2ee48 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
@@ -168,6 +168,23 @@
               </div>
             </a-col>
           </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text"
+                        :title="$t('problemPriority')">{{$t('problemPriority')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="problemPriority">
+                  <j-dict-select-tag class="box-input" v-model="formInline.problemPriority"
+                                     :placeholder="$t('PleaseSelect')+$t('problemPriority')"
+                                     :type="'select'"
+                                     :triggerChange="false" :dictCode="'wen4_ti2_you1_xian1_ji2'"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
           <a-row :gutter="24">
             <a-col :span="24">
               <div class="box-title-text">
@@ -504,6 +521,13 @@
               message: this.$t('conculsion') + this.$t('cannotEmpty'),
               trigger: 'change'
             }
+          ],
+          problemPriority: [
+            {
+              required: true,
+              message: this.$t('problemPriority') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
           ]
         },
         visible: false,
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue
index 284d6c5ee..3c058ef23 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue
@@ -161,6 +161,23 @@
               </div>
             </a-col>
           </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text"
+                        :title="$t('problemPriority')">{{$t('problemPriority')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="problemPriority">
+                  <j-dict-select-tag class="box-input" v-model="formInline.problemPriority"
+                                     :disabled="true"
+                                     :placeholder="$t('PleaseSelect')+$t('problemPriority')"
+                                     :type="'select'"
+                                     :triggerChange="false" :dictCode="'wen4_ti2_you1_xian1_ji2'"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
           <a-row :gutter="24">
             <a-col :span="24">
               <div class="box-title-text">