DIGITAL_MANAGEMENT
/
green-valley-admin
2
0
Fork 0
Code Pull Requests Releases Activity
Browse Source

细节修改

master
aBin 4 years ago
parent
4f20961af4
commit
13d15e7eb8
7 changed files with 217 additions and 164 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/App.vue
  2. 2
      src/components/EntityApply/EntityApplyDate.vue
  3. 100
      src/components/Policy/PolicyAdd.vue
  4. 146
      src/components/Policy/PolicyEdit.vue
  5. 3
      src/config/api.js
  6. 59
      src/views/HatchingDemandFilling/HatchingDemandFilling.vue
  7. 59
      src/views/IndustryDemandReport/IndustryDemandReport.vue

12
src/App.vue
View File

@ -1,7 +1,7 @@
<template>
<a-config-provider :locale="zh_CN">
<div class="d-flex flex-row flex-nowrap" id="app">
<btn-con />
<!-- <btn-con /> -->
<router-view class="flex-1 bg pa-3"></router-view>
</div>
</a-config-provider>
@ -10,11 +10,11 @@
<script>
import { mapState, mapActions, mapMutations } from 'vuex';
import zh_CN from 'ant-design-vue/lib/locale-provider/zh_CN';
import BtnCon from 'components/BtnCom/BtnCon.vue';
// import BtnCon from 'components/BtnCom/BtnCon.vue';
export default {
name: 'app',
components: { BtnCon },
// components: { BtnCon },
data() {
return {
zh_CN,
@ -35,9 +35,9 @@ export default {
created() {
// 测试数据
const userId = '1218763410024566784';
const params = { userId };
this.getUserId(params);
// const userId = '1218763410024566784';
// const params = { userId };
// this.getUserId(params);
const that = this;
window.plugin = window.TallPlugin.init();

2
src/components/EntityApply/EntityApplyDate.vue
View File

@ -38,7 +38,7 @@
}}</a-tag>
</template>
<!-- 审批 -->
<!-- 操作 -->
<template slot="edit" slot-scope="text, record">
<a-icon @click="showEditModal(record)" class="pointer" theme="twoTone" type="edit" />
<a-button @click="handleApply(record.id, 2)" class="ml-3" size="small" type="primary" v-if="record.dealStatus === 1"

100
src/components/Policy/PolicyAdd.vue
View File

@ -1,100 +1,56 @@
<template>
<div class="d-flex flex-wrap pb-3">
<!-- 添加 -->
<a-modal
:maskClosable="false"
@cancel="$emit('closeModal')"
destroyOnClose
footer
title="添加创新政策"
v-model="visible"
width="700px"
>
<a-modal :maskClosable="false" @cancel="$emit('closeModal')" destroyOnClose footer title="添加创新政策" v-model="visible" width="700px">
<a-form :form="form" @submit="handleSubmit">
<!-- 标题 -->
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="标题"
>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="标题">
<a-input
placeholder="标题"
v-decorator="[
'title',
{
rules: [
{ required: true, message: '标题不能为空' },
{ whitespace: true, message: '标题不能为空' },
{ max: 140, massage: '标题最多140个字符' },
],
},
]"
'title',
{
rules: [
{ required: true, message: '标题不能为空' },
{ whitespace: true, message: '标题不能为空' },
{ max: 140, massage: '标题最多140个字符' },
],
},
]"
/>
</a-form-item>
<!-- 发布部门 -->
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="发布部门"
>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="发布部门">
<a-input
placeholder="发布部门"
v-decorator="[
'pushDep',
{
rules: [
{ required: true, message: '发布部门不能为空' },
{ whitespace: true, message: '发布部门不能为空' },
{ max: 140, massage: '发布部门最多140个字符' },
],
},
]"
'pushDep',
{
rules: [
{ required: true, message: '发布部门不能为空' },
{ whitespace: true, message: '发布部门不能为空' },
{ max: 140, massage: '发布部门最多140个字符' },
],
},
]"
/>
</a-form-item>
<!-- 发布时间 -->
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="发布时间"
required
>
<a-date-picker @change="onChange" format="YYYY-MM-DD" show-time style="width:100%" />
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="发布时间" required>
<a-date-picker @change="onChange" format="YYYY-MM-DD" show-time style="width: 100%" />
</a-form-item>
<!-- 审核状态 -->
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="审核状态"
required
>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="审核状态" required>
<a-select @change="getStatus" placeholder="审核状态" style="width: 200px">
<a-select-option
:key="index"
:value="item.id"
v-for="(item, index) in applyStatus"
>{{ item.name }}</a-select-option>
<a-select-option :key="index" :value="item.id" v-for="(item, index) in applyStatus">{{ item.name }}</a-select-option>
</a-select>
</a-form-item>
<!-- 原文链接 -->
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="原文链接"
>
<a-input
placeholder="原文链接"
v-decorator="[
'url',
]"
/>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="原文链接">
<a-input placeholder="原文链接" v-decorator="['url']" />
</a-form-item>
<!-- 政策内容 -->
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="政策内容"
required
>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="政策内容" required>
<quill-editor :max-size="maxSize" :placeholder="placeholder" @changeInput="changeInput" />
</a-form-item>

