采集样式修改，采集数据任务审核样式修改

src/components/DataAcquisition/index.vue

@@ -1,6 +1,86 @@
 <template>
   <div>
-    <el-tabs v-model="activeName" type="border-card">
+    <div
+      v-for="(item, index) in tabList"
+      :key="index + 'tabs'"
+      :label="item.normName"
+      :name="item.normName"
+    >
+      <el-col
+        :span="24"
+        style="
+          border: 1px solid rgba(0, 0, 0, 0.05);
+          margin-bottom: 5px;
+          padding: 4px;
+        "
+      >
+        <p
+          style="
+            font-weight: 600;
+            margin: 0;
+            margin-bottom: 5px;
+            font-size: 17px;
+          "
+        >
+          {{ item.normName }}
+        </p>
+
+        <template v-for="listItem in taskList.formobj.feeLists">
+          <el-form
+            v-if="listItem.normId == item.normId"
+            :model="listItem"
+            :ref="'form' + listItem.normfeeId"
+            :key="listItem.normfeeId"
+            :disabled="listItem.sendValue == 1"
+            label-width="350px"
+          >
+            <!-- label-width="350px" -->
+            <el-col :span="8">
+              <el-form-item
+                style="padding: 10px"
+                :label="listItem.normfeeName + '（' + listItem.funitName + '）'"
+                prop="collCalue"
+              >
+                <!-- <el-input
+                  :disabled="!edit"
+                  v-model="listItem.collCalue"
+                  :placeholder="'请输入' + listItem.normfeeName"
+                ></el-input> -->
+                <div  style="background-color: rgba(0, 0, 0, .03); padding-left: 5px;" >{{ listItem.collCalue }}</div>
+
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </template>
+      </el-col>
+    </div>
+    <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.execName +
+              "------" +
+              statusArr[item.status] +
+              "------" +
+              item.createTime
+            }}
+            <span v-if="item.comments != null">{{
+              "------备注：" + item.comments
+            }}</span>
+          </p>
+        </el-card>
+      </el-timeline-item>
+    </el-timeline>
+    <!-- <el-tabs v-model="activeName" type="border-card">
       <el-tab-pane
         v-for="(item, index) in tabList"
         :key="index + 'tabs'"
@@ -48,7 +128,7 @@
             </el-card>
           </el-timeline-item>
         </el-timeline>
-    </el-tabs>
+    </el-tabs> -->
   </div>
 </template>
 
@@ -71,17 +151,16 @@ export default {
       openDetail: false,
       form: {},
       edit: false,
-      statusArr:{
-        '0': '待审核',
-        '1': '同意',
-        '2': '驳回',
-        '3': '退回',
-    },
-  }
+      statusArr: {
+        0: "待审核",
+        1: "同意",
+        2: "驳回",
+        3: "退回",
+      },
+    };
   },
   computed: {},
   methods: {
-
     handleClose() {
       this.check = false;
     },
@@ -183,7 +262,6 @@ export default {
     },
   },
   created() {
-
     this.tabList = JSON.parse(JSON.stringify(this.taskList.formobj.feeLists));
     //去重获取tab
     //遍历如果遇到相同的id则删掉

src/views/GATHER/index.vue

@@ -664,7 +664,7 @@
                 :ref="'form' + listItem.normfeeId"
                 :key="listItem.normfeeId"
                 :disabled="listItem.sendValue == 1"
-                label-width="340px"
+                label-width="350px"
                 >
                 <!-- label-width="350px" -->
                 <el-col :span="8">
@@ -676,12 +676,15 @@
                     "
                     prop="collCalue"
                   >
+                  <!-- <p>{{ edit }}</p> -->
 
                     <el-input
+                    v-if="edit == true"
                     :disabled="!edit"
                       v-model="listItem.collCalue"
                       :placeholder="'请输入' + listItem.normfeeName"
                     ></el-input>
+                    <div v-if="edit == false" style="background-color: rgba(0, 0, 0, .03); padding-left: 5px;" >{{ listItem.collCalue }}</div>
                   </el-form-item>
                 </el-col>
               </el-form>