合并分支冲突解决

zuozhengqing

2024-03-20 f4ed5ae8873f65c36b5cf37be264f6ec1e154647

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

@@ -51,7 +51,6 @@
                    v-model="editConfig.infomation.purchaseTypeId"
                    clearable
                    style="width: calc(100% - 30px)"
                    @visible-change="selPurchaseChange"
                  >
                    <el-option
                      v-for="ele in plcBrandList"
@@ -145,6 +144,7 @@
                    clearable
                    placeholder="选择日期"
                    value-format="yyyy-MM-dd"
                    :picker-options="pickerOptionsBefore"
                  >
                  </el-date-picker>
                </el-form-item>
@@ -159,6 +159,7 @@
                    clearable
                    placeholder="选择日期"
                    value-format="yyyy-MM-dd"
                    :picker-options="pickerOptions"
                  >
                  </el-date-picker>
                </el-form-item>
@@ -399,7 +400,7 @@
        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" }]
        deliveryDate: [{ required: true, message: "请选择交付日期", trigger: "change" }],
      },
      productTableList: {},
      showSummary: {
@@ -430,14 +431,21 @@
      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, "参数")
    if (this.editConfig.title == "新建") {
      this.handleGetBomKindDictList()
    }
    this.handleGetBomKindDictList()
    this.getWarehouseInfo()
    this.$store.dispatch("getSupplier")
    this.formInfo()
@@ -451,9 +459,7 @@
    "editCommonConfig.visible": {
      immediate: true,
      handler: function () {
        if (this.editConfig.title == "新建") {
          this.handleGetBomKindDictList(true)
        }
        this.handleGetBomKindDictList(true)
      }
    }
  },
@@ -513,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
@@ -527,12 +530,6 @@
          }
        }
      })
    },
    // 选择采购类型下拉方法
    selPurchaseChange(val) {
      if (val) {
        this.handleGetBomKindDictList()
      }
    },
    handleConfirmSave(data) {
      console.log(data, "data")