146
src/components/Policy/PolicyEdit.vue
View File

@ -12,124 +12,90 @@
>
<a-form :form="form" @submit="handleSubmit" v-if="editVisible && editItem">
<!-- 标题 -->
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="标题"
>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="标题">
<a-input
placeholder="标题"
v-decorator="[
'title',
{
initialValue: editItem.title,
rules: [
{ required: true, message: '标题不能为空' },
{ whitespace: true, message: '标题不能为空' },
{ max: 140, massage: '标题最多140个字符' },
],
},
]"
'title',
{
initialValue: editItem.title,
rules: [
{ required: true, message: '标题不能为空' },
{ whitespace: true, message: '标题不能为空' },
{ max: 140, massage: '标题最多140个字符' },
],
},
]"
/>
</a-form-item>
<!-- 发布部门 -->
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="发布部门"
>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="发布部门">
<a-input
placeholder="发布部门"
v-decorator="[
'pushDep',
{
initialValue: editItem.publishDepartName,
rules: [
{ required: true, message: '发布部门不能为空' },
{ whitespace: true, message: '发布部门不能为空' },
{ max: 140, massage: '发布部门最多140个字符' },
],
},
]"
'pushDep',
{
initialValue: editItem.publishDepartName,
rules: [
{ required: true, message: '发布部门不能为空' },
{ whitespace: true, message: '发布部门不能为空' },
{ max: 140, massage: '发布部门最多140个字符' },
],
},
]"
/>
</a-form-item>
<!-- 发布时间 -->
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="发布时间"
required
>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="发布时间" required>
<a-date-picker
@change="onChange"
format="YYYY-MM-DD"
show-time
style="width:100%"
style="width: 100%"
v-decorator="[
'pushTime',
{
initialValue: editItem.publishTime,
rules: [
{ required: true, message: '发布时间不能为空' },
],
},
]"
'pushTime',
{
initialValue: editItem.publishTime,
rules: [{ required: true, message: '发布时间不能为空' }],
},
]"
/>
</a-form-item>
<!-- 审核状态 -->
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="审核状态"
>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="审核状态">
<a-select
@change="getStatus"
placeholder="审核状态"
style="width: 200px"
v-decorator="[
'status',
{
initialValue: editItem.status,
rules: [
{ required: true, message: '审核状态不能为空' },
],
},
]"
'status',
{
initialValue: editItem.status,
rules: [{ required: true, message: '审核状态不能为空' }],
},
]"
>
<a-select-option
:key="index"
:value="item.id"
v-for="(item, index) in applyStatus"
>{{ item.name }}</a-select-option>
<a-select-option :key="index" :value="item.id" v-for="(item, index) in applyStatus">{{ item.name }}</a-select-option>
</a-select>
</a-form-item>
<!-- 原文链接 -->
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="原文链接"
>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="原文链接">
<a-input
placeholder="原文链接"
v-decorator="[
'url',
{
initialValue: editItem.titleUrl,
},
]"
'url',
{
initialValue: editItem.titleUrl,
},
]"
/>
</a-form-item>
<!-- 政策内容 -->
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="政策内容"
required
>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="政策内容" required>
<quill-editor
:max-size="maxSize"
:placeholder="placeholder"
:value="(editItem && editItem.content) ? editItem.content : content"
:value="editItem && editItem.content ? editItem.content : content"
@changeInput="changeInput"
/>
</a-form-item>
@ -144,7 +110,7 @@
</template>
<script>
import { addPolicy } from 'config/api';
import { addPolicy, getAreaBranch } from 'config/api';
import QuillEditor from 'components/QuillEditor/QuillEditor.vue';
const formItemLayout = {
@ -175,7 +141,9 @@ export default {
pushTime: '', // 发布时间
};
},
created() {
this.getArea();
},
methods: {
// 政策类型
getStatus(value) {
@ -192,7 +160,19 @@ export default {
console.log(date, dateString);
this.pushTime = dateString;
},
async getArea() {
try {
const res = await getAreaBranch();
const { code, msg, data } = res.data;
if (code === 200) {
console.log(data);
} else {
this.$message.error(msg);
}
} catch (error) {
this.$message.error(error);
}
},
// 提交表单
handleSubmit(e) {
e.preventDefault();

3
src/config/api.js
View File

@ -241,3 +241,6 @@ export const serviceApplyStatus = params => axios.post(`${service}/ServiceApplyS
// 入驻企业申请
export const applyBackend = params => axios.post(`${greenvalley}/place/applyBackend`, params);
// 添加/修改发布部门时的发布部门
export const getAreaBranch = params => axios.post(`${policy}/policy/area`, params);

59
src/views/HatchingDemandFilling/HatchingDemandFilling.vue
View File

@ -1,9 +1,66 @@
<template>
<div class="pa-3 white fill-height d-flex flex-column">开发中... ...</div>
<div class="pa-3 white fill-height d-flex flex-column">
<r-d-search @searchServiceApply="searchServiceApply" />
<r-d-date :lists="lists" :pagination="pagination" @searchServiceApply="searchServiceApply" />
</div>
</template>
<script>
// @ is an alias to /src
import RDSearch from 'components/RD/RDSearch.vue';
import RDDate from 'components/RD/RDDate.vue';
import { searchServiceApply } from 'config/api';
export default {
name: 'EntrepreneurialMentor',
components: {
RDSearch,
RDDate,
},
data() {
return {
str: '需求填报界面',
pagination: { current: 1, pageSize: 10 },
lists: {},
};
},
created() {
this.searchServiceApply();
},
methods: {
/**
* 根据团队id查看研发团队相关信息
* @param { String } competeTimeId 第几届信息的id
*/
async searchServiceApply(paramData) {
try {
const params = {
param: {
companyName: paramData && paramData.companyName !== '' ? paramData.companyName : '',
contactName: paramData && paramData.contactName !== '' ? paramData.contactName : '',
contactPhone: paramData && paramData.contactPhone !== '' ? paramData.contactPhone : '',
type: paramData && paramData.type !== '' ? paramData.type : '',
pageNum: paramData && paramData.current ? paramData.current : 1,
pageSize: paramData && paramData.pageSize ? paramData.pageSize : 10,
},
};
const res = await searchServiceApply(params);
const { code, msg, data } = res.data;
if (code === 200) {
this.lists = data;
const paper = { ...this.pagination };
paper.current = data.pageNum;
paper.total = +data.total;
paper.pageSize = data.pageSize;
this.pagination = paper;
} else {
throw msg || '获取失败';
}
} catch (error) {
this.$message.error(error);
}
},
},
};
</script>

59
src/views/IndustryDemandReport/IndustryDemandReport.vue
View File

@ -1,9 +1,66 @@
<template>
<div class="pa-3 white fill-height d-flex flex-column">开发中... ...</div>
<div class="pa-3 white fill-height d-flex flex-column">
<r-d-search @searchServiceApply="searchServiceApply" />
<r-d-date :lists="lists" :pagination="pagination" @searchServiceApply="searchServiceApply" />
</div>
</template>
<script>
// @ is an alias to /src
import RDSearch from 'components/RD/RDSearch.vue';
import RDDate from 'components/RD/RDDate.vue';
import { searchServiceApply } from 'config/api';
export default {
name: 'IndustryDemandReport',
components: {
RDSearch,
RDDate,
},
data() {
return {
str: '需求填报界面',
pagination: { current: 1, pageSize: 10 },
lists: {},
};
},
created() {
this.searchServiceApply();
},
methods: {
/**
* 根据团队id查看研发团队相关信息
* @param { String } competeTimeId 第几届信息的id
*/
async searchServiceApply(paramData) {
try {
const params = {
param: {
companyName: paramData && paramData.companyName !== '' ? paramData.companyName : '',
contactName: paramData && paramData.contactName !== '' ? paramData.contactName : '',
contactPhone: paramData && paramData.contactPhone !== '' ? paramData.contactPhone : '',
type: paramData && paramData.type !== '' ? paramData.type : '',
pageNum: paramData && paramData.current ? paramData.current : 1,
pageSize: paramData && paramData.pageSize ? paramData.pageSize : 10,
},
};
const res = await searchServiceApply(params);
const { code, msg, data } = res.data;
if (code === 200) {
this.lists = data;
const paper = { ...this.pagination };
paper.current = data.pageNum;
paper.total = +data.total;
paper.pageSize = data.pageSize;
this.pagination = paper;
} else {
throw msg || '获取失败';
}
} catch (error) {
this.$message.error(error);
}
},
},
};
</script>

Write Preview
Loading…
Cancel
Save