From 3f69b4dfc585c4dfbc3c07a6acf5cdd838033636 Mon Sep 17 00:00:00 2001
From: liuguocan <527956374@qq.com>
Date: 星期二, 28 十一月 2023 14:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-web/src/views/stock/ledger/alertQuery/index.vue | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/admin-web/src/views/stock/ledger/alertQuery/index.vue b/admin-web/src/views/stock/ledger/alertQuery/index.vue
index b4afedf..b27f0e8 100644
--- a/admin-web/src/views/stock/ledger/alertQuery/index.vue
+++ b/admin-web/src/views/stock/ledger/alertQuery/index.vue
@@ -10,7 +10,7 @@
<el-row style="margin-top: 15px">
<el-col>
<!--鍒楄〃-->
- <my-table-v2 ref="myTable" :filter="filterFrom" :table="table" />
+ <my-table-v2 ref="myTable" :filter="filterFrom" :table="table"/>
</el-col>
</el-row>
</el-card>
@@ -24,13 +24,13 @@
import MyButton from '@/components/myButton/myButton';
import SettingIplatform from '@/utils/settingIplatform';
import * as finsystenant from '@/api/baseSetting/finsystenant';
-import { goodsModel, getCategorySelectTree } from '@/api/baseSetting/finsystenant';
-import { getDicts } from '@/api/system/dict/data';
+import {goodsModel, getCategorySelectTree} from '@/api/baseSetting/finsystenant';
+import {getDicts} from '@/api/system/dict/data';
import * as DateFormatter from '@/utils/DateFormatter';
export default {
name: 'index',
- components: { MyButton, MyTableV2 },
+ components: {MyButton, MyTableV2},
data() {
return {
// 鎼滅储妗�
@@ -42,12 +42,12 @@
placeholder: '璇烽�夋嫨',
defaultValue: '',
options: [],
- cascader: [{key:'baseGoodsModelsId',queryKey: 'goodsTemplatesId'}],
+ cascader: [{key: 'baseGoodsModelsId', queryKey: 'goodsTemplatesId'}],
optionsConfig: {
label: 'label',
value: 'id',
url: SettingIplatform.apiBaseURL + '/pc/base/category/select/tree',
- props:{checkStrictly:false}
+ props: {checkStrictly: false}
},
},
{
@@ -57,7 +57,7 @@
placeholder: '璇疯緭鍏�',
defaultValue: '',
options: [],
- cascader: [{key:'baseGoodsModelsId',queryKey: 'goodsTemplatesId'}],
+ cascader: [{key: 'baseGoodsModelsId', queryKey: 'goodsTemplatesId'}],
optionsConfig: {
label: 'goodsName',
value: 'id',
@@ -84,14 +84,14 @@
placeholder: '璇烽�夋嫨',
defaultValue: '',
options: [{
- label:'A',
- value:'1'
- },{
- label:'B',
- value:'2'
- },{
- label:'C',
- value:'3'
+ label: 'A',
+ value: '1'
+ }, {
+ label: 'B',
+ value: '2'
+ }, {
+ label: 'C',
+ value: '3'
}],
},
],
@@ -130,16 +130,17 @@
},
// 鍒椾俊鎭�
columns: [
- { title: '鐗╁搧鍚嶇О', field: 'baseGoodsTemplateName', align: 'left' },
- { title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'center' },
- { title: '鍗曚綅', field: 'unit', align: 'center' },
- { title: '褰撳墠搴撳瓨', field: 'warehouseCount', align: 'center' },
- { title: '淇濆簳搴撳瓨', field: 'lowerLimit', align: 'left' },
- { title: '灏侀《搴撳瓨', field: 'upperLimit', align: 'left' },
+ {title: '鐗╁搧鍚嶇О', field: 'baseGoodsTemplateName', align: 'left', minWidth: 140},
+ {title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'left', minWidth: 130},
+ {title: '鍗曚綅', field: 'unit', align: 'center', width: 80},
+ {title: '褰撳墠搴撳瓨', field: 'warehouseCount', align: 'center', width: 130},
+ {title: '淇濆簳搴撳瓨', field: 'lowerLimit', align: 'center', width: 130},
+ {title: '灏侀《搴撳瓨', field: 'upperLimit', align: 'center', width: 130},
{
title: '鐘舵��',
field: 'warningType',
- align: 'left',
+ align: 'center',
+ width: 90,
formatter: (row) => {
return {
type: row.warningType == 1 ? 'warning' : 'danger',
@@ -150,10 +151,10 @@
{
title: '棰勮鏃堕棿',
field: 'warningTime',
- align: 'left',
+ align: 'center',
width: 160,
formatter: (row) => {
- return { value: DateFormatter.LongToDateTime(row.warningTime) };
+ return {value: DateFormatter.LongToDateTime(row.warningTime)};
},
},
],
@@ -177,13 +178,15 @@
this.$modal
.confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.name + '"鐨勬満鏋勫悧锛�')
.then(function () {
- finsystenant.del({ id: row.id }).then((res) => {});
+ finsystenant.del({id: row.id}).then((res) => {
+ });
})
.then((res) => {
this.$message.success('鍒犻櫎鎴愬姛锛�');
this.search();
})
- .catch(() => {});
+ .catch(() => {
+ });
},
// 鏌ヨtable鍒楄〃
search(pageNum) {
--
Gitblit v1.9.1