Browse Source

接口参数问题修复

master
aBin 4 years ago
parent
commit
f8aec33069
  1. 162
      package-lock.json
  2. 7
      src/App.vue
  3. 203
      src/components/Activity/ActivityAdd.vue
  4. 226
      src/components/Activity/ActivityEdit.vue
  5. 6
      src/components/Policy/PolicyAdd.vue
  6. 46
      src/components/Policy/PolicyDate.vue
  7. 6
      src/components/Policy/PolicyEdit.vue
  8. 6
      src/components/Policy/PolicySearch.vue
  9. 2
      src/views/CooperativePartner/CooperativePartner.vue
  10. 16
      src/views/InnovativeAchievements/InnovativeAchievements.vue
  11. 19
      src/views/UserManage/UserManage.vue

162
package-lock.json

@ -1808,6 +1808,16 @@
"integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=", "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
"dev": true "dev": true
}, },
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"cacache": { "cacache": {
"version": "13.0.1", "version": "13.0.1",
"resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz?cache=0&sync_timestamp=1594427999421&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-13.0.1.tgz", "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz?cache=0&sync_timestamp=1594427999421&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-13.0.1.tgz",
@ -1840,6 +1850,34 @@
"integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA=", "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA=",
"dev": true "dev": true
}, },
"chalk": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true,
"optional": true
},
"css-loader": { "css-loader": {
"version": "3.6.0", "version": "3.6.0",
"resolved": "https://registry.npm.taobao.org/css-loader/download/css-loader-3.6.0.tgz?cache=0&sync_timestamp=1604507107408&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcss-loader%2Fdownload%2Fcss-loader-3.6.0.tgz", "resolved": "https://registry.npm.taobao.org/css-loader/download/css-loader-3.6.0.tgz?cache=0&sync_timestamp=1604507107408&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcss-loader%2Fdownload%2Fcss-loader-3.6.0.tgz",
@ -1893,6 +1931,13 @@
"universalify": "^0.1.0" "universalify": "^0.1.0"
} }
}, },
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"optional": true
},
"icss-utils": { "icss-utils": {
"version": "4.1.1", "version": "4.1.1",
"resolved": "https://registry.npm.taobao.org/icss-utils/download/icss-utils-4.1.1.tgz?cache=0&sync_timestamp=1602527330977&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ficss-utils%2Fdownload%2Ficss-utils-4.1.1.tgz", "resolved": "https://registry.npm.taobao.org/icss-utils/download/icss-utils-4.1.1.tgz?cache=0&sync_timestamp=1602527330977&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ficss-utils%2Fdownload%2Ficss-utils-4.1.1.tgz",
@ -2007,6 +2052,16 @@
"minipass": "^3.1.1" "minipass": "^3.1.1"
} }
}, },
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
},
"terser-webpack-plugin": { "terser-webpack-plugin": {
"version": "2.3.8", "version": "2.3.8",
"resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz?cache=0&sync_timestamp=1603881757308&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-2.3.8.tgz", "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz?cache=0&sync_timestamp=1603881757308&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-2.3.8.tgz",
@ -2023,6 +2078,32 @@
"terser": "^4.6.12", "terser": "^4.6.12",
"webpack-sources": "^1.4.3" "webpack-sources": "^1.4.3"
} }
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.2.0",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz",
"integrity": "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
}
}
} }
} }
}, },
@ -12580,87 +12661,6 @@
} }
} }
}, },
"vue-loader-v16": {
"version": "npm:vue-loader@16.1.2",
"resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-16.1.2.tgz?cache=0&sync_timestamp=1608188050165&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-16.1.2.tgz",
"integrity": "sha1-XAO2xQ0qX5g8fOuhXFDXjKKymPQ=",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1601839122515&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
"integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.0",
"resolved": "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz",
"integrity": "sha1-ThSHCmGNni7dl92DRf2dncMVZGo=",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
"integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
"dev": true,
"optional": true
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz",
"integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
"dev": true,
"optional": true
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
"integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1598611732186&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
"integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
}
}
},
"vue-quill-editor": { "vue-quill-editor": {
"version": "3.0.6", "version": "3.0.6",
"resolved": "https://registry.npm.taobao.org/vue-quill-editor/download/vue-quill-editor-3.0.6.tgz", "resolved": "https://registry.npm.taobao.org/vue-quill-editor/download/vue-quill-editor-3.0.6.tgz",

7
src/App.vue

@ -1,3 +1,10 @@
<!--
* @Author: wally
* @email: 18603454788@163.com
* @Date: 2021-04-20 12:33:22
* @LastEditors: wally
* @LastEditTime: 2021-04-20 12:53:36
-->
<template> <template>
<a-config-provider :locale="zh_CN"> <a-config-provider :locale="zh_CN">
<div class="d-flex flex-row flex-nowrap" id="app"> <div class="d-flex flex-row flex-nowrap" id="app">

203
src/components/Activity/ActivityAdd.vue

@ -1,197 +1,100 @@
<template> <template>
<div class="d-flex flex-wrap pb-3"> <div class="d-flex flex-wrap pb-3">
<!-- 添加 --> <!-- 添加 -->
<a-modal <a-modal :maskClosable="false" @cancel="$emit('closeModal')" destroyOnClose footer title="添加活动公告" v-model="visible" width="700px">
:maskClosable="false"
@cancel="$emit('closeModal')"
destroyOnClose
footer
title="添加活动公告"
v-model="visible"
width="700px"
>
<a-form :form="form" @submit="handleSubmit"> <a-form :form="form" @submit="handleSubmit">
<!-- 标题 --> <!-- 标题 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="标题">
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="标题"
>
<a-input <a-input
placeholder="标题" placeholder="标题"
v-decorator="[ v-decorator="[
'title', 'title',
{ {
rules: [ rules: [
{ required: true, message: '标题不能为空' }, { required: true, message: '标题不能为空' },
{ whitespace: true, message: '标题不能为空' }, { whitespace: true, message: '标题不能为空' },
{ max: 140, massage: '地点最多140个字符' }, { max: 140, massage: '地点最多140个字符' },
], ],
}, },
]" ]"
/> />
</a-form-item> </a-form-item>
<!-- 地点 --> <!-- 地点 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="地点">
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="地点"
>
<a-input <a-input
placeholder="地点" placeholder="地点"
v-decorator="[ v-decorator="[
'address', 'address',
{ {
rules: [ rules: [
{ required: true, message: '地点不能为空' }, { required: true, message: '地点不能为空' },
{ whitespace: true, message: '地点不能为空' }, { whitespace: true, message: '地点不能为空' },
{ max: 140, massage: '地点最多140个字符' }, { max: 140, massage: '地点最多140个字符' },
], ],
}, },
]" ]"
/> />
</a-form-item> </a-form-item>
<!-- 时间 --> <!-- 时间 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="时间" required>
:label-col="formItemLayout.labelCol" <a-range-picker @change="onChange" format="YYYY-MM-DD HH:mm:ss" show-time style="width: 100%" />
:wrapper-col="formItemLayout.wrapperCol"
label="时间"
required
>
<a-range-picker
@change="onChange"
format="YYYY-MM-DD HH:mm:ss"
show-time
style="width:100%"
/>
</a-form-item> </a-form-item>
<!-- 活动类型 --> <!-- 活动类型 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="活动类型">
:label-col="formItemLayout.labelCol" <a-select @change="changeType" placeholder="活动类型" style="width: 100%">
:wrapper-col="formItemLayout.wrapperCol" <a-select-option :key="index" :value="category.id" v-for="(category, index) in types">{{ category.name }}</a-select-option>
label="活动类型"
>
<a-select @change="changeType" placeholder="活动类型" style="width:100%">
<a-select-option
:key="index"
:value="category.id"
v-for="(category, index) in types"
>{{ category.name }}</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
<!-- 主讲人 --> <!-- 主讲人 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="主讲人">
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="主讲人"
>
<a-input <a-input
placeholder="主讲人" placeholder="主讲人"
v-decorator="[ v-decorator="[
'name', 'name',
{ {
rules: [ rules: [
{ required: true, message: '主讲人不能为空' }, { required: true, message: '主讲人不能为空' },
{ whitespace: true, message: '主讲人不能为空' }, { whitespace: true, message: '主讲人不能为空' },
{ max: 140, massage: '主讲人最多140个字符' }, { max: 140, massage: '主讲人最多140个字符' },
], ],
}, },
]" ]"
/> />
</a-form-item> </a-form-item>
<!-- 组织单位 --> <!-- 组织单位 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="组织单位">
:label-col="formItemLayout.labelCol" <a-input placeholder="组织单位" v-decorator="['organization']" />
:wrapper-col="formItemLayout.wrapperCol"
label="组织单位"
>
<a-input
placeholder="组织单位"
v-decorator="[
'organization'
]"
/>
</a-form-item> </a-form-item>
<!-- 其他事宜 --> <!-- 其他事宜 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="其他事宜">
:label-col="formItemLayout.labelCol" <a-input placeholder="其他事宜" v-decorator="['other']" />
:wrapper-col="formItemLayout.wrapperCol"
label="其他事宜"
>
<a-input
placeholder="其他事宜"
v-decorator="[
'other'
]"
/>
</a-form-item> </a-form-item>
<!-- 会议主题 --> <!-- 会议主题 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="会议主题">
:label-col="formItemLayout.labelCol" <a-input placeholder="会议主题" v-decorator="['theme']" />
:wrapper-col="formItemLayout.wrapperCol"
label="会议主题"
>
<a-input
placeholder="会议主题"
v-decorator="[
'theme'
]"
/>
</a-form-item> </a-form-item>
<!-- 培训对象 --> <!-- 培训对象 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="培训对象">
:label-col="formItemLayout.labelCol" <a-input placeholder="培训对象" v-decorator="['trainees']" />
:wrapper-col="formItemLayout.wrapperCol"
label="培训对象"
>
<a-input
placeholder="培训对象"
v-decorator="[
'trainees'
]"
/>
</a-form-item> </a-form-item>
<!-- 报名方式 --> <!-- 报名方式 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="报名方式">
:label-col="formItemLayout.labelCol" <a-input placeholder="报名方式" v-decorator="['way']" />
:wrapper-col="formItemLayout.wrapperCol"
label="报名方式"
>
<a-input
placeholder="报名方式"
v-decorator="[
'way'
]"
/>
</a-form-item> </a-form-item>
<!-- 活动结束内容 --> <!-- 活动结束内容 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="活动结束内容">
:label-col="formItemLayout.labelCol" <a-textarea placeholder="活动结束内容" v-decorator="['endContent']" />
:wrapper-col="formItemLayout.wrapperCol"
label="活动结束内容"
>
<a-textarea
placeholder="活动结束内容"
v-decorator="[
'endContent',
]"
/>
</a-form-item> </a-form-item>
<!-- 详情 --> <!-- 详情 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="详情" required>
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="详情"
required
>
<quill-editor :max-size="maxSize" :placeholder="placeholder" @changeInput="changeInput" /> <quill-editor :max-size="maxSize" :placeholder="placeholder" @changeInput="changeInput" />
</a-form-item> </a-form-item>
@ -223,9 +126,11 @@ export default {
tailItemLayout, tailItemLayout,
form: this.$form.createForm(this, { name: 'activity-add' }), form: this.$form.createForm(this, { name: 'activity-add' }),
types: [ types: [
{ id: 0, name: '路演' }, { id: 0, name: '培训' },
{ id: 1, name: '沙龙' }, { id: 1, name: '讲座' },
{ id: 2, name: '论坛' }, { id: 2, name: '交流' },
{ id: 3, name: '路演' },
{ id: 4, name: '论坛' },
], ],
activityType: '', activityType: '',
maxSize: 2048, maxSize: 2048,

226
src/components/Activity/ActivityEdit.vue

@ -12,216 +12,162 @@
> >
<a-form :form="form" @submit="handleSubmit" v-if="editVisible && editItem"> <a-form :form="form" @submit="handleSubmit" v-if="editVisible && editItem">
<!-- 标题 --> <!-- 标题 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="标题">
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="标题"
>
<a-input <a-input
placeholder="标题" placeholder="标题"
v-decorator="[ v-decorator="[
'title', 'title',
{ {
initialValue: editItem.title || '', initialValue: editItem.title || '',
rules: [ rules: [
{ required: true, message: '标题不能为空' }, { required: true, message: '标题不能为空' },
{ whitespace: true, message: '标题不能为空' }, { whitespace: true, message: '标题不能为空' },
{ max: 140, massage: '地点最多140个字符' }, { max: 140, massage: '地点最多140个字符' },
], ],
}, },
]" ]"
/> />
</a-form-item> </a-form-item>
<!-- 地点 --> <!-- 地点 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="地点">
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="地点"
>
<a-input <a-input
placeholder="地点" placeholder="地点"
v-decorator="[ v-decorator="[
'address', 'address',
{ {
initialValue: editItem.address || '', initialValue: editItem.address || '',
rules: [ rules: [
{ required: true, message: '地点不能为空' }, { required: true, message: '地点不能为空' },
{ whitespace: true, message: '地点不能为空' }, { whitespace: true, message: '地点不能为空' },
{ max: 140, massage: '地点最多140个字符' }, { max: 140, massage: '地点最多140个字符' },
], ],
}, },
]" ]"
/> />
</a-form-item> </a-form-item>
<!-- 时间 --> <!-- 时间 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="时间" required>
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="时间"
required
>
<a-range-picker <a-range-picker
:default-value="[editItem.releaseTime ? editItem.releaseTime : '',editItem.closeTime ? editItem.closeTime : '']" :default-value="[editItem.releaseTime ? editItem.releaseTime : '', editItem.closeTime ? editItem.closeTime : '']"
@change="onChange" @change="onChange"
format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"
show-time show-time
style="width:100%" style="width: 100%"
/> />
</a-form-item> </a-form-item>
<!-- 活动类型 --> <!-- 活动类型 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="活动类型">
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="活动类型"
>
<a-select <a-select
@change="changeType" @change="changeType"
placeholder="活动类型" placeholder="活动类型"
style="width:100%" style="width: 100%"
v-decorator="[ v-decorator="[
'activityType', 'activityType',
{ {
initialValue: editItem.info && editItem.info.activityType, initialValue: editItem.info && editItem.info.activityType,
}, },
]" ]"
> >
<a-select-option <a-select-option :key="index" :value="category.id" v-for="(category, index) in types">{{ category.name }}</a-select-option>
:key="index"
:value="category.id"
v-for="(category, index) in types"
>{{ category.name }}</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
<!-- 主讲人 --> <!-- 主讲人 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="主讲人">
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="主讲人"
>
<a-input <a-input
placeholder="主讲人" placeholder="主讲人"
v-decorator="[ v-decorator="[
'name', 'name',
{ {
initialValue: (editItem.info && editItem.info.name) ? editItem.info.name : '', initialValue: editItem.info && editItem.info.name ? editItem.info.name : '',
rules: [ rules: [
{ required: true, message: '主讲人不能为空' }, { required: true, message: '主讲人不能为空' },
{ whitespace: true, message: '主讲人不能为空' }, { whitespace: true, message: '主讲人不能为空' },
{ max: 140, massage: '主讲人最多140个字符' }, { max: 140, massage: '主讲人最多140个字符' },
], ],
}, },
]" ]"
/> />
</a-form-item> </a-form-item>
<!-- 组织单位 --> <!-- 组织单位 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="组织单位">
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="组织单位"
>
<a-input <a-input
placeholder="组织单位" placeholder="组织单位"
v-decorator="[ v-decorator="[
'organization', 'organization',
{ {
initialValue: (editItem.info && editItem.info.organization) ? editItem.info.organization : '', initialValue: editItem.info && editItem.info.organization ? editItem.info.organization : '',
}, },
]" ]"
/> />
</a-form-item> </a-form-item>
<!-- 其他事宜 --> <!-- 其他事宜 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="其他事宜">
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="其他事宜"
>
<a-input <a-input
placeholder="其他事宜" placeholder="其他事宜"
v-decorator="[ v-decorator="[
'other', 'other',
{ {
initialValue: (editItem.info && editItem.info.other) ? editItem.info.other : '', initialValue: editItem.info && editItem.info.other ? editItem.info.other : '',
}, },
]" ]"
/> />
</a-form-item> </a-form-item>
<!-- 会议主题 --> <!-- 会议主题 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="会议主题">
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="会议主题"
>
<a-input <a-input
placeholder="会议主题" placeholder="会议主题"
v-decorator="[ v-decorator="[
'theme', 'theme',
{ {
initialValue: (editItem.info && editItem.info.theme) ? editItem.info.theme : '', initialValue: editItem.info && editItem.info.theme ? editItem.info.theme : '',
}, },
]" ]"
/> />
</a-form-item> </a-form-item>
<!-- 培训对象 --> <!-- 培训对象 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="培训对象">
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="培训对象"
>
<a-input <a-input
placeholder="培训对象" placeholder="培训对象"
v-decorator="[ v-decorator="[
'trainees', 'trainees',
{ {
initialValue: (editItem.info && editItem.info.trainees) ? editItem.info.trainees : '', initialValue: editItem.info && editItem.info.trainees ? editItem.info.trainees : '',
}, },
]" ]"
/> />
</a-form-item> </a-form-item>
<!-- 报名方式 --> <!-- 报名方式 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="报名方式">
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="报名方式"
>
<a-input <a-input
placeholder="报名方式" placeholder="报名方式"
v-decorator="[ v-decorator="[
'way', 'way',
{ {
initialValue: (editItem.info && editItem.info.way) ? editItem.info.way : '', initialValue: editItem.info && editItem.info.way ? editItem.info.way : '',
}, },
]" ]"
/> />
</a-form-item> </a-form-item>
<!-- 活动结束内容 --> <!-- 活动结束内容 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="活动结束内容">
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="活动结束内容"
>
<a-textarea <a-textarea
placeholder="活动结束内容" placeholder="活动结束内容"
v-decorator="[ v-decorator="[
'endContent', 'endContent',
{ {
initialValue: (editItem.info && editItem.info.endContent) ? editItem.info.endContent : '', initialValue: editItem.info && editItem.info.endContent ? editItem.info.endContent : '',
}, },
]" ]"
/> />
</a-form-item> </a-form-item>
<!-- 详情 --> <!-- 详情 -->
<a-form-item <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="详情" required>
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="详情"
required
>
<quill-editor <quill-editor
:max-size="maxSize" :max-size="maxSize"
:value="(editItem && editItem.info && editItem.info.content) ? editItem.info.content : content" :value="editItem && editItem.info && editItem.info.content ? editItem.info.content : content"
@changeInput="changeInput" @changeInput="changeInput"
/> />
</a-form-item> </a-form-item>
@ -255,9 +201,11 @@ export default {
tailItemLayout, tailItemLayout,
form: this.$form.createForm(this, { name: 'activity-edit' }), form: this.$form.createForm(this, { name: 'activity-edit' }),
types: [ types: [
{ id: 0, name: '路演' }, { id: 0, name: '培训' },
{ id: 1, name: '沙龙' }, { id: 1, name: '讲座' },
{ id: 2, name: '论坛' }, { id: 2, name: '交流' },
{ id: 3, name: '路演' },
{ id: 4, name: '论坛' },
], ],
activityType: null, activityType: null,
maxSize: 2048, maxSize: 2048,

6
src/components/Policy/PolicyAdd.vue

@ -78,9 +78,9 @@ export default {
tailItemLayout, tailItemLayout,
form: this.$form.createForm(this, { name: 'policy-edit' }), form: this.$form.createForm(this, { name: 'policy-edit' }),
applyStatus: [ applyStatus: [
{ id: 0, name: '审核中' }, { id: 2, name: '审核中' },
{ id: 1, name: '未通过' }, { id: 0, name: '未通过' },
{ id: 2, name: '已通过' }, { id: 1, name: '已通过' },
], ],
status: null, status: null,
maxSize: 2048, maxSize: 2048,

46
src/components/Policy/PolicyDate.vue

@ -1,15 +1,9 @@
<template> <template>
<div class="main flex-1"> <div class="main flex-1">
<div style="width:100%" v-if="lists && lists.length > 0"> <div style="width: 100%" v-if="lists && lists.length > 0">
<div class="mb-4"> <div class="mb-4">
<a-button :disabled="!hasSelected" :loading="loading" @click="start(2)" type="primary">审核通过</a-button> <a-button :disabled="!hasSelected" :loading="loading" @click="start(1)" type="primary">审核通过</a-button>
<a-button <a-button :disabled="!hasSelected" :loading="loading" @click="start(0)" class="ml-3" type="danger">审核不通过</a-button>
:disabled="!hasSelected"
:loading="loading"
@click="start(1)"
class="ml-3"
type="danger"
>审核不通过</a-button>
<span class="ml-2"> <span class="ml-2">
<template v-if="hasSelected">{{ `选中 ${selectedRowKeys.length} ` }}</template> <template v-if="hasSelected">{{ `选中 ${selectedRowKeys.length} ` }}</template>
</span> </span>
@ -31,27 +25,30 @@
</template> </template>
<template slot="type" slot-scope="text, record"> <template slot="type" slot-scope="text, record">
<a-tag <a-tag color="blue">{{
color="blue" record.type === 0
>{{ record.type === 0 ? '申报通知' : record.type === 1 ? '公告公示' : record.type === 2 ? '政策动态' : record.type === 3 ? '申报指南' : '' }}</a-tag> ? '申报通知'
: record.type === 1
? '公告公示'
: record.type === 2
? '政策动态'
: record.type === 3
? '申报指南'
: ''
}}</a-tag>
</template> </template>
<template slot="status" slot-scope="text, record"> <template slot="status" slot-scope="text, record">
<a-tag <a-tag :color="record.status === 1 ? 'green' : record.status === 0 ? 'red' : 'blue'">{{
:color="record.status === 2 ? 'green' : record.status === 1 ? 'red' : 'blue'" record.status === 1 ? '已通过' : record.status === 0 ? '未通过' : '审核中'
>{{ record.status === 2 ? '已通过' : record.status === 1 ? '未通过' : '审核中' }}</a-tag> }}</a-tag>
</template> </template>
<template slot="edit" slot-scope="text, record"> <template slot="edit" slot-scope="text, record">
<a-icon @click="showEditModal(record)" class="pointer" theme="twoTone" type="edit" /> <a-icon @click="showEditModal(record)" class="pointer" theme="twoTone" type="edit" />
</template> </template>
<div <div class="d-flex flex-column" slot="expandedRowRender" slot-scope="record" style="margin: 0">
class="d-flex flex-column"
slot="expandedRowRender"
slot-scope="record"
style="margin: 0"
>
<div class="mb-3"> <div class="mb-3">
<span class="font-bold-14">原文链接</span> <span class="font-bold-14">原文链接</span>
{{ record.titleUrl }} {{ record.titleUrl }}
@ -73,12 +70,7 @@
<a-empty v-else /> <a-empty v-else />
<!-- 编辑 --> <!-- 编辑 -->
<policy-edit <policy-edit :editItem="editItem" :editVisible="editVisible" @closeModal="closeModal" @getSelectTeam="getSelectTeam" />
:editItem="editItem"
:editVisible="editVisible"
@closeModal="closeModal"
@getSelectTeam="getSelectTeam"
/>
</div> </div>
</template> </template>

6
src/components/Policy/PolicyEdit.vue

@ -125,9 +125,9 @@ export default {
tailItemLayout, tailItemLayout,
form: this.$form.createForm(this, { name: 'policy-edit' }), form: this.$form.createForm(this, { name: 'policy-edit' }),
applyStatus: [ applyStatus: [
{ id: 0, name: '审核中' }, { id: 2, name: '审核中' },
{ id: 1, name: '未通过' }, { id: 0, name: '未通过' },
{ id: 2, name: '已通过' }, { id: 1, name: '已通过' },
], ],
status: null, status: null,
maxSize: 2048, maxSize: 2048,

6
src/components/Policy/PolicySearch.vue

@ -52,9 +52,9 @@ export default {
{ code: 'area', value: '地区/发布部门' }, { code: 'area', value: '地区/发布部门' },
], ],
policyStatus: [ policyStatus: [
{ id: 0, value: '审核中' }, { id: 2, value: '审核中' },
{ id: 1, value: '未通过' }, { id: 0, value: '未通过' },
{ id: 2, value: '已通过' }, { id: 1, value: '已通过' },
], ],
options: { options: {
bw: 0, bw: 0,

2
src/views/CooperativePartner/CooperativePartner.vue

@ -3,7 +3,7 @@
* @email: 18603454788@163.com * @email: 18603454788@163.com
* @Date: 2021-03-23 10:09:55 * @Date: 2021-03-23 10:09:55
* @LastEditors: wally * @LastEditors: wally
* @LastEditTime: 2021-04-17 19:20:58 * @LastEditTime: 2021-04-20 12:44:57
--> -->
<template> <template>
<div class="pa-3 white fill-height d-flex flex-column"> <div class="pa-3 white fill-height d-flex flex-column">

16
src/views/InnovativeAchievements/InnovativeAchievements.vue

@ -1,12 +1,14 @@
<!--
* @Author: wally
* @email: 18603454788@163.com
* @Date: 2021-04-20 12:33:22
* @LastEditors: wally
* @LastEditTime: 2021-04-20 12:45:39
-->
<template> <template>
<div class="pa-3 white fill-height d-flex flex-column"> <div class="pa-3 white fill-height d-flex flex-column">
<development-search :typeLists="typeLists" @selResSearch="selResSearch" /> <development-search :type-lists="typeLists" @selResSearch="selResSearch" />
<development-date <development-date :lists="lists" :pagination="pagination" :type-lists="typeLists" @selResSearch="selResSearch" />
:lists="lists"
:pagination="pagination"
:typeLists="typeLists"
@selResSearch="selResSearch"
/>
</div> </div>
</template> </template>

19
src/views/UserManage/UserManage.vue

@ -1,3 +1,10 @@
<!--
* @Author: wally
* @email: 18603454788@163.com
* @Date: 2021-04-20 12:33:22
* @LastEditors: wally
* @LastEditTime: 2021-04-20 12:45:23
-->
<template> <template>
<div class="pa-3 white fill-height d-flex flex-column"> <div class="pa-3 white fill-height d-flex flex-column">
<!-- <user-search /> <!-- <user-search />
@ -8,14 +15,14 @@
<script> <script>
// @ is an alias to /src // @ is an alias to /src
import UserSearch from 'components/User/UserSearch.vue'; // import UserSearch from 'components/User/UserSearch.vue';
import UserDate from 'components/User/UserDate.vue'; // import UserDate from 'components/User/UserDate.vue';
export default { export default {
name: 'Home', name: 'Home',
components: { // components: {
UserSearch, // UserSearch,
UserDate, // UserDate,
}, // },
}; };
</script> </script>

Loading…
Cancel
Save