From b65aa5b75bd195bbbc7afef9fb5fc242774baea7 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Tue, 3 Dec 2024 18:41:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9zzy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/lease/out.js | 5 +-
.../material/back/component/queryReturn.vue | 4 +-
src/views/material/lease/outBound/index.vue | 84 ++++++++++---------
.../goodsArrived/component/addTools.vue | 13 ++-
4 files changed, 57 insertions(+), 49 deletions(-)
diff --git a/src/api/lease/out.js b/src/api/lease/out.js
index d263fb6e..438ac4f2 100644
--- a/src/api/lease/out.js
+++ b/src/api/lease/out.js
@@ -10,10 +10,11 @@ export function getListLeaseOut(query) {
}
// 领料出库-出库详情信息
-export function outInfoList(id) {
+export function outInfoList(id,query) {
return request({
url: '/material/lease_apply_info/' + id,
- method: 'get'
+ method: 'get',
+ params: query,
})
}
diff --git a/src/views/material/back/component/queryReturn.vue b/src/views/material/back/component/queryReturn.vue
index 337424ac..d3b60b2d 100644
--- a/src/views/material/back/component/queryReturn.vue
+++ b/src/views/material/back/component/queryReturn.vue
@@ -126,12 +126,12 @@
:data="equipmentList"
@selection-change="handleSelectionChange"
>
-
+ /> -->
-
+
@@ -337,12 +336,11 @@
v-show="showSearch"
label-width="68px"
>
-
+
@@ -351,13 +349,13 @@
type="primary"
icon="el-icon-search"
size="mini"
- @click="handleQueryOutInfo"
+ @click="handleQueryOutView"
>查询
- 重置
@@ -1004,49 +1002,59 @@ export default {
this.queryParams.keyWord = "";
this.handleQuery();
},
- //出库搜索按钮
- handleQueryOutInfo() {
- this.queryOutInfo.pageNum = 1;
- this.getDialogList();
- },
- resetQueryOutInfo() {
- this.queryOutInfo.typeId=""
- this.getDialogList();
- },
- getListView() {
- outInfoList(this.queryOutView.id).then((response) => {
- this.getListOutInfo = response.data.leaseApplyDetailsList;
- // this.dialogTotal = response.
- // this.loading = false;
- });
- },
- /** 出库查询列表 */
- getDialogList() {
- outInfoList(this.queryOutInfo.id).then((response) => {
- this.getListOutInfo = response.data.leaseApplyDetailsList;
- // this.dialogTotal = response.
- // this.loading = false;
- });
- },
-
/** 查看按钮操作 */
handleView(row) {
this.title = "查看";
this.showOutView = true;
this.queryOutView.id = row.id;
- outInfoList(row.id).then((response) => {
+ outInfoList(row.id,{keyWord:this.queryOutView.keyWord}).then((response) => {
this.getListOutInfo = response.data.leaseApplyDetailsList;
// this.loading = false;
});
},
+ //查看
+ handleQueryOutView(){
+ this.queryOutView.pageNum = 1;
+ this.getListView();
+ },
+ resetQueryOutView() {
+ this.queryOutView.keyWord=""
+ this.getListView();
+ },
+ getListView() {
+ outInfoList(this.queryOutView.id,{keyWord:this.queryOutView.keyWord}).then((response) => {
+ this.getListOutInfo = response.data.leaseApplyDetailsList;
+ // this.dialogTotal = response.
+ // this.loading = false;
+ });
+ },
+ /** 出库查询列表 */
+ getDialogList() {
+ outInfoList(this.queryOutInfo.id,{keyWord:this.queryOutInfo.keyWord}).then((response) => {
+ this.getListOutInfo = response.data.leaseApplyDetailsList;
+ // this.dialogTotal = response.
+ // this.loading = false;
+ });
+ },
+ //出库搜索按钮
+ handleQueryOutInfo() {
+ this.queryOutInfo.pageNum = 1;
+ this.getDialogList();
+ },
+ //出库搜索按钮
+ resetQueryOutInfo() {
+ this.queryOutInfo.keyWord=""
+ this.getDialogList();
+ },
+
/** 出库按钮操作 */
handleOut(row) {
this.title = "出库";
this.showOutInfo = true;
this.queryOutInfo.id = row.id;
- outInfoList(row.id).then((response) => {
+ outInfoList(row.id,{keyWord:this.queryOutInfo.keyWord}).then((response) => {
this.getListOutInfo = response.data.leaseApplyDetailsList;
// this.loading = false;
});
diff --git a/src/views/material/purchase/goodsArrived/component/addTools.vue b/src/views/material/purchase/goodsArrived/component/addTools.vue
index b6a4210f..111e9a9c 100644
--- a/src/views/material/purchase/goodsArrived/component/addTools.vue
+++ b/src/views/material/purchase/goodsArrived/component/addTools.vue
@@ -145,7 +145,7 @@
v-model="scope.row.purchaseTaxPrice"
controls-position="right"
style="width: 100%"
- :min="0"
+ :min="0" disabled
@change="purchaseTaxPriceChange(scope.row,scope.$index)"
>
@@ -456,14 +456,13 @@ export default {
})
},
// 含税单价
- purchaseTaxPriceChange(row,val){
- // this.equipmentList[val].purchasePrice = (row.purchaseTaxPrice/(1 + this.maForm.taxRate/100)).toFixed(2)
- row.purchasePrice = (row.purchaseTaxPrice/(1 + this.maForm.taxRate/100)).toFixed(3)
+ purchaseTaxPriceChange(row,val){
+ row.purchasePrice = (row.purchaseTaxPrice/(1 + this.maForm.taxRate/100)).toFixed(4)
+ // row.purchaseTaxPrice = (row.purchasePrice*(1 + this.maForm.taxRate/100)).toFixed(3)
},
// 不含税单价
- purchasePriceChange(row,val){
- // this.equipmentList[val].purchaseTaxPrice = (row.purchasePrice*(1 + this.maForm.taxRate/100)).toFixed(2)
- row.purchaseTaxPrice = (row.purchasePrice*(1 + this.maForm.taxRate/100)).toFixed(3)
+ purchasePriceChange(row,val){
+ row.purchaseTaxPrice = (row.purchasePrice*(1 + this.maForm.taxRate/100)).toFixed(4)
},
/** 物资厂家-下拉选 */
supplierInfoList() {