From fa3a13b43cdcd3bcc42abae4d9c0a67e48ebea41 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 12 十二月 2023 16:05:41 +0800
Subject: [PATCH] feat: bug修复 12536
---
admin-web/src/views/foundation/material/index.vue | 35 +++++++++++++++--------------------
1 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/admin-web/src/views/foundation/material/index.vue b/admin-web/src/views/foundation/material/index.vue
index e79fab4..fbc8293 100644
--- a/admin-web/src/views/foundation/material/index.vue
+++ b/admin-web/src/views/foundation/material/index.vue
@@ -110,7 +110,7 @@
dialogShow: false,
fileSettings: {
data: {},
- uploadUrl: getBaseUrl()+"/pc/fin/sys/tenant/import", // 涓婁紶鍦板潃
+ uploadUrl: getBaseUrl()+"/pc/base/goods/template/import", // 涓婁紶鍦板潃
accept: '.xls', // 鏍煎紡
type: 'text', // 鍥炴樉褰㈠紡
loading: false // 瀵煎叆鏁堟灉
@@ -118,7 +118,7 @@
/* 妯℃澘涓嬭浇 */
templateSettings: {
templateName: '瀵煎叆妯℃澘.xls', // 鍚嶇О
- templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate' // 涓嬭浇鍦板潃
+ templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate?type=goods' // 涓嬭浇鍦板潃
},
onSuccess: null
},
@@ -159,12 +159,12 @@
},
// 鍒椾俊鎭�
columns: [
- {title: '鐗╁搧缂栧彿', field: 'goodsCode', align: 'center'},
- {title: '鐗╁搧鍚嶇О', field: 'goodsName', align: 'center'},
- {title: '鍒嗙被', field: 'categoryName', align: 'center'},
- {title: '绫诲埆', field: 'classification', align: 'center'},
+ {title: '鐗╁搧缂栧彿', field: 'goodsCode', align: 'center', width: 120},
+ {title: '鐗╁搧鍚嶇О', field: 'goodsName', align: 'left', minWidth: 140},
+ {title: '鍒嗙被', field: 'categoryName', align: 'left', minWidth: 140},
+ {title: '绫诲埆', field: 'classification', align: 'center', width: 80},
// {title: '閲囪喘绫诲瀷', field: 'categoryId', align: 'center'},
- {title: '鎵�灞炴満鏋�', field: '', align: 'center'},
+ {title: '鎵�灞炴満鏋�', field: 'agencyName', align: 'left', minWidth: 140},
{
title: '鍒涘缓鏃堕棿',
field: 'createDate',
@@ -205,7 +205,7 @@
// 鎿嶄綔淇℃伅
operation: {
show: true, // 鏄剧ず鎿嶄綔鍒�
- width: '250', // 鍒楀
+ width: 160, // 鍒楀
attr: [
{
title: '缂栬緫',
@@ -258,13 +258,13 @@
},
updState(row) {
let vm = this
- let text = row.status == 0 ? "鍚敤" : "绂佺敤";
+ let text = row.states == 0 ? "鍚敤" : "绂佺敤";
vm.$modal.confirm('纭瑕�' + text + '"' + row.goodsName + '"鍚楋紵').then(function () {
let params = Object.assign({}, row)
- params.status = row.status == 1 ? 0 : 1
- finsystenant.editcode(params).then(res => {
+ params.states = row.states == 1 ? 0 : 1
+ finsystenant.upcode(params).then(res => {
if (res) {
- row.status = row.status === 1 ? 0 : 1
+ row.states = row.states === 1 ? 0 : 1
vm.$modal.msgSuccess(text + "鎴愬姛");
vm.search()
}
@@ -290,19 +290,14 @@
// this.$message.warning('璇峰厛閫夋嫨宸︿晶鏈烘瀯')
// } else {
this.editSetting.id = null;
- this.editSetting.info = null;
this.editSetting.title = '鏂板';
this.editSetting.show = true;
// }
},
showAudit(row) {
- finsystenant.editmaterial(row.id).then(res => {
- // console.log(res,'res');
- this.editSetting.id = res.id;
- this.editSetting.info = JSON.stringify(res);
- this.editSetting.title = '缂栬緫';
- this.editSetting.show = true;
- })
+ this.editSetting.id = row.id;
+ this.editSetting.title = '缂栬緫';
+ this.editSetting.show = true;
},
// 鏌ヨtable鍒楄〃
search(pageNum) {
--
Gitblit v1.9.1