会议添加修改

src/components/AuxiliaryAudit/index.vue

@@ -6,17 +6,20 @@
             <el-descriptions-item label="活动名称">{{
               taskList.acname
             }}</el-descriptions-item>
-            <el-descriptions-item label="任务启动时间">
-              {{
-                taskList.beginTime ? taskList.beginTime.substr(0, 10) : "无"
-              }}</el-descriptions-item
-            >
-            <el-descriptions-item label="业务备注">{{
-              taskList.fromKeyword
-            }}</el-descriptions-item>
             <el-descriptions-item label="流程名称">{{
               taskList.proname
             }}</el-descriptions-item>
+              <el-descriptions-item label="任务启动时间">
+                {{
+                  taskList.beginTime ? taskList.beginTime.substr(0, 10) : "无"
+                }}</el-descriptions-item
+                >
+                <el-descriptions-item label="提交人">{{
+              taskList.formobj.auditName
+            }}</el-descriptions-item>
+            <el-descriptions-item label="审批人">{{
+              taskList.execName
+            }}</el-descriptions-item>
             <el-descriptions-item label="审核状态">
               <el-tag v-if="taskList.status == 1" type="success">已审</el-tag>
               <el-tag v-else-if="taskList.status == 2" type="danger">驳回</el-tag>
@@ -24,104 +27,21 @@
               <el-tag v-else-if="taskList.status == 0">待审核</el-tag>
   
             </el-descriptions-item>
+            <el-descriptions-item label="业务备注">{{
+              taskList.fromKeyword
+            }}</el-descriptions-item>
   
-            <el-descriptions-item label="审核意见">{{
+            <!-- <el-descriptions-item label="审核意见">{{
               taskList.comments ? taskList.comments : "无"
-            }}</el-descriptions-item>
+            }}</el-descriptions-item> -->
           </el-descriptions>
   
-          <el-form
-            ref="form"
-            :model="taskList"
-            label-width="80px"
-            style="margin-top: 20px"
-          >
-            <el-form-item label="提问标题" prop="title">
-              <el-input v-model="taskList.formobj.question" disabled></el-input>
-            </el-form-item>
-            <el-form-item label="问题类型" prop="type">
-              <el-input v-model="taskList.formobj.mark" disabled></el-input>
-            </el-form-item>
-  
-            <!-- <el-form-item label="提问用户" prop="expertName">
-              <el-input v-model="taskList.formobj.question" disabled></el-input>
-            </el-form-item> -->
-  
-            <el-form-item label="专家" prop="expertName">
-              <el-input v-model="taskList.formobj.expertName" disabled></el-input>
-            </el-form-item>
-  
-            <!-- <el-form-item label="来源">
-              <el-input v-model="taskList.formobj.source" disabled></el-input>
-            </el-form-item> -->
-  
-            <el-form-item label="提问内容" prop="detail">
-              <!-- <el-input
-                type="textarea"
-                :autosize="true"
-                disabled
-                v-html="taskList.formobj.detail"
-              > -->
-              <!-- </el-input> -->
-              <div class="question_content" v-html="taskList.formobj.detail"></div>
-            </el-form-item>
-  
-            <el-form-item label="专家回复" prop="expertAnswer">
-              <!-- <el-input
-                type="textarea"
-                :autosize="true"
-                disabled
-                v-html="taskList.formobj.expertAnswer"
-              >
-              </el-input> -->
-              <div class="question_content"  v-html="taskList.formobj.expertAnswer"></div>
-            </el-form-item>
-  
-            <!-- <el-form-item label="封面图" prop="picture" disabled>
-              <el-upload
-                action="#"
-                list-type="picture-card"
-                :limit="1"
-                :auto-upload="false"
-                :file-list="fileList"
-                :disabled="true"
-              >
-                <i slot="default" class="el-icon-plus"></i>
-                <div slot="file" slot-scope="{ file }">
-                  <img class="el-upload-list__item-thumbnail" :src="file.url" />
-  
-                  放大预览
-                  <span class="el-upload-list__item-actions">
-                    <span
-                      class="el-upload-list__item-preview"
-                      @click="handlePictureCardPreview(file)"
-                    >
-                      <i class="el-icon-zoom-in"></i>
-                    </span>
-                  </span>
-                </div>
-              </el-upload>
-            </el-form-item> -->
-  
-            <!-- <el-form-item label="新闻内容" prop="content">
-              <editor v-model="taskList.formobj.content" />
-            </el-form-item> -->
-          </el-form>
-  
-          <el-dialog
-            :visible="BigImgVisible"
-            fullscreen
-            append-to-body
-            :close-on-click-modal="false"
-            @close="BigImgVisible = false"
-          >
-            <img width="100%" :src="taskList.formobj.picture" alt="" />
-          </el-dialog>
+         
         </el-tab-pane>
         <el-tab-pane label="审批记录" name="审批记录">
           <el-timeline>
             <el-timeline-item
-              v-for="(item, index) in taskList.taskHisAction"
+              v-for="(item, index) in taskList.formobj.taskVoList"
               :timestamp="item.createTime"
               placement="top"
               :key="index + 'taskHisAction'"
