From b76d2ff5ca4c9eb727266da636c7ccfad1038094 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 23 Jan 2024 11:39:36 +0800 Subject: [PATCH 01/63] =?UTF-8?q?feature(=E5=B7=A5=E4=BD=9C=E4=B8=AD?= =?UTF-8?q?=E5=BF=83):=20=E2=80=9C=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E7=9B=B8=E5=85=B3=E6=B5=81=E7=A8=8B=E2=80=9D=E6=94=B9?= =?UTF-8?q?=E6=88=90=E2=80=9C=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?/=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/processList/tabComponents/newProcess/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue index 813f986f9..97c9607b3 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue @@ -312,7 +312,7 @@
-

标准化活动相关流程

 +

标准化活动/政策课题相关流程
From b42d9182129ccaee0cbee068948cd8862528e825 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 23 Jan 2024 11:41:47 +0800 Subject: [PATCH 02/63] =?UTF-8?q?style:=20=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/components/editDrawer.vue | 290 +++++++++------- src/pages/policyRegulation/meeting/index.vue | 310 ++++++++++-------- 2 files changed, 345 insertions(+), 255 deletions(-) diff --git a/src/pages/policyRegulation/meeting/components/editDrawer.vue b/src/pages/policyRegulation/meeting/components/editDrawer.vue index 3027ae6ee..c2141b0c8 100644 --- a/src/pages/policyRegulation/meeting/components/editDrawer.vue +++ b/src/pages/policyRegulation/meeting/components/editDrawer.vue @@ -1,87 +1,101 @@ @@ -187,10 +241,10 @@ import CustomDatePick from '@/components/CustomFormComponents/DatePicker' import CustomFile from '@/components/CustomFormComponents/File' import CustomTextarea from '@/components/CustomFormComponents/Textarea' -import TopicsTable from "./TopicsTable"; +import TopicsTable from './TopicsTable'; export default { - name: "editDrawer", + name: 'EditDrawer', components: { CustomDatePick, CustomFile, @@ -213,52 +267,52 @@ export default { type: Object } }, - data (){ + data () { const rules = { meetingName: [ - {required: true, type: 'string', message: '会议名称不能为空', trigger: 'change'}, - {type: 'string', max: 500, message: '会议名称不能超过500个字符', trigger: 'change'} + { required: true, type: 'string', message: '会议名称不能为空', trigger: 'change' }, + { type: 'string', max: 500, message: '会议名称不能超过500个字符', trigger: 'change' } ], meetingOrganizer: [ - {required: true, type: 'string', message: '会议主办单位不能为空', trigger: 'change'}, - {type: 'string', max: 500, message: '会议主办单位不能超过500个字符', trigger: 'change'} + { required: true, type: 'string', message: '会议主办单位不能为空', trigger: 'change' }, + { type: 'string', max: 500, message: '会议主办单位不能超过500个字符', trigger: 'change' } ], meetingTime: [ - {required: true, message: '会议时间不能为空', trigger: 'change'} + { required: true, message: '会议时间不能为空', trigger: 'change' } ], meetingAddress: [ - {required: true, type: 'string', message: '会议地点不能为空', trigger: 'change'}, - {type: 'string', max: 500, message: '会议地点不能超过500个字符', trigger: 'change'} + { required: true, type: 'string', message: '会议地点不能为空', trigger: 'change' }, + { type: 'string', max: 500, message: '会议地点不能超过500个字符', trigger: 'change' } ], participants: [ - {required: true, type: 'string', message: '参会人员不能为空', trigger: 'change'}, - {type: 'string', max: 500, message: '参会人员不能超过500个字符', trigger: 'change'} + { required: true, type: 'string', message: '参会人员不能为空', trigger: 'change' }, + { type: 'string', max: 500, message: '参会人员不能超过500个字符', trigger: 'change' } ], meetingContent: [ - {required: true, type: 'string', message: '会议主要内容不能为空', trigger: 'change'}, - {type: 'string', max: 500, message: '会议主要内容不能超过500个字符', trigger: 'change'} + { required: true, type: 'string', message: '会议主要内容不能为空', trigger: 'change' }, + { type: 'string', max: 500, message: '会议主要内容不能超过500个字符', trigger: 'change' } ], firstMeetingType: [ - {required: true, message: '1级会议分类不能为空', trigger: 'change'} + { required: true, message: '1级会议分类不能为空', trigger: 'change' } ], secondMeetingType: [ - {required: true, message: '2级会议分类不能为空', trigger: 'change'} + { required: true, message: '2级会议分类不能为空', trigger: 'change' } ], agendaName: [ - {required: true, type: 'string', message: '议题名称不能为空', trigger: 'change'}, - {type: 'string', max: 500, message: '议题名称不能超过500个字符', trigger: 'change'} + { required: true, type: 'string', message: '议题名称不能为空', trigger: 'change' }, + { type: 'string', max: 500, message: '议题名称不能超过500个字符', trigger: 'change' } ], reporter: [ - {required: true, type: 'string', message: '汇报人不能为空', trigger: 'change'}, - {type: 'string', max: 500, message: '汇报人不能超过500个字符', trigger: 'change'} + { required: true, type: 'string', message: '汇报人不能为空', trigger: 'change' }, + { type: 'string', max: 500, message: '汇报人不能超过500个字符', trigger: 'change' } ], reportingUnit: [ - {required: true, type: 'string', message: '汇报人单位不能为空', trigger: 'change'}, - {type: 'string', max: 500, message: '汇报人单位不能超过500个字符', trigger: 'change'} + { required: true, type: 'string', message: '汇报人单位不能为空', trigger: 'change' }, + { type: 'string', max: 500, message: '汇报人单位不能超过500个字符', trigger: 'change' } ], agendaContent: [ - {required: true, type: 'string', message: '议题主要内容不能为空', trigger: 'change'}, - {type: 'string', max: 500, message: '议题主要内容不能超过500个字符', trigger: 'change'} + { required: true, type: 'string', message: '议题主要内容不能为空', trigger: 'change' }, + { type: 'string', max: 500, message: '议题主要内容不能超过500个字符', trigger: 'change' } ], } const form = { @@ -288,7 +342,7 @@ export default { reloadForm: true, api: { add: 'lawss/insideOutsideMeeting/addMeetingInfo', - delete :'lawss/insideOutsideMeeting/deleteMeetingInfo', + delete: 'lawss/insideOutsideMeeting/deleteMeetingInfo', update: 'lawss/insideOutsideMeeting/updateMeetingInfo' } } @@ -311,10 +365,10 @@ export default { reportingUnit: '', agendaContent: '' } - this.form.meetingTopicList = [...this.form.meetingTopicList, meetingTopicItem] + this.form.meetingTopicList = [ ...this.form.meetingTopicList, meetingTopicItem ] }, removeMeetingTopic (index) { - let res = [] + const res = [] this.form.meetingTopicList.forEach((item, i) => { if (i !== index) { res.push(item) diff --git a/src/pages/policyRegulation/meeting/index.vue b/src/pages/policyRegulation/meeting/index.vue index cd492d751..84b07fb5c 100644 --- a/src/pages/policyRegulation/meeting/index.vue +++ b/src/pages/policyRegulation/meeting/index.vue @@ -4,200 +4,236 @@
- + - + - + v-model="searchForm.meetingTimeBegin" + value-format="yyyy-MM-dd" + format="yyyy-MM-dd" + type="date" + clearable + :editable="true" + placeholder="选择开始时间" + /> - + v-model="searchForm.meetingTimeEnd" + value-format="yyyy-MM-dd" + format="yyyy-MM-dd" + type="date" + clearable + :editable="true" + placeholder="选择结束时间" + /> + v-btn-permission="'520f8524252e76e751a883a0a8a8615c'" + type="primary" + size="mini" + class="common-button-primary" + @click="onSearch" + > 查询 清空 + v-btn-permission="'6a9483964b7b49dd473ef9e6fd4a649e'" + size="mini" + class="common-button-default" + @click="onClear" + > + 清空 高级检索 + v-btn-permission="'7f98cd8b424d6ad83b1770a6576993fc'" + size="mini" + type="primary" + class="common-button-primary" + @click="advancedSearch" + > + 高级检索
- 导出 + + 导出 - 导入 + + 导入 - 模板下载 + + 模板下载 - 新增 + + 新增
- + type="selection" + width="55" + align="center" + /> + type="index" + width="55" + label="序号" + align="center" + > - + show-overflow-tooltip + prop="meetingOrganizer" + label="会议主办单位" + align="center" + sortable="custom" + /> - + show-overflow-tooltip + prop="meetingTime" + label="会议时间" + align="center" + sortable="custom" + /> - + show-overflow-tooltip + prop="meetingAddress" + label="会议地点" + align="center" + sortable="custom" + /> - + show-overflow-tooltip + prop="agendaNameStr" + label="议题名称" + align="center" + sortable="custom" + /> - + 数据获取中...
- + - + - + - +
@@ -457,4 +490,11 @@ export default { background: #fff; z-index: 999; } +.move-icon { + font-size: 32px; + cursor: pointer +} +.move-icon:hover { + color: #409EFF; +} From dfd3cad0464a286621e23cf1f75e66d7c658e15d Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 23 Jan 2024 15:35:55 +0800 Subject: [PATCH 04/63] =?UTF-8?q?style:=20=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/components/ProcessTitle.vue | 14 +- .../creatProcess/policyMeetings/step1.vue | 148 ++++++++------- .../creatProcess/policyMeetings/step2.vue | 168 ++++++++++-------- 3 files changed, 178 insertions(+), 152 deletions(-) diff --git a/src/pages/processCenter/pages/components/ProcessTitle.vue b/src/pages/processCenter/pages/components/ProcessTitle.vue index 30951677b..916c9baa2 100644 --- a/src/pages/processCenter/pages/components/ProcessTitle.vue +++ b/src/pages/processCenter/pages/components/ProcessTitle.vue @@ -1,15 +1,15 @@ diff --git a/src/pages/processCenter/pages/creatProcess/policyMeetings/step1.vue b/src/pages/processCenter/pages/creatProcess/policyMeetings/step1.vue index 33f83a923..fa4a81079 100644 --- a/src/pages/processCenter/pages/creatProcess/policyMeetings/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/policyMeetings/step1.vue @@ -30,23 +30,40 @@
@@ -338,6 +355,10 @@ export default { async submit () { this.footerLoading = true + this.form.meetingTopicList.forEach((item, index) => { + item.sort = index + }) + const json = Object.assign(this.form, this.roleForm); let completeTaskQuery = {} if (this.$route.query.taskIds) { @@ -403,7 +424,21 @@ export default { if (res.ok) { this.dict = res.data } - } + }, + moveOrder (index, type) { + if (type === 'top') { + const obj1 = this.form.meetingTopicList[index] + const obj2 = this.form.meetingTopicList[index - 1] + this.$set(this.form.meetingTopicList, index - 1, obj1) + this.$set(this.form.meetingTopicList, index, obj2) + } + if (type === 'bottom') { + const obj1 = this.form.meetingTopicList[index] + const obj2 = this.form.meetingTopicList[index + 1] + this.$set(this.form.meetingTopicList, index + 1, obj1) + this.$set(this.form.meetingTopicList, index, obj2) + } + }, } } @@ -444,4 +479,11 @@ export default { min-height: 100%; } } +.move-icon { + font-size: 32px; + cursor: pointer +} +.move-icon:hover { + color: #409EFF; +} diff --git a/src/pages/processCenter/pages/creatProcess/policyMeetings/step2.vue b/src/pages/processCenter/pages/creatProcess/policyMeetings/step2.vue index 0818c1cd2..86da73597 100644 --- a/src/pages/processCenter/pages/creatProcess/policyMeetings/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/policyMeetings/step2.vue @@ -29,7 +29,7 @@
+ + diff --git a/src/pages/policyRegulation/standardTrackingList/PersonInfo.vue b/src/pages/policyRegulation/standardTrackingList/PersonInfo.vue new file mode 100644 index 000000000..40312ed6d --- /dev/null +++ b/src/pages/policyRegulation/standardTrackingList/PersonInfo.vue @@ -0,0 +1,133 @@ + + + + + diff --git a/src/pages/policyRegulation/standardTrackingList/addModel.vue b/src/pages/policyRegulation/standardTrackingList/addModel.vue new file mode 100644 index 000000000..c72df084f --- /dev/null +++ b/src/pages/policyRegulation/standardTrackingList/addModel.vue @@ -0,0 +1,218 @@ + + + + + diff --git a/src/pages/policyRegulation/standardTrackingList/index.vue b/src/pages/policyRegulation/standardTrackingList/index.vue index 12b8507a8..ac724ee72 100644 --- a/src/pages/policyRegulation/standardTrackingList/index.vue +++ b/src/pages/policyRegulation/standardTrackingList/index.vue @@ -1,27 +1,280 @@ From ebe7df84d556667a2e42ffa7701fbe0055fc0f05 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 30 Jan 2024 13:38:54 +0800 Subject: [PATCH 11/63] =?UTF-8?q?feature:=20=E6=A0=87=E5=87=86=E8=B7=9F?= =?UTF-8?q?=E8=B8=AA=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzwlComponents/UploadFormItem.vue | 8 ++ .../standardTrackingList/Inventory.vue | 13 +- .../standardTrackingList/addModel.vue | 29 ++++- .../standardTrackingList/index.vue | 111 +++++++++++++++++- 4 files changed, 145 insertions(+), 16 deletions(-) diff --git a/src/components/hzwlComponents/UploadFormItem.vue b/src/components/hzwlComponents/UploadFormItem.vue index 7515ca3c9..3c5371ae9 100644 --- a/src/components/hzwlComponents/UploadFormItem.vue +++ b/src/components/hzwlComponents/UploadFormItem.vue @@ -123,6 +123,11 @@ export default { FileList: [], // 用于回显 } }, + watch: { + ids (val) { + this.initFileList() + }, + }, created () { this.initFileList() }, @@ -143,6 +148,9 @@ export default { } this.fileList = fileList this.FileList = fileList + } else { + this.fileList = [] + this.FileList = [] } }, beforeUpload (file) { diff --git a/src/pages/policyRegulation/standardTrackingList/Inventory.vue b/src/pages/policyRegulation/standardTrackingList/Inventory.vue index c03872c65..ecf58e33b 100644 --- a/src/pages/policyRegulation/standardTrackingList/Inventory.vue +++ b/src/pages/policyRegulation/standardTrackingList/Inventory.vue @@ -19,7 +19,7 @@ [] } @@ -151,7 +151,7 @@ export default { this.selectedList = selection }, dragIn ({ list, type }) { - if (list.some(item => this.data.some(i => i.id === item.id))) { + if (list.some(item => this.value.some(i => i.lawId === item.id))) { this.$message.warning('请勿重复添加数据') return } @@ -171,7 +171,7 @@ export default { break } return { - id: item.id, + lawId: item.id, dataSource: type, lawCode, lawName, @@ -180,7 +180,7 @@ export default { implRequire: '' } }) - this.data.push(...newList) + this.$emit('input', [ ...this.value, ...newList ]) }, handleDeleteStandard () { if (this.selectedList.length === 0) { @@ -194,7 +194,8 @@ export default { confirmButtonClass: 'common-button-primary', roundButton: true }).then(() => { - this.data = this.data.filter(item => !this.selectedList.some(i => i.id === item.id)) + const list = this.value.filter(item => !this.selectedList.some(i => i.id === item.id)) + this.$emit('input', list) }) }, getDicTypeListCode () { diff --git a/src/pages/policyRegulation/standardTrackingList/addModel.vue b/src/pages/policyRegulation/standardTrackingList/addModel.vue index c72df084f..21f598b40 100644 --- a/src/pages/policyRegulation/standardTrackingList/addModel.vue +++ b/src/pages/policyRegulation/standardTrackingList/addModel.vue @@ -30,8 +30,9 @@ - + + 数据获取中...
@@ -130,14 +131,18 @@ export default { showDrawer: false, isSubmit: false, form, + initForm: JSON.parse(JSON.stringify(form)), roleForm, + initRoleForm: JSON.parse(JSON.stringify(roleForm)), rules, roleRules, activeName: '1', url: { save: 'standardTrackingCheckList/save', update: 'standardTrackingCheckList/update', - } + getById: 'standardTrackingCheckList/getById', + }, + loading: false, } }, methods: { @@ -146,11 +151,25 @@ export default { }, add () { this.title = '新增' + // this.form = JSON.parse(JSON.stringify(this.initForm)) + Object.keys(this.initForm).forEach(key => this.form[key] = this.initForm[key]) + this.roleForm = JSON.parse(JSON.stringify(this.initRoleForm)) + this.$nextTick(() => { + this.$refs.form.clearValidate() + this.$refs['roleForm'].$refs['userForm'].clearValidate() + }) this.showDrawer = true }, - edit () { + edit (id) { this.title = '编辑' this.showDrawer = true + const config = { _this: this, loading: 'loading' } + this.$http._getData(this.url.getById, { checklistId: id }, config).then(res => { + if (res.ok) { + this.form = res.data + this.roleForm = res.data.roleForm + } + }) }, onSubmit () { if (this.form.issueTrackList.length === 0) { @@ -164,14 +183,16 @@ export default { return this.$message.warning('请完善人员信息'); const url = this.title === '新增' ? this.url.save : this.url.update + const method = this.title === '新增' ? '_postData' : '_putData' const form = Object.assign(this.form, { roleForm: this.roleForm }) const config = { _this: this, loading: 'isSubmit', } - this.$http._postData(url, form, config).then(res => { + this.$http[method](url, form, config).then(res => { if (res.ok) { this.$message.success('操作成功') + this.$emit('ok') this.showDrawer = false } else { this.$message.error(res.message) diff --git a/src/pages/policyRegulation/standardTrackingList/index.vue b/src/pages/policyRegulation/standardTrackingList/index.vue index ac724ee72..3dabb7280 100644 --- a/src/pages/policyRegulation/standardTrackingList/index.vue +++ b/src/pages/policyRegulation/standardTrackingList/index.vue @@ -55,30 +55,42 @@ + 编辑 + + 模板下载 导入 导出 批量删除 流程下发 @@ -161,21 +173,42 @@ label="流程状态" align="center" sortable="custom" - /> + > + + 数据获取中...
- + + + + + + +
+ 取消 + 确定 +
+
+ + diff --git a/src/pages/policyRegulation/standardTrackingList/index.vue b/src/pages/policyRegulation/standardTrackingList/index.vue index ff89d03e9..4e9a2769b 100644 --- a/src/pages/policyRegulation/standardTrackingList/index.vue +++ b/src/pages/policyRegulation/standardTrackingList/index.vue @@ -169,7 +169,7 @@ sortable="custom" > + @@ -222,6 +223,7 @@ diff --git a/src/pages/policyRegulation/standardTrackingList/addModel.vue b/src/pages/policyRegulation/standardTrackingList/addModel.vue index bf310e791..fa6b49dd8 100644 --- a/src/pages/policyRegulation/standardTrackingList/addModel.vue +++ b/src/pages/policyRegulation/standardTrackingList/addModel.vue @@ -168,6 +168,7 @@ export default { }, add () { this.title = '新增' + this.disabled = false // this.form = JSON.parse(JSON.stringify(this.initForm)) Object.keys(this.initForm).forEach(key => this.form[key] = this.initForm[key]) this.roleForm = JSON.parse(JSON.stringify(this.initRoleForm)) @@ -250,9 +251,16 @@ export default { .el-form-item__content{ line-height: 50px; } + .el-input.is-disabled .el-input__inner { + background-color: transparent; + border-color: #E4E7ED; + color: #666; + cursor: not-allowed; + } } .form-item-first { /deep/ .el-input__inner{ + padding-left: 0; border: none; } } From 9862b515716da110bca87909727a81a7073d2cd6 Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 31 Jan 2024 13:52:11 +0800 Subject: [PATCH 19/63] =?UTF-8?q?feature(=E6=A0=87=E5=87=86=E8=B7=9F?= =?UTF-8?q?=E8=B8=AA=E6=B8=85=E5=8D=95):=20=E6=9F=A5=E8=AF=A2=E6=A1=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E7=9C=8B=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzwlComponents/StandardListDrawer.vue | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/components/hzwlComponents/StandardListDrawer.vue b/src/components/hzwlComponents/StandardListDrawer.vue index e40d62fd9..36cd47d7f 100644 --- a/src/components/hzwlComponents/StandardListDrawer.vue +++ b/src/components/hzwlComponents/StandardListDrawer.vue @@ -655,6 +655,25 @@ export default { selectionChange (selection) { this.selectedList = selection }, + // 点击查看 + handlePreview (item) { + let name = '', id = item.id, pageType = '' + if (item.standType === 'INLAND') { + name = 'OtherStandardDetails' + pageType = 'INLAND_STAND' + }else if (item.standType === 'FOREIGN') { + name = 'OtherStandardDetails' + pageType = 'FOREIGN_STAND' + }else if (item.country !== undefined) { + name = 'OtherLawsStandDetails' + pageType = 'LAWS_STAND' + } else { + name = 'OtherBussStandardDetails' + pageType = 'BUSINESS_STAND' + } + const routeUrl = this.$router.resolve({ name, params: { id, pageType } }) + window.open(routeUrl.href, '_blank') + }, onDrag () { this.$emit('dragIn', { list: this.selectedList, From 1d1c07a4fab2afe908b4ad143bf6886fdde70437 Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 31 Jan 2024 13:54:28 +0800 Subject: [PATCH 20/63] =?UTF-8?q?style:=20=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../creatProcess/policyConsultation/index.vue | 1753 +++++++++-------- 1 file changed, 912 insertions(+), 841 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue index f17fd2831..d4a97668f 100644 --- a/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue +++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue @@ -1,413 +1,485 @@ From a94458409827ae9e96b585d83e5a56e73fb2bcf2 Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Wed, 10 Apr 2024 14:24:50 +0800 Subject: [PATCH 44/63] =?UTF-8?q?BUG=2083405,=E6=A0=87=E5=87=86=E8=B7=9F?= =?UTF-8?q?=E8=B8=AA=E6=B8=85=E5=8D=95--=E6=B5=81=E7=A8=8B=E4=B8=8B?= =?UTF-8?q?=E5=8F=91--=E6=8F=90=E7=A4=BA=E8=AF=AD=E6=98=AF=E7=A9=BA?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/policyRegulation/standardTrackingList/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/policyRegulation/standardTrackingList/index.vue b/src/pages/policyRegulation/standardTrackingList/index.vue index 8ed6492de..194f60112 100644 --- a/src/pages/policyRegulation/standardTrackingList/index.vue +++ b/src/pages/policyRegulation/standardTrackingList/index.vue @@ -427,7 +427,7 @@ export default { const config = { _this: this, loading: 'processDistributionLoading' } this.$http._post(this.url.processDistribution, this.processDistributionForm, config).then(res => { if (res.ok) { - this.$message.success(res.data) + this.$message.success('操作成功') this.visible = false this.getData() } else { From d002bc085a937c48d4ac29037ef24c00ca21d1e1 Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Wed, 10 Apr 2024 15:52:28 +0800 Subject: [PATCH 45/63] =?UTF-8?q?=E4=BF=AE=E6=94=B9=2083392=EF=BC=8C?= =?UTF-8?q?=E5=86=85=E5=A4=96=E9=83=A8=E4=BC=9A=E8=AE=AE--=E6=96=B0?= =?UTF-8?q?=E5=A2=9E/=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2--=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E8=AE=AE=E9=A2=98=E7=9A=84=E7=A7=BB=E5=8A=A8=E6=B2=A1?= =?UTF-8?q?=E6=8A=8A=E8=AE=AE=E9=A2=98=E6=9D=90=E6=96=99=E5=B8=A6=E8=BF=87?= =?UTF-8?q?=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomFormComponents/File.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue index 9633e1d1f..9b3f3e993 100644 --- a/src/components/CustomFormComponents/File.vue +++ b/src/components/CustomFormComponents/File.vue @@ -212,10 +212,11 @@ export default { }, watch: { value: { - handler(val) { - if (this.showFileModel) { - this.getShowFileList() - } + handler () { + this.getShowFileList() + // if (this.showFileModel) { + // this.getShowFileList() + // } } } }, From 4d22be70f5b490fd0ccd108d365d450a4b1e646d Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Wed, 10 Apr 2024 17:07:34 +0800 Subject: [PATCH 46/63] =?UTF-8?q?BUG=2083392=EF=BC=8C=E5=86=85=E5=A4=96?= =?UTF-8?q?=E9=83=A8=E4=BC=9A=E8=AE=AE--=E6=96=B0=E5=A2=9E/=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2--=E4=BC=9A=E8=AE=AE=E8=AE=AE?= =?UTF-8?q?=E9=A2=98=E7=9A=84=E7=A7=BB=E5=8A=A8=E6=B2=A1=E6=8A=8A=E8=AE=AE?= =?UTF-8?q?=E9=A2=98=E6=9D=90=E6=96=99=E5=B8=A6=E8=BF=87=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomFormComponents/File.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue index 9b3f3e993..c29af344a 100644 --- a/src/components/CustomFormComponents/File.vue +++ b/src/components/CustomFormComponents/File.vue @@ -541,6 +541,7 @@ export default { */ getShowFileList() { return new Promise((resolve, reject) => { + this.showFileList = [] if (this.value && this.value !== '') { let paramefile = this.value if (paramefile.charAt(paramefile.length - 1) === ',') { From 1fa8a724727dbf39737d6544dd5b228d80384242 Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Thu, 11 Apr 2024 09:14:29 +0800 Subject: [PATCH 47/63] =?UTF-8?q?=E4=BF=AE=E6=94=B9=2083427=EF=BC=8C?= =?UTF-8?q?=E6=AD=A5=E9=AA=A43.=E5=8B=BE=E9=80=89=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E7=BC=96=E8=BE=91=EF=BC=8C=E5=8F=91=E7=8E=B0=E6=AD=A5=E9=AA=A4?= =?UTF-8?q?2=E7=BB=B4=E6=8A=A4=E7=9A=84=E4=BA=A7=E5=93=81=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=92=8C=E5=AE=9E=E6=96=BD=E8=A6=81=E6=B1=82=EF=BC=8C?= =?UTF-8?q?=E4=BC=9A=E6=9C=89=E4=B8=80=E7=A7=92=E9=97=AA=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E8=BF=98=E6=98=AF=E5=95=A5=EF=BC=9F=E4=B8=80=E7=A7=92=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=E5=B0=B1=E5=9B=9E=E6=98=BE=E6=AD=A3=E5=B8=B8=E4=BA=86?= =?UTF-8?q?=EF=BC=8C=E5=8F=8D=E6=AD=A3=E8=BF=98=E6=8C=BA=E6=98=8E=E6=98=BE?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../policyRegulation/standardTrackingList/Inventory.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/policyRegulation/standardTrackingList/Inventory.vue b/src/pages/policyRegulation/standardTrackingList/Inventory.vue index bd4df4dca..7a503e7e3 100644 --- a/src/pages/policyRegulation/standardTrackingList/Inventory.vue +++ b/src/pages/policyRegulation/standardTrackingList/Inventory.vue @@ -1,5 +1,6 @@