Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc_app into V0.0.5

src/views/menu/problemItem/api.js

@@ -2,7 +2,7 @@ import request from "@/utils/request";
 //获取列表
 export function dataList(data) {
   return request({
-    url: "/core/question/list",
+    url: "/core/appquestion/list",
     method: "get",
     params: data,
   });
@@ -11,7 +11,7 @@ export function dataList(data) {
 //获取详情
 export function taskDetails(orgId){
   return request({
-    url: "/core/question/info/"+orgId,
+    url: "/core/appquestion/info/"+orgId,
     method: "get",
   });
 }
@@ -19,7 +19,7 @@ export function taskDetails(orgId){
 // 问题确认
 export function confirm(data) {
   return request({
-    url: "/core/question/confirm/" + data.id,
+    url: "/core/appquestion/confirm/" + data.id,
     method: "put",
     data,
     showLoading: true,
@@ -29,7 +29,7 @@ export function confirm(data) {
 // 异议审批
 export function confirmDissent(data) {
   return request({
-    url: "/core/question/confirmDissent/" + data.id,
+    url: "/core/appquestion/confirmDissent/" + data.id,
     method: "put",
     data,
     showLoading: true,
@@ -39,7 +39,7 @@ export function confirmDissent(data) {
 // 整改
 export function reform(data) {
   return request({
-    url: "/core/questionreform/reform/" + data.id,
+    url: "/core/appquestion/reform/" + data.id,
     method: "put",
     data,
   });

src/views/menu/problemItem/detail.vue

@@ -24,11 +24,11 @@
                   <div>问题状态</div>
                 </van-col>
                 <van-col :span="16">
-                 <span v-if="taskInfo.reformStatus" :style="{color:getState(getDictLabel(taskInfo.reformStatus,'question_reform_status'))}">
-                  {{getDictLabel(taskInfo.reformStatus,'question_reform_status')}}
+                 <span v-if="taskInfo.reformStatus" :style="{color:getState(getDictLabel(taskInfo.reformStatus,'app_question_status'))}">
+                  {{getDictLabel(taskInfo.reformStatus,'app_question_status')}}
                   </span>
-                  <span v-else :style="{color:getState(getDictLabel(taskInfo.confirmStatus,'question_confirm_status'))}">
-                  {{getDictLabel(taskInfo.confirmStatus,'question_confirm_status')}}
+                  <span v-else :style="{color:getState(getDictLabel(taskInfo.confirmStatus,'app_question_status'))}">
+                  {{getDictLabel(taskInfo.confirmStatus,'app_question_status')}}
                   </span>
                 </van-col>
               </van-row>
@@ -136,8 +136,6 @@
                 </van-col>
               </van-row>
             </div>
-
-
           </div>
         </div>
       </div>
@@ -356,7 +354,7 @@ export default {
       },
       type:null,
       preViewImages:{},
-      dicts:['resumption_status','question_confirm_status','question_reform_status','rectification_deadline'],
+      dicts:['resumption_status'],
     }
   },
   mounted() {

src/views/menu/problemItem/edit.vue

@@ -8,11 +8,11 @@
           <div class="panel-box">
             <van-cell title="问题状态">
               <div slot="right-icon">
-                <span v-if="taskInfo.reformStatus" :style="{color:getState(getDictLabel(taskInfo.reformStatus,'question_reform_status'))}">
-                  {{getDictLabel(taskInfo.reformStatus,'question_reform_status')}}
+                <span v-if="taskInfo.reformStatus" :style="{color:getState(getDictLabel(taskInfo.reformStatus,'app_question_status'))}">
+                  {{getDictLabel(taskInfo.reformStatus,'app_question_status')}}
                 </span>
-                <span v-else :style="{color:getState(getDictLabel(taskInfo.confirmStatus,'question_confirm_status'))}">
-                  {{getDictLabel(taskInfo.confirmStatus,'question_confirm_status')}}
+                <span v-else :style="{color:getState(getDictLabel(taskInfo.confirmStatus,'app_question_status'))}">
+                  {{getDictLabel(taskInfo.confirmStatus,'app_question_status')}}
                 </span>
               </div>
             </van-cell>
@@ -215,7 +215,7 @@ export default {
       },
       type:null,
       preViewImages:{},
-      dicts:['resumption_status','question_confirm_status','question_reform_status','rectification_deadline'],
+      dicts:['app_question_status'],
     }
   },
   mounted() {

src/views/menu/problemItem/index.vue

@@ -10,8 +10,8 @@
           title="问题状态"
           :isAll="true"
           :border="false"
-          v-model="query.confirmStatus"
-          :data-list="getDictItem('question_confirm_status')"
+          v-model="query.status"
+          :data-list="getDictItem('app_question_status')"
           @change="refreshData"/>
         <date-cell title="整改日期"  v-model="query.reformDate" @change="refreshData"/>
       </div>
@@ -67,11 +67,11 @@
                 <template #default>
                   <div class="info-box">
                     <div class="info-desc">问题状态:
-                      <span v-if="v.reformStatus" :style="{color:getState(getDictLabel(v.reformStatus,'question_reform_status'))}">
-                        {{getDictLabel(v.reformStatus,'question_reform_status')}}
+                      <span v-if="v.reformStatus" :style="{color:getState(getDictLabel(v.reformStatus,'app_question_status'))}">
+                        {{getDictLabel(v.reformStatus,'app_question_status')}}
                       </span>
-                      <span v-else :style="{color:getState(getDictLabel(v.confirmStatus,'question_confirm_status'))}">
-                        {{getDictLabel(v.confirmStatus,'question_confirm_status')}}
+                      <span v-else :style="{color:getState(getDictLabel(v.confirmStatus,'app_question_status'))}">
+                        {{getDictLabel(v.confirmStatus,'app_question_status')}}
                       </span>
                     </div>
                     <div class="info-desc">隐患描述: <span>{{v.questionDesc}}</span></div>
@@ -110,7 +110,7 @@ export default {
       query:{
         reformDate:`${formatDate(new Date(),'YYYY-MM-DD')}`,
         orgId:null,
-        confirmStatus:null,
+        status:null,
         pageSize:10,
         pageNum:1,
       },
@@ -135,7 +135,7 @@ export default {
       ],
       dataList:[],
       pullup:false,
-      dicts:['resumption_status','question_confirm_status','question_reform_status','rectification_deadline'],
+      dicts:['app_question_status'],
     }
   },
   beforeRouteEnter(to,from,next){