From 834c77e1c1132352d1d1aa61551f3bf46894172d Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期四, 11 十二月 2025 16:20:46 +0800
Subject: [PATCH] Merge branch 'dev_RT_AY' of http://114.132.189.42:9002/r/product-inventory-management into dev_RT_AY
---
src/views/basicData/product/index.vue | 9 +---
src/views/inventoryManagement/receiptManagement/index.vue | 16 ++++++++
src/views/inventoryManagement/issueManagement/index.vue | 16 ++++++++
src/views/inventoryManagement/stockManagement/index.vue | 16 ++++++++
src/views/inventoryManagement/dispatchLog/index.vue | 16 ++++++++
5 files changed, 66 insertions(+), 7 deletions(-)
diff --git a/src/views/basicData/product/index.vue b/src/views/basicData/product/index.vue
index a6e1e6a..9cc2a83 100644
--- a/src/views/basicData/product/index.vue
+++ b/src/views/basicData/product/index.vue
@@ -146,7 +146,7 @@
<el-form-item label="瑙勬牸鍨嬪彿锛�" prop="model">
<el-input
v-model="modelForm.model"
- placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�(g*琚嬫暟)"
+ placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
clearable
@keydown.enter.prevent
/>
@@ -272,12 +272,7 @@
},
modelRules: {
model: [
- { required: true, message: "璇疯緭鍏�", trigger: "blur" },
- {
- pattern: /^[0-9*]*$/,
- message: "鍙兘杈撳叆鏁板瓧鍜�*鍙�",
- trigger: "blur"
- }
+ { required: true, message: "璇疯緭鍏�", trigger: "blur" }
],
unit: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
speculativeTradingName: [{ required: true, message: "璇烽�夋嫨缁戝畾鏈哄櫒", trigger: "change" }],
diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue
index d0ae409..a79be79 100644
--- a/src/views/inventoryManagement/dispatchLog/index.vue
+++ b/src/views/inventoryManagement/dispatchLog/index.vue
@@ -23,6 +23,13 @@
clearable
@change="handleQuery"
/>
+ <span class="search_title ml10">浜у搧澶х被锛�</span>
+ <el-input
+ v-model="searchForm.productCategory"
+ style="width: 240px"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
<div>
@@ -90,6 +97,13 @@
format="YYYY-MM-DD"
clearable
@change="handleQuery"
+ />
+ <span class="search_title ml10">浜у搧澶х被锛�</span>
+ <el-input
+ v-model="searchForm.productCategory"
+ style="width: 240px"
+ placeholder="璇疯緭鍏�"
+ clearable
/>
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
@@ -358,6 +372,7 @@
searchForm: {
supplierName: "",
customerName: "",
+ productCategory:'',
timeStr: getCurrentDate(),
},
form: {
@@ -403,6 +418,7 @@
params.supplierName = searchForm.value.supplierName
params.timeStr = searchForm.value.timeStr
}
+ params.productCategory = searchForm.value.productCategory
// 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勬帴鍙�
const apiCall = activeTab.value === 'production'
diff --git a/src/views/inventoryManagement/issueManagement/index.vue b/src/views/inventoryManagement/issueManagement/index.vue
index e3d45fd..2baf74c 100644
--- a/src/views/inventoryManagement/issueManagement/index.vue
+++ b/src/views/inventoryManagement/issueManagement/index.vue
@@ -17,6 +17,13 @@
clearable
@change="handleQuery"
/>
+ <span class="search_title ml10">浜у搧澶х被锛�</span>
+ <el-input
+ v-model="searchForm.productCategory"
+ style="width: 240px"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
<div>
@@ -66,6 +73,13 @@
format="YYYY-MM-DD"
clearable
@change="handleQuery"
+ />
+ <span class="search_title ml10">浜у搧澶х被锛�</span>
+ <el-input
+ v-model="searchForm.productCategory"
+ style="width: 240px"
+ placeholder="璇疯緭鍏�"
+ clearable
/>
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
@@ -223,6 +237,7 @@
inboundTime:'',
nickName: '',
userId: '',
+ productCategory:'',
timeStr: getCurrentDate(),
},
form: {
@@ -257,6 +272,7 @@
params.supplierName = searchForm.value.supplierName
params.timeStr = searchForm.value.timeStr
}
+ params.productCategory = searchForm.value.productCategory
let apiCall
if (activeTab.value === 'production') {
apiCall = getStockInPageByProduction(params)
diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue
index e8c4b48..3c75940 100644
--- a/src/views/inventoryManagement/receiptManagement/index.vue
+++ b/src/views/inventoryManagement/receiptManagement/index.vue
@@ -17,6 +17,13 @@
clearable
@change="handleQuery"
/>
+ <span class="search_title ml10">浜у搧澶х被锛�</span>
+ <el-input
+ v-model="searchForm.productCategory"
+ style="width: 240px"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
<div>
@@ -61,6 +68,13 @@
format="YYYY-MM-DD"
clearable
@change="handleQuery"
+ />
+ <span class="search_title ml10">浜у搧澶х被锛�</span>
+ <el-input
+ v-model="searchForm.productCategory"
+ style="width: 240px"
+ placeholder="璇疯緭鍏�"
+ clearable
/>
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
@@ -200,6 +214,7 @@
searchForm: {
supplierName: '',
customerName: '',
+ productCategory:'',
timeStr: getCurrentDate(),
},
})
@@ -227,6 +242,7 @@
params.supplierName = searchForm.value.supplierName
params.timeStr = searchForm.value.timeStr
}
+ params.productCategory = searchForm.value.productCategory
// 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勬帴鍙�
const apiCall = activeTab.value === 'production'
diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue
index 3b01344..cf33970 100644
--- a/src/views/inventoryManagement/stockManagement/index.vue
+++ b/src/views/inventoryManagement/stockManagement/index.vue
@@ -17,6 +17,13 @@
clearable
@change="handleQuery"
/>
+ <span class="search_title ml10">浜у搧澶х被锛�</span>
+ <el-input
+ v-model="searchForm.productCategory"
+ style="width: 240px"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
<div>
@@ -71,6 +78,13 @@
clearable
@change="handleQuery"
/>
+ <span class="search_title ml10">浜у搧澶х被锛�</span>
+ <el-input
+ v-model="searchForm.productCategory"
+ style="width: 240px"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
<div>
@@ -309,6 +323,7 @@
searchForm: {
supplierName: '',
customerName: '',
+ productCategory:'',
timeStr: getCurrentDate(),
},
form: {
@@ -372,6 +387,7 @@
} else {
params.supplierName = searchForm.value.supplierName
}
+ params.productCategory = searchForm.value.productCategory
return params
}
--
Gitblit v1.9.3