Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/api/question/list.js

@@ -24,6 +24,7 @@ export function confirm(data) {
     url: "/core/question/confirm/" + data.id,
     method: "put",
     data,
+    showLoading: true,
   });
 }
 
@@ -33,6 +34,7 @@ export function confirmDissent(data) {
     url: "/core/question/confirmDissent/" + data.id,
     method: "put",
     data,
+    showLoading: true,
   });
 }
 
@@ -42,5 +44,6 @@ export function reform(data) {
     url: "/core/question/reform/" + data.id,
     method: "put",
     data,
+    showLoading: true,
   });
 }

src/views/core/task/index.vue

@@ -77,25 +77,27 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="taskList" >
+    <el-table v-loading="loading" :data="taskList"  border
+              height="600"
+              size="small">
 
       <el-table-column label="序号" type="index" align="center">
         <template slot-scope="scope">
           <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="任务名称" align="center" prop="taskName" />
+      <el-table-column label="任务名称" align="center" prop="taskName" width="220"/>
       <el-table-column label="调阅周期" align="center" prop="cycle" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_access_cycle" :value="scope.row.cycle" />
         </template>
       </el-table-column>
-      <el-table-column label="开始时间" align="center" prop="planStartTime" width="180">
+      <el-table-column label="开始时间" align="center" prop="planStartTime" width="160">
 <!--        <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planStartTime, '{y}-{m}-{d}') }}</span>
         </template>-->
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="planEndTime" width="180">
+      <el-table-column label="结束时间" align="center" prop="planEndTime" width="160">
 <!--        <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d}') }}</span>
         </template>-->
@@ -105,21 +107,21 @@
           <dict-tag :options="dict.type.retrieval_task_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="调阅机构" align="center" prop="orgName" />
+      <el-table-column label="调阅机构" align="center" prop="orgName"  width="220"/>
 
-      <el-table-column label="调阅角色" align="center" prop="roleName" />
+      <el-table-column label="调阅角色" align="center" prop="roleName" width="160"/>
 
-      <el-table-column label="调阅开始时间" align="center" prop="startTime" width="180">
+      <el-table-column label="调阅开始时间" align="center" prop="startTime" width="160">
 <!--        <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
         </template>-->
       </el-table-column>
-      <el-table-column label="调阅结束时间" align="center" prop="endTime" width="180">
+      <el-table-column label="调阅结束时间" align="center" prop="endTime" width="160">
 <!--        <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
         </template>-->
       </el-table-column>
-      <el-table-column label="调阅人" align="center" prop="retrievalUserName" />
+      <el-table-column label="调阅人" align="center" prop="retrievalUserName" width="140"/>
       <el-table-column label="异常数" align="center" prop="exceptionCount" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">

src/views/question/list/dialog.vue

@@ -1,6 +1,7 @@
 <template>
-  <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body @close="cancel">
-    <el-descriptions :column="2" class="contentArea">
+  <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @close="cancel">
+    <div class="question-dialog-body">
+      <el-descriptions :column="2" class="contentArea">
       <el-descriptions-item label="隐患所属机构">{{
         data.orgName
       }}</el-descriptions-item>
@@ -45,7 +46,7 @@
       <el-descriptions-item label="确认人">{{
         data.confirm.executorName
       }}</el-descriptions-item>
