Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

k94314517

2024-11-23 3011b9800d6c5bee031d87bc4e225b5b1fb52571

 company/src/components/business/OperaSolutionsDescWindow.vue

@@ -57,8 +57,10 @@
                    <div class="info_list_item_val" ><a v-if="form.fanganFile && form.fanganFile.fileurlFull" style="cursor: pointer;color: #2E68EC" title="点击查看" @click="openFile(form.fanganFile.fileurlFull)">{{ form.fanganFile.name || '点击查看' }}</a></div>
                </div>
            </div>
            <div style="font-size: 18px; font-weight: bold; margin-bottom: 10px;" v-if="userInfo.type === 0">方案使用情况</div>
            <el-table
                :data="form.worktypeList"
                v-if="userInfo.type === 0"
                :data="list"
                border
                style="width: 100%; margin-bottom: 20px;">
                <el-table-column
@@ -70,11 +72,37 @@
                    </template>
                </el-table-column>
                <el-table-column
                    prop="worktypeName"
                    prop="companyName"
                    align="center"
                    label="工种名称">
                    label="企业名称">
                </el-table-column>
                <el-table-column
                    align="center"
                    label="签章情况">
                    <template slot-scope="{row}">
                        <span v-if="row.signStatus === 0">待签章</span>
                        <span v-if="row.signStatus === 1">已签章</span>
                    </template>
                </el-table-column>
            </el-table>
<!--            <el-table-->
<!--                :data="form.worktypeList"-->
<!--                border-->
<!--                style="width: 100%; margin-bottom: 20px;">-->
<!--                <el-table-column-->
<!--                    label="序号"-->
<!--                    align="center"-->
<!--                    width="80">-->
<!--                    <template slot-scope="scope">-->
<!--                        <span>{{scope.$index + 1}}</span>-->
<!--                    </template>-->
<!--                </el-table-column>-->
<!--                <el-table-column-->
<!--                    prop="worktypeName"-->
<!--                    align="center"-->
<!--                    label="工种名称">-->
<!--                </el-table-column>-->
<!--            </el-table>-->
        </div>
        <!-- 修改 -->
        <OperaSolutionsWindow ref="operaSolutionsWindow" @success="callback"/>
@@ -89,7 +117,7 @@
import OperaSolutionsWindow from '@/components/business/OperaSolutionsWindow'
import OperaPdfViewerWindow from '@/components/business/OperaPdfViewerWindow'
import OperaSolutionsBaseDescWindow from '@/components/business/OperaSolutionsBaseDescWindow'
import { solutionsId } from '@/api/business/solutions'
import { solutionsId, listForCompany } from '@/api/business/solutions'
import { mapState } from 'vuex'
export default {
  name: 'OperaSolutionsDescWindow',
@@ -130,7 +158,8 @@
        signKeyword: '',
        worktypeList: [],
        worktypeIdList: []
      }
      },
      list: []
    }
  },
  computed: {
@@ -186,8 +215,15 @@
          this.form[key] = target[key]
        }
        this.getDetails()
        this.getList()
      })
    },
    getList() {
      listForCompany({ solutionId: this.form.id })
        .then(res => {
          this.list = res
        })
    },
    openFile (url) {
      setTimeout(() => {
        this.$refs.OperaPdfViewerWindow.open('方案确认书',url)