From 75aaca3a95314be8c384df18dba23c661dea742c Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期一, 27 十一月 2023 19:05:38 +0800
Subject: [PATCH] feat:
---
admin-web/src/views/stock/ledger/alertQuery/index.vue | 55 +++++-----
admin-web/src/views/stock/ledger/ledgerQuery/index.vue | 23 ++--
admin-web/src/views/stock/ledger/inventoryAlert/index.vue | 16 +-
admin-web/src/views/stock/ledger/inventoryQuery/index.vue | 18 +-
admin-web/src/views/stock/procure/purchaseOrder/index.vue | 114 +++++++++++-----------
admin-web/src/views/stock/inventorycount/inventorytask/edit.vue | 32 +++++
admin-web/src/views/stock/scrap/scrapDetails/index.vue | 4
admin-web/src/views/stock/inventorycount/inventorytask/inventory.vue | 20 +++
8 files changed, 163 insertions(+), 119 deletions(-)
diff --git a/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue b/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue
index 7708d9f..7a661e7 100644
--- a/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue
+++ b/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue
@@ -1,6 +1,6 @@
<template>
<win-sm :title="`${setting.title}鐩樼偣`" @close="close" :width="'800px'">
- <el-form ref="ruleForm" :model="formData" :rules="rules" class="demo-ruleForm" label-width="100px">
+ <el-form v-loading="loading" ref="ruleForm" :model="formData" :rules="rules" class="demo-ruleForm" label-width="100px">
<el-form-item label="鐩樼偣鍗曞悕" prop="businessFormName">
<el-input
v-model="formData.businessFormName"
@@ -62,13 +62,20 @@
},
data() {
return {
- loading:true,
+ count: 0,
+ loading: true,
checkAll: false,
checkedList: [],
warehouseOptions: [], // 浠撳簱鍒楄〃
operatorOptions: [],
operatorOptions2: [],
- formData: {},
+ formData: {
+ businessFormName: '',
+ warehouseId: '',
+ operatorUserId: '',
+ monitorUserId: '',
+ remark: '',
+ },
rules: {
businessFormName: [{ required: true, message: '璇疯緭鍏�', trigger: 'blur' }],
warehouseId: [{ required: true, message: '璇烽�夋嫨', trigger: 'blur' }],
@@ -97,19 +104,31 @@
// 鑾峰彇浠撳簱鍒楄〃
handleSelectTenantWarehouse() {
selectTenantWarehouse({ agencyId: this.userInfo.tenantId }).then((res) => {
+ this.count++
this.warehouseOptions = res;
+ if(this.count>1){
+ this.loading = false
+ }
});
},
// 鑾峰彇鐩樼偣浜�
getPdr() {
warehouseManagerList({ tenantId: this.userInfo.tenantId }).then((res) => {
+ this.count++
this.operatorOptions = res;
+ if(this.count>1){
+ this.loading = false
+ }
});
},
// 鑾峰彇鐩戠洏浜�
getJpr() {
tenantUserQueryUser({ tenantId: this.userInfo.tenantId }).then((res) => {
+ this.count++
this.operatorOptions2 = res;
+ if(this.count>1){
+ this.loading = false
+ }
});
},
getEditInfo(id) {},
@@ -120,18 +139,25 @@
this.$refs.ruleForm.validate((valid) => {
if (valid) {
const params = Object.assign({}, this.formData);
+ this.loading = true
if (this.setting.id) {
// 缂栬緫鎺ュ彛
inventoryEdit(params).then((res) => {
+ this.loading = false
this.$message.success('淇濆瓨鎴愬姛锛�');
this.close();
this.$emit('search');
+ }).catch(()=>{
+ this.loading = false
});
} else {
inventoryAdd(params).then((res) => {
+ this.loading = false
this.$message.success('淇濆瓨鎴愬姛锛�');
this.close();
this.$emit('search');
+ }).catch(()=>{
+ this.loading = false
});
}
} else {
diff --git a/admin-web/src/views/stock/inventorycount/inventorytask/inventory.vue b/admin-web/src/views/stock/inventorycount/inventorytask/inventory.vue
index fa31464..4fa870b 100644
--- a/admin-web/src/views/stock/inventorycount/inventorytask/inventory.vue
+++ b/admin-web/src/views/stock/inventorycount/inventorytask/inventory.vue
@@ -1,6 +1,6 @@
<template>
<win-md :title="setting.title" @close="close" :width="'1200px'">
- <el-form class="form" ref="ruleForm" :model="formData" :rules="rules">
+ <el-form v-loading="loading" class="form" ref="ruleForm" :model="formData" :rules="rules">
<el-row :gutter="20" style="margin-bottom: 20px" type="flex" align="middle">
<el-col :span="6">鐩樼偣鍗曞彿锛歿{ formData.businessFormCode }}</el-col>
<el-col :span="6">鐩樼偣浠诲姟锛歿{ formData.businessFormName }}</el-col>
@@ -10,7 +10,6 @@
</el-col>
</el-row>
<el-table
- v-loading="loading"
:data="formData.formInventoryGoodsList"
:rules="rules"
height="500"
@@ -25,6 +24,7 @@
<el-table-column prop="realNum" label="瀹炵洏鏁伴噺" align="center">
<template slot-scope="scope">
<el-form-item
+ style="margin-bottom: 0"
label-width="0"
:prop="`formInventoryGoodsList[${scope.$index}].realNum`"
:rules="rules.realNum"
@@ -57,7 +57,7 @@
},
data() {
return {
- loading: false,
+ loading: true,
btnLoading: false,
formData: {
businessFormCode: '',
@@ -75,17 +75,22 @@
},
created() {
const info = JSON.parse(this.setting.info);
- console.log('info', info);
if (info.states == 1) {
// 缁х画鐩樼偣
inventoryDetail({ id: this.setting.id }).then((res) => {
+ this.loading = false
this.formData = res;
this.formData.id = this.setting.id;
+ }).catch(()=>{
+ this.loading = false
});
} else {
inventoryQuery({ id: this.setting.id }).then((res) => {
+ this.loading = false
this.formData = res;
this.formData.id = this.setting.id;
+ }).catch(()=>{
+ this.loading = false
});
}
},
@@ -98,10 +103,14 @@
id: this.formData.id,
inventoryGoodsList: this.formData.formInventoryGoodsList,
};
+ this.loading = true
inventoryTemporaryStorage(params).then(() => {
+ this.loading = false
this.$message.success('鏆傚瓨鎴愬姛锛�');
this.close();
this.$emit('search');
+ }).catch(()=>{
+ this.loading = false
});
},
save() {
@@ -111,10 +120,13 @@
...this.formData,
inventoryGoodsList: this.formData.formInventoryGoodsList,
};
+ this.loading = true
inventoryFinish(params).then(() => {
this.$message.success('鏆傚瓨鎴愬姛锛�');
this.close();
this.$emit('search');
+ }).catch(()=>{
+ this.loading = false
});
}
});
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) {
diff --git a/admin-web/src/views/stock/ledger/inventoryAlert/index.vue b/admin-web/src/views/stock/ledger/inventoryAlert/index.vue
index 150b2fb..2b38e4b 100644
--- a/admin-web/src/views/stock/ledger/inventoryAlert/index.vue
+++ b/admin-web/src/views/stock/ledger/inventoryAlert/index.vue
@@ -178,14 +178,14 @@
},
// 鍒椾俊鎭�
columns: [
- { title: '鏈烘瀯', field: 'agencyName', align: 'left' },
- { title: '浠撳簱', field: 'warehouseName', align: 'center' },
- { title: '鍒嗙被', field: 'categoryName', align: 'center' },
- { title: '鎵�灞炵被鍒�', field: 'costType', align: 'center' },
- { title: '鐗╁搧鍚嶇О', field: 'goodsName', align: 'left' },
- { title: '瑙勬牸鍨嬪彿', field: 'modelName', align: 'left' },
- { title: '淇濆簳搴撳瓨', field: 'lowerLimit', align: 'left' },
- { title: '灏侀《搴撳瓨', field: 'upperLimit', align: 'left' },
+ { title: '鏈烘瀯', field: 'agencyName', align: 'left', minWidth: 130 },
+ { title: '浠撳簱', field: 'warehouseName', align: 'left', minWidth: 130 },
+ { title: '鍒嗙被', field: 'categoryName', align: 'left', minWidth: 130 },
+ { title: '鎵�灞炵被鍒�', field: 'costType', align: 'center', width: 80 },
+ { title: '鐗╁搧鍚嶇О', field: 'goodsName', align: 'left', minWidth: 130 },
+ { title: '瑙勬牸鍨嬪彿', field: 'modelName', align: 'left', minWidth: 130 },
+ { title: '淇濆簳搴撳瓨', field: 'lowerLimit', align: 'center', width: 100 },
+ { title: '灏侀《搴撳瓨', field: 'upperLimit', align: 'center', width: 100 },
],
// 鎿嶄綔淇℃伅
operation: {
diff --git a/admin-web/src/views/stock/ledger/inventoryQuery/index.vue b/admin-web/src/views/stock/ledger/inventoryQuery/index.vue
index 56f4188..f24b0c8 100644
--- a/admin-web/src/views/stock/ledger/inventoryQuery/index.vue
+++ b/admin-web/src/views/stock/ledger/inventoryQuery/index.vue
@@ -16,7 +16,7 @@
</el-card>
</el-container>
</el-container>
-
+
</div>
</template>
@@ -140,14 +140,14 @@
},
// 鍒椾俊鎭�
columns: [
- { title: '鏈烘瀯', field: 'agencyName', align: 'center' },
- { title: '浠撳簱', field: 'warehouseName', align: 'center' },
- { title: '鍒嗙被', field: 'categoryName', align: 'center' },
- { title: '鎵�灞炵被鍒�', field: 'costType', align: 'center' },
- { title: '鐗╁搧鍚嶇О', field: 'goodsTemplateName', align: 'left' },
- { title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'left' },
- { title: '鍗曚綅', field: 'unit', align: 'left' },
- { title: '褰撳墠搴撳瓨', field: 'kucun', align: 'left' },
+ { title: '鏈烘瀯', field: 'agencyName', align: 'left', minWidth: 130 },
+ { title: '浠撳簱', field: 'warehouseName', align: 'left', minWidth: 130 },
+ { title: '鍒嗙被', field: 'categoryName', align: 'left', minWidth: 130 },
+ { title: '鎵�灞炵被鍒�', field: 'costType', align: 'center', width:80 },
+ { title: '鐗╁搧鍚嶇О', field: 'goodsTemplateName', align: 'left', minWidth: 140 },
+ { title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'left', minWidth: 130 },
+ { title: '鍗曚綅', field: 'unit', align: 'center', width:80 },
+ { title: '褰撳墠搴撳瓨', field: 'kucun', align: 'center' },
],
paging: {
show: true, // 鏄剧ず鍒嗛〉
diff --git a/admin-web/src/views/stock/ledger/ledgerQuery/index.vue b/admin-web/src/views/stock/ledger/ledgerQuery/index.vue
index 16a2193..5bf9cd5 100644
--- a/admin-web/src/views/stock/ledger/ledgerQuery/index.vue
+++ b/admin-web/src/views/stock/ledger/ledgerQuery/index.vue
@@ -182,28 +182,29 @@
},
// 鍒椾俊鎭�
columns: [
- { title: '鏈烘瀯', field: 'agencyName', align: 'left' },
- { title: '浠撳簱', field: 'warehouseName', align: 'center' },
- { title: '鐗╁搧鍚嶇О', field: 'goodsTemplateName', align: 'center' },
- { title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'center' },
+ { title: '鏈烘瀯', field: 'agencyName', align: 'left', width: 130 },
+ { title: '浠撳簱', field: 'warehouseName', align: 'left', width: 130 },
+ { title: '鐗╁搧鍚嶇О', field: 'goodsTemplateName', align: 'left', minWidth: 130 },
+ { title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'left', width: 130 },
{
title: '绫诲瀷',
field: 'summary',
- align: 'left',
+ align: 'center',
formatter: (row) => {
let result = stockType(row)
return { value: result };
},
},
- { title: '鍗曞彿', field: 'businessFormCode', align: 'left' },
- { title: '鏁伴噺', field: 'thisCount', align: 'left' },
- { title: '鎿嶄綔鍓嶆暟閲�', field: 'initialCount', align: 'left' },
- { title: '鎿嶄綔鍚庢暟閲�', field: 'endCount', align: 'left' },
- { title: '鍦ㄩ��', field: 'zaiTuCount', align: 'left' },
+ { title: '鍗曞彿', field: 'businessFormCode', align: 'center', width: 130 },
+ { title: '鏁伴噺', field: 'thisCount', align: 'center', width: 100 },
+ { title: '鎿嶄綔鍓嶆暟閲�', field: 'initialCount', align: 'center', width: 100 },
+ { title: '鎿嶄綔鍚庢暟閲�', field: 'endCount', align: 'center', width: 100 },
+ { title: '鍦ㄩ��', field: 'zaiTuCount', align: 'center', width: 100 },
{
title: '鎿嶄綔鏃堕棿',
field: 'dealTime',
- align: 'left',
+ align: 'center',
+ width: 160,
formatter: (row) => {
return { value: DateFormatter.LongToDateTime(row.dealTime) };
},
diff --git a/admin-web/src/views/stock/procure/purchaseOrder/index.vue b/admin-web/src/views/stock/procure/purchaseOrder/index.vue
index 7000dc4..e3e3865 100644
--- a/admin-web/src/views/stock/procure/purchaseOrder/index.vue
+++ b/admin-web/src/views/stock/procure/purchaseOrder/index.vue
@@ -13,69 +13,72 @@
<my-button name="鏂板" @click="handleAdd" site="tools" size="medium" />
<my-button name="瀵煎叆" @click="importSetting.dialogShow = true" site="tools" size="medium" />
</div>
- <div :style="{ 'overflow-y': 'auto', height: `${clientHeight - 320}px` }" v-loading="loading">
- <el-row v-if="list.length" class="card" :gutter="5">
- <el-col v-for="(item, index) in list" :key="index" class="cm-item">
- <el-card class="card-data">
- <div class="card-container">
- <div class="card-header">
- <div class="card-header-left">
- <span>鍏ュ簱鍗曞彿锛�</span>
- <span class="value">{{ item.businessFormCode }}</span>
- <div class="states" :class="item.states == 1 ? '' : 'states-success'">
- {{ item.states == 1 ? '寰呭叆搴�' : '宸插叆搴�' }}
+ <div v-loading="loading" style="margin-bottom: 15px">
+ <div :style="{ 'overflow-y': 'auto', height: `${clientHeight - 360}px` }">
+ <el-row v-if="list.length" class="card" :gutter="5">
+ <el-col v-for="(item, index) in list" :key="index" class="cm-item">
+ <el-card class="card-data">
+ <div class="card-container">
+ <div class="card-header">
+ <div class="card-header-left">
+ <span>鍏ュ簱鍗曞彿锛�</span>
+ <span class="value">{{ item.businessFormCode }}</span>
+ <div class="states" :class="item.states == 1 ? '' : 'states-success'">
+ {{ item.states == 1 ? '寰呭叆搴�' : '宸插叆搴�' }}
+ </div>
+ </div>
+ <div class="card-header-right">
+ <template v-if="item.states == 1">
+ <el-button name="缂栬緫" site="form" type="success" size="mini" @click="handleEdit(item)"
+ >缂栬緫</el-button
+ >
+ <el-button name="鍏ュ簱" site="form" type="primary" size="mini" @click="handleIncome(item)"
+ >鍏ュ簱</el-button
+ >
+ <el-button name="鍒犻櫎" site="form" type="danger" size="mini" @click="del(item)"
+ >鍒犻櫎</el-button
+ >
+ </template>
+ <template v-if="item.states != 1">
+ <el-button site="form" type="success" size="mini" @click="handleExport(item)"
+ >瀵煎嚭鍏ュ簱鍗�</el-button
+ >
+ </template>
+ <el-button name="鏌ョ湅璇︽儏" site="form" type="info" size="mini" @click="handleDetail(item)"
+ >鏌ョ湅璇︽儏</el-button
+ >
</div>
</div>
- <div class="card-header-right">
- <template v-if="item.states == 1">
- <el-button name="缂栬緫" site="form" type="success" size="mini" @click="handleEdit(item)"
- >缂栬緫</el-button
- >
- <el-button name="鍏ュ簱" site="form" type="primary" size="mini" @click="handleIncome(item)"
- >鍏ュ簱</el-button
- >
- <el-button name="鍒犻櫎" site="form" type="danger" size="mini" @click="del(item)"
- >鍒犻櫎</el-button
- >
- </template>
- <template v-if="item.states != 1">
- <el-button site="form" type="success" size="mini" @click="handleExport(item)"
- >瀵煎嚭鍏ュ簱鍗�</el-button
- >
- </template>
- <el-button name="鏌ョ湅璇︽儏" site="form" type="info" size="mini" @click="handleDetail(item)"
- >鏌ョ湅璇︽儏</el-button
- >
+ <div class="one-hed">
+ <div class="box"><span class="span-two">鏈烘瀯锛�</span>{{ item.agencyId }}</div>
+ <div class="box"><span class="span-two">鎿嶄綔浜猴細</span>{{ item.buyerName }}</div>
+ <div class="box">
+ <span class="span-two">閲囪喘鏃堕棿锛�</span>{{ item.procureTime | formatTime }}
+ </div>
+ <div class="box">
+ <span class="span-two">鍏ュ簱鏃堕棿锛�</span>{{ item.incomeTime | formatTime }}
+ </div>
</div>
- </div>
- <div class="one-hed">
- <div class="box"><span class="span-two">鏈烘瀯锛�</span>{{ item.agencyId }}</div>
- <div class="box"><span class="span-two">鎿嶄綔浜猴細</span>{{ item.buyerName }}</div>
- <div class="box">
- <span class="span-two">閲囪喘鏃堕棿锛�</span>{{ item.procureTime | formatTime }}
- </div>
- <div class="box">
- <span class="span-two">鍏ュ簱鏃堕棿锛�</span>{{ item.incomeTime | formatTime }}
- </div>
- </div>
- <div class="card-end">
- <div v-for="(just, index) in item.fromProcureTemplateInfoList" :key="index" class="item">
- <div class="name">{{ just.goodsTemplateName }}</div>
- <div class="value-box">
- <div class="value-box-item">
- <span class="label">鏁伴噺锛�</span>
- <span class="value">{{ just.count }}</span>
- <span class="unit">{{ just.unit }}</span>
+ <div class="card-end">
+ <div v-for="(just, index) in item.fromProcureTemplateInfoList" :key="index" class="item">
+ <div class="name">{{ just.goodsTemplateName }}</div>
+ <div class="value-box">
+ <div class="value-box-item">
+ <span class="label">鏁伴噺锛�</span>
+ <span class="value">{{ just.count }}</span>
+ <span class="unit">{{ just.unit }}</span>
+ </div>
</div>
</div>
</div>
</div>
- </div>
- </el-card>
- </el-col>
- </el-row>
- <div class="no-data" v-else>鏆傛棤鏁版嵁</div>
+ </el-card>
+ </el-col>
+ </el-row>
+ <div class="no-data" v-else>鏆傛棤鏁版嵁</div>
+ </div>
</div>
+
<el-pagination
:small="false"
:current-page="pageNum"
@@ -246,7 +249,6 @@
this.list = res.datas;
this.total = res.totalRows;
this.loading = false;
- console.log(this.list);
});
},
diff --git a/admin-web/src/views/stock/scrap/scrapDetails/index.vue b/admin-web/src/views/stock/scrap/scrapDetails/index.vue
index 9c8d919..235d732 100644
--- a/admin-web/src/views/stock/scrap/scrapDetails/index.vue
+++ b/admin-web/src/views/stock/scrap/scrapDetails/index.vue
@@ -166,9 +166,9 @@
columns: [
{ title: '鍗曞彿', field: 'businessFormCode', align: 'center', width: 130 },
{ title: '鐗╁搧鍚嶇О', field: 'goodsTemplateName', align: 'left', minWidth: 130 },
- { title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'left', width: 130 },
+ { title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'left', minWidth: 130 },
{ title: '鎶ュ簾鏁伴噺', field: 'counts', align: 'center' },
- { title: '鎵�灞炴満鏋�', field: 'agencyName', align: 'left', width: 130 },
+ { title: '鎵�灞炴満鏋�', field: 'agencyName', align: 'left', minWidth: 130 },
{ title: '鍒涘缓浜�', field: 'operatorName', align: 'left' },
{
title: '鎿嶄綔鏃堕棿',
--
Gitblit v1.9.1