Merge remote-tracking branch 'origin/master'

zss

2023-12-11 c880739ec4cd5ede33b31eb98ad5f7628ea288e5

 src/views/product/workbench/product-record-form.vue

@@ -395,7 +395,6 @@
          endTime: this.endTime
          //   criteria: JSON.stringify(obj)
        }).then((res) => {
          console.log(res.data.data.length)
          if (res.data.data.length) {
            const arr = []
            arr.push(res.data.data[0])
@@ -407,7 +406,6 @@
            this.scanArr.push(res.data.data[0].id)
            this.idList = [...new Set(this.scanArr)]
            this.part = null
            console.log(this.idList)
          }
        })
      }
@@ -472,7 +470,6 @@
          templateType: this.currTemplateType
        })
      ).then((response) => {
        console.log(response)
        this.paramTemplatesList = response.data.data.records
      })
    },
@@ -507,7 +504,6 @@
          this.params = JSON.parse(JSON.stringify(list))
        }
      })
      console.log(this.selectedTemplateId)
    },
    getParamValuesi() {
      this.params = []
@@ -524,7 +520,6 @@
          this.params = JSON.parse(JSON.stringify(list))
        }
      })
      console.log(this.selectedTemplateIds)
    },
    saveProductRecord() {
      this.saveDisabled = true
@@ -661,11 +656,8 @@
        // this.part = val.systemNo + '   ' + val.outBatchNo
        this.part = val.outBatchNo
        this.productOutId = val.id
        console.log(this.part)
        const forData = []
        console.log(val)
        forData.push(val)
        console.log(forData)
        for (let i = 0; i < forData.length; i++) {
          if (!this.produceList.some((e) => e.id === forData[i].id))
            this.produceList.push(forData[i])
@@ -692,8 +684,6 @@
          }
        }
        // this.idList = [...new Set(arr)]
        console.log(this.outputPartsList)
        console.log(this.idList)
      }
    },
    selectProductOutPuts(val) {
@@ -705,11 +695,8 @@
        // this.part = val.systemNo + '   ' + val.outBatchNo
        this.parts = val.partBatchNo
        this.productOutId = val.id
        console.log(this.parts)
        const forData = []
        console.log(val)
        forData.push(val)
        console.log(forData)
        for (let i = 0; i < forData.length; i++) {
          if (!this.cutApartList.some((e) => e.id === forData[i].id))
            this.cutApartList.push(forData[i])
@@ -735,12 +722,9 @@
          }
        }
        // this.idLists = [...new Set(arr)]
        console.log(this.outputPartsList)
        console.log(this.idLists)
      }
    },
    handleDelete(index, row) {
      console.log(index, row)
      this.outputPartsList = this.outputPartsList.filter(
        (item) => item.id !== row.id
      )
@@ -749,8 +733,6 @@
      this.produceList = this.produceList.filter((item) => item.id !== row.id)
      this.cutApartList = this.cutApartList.filter((item) => item.id !== row.id)

      console.log(this.idList)
      console.log(this.outputPartsList)
    },
    // 回车换行
    nextFocus(index) {
@@ -774,9 +756,7 @@
          this.paramObj.endTime = this.getNowFormatDate()
          this.paramObjs.startTime = this.getNowFormatDate()
          this.paramObjs.endTime = this.getNowFormatDate()
          console.log(123456)
        } else if (this.createDateRangeArr.length !== 0) {
          console.log(123456)
          this.paramObj.startTime = this.createDateRangeArr[0]
            .split('-')
            .join('')