From 3c5422d71c4f14a74be03f97c81301ed1e9eacd1 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 15 Jul 2024 15:41:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E7=A1=AE=E8=AE=A4=E9=9C=80?=
=?UTF-8?q?=E6=B1=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/style/layout.css | 10 +++++++
components/SearchBox.vue | 6 +++-
pages/management/in-storage.vue | 2 --
pages/management/receive-confirm.vue | 45 ++++++++++++++++++----------
utils/getData2.js | 3 +-
utils/mork2.js | 2 +-
6 files changed, 47 insertions(+), 21 deletions(-)
diff --git a/common/style/layout.css b/common/style/layout.css
index 3ad38f3..da0cfd2 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -40,6 +40,10 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
border: 1px solid #00a3dd;
box-shadow: rgba(4, 136, 203, 0.2) -3px 6px 6px 1px, rgba(4, 136, 203, 0.2) 3px -3px 6px 1px;
}
+.search-confirm-wrap_2 {
+ width: calc(100% - 20px);
+ margin: 0 auto;
+}
.search-label{
height: 35px;
font-size: 16px;
@@ -137,6 +141,9 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
padding: 15px 0 10px 0;
overflow-y: auto;
}
+.table-wrap_1 {
+ width: calc(100% - 20px);
+}
.grid-table {
min-width: 100%;
border-spacing: 0;
@@ -557,4 +564,7 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
}
.uni-select__selector-item:hover {
background-color: #3F6ACA !important;
+}
+.uni-input-placeholder {
+ color: #fff;
}
\ No newline at end of file
diff --git a/components/SearchBox.vue b/components/SearchBox.vue
index d28f711..547871f 100644
--- a/components/SearchBox.vue
+++ b/components/SearchBox.vue
@@ -13,7 +13,7 @@
@input="handleChange($event)">
-
+
@@ -36,6 +36,10 @@
seaShow: {
type: Boolean,
default: false
+ },
+ scanShow: {
+ type: Boolean,
+ default: true
}
},
methods: {
diff --git a/pages/management/in-storage.vue b/pages/management/in-storage.vue
index d94d692..f8c88c9 100644
--- a/pages/management/in-storage.vue
+++ b/pages/management/in-storage.vue
@@ -245,8 +245,6 @@
this.id = options.id
this.title = options.name
this.crType = options.type
- },
- onLoad () {
this._getWarehouseInfo()
this._getUserInfo()
},
diff --git a/pages/management/receive-confirm.vue b/pages/management/receive-confirm.vue
index 2ccb9f1..1e02b24 100644
--- a/pages/management/receive-confirm.vue
+++ b/pages/management/receive-confirm.vue
@@ -45,13 +45,26 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
| 序号 |
- 选择 |
+
+
+
+
+ |
采购订单号 |
物料编码 |
物料名称 |
@@ -119,17 +132,6 @@
-
-
-
-
-
-
-
-
-
@@ -202,7 +204,8 @@
modalObj: {},
disabled: false,
value1: '',
- range1: []
+ range1: [],
+ val2: ''
};
},
onLoad () {
@@ -262,7 +265,7 @@
},
// 二级表格接口
async _receiptBillPage () {
- let res = await receiptBillPage(this.pkObj.djid, this.queryParams2.pageNum + '', this.queryParams2.pageSize + '')
+ let res = await receiptBillPage(this.val2, this.pkObj.djid, this.queryParams2.pageNum + '', this.queryParams2.pageSize + '')
if (res.code === 1) {
res.result.map(el => {
this.$set(el, 'checked', true)
@@ -298,6 +301,7 @@
toCollapse (e) {
this.pkId = this.pkId === e.djid ? '' : e.djid
this.pkObj = this.pkId === e.djid ? e : {}
+ this.val2 = ''
this.dataList2 = []
if (this.pkId === e.djid) {
this.queryParams2 = {
@@ -308,6 +312,15 @@
this._receiptBillPage()
}
},
+ // 二级表格查询
+ toSearch2 () {
+ this.queryParams2 = {
+ pageSize: 200,
+ pageNum: 1
+ }
+ this.currentPage2 = 1
+ this._receiptBillPage()
+ },
// 二级表格多选
toCheck2 (e) {
e.checked = !e.checked
diff --git a/utils/getData2.js b/utils/getData2.js
index 0100c1a..40090e3 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -144,9 +144,10 @@ export const receiptPage = (fuzzy, kczzbm, page, size) => request({
}
})
// 2.收货单明细分页查询
-export const receiptBillPage = (djid, page, size) => request({
+export const receiptBillPage = (fuzzy, djid, page, size) => request({
url:'api/receiptBill/page',
data: {
+ fuzzy: fuzzy,
djid: djid,
page: page,
size: size
diff --git a/utils/mork2.js b/utils/mork2.js
index 5acf470..4c90518 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -1378,7 +1378,7 @@ export const receiptPage = () => {
"djid": "1777232450742624257",
"djbh": "DH2024040815101039",
"ywrq": "2024-04-08",
- "djzt": "1",
+ "djzt": "审核后",
"tjsj": "2024-04-08 15:10:13",
"cgbh": "POORD06240400001",
"cggs": "诺力智能装备股份有限公司",