admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改管理人员可以移动至其他企业

Browse Source
This commit is contained in:
Vce 2024-05-30 11:53:45 +08:00
parent 220aae7085
commit f6223062de
3 changed files with 65 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/assets/js/http.js
View File

@ -86,7 +86,7 @@ if (process.env.NODE_ENV == 'development') {
// 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.155:19111/' //彭洁本地
axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
@ -97,7 +97,7 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
// axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:11211/'//鞍钢测试地址
axios.defaults.baseURL = 'http://42.180.188.17:11211/'//鞍钢测试地址
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址
} else if (process.env.NODE_ENV == 'debug') {

24
src/store/index.js
View File

@ -48,8 +48,8 @@ export default new Vuex.Store({
PAGESIZRS: [10, 20, 30, 50],
// UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色
// FILEURL:' http://101.43.164.214:11111/image/',// 百色
UPLOADURL:'http://182.90.224.237:51234/upload/image/',
FILEURL:'http://182.90.224.237:51234/image/',
// UPLOADURL:'http://182.90.224.237:51234/upload/image/',
// FILEURL:'http://182.90.224.237:51234/image/',
// UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
// FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
// UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地
@ -61,19 +61,19 @@ export default new Vuex.Store({
// UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试
// FILEURL:'http://42.180.188.17:11211/image/',//测试
// BASEURL: baseUrl
// ? baseUrl
// : window.location.protocol + "//" + window.location.host + "/", //正式环境
// UPLOADURL:
// window.location.protocol +
// "//" +
// window.location.host +
// "/upload/image", //正式环境
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
BASEURL: baseUrl
? baseUrl
: window.location.protocol + "//" + window.location.host + "/", //正式环境
UPLOADURL:
window.location.protocol +
"//" +
window.location.host +
"/upload/image", //正式环境
FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
// WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
// WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
// WORKFLOWURL: 'http://42.180.188.17:19098/#/workspace/forms',//鞍钢测试平台工作流地址
WORKFLOWURL: 'http://42.180.188.17:19098/#/workspace/forms',//鞍钢测试平台工作流地址
//---------------------------------------------------------------------------------------------
// BASEURL: baseUrl
// ? baseUrl

51
src/views/projectFront/laborManage/personModule/administration.vue
View File

@ -1767,6 +1767,33 @@
label-position="top"
label-width="80px"
>
<!-- 选择企业 -->
<el-form-item
:label="$t('message.laborMange.set')"
prop="enterpriseId"
:rules="[
{
required: true,
message: $t('message.laborMange.pleaseSelectMoveTo'),
trigger: 'change',
},
]"
>
<el-select
v-model="batchMoveForm.enterpriseId"
:placeholder="$t('message.laborMange.pleaseChoose')"
@change="changeMoveCompany"
style="width: 100%"
>
<el-option
v-for="item in enterpriseListData"
:key="item.id"
:label="item.enterpriseName"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<!-- 选择部门 -->
<el-form-item
:label="$t('message.laborMange.mobileDivision')"
prop="departmentId"
@ -2181,6 +2208,7 @@ export default {
batchMoveDialog: false, //批量移动弹窗
//批量移动表单
batchMoveForm: {
enterpriseId: "",
departmentId: "",
},
moveTeamList: [], // 选择移动的班组的列表
@ -3552,12 +3580,35 @@ export default {
batchMove() {
this.batchMoveDialog = true;
this.batchMoveForm = {
enterpriseId: "",
departmentId: "",
};
setTimeout(() => {
this.$refs["batchMoveForm"].clearValidate();
}, 120);
},
//选择批量移动的 公司时
changeMoveCompany(value) {
this.batchMoveForm.departmentId = "";
let data = {
enterpriseId: value,
projectSn: this.projectSn,
};
getDepartmentInfoList(data).then((res) => {
console.log("移动时，部门列表数据=====：", res);
if (res.code == 200) {
// this.checkedTeamId = 0;
// this.checkedTeamId = type !== 1 ? 0 : this.checkedTeamId;
this.teamListData = res.result;
// this.getTableData();
}
});
// getTeamInfoList(data).then((res) => {
// if (res.code == 200) {
// this.moveTeamList = res.result;
// }
// });
},
//批量移动 保存按钮
saveBatchMove(formName) {