问题管理增加problemPriority

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'),

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,

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">