团组流程添加字段、样式冲突修改

src/components/OP/DepartProcessList.vue

@@ -50,7 +50,7 @@
 </div> -->
                                         <div class="toppx" style="display: flex;flex-wrap: wrap;">
                                             <div class="step_icon">主要任务：</div>
-                                            <div v-for="(stepItem, index) in props.row.stepInfo.steps">
+                                            <div v-for="(stepItem, index) in props.row.stepInfo.steps" :key="index">
                                                 <div
                                                     :style="{ 'color': index < props.row.stepInfo.active - 1 ? '#67c23a' : props.row.stepInfo.active - 1 == index ? 'black' : '#c0c4cc' }">
                                                     <!-- props.row.stepInfo.active - 1 == index -->
@@ -70,7 +70,7 @@
                                             <br />
                                             <div class="toppx" style="display: flex;flex-wrap: wrap;">
                                                 <div class="step_icon">额外任务：</div>
-                                                <div v-for="(stepItem, index) in props.row.stepInfo.extraStep">
+                                                <div v-for="(stepItem, index) in props.row.stepInfo.extraStep" :key="index">
                                                     <div
                                                         :style="{ 'color': stepItem.approved == 1 ? '#67c23a' : 'black' }">
                                                         <span
@@ -129,7 +129,7 @@
             <el-dialog title="回执信息" :visible.sync="dialogVisible" width="30%">
                 <el-card class="form-card" v-for="item in historyForm" :key="item.id">
                     <div style="margin: 0px auto; width: 90%;">
-                        <el-form :model="item">
+                        <el-form :model="item" label-width="130px">
                             <h4>
                                 审核状态:&nbsp;&nbsp;<span v-if="item.isApproved == 1" style="color: #67C23A;">已审核</span>
                                 <span v-else-if="item.isApproved == 0" style="color: #E6A23C;">未审核</span>
@@ -155,16 +155,22 @@
                                     </el-input>
                                 </div>
                             </el-form-item>
+                            <!-- <el-form-item label="特殊说明："  v-if="isReview">
+                                <div class="over_input">
+                                    <el-input width="70%" type="textarea" v-model="item.remark">
+                                    </el-input>
+                                </div>
+                            </el-form-item> -->
                             <div v-if="item.files.length > 0">
                                 <h4>相关文件</h4>
-                                <div v-for="(file, index) in item.files" style="display: flex;text-align: center;">
+                                <div v-for="(file, index) in item.files" :key="index" style="display: flex;text-align: center;">
                                     <div style="flex: 1;">
                                         {{ file.fileName }}
                                     </div>
                                     <div style="flex: 1;">
                                         <a :href="file.url" target="_blank">下载</a>
                                     </div>
-                                </div>
+                                </div> 
                             </div>
                         </el-form>
                     </div>
@@ -173,6 +179,9 @@
                         <div style="flex: 1;">
                             <el-button type="primary" size="mini" @click="handleApproval(item)">通过</el-button>
                         </div>
+                        <!-- <div style="flex: 1;">
+                            <el-button type="primary" size="mini" @click="SetWorkTaskReceiptRemark(item)">保存备注</el-button>
+                        </div> -->
                         <div style="flex: 1;">
                             <el-button type="danger" size="mini" @click="handleReject(item)">驳回</el-button>
                         </div>
@@ -439,6 +448,31 @@ export default {
                 }
             });
         },
+        //保存备注
+        SetWorkTaskReceiptRemark(item) {              
+            var url = "/api/Task/SetWorkTaskReceiptRemark"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    receiptId: item.id,
+                    remark: item.remark,
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    
+                }else {
+                    that.$message({
+                        message: res.data.msg,
+                        type: 'warning'
+                    });
+                }
+            })
+        },
         handleCurrentChange(val) {
             this.pagination.pageIndex = val;
             this.load(); // 重新加载数据
@@ -666,7 +700,7 @@ export default {
 }
 
 .over_input .el-textarea {
-    width: 70%;
+    width: 100%;
 }
 
 .toppx>div {