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

zhuo

2025-05-12 9a4370f8bd16d2bcfb41aac0df3f580ac6642d7b

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

 src/api/business/add.js

@@ -16,6 +16,14 @@
    data: query
  })
}
// 检验类别为抽检时掉接口
export function judgeNotSpotCheckOrder(query) {
  return request({
    url: '/insOrder/judgeNotSpotCheckOrder',
    method: 'post',
    data: query
  })
}
// 添加检验下单数据
export function addInsOrder(query) {
  return request({

 src/views/business/productOrder/components/addOrder.vue

@@ -591,7 +591,7 @@
} from "@/api/business/rawMaterialOrder";
import {
  addInsOrder, addInsOrderTemplate, delInsOrderTemplate,
  getQuarterOnOrder, selectInsOrderTemplateById,
  getQuarterOnOrder, judgeNotSpotCheckOrder, selectInsOrderTemplateById,
  selectOrderManDay,
  updateInsOrder,
  upInsOrder,
@@ -602,6 +602,7 @@
import limsTable from "@/components/Table/lims-table.vue";
import {selectCustomPageList} from "@/api/system/customer";
import {mapGetters} from "vuex";
import {addQuarter, updateQuarterOnOrder} from "@/api/business/finishedProductSampling";

export default {
  name: 'AddOrder',
@@ -1259,36 +1260,62 @@
        }
      },
      saveMethod(sampleList){
        this.saveLoad = true
        if (this.addObj.quarterItemId) {
          this.addObj.quarterItemId = this.addObj.quarterItemId[1]
        }
        if(this.tabIndex==4&&this.active==2){
          if (this.addObj.createTime) {
            delete this.addObj.createTime
          }
          // 退回后提交
          updateInsOrder({insOrder: this.addObj, sampleProduct: sampleList}).then(res => {
            this.saveLoad = false
            this.$message.success('已提交')
            this.bsm3Dia = false;
            this.closeOpenPage()
          }).catch(e=>{
            this.saveLoad = false
          })
        }else{
          // 常规提交
          addInsOrder({insOrder: this.addObj, sampleList: sampleList}).then(res => {
            this.saveLoad = false
            this.$message.success('已提交')
            this.bsm3Dia = false;
            this.closeOpenPage()
          }).catch(e=>{
            this.saveLoad = false
          })
        if (this.addObj.createTime) {
          delete this.addObj.createTime
        }

        if (this.addObj.orderType === '抽检') {
          judgeNotSpotCheckOrder({ insOrder: this.addObj, sampleList: sampleList }).then(res => {
            if (res.data === true) {
              this.saveData(sampleList);
            } else {
              // const message = res.message.replace(/\n/g, '<br>');
              this.$confirm(res.message, '提示', {
                confirmButtonText: '确定',
                cancelButtonText: '取消',
                type: 'warning',
                dangerouslyUseHTMLString: true, // 👈 关键点：允许 HTML
                message: res.message // 这里也可以省略，因为第二个参数是 title，第三个是 options
              }).then(() => {
                this.saveData(sampleList);
              }).catch(() => {
                this.$message({
                  type: 'info',
                  message: '已取消'
                });
              });
            }
          });
        } else {
          this.saveData(sampleList)
        }
      },
    saveData(sampleList) {
      this.saveLoad = true
      if(this.tabIndex==4&&this.active==2){
        // 退回后提交
        updateInsOrder({insOrder: this.addObj, sampleProduct: sampleList}).then(res => {
          this.saveLoad = false
          this.$message.success('已提交')
          this.bsm3Dia = false;
          this.closeOpenPage()
        }).catch(e=>{
          this.saveLoad = false
        })
      }else{
        // 常规提交
        addInsOrder({insOrder: this.addObj, sampleList: sampleList}).then(res => {
          this.saveLoad = false
          this.$message.success('已提交')
          this.bsm3Dia = false;
          this.closeOpenPage()
        }).catch(e=>{
          this.saveLoad = false
        })
      }
    },
      upInsOrderOfState(state) {
        if (state == 1) {
          this.saveLoad = true