diff --git a/package.json b/package.json index 49df7c2c9..85c8f292b 100644 --- a/package.json +++ b/package.json @@ -14,11 +14,14 @@ "axios": "^0.21.1", "babel-polyfill": "^6.26.0", "core-js": "^3.6.5", + "cross-env": "^5.0.5", "echarts": "^5.0.1", "element-ui": "^2.13.2", "es6-promise": "^4.2.8", + "increase-memory-limit": "^1.0.3", "jquery": "^3.5.1", "js-base64": "^2.6.2", + "lodash": "^4.17.21", "moment": "^2.29.1", "qs": "latest", "sortablejs": "^1.14.0", @@ -31,9 +34,7 @@ "vue-custom-scrollbar": "^1.4.4", "vue-i18n": "^8.22.4", "vue-router": "^3.2.0", - "vuex": "^3.4.0", - "increase-memory-limit": "^1.0.3", - "cross-env": "^5.0.5" + "vuex": "^3.4.0" }, "devDependencies": { "@vue/cli-plugin-babel": "~4.5.0", diff --git a/src/api/process.js b/src/api/process.js index 44ac63ddc..0a39bbd5b 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -49,7 +49,14 @@ export function inboundLiaisonDetail (data) { params: data }) } - +// 联络人分配FO详情查询 +export function queryZchgxxmscTaskDetail (data) { + return axios({ + url: '/api/lawss/activiti/queryZchgxxmscTaskDetail', + method: 'get', + params: data + }) +} // 流程保存 export function saveTask (data) { return axios({ @@ -1074,3 +1081,39 @@ export function productDeptIssue(params) { params }) } + +// 内外部会议入库 +export function processCreateMeeting (data) { + return axios({ + url: '/api/lawss/meeting/processCreateMeeting', + method: 'post', + data + }) +} + +// 政策课题入会 +export function processLawsTopicMembership (data) { + return axios({ + url: '/api/lawss/sarLawsTopic/processLawsTopicMembership', + method: 'post', + data + }) +} + +// 政策课题参会 +export function processLawsTopicParticipation (data) { + return axios({ + url: '/api/lawss/sarLawsTopic/processLawsTopicParticipation', + method: 'post', + data + }) +} + +// 政策法规资料入库流程 +export function processLawsRegulatoryInformation (data) { + return axios({ + url: '/api/lawss/sarLawsTopic/processLawsRegulatoryInformation', + method: 'post', + data + }) +} diff --git a/src/common/axios/index.js b/src/common/axios/index.js index 2957a7291..8fd737999 100644 --- a/src/common/axios/index.js +++ b/src/common/axios/index.js @@ -635,6 +635,34 @@ export default { }) }, + // formData + _put (url, params = {}, config = {}) { + var _formData = formData(params) + // 参数包含this + let _this = config._this || false + // 参数包含loading + let loading = config.loading || false + // 是否显示操作提示 + let showTips = config.showTips === undefined ? true : config.showTips + if (_this && loading) { _this[loading] = true } + + return new Promise((resolve,reject) => { + _axios.put(api() + url + '?' + new Date().getTime(), _formData).then(res => { + if (res.data.ok !== undefined && showTips) { + let type = res.data.ok ? 'success' : 'warning' + if (_this && res.data.message !== '' && res.data.message !== null) { + Message[type](res.data.message) + } + } + resolve(res.data) + }).catch(err => { + reject(err) + }).finally(()=>{ + if (_this && loading) { _this[loading] = false } + }) + }) + }, + _downloadFile (url, params = {}, method = 'get', fileName = '导出文件') { _axios({ method, diff --git a/src/components/CustomFormComponents/DatePicker.vue b/src/components/CustomFormComponents/DatePicker.vue index 665e1b03b..db9fb75cd 100644 --- a/src/components/CustomFormComponents/DatePicker.vue +++ b/src/components/CustomFormComponents/DatePicker.vue @@ -18,7 +18,7 @@ clearable :editable="true" :disabled="disabled" - :placeholder="placeholder" + :placeholder="placeholder || defaultPlaceholder" @input="handleChange" > @@ -49,10 +49,13 @@ export default { span: { type: Number, default: 24 + }, + placeholder: { + type: String } }, computed: { - placeholder () { + defaultPlaceholder () { return `请选择${this.config.attrName}` }, showMessage () { diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue index f0488b990..674832417 100644 --- a/src/components/CustomFormComponents/File.vue +++ b/src/components/CustomFormComponents/File.vue @@ -4,6 +4,7 @@ 文件{file.name}格式不正确,请上传{this.allowType.join('、')}文件, + type: 'error' + }) return false } // 判断文件上传大小 - if (file.size / 1024 / 1024 > 200) {// eslint-disable-line - this.$message.error('文件' + file.name + '大小不超过200M') + if (file.size / 1024 / 1024 > this.size) {// eslint-disable-line + this.$message.error('文件' + file.name + `超过${ this.size }M`) return false } return true diff --git a/src/components/CustomFormComponents/Textarea.vue b/src/components/CustomFormComponents/Textarea.vue index 1e6805977..c0887a106 100644 --- a/src/components/CustomFormComponents/Textarea.vue +++ b/src/components/CustomFormComponents/Textarea.vue @@ -3,6 +3,7 @@ + +
+ + + + + + + + + + + + + + + + + + + + + 流程列表加载中 +
+ + + + + diff --git a/src/components/hzwlComponents/DataRangePickerFormItem.vue b/src/components/hzwlComponents/DataRangePickerFormItem.vue new file mode 100644 index 000000000..4ac8e172a --- /dev/null +++ b/src/components/hzwlComponents/DataRangePickerFormItem.vue @@ -0,0 +1,109 @@ + + + + + diff --git a/src/components/hzwlComponents/DatePickerFormItem.vue b/src/components/hzwlComponents/DatePickerFormItem.vue new file mode 100644 index 000000000..fd376c2e6 --- /dev/null +++ b/src/components/hzwlComponents/DatePickerFormItem.vue @@ -0,0 +1,64 @@ + + + + + diff --git a/src/components/hzwlComponents/DatePickerGroupFormItem.vue b/src/components/hzwlComponents/DatePickerGroupFormItem.vue new file mode 100644 index 000000000..da6e9abbb --- /dev/null +++ b/src/components/hzwlComponents/DatePickerGroupFormItem.vue @@ -0,0 +1,162 @@ + + + + + + diff --git a/src/components/hzwlComponents/DepartmentFormItem.vue b/src/components/hzwlComponents/DepartmentFormItem.vue new file mode 100644 index 000000000..1aea491b6 --- /dev/null +++ b/src/components/hzwlComponents/DepartmentFormItem.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/src/components/hzwlComponents/InputForStandardsForLaws.vue b/src/components/hzwlComponents/InputForStandardsForLaws.vue new file mode 100644 index 000000000..d3f9bf30e --- /dev/null +++ b/src/components/hzwlComponents/InputForStandardsForLaws.vue @@ -0,0 +1,349 @@ + + + + + diff --git a/src/components/hzwlComponents/InputFormItem.vue b/src/components/hzwlComponents/InputFormItem.vue new file mode 100644 index 000000000..5d72a1da0 --- /dev/null +++ b/src/components/hzwlComponents/InputFormItem.vue @@ -0,0 +1,89 @@ + + + + + diff --git a/src/components/hzwlComponents/ReceiptDescription.vue b/src/components/hzwlComponents/ReceiptDescription.vue new file mode 100644 index 000000000..e3ebdd552 --- /dev/null +++ b/src/components/hzwlComponents/ReceiptDescription.vue @@ -0,0 +1,56 @@ + + + + + diff --git a/src/components/hzwlComponents/SelectFormItem.vue b/src/components/hzwlComponents/SelectFormItem.vue new file mode 100644 index 000000000..91e8bb389 --- /dev/null +++ b/src/components/hzwlComponents/SelectFormItem.vue @@ -0,0 +1,99 @@ + + + + + diff --git a/src/components/hzwlComponents/SelectMultipleFormItem.vue b/src/components/hzwlComponents/SelectMultipleFormItem.vue new file mode 100644 index 000000000..571dbd025 --- /dev/null +++ b/src/components/hzwlComponents/SelectMultipleFormItem.vue @@ -0,0 +1,80 @@ + + + + + diff --git a/src/components/hzwlComponents/TableFormItem.vue b/src/components/hzwlComponents/TableFormItem.vue new file mode 100644 index 000000000..ed0b7d10f --- /dev/null +++ b/src/components/hzwlComponents/TableFormItem.vue @@ -0,0 +1,101 @@ + + + + + diff --git a/src/components/hzwlComponents/TextareaFormItem.vue b/src/components/hzwlComponents/TextareaFormItem.vue new file mode 100644 index 000000000..276bf89c8 --- /dev/null +++ b/src/components/hzwlComponents/TextareaFormItem.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/components/hzwlComponents/TimeLineFormItem.vue b/src/components/hzwlComponents/TimeLineFormItem.vue new file mode 100644 index 000000000..9808c5e9a --- /dev/null +++ b/src/components/hzwlComponents/TimeLineFormItem.vue @@ -0,0 +1,96 @@ + + + + + diff --git a/src/components/hzwlComponents/UploadFormItem.vue b/src/components/hzwlComponents/UploadFormItem.vue new file mode 100644 index 000000000..2765699e3 --- /dev/null +++ b/src/components/hzwlComponents/UploadFormItem.vue @@ -0,0 +1,209 @@ + + + + + diff --git a/src/components/hzwlComponents/exportDialog.vue b/src/components/hzwlComponents/exportDialog.vue new file mode 100644 index 000000000..8dddf379a --- /dev/null +++ b/src/components/hzwlComponents/exportDialog.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/src/components/hzwlComponents/importZip.vue b/src/components/hzwlComponents/importZip.vue new file mode 100644 index 000000000..d2bd27df7 --- /dev/null +++ b/src/components/hzwlComponents/importZip.vue @@ -0,0 +1,106 @@ + + + + + diff --git a/src/components/hzwlComponents/personFormItem.vue b/src/components/hzwlComponents/personFormItem.vue new file mode 100644 index 000000000..df2cb6a4d --- /dev/null +++ b/src/components/hzwlComponents/personFormItem.vue @@ -0,0 +1,105 @@ + + + + + diff --git a/src/components/mechanismTree/index.vue b/src/components/mechanismTree/index.vue index fe409a18e..480236ddf 100644 --- a/src/components/mechanismTree/index.vue +++ b/src/components/mechanismTree/index.vue @@ -6,6 +6,7 @@ :visible.sync="isVisible2" :wrapperClosable="false" @close="handleTreeDrawerCancel" + append-to-body size="400px"> diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue index a12c91af1..95cc0e074 100644 --- a/src/components/roleTree/index.vue +++ b/src/components/roleTree/index.vue @@ -1,11 +1,13 @@ + + diff --git a/src/pages/details/otherLawsStandDetails/index.vue b/src/pages/details/otherLawsStandDetails/index.vue index 5298d9ff3..cb92f72ce 100644 --- a/src/pages/details/otherLawsStandDetails/index.vue +++ b/src/pages/details/otherLawsStandDetails/index.vue @@ -3,7 +3,7 @@
- {{sarStandardsInfoEO.lawsNumber}}-{{sarStandardsInfoEO.lawsYear}} 《{{sarStandardsInfoEO.lawsName}}》 政策详情 + {{sarStandardsInfoEO.lawsNo}}-{{sarStandardsInfoEO.lawsYear}} 《{{sarStandardsInfoEO.lawsName}}》 政策详情
@@ -40,27 +40,34 @@