fix: BUG修改
This commit is contained in:
kun
parent
94f2a3d6e2
commit
375f02960a
@ -83,7 +83,7 @@ if (process.env.NODE_ENV == 'development') {
|
||||
// axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
|
||||
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
|
||||
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
|
||||
axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
|
||||
// axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
|
||||
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
|
||||
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
|
||||
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
|
||||
@ -91,7 +91,7 @@ if (process.env.NODE_ENV == 'development') {
|
||||
// axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
|
||||
// axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址
|
||||
// axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址
|
||||
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
|
||||
axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
|
||||
|
||||
|
||||
} else if (process.env.NODE_ENV == 'debug') {
|
||||
|
||||
@ -61,7 +61,7 @@ export default new Vuex.Store({
|
||||
"//" +
|
||||
window.location.host +
|
||||
"/upload/image", //正式环境
|
||||
FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
|
||||
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
|
||||
// WORKFLOWURL: 'http://jxj.zhgdyun.com:9811/#/workspace/forms',//正式工作流地址
|
||||
//---------------------------------------------------------------------------------------------
|
||||
// BASEURL: baseUrl
|
||||
|
||||
@ -1056,6 +1056,14 @@
|
||||
:label="i.moduleId"
|
||||
>{{ i.moduleName }}</el-checkbox
|
||||
>
|
||||
<div class="CheckboxTitle">工作台模块</div>
|
||||
<el-checkbox
|
||||
v-if="i.moduleType === 7"
|
||||
v-for="i in checkArr"
|
||||
:key="i.moduleId"
|
||||
:label="i.moduleId"
|
||||
>{{ i.moduleName }}</el-checkbox
|
||||
>
|
||||
</el-checkbox-group>
|
||||
<div class="dialog-footer">
|
||||
<el-button
|
||||
@ -3022,7 +3030,8 @@ export default {
|
||||
pageSize: this.pagInfo.pageSize
|
||||
}
|
||||
getorganizationJobPageApi(requestData).then((res) => {
|
||||
this.jobList = res.result;
|
||||
this.jobList = res.result.records;
|
||||
this.pagInfo.total = res.result.total;
|
||||
});
|
||||
},
|
||||
// 拒绝申请
|
||||
@ -3336,7 +3345,8 @@ export default {
|
||||
pageSize: this.pagInfo.pageSize
|
||||
}
|
||||
getUserManagerPageApi(requestData).then((res) => {
|
||||
this.userManageList = res.result;
|
||||
this.userManageList = res.result.records;
|
||||
this.pagInfo.total = res.result.total;
|
||||
});
|
||||
},
|
||||
// 获取新用户审核列表
|
||||
@ -3364,8 +3374,8 @@ export default {
|
||||
pageSize: this.pagInfo.pageSize
|
||||
}
|
||||
getSystemUserBySnPageApi(requestData).then((res) => {
|
||||
this.level1AccountData = res.result;
|
||||
this.pagInfo.total = res.result.length;
|
||||
this.level1AccountData = res.result.records;
|
||||
this.pagInfo.total = res.result.total;
|
||||
});
|
||||
},
|
||||
//删除项目
|
||||
|
||||
@ -740,7 +740,7 @@ export default {
|
||||
]
|
||||
},
|
||||
btnList: [],
|
||||
moudleTypeArr: ['企业前台', '项目后台', '企业后台', '项目看板', '项目前台','供应商管理'],
|
||||
moudleTypeArr: ['企业前台', '项目后台', '企业后台', '项目看板', '项目前台','供应商管理','工作台'],
|
||||
searchModuleType: 2,
|
||||
styleTypeArr: [
|
||||
'普通项目级版本',
|
||||
|
||||
@ -203,6 +203,10 @@
|
||||
<el-checkbox v-if="i.moduleType === 5" v-for="i in companyArr" :key="i.moduleId" :label="i.moduleId">{{
|
||||
i.moduleName
|
||||
}}</el-checkbox>
|
||||
<div class="CheckboxTitle">工作台模块</div>
|
||||
<el-checkbox v-if="i.moduleType === 7" v-for="i in companyArr" :key="i.moduleId" :label="i.moduleId">{{
|
||||
i.moduleName
|
||||
}}</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
@ -128,7 +128,7 @@
|
||||
:rules="formRules"
|
||||
>
|
||||
<el-form-item
|
||||
v-if="title == '添加子组织' || addEditForm.parentId !='0'"
|
||||
v-if="title == '添加子组织' || (addEditForm.parentId && addEditForm.parentId !='0')"
|
||||
label="选择父级"
|
||||
prop="parentId"
|
||||
>
|
||||
|
||||
@ -348,7 +348,7 @@ export default {
|
||||
getProjectMenu() {
|
||||
getProjectModuleGroupMenuListApi({
|
||||
projectSn: this.$store.state.projectSn,
|
||||
moduleTypes:'2,4',
|
||||
moduleTypes:'2,4,7',
|
||||
}).then(res => {
|
||||
var DATA = res.result;
|
||||
// DATA.forEach((element,i) => {
|
||||
|
||||
@ -29,10 +29,10 @@
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" plain>{{
|
||||
<el-button type="primary" plain @click="getTableList">{{
|
||||
$t("message.laborMange.inquire")
|
||||
}}</el-button>
|
||||
<el-button type="warning" plain>{{
|
||||
<el-button type="warning" plain @click="refreshTable">{{
|
||||
$t("message.laborMange.refresh")
|
||||
}}</el-button>
|
||||
<el-button type="primary" @click="openApplyDialog"
|
||||
@ -664,6 +664,14 @@ export default {
|
||||
|
||||
console.log(this.level1CompanyData);
|
||||
},
|
||||
// 刷新数据
|
||||
refreshTable(){
|
||||
this.tableParameter = {
|
||||
applyStatus: "",
|
||||
timeRange: []
|
||||
}
|
||||
this.getTableList();
|
||||
},
|
||||
// 获取表格数据
|
||||
getTableList() {
|
||||
let requestData = {
|
||||
|
||||
@ -45,6 +45,7 @@
|
||||
prop="remarks"
|
||||
label="备注"
|
||||
align="center"
|
||||
:show-overflow-tooltip="true"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
:label="$t('message.deviceManage.operation')"
|
||||
@ -298,6 +299,9 @@ export default {
|
||||
remarks: "",
|
||||
};
|
||||
}, 100);
|
||||
this.$nextTick(() => {
|
||||
this.$refs.addFileForm.clearValidate();
|
||||
});
|
||||
},
|
||||
getTableList() {
|
||||
let requestData = {
|
||||
@ -308,7 +312,8 @@ export default {
|
||||
getQualificationFilePageApi(requestData).then((res) => {
|
||||
console.log(res, "资质文件表格");
|
||||
if (res.result) {
|
||||
this.tableList = res.result;
|
||||
this.tableList = res.result.records;
|
||||
this.total = res.result.total;
|
||||
this.tableList.map((item) => {
|
||||
if (!item.fileUrl.includes(this.$store.state.FILEURL)) {
|
||||
item.fileUrl = this.$store.state.FILEURL + item.fileUrl;
|
||||
|
||||
@ -51,7 +51,10 @@
|
||||
import vhead from "@/components/header";
|
||||
import { getProjectDetail } from "@/assets/js/api/baseInfo.js";
|
||||
import { getGroupListApi } from "@/assets/js/api/loginSign.js";
|
||||
import { getAllModuleApi } from "@/assets/js/api/jxjadmin.js";
|
||||
import {
|
||||
getAllModuleApi,
|
||||
getNewUserAllModulePageApi,
|
||||
} from "@/assets/js/api/jxjadmin.js";
|
||||
export default {
|
||||
name: "workSpace",
|
||||
components: { vhead },
|
||||
@ -78,70 +81,73 @@ export default {
|
||||
},
|
||||
methods: {
|
||||
// 查询全部模块(拿到工作流的模块菜单)
|
||||
async getModuleList() {
|
||||
const res = await getAllModuleApi({
|
||||
moduleType: 2,
|
||||
styleType: this.$store.state.userInfo.styleType,
|
||||
});
|
||||
console.log(res);
|
||||
// 传递的工作流菜单
|
||||
const responseMenuList = [];
|
||||
if (res && res.result) {
|
||||
res.result.map((item) => {
|
||||
if (item.moduleName == "工作流" && item.menuList) {
|
||||
item.menuList.map((item2) => {
|
||||
getModuleList() {
|
||||
getNewUserAllModulePageApi({
|
||||
projectSn: this.$store.state.projectSn,
|
||||
moduleType: 7,
|
||||
}).then((res) => {
|
||||
// 传递的工作流菜单
|
||||
const responseMenuList = [];
|
||||
let all = res.result.moduleList;
|
||||
console.log("all", res.result);
|
||||
all.forEach((element, index) => {
|
||||
all[index].operation = false;
|
||||
res.result.menuList.forEach((element2) => {
|
||||
if (element2.moduleId == element.moduleId) {
|
||||
all[index].operation = true;
|
||||
responseMenuList.push({
|
||||
menuName: item2.menuName,
|
||||
path: item2.path,
|
||||
icon: item2.icon,
|
||||
menuName: element2.menuName,
|
||||
path: element2.path,
|
||||
icon: element2.icon,
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
console.log(responseMenuList, "我的测试数据啊啊啊啊");
|
||||
// 传递的工作流菜单
|
||||
const defaultMenuList = [
|
||||
{
|
||||
menuName: "审批列表",
|
||||
path: "/workspace/forms",
|
||||
icon: "el-icon-s-order",
|
||||
},
|
||||
{
|
||||
menuName: "待我处理",
|
||||
path: "/workspace/unfinished",
|
||||
icon: "el-icon-s-check",
|
||||
},
|
||||
{
|
||||
menuName: "已处理的",
|
||||
path: "/workspace/finished",
|
||||
icon: "el-icon-s-custom",
|
||||
},
|
||||
{
|
||||
menuName: "我发起的",
|
||||
path: "/workspace/submit",
|
||||
icon: "el-icon-s-claim",
|
||||
},
|
||||
{
|
||||
menuName: "关于我的",
|
||||
path: "/workspace/cc",
|
||||
icon: "el-icon-s-promotion",
|
||||
},
|
||||
];
|
||||
this.$nextTick(() => {
|
||||
setTimeout(() => {
|
||||
let iframe = document.getElementById("myIframe");
|
||||
iframe.contentWindow.postMessage(
|
||||
{
|
||||
type: "emitData",
|
||||
data: JSON.stringify(this.$store.state.userInfo),
|
||||
authMenuList:
|
||||
responseMenuList.length > 0
|
||||
? JSON.stringify(responseMenuList)
|
||||
: JSON.stringify(defaultMenuList),
|
||||
},
|
||||
"*"
|
||||
);
|
||||
}, 1000);
|
||||
});
|
||||
}
|
||||
// 传递的工作流菜单
|
||||
const defaultMenuList = [
|
||||
{
|
||||
menuName: "审批列表",
|
||||
path: "/workspace/forms",
|
||||
icon: "el-icon-s-order",
|
||||
},
|
||||
{
|
||||
menuName: "待我处理",
|
||||
path: "/workspace/unfinished",
|
||||
icon: "el-icon-s-check",
|
||||
},
|
||||
{
|
||||
menuName: "已处理的",
|
||||
path: "/workspace/finished",
|
||||
icon: "el-icon-s-custom",
|
||||
},
|
||||
{
|
||||
menuName: "我发起的",
|
||||
path: "/workspace/submit",
|
||||
icon: "el-icon-s-claim",
|
||||
},
|
||||
{
|
||||
menuName: "关于我的",
|
||||
path: "/workspace/cc",
|
||||
icon: "el-icon-s-promotion",
|
||||
},
|
||||
];
|
||||
this.$nextTick(() => {
|
||||
setTimeout(() => {
|
||||
let iframe = document.getElementById("myIframe");
|
||||
iframe.contentWindow.postMessage(
|
||||
{
|
||||
type: "emitData",
|
||||
data: JSON.stringify(this.$store.state.userInfo),
|
||||
authMenuList:
|
||||
responseMenuList.length > 0
|
||||
? JSON.stringify(responseMenuList)
|
||||
: JSON.stringify(defaultMenuList),
|
||||
},
|
||||
"*"
|
||||
);
|
||||
}, 1000);
|
||||
});
|
||||
},
|
||||
// 默认选中已选中组织的第一个项目
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user