Skip to content

T
techbook
Commit 7c8f1284 authored by zhangyanni's avatar zhangyanni
Browse files
Options

提交

parent fa58f5c4
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 18 deletions
src/views/busgovernment/auditDetail.vue
View file @ 7c8f1284
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</el-row> </el-row>
<el-row class="projectTabadd" style="margin-top: 20px" v-if="partnerInfo"> <el-row class="projectTabadd" style="margin-top: 20px" v-if="partnerInfo">
<el-tabs v-model="activeName"> <el-tabs v-model="activeName">
<el-tab-pane label="验收操作" name="first" style="position: relative;"> <el-tab-pane label="详细信息" name="first" style="position: relative;">
<div style="margin: 10px 30px 0;"> <div style="margin: 10px 30px 0;">
<el-form :inline="true" label-width="160px" :model="partnerInfo" class="contnetform"> <el-form :inline="true" label-width="160px" :model="partnerInfo" class="contnetform">
<el-form-item label="区域：" style="width: 100%;"> <el-form-item label="区域：" style="width: 100%;">
......
src/views/busgovernment/auditList.vue
View file @ 7c8f1284
...@@ -31,7 +31,23 @@ ...@@ -31,7 +31,23 @@
</el-form> </el-form>
</el-row> </el-row>
<div class="gendisplay statebottm" style="margin: 20px 0 0 25px;">
<el-form :inline="true" label-width="120px" label-position="left" style="width: 100%;">
<el-form-item label="审核时间：">
<template slot-scope="scope">
<div style="display: flex">
<el-date-picker style="width: 200px;" v-model="checkStartTime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
:placeholder="$t('operationjson.authBegin')"></el-date-picker>
<p style="width: 50px;text-align: center;line-height: 40px;">{{$t('operationjson.tos')}}</p>
<el-date-picker style="width: 200px;" v-model="checkEndTime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
:placeholder="$t('operationjson.authEnd')"></el-date-picker>
</div>
</template>
</el-form-item>
</el-form>
</div>
<div class="gendisplay" style="margin: 20px 0 0 25px;"> <div class="gendisplay" style="margin: 20px 0 0 25px;">
<el-form :inline="true" label-width="120px" label-position="left" style="width: 100%;"> <el-form :inline="true" label-width="120px" label-position="left" style="width: 100%;">
<el-form-item label="创建时间："> <el-form-item label="创建时间：">
...@@ -174,7 +190,9 @@ ...@@ -174,7 +190,9 @@
return { return {
activeName: "first", activeName: "first",
startTime: "", startTime: "",
checkStartTime:"",
endTime: "", endTime: "",
checkEndTime:"",
orgIdList: [], orgIdList: [],
cur_page: 1, //页数 cur_page: 1, //页数
numberData: 10, //设置个数 numberData: 10, //设置个数
...@@ -240,8 +258,8 @@ ...@@ -240,8 +258,8 @@
//搜索 //搜索
handleSearch() { handleSearch() {
this.cur_page = 1; this.cur_page = 1;
if (this.startTime && this.endTime) { if ((this.startTime && this.endTime)||(this.checkStartTime&&this.checkEndTime)) {
if (this.publicFun.getDataCheck(this.startTime, this.endTime)) { if (this.publicFun.getDataCheck(this.startTime, this.endTime)||this.publicFun.getDataCheck(this.checkStartTime, this.checkEndTime)) {
this.$message.error(this.$t('usermanagement.time')); this.$message.error(this.$t('usermanagement.time'));
return; return;
} }
...@@ -249,8 +267,11 @@ ...@@ -249,8 +267,11 @@
this.searchData.cur_page = 1; this.searchData.cur_page = 1;
this.searchData.startTime = this.startTime; this.searchData.startTime = this.startTime;
this.searchData.endTime = this.endTime; this.searchData.endTime = this.endTime;
this.searchData.checkStartTime = this.checkStartTime;
this.searchData.checkEndTime = this.checkEndTime;
this.searchData.keyWord = this.keyWord; this.searchData.keyWord = this.keyWord;
this.searchData.currentStatus = this.currentStatus; this.searchData.currentStatus = this.currentStatus;
this.searchData.currentStar = this.currentStar;
this.searchData.orgIdList = this.orgIdList; this.searchData.orgIdList = this.orgIdList;
this.searchData.contactsName = this.contactsName; this.searchData.contactsName = this.contactsName;
this.$store.dispatch('myAuditBusGoverManageListSearchAction', {path: this.$route.path, pars: this.searchData}); this.$store.dispatch('myAuditBusGoverManageListSearchAction', {path: this.$route.path, pars: this.searchData});
...@@ -261,9 +282,12 @@ ...@@ -261,9 +282,12 @@
handleReset() { handleReset() {
this.startTime = ""; this.startTime = "";
this.endTime = ""; this.endTime = "";
this.checkStartTime = "";
this.checkEndTime = "";
this.keyWord = ""; this.keyWord = "";
this.cur_page = 1; this.cur_page = 1;
this.currentStatus = null; this.currentStatus = null;
this.currentStar = null;
this.orgIdList = []; this.orgIdList = [];
this.contactsName = ""; this.contactsName = "";
this.$store.dispatch('myAuditBusGoverManageListSearchAction', {path: this.$route.path, pars: {}}); this.$store.dispatch('myAuditBusGoverManageListSearchAction', {path: this.$route.path, pars: {}});
...@@ -281,6 +305,12 @@ ...@@ -281,6 +305,12 @@
if (this.searchData.hasOwnProperty("endTime")) { if (this.searchData.hasOwnProperty("endTime")) {
this.endTime = this.searchData.endTime; this.endTime = this.searchData.endTime;
} }
if (this.searchData.hasOwnProperty("checkStartTime")) {
this.checkStartTime = this.searchData.checkStartTime;
}
if (this.searchData.hasOwnProperty("checkEndTime")) {
this.checkEndTime = this.searchData.checkEndTime;
}
if (this.searchData.hasOwnProperty("keyWord")) { if (this.searchData.hasOwnProperty("keyWord")) {
this.keyWord = this.searchData.keyWord; this.keyWord = this.searchData.keyWord;
} }
...@@ -306,6 +336,8 @@ ...@@ -306,6 +336,8 @@
empName: this.contactsName, empName: this.contactsName,
orgIdList: this.orgIdList, orgIdList: this.orgIdList,
checkState: this.currentStatus, checkState: this.currentStatus,
checkStartTime: this.checkStartTime,
checkEndTime: this.checkEndTime,
}; };
api.getMyAuditManagerBusgoverList(params).then((res) => { api.getMyAuditManagerBusgoverList(params).then((res) => {
if (res.code == 0) { if (res.code == 0) {
...@@ -339,10 +371,12 @@ ...@@ -339,10 +371,12 @@
empName: this.contactsName, empName: this.contactsName,
orgIdList: this.orgIdList, orgIdList: this.orgIdList,
checkState: this.currentStatus, checkState: this.currentStatus,
selectedFields: data ? data : [] selectedFields: data ? data : [],
checkStartTime: this.checkStartTime,
checkEndTime: this.checkEndTime,
}; };
if (this.startTime && this.endTime) { if ((this.startTime && this.endTime)||(this.checkStartTime&&this.checkEndTime)) {
if (this.publicFun.getDataCheck(this.startTime, this.endTime)) { if (this.publicFun.getDataCheck(this.startTime, this.endTime)||this.publicFun.getDataCheck(this.checkStartTime, this.checkEndTime)) {
this.$message.error(this.$t('usermanagement.time')); this.$message.error(this.$t('usermanagement.time'));
return; return;
} }
......
src/views/busgovernment/detail.vue
View file @ 7c8f1284
...@@ -6,15 +6,17 @@ ...@@ -6,15 +6,17 @@
:to="{ path: publicFun.isgetUserRoleFunc(5)?'':publicFun.isgetUserRoleFunc(2)?'/projectdynamics':'/litemlist' }"> :to="{ path: publicFun.isgetUserRoleFunc(5)?'':publicFun.isgetUserRoleFunc(2)?'/projectdynamics':'/litemlist' }">
{{$t("workPlace.myworkPlace")}} {{$t("workPlace.myworkPlace")}}
</el-breadcrumb-item> </el-breadcrumb-item>
<el-breadcrumb-item><span @click="$router.go(-1)" style="font-weight: bold;cursor: pointer;">合作伙伴列表</span></el-breadcrumb-item> <el-breadcrumb-item><span @click="$router.go(-1)" style="font-weight: bold;cursor: pointer;">大企业机构政府列表</span></el-breadcrumb-item>
<el-breadcrumb-item>合作伙伴详情</el-breadcrumb-item> <el-breadcrumb-item>大企业机构详情</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
<el-row class="projectTabadd" style="margin-top: 20px" v-if="partnerInfo"> <el-row class="projectTabadd" style="margin-top: 20px" v-if="partnerInfo">
<el-tabs v-model="activeNames"> <el-tabs v-model="activeNames">
<el-tab-pane label="详细资料" name="first" style="position: relative;"> <el-tab-pane label="详细资料" name="first" style="position: relative;">
<div style="margin: 10px 30px 0;"> <div style="margin: 10px 30px 0;">
<el-row style="margin: 10px 30px"> <el-row style="margin: 10px 30px">
<p v-if="partnerInfo.checkState!=2" style="padding: 10px;background: rgb(255, 239, 239);border: 1px solid rgb(255, 93, 93);" :style="{color:partnerInfo.checkState==0?'#FF5D5D':partnerInfo.checkState==1?'#0ABB87 ':'unset'}">{{partnerInfo.checkState==0?'您提交的KOL专家未通过验收，请修改后重新提交。驳回理由：'+partnerInfo.checkDesc:partnerInfo.checkState==1?'已验收 ':''}}</p> <p v-if="partnerInfo.checkState==0" style="padding: 10px;background: rgb(255, 239, 239);border: 1px solid rgb(255, 93, 93);" :style="{color:partnerInfo.checkState==0?'#FF5D5D':partnerInfo.checkState==1?'#0ABB87 ':'unset'}">{{partnerInfo.checkState==0?'您提交的大企业机构政府未通过验收，请修改后重新提交。驳回理由：'+partnerInfo.checkDesc:partnerInfo.checkState==1?'已验收通过':''}}</p>
<p v-if="partnerInfo.checkState==1" style="padding: 10px;background: #f0f9eb;border: 1px solid #0ABB87;" :style="{color:partnerInfo.checkState==0?'#FF5D5D':partnerInfo.checkState==1?'#0ABB87 ':'unset'}">{{partnerInfo.checkState==0?'您提交的大企业机构政府未通过验收，请修改后重新提交。驳回理由：'+partnerInfo.checkDesc:partnerInfo.checkState==1?'已验收通过':''}}</p>
</el-row> </el-row>
<el-form :inline="true" label-width="160px" :model="partnerInfo" class="contnetform"> <el-form :inline="true" label-width="160px" :model="partnerInfo" class="contnetform">
<el-form-item label="单位名称：" style="width: 100%;"> <el-form-item label="单位名称：" style="width: 100%;">
......
src/views/busgovernment/list.vue
View file @ 7c8f1284
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
:to="{ path: publicFun.isgetUserRoleFunc(5)?'':publicFun.isgetUserRoleFunc(2)?'/projectdynamics':'/litemlist' }"> :to="{ path: publicFun.isgetUserRoleFunc(5)?'':publicFun.isgetUserRoleFunc(2)?'/projectdynamics':'/litemlist' }">
{{$t("workPlace.myworkPlace")}} {{$t("workPlace.myworkPlace")}}
</el-breadcrumb-item> </el-breadcrumb-item>
<el-breadcrumb-item>目标领域大企业机构政府</el-breadcrumb-item> <el-breadcrumb-item>大企业机构政府列表</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
</div> </div>
<div class="projectTabadd" style="margin-top: 10px;position: relative;border-radius: 3px;min-height: 700px;"> <div class="projectTabadd" style="margin-top: 10px;position: relative;border-radius: 3px;min-height: 700px;">
<el-tabs v-model="activeName"> <el-tabs v-model="activeName">
<el-tab-pane label="目标领域大企业机构政府列表" name="first"> <el-tab-pane label="大企业机构政府列表" name="first">
<div class="btodiv"> <div class="btodiv">
<div class="gendisplay" style="margin: 20px 0 0 25px;"> <div class="gendisplay" style="margin: 20px 0 0 25px;">
<el-date-picker style="width: 200px;" v-model="startTime" type="datetime" <el-date-picker style="width: 200px;" v-model="startTime" type="datetime"
......
src/views/partner/auditDetail.vue
View file @ 7c8f1284
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</el-row> </el-row>
<el-row class="projectTabadd" style="margin-top: 20px" v-if="partnerInfo"> <el-row class="projectTabadd" style="margin-top: 20px" v-if="partnerInfo">
<el-tabs v-model="activeName"> <el-tabs v-model="activeName">
<el-tab-pane label="验收操作" name="first" style="position: relative;"> <el-tab-pane label="详细信息" name="first" style="position: relative;">
<div style="margin: 10px 30px 0;"> <div style="margin: 10px 30px 0;">
<el-form :inline="true" label-width="160px" :model="partnerInfo" class="contnetform"> <el-form :inline="true" label-width="160px" :model="partnerInfo" class="contnetform">
<el-form-item label="区域：" style="width: 100%;"> <el-form-item label="区域：" style="width: 100%;">
......
src/views/partner/auditList.vue
View file @ 7c8f1284
...@@ -37,6 +37,23 @@ ...@@ -37,6 +37,23 @@
:screenchildListIf="true" ref="screenchildStar" :titleName="'星级'" :screenchildListIf="true" ref="screenchildStar" :titleName="'星级'"
@changecheck="handleChangeStar"></page-screen> @changecheck="handleChangeStar"></page-screen>
</el-row> </el-row>
<div class="gendisplay statebottm" style="margin: 20px 0 0 25px;">
<el-form :inline="true" label-width="120px" label-position="left" style="width: 100%;">
<el-form-item label="审核时间：">
<template slot-scope="scope">
<div style="display: flex">
<el-date-picker style="width: 200px;" v-model="checkStartTime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
:placeholder="$t('operationjson.authBegin')"></el-date-picker>
<p style="width: 50px;text-align: center;line-height: 40px;">{{$t('operationjson.tos')}}</p>
<el-date-picker style="width: 200px;" v-model="checkEndTime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
:placeholder="$t('operationjson.authEnd')"></el-date-picker>
</div>
</template>
</el-form-item>
</el-form>
</div>
<div class="gendisplay" style="margin: 20px 0 0 25px;"> <div class="gendisplay" style="margin: 20px 0 0 25px;">
<el-form :inline="true" label-width="120px" label-position="left" style="width: 100%;"> <el-form :inline="true" label-width="120px" label-position="left" style="width: 100%;">
...@@ -177,7 +194,9 @@ ...@@ -177,7 +194,9 @@
return { return {
activeName: "first", activeName: "first",
startTime: "", startTime: "",
checkStartTime:"",
endTime: "", endTime: "",
checkEndTime:"",
orgIdList: [], orgIdList: [],
cur_page: 1, //页数 cur_page: 1, //页数
numberData: 10, //设置个数 numberData: 10, //设置个数
...@@ -266,8 +285,8 @@ ...@@ -266,8 +285,8 @@
//搜索 //搜索
handleSearch() { handleSearch() {
this.cur_page = 1; this.cur_page = 1;
if (this.startTime && this.endTime) { if ((this.startTime && this.endTime)||(this.checkStartTime&&this.checkEndTime)) {
if (this.publicFun.getDataCheck(this.startTime, this.endTime)) { if (this.publicFun.getDataCheck(this.startTime, this.endTime)||this.publicFun.getDataCheck(this.checkStartTime, this.checkEndTime)) {
this.$message.error(this.$t('usermanagement.time')); this.$message.error(this.$t('usermanagement.time'));
return; return;
} }
...@@ -275,6 +294,8 @@ ...@@ -275,6 +294,8 @@
this.searchData.cur_page = 1; this.searchData.cur_page = 1;
this.searchData.startTime = this.startTime; this.searchData.startTime = this.startTime;
this.searchData.endTime = this.endTime; this.searchData.endTime = this.endTime;
this.searchData.checkStartTime = this.checkStartTime;
this.searchData.checkEndTime = this.checkEndTime;
this.searchData.keyWord = this.keyWord; this.searchData.keyWord = this.keyWord;
this.searchData.currentStatus = this.currentStatus; this.searchData.currentStatus = this.currentStatus;
this.searchData.currentStar = this.currentStar; this.searchData.currentStar = this.currentStar;
...@@ -288,6 +309,8 @@ ...@@ -288,6 +309,8 @@
handleReset() { handleReset() {
this.startTime = ""; this.startTime = "";
this.endTime = ""; this.endTime = "";
this.checkStartTime = "";
this.checkEndTime = "";
this.keyWord = ""; this.keyWord = "";
this.cur_page = 1; this.cur_page = 1;
this.currentStatus = null; this.currentStatus = null;
...@@ -310,6 +333,12 @@ ...@@ -310,6 +333,12 @@
if (this.searchData.hasOwnProperty("endTime")) { if (this.searchData.hasOwnProperty("endTime")) {
this.endTime = this.searchData.endTime; this.endTime = this.searchData.endTime;
} }
if (this.searchData.hasOwnProperty("checkStartTime")) {
this.checkStartTime = this.searchData.checkStartTime;
}
if (this.searchData.hasOwnProperty("checkEndTime")) {
this.checkEndTime = this.searchData.checkEndTime;
}
if (this.searchData.hasOwnProperty("keyWord")) { if (this.searchData.hasOwnProperty("keyWord")) {
this.keyWord = this.searchData.keyWord; this.keyWord = this.searchData.keyWord;
} }
...@@ -337,6 +366,8 @@ ...@@ -337,6 +366,8 @@
search: { search: {
startTime: this.startTime, startTime: this.startTime,
endTime: this.endTime, endTime: this.endTime,
checkStartTime: this.checkStartTime,
checkEndTime: this.checkEndTime,
keyWord: this.keyWord, keyWord: this.keyWord,
contactsName: this.contactsName, contactsName: this.contactsName,
orgIdList: this.orgIdList, orgIdList: this.orgIdList,
...@@ -372,6 +403,8 @@ ...@@ -372,6 +403,8 @@
let params = { let params = {
startTime: this.startTime, startTime: this.startTime,
endTime: this.endTime, endTime: this.endTime,
checkStartTime: this.checkStartTime,
checkEndTime: this.checkEndTime,
keyWord: this.keyWord, keyWord: this.keyWord,
contactsName: this.contactsName, contactsName: this.contactsName,
orgIdList: this.orgIdList, orgIdList: this.orgIdList,
...@@ -379,8 +412,8 @@ ...@@ -379,8 +412,8 @@
starRating: this.currentStar, starRating: this.currentStar,
fieldIdList: data ? data : [] fieldIdList: data ? data : []
}; };
if (this.startTime && this.endTime) { if ((this.startTime && this.endTime)||(this.checkStartTime&&this.checkEndTime)) {
if (this.publicFun.getDataCheck(this.startTime, this.endTime)) { if (this.publicFun.getDataCheck(this.startTime, this.endTime)||this.publicFun.getDataCheck(this.checkStartTime, this.checkEndTime)) {
this.$message.error(this.$t('usermanagement.time')); this.$message.error(this.$t('usermanagement.time'));
return; return;
} }
......
src/views/partner/detail.vue
View file @ 7c8f1284
...@@ -14,7 +14,9 @@ ...@@ -14,7 +14,9 @@
<el-tab-pane label="详细资料" name="first" style="position: relative;"> <el-tab-pane label="详细资料" name="first" style="position: relative;">
<div style="margin: 10px 30px 0;"> <div style="margin: 10px 30px 0;">
<el-row style="margin: 10px 30px"> <el-row style="margin: 10px 30px">
<p v-if="partnerInfo.checkState!=2" style="padding: 10px;background: rgb(255, 239, 239);border: 1px solid rgb(255, 93, 93);" :style="{color:partnerInfo.checkState==0?'#FF5D5D':partnerInfo.checkState==1?'#0ABB87 ':'unset'}">{{partnerInfo.checkState==0?'您提交的KOL专家未通过验收，请修改后重新提交。驳回理由：'+partnerInfo.checkDesc:partnerInfo.checkState==1?'已验收 ':''}}</p> <p v-if="partnerInfo.checkState==0" style="padding: 10px;background: rgb(255, 239, 239);border: 1px solid rgb(255, 93, 93);" :style="{color:partnerInfo.checkState==0?'#FF5D5D':partnerInfo.checkState==1?'#0ABB87 ':'unset'}">{{partnerInfo.checkState==0?'您提交的合作伙伴未通过验收，请修改后重新提交。驳回理由：'+partnerInfo.checkDesc:partnerInfo.checkState==1?'已验收通过':''}}</p>
<p v-if="partnerInfo.checkState==1" style="padding: 10px;background: #f0f9eb;border: 1px solid #0ABB87;" :style="{color:partnerInfo.checkState==0?'#FF5D5D':partnerInfo.checkState==1?'#0ABB87 ':'unset'}">{{partnerInfo.checkState==0?'您提交的合作伙伴未通过验收，请修改后重新提交。驳回理由：'+partnerInfo.checkDesc:partnerInfo.checkState==1?'已验收通过':''}}</p>
</el-row> </el-row>
<el-form :inline="true" label-width="160px" :model="partnerInfo" class="contnetform"> <el-form :inline="true" label-width="160px" :model="partnerInfo" class="contnetform">
<el-form-item label="单位名称：" style="width: 100%;"> <el-form-item label="单位名称：" style="width: 100%;">
......
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