Merge remote-tracking branch 'origin/master'

value

2024-05-22 c55ca6e6d52254f2acca7af443403fa215c42ded

Merge remote-tracking branch 'origin/master'

 src/assets/api/controller.js

@@ -35,6 +35,7 @@

const user = {
    selectUserList: "/user/selectUserList", //获取用户列表
    selectPersonnelOverview: "/user/selectPersonnelOverview", // 资源要求-人员总览
    selectRoleList: "/role/selectRoleList", //获取角色列表
    updateUser: "/user/updateUser", //修改用户信息
    addUser: "/user/addUser", //添加用户信息

 src/components/do/b1-inspect-order-plan/Inspection.vue

@@ -320,7 +320,7 @@
    </el-drawer>
    <el-drawer title="任务切换" :visible.sync="taskVisible" :size="500">
      <ValueTable class="value-table" ref="insOrderPlan" :url="$api.insOrderPlan.selectInsOrderPlanList"
        :componentData="componentData" :key="upIndex" style="max-height: 100%;height: inherit;"/>
        :componentData="componentData" :key="upIndex" style="height: 100%;"/>
    </el-drawer>
    <el-dialog title="检验复核" :visible.sync="reviewDia" width="500px">
      <div class="body" style="display: flex;padding: 10px;" v-if="reviewDia">

 src/components/tool/onlyoffice.vue

@@ -57,7 +57,6 @@
  },
  methods: {
    async setEditor(option) {
      console.log(`output->option`,option)
      if (this.docEditor !== null) {
        this.docEditor.destroyEditor();
        this.docEditor = null;

 src/components/view/a6-personnel-overview.vue

@@ -166,7 +166,7 @@
        if(this.currentPage==1){
          this.loading = true
        }
        this.$axios.post(this.$api.user.selectUserList,{
        this.$axios.post(this.$api.user.selectPersonnelOverview,{
                    page: {
            current: this.currentPage,
            size: this.pageSize

 src/components/view/b1-report-preparation.vue

@@ -355,7 +355,8 @@
            title: row.entrustCode + ".docx",
            lang: 'zh-CN',
            isPrint: true,
            user:  { id: 1, name: userName},
            user_id: 1,
            user_name: userName,
            editUrl: this.javaApi + "/insReport/onlyOffice/save?fileName=" + row.entrustCode + ".docx"
          }
        })