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

zhuo

2025-03-17 61febcbc0dc133de8ab5237921f5bf89c9558e69

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

 src/views/business/inspectionReview/index.vue

@@ -153,7 +153,7 @@
                this.handleReview(row);
              },
              disabled: (row) => {
                return row.userName == null || row.userName && !row.userName.includes(this.nickName)
                return row.checkName == null || (row.checkName && !row.checkName.includes(this.nickName))
              }
            },
            {

 src/views/business/inspectionTask/inspection.vue

@@ -23,7 +23,7 @@
          @click="openUnPassDialog('add')">不合格处理</el-button>
        <el-button size="small" type="primary" @click="sampleVisible = true; uploadSample();">样品切换</el-button>
        <!--        <el-button v-if="state == 1" size="small" type="primary" @click="taskVisible = true">任务切换</el-button>-->
        <el-button v-if="state == 1" size="small" type="primary" @click="viewManHour">提交</el-button>
        <el-button v-if="state == 1" size="small" type="primary" @click="addVerifyDia = true">提交</el-button>
        <!-- 复核 -->
        <el-button v-if="state == 2" size="medium" type="primary" @click="openAddCheck">通过</el-button>
        <el-button v-if="state == 2" size="medium" @click="upInsReview(0)">不通过</el-button>