@@ -130,6 +50,7 @@
                 <p>
                   {{ item.execId }} {{ item.acname }} 于 {{ item.createTime }}
                 </p>
+                <p v-if="item.comments">{{"驳回理由：" + item.comments }}</p>
               </el-card>
             </el-timeline-item>
           </el-timeline>

src/views/JOINTCONFERENCE/add.vue

@@ -54,19 +54,37 @@
       </el-form-item>
       <el-form-item label="状态" prop="type">
         <template>
-          <el-radio :disabled="param.edit" v-model="form.type" label="1"
+          <el-radio
+            @input="radioChange"
+            :disabled="param.edit"
+            v-model="form.type"
+            label="1"
             >完结</el-radio
           >
-          <el-radio :disabled="param.edit" v-model="form.type" label="2"
+          <el-radio
+            @input="radioChange"
+            :disabled="param.edit"
+            v-model="form.type"
+            label="2"
             >长期</el-radio
           >
-          <el-radio :disabled="param.edit" v-model="form.type" label="3"
+          <el-radio
+            @input="radioChange"
+            :disabled="param.edit"
+            v-model="form.type"
+            label="3"
             >限期</el-radio
           >
         </template>
       </el-form-item>
-      <el-form-item style="padding-bottom: 20px" label="限期日期" prop="date">
+      <el-form-item
+        v-if="isShowDate"
+        style="padding-bottom: 20px"
+        label="限期日期"
+        prop="date"
+      >
         <el-date-picker
+          :picker-options="pickerOptions"
           :disabled="param.edit"
           v-model="form.date"
           type="date"
