2025-11-06

oqc优化

src/views/modules/qc/OQCResultEntry.vue

@@ -529,7 +529,8 @@
         </el-table>
       </div>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
-        <el-button type="primary" @click="Transfer">保存</el-button>
+        <el-button v-if="detailData.state === '待检验'" type="primary" :loading="transferLoadFlag" @click="Transfer('1')">应用</el-button>
+        <el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="primary" :loading="transferLoadFlag" @click="Transfer('2')">保存</el-button>
         <el-button type="primary" @click="detailInformationFlag=false">关闭</el-button>
       </el-footer>
     </el-dialog>
@@ -863,6 +864,7 @@
         favorite: false,
         // 导出 start
         exportData: [],
+        transferLoadFlag: false,
         exportName: "FQAS检验录入" + this.dayjs().format('YYYYMMDDHHmmss'),
         exportHeader: ["FQAS检验录入"],
         exportFooter: [],
@@ -2479,37 +2481,33 @@
         this.dataListSelections = val
       },
 
-      async Transfer () {
-        if (this.detailData.inspectionResult === '' || this.detailData.inspectionResult == null) {
-          this.$message.warning('请选择检验结论！')
-          return
-        }
-        if (this.detailData.inspectionResult === '不合格' && (this.detailData.disposalMeasures == null || this.detailData.disposalMeasures === '')) {
-          this.$message.warning('请选择处置措施！')
-          return
-        }
-        if (this.detailList.length > 0 && this.detailData.inspectionResult === '不合格') {
-          const flag = this.detailList.some(item => item.itemResult === 'N')
-          if (!flag) {
-            this.$message.warning('请选择不合格项目！')
+      async Transfer (type) {
+        if (type === '2') {
+          if (this.detailData.inspectionResult === '' || this.detailData.inspectionResult == null) {
+            this.$message.warning('请选择检验结论！')
             return
           }
-        }
-        this.$confirm(`确认保存检验数据?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
+          if (this.detailData.inspectionResult === '不合格' && (this.detailData.disposalMeasures == null || this.detailData.disposalMeasures === '')) {
+            this.$message.warning('请选择处置措施！')
+            return
+          }
+          if (this.detailList.length > 0 && this.detailData.inspectionResult === '不合格') {
+            const flag = this.detailList.some(item => item.itemResult === 'N')
+            if (!flag) {
+              this.$message.warning('请选择不合格项目！')
+              return
+            }
+          }
           if (this.detailData.inspectionResult !== '不合格') {
             this.detailData.disposalMeasures = ''
             this.detailData.disposalRemark = ''
           }
-          this.saveDetailInformation()
-        })
+        }
+        this.saveDetailInformation(type)
       },
 
       // 新增明细信息
-      saveDetailInformation () {
+      saveDetailInformation (type) {
         this.saveInformationData.site = this.detailData.site
         this.saveInformationData.buNo = this.detailData.buNo
         this.saveInformationData.inspectionNo = this.detailData.inspectionNo
@@ -2528,7 +2526,8 @@
         this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
         this.saveInformationData.passQty = this.detailData.passQty == null ? 0 : this.detailData.passQty
         this.saveInformationData.notPassQty = this.detailData.notPassQty == null ? 0 : this.detailData.notPassQty
-        // this.saveInformationData.subDetailList = this.acquisitionList
+        this.saveInformationData.type = type
+        this.transferLoadFlag = true
         saveFQASDetailedRecord(this.saveInformationData).then(({data}) => {
           if (data && data.code === 0) {
             this.searchData.inspectionNo = ''
@@ -2545,6 +2544,8 @@
               confirmButtonText: '确定'
             })
           }
+        }).finally(()=>{
+          this.transferLoadFlag = false
         })
       },