Merge remote-tracking branch 'origin/master'

jiangping

2024-02-04 3c2e49d7bcc91268a75689db400d1f1698c0f8b7

 company/src/components/business/OperaInsuranceApplyWindow.vue

@@ -83,7 +83,7 @@
                        <el-table-column
                            prop="currentFee"
                            align="center"
                            label="当前费用(元)">
                            label="产生费用(元)">
                        </el-table-column>
                        <el-table-column
                            prop="fee"
@@ -228,7 +228,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;">
@@ -250,6 +250,9 @@
        <additionSubtractionApplication ref="additionSubtractionApplication" @success="successEvent" />
        <!--    换厂申请    -->
        <factoryChange ref="factoryChange" @success="successEvent" />
      <template v-slot:footer>
        <el-button @click="visible=false">返回</el-button>
      </template>
    </GlobalWindow>
</template>

@@ -310,7 +313,7 @@
      visible3: false,
      visible4: false,
      visible5: false,
      reverse: true,
      reverse: false,
      radio: 0,
      activities: [],
      tableData: [],
@@ -335,6 +338,8 @@
     open(title,target){
        this.visible = true;
        this.title = title
        this.model={}
        this.dataId=null
        this.dataId = target.id
        this.getDetail()
        this.getList()
@@ -520,7 +525,7 @@
    onSubmit(){

    },
    getDetail(){
     getDetail(){
      getDetail(this.dataId).then(res => {
        this.model = res
        this.tableData = new Array()