From 364d3221b9a8e6dd3a19701d30c4dc4239ef8abf Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 07 二月 2025 11:48:49 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
admin/src/views/stock/components/inventoryDetails.vue | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/stock/components/inventoryDetails.vue b/admin/src/views/stock/components/inventoryDetails.vue
index 790d7bf..c5b03c4 100644
--- a/admin/src/views/stock/components/inventoryDetails.vue
+++ b/admin/src/views/stock/components/inventoryDetails.vue
@@ -36,7 +36,7 @@
<div class="list">
<div class="list_search">
<div class="list_search_left">
- <el-input v-model="form.code" style="width: 200px; margin-right: 10px;" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�/缂栫爜"></el-input>
+ <el-input v-model="form.materialCode" style="width: 200px; margin-right: 10px;" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�/缂栫爜"></el-input>
<el-select v-model="form.status" style="width: 150px; margin-right: 10px;" placeholder="鐩樼偣鐘舵��">
<el-option label="宸茬洏" :value="1"></el-option>
<el-option label="鏈洏" :value="0"></el-option>
@@ -68,7 +68,13 @@
<el-table-column prop="materialUnitName" label="鍗曚綅" show-overflow-tooltip />
<el-table-column prop="warehouseName" label="鎵�鍦ㄤ粨搴�" show-overflow-tooltip />
<el-table-column prop="stock" label="璐﹂潰鏁伴噺" show-overflow-tooltip />
- <el-table-column prop="actStock" label="鐩樼偣鏁伴噺" show-overflow-tooltip />
+ <el-table-column label="鐩樼偣鏁伴噺" show-overflow-tooltip>
+ <template slot-scope="{row}">
+ <span style="color: red;" v-if="row.type === 1">{{row.actStock}}</span>
+ <span style="color: green;" v-else-if="row.type === 2">{{row.actStock}}</span>
+ <span v-else>{{row.actStock}}</span>
+ </template>
+ </el-table-column>
<el-table-column prop="remark" label="澶囨敞" show-overflow-tooltip />
</el-table>
</div>
@@ -104,7 +110,7 @@
info: {},
list: [],
form: {
- code: '',
+ materialCode: '',
status: '',
type: ''
},
@@ -139,6 +145,7 @@
this.form.name = ''
this.form.status = ''
this.form.type = ''
+ this.form.materialCode = ''
this.page = 1
this.getList()
},
@@ -148,12 +155,13 @@
page: this.page,
model: {
stocktakingId: this.id,
- code: this.form.code,
+ materialCode: this.form.materialCode,
status: this.form.status,
type: this.form.type
}
}).then(res => {
this.list = res.records
+ this.total = res.total
})
}
}
--
Gitblit v1.9.3