Browse Source

修改隐患问题状态显示,修改显示文字

凉纪 1 year ago
parent
commit
1ecf877cc1

+ 7 - 4
src/views/menu/problemItem/detail.vue

@@ -24,9 +24,12 @@
                   <div>问题状态</div>
                 </van-col>
                 <van-col :span="16">
-                <span :style="{color:getState(getDictLabel(taskInfo.reformStatus,'question_reform_status'))}">
+                 <span v-if="taskInfo.reformStatus" :style="{color:getState(getDictLabel(taskInfo.reformStatus,'question_reform_status'))}">
                   {{getDictLabel(taskInfo.reformStatus,'question_reform_status')}}
-                </span>
+                  </span>
+                  <span v-else :style="{color:getState(getDictLabel(taskInfo.confirmStatus,'question_confirm_status'))}">
+                  {{getDictLabel(taskInfo.confirmStatus,'question_confirm_status')}}
+                  </span>
                 </van-col>
               </van-row>
             </div>
@@ -85,7 +88,7 @@
             <div class="mainItem">
               <van-row>
                 <van-col :span="8" class="label">
-                  <div>发现日期</div>
+                  <div>发现时间</div>
                 </van-col>
                 <van-col :span="16">
                  <span>
@@ -353,7 +356,7 @@ export default {
       },
       type:null,
       preViewImages:{},
-      dicts:['resumption_status','question_reform_status','rectification_deadline'],
+      dicts:['resumption_status','question_confirm_status','question_reform_status','rectification_deadline'],
     }
   },
   mounted() {

+ 6 - 3
src/views/menu/problemItem/edit.vue

@@ -8,16 +8,19 @@
           <div class="panel-box">
             <van-cell title="问题状态">
               <div slot="right-icon">
-                <span :style="{color:getState(getDictLabel(taskInfo.reformStatus,'question_reform_status'))}">
+                <span v-if="taskInfo.reformStatus" :style="{color:getState(getDictLabel(taskInfo.reformStatus,'question_reform_status'))}">
                   {{getDictLabel(taskInfo.reformStatus,'question_reform_status')}}
                 </span>
+                <span v-else :style="{color:getState(getDictLabel(taskInfo.confirmStatus,'question_confirm_status'))}">
+                  {{getDictLabel(taskInfo.confirmStatus,'question_confirm_status')}}
+                </span>
               </div>
             </van-cell>
             <van-cell title="隐患所在机构" :value="taskInfo.orgName" />
             <van-cell title="检查项" :value="taskInfo.checkItem" />
             <van-cell title="检查内容" :label="taskInfo.checkContent" />
             <van-cell title="隐患描述" :label="taskInfo.questionDesc" />
-            <van-cell title="发现日期" :value="taskInfo.submitTime" />
+            <van-cell title="发现时间" :value="taskInfo.submitTime" />
             <van-cell title="提出人" :value="taskInfo.submitorName" />
             <van-cell title="整改期限" :value="formatDate(taskInfo.reformDeadline,'YYYY-MM-DD')" />
             <van-cell title="隐患图片" v-if="taskInfo.images && taskInfo.images.length > 0" :border="false" >
@@ -212,7 +215,7 @@ export default {
       },
       type:null,
       preViewImages:{},
-      dicts:['resumption_status','question_reform_status','rectification_deadline'],
+      dicts:['resumption_status','question_confirm_status','question_reform_status','rectification_deadline'],
     }
   },
   mounted() {

+ 8 - 5
src/views/menu/problemItem/index.vue

@@ -7,13 +7,13 @@
       <div class="search-flex">
         <select-cell
           style="border-right: 1px solid #f5f5f5;"
-          title="确认状态"
+          title="问题状态"
           :isAll="true"
           :border="false"
           v-model="query.confirmStatus"
           :data-list="getDictItem('question_confirm_status')"
           @change="refreshData"/>
-        <date-cell title="日期"  v-model="query.reformDate" @change="refreshData"/>
+        <date-cell title="整改日期"  v-model="query.reformDate" @change="refreshData"/>
       </div>
       <div class="card-list">
         <Scroll
@@ -67,12 +67,15 @@
                 <template #default>
                   <div class="info-box">
                     <div class="info-desc">问题状态:
-                      <span :style="{color:getState(getDictLabel(v.reformStatus,'question_reform_status'))}">
+                      <span v-if="v.reformStatus" :style="{color:getState(getDictLabel(v.reformStatus,'question_reform_status'))}">
                         {{getDictLabel(v.reformStatus,'question_reform_status')}}
                       </span>
+                      <span v-else :style="{color:getState(getDictLabel(v.confirmStatus,'question_confirm_status'))}">
+                        {{getDictLabel(v.confirmStatus,'question_confirm_status')}}
+                      </span>
                     </div>
                     <div class="info-desc">隐患描述: <span>{{v.questionDesc}}</span></div>
-                    <div class="info-item">发现日期: <span>{{v.submitTime}}</span></div>
+                    <div class="info-item">发现时间: <span>{{v.submitTime}}</span></div>
                   </div>
                 </template>
               </van-cell>
@@ -132,7 +135,7 @@ export default {
       ],
       dataList:[],
       pullup:false,
-      dicts:['question_confirm_status','question_reform_status']
+      dicts:['resumption_status','question_confirm_status','question_reform_status','rectification_deadline'],
     }
   },
   beforeRouteEnter(to,from,next){