From f4ed5ae8873f65c36b5cf37be264f6ec1e154647 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期三, 20 三月 2024 19:36:58 +0800
Subject: [PATCH] 合并分支冲突解决
---
src/views/purchaseManage/purchase/components/AddPurchase.vue | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/src/views/purchaseManage/purchase/components/AddPurchase.vue b/src/views/purchaseManage/purchase/components/AddPurchase.vue
index 653cca7..ed08a9b 100644
--- a/src/views/purchaseManage/purchase/components/AddPurchase.vue
+++ b/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")
--
Gitblit v1.8.0