协作单位

src/components/DataAcquisition/index.vue

@@ -34,7 +34,7 @@
         </el-row>
       </el-tab-pane>
 
-      <el-tab-pane label="审批记录" name="审批记录">
+      <!-- <el-tab-pane label="审批记录" name="审批记录">
         <el-timeline>
           <el-timeline-item
             v-for="(item, index) in taskList.formobj.taskVoList"
@@ -49,7 +49,22 @@
             </el-card>
           </el-timeline-item>
         </el-timeline>
-      </el-tab-pane>
+      </el-tab-pane> -->
+      <div style="font-size: 18px; font-weight: 600; margin-bottom: 20px;">审批记录：</div>
+      <el-timeline>
+          <el-timeline-item
+            v-for="(item, index) in taskList.formobj.taskVoList"
+            :timestamp="item.createTime"
+            placement="top"
+            :key="index + 'taskHisAction'"
+          >
+            <el-card>
+              <p>
+                {{ item.execId }} {{ item.acname }} 于 {{ item.createTime }}
+              </p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
     </el-tabs>
     <div class="remark" v-if="form.remark != null">
       <div class="remark_title">驳回理由：</div>

src/views/GATHER/index.vue

@@ -667,8 +667,8 @@
       </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_title" style="margin-bottom: 20px;">审批记录：</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>{{
@@ -683,7 +683,30 @@
             <span> {{ item.comments }}  </span>
             <span>{{ item.createTime }} </span>
           </div>
-        </div>
+        </div> -->
+
+        <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.status == 0
+                ? "待审核"
+                : item.status == 1
+                ? "同意"
+                : item.status == 2
+                ? "驳回"
+                : "退回"
+            }}  {{ item.acname }} 于 {{ item.createTime }}
+              </p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
       </div>
     </el-dialog>
   </div>
@@ -1389,9 +1412,10 @@ export default {
   margin-top: 20px;
 
   .remark_title {
-    margin-bottom: 10px;
+    margin-bottom: 30px;
     font-size: 18px;
     font-weight: bold;
+
   }
 
   .remark_text {

src/views/JOINTCONFERENCE/add.vue

@@ -47,19 +47,19 @@
           type="textarea"
           rows="4"
           placeholder="请输入协作要求"
-          v-model="form.status"
+          v-model="form.cooperation_req"
         ></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>
+          <el-radio v-model="form.type" label="1">完结</el-radio>
+          <el-radio v-model="form.type" label="2">长期</el-radio>
+          <el-radio v-model="form.type" label="3">限期</el-radio>
         </template>
       </el-form-item>
       <el-form-item label="限期日期">
         <el-date-picker
-          v-model="date"
+          v-model="form.collaborativeContent"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="选择日期"
@@ -105,7 +105,7 @@ export default {
     };
     return {
       // 状态选择
-      radio: null,
+      status: null,
       // 限期日期
       date: null,