From d3ae08fbd8634429150f8a54bc779efdfd9aa1e2 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 13 十二月 2023 19:02:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-web/src/views/foundation/material/index.vue | 79 +++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 40 deletions(-)
diff --git a/admin-web/src/views/foundation/material/index.vue b/admin-web/src/views/foundation/material/index.vue
index 12b56a6..a946c1c 100644
--- a/admin-web/src/views/foundation/material/index.vue
+++ b/admin-web/src/views/foundation/material/index.vue
@@ -13,11 +13,13 @@
<my-table-v2 ref="myTable" :filter="filterFrom" :table="table"/>
</el-col>
</el-row>
- <!--娣诲姞/缂栬緫寮圭獥-->
- <edit v-if="editSetting.show" :setting="editSetting" @close="editSetting.show = false" @search="search"/>
</el-card>
</el-container>
</el-container>
+ <!--娣诲姞/缂栬緫寮圭獥-->
+ <edit v-if="editSetting.show" :setting="editSetting" @close="editSetting.show = false" @search="search"/>
+ <!--瑙勬牸-->
+ <specs v-if="specsSetting.show" :setting="specsSetting" @close="specsSetting.show = false" @search="search"></specs>
<my-import
:import-setting="importSetting"
:dialog-show="importSetting.dialogShow"
@@ -33,13 +35,14 @@
import MyButton from "@/components/myButton/myButton";
import SettingIplatform from '@/utils/settingIplatform';
import edit from './edit'
-import * as finsystenant from '@/api/baseSetting/finsystenant'
+import {updStatus,delGoods} from '@/api/foudation/material'
import myImport from '@/views/components/myImport'
import {getBaseUrl} from '@/utils/base';
+import Specs from "@/views/foundation/material/specs/list.vue";
export default {
name: "index",
- components: {MyButton, MyTableV2, edit, myTree, myImport},
+ components: {Specs, MyButton, MyTableV2, edit, myTree, myImport},
data() {
return {
// 鎼滅储妗�
@@ -110,7 +113,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 +121,7 @@
/* 妯℃澘涓嬭浇 */
templateSettings: {
templateName: '瀵煎叆妯℃澘.xls', // 鍚嶇О
- templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate' // 涓嬭浇鍦板潃
+ templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate?type=goods' // 涓嬭浇鍦板潃
},
onSuccess: null
},
@@ -126,6 +129,11 @@
title: '',
id: '',
orgId: '',
+ show: false,
+ },
+ specsSetting: {
+ title: '',
+ id: '',
show: false,
},
// 琛ㄦ牸鏁版嵁
@@ -159,12 +167,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,12 +213,12 @@
// 鎿嶄綔淇℃伅
operation: {
show: true, // 鏄剧ず鎿嶄綔鍒�
- width: '250', // 鍒楀
+ width: 250, // 鍒楀
attr: [
{
title: '缂栬緫',
events: (row) => {
- this.showAudit(row);
+ this.showAdd(row.id);
},
},
{
@@ -219,12 +227,13 @@
this.del(row);
},
},
- // {
- // title: '瑙勬牸鍨嬪彿',
- // events: (row) => {
- // this.showAudit(row);
- // },
- // },
+ {
+ title: '瑙勬牸鍨嬪彿',
+ type: 'primary',
+ events: (row) => {
+ this.showSpecs(row);
+ },
+ },
],
},
paging: {
@@ -259,10 +268,10 @@
updState(row) {
let vm = this
let text = row.states == 0 ? "鍚敤" : "绂佺敤";
- vm.$modal.confirm('纭瑕�' + text + '"' + row.goodsName + '"鍚楋紵').then(function () {
+ vm.$modal.confirm('纭瑕�' + text + '"' + row.goodsName + '"鐗╁搧鍚楋紵').then(function () {
let params = Object.assign({}, row)
params.states = row.states == 1 ? 0 : 1
- finsystenant.upcode(params).then(res => {
+ updStatus(params).then(res => {
if (res) {
row.states = row.states === 1 ? 0 : 1
vm.$modal.msgSuccess(text + "鎴愬姛");
@@ -273,9 +282,9 @@
},
del(row) {
this.$modal
- .confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.goodsName + '"鐨勬満鏋勫悧锛�')
+ .confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.goodsName + '"鐨勭墿鍝佸悧锛�')
.then(function () {
- finsystenant.delCode({id: row.id}).then((res) => {
+ delGoods({id: row.id}).then((res) => {
});
})
.then((res) => {
@@ -285,24 +294,14 @@
.catch(() => {
});
},
- showAdd() {
- // if (!this.editSetting.orgId) {
- // this.$message.warning('璇峰厛閫夋嫨宸︿晶鏈烘瀯')
- // } else {
- this.editSetting.id = null;
- this.editSetting.info = null;
- this.editSetting.title = '鏂板';
- this.editSetting.show = true;
- // }
+ showAdd(id) {
+ this.editSetting.id = id;
+ this.editSetting.title = id?'缂栬緫':'鏂板';
+ 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;
- })
+ showSpecs(row) {
+ this.specsSetting.goodsTemplatesId = row.id;
+ this.specsSetting.show = true;
},
// 鏌ヨtable鍒楄〃
search(pageNum) {
--
Gitblit v1.9.1