From 52c492586cc33a909e8192ef6d83ac609ce8126c Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期五, 01 十二月 2023 18:20:31 +0800
Subject: [PATCH] 修改库存调整，选择产品会修改列表所有产品的bug，新建出库单添加表单校验
---
src/views/overview/AddOverviewDialog.vue | 29 +++++++++++++++++++----------
src/views/overview/OverviewListView.vue | 2 +-
src/components/makepager/CommonFormTableView.vue | 11 ++++++++++-
src/views/operate/inventoryAdjustment/index.vue | 5 ++++-
4 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index d83b14f..06667cc 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -662,7 +662,16 @@
} else {
let selIndex = 0
this.tableList.tableData.map((ite, index) => {
- if (ite.id === row.id) {
+ // ite.id 鏄笂鏋惰鍒欑殑, ite.productId鏄簱瀛樿皟鏁寸殑
+ if (ite.id === row.id&&ite.id!=undefined&&row.id!=undefined) {
+ selIndex = index
+ ite.productId = item.id
+ ite.productName = item.name
+ ite.categoryId = item.categoryId
+ ite.productCategory = item.categoryName
+ ite.amount = item.amount
+ ite.unit = item.unit
+ }else if(ite.productId===row.productId){
selIndex = index
ite.productId = item.id
ite.productName = item.name
diff --git a/src/views/operate/inventoryAdjustment/index.vue b/src/views/operate/inventoryAdjustment/index.vue
index 26528c4..04e6dd7 100644
--- a/src/views/operate/inventoryAdjustment/index.vue
+++ b/src/views/operate/inventoryAdjustment/index.vue
@@ -136,6 +136,7 @@
this.pagerOptions.totalCount = res.total
}
})
+
},
// 鎿嶄綔杈撳叆
inputContent(val, prop, row) {
@@ -316,7 +317,9 @@
},
// 閫変腑浜у搧鏂规硶
selProductClick(value, item) {
- this.productId = item.productId
+ if (value === "product") {
+ this.productId = item.productId
+ }
},
// 鑾峰彇褰撳墠鏃堕棿
currentTime() {
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index a6d3605..c6b7a82 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -183,7 +183,7 @@
</div>
<!-- 鐗╂祦淇℃伅 -->
<div v-if="activeName === 'two' && this.workType === 2">
- <el-form label-position="right" :model="shipmentsInfo" label-width="120px" size="mini"
+ <el-form :rules="rules" ref="shipmentsInfo" label-position="right" :model="shipmentsInfo" label-width="120px" size="mini"
style="margin-top: 20px;">
<el-col :span="12">
<el-form-item label="鎵胯繍鍟�">
@@ -207,7 +207,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鑱旂郴鐢佃瘽">
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="receiverPhone">
<el-input style="width: 90%;" :disabled="!showFooter"
v-model="editConfig.infomation.receiverPhone"></el-input>
</el-form-item>
@@ -220,13 +220,13 @@
</el-col>
<el-col :span="12">
<el-form-item label="閲嶉噺">
- <el-input style="width: 90%;" :disabled="!showFooter"
+ <el-input style="width: 90%;" :disabled="!showFooter" type="number"
v-model="editConfig.infomation.weight"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鐗╂祦閲嶉噺">
- <el-input style="width: 90%;" :disabled="!showFooter"
+ <el-input style="width: 90%;" :disabled="!showFooter" type="number"
v-model="editConfig.infomation.logisticWeight"></el-input>
</el-form-item>
</el-col>
@@ -257,7 +257,7 @@
<!-- 灏� -->
<div slot="footer" class="dialog-footer">
<!-- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆苟鎻愪氦瀹℃壒</el-button> -->
- <el-button type="primary" size="small" @click="saveClick('form')" :disabled="!showFooter">淇濆瓨</el-button>
+ <el-button type="primary" size="small" @click="saveClick('form','shipmentsInfo')" :disabled="!showFooter">淇濆瓨</el-button>
<el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
</div>
</el-dialog>
@@ -316,8 +316,18 @@
operationDate: [{ required: true, message: "璇烽�夋嫨鏃ユ湡", trigger: "change" }],
toLocationId: [{ required: true, message: "璇烽�夋嫨浠撳簱浣嶇疆", trigger: "change" }],
fromLocationId: [{ required: true, message: "璇烽�夋嫨婧愪綅缃�", trigger: "change" }],
- operationTypeId: [{ required: true, message: "璇烽�夋嫨鍏ュ簱绫诲瀷", trigger: "change" }]
- },
+ operationTypeId: [{ required: true, message: "璇烽�夋嫨鍏ュ簱绫诲瀷", trigger: "change" }],
+ receiverPhone: [
+ {required: true, message: "璇疯緭鍏ユ墜鏈哄彿", trigger: "change" },
+ {
+ pattern:
+ /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/,
+ message: "璇疯緭鍏ユ纭殑鎵嬫満鍙�",
+ trigger: ["blur",'change' ],
+ },
+ ]
+
+ },
companyOptions: [], // 鍏徃
supplierOptions: [],//渚涘簲鍟�
clientOptions: [],//瀹㈡埛
@@ -356,7 +366,6 @@
}
},
created() {
- localStorage.removeItem('pdfParams');
this.getCompanyList()
this.setStatusList()
this.setTableForm()
@@ -527,8 +536,8 @@
})
},
// 淇濆瓨
- saveClick(formName) {
- this.$refs[formName].validate((valid) => {
+ saveClick(formName,shipmentsInfo) {
+ this.$refs[formName,shipmentsInfo].validate((valid) => {
if (valid) {
for (let i = 0; i < this.tableData.length; i++) {
if (this.tableData[i].productName.length === 0) {
diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index dd47909..6a6fc75 100644
--- a/src/views/overview/OverviewListView.vue
+++ b/src/views/overview/OverviewListView.vue
@@ -234,7 +234,7 @@
async getData() {
await getOperation({
number: this.keyword,
- operationTypeId: this.$route.params.id,
+ operationTypeId: this.$route.params.id?this.$route.params.id:this.params.id,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize,
status: this.params.status
--
Gitblit v1.8.0