Merge remote-tracking branch 'origin/master'

jiangping

2024-02-02 f8b1073fbb28d37e08016eed32c682f8c5eae391

 company/src/components/business/dispatchUnitDetailsPlat.vue

@@ -67,9 +67,9 @@
                            <el-table-column
                                label="状态">
                                <template slot-scope="{row}">
                                    <span v-if="row.status === 0">待审核</span>
                                    <span v-if="row.status === 1">审核通过</span>
                                    <span v-if="row.status === 2">审核不通过</span>
                                    <span style="color:#2E68EC"  v-if="row.status === 0">待审核</span>
                                    <span style="color:green"  v-if="row.status === 1">审核通过</span>
                                    <span style="color:red"  v-if="row.status === 2">审核不通过</span>
                                </template>
                            </el-table-column>
<!--                            <el-table-column
@@ -93,7 +93,7 @@
                                <span style="font-size: 16px; font-weight: 400; color: black;">
                                    {{activity.title}}
                                    <span style="font-size: 16px; font-weight: 400; color: black; margin-left: 10px;" v-if="activity.objType === 5 || activity.objType === 6 || activity.objType === 1 || activity.objType === 2">
                                       提交意见：{{activity.content}}
                                       {{activity.content}}
                                    </span>
                                </span>
                                <span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
@@ -161,7 +161,7 @@
        },
        tableData: [],
        insuranceScheme: [],
        reverse: true,
        reverse: false,
        visible5:false,
        activities: []
      }
@@ -188,8 +188,8 @@
          duSolutionList: [],
          saveDuSolutionDTOList:[ ]
        }

        this.form.id = target.id
        this.form.checkInfo=''
        this.getDetails()
      },
      async getDetails() {