-      <el-descriptions-item label="描述">{{
+      <el-descriptions-item label="异议内容" :span="2" v-if="data.confirm.executeStatus==1">{{
         data.confirm.description
       }}</el-descriptions-item>
     </el-descriptions>
@@ -56,7 +57,7 @@
       <el-descriptions-item label="审核人">{{
         data.confirmDissent.executorName
       }}</el-descriptions-item>
-      <el-descriptions-item label="描述">{{
+      <el-descriptions-item label="描述" :span="2" v-if="data.confirmDissent.executeStatus==1">{{
         data.confirmDissent.description
       }}</el-descriptions-item>
     </el-descriptions>
@@ -67,10 +68,10 @@
       <el-descriptions-item label="整改状态">{{
         data.reform.executeStatus == 0 ? "已整改" : "未整改"
       }}</el-descriptions-item>
-      <el-descriptions-item label="描述">{{
+      <el-descriptions-item label="描述" :span="2">{{
         data.reform.description
       }}</el-descriptions-item>
-      <el-descriptions-item label="整改图片">
+      <el-descriptions-item label="整改图片" :span="2">
         <div class="imageList">
           <el-image
             style="width: 100px; height: 100px"
@@ -128,6 +129,7 @@
       >
         <el-input
           v-model="confirmDissentData.description"
+          placeHolder="请输入原因"
           maxlength="255"
         ></el-input>
       </el-form-item>
@@ -164,8 +166,10 @@
         ></imgUpload>
       </el-form-item>
     </el-form>
+  
+    </div>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button type="primary" @click="submitForm" v-if="type!='detail'">确 定</el-button>
       <el-button @click="cancel">取 消</el-button>
     </div>
   </el-dialog>
@@ -211,13 +215,13 @@ export default {
       },
       confirmRule: {
         description: [
-          { required: false, message: "请输入异议内容", trigger: "blur" },
+          { required: true, message: "请输入异议内容", trigger: "blur" },
         ],
       },
 
       confirmDissentRule: {
         description: [
-          { required: false, message: "请输入原因", trigger: "blur" },
+          { required: true, message: "请输入原因", trigger: "blur" },
         ],
       },
       reformRule: {
@@ -246,10 +250,12 @@ export default {
       this.setTitle(type);
       getQuestion(row.id).then((r) => {
         this.data = r.data;
-        this.data.confirmDissent = r.data.flows.find((d) => d.executeStep == 1);
-        this.data.confirm = r.data.flows.find((d) => d.executeStep == 2);
-        this.data.reform = r.data.flows.find((d) => d.executeStep == 10);
-        debugger
+        this.data.confirmDissent = r.data.flows.find((d) => d.executeStep == 2);
+        this.data.confirm = r.data.flows.find((d) => d.executeStep == 1);
+        this.data.reform = r.data.flows.find((d) => d.executeStep == 11);   
+        if(this.data.reform && this.data.reform.images)     {
+          this.data.reform.images=this.data.reform.images.split(",")
+        }
         this.open = true;
       });
     },
@@ -367,7 +373,20 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.contentArea {
+.form {
+  padding-top: 20px;
+}
+.imageList div {
+  margin-left: 5px;
+  margin-right: 5px;
+}
+.question-dialog-body{
+  max-height: 500px;
+  overflow-y: auto;
+  padding-right: 15px;
+}
+
+.question-dialog-body>div{
   border-bottom: 1px solid #606266;
   padding-bottom: 20px;
 
@@ -377,11 +396,11 @@ export default {
     display: inline-block;
   }
 }
-.form {
-  padding-top: 20px;
+
+.question-dialog-body>div:not(:first-child){
+  padding-top: 15px;
 }
-.imageList div {
-  margin-left: 5px;
-  margin-right: 5px;
+.question-dialog-body>div:last-child{
+  border: none;
 }
 </style>

src/views/question/list/index.vue

@@ -57,12 +57,12 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="发现日期" prop="submitTime">
+          <el-form-item label="发现日期" prop="submitRange">
             <el-date-picker
               clearable
-              v-model="queryParams.submitTime"
+              v-model="queryParams.submitRange"
               type="daterange"
-              value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd"
               placeholder="请选择发现日期"
             >
             </el-date-picker>
@@ -96,6 +96,7 @@
           <right-toolbar
             :showSearch.sync="showSearch"
             @queryTable="getList"
+            :columns="columns"
           ></right-toolbar>
         </el-row>
 
@@ -188,7 +189,6 @@
           <el-table-column
             label="操作"
             align="center"
-            width="120px"
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope">
@@ -281,7 +281,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         orgId: this.orgId,
-        submitTime: null,
+        submitRange: null,
         confirmStatus: null,
         reformStatus: null,
         checkSub: true,

src/views/resumption/taskManager/index.vue

@@ -348,14 +348,14 @@
             prop="abnormalDataNums"
             label="异常个数"
             min-width="9%"
-            v-if="columns[8].visible"
+            v-if="columns[9].visible"
           >
           </el-table-column>
           <el-table-column
             prop="status"
             label="任务状态"
             width="100px"
-            v-if="columns[9].visible"
+            v-if="columns[10].visible"
           >
             <template slot-scope="r">
               <span>
@@ -523,10 +523,10 @@ export default {
         { key: 4, label: `上级机构`, visible: true },
         { key: 5, label: `履职机构`, visible: true },
         { key: 6, label: `履职角色`, visible: true },
-        { key: 2, label: `提交人`, visible: true },
-        { key: 3, label: `提交时间`, visible: true },
-        { key: 4, label: `异常个数`, visible: true },
-        { key: 5, label: `任务状态`, visible: true },
+        { key: 7, label: `提交人`, visible: true },
+        { key: 8, label: `提交时间`, visible: true },
+        { key: 9, label: `异常个数`, visible: true },
+        { key: 10, label: `任务状态`, visible: true },
       ],
     };
   },