@@ -114,6 +132,14 @@ export default {
       }
     };
     return {
+      // 时间日期格式选择限制
+      pickerOptions: {
+        disabledDate(time) {
+          const date = new Date();
+          return time.getTime() < Date.now() - 8.64e7; //禁止选取当天之后的日期（不包括静止当天）
+        },
+      },
+      isShowDate: false,
       user: null,
       // 状态选择
       status: null,
@@ -185,7 +211,7 @@ export default {
         getDept(2).then((res) => {
           this.deptList = res.data;
         });
-      } else if(res.user.dept.type == 2) {
+      } else if (res.user.dept.type == 2) {
         this.deptList = [
           {
             searchValue: null,
@@ -239,6 +265,13 @@ export default {
   },
 
   methods: {
+    radioChange(val) {
+      if (val == 1) {
+        this.isShowDate = false;
+        return;
+      }
+      this.isShowDate = true;
+    },
     getDeptList() {},
     handleTrees(data, id, parentId, children) {
       let config = {
@@ -285,8 +318,7 @@ export default {
       }
       return tree;
     },
-    selectChange(val) {
-    },
+    selectChange(val) {},
     handleChange(val) {
       this.form.cooperativeUnitId = this.seleValue;
     },
@@ -339,7 +371,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-p{
+p {
   margin: 0;
 }
 </style>

src/views/JOINTCONFERENCE/detail.vue

@@ -15,11 +15,14 @@
           }}</span
         >
       </el-descriptions-item>
-    </el-descriptions>
-    <el-descriptions border :labelStyle="{ width: '120px' }" >
+  
       <el-descriptions-item label="协作单位">
         <span v-text="form.conference.cooperativeUnit"></span>
       </el-descriptions-item>
+
+      <el-descriptions-item v-if="form.conference.type != 1" label="限期日期">
+        <span v-text="form.conference.date"></span>
+      </el-descriptions-item>
     </el-descriptions>
 
     <!-- <div class="detail_item">
@@ -75,7 +78,7 @@
         </template>
       </el-form-item> -->
 
-      <el-form-item label="限期日期" prop="date">
+      <!-- <el-form-item  label="限期日期" prop="date">
         <el-date-picker
           :disabled="true"
           v-model="form.conference.date"
@@ -84,7 +87,7 @@
           placeholder="选择日期"
         >
         </el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
 
       <div class="dept_list" v-for="(item, index) in form.reply" :key="index">
         <div class="title">{{ item.deptName }}：</div>

src/views/JOINTCONFERENCE/index.vue

@@ -261,7 +261,7 @@ export default {
       this.iframe({
         obj: detail,
         param: { id: row.id },
-        title: "单位指派",
+        title: "会议详情",
         width: "750px",
         height: "60%",
       });

src/views/norm/quotaBonded.vue

@@ -142,7 +142,10 @@
         <template slot-scope="scope">
           <el-button
             v-if="
-              (scope.row.auditStatus == 0 || scope.row.auditStatus == null) && (scope.row.approvalStatus == 0 ||scope.row.approvalStatus == null) &&
+              (scope.row.auditStatus == 0 || scope.row.auditStatus == null) &&
+              (scope.row.approvalStatus == 0 ||
+                scope.row.approvalStatus == null ||
+                scope.row.approvalStatus == 3) &&
               checkPermi(['gather:QUOTABONDED:audit'])
             "
             size="mini"
@@ -176,7 +179,10 @@
           >
           <el-button
             v-if="
-              (scope.row.auditStatus == 0 || scope.row.auditStatus == null) && (scope.row.approvalStatus == 0 ||scope.row.approvalStatus == null) &&
+              (scope.row.auditStatus == 0 || scope.row.auditStatus == null) &&
+              (scope.row.approvalStatus == 0 ||
+                scope.row.approvalStatus == null ||
+                scope.row.approvalStatus == 3) &&
               checkPermi(['business:QUOTABONDED:edit'])
             "
             size="mini"
@@ -191,15 +197,17 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            >删除</el-button>
+            >删除</el-button
+          >
 
-            <el-button
+          <el-button
             v-if="checkPermi(['business:QUOTABONDED:query'])"
             size="mini"
             type="text"
             icon="el-icon-delete"
-            @click="handleUpdate(scope.row)"
-            >查看</el-button>
+            @click="handleSelect(scope.row)"
+            >查看</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -224,9 +232,10 @@
       <el-form ref="form" :model="form" :rules="rules">
         <el-form-item label-width="100px" label="年份" prop="year">
           <el-date-picker
+            :disabled="isAppoval"
             v-model="form.year"
             type="year"
-            placeholder="请选择年份"
+            placeholder="请选123择年份"
             size="mini"
             class="year-picker"
             format="yyyy 年"
@@ -271,6 +280,7 @@
             label="上传附件"
           >
             <el-upload
+              :disabled="isAppoval"
               class="upload-demo"
               ref="upload"
               :headers="upload.headers"
@@ -285,7 +295,11 @@
               <div v-if="isAppoval" slot="tip" class="el-upload__tip">
                 审核无法修改
               </div>
-              <el-button slot="trigger" size="small" type="primary"
+              <el-button
+                :disabled="isAppoval"
+                slot="trigger"
+                size="small"
+                type="primary"
                 >选取文件</el-button
               >
             </el-upload>
@@ -324,6 +338,22 @@
           <el-input type="textarea" width="100%" v-model="form.test"></el-input>
         </el-form-item> -->
       </el-form>
+      
+      <p style="padding-right: 12px; margin-top: 30px; font-weight:600;font-size: 14px;
+    color: #606266; width: 100px; text-align: right;">审核记录</p>
+      <el-timeline>
+        <el-timeline-item
+          v-for="(item, index) in form.taskVoList"
+          :timestamp="item.createTime"
+          placement="top"
+          :key="index + 'taskHisAction'"
+        >
+          <el-card>
+            <p>{{ item.execName }}{{ item.createTime }}  <p v-if="item.comments !=null">{{ item.comments }}</p></p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+
       <div slot="footer" v-if="!isAppoval" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -365,6 +395,9 @@ export default {
   name: "QUOTABONDED",
   data() {
     return {
+      // 查看修改
+      check: false,
+
       // 用户导入参数
       upload: {
         // 是否显示弹出层（用户导入）
@@ -467,7 +500,7 @@ export default {
             });
             this.loading = false;
             return;
-          } else if(res.user.dept.type == 1) {
+          } else if (res.user.dept.type == 1) {
             this.deptList = response.data;
           }
           this.loading = false;
@@ -555,6 +588,7 @@ export default {
       const id = row.id || this.ids;
       getQUOTABONDED(id).then((response) => {
         this.form = response.data;
+        this.isAppoval = false;
         this.QUOTAFEEList = response.data.bondedFeeList;
         this.QUOTAFEEList.forEach((item) => (item.fileList = []));
         this.QUOTAFEEList.forEach((item) => {
@@ -565,6 +599,24 @@ export default {
         this.title = "辅助指标录入修改";
       });
     },
+
+    handleSelect(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getQUOTABONDED(id).then((response) => {
+        this.isAppoval = true;
+        this.form = response.data;
+        this.QUOTAFEEList = response.data.bondedFeeList;
+        this.QUOTAFEEList.forEach((item) => (item.fileList = []));
+        this.QUOTAFEEList.forEach((item) => {
+          item.fileList.push({ name: item.fileNames, url: item.linkUrls });
+        });
+        this.open = true;
+        this.$forceUpdate();
+        this.title = "辅助指标录入详情";
+      });
+    },
+
     // 文件上传成功处理
     handleFileSuccess(index, response, file, fileList) {
       console.log("1111", index);

src/views/task/index.vue

@@ -106,6 +106,8 @@ import CompanyUserService from "@/views/CompanyUserService/index.vue";
 import questionService from "@/views/QUESTION/questionService.vue";
 import articleTask from "@/views/ARTICLE/task/index.vue";
 import dataAcquisition from "@/components/DataAcquisition";
+import auxiliaryAudit from "@/components/AuxiliaryAudit";
+
 import { checkPermi } from "@/utils/permission.js";
 
 
@@ -132,6 +134,8 @@ export default {
     articleTask,
     dataAcquisition,
     CompanyUserService,
+    auxiliaryAudit,
+
   },
   data() {
     return {