合并分支冲突解决

zuozhengqing

2024-03-20 f4ed5ae8873f65c36b5cf37be264f6ec1e154647

 src/views/purchaseManage/purchase/components/AddPurchase.vue

@@ -144,6 +144,7 @@
                    clearable
                    placeholder="选择日期"
                    value-format="yyyy-MM-dd"
                    :picker-options="pickerOptionsBefore"
                  >
                  </el-date-picker>
                </el-form-item>
@@ -158,6 +159,7 @@
                    clearable
                    placeholder="选择日期"
                    value-format="yyyy-MM-dd"
                    :picker-options="pickerOptions"
                  >
                  </el-date-picker>
                </el-form-item>
@@ -231,11 +233,13 @@
              :detailEnter="editCommonConfig.detailEnter"
              :show-summary="showSummary"
              :recalculateShow="false"
              :addTypeIdMultiple="true"
              :product-table-list="productTableList"
              sign="purchase"
              @inputContent="inputContent"
              @getSummaries="getSummaries"
              @addProductClick="addProductClick"
              @getSelectArray="getSelectArray"
              @emptyProductClick="emptyProductClick"
              @clearupProduct="clearupProduct"
              @rowClick="rowClick"
@@ -368,7 +372,7 @@
      editConfig: this.editCommonConfig,
      rules: {
        purchaseTypeId: [{ required: true, message: "请选择", trigger: "change" }],
        supplierName: [{ required: true, message: "请选择", trigger: "change" }],
        supplierName: [{ required: true, message: "请选择供应商名称", trigger: "change" }],
        phone: [
          {
            required: false,
@@ -393,7 +397,10 @@
          },
          { validator: this.validatorNumThree, trigger: "change" }
        ],
        number: [{ required: true, validator: this.validateCheckCode, trigger: ["change", "blur"] }]
        number: [{ required: true, validator: this.validateCheckCode, trigger: ["change", "blur"] }],
        warehouse: [{ required: true, message: "请选择收货仓库", trigger: "change" }],
        signingDate: [{ required: true, message: "请选择签约日期", trigger: "change" }],
        deliveryDate: [{ required: true, message: "请选择交付日期", trigger: "change" }],
      },
      productTableList: {},
      showSummary: {
@@ -401,7 +408,7 @@
        total: false,
        sumProp: ["price", "total"],
        multiply: ["amount", "price"],
        titleProp: ["编号", "产品名称", "产品编号", "计量单位", "规格型号", "采购单价", "描述"],
        titleProp: ["编号", "产品名称", "产品编号", "计量单位", "规格", "型号", "采购单价", "描述"],
        mergeNumber: 4,
        totalName: "小计"
      },
@@ -424,11 +431,20 @@
      totalTwo: 0,
      productListIdx: 0,
      lacks: [],
      pickerOptions: {
        disabledDate(time) {
          return time.getTime() < Date.now() - 8.64e7
        }
      },
      pickerOptionsBefore: {
        disabledDate(time) {
          return time.getTime() > Date.now()
        }
      },
      receiveWhouseList: [] // 收货仓库列表
    }
  },
  created() {
    console.log(this.editConfig, "参数")
    this.handleGetBomKindDictList()
    this.getWarehouseInfo()
    this.$store.dispatch("getSupplier")
@@ -503,9 +519,6 @@
        this.plcBrandList = res.data
        this.setTableForm()
        if (val) {
          // this.plcBrandList.map((item)=>{
          //   item.purchaseTypeId=item.id
          // })
          for (let i in this.plcBrandList) {
            if (this.plcBrandList[i][this.editRow.isDefault]) {
              this.editConfig.infomation.purchaseTypeId = this.editConfig.infomation.purchaseTypeId
@@ -616,6 +629,8 @@
                  if (res.code === 200) {
                    this.$message.success("创建成功")
                    this.$parent.getData()
                  } else {
                    this.$message.error(res.msg)
                  }
                })
              }
@@ -788,7 +803,7 @@
            purchaseId: 0,
            productId: Number(this.productId),
            productIndex: this.productIndex,
            amount: 0,
            amount: 1,
            name: "",
            number: "",
            price: 0,
@@ -813,6 +828,7 @@
        supplierId: undefined,
        tableData: this.tableData,
        disabled: this.editConfig.isDisabled,
        isReturn: true,
        tableColumn: [
          {
            label: "产品名称",
@@ -824,11 +840,12 @@
          },
          { label: "产品编号", prop: "number", min: 150 },
          { label: "计量单位", prop: "unit" },
          { label: "规格型号", prop: "specifications" },
          { label: "规格", prop: "specifications" },
          { label: "型号", prop: "modelNumber" },
          { label: "数量", prop: "amount", inputNumber: true, disabled: this.editConfig.isDisabled },
          {
            label: "采购单价",
            prop: "price",
            prop: "purchasePrice",
            inputFloat: true,
            isRequird: true,
            disabled: this.editConfig.isDisabled
@@ -841,12 +858,10 @@
    },
    // 产品列表输入
    inputContent(val, prop, row) {
      // this.productId = row.productId;
      this.productIndex = row.productIndex
      let num = 0
      this.tableData.map((item) => {
        num += item.amount
        if (item.productIndex === row.productIndex) {
        if (item.number === row.number) {
          item[prop] = val
        }
      })
@@ -880,18 +895,35 @@
    },
    // 产品新增
    addProductClick() {
      this.productIndex++
      this.tableData.push({
        productIndex: this.productIndex,
        productId: "",
        id: 0,
        amount: 0,
        desc: "",
        name: "",
        number: "",
        price: 0,
        total: 0
      })
      // this.productIndex++
      // this.tableData.push({
      //   productIndex: this.productIndex,
      //   productId: "",
      //   id: 0,
      //   amount: 0,
      //   desc: "",
      //   name: "",
      //   number: "",
      //   price: 0,
      //   total: 0
      // })
      // this.showSummary.show = true
    },
    // 新增方式修改
    getSelectArray(val, index) {
      console.log(val, "ddd99999")
      if (this.tableData.length == 1 && this.tableData[0].number.length == 0) {
        this.tableData = []
      }
      if (index < this.tableData.length) {
        this.tableData.splice(index, 1)
        val.map((item, ind) => {
          this.tableData.splice(index + ind, 0, item)
        })
      } else {
        this.tableData = this.tableData.concat(val)
      }
      this.productTableList.tableData = this.tableData
      this.showSummary.show = true
    },
    //  产品清空