数据采集覆盖驳回

src/views/GATHER/index.vue

@@ -85,9 +85,10 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="success" 
-        v-hasPermi="['gather:GATHER:upload']"
-        @click="onOpenDialog('old')"
+        <el-button
+          type="success"
+          v-hasPermi="['gather:GATHER:upload']"
+          @click="onOpenDialog('old')"
           >历史数据导入</el-button
         >
       </el-col>
@@ -101,7 +102,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          @click="handleDownload()" 
+          @click="handleDownload()"
           v-hasPermi="['gather:GATHER:download']"
           :title="radio === '' ? '请先选择下面对应的单位模板' : ''"
           :disabled="radio === '' ? true : false"
@@ -665,9 +666,24 @@
         <el-button type="primary" @click="cancel">返 回</el-button>
       </div>
 
-      <div class="remark" v-if="form.remark != null">
-        <div class="remark_title">驳回理由：</div>
-        <div class="remark_text">{{ form.remark }}</div>
+      <div class="remark" v-if="form.taskVoList != 0">
+        <div class="remark_title">审批记录：</div>
+        <div style="padding: 4px; border-radius: 4px; background-color: #F5F7FA;">
+          <div class="remark_item" v-for="(item, index) in form.taskVoList">
+            <span>{{ item.execName }} </span>
+            <span>{{
+              item.status == 0
+                ? "待审核"
+                : item.status == 1
+                ? "同意"
+                : item.status == 2
+                ? "驳回"
+                : "退回"
+            }} </span>
+            <span> {{ item.comments }}  </span>
+            <span>{{ item.createTime }} </span>
+          </div>
+        </div>
       </div>
     </el-dialog>
   </div>

src/views/JOINTCONFERENCE/add.vue

@@ -42,16 +42,28 @@
         >
         </el-cascader>
       </el-form-item>
+      <el-form-item label="协作要求">
+        <el-input
+          type="textarea"
+          rows="4"
+          placeholder="请输入协作要求"
+          v-model="form.status"
+        ></el-input>
+      </el-form-item>
       <el-form-item label="状态">
         <template>
           <el-radio v-model="radio" label="1">完结</el-radio>
           <el-radio v-model="radio" label="2">长期</el-radio>
           <el-radio v-model="radio" label="3">限期</el-radio>
-
         </template>
       </el-form-item>
       <el-form-item label="限期日期">
-        <el-date-picker v-model="date" type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
+        <el-date-picker
+          v-model="date"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期"
+        >
         </el-date-picker>
       </el-form-item>
     </el-form>
@@ -93,9 +105,9 @@ export default {
     };
     return {
       // 状态选择
-      radio:null,
+      radio: null,
       // 限期日期
-      date:null,
+      date: null,
 
       propOpt: {
         value: "value",
@@ -117,6 +129,9 @@ export default {
           { required: true, message: "会议内容不能为空", trigger: "blur" },
         ],
         dept: [{ validator: checkDeptId, trigger: "blur" }],
+        status: [
+          { required: true, message: "协作要求不能为空", trigger: "blur" },
+        ],
       },
 
       deptListSele: [],

src/views/JOINTCONFERENCE/callback.vue

@@ -186,6 +186,7 @@ export default {
 }
 .detail_item .title {
   width: 100px;
+  margin: 0;
 }
 .cmain .detail_item p {
   margin: 0;