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

zhuo

2025-03-07 8314c2943734770c6a38e67147e6367f683df8d1

 src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue

@@ -18,7 +18,7 @@
      </div>
      <div class="btns" style="padding-left: 30px;">
        <el-button v-if="addPower" size="small" type="primary"
          @click="addDialogVisible = true, addInfo = {}, radio = '发放'">添加发放记录</el-button>
          @click="addDialogVisible = true, addInfo = {}, radio = '发放', file = null">添加发放记录</el-button>
        <el-button v-if="outPower" :loading="outLoading" size="small" type="primary" @click="handleOut">导出</el-button>
      </div>
    </div>
@@ -245,7 +245,7 @@
              clickFun: (row) => {
                this.handleDelete(row);
              },
              disabFun: (row, index) => {
              disabled: (row, index) => {
                return row.documentState == '通过'
              }
            },
@@ -255,7 +255,7 @@
              clickFun: (row) => {
                this.handleLook(row);
              },
              disabFun: (row, index) => {
              disabled: (row, index) => {
                return !row.url
              }
            },
@@ -265,7 +265,7 @@
              clickFun: (row) => {
                this.handleCheck(row);
              },
              disabFun: (row, index) => {
              disabled: (row, index) => {
                return row.receiveUser != this.userId || row.documentState == '通过'
              }
            },
@@ -479,6 +479,7 @@
    handleUpdate(row) {
      this.addInfo = this.HaveJson(row)
      this.radio = '回收'
      this.file = null
      this.addDialogVisible = true
    },
    // 审核