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

gaoluyang

2025-03-31 80c915239301b1f0e3a732a6318e7743709e9489

 src/views/business/materialOrder/copperOrder.vue

@@ -439,15 +439,16 @@
        custom: null,
        company: null,
        userId: null,
        companyId: '',
        type: '0', // 紧急程度
        code: null,
        remark: null, // 备注
        mating: 0,
        sample: null, // 样品名称
        appointed: '', // 约定时间
        buyUnitMeas: '', // 单位
        updateBatchNo: '', // 批次号
        partDetail: '', // 规格型号
        buyUnitMeas: null, // 单位
        updateBatchNo: null, // 批次号
        partDetail: null, // 规格型号
        declareDate: '', // 到货时间
        factory: null,
        laboratory: null,
@@ -460,8 +461,8 @@
        processing: 1,
        isLeave: 0,
        orderType: '进厂检验', // 检验类型
        supplierName: '', // 材料厂家
        qtyArrived: '', // 到货数量
        supplierName: null, // 材料厂家
        qtyArrived: null, // 到货数量
      },
      sample: {
        sampleCode: null,
@@ -555,7 +556,7 @@
          { required: true, message: '请填写规格型号', trigger: 'blur' }
        ],
        declareDate: [
          { required: true, message: '请填写到货时间', trigger: 'blur' }
          { required: true, message: '请填写到货时间', trigger: 'change' }
        ]
      },
      noNeedCheckDia: false,
@@ -583,23 +584,6 @@
        }
      }
    },
    productListSelected: {
      deep: true,
      handler(val) {
        if(val.length>0){
          for(let i =0 ; i< val.length; i++){
            if(val[i].inspectionItem.includes('松套管')){
              this.inspectionItemST = 1
              break;
            }else{
              this.inspectionItemST = 0
            }
          }
        }else{
          this.inspectionItemST = 0
        }
      }
    },
    sampleList: {
      deep: true,
      handler(val) {
@@ -621,6 +605,12 @@
    this.getInfoRow();
  },
  activated() {
    this.$refs.addObj.resetFields()
    this.addObj.createTime = ''
    this.addObj.id = ''
    this.addObj.updateTime = ''
    this.sampleList = []
    this.productList = []
    this.active = this.$route.query.active
    this.currentId = this.$route.query.currentId
    this.getInfoRow();
@@ -747,10 +737,11 @@
          this.addObj = {
            ...res.data.insOrder
          }
          this.addObj.qtyArrived = res.data.insOrderTemplate.qtyArrived
          this.addObj.buyUnitMeas = res.data.insOrderTemplate.buyUnitMeas
          this.addObj.updateBatchNo = res.data.insOrderTemplate.updateBatchNo
          this.addObj.supplierName = res.data.insOrderTemplate.supplierName
          this.$set(this.addObj, 'qtyArrived', res.data.insOrderTemplate.qtyArrived)
          this.$set(this.addObj, 'buyUnitMeas', res.data.insOrderTemplate.buyUnitMeas)
          this.$set(this.addObj, 'updateBatchNo', res.data.insOrderTemplate.updateBatchNo)
          this.$set(this.addObj, 'supplierName', res.data.insOrderTemplate.supplierName)
          this.$set(this.addObj, 'declareDate', res.data.insOrderTemplate.declareDate)
          this.addObj.type = String(this.addObj.type)
          this.sampleList = this.HaveJson(res.data.sampleProduct);
          this.getProNum()
@@ -1188,9 +1179,9 @@
        this.addObj.code = selects.code
        this.addObj.phone = selects.phone
        this.addObj.companyId = selects.departId
        if(this.active==1){
          this.selectInsOrderTemplateInfo()
        }
        // if(this.active==1){
        //   this.selectInsOrderTemplateInfo()
        // }
      })
    },
    getProNum() {
@@ -1465,11 +1456,11 @@
      }
      return 'warning-row';
    },
    selectInsOrderTemplateInfo() {
      selectInsOrderTemplate({company: this.addObj.company}).then(res => {
        this.templates = res.data
      })
    },
    // selectInsOrderTemplateInfo() {
    //   selectInsOrderTemplate({company: this.addObj.company}).then(res => {
    //     this.templates = res.data
    //   })
    // },
    methodChange(val, row) {
      if (val === null || val === '') return
      if (this.sampleList.length > 1) {