From 303c1026f80c5e241fbf52dc41a7caa0c52da9f3 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Fri, 3 Sep 2021 19:27:41 +0800 Subject: [PATCH] =?UTF-8?q?eslint;=20=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- babel.config.js | 4 +- src/App.vue | 24 +- src/api/api.js | 112 +- src/api/inconmeMeetingApi.js | 2 +- src/api/manage.js | 6 +- src/assets/imgs/generial_project.png | Bin 0 -> 4246 bytes src/assets/imgs/meeting_project.png | Bin 0 -> 5816 bytes src/assets/imgs/member_project.png | Bin 0 -> 2475 bytes .../imgs/working_group_project_selected.png | Bin 0 -> 1591 bytes src/assets/less/common.less | 2 + src/components/HelloWorld.vue | 4 +- src/components/ProjectDetailModal.vue | 28 +- src/components/company/BusinessSelect.vue | 42 +- src/components/company/SelectContacts.vue | 11 +- src/components/company/SelectPrincipal.vue | 2 +- src/components/dict/JDictSelectTag.vue | 22 +- src/components/dict/JDictSelectUtil.js | 40 +- src/components/dict/JMultiSelectTag.vue | 12 +- src/components/dict/JSearchSelectTag.vue | 32 +- src/components/dict/index.js | 6 +- src/components/form/InstallmentForm.vue | 160 + src/components/jero/JCron.vue | 8 +- src/components/jero/JDate.vue | 10 +- src/components/jero/JFormContainer.vue | 2 +- src/components/jero/JImageUpload.vue | 64 +- src/components/jero/JInput.vue | 52 +- src/components/jero/JTreeSelect.vue | 32 +- src/components/jero/JUpload.vue | 86 +- src/components/jero/index.js | 10 +- src/components/jero/minipop/JFilePop.vue | 22 +- src/components/jero/minipop/JInputPop.vue | 2 +- src/components/jero/modal/JCronModal.vue | 472 +-- src/components/layouts/BasicLayout.vue | 2 +- src/components/layouts/IframePageView.vue | 24 +- src/components/layouts/PageView.vue | 2 +- src/components/layouts/RouteView.vue | 8 +- src/components/layouts/TabLayout.vue | 14 +- src/components/layouts/UserLayout.vue | 22 +- src/components/menu/SideMenu.vue | 4 +- src/components/menu/index.js | 2 +- src/components/page/GlobalFooter.vue | 2 +- src/components/page/PageHeader.vue | 4 +- src/components/page/PageLayout.vue | 2 +- src/components/page/SHeaderNotice.vue | 2 +- src/components/setting/SettingDrawer.vue | 60 +- src/components/setting/SettingItem.vue | 2 +- src/components/tools/DepartSelect.vue | 30 +- src/components/tools/DetailList.vue | 2 +- src/components/tools/HeaderNotice.vue | 152 +- src/components/tools/ShowAnnouncement.vue | 18 +- src/components/tools/StatusSlot.vue | 2 +- src/components/tools/UserMenu.vue | 28 +- src/components/tools/UserPassword.vue | 44 +- src/components/tools/setting.js | 54 +- src/main.js | 68 +- src/mixins/JeroListMixin.js | 196 +- src/permission.js | 72 +- src/router/index.js | 20 +- src/store/getters.js | 4 +- src/store/index.js | 22 +- src/store/modules/app.js | 90 +- src/store/modules/online.js | 10 +- src/store/modules/permission.js | 4 +- src/store/modules/user.js | 28 +- src/utils/JEditableTableUtil.js | 10 +- src/utils/authFilter.js | 120 +- src/utils/encryption/aesEncrypt.js | 3088 ++++++++--------- src/utils/filter.js | 6 +- src/utils/hasPermission.js | 80 +- src/utils/mixin.js | 2 +- src/utils/request.js | 44 +- src/utils/util.js | 70 +- src/utils/vTrim.js | 6 +- src/utils/validateOnly.js | 4 +- src/views/Home.vue | 6 +- .../businessManagement/BusinessManagement.vue | 35 +- .../businessManagement/ContactManagement.vue | 35 +- .../modules/BusinessManagementModule.vue | 26 +- .../modules/ContactManagementModule.vue | 28 +- .../revenueContract/RevenueContractList.vue | 21 +- .../modules/ProjectTypeSelection.vue | 120 + .../modules/RevenueContractDetail.vue | 219 +- .../modules/RevenueContractModule.vue | 526 ++- .../modules/SelectProjectModule.vue | 151 + src/views/dashboard/Analysis.vue | 6 +- .../committee/CommitteeMaintenance.vue | 30 +- src/views/exception/ExceptionPage.vue | 2 +- .../meetManage/AddOrDetailMeet.vue | 34 +- .../incomePayments/meetManage/Attendance.vue | 62 +- .../meetManage/MeetManageList.vue | 44 +- .../meetManage/SignUpInfoEdit.vue | 16 +- .../meetManage/SignUpInfoList.vue | 36 +- .../meetManage/modules/AuditModal.vue | 8 +- .../meetManage/modules/BatchInvocieModal.vue | 8 +- .../modules/BatchSetDockerModal.vue | 8 +- .../modules/ImportParticipantModal.vue | 30 +- .../meetManage/modules/MeetModal.vue | 16 +- .../modules/UploadMeetFileModal.vue | 10 +- .../memberManage/MemberProjectList.vue | 32 +- .../memberManage/SafeguardMemberList.vue | 76 +- .../SafeguardStardsMemberList.vue | 126 +- .../memberManage/StardsMemberProjectList.vue | 12 +- .../modules/MemberProjectModal.vue | 16 +- .../modules/SafeguardMemberModal.vue | 158 +- .../ConferenceMaintenance.vue | 17 +- .../GeneralProjectManagement.vue | 2 +- .../WorkingGroupMemberUnitMaintenance.vue | 8 +- .../WorkingGroupProjectManagement.vue | 4 +- .../modules/GeneralProjectModule.vue | 13 +- .../WorkingGroupMemberSetChargeNotice.vue | 6 +- .../modules/WorkingGroupMemberUnitModule.vue | 68 +- .../modules/WorkingGroupProjectModule.vue | 10 +- src/views/result/Error.vue | 2 +- src/views/result/Result.vue | 2 +- src/views/result/Success.vue | 2 +- src/views/system/ConfusionList.vue | 32 +- src/views/system/DepartList.vue | 26 +- src/views/system/DepartUserList.vue | 46 +- src/views/system/DictDeleteList.vue | 36 +- src/views/system/DictItemList.vue | 82 +- src/views/system/DictList.vue | 54 +- src/views/system/LogList.vue | 72 +- src/views/system/PermissionDataRuleList.vue | 12 +- src/views/system/PermissionList.vue | 8 +- src/views/system/QuartzJobList.vue | 102 +- src/views/system/RoleUserList.vue | 122 +- src/views/system/SysCategoryList.vue | 70 +- src/views/system/TenantList.vue | 24 +- src/views/system/UserAnnouncementList.vue | 84 +- src/views/system/UserList.vue | 110 +- src/views/system/modules/DepartAuthModal.vue | 44 +- .../system/modules/DepartDataruleModal.vue | 8 +- src/views/system/modules/DepartModal.vue | 104 +- src/views/system/modules/DeptBaseInfo.vue | 24 +- .../system/modules/DeptRoleAuthModal.vue | 50 +- .../system/modules/DeptRoleDataruleModal.vue | 10 +- src/views/system/modules/DeptRoleInfo.vue | 62 +- .../system/modules/DeptRoleUserModal.vue | 94 +- src/views/system/modules/DeptUserInfo.vue | 152 +- src/views/system/modules/DictItemModal.vue | 74 +- src/views/system/modules/DictModal.vue | 4 +- src/views/system/modules/PermissionModal.vue | 140 +- src/views/system/modules/QuartzJobModal.vue | 70 +- .../system/modules/RoleDataruleModal.vue | 10 +- src/views/system/modules/RoleModal.vue | 52 +- src/views/system/modules/SelectUserModal.vue | 92 +- src/views/system/modules/SysCategoryModal.vue | 58 +- src/views/system/modules/SysConfusionForm.vue | 50 +- .../system/modules/SysConfusionModal.vue | 14 +- .../system/modules/SysDepartRoleModal.vue | 68 +- src/views/system/modules/TenantForm.vue | 58 +- src/views/system/modules/TenantModal.vue | 16 +- src/views/system/modules/UserModal.vue | 318 +- src/views/system/modules/UserRoleModal.vue | 46 +- src/views/test/TestPage.vue | 4 +- src/views/user/Login.vue | 226 +- src/views/user/alteration/Alteration.vue | 6 +- src/views/user/alteration/Step1.vue | 54 +- src/views/user/alteration/Step2.vue | 84 +- src/views/user/alteration/Step3.vue | 20 +- src/views/user/alteration/Step4.vue | 14 +- src/views/user/register/Register.vue | 78 +- src/views/user/register/RegisterResult.vue | 12 +- vue.config.js | 32 +- 164 files changed, 5964 insertions(+), 4788 deletions(-) create mode 100644 src/assets/imgs/generial_project.png create mode 100644 src/assets/imgs/meeting_project.png create mode 100644 src/assets/imgs/member_project.png create mode 100644 src/assets/imgs/working_group_project_selected.png create mode 100644 src/components/form/InstallmentForm.vue create mode 100644 src/views/contractManagement/revenueContract/modules/ProjectTypeSelection.vue create mode 100644 src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue diff --git a/babel.config.js b/babel.config.js index 162a3ea..c1b783e 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,3 +1,3 @@ module.exports = { - presets: ["@vue/cli-plugin-babel/preset"], -}; + presets: ['@vue/cli-plugin-babel/preset'], +} diff --git a/src/App.vue b/src/App.vue index b809566..6dbb24c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -6,35 +6,35 @@ diff --git a/src/components/company/SelectPrincipal.vue b/src/components/company/SelectPrincipal.vue index ea5f50d..0cb0a4f 100644 --- a/src/components/company/SelectPrincipal.vue +++ b/src/components/company/SelectPrincipal.vue @@ -43,7 +43,7 @@ export default { filterOption(input, option) { return ( option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 - ); + ) } }, model: { diff --git a/src/components/dict/JDictSelectTag.vue b/src/components/dict/JDictSelectTag.vue index 6c01da3..379f1b2 100644 --- a/src/components/dict/JDictSelectTag.vue +++ b/src/components/dict/JDictSelectTag.vue @@ -21,7 +21,7 @@ import {ajaxGetDictItems,getDictItemsFromCache} from '@/api/api' export default { - name: "JDictSelectTag", + name: 'JDictSelectTag', props: { dictCode: String, placeholder: String, @@ -37,7 +37,7 @@ data() { return { dictOptions: [], - tagType:"" + tagType:'' } }, watch:{ @@ -50,8 +50,8 @@ }, created() { // console.log(this.dictCode); - if(!this.type || this.type==="list"){ - this.tagType = "select" + if(!this.type || this.type==='list'){ + this.tagType = 'select' }else{ this.tagType = this.type } @@ -62,7 +62,7 @@ getValueSting(){ // update-begin author:wangshuai date:20200601 for: 不显示placeholder的文字 ------ // 当有null或“” placeholder不显示 - return this.value != null ? this.value.toString() : undefined; + return this.value != null ? this.value.toString() : undefined // update-end author:wangshuai date:20200601 for: 不显示placeholder的文字 ------ }, }, @@ -70,7 +70,7 @@ initDictData() { //优先从缓存中读取字典配置 if(getDictItemsFromCache(this.dictCode)){ - this.dictOptions = getDictItemsFromCache(this.dictCode); + this.dictOptions = getDictItemsFromCache(this.dictCode) return } @@ -78,22 +78,22 @@ ajaxGetDictItems(this.dictCode, null).then((res) => { if (res.success) { // console.log(res.result); - this.dictOptions = res.result; + this.dictOptions = res.result } }) }, handleInput(e) { - let val; - if(this.tagType=="radio"){ + let val + if(this.tagType=='radio'){ val = e.target.value }else{ val = e } if(this.triggerChange){ - this.$emit('change', val); + this.$emit('change', val) }else{ - this.$emit('input', val); + this.$emit('input', val) } }, setCurrentDictOptions(dictOptions){ diff --git a/src/components/dict/JDictSelectUtil.js b/src/components/dict/JDictSelectUtil.js index a735f3f..06ddb88 100644 --- a/src/components/dict/JDictSelectUtil.js +++ b/src/components/dict/JDictSelectUtil.js @@ -14,18 +14,18 @@ import {getAction} from '@/api/manage' */ export async function initDictOptions(dictCode) { if (!dictCode) { - return '字典Code不能为空!'; + return '字典Code不能为空!' } //优先从缓存中读取字典配置 if(getDictItemsFromCache(dictCode)){ let res = {} - res.result = getDictItemsFromCache(dictCode); - res.success = true; - return res; + res.result = getDictItemsFromCache(dictCode) + res.success = true + return res } //获取字典数组 - let res = await ajaxGetDictItems(dictCode); - return res; + let res = await ajaxGetDictItems(dictCode) + return res } /** @@ -80,25 +80,25 @@ export function filterMultiDictText(dictOptions, text) { } if(!text || text=='null' || !dictOptions || dictOptions.length==0){ - return "" + return '' } - let re = ""; + let re = '' text = text.toString() - let arr = text.split(",") + let arr = text.split(',') dictOptions.forEach(function (option) { if(option){ for(let i=0;i t["value"] == key) + let item = getDictItemsFromCache(dictCode).filter(t => t['value'] == key) if(item && item.length>0){ - return item[0]["text"] + return item[0]['text'] } } } @@ -127,7 +127,7 @@ export async function getDictItems(dictCode, params) { //优先从缓存中读取字典配置 if(getDictItemsFromCache(dictCode)){ let desformDictItems = getDictItemsFromCache(dictCode).map(item => ({...item, label: item.text})) - return desformDictItems; + return desformDictItems } //缓存中没有，就请求后台 diff --git a/src/components/dict/JMultiSelectTag.vue b/src/components/dict/JMultiSelectTag.vue index 66f9ba9..86c04c5 100644 --- a/src/components/dict/JMultiSelectTag.vue +++ b/src/components/dict/JMultiSelectTag.vue @@ -51,13 +51,13 @@ data() { return { dictOptions: [], - tagType:"", + tagType:'', arrayValue:!this.value?[]:this.value.split(this.spliter) } }, created() { - if(!this.type || this.type==="list_multi"){ - this.tagType = "select" + if(!this.type || this.type==='list_multi'){ + this.tagType = 'select' }else{ this.tagType = this.type } @@ -66,7 +66,7 @@ }, watch:{ options: function(val){ - this.setCurrentDictOptions(val); + this.setCurrentDictOptions(val) }, dictCode:{ immediate:true, @@ -96,14 +96,14 @@ //根据字典Code, 初始化字典数组 ajaxGetDictItems(this.dictCode, null).then((res) => { if (res.success) { - this.dictOptions = res.result; + this.dictOptions = res.result } }) } }, onChange (selectedValue) { - this.$emit('change', selectedValue.join(this.spliter)); + this.$emit('change', selectedValue.join(this.spliter)) }, setCurrentDictOptions(dictOptions){ this.dictOptions = dictOptions diff --git a/src/components/dict/JSearchSelectTag.vue b/src/components/dict/JSearchSelectTag.vue index 077530b..82979c7 100644 --- a/src/components/dict/JSearchSelectTag.vue +++ b/src/components/dict/JSearchSelectTag.vue @@ -40,7 +40,7 @@ + + \ No newline at end of file diff --git a/src/components/jero/JCron.vue b/src/components/jero/JCron.vue index 39c279e..3902b25 100644 --- a/src/components/jero/JCron.vue +++ b/src/components/jero/JCron.vue @@ -8,7 +8,7 @@ diff --git a/src/components/jero/JImageUpload.vue b/src/components/jero/JImageUpload.vue index e6e66a5..64a7571 100644 --- a/src/components/jero/JImageUpload.vue +++ b/src/components/jero/JImageUpload.vue @@ -31,36 +31,36 @@ \ No newline at end of file diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue index 32d0166..4c07ae5 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue @@ -1,16 +1,231 @@ - \ No newline at end of file diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue index 83661cb..b1f4d9a 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue @@ -3,81 +3,569 @@ -
-
主体信息
-
+
+
+
主体信息
+
- + - + - + + :disabled="isSaved" + v-decorator="['signedCompany',validatorRules.signedCompany]" + @change="handleSignedCompanyChange"> - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+
+
日期节点
+
+ + + + + + + + + + + + + + + + + +
+ + + +
+
+
账款信息
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
+
+ + + +
+
+
其他信息
+
+
+ + + + + + + + + + + + + + + + + +
+
+ + + +
+
+
分期信息
+
+ +
+ + + 保存 + 取消 + + + +
+
关联项目
+ 选择项目 +
+ + + + \ No newline at end of file diff --git a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue new file mode 100644 index 0000000..2c9205c --- /dev/null +++ b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue @@ -0,0 +1,151 @@ + + + + + \ No newline at end of file diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue index f6dac86..ed47028 100644 --- a/src/views/dashboard/Analysis.vue +++ b/src/views/dashboard/Analysis.vue @@ -7,16 +7,16 @@ export default { - name: "Analysis", + name: 'Analysis', components: {}, data() { return { indexStyle: 1 - }; + } }, created() { }, methods: {} -}; +} diff --git a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue index 38a6daf..51864f6 100644 --- a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue +++ b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue @@ -192,9 +192,9 @@ export default { ) }, handleAdd() { - this.$refs.modalForm.add(); - this.$refs.modalForm.title = "新增群组"; - this.$refs.modalForm.disableSubmit = false; + this.$refs.modalForm.add() + this.$refs.modalForm.title = '新增群组' + this.$refs.modalForm.disableSubmit = false }, /** * 新增成员 @@ -202,31 +202,31 @@ export default { */ handleAddCommitteeMember(record) { record.committeeId = record.id - this.$refs.memberModalForm.add(record); - this.$refs.memberModalForm.title = "新增成员"; - this.$refs.memberModalForm.disableSubmit = false; + this.$refs.memberModalForm.add(record) + this.$refs.memberModalForm.title = '新增成员' + this.$refs.memberModalForm.disableSubmit = false }, handleDeleteMember(id) { console.log(id) if (!this.url.deleteMember) { - this.$message.error("请设置url.deleteMember属性!") + this.$message.error('请设置url.deleteMember属性!') return } - var that = this; + var that = this this.$confirm({ - title: "确认删除", - content: "确定要删除此条数据吗?", + title: '确认删除', + content: '确定要删除此条数据吗?', onOk: function () { getAction(that.url.deleteMember, {id: id}).then((res) => { if (res.success) { - that.$message.success(res.message); - that.loadData(); + that.$message.success(res.message) + that.loadData() } else { - that.$message.warning(res.message); + that.$message.warning(res.message) } - }); + }) } - }); + }) }, } } diff --git a/src/views/exception/ExceptionPage.vue b/src/views/exception/ExceptionPage.vue index 0550d5e..455b15c 100644 --- a/src/views/exception/ExceptionPage.vue +++ b/src/views/exception/ExceptionPage.vue @@ -17,7 +17,7 @@ import types from './type' export default { - name: "Exception", + name: 'Exception', props: { type: { type: String, diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue index 120cc6e..0e57a90 100644 --- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue +++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue @@ -301,23 +301,23 @@