From 18931aa94b6567ab715f4bdd955dacb49a11f005 Mon Sep 17 00:00:00 2001 From: xjh <2423579486@qq.com> Date: Thu, 29 Jun 2023 21:06:00 +0800 Subject: [PATCH] =?UTF-8?q?feta:=E5=AE=8C=E6=88=90=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=9D=97=E7=B1=BB=E7=9B=AE=E6=A8=A1=E5=9D=97=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=20fix:=E5=AE=A2=E6=88=B7=E6=A8=A1=E5=9D=97=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=81=E4=BB=A3=E7=A0=81=E5=9D=97=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=96=87=E4=BB=B6=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/AddCodeModuleDialog.vue | 0 .../components/DetailCodeModuleDialog.vue | 0 .../components/EditCodeModuleDialog.vue | 0 .../index/{ => code}/code_module/index.vue | 3 - .../AddCodeModuleCategoryDialog.vue | 247 ++++++++++++++++ .../DetailCodeModuleCategoryDialog.vue | 151 ++++++++++ .../EditCodeModuleCategoryDialog.vue | 248 ++++++++++++++++ .../index/code/code_module_category/index.vue | 268 ++++++++++++++++++ .../components/AddCustomerDialog.vue | 39 ++- .../components/DetailCustomerDialog.vue | 24 +- .../components/EditCustomerDialog.vue | 55 ++-- .../components/EditPswDialog.vue | 107 +++++++ .../index/customer/customer_list/index.vue | 62 +++- src/service/code_module.js | 24 +- src/service/code_module_category.js | 78 +++++ src/service/customer.js | 21 ++ 16 files changed, 1245 insertions(+), 82 deletions(-) rename src/pages/index/{ => code}/code_module/components/AddCodeModuleDialog.vue (100%) rename src/pages/index/{ => code}/code_module/components/DetailCodeModuleDialog.vue (100%) rename src/pages/index/{ => code}/code_module/components/EditCodeModuleDialog.vue (100%) rename src/pages/index/{ => code}/code_module/index.vue (99%) create mode 100644 src/pages/index/code/code_module_category/components/AddCodeModuleCategoryDialog.vue create mode 100644 src/pages/index/code/code_module_category/components/DetailCodeModuleCategoryDialog.vue create mode 100644 src/pages/index/code/code_module_category/components/EditCodeModuleCategoryDialog.vue create mode 100644 src/pages/index/code/code_module_category/index.vue create mode 100644 src/pages/index/customer/customer_list/components/EditPswDialog.vue create mode 100644 src/service/code_module_category.js diff --git a/src/pages/index/code_module/components/AddCodeModuleDialog.vue b/src/pages/index/code/code_module/components/AddCodeModuleDialog.vue similarity index 100% rename from src/pages/index/code_module/components/AddCodeModuleDialog.vue rename to src/pages/index/code/code_module/components/AddCodeModuleDialog.vue diff --git a/src/pages/index/code_module/components/DetailCodeModuleDialog.vue b/src/pages/index/code/code_module/components/DetailCodeModuleDialog.vue similarity index 100% rename from src/pages/index/code_module/components/DetailCodeModuleDialog.vue rename to src/pages/index/code/code_module/components/DetailCodeModuleDialog.vue diff --git a/src/pages/index/code_module/components/EditCodeModuleDialog.vue b/src/pages/index/code/code_module/components/EditCodeModuleDialog.vue similarity index 100% rename from src/pages/index/code_module/components/EditCodeModuleDialog.vue rename to src/pages/index/code/code_module/components/EditCodeModuleDialog.vue diff --git a/src/pages/index/code_module/index.vue b/src/pages/index/code/code_module/index.vue similarity index 99% rename from src/pages/index/code_module/index.vue rename to src/pages/index/code/code_module/index.vue index 917d68e..b9719e9 100644 --- a/src/pages/index/code_module/index.vue +++ b/src/pages/index/code/code_module/index.vue @@ -7,7 +7,6 @@ - @@ -35,7 +34,6 @@ 添加 - @@ -48,7 +46,6 @@ 导出 - diff --git a/src/pages/index/code/code_module_category/components/AddCodeModuleCategoryDialog.vue b/src/pages/index/code/code_module_category/components/AddCodeModuleCategoryDialog.vue new file mode 100644 index 0000000..7cf52c8 --- /dev/null +++ b/src/pages/index/code/code_module_category/components/AddCodeModuleCategoryDialog.vue @@ -0,0 +1,247 @@ + + + + + diff --git a/src/pages/index/code/code_module_category/components/DetailCodeModuleCategoryDialog.vue b/src/pages/index/code/code_module_category/components/DetailCodeModuleCategoryDialog.vue new file mode 100644 index 0000000..3966666 --- /dev/null +++ b/src/pages/index/code/code_module_category/components/DetailCodeModuleCategoryDialog.vue @@ -0,0 +1,151 @@ + + + + + diff --git a/src/pages/index/code/code_module_category/components/EditCodeModuleCategoryDialog.vue b/src/pages/index/code/code_module_category/components/EditCodeModuleCategoryDialog.vue new file mode 100644 index 0000000..6f00a3b --- /dev/null +++ b/src/pages/index/code/code_module_category/components/EditCodeModuleCategoryDialog.vue @@ -0,0 +1,248 @@ + + + + + diff --git a/src/pages/index/code/code_module_category/index.vue b/src/pages/index/code/code_module_category/index.vue new file mode 100644 index 0000000..e086ed9 --- /dev/null +++ b/src/pages/index/code/code_module_category/index.vue @@ -0,0 +1,268 @@ + + diff --git a/src/pages/index/customer/customer_list/components/AddCustomerDialog.vue b/src/pages/index/customer/customer_list/components/AddCustomerDialog.vue index 84a47af..3e50e43 100644 --- a/src/pages/index/customer/customer_list/components/AddCustomerDialog.vue +++ b/src/pages/index/customer/customer_list/components/AddCustomerDialog.vue @@ -2,6 +2,8 @@ + + @@ -28,13 +30,21 @@ - + + + + + + + + @@ -65,6 +75,13 @@ async function get_sex() { sex.value = res }) } +// 字典获取 +const blacklist = ref([]); +async function get_blacklist() { + await getDictionary({ dictionary_value: 'blacklist' }).then((res) => { + blacklist.value = res + }) +} @@ -114,25 +131,6 @@ const rules = reactive({ message: '客户密码不能为空' } ], - // customer_phone: [ - // { - // required: true, - // message: '客户手机号不能为空' - // } - // ], - // customer_email: [ - // { - // required: true, - // message: '客户邮箱不能为空' - // } - // ], - // customer_sex: [ - // { - // required: true, - // message: '客户性别不能为空' - // } - // ], - }); @@ -141,6 +139,7 @@ const rules = reactive({ // 打开弹窗时执行 const openDialog = () => { get_sex() + get_blacklist() }; diff --git a/src/pages/index/customer/customer_list/components/DetailCustomerDialog.vue b/src/pages/index/customer/customer_list/components/DetailCustomerDialog.vue index 938b7b4..75599ab 100644 --- a/src/pages/index/customer/customer_list/components/DetailCustomerDialog.vue +++ b/src/pages/index/customer/customer_list/components/DetailCustomerDialog.vue @@ -2,6 +2,8 @@ + + @@ -12,11 +14,6 @@ - - - - - @@ -28,13 +25,20 @@ - + + + + + + + @@ -59,6 +63,13 @@ async function get_sex() { sex.value = res }) } +// 字典获取 +const blacklist = ref([]); +async function get_blacklist() { + await getDictionary({ dictionary_value: 'blacklist' }).then((res) => { + blacklist.value = res + }) +} @@ -88,6 +99,7 @@ watch(props, (v) => { const openDialog = () => { get_sex() + get_blacklist() }; diff --git a/src/pages/index/customer/customer_list/components/EditCustomerDialog.vue b/src/pages/index/customer/customer_list/components/EditCustomerDialog.vue index aad9831..d0ff118 100644 --- a/src/pages/index/customer/customer_list/components/EditCustomerDialog.vue +++ b/src/pages/index/customer/customer_list/components/EditCustomerDialog.vue @@ -2,6 +2,8 @@ + + @@ -9,12 +11,7 @@ - - - - - - + @@ -28,13 +25,21 @@ - + + + + + + + + - - + @@ -92,6 +106,8 @@ + + diff --git a/src/service/code_module.js b/src/service/code_module.js index 2c44212..23d7d95 100644 --- a/src/service/code_module.js +++ b/src/service/code_module.js @@ -4,14 +4,13 @@ import { createApiUrl } from '~/utils/axios'; - /** * 下载代码块模板 * @param {Object} data * @return {Promise} api */ export function downloadTemplate(data) { - downloadFile(createApiUrl('CodeModule.CodeModule/downloadTemplate'), data); + downloadFile(createApiUrl('Code.CodeModule/downloadTemplate'), data); } /** @@ -19,7 +18,7 @@ export function downloadTemplate(data) { * @param {Object} data * @return {Promise} api */ -export const importExcel = createApiUrl('CodeModule.CodeModule/importExcel'); +export const importExcel = createApiUrl('Code.CodeModule/importExcel'); /** * 导出代码块 @@ -27,15 +26,9 @@ export const importExcel = createApiUrl('CodeModule.CodeModule/importExcel'); * @return {Promise} api */ export function exportExcel(data) { - downloadFile(createApiUrl('CodeModule.CodeModule/exportExcel'), data); + downloadFile(createApiUrl('Code.CodeModule/exportExcel'), data); } - - - - - - /** * 获取字典值 * @param {Object} data @@ -45,14 +38,13 @@ export function getDictionary(data) { return api.post('Dictionary.Dictionary/getDictionary', data, {}); } - /** * 获取代码块列表 * @param {Object} data * @return {Promise} api */ export function getCodeModuleList(data) { - return api.post('CodeModule.CodeModule/getCodeModuleList', data); + return api.post('Code.CodeModule/getCodeModuleList', data); } /** @@ -61,7 +53,7 @@ export function getCodeModuleList(data) { * @return {Promise} api */ export function deleteCodeModule(data) { - return api.post('CodeModule.CodeModule/deleteCodeModule', data, { + return api.post('Code.CodeModule/deleteCodeModule', data, { isTransformResponse: true, isShowSuccessMessage: true, errorMessageText: '删除失败' @@ -74,7 +66,7 @@ export function deleteCodeModule(data) { * @return {Promise} api */ export function addCodeModule(data) { - return api.post('CodeModule.CodeModule/addCodeModule', data, { + return api.post('Code.CodeModule/addCodeModule', data, { isTransformResponse: true, isShowSuccessMessage: true, errorMessageText: '添加失败' @@ -86,7 +78,7 @@ export function addCodeModule(data) { * @return {Promise} api */ export function editCodeModule(data) { - return api.post('CodeModule.CodeModule/editCodeModule', data, { + return api.post('Code.CodeModule/editCodeModule', data, { isTransformResponse: true, isShowSuccessMessage: true, errorMessageText: '编辑失败' @@ -99,7 +91,7 @@ export function editCodeModule(data) { * @return {Promise} api */ export function audit(data) { - return api.post('CodeModule.CodeModule/auditCodeModule', data, { + return api.post('Code.CodeModule/auditCodeModule', data, { errorMessageText: '审核失败' }); } \ No newline at end of file diff --git a/src/service/code_module_category.js b/src/service/code_module_category.js new file mode 100644 index 0000000..1b2318b --- /dev/null +++ b/src/service/code_module_category.js @@ -0,0 +1,78 @@ +import { + api, + downloadFile, + createApiUrl +} from '~/utils/axios'; + + + + + + + + +/** + * 获取字典值 + * @param {Object} data + * @return {Promise} api + */ +export function getDictionary(data) { + return api.post('Dictionary.Dictionary/getDictionary', data, {}); +} + + +/** + * 获取代码块类目列表 + * @param {Object} data + * @return {Promise} api + */ +export function getCodeModuleCategoryList(data) { + return api.post('Code.CodeModuleCategory/getCodeModuleCategoryList', data); +} + +/** + * 获取父子类目共用信息 + * @param {Object} data + * @return {Promise} api + */ +export function getCodeModuleCategoryInfo(data) { + return api.post('Code.CodeModuleCategory/getCodeModuleCategoryInfo', data); +} + +/** + * 删除代码块类目 + * @param {Object} data + * @return {Promise} api + */ +export function deleteCodeModuleCategory(data) { + return api.post('Code.CodeModuleCategory/deleteCodeModuleCategory', data, { + isTransformResponse: true, + isShowSuccessMessage: true, + errorMessageText: '删除失败' + }); +} + +/** + * 添加代码块类目 + * @param {Object} data + * @return {Promise} api + */ +export function addCodeModuleCategory(data) { + return api.post('Code.CodeModuleCategory/addCodeModuleCategory', data, { + // isTransformResponse: true, + // isShowSuccessMessage: true, + errorMessageText: '添加失败' + }); +} +/** + * 编辑代码块类目 + * @param {Object} data + * @return {Promise} api + */ +export function editCodeModuleCategory(data) { + return api.post('Code.CodeModuleCategory/editCodeModuleCategory', data, { + // isTransformResponse: true, + // isShowSuccessMessage: true, + errorMessageText: '编辑失败' + }); +} \ No newline at end of file diff --git a/src/service/customer.js b/src/service/customer.js index 80643b4..04ec49e 100644 --- a/src/service/customer.js +++ b/src/service/customer.js @@ -13,6 +13,7 @@ export function getDictionary(data) { return api.post('Dictionary.Dictionary/getDictionary', data, {}); } + /** * 获取客户列表 * @param {Object} data @@ -58,4 +59,24 @@ export function editCustomer(data) { isShowSuccessMessage: true, errorMessageText: '编辑失败' }); +} +/** + * 修改密码 + * @param {Object} data + * @return {Promise} api + */ +export function editPassword(data) { + return api.post('Customer.Customer/editPassword', data, { + isTransformResponse: true, + isShowSuccessMessage: true, + errorMessageText: '修改失败' + }); +} +/** + * 获取客户下拉选项数据 + * @param {Object} data + * @return {Promise} api + */ +export function getCustomerOptionList(data) { + return api.post('Customer.Customer/getCustomerOptionList', data); } \ No newline at end of file