From 35738d1b2c095b2eca0211efdc4fa59507189e6f Mon Sep 17 00:00:00 2001
From: zhy <luhan1008611>
Date: 星期一, 30 十月 2023 09:33:34 +0800
Subject: [PATCH] feat: 基础信息
---
admin-web/src/views/foundation/classification/edit.vue | 43 +++---
admin-web/src/api/baseSetting/finsystenant.js | 64 ++++++++
admin-web/src/views/foundation/material/edit.vue | 53 ++++---
admin-web/src/views/foundation/store/edit.vue | 37 ++--
admin-web/src/views/foundation/classification/index.vue | 23 +-
admin-web/src/components/myTable/myTableV2.vue | 2
admin-web/src/utils/settingIplatform.js | 2
admin-web/src/views/foundation/classification/items.js | 12
admin-web/src/views/foundation/store/index.vue | 46 +++---
admin-web/public/static/config.js | 2
admin-web/src/views/foundation/material/index.vue | 93 +++++-------
11 files changed, 208 insertions(+), 169 deletions(-)
diff --git a/admin-web/public/static/config.js b/admin-web/public/static/config.js
index 40ba56b..6dfc779 100644
--- a/admin-web/public/static/config.js
+++ b/admin-web/public/static/config.js
@@ -14,7 +14,7 @@
// 鎺ュ彛璇锋眰鍦板潃
// apiBaseURL: 'http://116.198.39.83:8082/progress', // 姝ｅ紡
// apiBaseURL: 'http://172.16.60.90:8082/progress',//寮�鍙�
- apiBaseURL: 'https://yqzx.jinmingyuan.com/lowConsum',//寮�鍙�
+ apiBaseURL: 'http://172.16.60.175:8083/lowConsum',//寮�鍙�
// apiBaseURL: 'https://jmy.jinmingyuan.com/progress',// 娴嬭瘯,
// socket杩炴帴
wsSocketUrl: VUE_APP_WS_URL,
diff --git a/admin-web/src/api/baseSetting/finsystenant.js b/admin-web/src/api/baseSetting/finsystenant.js
index 1b85d94..03e5bbe 100644
--- a/admin-web/src/api/baseSetting/finsystenant.js
+++ b/admin-web/src/api/baseSetting/finsystenant.js
@@ -21,7 +21,7 @@
// 鏂板
export function add(data) {
return request({
- url: '/pc/fin/sys/tenant/add',
+ url: '/pc/base/category/add',
method: 'post',
data: data
})
@@ -30,8 +30,64 @@
// 淇敼
export function edit(data) {
return request({
- url: '/pc/fin/sys/tenant/edit',
+ url: '/pc/base/category/edit',
method: 'post',
+ data: data
+ })
+}
+
+export function addcode(data) {
+ return request({
+ url: '/pc/base/goods/template/add',
+ method: 'post',
+ data: data
+ })
+}
+
+export function addstore(data) {
+ return request({
+ url: '/pc/base/warehouse/add',
+ method: 'post',
+ data: data
+ })
+}
+
+export function editstore(data) {
+ return request({
+ url: '/pc/base/warehouse/edit',
+ method: 'post',
+ data: data
+ })
+}
+
+export function delstore(data) {
+ return request({
+ url: '/pc/base/warehouse/del',
+ method: 'delete',
+ data: data
+ })
+}
+
+export function editmaterial(data) {
+ return request({
+ url: `/pc/base/goods/template/detail/?id=${data}`,
+ method: 'get',
+ })
+}
+
+
+export function editcode(data) {
+ return request({
+ url: '/pc/base/goods/template/edit',
+ method: 'post',
+ data: data
+ })
+}
+
+export function delCode(data) {
+ return request({
+ url: '/pc/base/goods/template/del',
+ method: 'delete',
data: data
})
}
@@ -44,8 +100,8 @@
// 鍒犻櫎鏈烘瀯淇℃伅
export function del(data) {
return request({
- url: '/pc/fin/sys/tenant/del',
- method: 'post',
+ url: '/pc/base/category/del',
+ method: 'delete',
data: data
})
}
diff --git a/admin-web/src/components/myTable/myTableV2.vue b/admin-web/src/components/myTable/myTableV2.vue
index faeb6c2..5857918 100644
--- a/admin-web/src/components/myTable/myTableV2.vue
+++ b/admin-web/src/components/myTable/myTableV2.vue
@@ -365,7 +365,7 @@
*/
search(param) {
this.$nextTick(() => {
- // this.myTable.loading = true
+ this.myTable.loading = true
const params = Object.assign({}, this.filter)
if(this.myTable.paging.show){
params.pageSize = this.myTable.paging.page.pageSize
diff --git a/admin-web/src/utils/settingIplatform.js b/admin-web/src/utils/settingIplatform.js
index 22e6d80..a733a0e 100644
--- a/admin-web/src/utils/settingIplatform.js
+++ b/admin-web/src/utils/settingIplatform.js
@@ -13,7 +13,7 @@
// 鎺ュ彛璇锋眰鍦板潃
// apiBaseURL: 'http://116.198.39.83:8082/progress', // 姝ｅ紡
// apiBaseURL: 'http://172.16.60.90:8082/progress',//寮�鍙�
- apiBaseURL: 'https://yqzx.jinmingyuan.com/lowConsum',//寮�鍙�
+ apiBaseURL: 'http://172.16.60.175:8083/lowConsum',//寮�鍙�
// apiBaseURL: 'https://jmy.jinmingyuan.com/progress',// 娴嬭瘯,
// socket杩炴帴
wsSocketUrl: VUE_APP_WS_URL,
diff --git a/admin-web/src/views/foundation/classification/edit.vue b/admin-web/src/views/foundation/classification/edit.vue
index 137165d..f0f9077 100644
--- a/admin-web/src/views/foundation/classification/edit.vue
+++ b/admin-web/src/views/foundation/classification/edit.vue
@@ -1,15 +1,15 @@
<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-item label="涓婄骇鍒嗙被" prop="code">
- <el-input v-model="formData.code" clearable maxlength="20" show-word-limit style="width: 100%"/>
+ <el-form-item label="涓婄骇鍒嗙被" prop="fatherCategoryId">
+ <el-input v-model="formData.fatherCategoryId" clearable maxlength="20" show-word-limit style="width: 100%"/>
</el-form-item>
- <el-form-item label="鍒嗙被鍚嶇О" prop="name">
- <el-input v-model="formData.name" clearable maxlength="20" show-word-limit style="width: 100%"/>
+ <el-form-item label="鍒嗙被鍚嶇О" prop="categoryName">
+ <el-input v-model="formData.categoryName" clearable maxlength="20" show-word-limit style="width: 100%"/>
</el-form-item>
- <el-form-item label="绫诲埆" prop="name">
+ <el-form-item label="绫诲埆" prop="classification">
<!-- <el-input v-model="formData.name" clearable maxlength="20" show-word-limit style="width: 100%"/> -->
- <el-select v-model="formData.planTypeCode" placeholder="" clearable style="width: 100%">
+ <el-select v-model="formData.classification" placeholder="" clearable style="width: 100%">
<el-option
v-for="item in options"
:key="item.code"
@@ -18,15 +18,14 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="椤哄簭" prop="name">
- <el-input v-model="formData.name" clearable maxlength="20" show-word-limit style="width: 100%"/>
+ <el-form-item label="椤哄簭" prop="orderNumber">
+ <el-input v-model="formData.orderNumber" clearable maxlength="20" show-word-limit style="width: 100%"/>
</el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-switch
- v-model="formData.status"
- active-color="#0d997c"
- inactive-color="#C0CCDA">
- </el-switch>
+ <el-form-item label="鐘舵��" prop="states">
+ <el-radio-group v-model="formData.states">
+ <el-radio :label="1" border>鍚敤</el-radio>
+ <el-radio :label="0" border>绂佺敤</el-radio>
+ </el-radio-group>
</el-form-item>
</el-form>
<div slot="footer" align="center" class="dialog-footer">
@@ -56,31 +55,31 @@
checkedList: [],
options:[
{
- code: 1,
+ code: 'A',
label:'A'
},
{
- code: 2,
+ code: "B",
label:'B'
},
{
- code: 3,
+ code: 'c',
label:'C'
}
],
formData: {
code: '',
name: '',
- status: true,
+ states: '',
summary: '',
planTypeCode:''
},
rules: {
- code: [
- {required: true, message: '璇疯緭鍏ユ満鏋勭紪鍙�', trigger: 'blur'}
+ fatherCategoryId: [
+ {required: true, message: '璇疯緭鍏�', trigger: 'blur'}
],
- name: [
- {required: true, message: '璇疯緭鍏ユ満鏋勫悕绉�', trigger: 'blur'}
+ categoryName: [
+ {required: true, message: '璇疯緭鍏�', trigger: 'blur'}
]
}
}
diff --git a/admin-web/src/views/foundation/classification/index.vue b/admin-web/src/views/foundation/classification/index.vue
index 026e52c..3d942fa 100644
--- a/admin-web/src/views/foundation/classification/index.vue
+++ b/admin-web/src/views/foundation/classification/index.vue
@@ -38,8 +38,7 @@
import edit from './edit'
import * as finsystenant from '@/api/baseSetting/finsystenant'
import myImport from '@/views/components/myImport'
-import {updStatus} from "@/api/baseSetting/finsystenant";
-import {getBaseUrl, getUploadUrl} from '@/utils/base';
+import {getBaseUrl} from '@/utils/base';
export default {
name: "index",
@@ -55,7 +54,7 @@
tenantId: null,
userName: null,
userPhone: null,
- status: 1
+ states: 1
},
// 瀵煎叆
importSetting: {
@@ -85,7 +84,7 @@
table: {
showIndex: true, // 鏄惁鏄剧ず搴忓彿
expand: false, // 鏄惁鏄剧ず璇︽儏鏁版嵁
- url: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/select/list', // 璇锋眰鍦板潃
+ url: SettingIplatform.apiBaseURL + '/pc/base/category/list', // 璇锋眰鍦板潃
// 宸ュ叿鏉�
tools: {
columnsCtrl: {// 鍒楁帶鍒舵寜閽�
@@ -106,9 +105,9 @@
},
// 鍒椾俊鎭�
columns: [
- {title: '鍒嗙被鍚嶇О', field: 'category_Name', align: 'center'},
+ {title: '鍒嗙被鍚嶇О', field: 'categoryName', align: 'center'},
{title: '绫诲埆', field: 'classification', align: 'left'},
- {title: '鏄剧ず椤哄簭', field: 'order_Number', align: 'center', width: '80px'},
+ {title: '鏄剧ず椤哄簭', field: 'orderNumber', align: 'center', width: '80px'},
{
field: 'states',
title: '鐘舵��',
@@ -116,7 +115,7 @@
width: 100,
switch: row => {
const result = {}
- if (row.status == 1) {
+ if (row.states == 1) {
Object.assign(result, {
value: true, // 寮�
label: '鏄�', // 寮�鐨勬弿杩�
@@ -200,13 +199,13 @@
},
updState(row) {
let vm = this
- let text = row.status == 0 ? "鍚敤" : "绂佺敤";
- vm.$modal.confirm('纭瑕�' + text + '"' + row.name + '"鍚楋紵').then(function () {
+ let text = row.states == 0 ? "鍚敤" : "绂佺敤";
+ vm.$modal.confirm('纭瑕�' + text + '"' + row.categoryName + '"鍚楋紵').then(function () {
let params = Object.assign({}, row)
- params.status = row.status == 1 ? 0 : 1
+ params.states = row.states == 1 ? 0 : 1
finsystenant.edit(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()
}
@@ -215,7 +214,7 @@
},
del(row) {
this.$modal
- .confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.name + '"鐨勬満鏋勫悧锛�')
+ .confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.categoryName + '"鐨勬満鏋勫悧锛�')
.then(function () {
finsystenant.del({id: row.id}).then((res) => {
});
diff --git a/admin-web/src/views/foundation/classification/items.js b/admin-web/src/views/foundation/classification/items.js
index 82b5b87..37af1b4 100644
--- a/admin-web/src/views/foundation/classification/items.js
+++ b/admin-web/src/views/foundation/classification/items.js
@@ -1,35 +1,35 @@
export default [
{
type: 'text',
- dataIndex: 'name',
+ dataIndex: 'categoryName',
label: '鍒嗙被鍚嶇О',
placeholder: '璇疯緭鍏�',
defaultValue: ''
},
{
type: 'select',
- dataIndex: 'status',
+ dataIndex: 'classification',
label: '绫诲埆',
placeholder: '璇烽�夋嫨',
defaultValue: '1',
options: [
{
label: 'A',
- value: '1'
+ value: 'A'
},
{
label: 'B',
- value: '2'
+ value: 'B'
},
{
label: 'C',
- value: '3'
+ value: 'C'
}
]
},
{
type: 'select',
- dataIndex: 'status',
+ dataIndex: 'states',
label: '鐘舵��',
placeholder: '璇烽�夋嫨',
defaultValue: '1',
diff --git a/admin-web/src/views/foundation/material/edit.vue b/admin-web/src/views/foundation/material/edit.vue
index 1d1ad94..8f8733b 100644
--- a/admin-web/src/views/foundation/material/edit.vue
+++ b/admin-web/src/views/foundation/material/edit.vue
@@ -2,27 +2,29 @@
<win-md :title="setting.title" @close="close" :width="'800px'">
<el-form ref="ruleForm" :model="formData" :rules="rules" class="demo-ruleForm" label-width="100px">
<el-form-item label="鐗╁搧缂栧彿">
- <el-input v-model="formData.code88" disabled clearable maxlength="20" show-word-limit style="width: 100%"/>
+ <el-input v-model="formData.goodsCode" disabled clearable maxlength="20" show-word-limit style="width: 100%"/>
</el-form-item>
- <el-form-item label="鐗╁搧鍚嶇О" prop="name">
- <el-input v-model="formData.name" clearable maxlength="20" show-word-limit style="width: 100%"/>
+ <el-form-item label="鐗╁搧鍚嶇О" prop="goodsName">
+ <el-input v-model="formData.goodsName" clearable maxlength="20" show-word-limit style="width: 100%"/>
</el-form-item>
- <el-form-item style="margin-left: -100px;" v-for="(m, i) in formData.code">
- <el-form-item label="瑙勬牸鍨嬪彿" prop="name" style="float: left;">
- <el-input v-model="m.name" clearable maxlength="20" show-word-limit style="width: 100%"/>
+ <el-form-item label="鍒嗙被" prop="categoryId">
+ <el-input v-model="formData.categoryId" clearable maxlength="20" show-word-limit style="width: 100%"/>
+ </el-form-item>
+ <el-form-item style="margin-left: -100px;" v-for="(m, i) in formData.models">
+ <el-form-item label="瑙勬牸鍨嬪彿" prop="modelName" style="float: left;">
+ <el-input v-model="m.modelName" clearable maxlength="20" show-word-limit style="width: 100%"/>
</el-form-item>
- <el-form-item label="鍗曚綅" prop="name" style="float: left;">
- <el-input v-model="m.code" clearable maxlength="20" show-word-limit style="width: 100%"/>
+ <el-form-item label="鍗曚綅" prop="unit" style="float: left;">
+ <el-input v-model="m.unit" clearable maxlength="20" show-word-limit style="width: 100%"/>
</el-form-item>
<my-button name="鏂板鍨嬪彿" type="" @click="addCode"/>
<my-button name="鍒犻櫎" type="" @click="delCode(i)"/>
</el-form-item>
- <el-form-item label="鐘舵��">
- <el-switch
- v-model="formData.status"
- active-color="#0d997c"
- inactive-color="#C0CCDA">
- </el-switch>
+ <el-form-item label="鐘舵��" prop="states">
+ <el-radio-group v-model="formData.states">
+ <el-radio :label="1" border>鍚敤</el-radio>
+ <el-radio :label="0" border>绂佺敤</el-radio>
+ </el-radio-group>
</el-form-item>
</el-form>
<div slot="footer" align="center" class="dialog-footer">
@@ -54,13 +56,14 @@
radio1: '',
code: '',
name: '',
- status: true,
+ states: '',
summary: '',
- code:[
+ categoryId: null,
+ models:[
{
- name:'12',
- code:'13'
- },
+ modelName:'',
+ unit:''
+ }
]
},
rules: {
@@ -77,15 +80,15 @@
},
methods: {
addCode(){
- this.formData.code.push(
+ this.formData.models.push(
{
- name:'',
- code:''
+ modelName:'',
+ unit:''
}
)
},
delCode(index){
- this.formData.code.splice(index, 1)
+ this.formData.models.splice(index, 1)
},
getEditInfo(id){
@@ -99,7 +102,7 @@
const params = Object.assign({}, this.formData)
if(this.setting.id){
// 缂栬緫鎺ュ彛
- finsystenant.edit(params).then(res => {
+ finsystenant.editcode(params).then(res => {
if (res) {
this.$message.success('淇濆瓨鎴愬姛锛�')
this.close()
@@ -110,7 +113,7 @@
})
}else{
params.orgId = this.setting.orgId
- finsystenant.add(params).then(res => {
+ finsystenant.addcode(params).then(res => {
if (res) {
this.$message.success('淇濆瓨鎴愬姛锛�')
this.close()
diff --git a/admin-web/src/views/foundation/material/index.vue b/admin-web/src/views/foundation/material/index.vue
index 167fd9a..e79fab4 100644
--- a/admin-web/src/views/foundation/material/index.vue
+++ b/admin-web/src/views/foundation/material/index.vue
@@ -27,6 +27,7 @@
</template>
<script>
+import * as DateFormatter from '@/utils/DateFormatter';
import myTree from '@/components/myTree/index'
import MyTableV2 from "@/components/myTable/myTableV2";
import MyButton from "@/components/myButton/myButton";
@@ -45,63 +46,42 @@
items: [
{
type: 'text',
- dataIndex: 'goods_Name',
+ dataIndex: 'goodsName',
label: '鐗╁搧鍚嶇О',
placeholder: '璇疯緭鍏�',
defaultValue: ''
},
{
type: 'text',
- dataIndex: 'goods_Code',
+ dataIndex: 'goodsCode',
label: '鐗╁搧缂栧彿',
placeholder: '璇疯緭鍏�',
defaultValue: ''
},
{
type: 'select',
- dataIndex: 'status',
+ dataIndex: 'classification',
label: '绫诲埆',
placeholder: '璇烽�夋嫨',
- defaultValue: '1',
+ defaultValue: '',
options: [
{
label: 'A',
- value: '1'
+ value: 'A'
},
{
label: 'B',
- value: '2'
+ value: 'B'
},
{
label: 'C',
- value: '3'
+ value: 'C'
}
]
},
{
type: 'select',
- dataIndex: 'status',
- label: '閲囪喘绫诲埆',
- placeholder: '璇烽�夋嫨',
- defaultValue: '1',
- options: [
- {
- label: '鍏ㄩ儴',
- value: '1'
- },
- {
- label: '鑷噰',
- value: '2'
- },
- {
- label: '闆嗛噰',
- value: '3'
- }
- ]
- },
- {
- type: 'select',
- dataIndex: 'status',
+ dataIndex: 'states',
label: '鐘舵��',
placeholder: '璇烽�夋嫨',
defaultValue: '1',
@@ -122,7 +102,7 @@
tenantId: null,
userName: null,
userPhone: null,
- status: 1
+ states: 1
},
// 瀵煎叆
importSetting: {
@@ -152,7 +132,7 @@
table: {
showIndex: true, // 鏄惁鏄剧ず搴忓彿
expand: false, // 鏄惁鏄剧ず璇︽儏鏁版嵁
- url: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/select/list', // 璇锋眰鍦板潃
+ url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/list', // 璇锋眰鍦板潃
// 宸ュ叿鏉�
tools: {
columnsCtrl: {// 鍒楁帶鍒舵寜閽�
@@ -179,19 +159,19 @@
},
// 鍒椾俊鎭�
columns: [
- {title: '鐗╁搧缂栧彿', field: 'goods_Code', align: 'center'},
- {title: '鐗╁搧鍚嶇О', field: 'goods_Name', align: 'center'},
- {title: '鍒嗙被', field: 'classification', align: 'center'},
- {title: '绫诲埆', field: 'states', align: 'center'},
- {title: '閲囪喘绫诲瀷', field: 'category_id', align: 'center'},
- {title: '鎵�灞炴満鏋�', field: 'agency_Name', align: 'center'},
+ {title: '鐗╁搧缂栧彿', field: 'goodsCode', align: 'center'},
+ {title: '鐗╁搧鍚嶇О', field: 'goodsName', align: 'center'},
+ {title: '鍒嗙被', field: 'categoryName', align: 'center'},
+ {title: '绫诲埆', field: 'classification', align: 'center'},
+ // {title: '閲囪喘绫诲瀷', field: 'categoryId', align: 'center'},
+ {title: '鎵�灞炴満鏋�', field: '', align: 'center'},
{
title: '鍒涘缓鏃堕棿',
- field: 'create_Date',
+ field: 'createDate',
align: 'center',
width: 160,
formatter: (row) => {
- return {value: DateFormatter.LongToDateTime(row.create_Date)};
+ return {value: DateFormatter.LongToDateTime(row.createDate)};
},
},
{
@@ -201,7 +181,7 @@
width: 100,
switch: row => {
const result = {}
- if (row.status == 1) {
+ if (row.states == 1) {
Object.assign(result, {
value: true, // 寮�
label: '鏄�', // 寮�鐨勬弿杩�
@@ -225,7 +205,7 @@
// 鎿嶄綔淇℃伅
operation: {
show: true, // 鏄剧ず鎿嶄綔鍒�
- width: '150', // 鍒楀
+ width: '250', // 鍒楀
attr: [
{
title: '缂栬緫',
@@ -239,12 +219,12 @@
this.del(row);
},
},
- {
- title: '瑙勬牸鍨嬪彿',
- events: (row) => {
- this.showAudit(row);
- },
- },
+ // {
+ // title: '瑙勬牸鍨嬪彿',
+ // events: (row) => {
+ // this.showAudit(row);
+ // },
+ // },
],
},
paging: {
@@ -279,10 +259,10 @@
updState(row) {
let vm = this
let text = row.status == 0 ? "鍚敤" : "绂佺敤";
- vm.$modal.confirm('纭瑕�' + text + '"' + row.name + '"鍚楋紵').then(function () {
+ vm.$modal.confirm('纭瑕�' + text + '"' + row.goodsName + '"鍚楋紵').then(function () {
let params = Object.assign({}, row)
params.status = row.status == 1 ? 0 : 1
- finsystenant.edit(params).then(res => {
+ finsystenant.editcode(params).then(res => {
if (res) {
row.status = row.status === 1 ? 0 : 1
vm.$modal.msgSuccess(text + "鎴愬姛");
@@ -293,9 +273,9 @@
},
del(row) {
this.$modal
- .confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.name + '"鐨勬満鏋勫悧锛�')
+ .confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.goodsName + '"鐨勬満鏋勫悧锛�')
.then(function () {
- finsystenant.del({id: row.id}).then((res) => {
+ finsystenant.delCode({id: row.id}).then((res) => {
});
})
.then((res) => {
@@ -316,10 +296,13 @@
// }
},
showAudit(row) {
- this.editSetting.id = row.id;
- this.editSetting.info = JSON.stringify(row);
- this.editSetting.title = '缂栬緫';
- this.editSetting.show = true;
+ 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;
+ })
},
// 鏌ヨtable鍒楄〃
search(pageNum) {
diff --git a/admin-web/src/views/foundation/store/edit.vue b/admin-web/src/views/foundation/store/edit.vue
index 37b0db9..600af3c 100644
--- a/admin-web/src/views/foundation/store/edit.vue
+++ b/admin-web/src/views/foundation/store/edit.vue
@@ -4,18 +4,20 @@
<el-form-item label="缂栧彿" prop="code">
<el-input disabled v-model="formData.code" clearable maxlength="20" show-word-limit style="width: 100%"/>
</el-form-item>
- <el-form-item label="浠撳簱鍚嶇О" prop="name">
- <el-input v-model="formData.name" clearable maxlength="20" show-word-limit style="width: 100%"/>
+ <el-form-item label="浠撳簱鍚嶇О" prop="warehouseName">
+ <el-input v-model="formData.warehouseName" clearable maxlength="20" show-word-limit style="width: 100%"/>
+ </el-form-item>
+ <el-form-item label="浠撳簱绫诲瀷" prop="classificationId">
+ <el-input v-model="formData.classificationId" clearable maxlength="20" show-word-limit style="width: 100%"/>
</el-form-item>
<el-form-item label="鍦板潃" >
- <el-input v-model="formData.adss" clearable maxlength="20" show-word-limit style="width: 100%"/>
+ <el-input v-model="formData.adress" clearable maxlength="20" show-word-limit style="width: 100%"/>
</el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-switch
- v-model="formData.status"
- active-color="#0d997c"
- inactive-color="#C0CCDA">
- </el-switch>
+ <el-form-item label="鐘舵��" prop="states">
+ <el-radio-group v-model="formData.states">
+ <el-radio :label="1" border>鍚敤</el-radio>
+ <el-radio :label="0" border>绂佺敤</el-radio>
+ </el-radio-group>
</el-form-item>
</el-form>
<div slot="footer" align="center" class="dialog-footer">
@@ -44,19 +46,16 @@
checkAll: false,
checkedList: [],
formData: {
- code: '',
- name: '',
- status: true,
- summary: '',
+ classificationId: null,
},
rules: {
- code: [
- {required: true, message: '璇疯緭鍏ユ満鏋勭紪鍙�', trigger: 'blur'}
+ warehouseName: [
+ {required: true, message: '璇疯緭鍏�', trigger: 'blur'}
],
name: [
- {required: true, message: '璇疯緭鍏ユ満鏋勫悕绉�', trigger: 'blur'}
+ {required: true, message: '璇疯緭鍏�', trigger: 'blur'}
],
- status: [
+ states: [
{required: true, message: '璇烽�夋嫨鐘舵��', trigger: 'blur'}
]
}
@@ -80,7 +79,7 @@
const params = Object.assign({}, this.formData)
if(this.setting.id){
// 缂栬緫鎺ュ彛
- finsystenant.edit(params).then(res => {
+ finsystenant.editstore(params).then(res => {
if (res) {
this.$message.success('淇濆瓨鎴愬姛锛�')
this.close()
@@ -91,7 +90,7 @@
})
}else{
params.orgId = this.setting.orgId
- finsystenant.add(params).then(res => {
+ finsystenant.addstore(params).then(res => {
if (res) {
this.$message.success('淇濆瓨鎴愬姛锛�')
this.close()
diff --git a/admin-web/src/views/foundation/store/index.vue b/admin-web/src/views/foundation/store/index.vue
index 3f7a463..9df6b08 100644
--- a/admin-web/src/views/foundation/store/index.vue
+++ b/admin-web/src/views/foundation/store/index.vue
@@ -44,14 +44,14 @@
items: [
{
type: 'text',
- dataIndex: 'name',
+ dataIndex: 'warehouseName',
label: '浠撳簱鍚嶇О',
placeholder: '璇疯緭鍏�',
defaultValue: ''
},
{
type: 'select',
- dataIndex: 'status',
+ dataIndex: 'states',
label: '鐘舵��',
placeholder: '璇烽�夋嫨',
defaultValue: '1',
@@ -104,7 +104,7 @@
table: {
showIndex: true, // 鏄惁鏄剧ず搴忓彿
expand: false, // 鏄惁鏄剧ず璇︽儏鏁版嵁
- url: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/select/list', // 璇锋眰鍦板潃
+ url: SettingIplatform.apiBaseURL + '/pc/base/warehouse/list', // 璇锋眰鍦板潃
// 宸ュ叿鏉�
tools: {
columnsCtrl: {// 鍒楁帶鍒舵寜閽�
@@ -125,19 +125,19 @@
},
// 鍒椾俊鎭�
columns: [
- {title: '鍚嶇О浠撳簱', field: 'name', align: 'left',},
- {title: '缂栧彿', field: 'code', align: 'center'},
- {title: '绫诲瀷', field: 'lv', align: 'center', },
- {title: '鍦板潃', field: 'lv', align: 'center', },
- {title: '鎵�灞炴満鏋�', field: 'summary', align: 'left',},
+ {title: '鍚嶇О浠撳簱', field: 'warehouseName', align: 'left',},
+ {title: '缂栧彿', field: 'warehouseCode', align: 'center'},
+ {title: '绫诲瀷', field: 'classificationName', align: 'center', },
+ {title: '鍦板潃', field: 'adress', align: 'center', },
+ // {title: '鎵�灞炴満鏋�', field: 'summary', align: 'left',},
{
- field: 'belongProvince',
+ field: 'states',
title: '鐘舵��',
align: 'center',
width: 100,
switch: row => {
const result = {}
- if (row.status == 1) {
+ if (row.states == 1) {
Object.assign(result, {
value: true, // 寮�
label: '鏄�', // 寮�鐨勬弿杩�
@@ -175,12 +175,12 @@
this.del(row);
},
},
- {
- title: '浠撳簱鍛�',
- events: (row) => {
- this.showAudit(row);
- },
- }
+ // {
+ // title: '浠撳簱鍛�',
+ // events: (row) => {
+ // this.showAudit(row);
+ // },
+ // }
],
},
paging: {
@@ -227,13 +227,13 @@
},
updState(row) {
let vm = this
- let text = row.status == 0 ? "鍚敤" : "绂佺敤";
- vm.$modal.confirm('纭瑕�' + text + '"' + row.name + '"鍚楋紵').then(function () {
+ let text = row.states == 0 ? "鍚敤" : "绂佺敤";
+ vm.$modal.confirm('纭瑕�' + text + '"' + row.warehouseName + '"鍚楋紵').then(function () {
let params = Object.assign({}, row)
- params.status = row.status == 1 ? 0 : 1
- finsystenant.edit(params).then(res => {
+ params.states = row.states == 1 ? 0 : 1
+ finsystenant.editstore(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()
}
@@ -242,9 +242,9 @@
},
del(row) {
this.$modal
- .confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.name + '"鐨勬満鏋勫悧锛�')
+ .confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.warehouseName + '"鐨勬満鏋勫悧锛�')
.then(function () {
- finsystenant.del({id: row.id}).then((res) => {
+ finsystenant.delstore({id: row.id}).then((res) => {
});
})
.then((res) => {
--
Gitblit v1.9.1