Merge remote-tracking branch 'origin/master'

k94314517

2024-02-23 3c456949b70671cc2ad95ad5395dfaceda519f17

 company/src/components/enterprise/dispatchUnitDetails.vue

@@ -19,10 +19,10 @@
                <div class="info_list_item">
                    <div class="info_list_item_label">派遣单位状态：</div>
                    <div class="info_list_item_val" style="color:#2E68EC;" v-if="form.unitStatus === 0">待审核</div>
                    <div class="info_list_item_val"   v-if="form.unitStatus === 1">
                        <span style="color:#2E68EC;" v-if="form.worktypeStatus  ==null||form.worktypeStatus === 0">工种待审</span>
                        <span style="color: green" v-if="form.worktypeStatus === 1">审核通过</span>
                        <span style="color: red;" v-if="form.worktypeStatus === 2">工种审核不通过</span>
                    <div class="info_list_item_val" v-if="form.unitStatus === 1">
                        <span :class="'du-status'+ form.worktypeStatus" v-if="form.worktypeStatus == null || form.worktypeStatus === 0">工种待审</span>
                        <span :class="'du-status'+ form.worktypeStatus" v-if="form.worktypeStatus === 1">审核通过</span>
                        <span :class="'du-status'+ form.worktypeStatus" v-if="form.worktypeStatus === 2">工种审核不通过</span>
                    </div>
                    <div class="info_list_item_val"  style="color: red;" v-if="form.unitStatus === 2">审核不通过</div>
                </div>
@@ -56,12 +56,16 @@
                                prop="name"
                                label="操作视频">
                                <template slot-scope="{row}">
                                    <video loop controls width="150px" height="150px" :src="row.videoUrlFull"></video>
                                    <video v-if="row.videoUrlFull" loop controls width="150px" height="150px" :src="row.videoUrlFull"></video>
                                    <span v-else>-</span>
                                </template>
                            </el-table-column>
                            <el-table-column
                                prop="checkDate"
                                label="审核通过日期">
                                <template slot-scope="{row}">
                                    <span v-if="row.status === 2">-</span>
                                    <span v-else>{{row.checkDate}}</span>
                                </template>
                            </el-table-column>
                            <el-table-column
                                label="状态">
@@ -92,7 +96,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}}
                                    </span>
                                </span>
                                <span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
@@ -131,6 +135,7 @@
          code: '',
          content: '',
          unitStatus: '',
          worktypeStatus: '',
          duLogList: [],
          duSolutionList: [],
          saveDuSolutionDTOList: [