Skip to content

J
jiedao-app-operator-master
Commit 43499d88 authored by houjn@hikoon.cn's avatar houjn@hikoon.cn
Browse files
Options

需知改须知

parent f37edf9c
Show whitespace changes
Inline Side-by-side
Showing with 71 additions and 21 deletions
src/api/system/needKnow.js
View file @ 43499d88
import request from '@/utils/request'
// 创建需知
// 创建须知
export function createNeedKnow(data) {
return request({
url: '/system/need-know/create',
......@@ -9,7 +9,7 @@ export function createNeedKnow(data) {
})
}
// 更新需知
// 更新须知
export function updateNeedKnow(data) {
return request({
url: '/system/need-know/update',
......@@ -18,7 +18,7 @@ export function updateNeedKnow(data) {
})
}
// 删除需知
// 删除须知
export function deleteNeedKnow(id) {
return request({
url: '/system/need-know/delete?id=' + id,
......@@ -26,7 +26,7 @@ export function deleteNeedKnow(id) {
})
}
// 获得需知
// 获得须知
export function getNeedKnow(id) {
return request({
url: '/system/need-know/get?id=' + id,
......@@ -34,7 +34,7 @@ export function getNeedKnow(id) {
})
}
// 获得需知分页
// 获得须知分页
export function getNeedKnowPage(query) {
return request({
url: '/system/need-know/page',
......@@ -43,7 +43,7 @@ export function getNeedKnowPage(query) {
})
}
// 导出需知 Excel
// 导出须知 Excel
export function exportNeedKnowExcel(query) {
return request({
url: '/system/need-know/export-excel',
......
src/utils/dict.js
View file @ 43499d88
......@@ -164,8 +164,8 @@ export const DICT_TYPE = {
ORDER_COD_EXCEPTION_RESULT:'order_cod_exception_result',//代收货款异常处理结果
ORDER_OTHER_EXCEPTION_RESULT:'order_other_exception_result',//其它异常处理结果
ORDER_BULKY_CARGO_EXCEPTION_RESULT:'order_bulky_cargo_exception_result',//泡货异常处理结果
NEED_KNOW_TYPE:'need_know_type',//需知类型
NEED_KNOW_STATUS:'need_know_status',//需知状态
NEED_KNOW_TYPE:'need_know_type',//须知类型
NEED_KNOW_STATUS:'need_know_status',//须知状态
ECASH_INIT:'ecash_init', //e-cash
......
src/views/ecw/productBrank/index.vue
View file @ 43499d88
......@@ -323,7 +323,7 @@ export default {
this.exportLoading = true;
return exportProductBrankExcel(params);
}).then(response => {
this.$download.excel(response, '${table.classComment}.xls');
this.$download.excel(response, '品牌.xls');
this.exportLoading = false;
}).catch(() => {});
}
......
src/views/system/needKnow/index.vue
View file @ 43499d88
......@@ -3,8 +3,8 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="需知类型" prop="knowType">
<el-select v-model="queryParams.knowType" placeholder="请选择需知类型" clearable size="small">
<el-form-item label="须知类型" prop="knowType">
<el-select v-model="queryParams.knowType" placeholder="请选择须知类型" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.NEED_KNOW_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
......@@ -47,7 +47,7 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="" align="center" prop="id" />
<el-table-column label="需知类型" align="center" prop="knowType">
<el-table-column label="须知类型" align="center" prop="knowType">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.NEED_KNOW_TYPE" :value="scope.row.knowType" />
</template>
......@@ -82,8 +82,8 @@
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="需知类型" prop="knowType">
<el-select v-model="form.knowType" placeholder="请选择需知类型">
<el-form-item label="须知类型" prop="knowType">
<el-select v-model="form.knowType" placeholder="请选择须知类型">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.NEED_KNOW_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
......@@ -133,7 +133,7 @@ export default {
showSearch: true,
// 总条数
total: 0,
// 需知列表
// 须知列表
list: [],
// 弹出层标题
title: "",
......@@ -206,7 +206,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加需知";
this.title = "添加须知";
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -215,7 +215,7 @@ export default {
getNeedKnow(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改需知";
this.title = "修改须知";
});
},
/** 提交按钮 */
......@@ -244,7 +244,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除需知编号为"' + id + '"的数据项?').then(function() {
this.$modal.confirm('是否确认删除须知编号为"' + id + '"的数据项?').then(function() {
return deleteNeedKnow(id);
}).then(() => {
this.getList();
......@@ -259,7 +259,7 @@ export default {
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有需知数据项?').then(() => {
this.$modal.confirm('是否确认导出所有须知数据项?').then(() => {
this.exportLoading = true;
return exportNeedKnowExcel(params);
}).then(response => {
......
yarn.lock
View file @ 43499d88
......@@ -3604,6 +3604,11 @@ diffie-hellman@^5.0.0:
miller-rabin "^4.0.0"
randombytes "^2.0.0"
dijkstrajs@^1.0.1:
version "1.0.2"
resolved "https://registry.npmmirror.com/dijkstrajs/-/dijkstrajs-1.0.2.tgz#2e48c0d3b825462afe75ab4ad5e829c8ece36257"
integrity sha512-QV6PMaHTCNmKSeP6QoXhVTw9snc9VD8MulTT0Bd99Pacp4SS1cjcrYPgBPmibqKVtMJJfqC6XvOXgPMEEPH/fg==
dir-glob@^2.0.0, dir-glob@^2.2.2:
version "2.2.2"
resolved "https://registry.npmmirror.com/dir-glob/-/dir-glob-2.2.2.tgz"
......@@ -3852,6 +3857,11 @@ emojis-list@^3.0.0:
resolved "https://registry.npmmirror.com/emojis-list/-/emojis-list-3.0.0.tgz"
integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
encode-utf8@^1.0.3:
version "1.0.3"
resolved "https://registry.npmmirror.com/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda"
integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==
encodeurl@~1.0.1, encodeurl@~1.0.2:
version "1.0.2"
resolved "https://registry.npmmirror.com/encodeurl/-/encodeurl-1.0.2.tgz"
......@@ -4545,9 +4555,9 @@ find-up@^3.0.0:
dependencies:
locate-path "^3.0.0"
find-up@^4.0.0:
find-up@^4.0.0, find-up@^4.1.0:
version "4.1.0"
resolved "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz"
resolved "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
dependencies:
locate-path "^5.0.0"
......@@ -7357,6 +7367,11 @@ please-upgrade-node@^3.2.0:
dependencies:
semver-compare "^1.0.0"
pngjs@^5.0.0:
version "5.0.0"
resolved "https://registry.npmmirror.com/pngjs/-/pngjs-5.0.0.tgz#e79dd2b215767fd9c04561c01236df960bce7fbb"
integrity sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==
pnp-webpack-plugin@^1.6.4:
version "1.7.0"
resolved "https://registry.npmmirror.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz"
......@@ -7916,6 +7931,16 @@ q@^1.1.2:
resolved "https://registry.npmmirror.com/q/-/q-1.5.1.tgz"
integrity "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="
qrcode@^1.5.1:
version "1.5.1"
resolved "https://registry.npmmirror.com/qrcode/-/qrcode-1.5.1.tgz#0103f97317409f7bc91772ef30793a54cd59f0cb"
integrity sha512-nS8NJ1Z3md8uTjKtP+SGGhfqmTCs5flU/xR623oI0JX+Wepz9R8UrRVCTBTJm3qGw3rH6jJ6MUHjkDx15cxSSg==
dependencies:
dijkstrajs "^1.0.1"
encode-utf8 "^1.0.3"
pngjs "^5.0.0"
yargs "^15.3.1"
qs@6.9.7:
version "6.9.7"
resolved "https://registry.npmmirror.com/qs/-/qs-6.9.7.tgz"
......@@ -10172,6 +10197,14 @@ yargs-parser@^13.1.2:
camelcase "^5.0.0"
decamelize "^1.2.0"
yargs-parser@^18.1.2:
version "18.1.3"
resolved "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
dependencies:
camelcase "^5.0.0"
decamelize "^1.2.0"
yargs-parser@^20.2.2:
version "20.2.9"
resolved "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-20.2.9.tgz"
......@@ -10193,6 +10226,23 @@ yargs@^13.3.2:
y18n "^4.0.0"
yargs-parser "^13.1.2"
yargs@^15.3.1:
version "15.4.1"
resolved "https://registry.npmmirror.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
dependencies:
cliui "^6.0.0"
decamelize "^1.2.0"
find-up "^4.1.0"
get-caller-file "^2.0.1"
require-directory "^2.1.1"
require-main-filename "^2.0.0"
set-blocking "^2.0.0"
string-width "^4.2.0"
which-module "^2.0.0"
y18n "^4.0.0"
yargs-parser "^18.1.2"
yargs@^16.0.0:
version "16.2.0"
resolved "https://registry.npmmirror.com/yargs/-/yargs-16.2.0.tgz"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment