Browse Source

甲方bb的bug修改

master
aBin 4 years ago
parent
commit
4f20961af4
  1. 8
      src/App.vue
  2. 13
      src/components/Activity/ActivitySearch.vue
  3. 5
      src/components/Banner/BannerDate.vue
  4. 134
      src/components/Banner/BannerEdit.vue
  5. 13
      src/components/Development/DevelopmentSearch.vue
  6. 54
      src/components/EntityApply/EntityApplyDate.vue
  7. 28
      src/components/Manage/ManageDate.vue
  8. 26
      src/components/Page/PageDate.vue
  9. 63
      src/components/Partner/PartnerAdd.vue
  10. 29
      src/components/Policy/PolicySearch.vue
  11. 6
      src/components/RD/RDDate.vue
  12. 33
      src/components/SpinOff/SpinOffDate.vue
  13. 9
      src/components/Transfer/TransferSearch.vue
  14. 5
      src/config/api.js
  15. 11
      src/views/CategoryManage/CategoryManage.vue
  16. 8
      src/views/EntityApplication/VirtualApplication.vue

8
src/App.vue

@ -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>
@ -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();

13
src/components/Activity/ActivitySearch.vue

@ -8,7 +8,7 @@
<!-- 发布平台 -->
<div class="mb-3">
<span class="font-bold-14 ml-8">发布平台</span>
<a-radio-group @change="getPlatform" v-model="publishPlatform">
<a-radio-group @change="getPlatform">
<a-radio :value="0">绿谷</a-radio>
<a-radio :value="1">创时代</a-radio>
</a-radio-group>
@ -16,12 +16,7 @@
<!-- 活动标题 -->
<a-input class="ml-3 mb-3" placeholder="标题" style="width: 150px" v-model="titleKey" />
<!-- 发布时间 -->
<a-range-picker
@change="onChangeTime"
class="ml-3 mb-3"
format="YYYY-MM-DD HH:mm:ss"
show-time
/>
<a-range-picker @change="onChangeTime" class="ml-3 mb-3" format="YYYY-MM-DD HH:mm:ss" show-time />
<a-button @click="handleTableChange" class="ml-3 mb-3" type="primary">搜索</a-button>
<div class="flex-1"></div>
<a-button @click="showModal" class="editable-add-btn mb-3" type="primary">增加</a-button>
@ -55,8 +50,8 @@ export default {
methods: {
//
getPlatform(value) {
console.log('value: ', value);
this.publishPlatform = value;
console.log('value: ', value.target.value);
this.publishPlatform = value.target.value;
},
//

5
src/components/Banner/BannerDate.vue

@ -38,7 +38,7 @@
<a-empty v-else />
<!-- 编辑 -->
<banner-edit :edit-item="editItem" :edit-visible="editVisible" @closeModal="closeModal" />
<banner-edit :edit-item="editItem" :edit-visible="editVisible" @editSearch="editSearch" @closeModal="closeModal" />
</div>
</template>
@ -157,6 +157,9 @@ export default {
const condition = { current, pageSize };
this.$emit('getListData', condition);
},
editSearch() {
this.$emit('getListData');
},
//
async onDelete(id) {
try {

134
src/components/Banner/BannerEdit.vue

@ -11,29 +11,10 @@
width="700px"
>
<a-form :form="form" @submit="handleSubmit" v-if="editItem">
<!-- 页面路径 -->
<!-- <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="页面路径">
<a-input
placeholder="页面路径"
v-decorator="[
'pagePath',
{
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-select
:value="jumpType"
@change="getUse($event, 'jumpType')"
class="ml-3"
placeholder="请选择想要修改的跳转类型"
@ -47,17 +28,14 @@
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="图片跳转路径"
v-if="editItem.jumpType === 1"
v-if="editData.jumpType === 1"
>
<a-input class="ml-3" placeholder="图片跳转路径" v-model="editData.jumpUrl" />
</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
:value="recStatus"
@change="getUse($event, 'recStatus')"
class="ml-3"
placeholder="请选择想要修改的状态"
@ -67,41 +45,21 @@
</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-select
:value="showPage"
@change="getUse($event, 'showPage')"
class="ml-3"
placeholder="请选择想要修改的页面显示位置"
style="width: 100%"
>
<a-select-option
:key="item.page"
:value="item.page"
v-for="item in enable2"
>{{ item.name }}</a-select-option>
<a-select-option :key="item.page" :value="item.page" v-for="item in enable2">{{ item.name }}</a-select-option>
</a-select>
</a-form-item>
<!-- 图片 -->
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="图片"
>
<a-upload
:action="upload"
:before-upload="beforeUpload"
@change="handleChange"
class="ml-3"
list-type="picture"
name="files"
>
<a-button v-show="fileList.length - 0 === 0">
<a-icon type="upload" />更换图片
</a-button>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="图片">
<a-upload :action="upload" :before-upload="beforeUpload" @change="handleChange" class="ml-3" list-type="picture" name="files">
<a-button v-show="fileList.length - 0 === 0"> <a-icon type="upload" />更换图片 </a-button>
</a-upload>
</a-form-item>
<a-form-item class="d-flex flex-row-reverse">
@ -114,8 +72,7 @@
</template>
<script>
// import { upTeam } from 'config/api';
import { upload, addCarousel } from 'config/api';
import { upload, updateCarousel } from 'config/api';
const formItemLayout = {
labelCol: { span: 6 },
@ -209,14 +166,44 @@ export default {
showPage: '',
url: '',
},
jumpType: '',
recStatus: '',
showPage: '',
};
},
watch: {
editItem(val) {
this.editData.jumpType = this.editItem.jumpType;
this.editData.jumpUrl = this.editItem.jumpUrl;
this.editData.recStatus = this.editItem.recStatus;
this.editData.showPage = this.editItem.showPage;
this.editData.url = this.editItem.url;
this.jumpType = this.enable1[this.editItem.jumpType];
this.recStatus = this.enable[this.editItem.recStatus];
for (let i = 0; i < this.enable2.length; i++) {
if (this.enable.showPage === this.enable2[i].page) {
this.showPage = this.enable2[i].name;
}
}
},
},
methods: {
//
getUse(e, str) {
this.editData[str] = e;
if (str === 'jumpType' && e === 0) {
this.editData.jumpUrl = '';
for (let i = 0; i < this.enable2.length; i++) {
if (this.enable.showPage === this.enable2[i].page) {
this.showPage = this.enable2[i].name;
}
}
}
if (str === 'jumpType') {
this.jumpType = this.enable1[e];
}
if (str === 'recStatus') {
this.recStatus = this.enable[e];
}
},
//
@ -230,21 +217,36 @@ export default {
},
//
handleSubmit(e) {
console.log(this.editData);
if (this.fileList.length) {
this.editData.url = this.fileList[0];
}
e.preventDefault();
this.form.validateFieldsAndScroll(async (err, values) => {
if (!err) {
try {
// const params = { param: values };
// const res = await upTeam(params);
// const { data, msg, code } = res.data;
// this.$emit('closeModal');
// if (code === 200) {
// this.$message.success('')
// // TODO:
// } else {
// throw msg;
// }
const params = {
param: {
id: this.editItem.id,
jumpType: this.editData.jumpType,
jumpUrl: this.editData.jumpUrl,
recStatus: this.editData.recStatus,
showPage: this.editData.showPage,
url: this.editData.url,
},
};
const res = await updateCarousel(params);
const { data, msg, code } = res.data;
if (code === 200) {
this.$emit('closeModal');
this.$emit('editSearch');
this.$message.success('修改成功');
this.jumpType = '';
this.recStatus = '';
this.showPage = '';
// TODO:
} else {
throw msg;
}
} catch (error) {
this.$message.error(error || '修改失败');
}

13
src/components/Development/DevelopmentSearch.vue

@ -2,10 +2,10 @@
<div class="d-flex flex-wrap pb-3">
<!-- 中文名称 -->
<div>
<a-input placeholder="搜索内容" style="width: 150px" v-model="content" />
<a-checkbox-group @change="onChange" class="ml-3">
<a-input placeholder="成果名称" style="width: 150px" v-model="content" />
<!-- <a-checkbox-group @change="onChange" class="ml-3">
<a-checkbox :key="item.id" :value="item.id" v-for="item in typeLists">{{ item.name }}</a-checkbox>
</a-checkbox-group>
</a-checkbox-group> -->
<a-button @click="handleTableChange" class="ml-3" type="primary">搜索</a-button>
</div>
@ -14,12 +14,7 @@
<a-button @click="showModal" class="editable-add-btn" type="primary">增加</a-button>
<!-- 添加 -->
<development-add
:typeLists="typeLists"
:visible="visible"
@closeModal="closeModal"
@handleTableChange="handleTableChange"
/>
<development-add :typeLists="typeLists" :visible="visible" @closeModal="closeModal" @handleTableChange="handleTableChange" />
</div>
</template>

54
src/components/EntityApply/EntityApplyDate.vue

@ -1,11 +1,13 @@
<template>
<div class="main flex-1 flex-column">
<div style="width:100%" v-if="lists && lists.length > 0">
<div style="width: 100%" v-if="lists && lists.length > 0">
<a-table
:columns="columns"
:data-source="lists"
:loading="loading"
:pagination="pagination"
:row-key="record => record.id"
@change="handleTableChange"
:scroll="{ y: height }"
bordered
class="white"
@ -26,44 +28,28 @@
<template slot="processingStatus" slot-scope="text, record, index">
<div class="editable-cell d-flex flex-nowrap">
<a-badge status="success" />
<editable-cell-select
:arr="status"
:text="record.processingStatus"
@change="onCellChange(index, 'processingStatus', $event)"
/>
<editable-cell-select :arr="status" :text="record.processingStatus" @change="onCellChange(index, 'processingStatus', $event)" />
</div>
</template>
<template slot="dealStatus" slot-scope="text, record">
<a-tag
:color="record.dealStatus === 2 ? 'green' : record.dealStatus === 1 ? 'red' : 'blue'"
>{{ record.dealStatus === 2 ? '已通过' : record.dealStatus === 1 ? '未通过' : '审核中' }}</a-tag>
<a-tag :color="record.dealStatus === 2 ? 'green' : record.dealStatus === 1 ? 'red' : 'blue'">{{
record.dealStatus === 2 ? '已通过' : record.dealStatus === 1 ? '未通过' : '审核中'
}}</a-tag>
</template>
<!-- 审批 -->
<template slot="edit" slot-scope="text, record">
<a-button
@click="handleApply(record.id, 2)"
class="ml-3"
size="small"
type="primary"
v-if="record.dealStatus === 1"
>通过</a-button>
<a-button
@click="handleApply(record.id, 1)"
class="ml-3"
size="small"
type="danger"
v-if="record.dealStatus === 2"
>不通过</a-button>
<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"
>通过</a-button
>
<a-button @click="handleApply(record.id, 1)" class="ml-3" size="small" type="danger" v-if="record.dealStatus === 2"
>不通过</a-button
>
</template>
<div
class="d-flex flex-nowrap justify-space-between"
slot="expandedRowRender"
slot-scope="record"
style="margin: 0"
>
<div class="d-flex flex-nowrap justify-space-between" slot="expandedRowRender" slot-scope="record" style="margin: 0">
<detail :record="record" />
</div>
</a-table>
@ -118,7 +104,7 @@ const columns = [
scopedSlots: { customRender: 'dealStatus' },
},
{
title: '审批',
title: '操作',
align: 'center',
dataIndex: 'edit',
key: 'edit',
@ -157,6 +143,14 @@ export default {
},
methods: {
showEditModal(data) {
console.log(data);
},
handleTableChange(pagination) {
const { current, pageSize } = pagination;
const condition = { current, pageSize };
this.$emit('entityApplicationSearch', condition);
},
onCellChange(key, dataIndex, value) {
console.log('key, dataIndex, value: ', key, dataIndex, value);
const dataSource = [...this.dataSource];

28
src/components/Manage/ManageDate.vue

@ -1,12 +1,13 @@
<template>
<div class="main flex-1">
<div style="width:100%" v-if="lists && lists.length > 0">
<div style="width: 100%" v-if="lists.list && lists.list.length > 0">
<a-table
:columns="columns"
:data-source="lists"
:data-source="lists.list"
:loading="loading"
:pagination="pagination"
:row-key="record => record.id"
@change="handleTableChange"
:scroll="{ y: height }"
bordered
class="white"
@ -16,14 +17,14 @@
</template>
<template slot="model" slot-scope="text, record">
<span v-if=" record.model === 0">成果</span>
<span v-if=" record.model === 1">仪器</span>
<span v-if=" record.model === 2">实验室</span>
<span v-if="record.model === 0">成果</span>
<span v-if="record.model === 1">仪器</span>
<span v-if="record.model === 2">实验室</span>
</template>
<template slot="edit" slot-scope="text, record">
<a-icon @click="showEditModal(record)" class="pointer" theme="twoTone" type="edit" />
<a-popconfirm @confirm="() => onDelete(record.id)" title="确定要删除这一条?" v-if="lists.length">
<a-popconfirm @confirm="() => onDelete(record.id)" title="确定要删除这一条?" v-if="lists.list.length">
<a-icon class="ml-4 pointer" theme="twoTone" two-tone-color="#ff0000" type="delete" />
</a-popconfirm>
</template>
@ -32,12 +33,7 @@
<a-empty v-else />
<!-- 编辑 -->
<manage-edit
:editItem="editItem"
:editVisible="editVisible"
@closeModal="closeModal"
@selModelSearch="selModelSearch"
/>
<manage-edit :editItem="editItem" :editVisible="editVisible" @closeModal="closeModal" @selModelSearch="selModelSearch" />
</div>
</template>
@ -82,7 +78,7 @@ export default {
ManageEdit,
},
props: { lists: { type: Array, default: () => [] } },
props: { lists: { type: Object, default: () => {} }, pagination: { type: Object, default: () => {} } },
data() {
return {
@ -92,7 +88,6 @@ export default {
height: '',
editItem: null, //
editVisible: false,
pagination: false,
};
},
@ -138,6 +133,11 @@ export default {
this.$message.error(error || '删除失败');
}
},
handleTableChange(pagination) {
const { current, pageSize } = pagination;
const condition = { current, pageSize };
this.$emit('selModelSearch', condition);
},
},
};
</script>

26
src/components/Page/PageDate.vue

@ -1,7 +1,7 @@
<template>
<div class="main flex-1">
<a-spin :spinning="showEdit">
<div style="width:100%" v-if="lists && lists.length > 0">
<div style="width: 100%" v-if="lists && lists.length > 0">
<a-table
:columns="columns"
:data-source="lists"
@ -20,21 +20,12 @@
<template slot="edit" slot-scope="text, record">
<a-icon @click="showEditModal(record)" class="pointer" theme="twoTone" type="edit" />
<a-popconfirm
@confirm="() => onDelete(record.id)"
title="确定要删除这一条?"
v-if="lists.length"
>
<a-popconfirm @confirm="() => onDelete(record.id)" title="确定要删除这一条?" v-if="lists.length">
<a-icon class="ml-4 pointer" theme="twoTone" two-tone-color="#ff0000" type="delete" />
</a-popconfirm>
</template>
<div
class="d-flex flex-nowrap justify-space-between"
slot="expandedRowRender"
slot-scope="record"
style="margin: 0"
>
<div class="d-flex flex-nowrap justify-space-between" slot="expandedRowRender" slot-scope="record" style="margin: 0">
<div>
<a-spin :spinning="spinning" tip="详情加载中...">
内容
@ -48,12 +39,7 @@
<a-empty v-else />
<!-- 编辑 -->
<page-edit
:editItem="editItem"
:editVisible="editVisible"
@closeModal="closeModal"
@getPageList="getPageList"
/>
<page-edit :editItem="editItem" :editVisible="editVisible" @closeModal="closeModal" @getPageList="getPageList" />
</a-spin>
</div>
</template>
@ -141,9 +127,9 @@ export default {
},
//
async onDelete(pageId) {
async onDelete(id) {
try {
const params = { param: { pageId } };
const params = { param: { id } };
const res = await deletePage(params);
const { data, msg, code } = res.data;
if (code === 200) {

63
src/components/Partner/PartnerAdd.vue

@ -12,65 +12,35 @@
>
<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="[
'name',
{
rules: [
{ required: true, message: '公司名称不能为空' },
{ whitespace: true, message: '公司名称不能为空' },
{ max: 140, massage: '公司名称最多140个字符' },
],
},
]"
'name',
{
rules: [
{ required: true, message: '公司名称不能为空' },
{ whitespace: true, message: '公司名称不能为空' },
{ max: 140, massage: '公司名称最多140个字符' },
],
},
]"
/>
</a-form-item>
<!-- logo -->
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="公司logo"
required
>
<a-upload
:action="upload"
:before-upload="beforeUpload"
@change="handleChange"
list-type="picture"
name="files"
>
<a-button v-show="fileList.length - 0 === 0">
<a-icon type="upload" />选择图片
</a-button>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="公司logo" required>
<a-upload :action="upload" :before-upload="beforeUpload" @change="handleChange" list-type="picture" name="files">
<a-button v-show="fileList.length - 0 === 0"> <a-icon type="upload" />选择图片 </a-button>
</a-upload>
</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: 100%">
<a-select-option
:key="index"
:value="item.id"
v-for="(item, index) in policyStatus"
>{{ item.value }}</a-select-option>
<a-select-option :key="index" :value="item.id" v-for="(item, index) in policyStatus">{{ item.value }}</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="公司简介">
<quill-editor :max-size="maxSize" :placeholder="placeholder" @changeInput="changeInput" />
</a-form-item>
@ -177,6 +147,7 @@ export default {
const { data, msg, code } = res.data;
if (code === 200) {
this.$message.success('添加成功');
this.fileList = [];
this.$emit('getBackendSearch');
} else {
throw msg;

29
src/components/Policy/PolicySearch.vue

@ -4,22 +4,13 @@
<div>
<div class="d-flex flex-nowrap">
<!-- 输入框 -->
<a-select @change="changeType" class="mb-3" placeholder="类型" style="width: 80px">
<a-select-option
:key="index"
:value="type.code"
v-for="(type, index) in types"
>{{ type.value }}</a-select-option>
<a-select @change="changeType" class="mb-3 mr-3" placeholder="类型" style="width: 180px">
<a-select-option :key="index" :value="type.code" v-for="(type, index) in types">{{ type.value }}</a-select-option>
</a-select>
<a-input class="mb-3" placeholder="标题" style="width: 200px" v-model="options.input" />
<!-- 发布时间 -->
<a-range-picker
@change="onChangeTime"
class="ml-3 mb-3 flex-1"
format="YYYY-MM-DD"
show-time
/>
<a-range-picker @change="onChangeTime" class="ml-3 mb-3 flex-1" format="YYYY-MM-DD" show-time />
</div>
<!-- 是否勾选 -->
@ -31,18 +22,8 @@
<a-checkbox @change="onChangeTy" class="mb-3">太原市</a-checkbox>
</div>
<!-- 状态 -->
<a-select
@change="changeState"
allow-clear
class="ml-3 mb-3"
placeholder="状态"
style="width: 150px"
>
<a-select-option
:key="index"
:value="state.id"
v-for="(state, index) in policyStatus"
>{{ state.value }}</a-select-option>
<a-select @change="changeState" allow-clear class="ml-3 mb-3" placeholder="状态" style="width: 150px">
<a-select-option :key="index" :value="state.id" v-for="(state, index) in policyStatus">{{ state.value }}</a-select-option>
</a-select>
<a-button @click="handleTableChange" class="ml-3" type="primary">搜索</a-button>
<div class="flex-1"></div>

6
src/components/RD/RDDate.vue

@ -35,7 +35,7 @@
</div>
<a-empty v-else />
<a-modal title="修改审核状态" :visible="editVisible" :confirm-loading="confirmLoading" @ok="onDelete" @cancel="handleCancel">
<a-select @change="getStatus" class="ml-3" style="width: 250px">
<a-select :value="value" @change="getStatus" class="ml-3" style="width: 250px">
<a-select-option :key="item" :value="index" v-for="(item, index) in enable">{{ item }}</a-select-option>
</a-select>
</a-modal>
@ -131,6 +131,7 @@ export default {
delId: '',
dealStatus: '',
enable: ['未处理', '处理中', '已处理'],
value: '',
};
},
@ -160,9 +161,11 @@ export default {
showEditModal(id, status) {
this.delId = id;
this.dealStatus = status;
this.value = this.enable[status];
this.editVisible = true;
},
getStatus(e) {
this.value = this.enable[e];
this.dealStatus = e;
},
//
@ -178,6 +181,7 @@ export default {
const { data, msg, code } = res.data;
if (code === 200) {
this.$message.success('修改成功');
this.value = '';
this.$emit('searchServiceApply');
this.editVisible = false;
// TODO:

33
src/components/SpinOff/SpinOffDate.vue

@ -1,14 +1,7 @@
<template>
<div class="main flex-1">
<div style="width: 100%" v-if="lists && lists.length > 0">
<a-table
:columns="columns"
:data-source="lists"
:loading="loading"
:row-key="record => record.id"
bordered
class="white"
>
<a-table :columns="columns" :data-source="lists" :loading="loading" :row-key="record => record.id" bordered class="white">
<template slot="id" slot-scope="text, record, index">
<span>{{ index + 1 }}</span>
</template>
@ -28,24 +21,13 @@
</template>
<template slot="edit" slot-scope="text, record">
<a-icon
@click="showEditModal(record.id, record.dealStatus)"
class="pointer"
theme="twoTone"
type="edit"
/>
<a-icon @click="showEditModal(record.id, record.dealStatus)" class="pointer" theme="twoTone" type="edit" />
</template>
</a-table>
</div>
<a-empty v-else />
<a-modal
:confirm-loading="confirmLoading"
:visible="editVisible"
@cancel="handleCancel"
@ok="onDelete"
title="修改审核状态"
>
<a-select @change="getStatus" class="ml-3" style="width: 250px">
<a-modal :confirm-loading="confirmLoading" :visible="editVisible" @cancel="handleCancel" @ok="onDelete" title="修改审核状态">
<a-select :value="value" @change="getStatus" class="ml-3" style="width: 250px">
<a-select-option :key="item" :value="index" v-for="(item, index) in enable">{{ item }}</a-select-option>
</a-select>
</a-modal>
@ -161,6 +143,7 @@ export default {
delId: '',
dealStatus: '',
enable: ['未处理', '审核通过', '审核未通过'],
value: '',
};
},
@ -170,9 +153,10 @@ export default {
methods: {
showEditModal(id, dealStatus) {
this.editVisible = true;
this.value = this.enable[dealStatus];
this.delId = id;
this.dealStatus = dealStatus;
this.editVisible = true;
},
handleCancel() {
this.editVisible = false;
@ -180,6 +164,8 @@ export default {
this.dealStatus = '';
},
getStatus(e) {
console.log(e);
this.value = this.enable[e];
this.dealStatus = e;
},
//
@ -196,6 +182,7 @@ export default {
if (code === 200) {
this.$emit('getCreatingPlatformSearch');
this.editVisible = false;
this.value = '';
this.$message.success('修改成功');
} else {
throw msg;

9
src/components/Transfer/TransferSearch.vue

@ -2,7 +2,7 @@
<div class="d-flex flex-wrap pb-3">
<!-- 中文名称 -->
<div>
<a-input placeholder="搜索内容" style="width: 150px" v-model="content" />
<a-input placeholder="设备名称" style="width: 150px" v-model="content" />
<a-checkbox-group @change="onChange" class="ml-3">
<a-checkbox :key="item.id" :value="item.id" v-for="item in typeLists">{{ item.name }}</a-checkbox>
</a-checkbox-group>
@ -14,12 +14,7 @@
<a-button @click="showModal" class="editable-add-btn" type="primary">增加</a-button>
<!-- 添加 -->
<transfer-add
:typeLists="typeLists"
:visible="visible"
@closeModal="closeModal"
@handleTableChange="handleTableChange"
/>
<transfer-add :typeLists="typeLists" :visible="visible" @closeModal="closeModal" @handleTableChange="handleTableChange" />
</div>
</template>

5
src/config/api.js

@ -224,12 +224,15 @@ export const selLikeTeam = params => axios.post(`${researchTeam}/selLikeTeam`, p
// 查询轮播图列表
export const queryCarousel = params => axios.post(`${carousel}/queryCarousel`, params);
// 查询轮播图列表
// 添加轮播图
export const addCarousel = params => axios.post(`${carousel}/addCarousel`, params);
// 删除轮播图
export const deleteCarousel = params => axios.post(`${carousel}/deleteCarousel`, params);
// 修改轮播图
export const updateCarousel = params => axios.post(`${carousel}/updateCarousel`, params);
// 三大平台需求填报查询
export const searchServiceApply = params => axios.post(`${service}/searchServiceApply`, params);

11
src/views/CategoryManage/CategoryManage.vue

@ -1,7 +1,7 @@
<template>
<div class="pa-3 white fill-height d-flex flex-column">
<manage-search @selModelSearch="selModelSearch" />
<manage-date :lists="lists" @selModelSearch="selModelSearch" />
<manage-date :pagination="pagination" :lists="lists" @selModelSearch="selModelSearch" />
</div>
</template>
@ -19,7 +19,8 @@ export default {
data() {
return {
lists: [],
lists: {},
pagination: { current: 1, pageSize: 10, total: 0 },
};
},
@ -52,6 +53,12 @@ export default {
}
const data = await this.getSelModelSearch(params);
this.lists = data;
this.pagination.total = parseInt(data.total);
const paper = { ...this.pagination };
paper.current = data.pageNum;
paper.total = +data.total;
paper.pageSize = data.pageSize;
this.pagination = paper;
},
},
};

8
src/views/EntityApplication/VirtualApplication.vue

@ -1,11 +1,7 @@
<template>
<div class="pa-3 white fill-height d-flex flex-column">
<entity-apply-search @entityApplicationSearch="entityApplicationSearch" />
<entity-apply-date
:lists="lists"
:pagination="pagination"
@entityApplicationSearch="entityApplicationSearch"
/>
<entity-apply-date :lists="lists" :pagination="pagination" @entityApplicationSearch="entityApplicationSearch" />
</div>
</template>
@ -25,7 +21,7 @@ export default {
data() {
return {
lists: [],
pagination: { current: 1, pageSize: 10 },
pagination: { current: 1, pageSize: 10, total: 0 },
};
},

Loading…
Cancel
Save