Merge remote-tracking branch 'origin/master'

jiangping

2024-02-04 3c2e49d7bcc91268a75689db400d1f1698c0f8b7

 company/src/components/business/dispatchUnitDetailsPlat.vue

@@ -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;">
@@ -112,6 +112,9 @@
      <OperaDispatchUnitWindow ref="OperaDispatchUnitWindow" @success="callback" />
      <dispatchReview ref="dispatchReview"  @success="callback" />
      <dispatchReviewCheck ref="dispatchReviewCheck" @success="callback" />
      <template v-slot:footer>
        <el-button @click="visible=false">返回</el-button>
      </template>
    </GlobalWindow>
</template>