Commit f3fb4bf9 authored by xulihui's avatar xulihui

修改行业专家库

parent 37def2d7
...@@ -51,3 +51,12 @@ export function exportBrowse(query) { ...@@ -51,3 +51,12 @@ export function exportBrowse(query) {
params: query params: query
}) })
} }
//获取任务
export function getProBehInforBrowseTask(query) {
return request({
url: '/government/supervision/getBehaviour',
method: 'get',
params: query
})
}
...@@ -51,3 +51,12 @@ export function exportBrowse(query) { ...@@ -51,3 +51,12 @@ export function exportBrowse(query) {
params: query params: query
}) })
} }
//获取任务
export function getExpertDeclarationTask(query) {
return request({
url: '/government/supervision/getProfessorInfo',
method: 'get',
params: query
})
}
...@@ -56,6 +56,14 @@ ...@@ -56,6 +56,14 @@
@click="handleExport" @click="handleExport"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button
plain
size="mini"
type="info"
@click="getGovermentTaskInfo"
>从省平台获取数据</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
...@@ -132,8 +140,18 @@ ...@@ -132,8 +140,18 @@
</template> </template>
<script> <script>
import { listBrowse, getBrowse, delBrowse, addBrowse, updateBrowse, exportBrowse } from "@/api/specialist/behBrowse"; import {
listBrowse,
getBrowse,
delBrowse,
addBrowse,
updateBrowse,
exportBrowse,
getProBehInforBrowseTask
} from "@/api/specialist/behBrowse";
import DetailInfo from "./components/DetailInfo"; import DetailInfo from "./components/DetailInfo";
import {getExpertDeclarationTask} from "@/api/specialist/browse";
import moment from "moment/moment";
export default { export default {
name: "Browse", name: "Browse",
components: { components: {
...@@ -291,6 +309,19 @@ export default { ...@@ -291,6 +309,19 @@ export default {
this.exportLoading = false; this.exportLoading = false;
}).catch(() => {}); }).catch(() => {});
}, },
//获取数据
getGovermentTaskInfo(){
this.$confirm('是否确认从省平台获取数据?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return getProBehInforBrowseTask({updateTime:moment().format('YYYY-MM-DD HH:mm:ss'),pageIndex: 1,pageSize: 1000});
}).then(() => {
this.getList();
this.msgSuccess("从省平台获取数据成功");
}).catch(() => {});
},
//详情 //详情
handleDetail(row){ handleDetail(row){
this.$refs.detail.getDetailInfo(row.fProBehInforId); this.$refs.detail.getDetailInfo(row.fProBehInforId);
......
...@@ -103,6 +103,14 @@ ...@@ -103,6 +103,14 @@
@click="handleExport" @click="handleExport"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button
plain
size="mini"
type="info"
@click="getGovermentTaskInfo"
>从省平台获取数据</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
...@@ -303,8 +311,9 @@ ...@@ -303,8 +311,9 @@
</template> </template>
<script> <script>
import { listBrowse, getBrowse, delBrowse, addBrowse, updateBrowse, exportBrowse } from "@/api/specialist/browse"; import { listBrowse, getBrowse, delBrowse, addBrowse, updateBrowse, exportBrowse, getExpertDeclarationTask } from "@/api/specialist/browse";
import DetailInfo from "./components/DetailInfo"; import DetailInfo from "./components/DetailInfo";
import moment from "moment";
export default { export default {
name: "Browse", name: "Browse",
components: { components: {
...@@ -557,6 +566,19 @@ export default { ...@@ -557,6 +566,19 @@ export default {
this.exportLoading = false; this.exportLoading = false;
}).catch(() => {}); }).catch(() => {});
}, },
//获取数据
getGovermentTaskInfo(){
this.$confirm('是否确认从省平台获取数据?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return getExpertDeclarationTask({updateTime:moment().format('YYYY-MM-DD HH:mm:ss'),pageIndex: 1,pageSize: 1000});
}).then(() => {
this.getList();
this.msgSuccess("从省平台获取数据成功");
}).catch(() => {});
},
//详情 //详情
handleDetail(row){ handleDetail(row){
this.$refs.detail.getDetailInfo(row.fProAppInforId); this.$refs.detail.getDetailInfo(row.fProAppInforId);
......
...@@ -255,11 +255,11 @@ ...@@ -255,11 +255,11 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="数据限定" prop="fDeptCode"> <el-form-item label="数据限定" prop="fDeptCode">
<el-input v-model="form.fDeptCode" placeholder="请输入数据限定" /> <el-input v-model="form.fDeptCode" placeholder="请输入数据限定" />
</el-form-item> </el-form-item>
</el-col> </el-col>-->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="数据来源" prop="fSource"> <el-form-item label="数据来源" prop="fSource">
...@@ -380,11 +380,11 @@ ...@@ -380,11 +380,11 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="从事专业工作年限" prop="fMajorLife"> <el-form-item label="从事专业工作年限" prop="fMajorLife">
<el-input-number <el-input-number
:style="{width: '320px'}" :style="{width: '320px'}"
controls-position="right" controls-position="right"
:min="0" :min="0"
v-model="form.fMajorLife" v-model="form.fMajorLife"
placeholder="请输入从事专业工作年限" /> placeholder="请输入从事专业工作年限" />
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -579,9 +579,9 @@ export default { ...@@ -579,9 +579,9 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
fDeptCode: [ /*fDeptCode: [
{ required: true, message: "数据限定不能为空", trigger: "blur" } { required: true, message: "数据限定不能为空", trigger: "blur" }
], ],*/
fSource: [ fSource: [
{ required: true, message: "数据来源不能为空", trigger: "change" } { required: true, message: "数据来源不能为空", trigger: "change" }
], ],
...@@ -698,7 +698,7 @@ export default { ...@@ -698,7 +698,7 @@ export default {
this.reset(); this.reset();
}, },
filterNum(value){ filterNum(value){
this.form.fMajorLife = Math.abs(this.value) //去除中文输入下的负号和 this.value是字符时00开头等乱输 this.form.fMajorLife = Math.abs(this.value) //去除中文输入下的负号和 this.value是字符时00开头等乱输
}, },
// 表单重置 // 表单重置
reset() { reset() {
...@@ -853,4 +853,4 @@ export default { ...@@ -853,4 +853,4 @@ export default {
.el-input-number .el-input__inner{ .el-input-number .el-input__inner{
text-align: left; text-align: left;
} }
</style> </style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment