1.调整部分页面文字显示,功能菜单名称,仓库管理页面布局和操作优化

purchase
x_z 3 years ago
parent 71468119e8
commit 91c4bb8da9

@ -20,3 +20,13 @@ export function updateInvUser(query) {
)
}
export function filterUserBusTypeList(query) {
return axios(
{
url: "spms/bus/user/filterUserBusList",
method: "get",
params: query
}
)
}

@ -248,7 +248,7 @@ export const asyncRouterMap = [
{
path: "authDept",
component: authDept,
name: "部门管理",
name: "科室管理",
icon: "",
meta: {
authRule: ["authMange/authDept"]
@ -440,7 +440,7 @@ export const asyncRouterMap = [
{
path: "invWarehouse",
component: invWarehouse,
name: "仓库字典",
name: "仓库 / 科室字典",
icon: "",
meta: {
authRule: ["basicProduct/invWarehouse"]

@ -713,6 +713,22 @@
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>进口产品代理商:&nbsp;</span>
</div>
<el-input
style="width: 65%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.cpdls"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="24" class="el-col">
<div style="margin-top: 18px;margin-bottom: 18px">

@ -575,13 +575,6 @@
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item prop="name">
<el-checkbox v-model="checked" class="text item itemTag" disabled
>以使用单元数量入库
</el-checkbox>
</el-form-item>
</el-col>
</el-row>
</el-form>
@ -736,7 +729,6 @@ export default {
handleDetail(row) {
this.editQuery = row;
console.log(row);
},
combine() {
@ -769,7 +761,6 @@ export default {
this.loading = false;
if (response.code == 20000) {
this.$message.success(response.data);
console.log("关闭弹窗");
this.$emit("closeSelDialog", true);
this.closeSelDialog();
} else {
@ -823,7 +814,6 @@ export default {
});
},
handleSelectionChange(val) {
console.log("----" + val);
this.multipleSelection = val;
},
@ -846,7 +836,6 @@ export default {
page: 1,
limit: 10,
};
console.log("this.editQuery.isUseDy = " + this.editQuery.isUseDy);
this.getDetailList(ttquery);
this.getThirdSysDetail();
@ -935,7 +924,6 @@ export default {
components: {},
created() {
console.log(" this.filterQuery.unitFk = " + this.unitFk)
this.getList();
this.selectSysParam();
},

@ -162,7 +162,7 @@
size="small"
:disabled="!configParms.basicInv"
@click.native.stop="addUser(scope.row)"
>添加用户
>管理用户
</el-button
>
<el-button
@ -170,7 +170,7 @@
size="small"
:disabled="!configParms.basicInv"
@click.native.stop="addBussinessType(scope.row)"
>添加单据类型
>管理单据类型
</el-button
>
<el-button
@ -201,7 +201,10 @@
<el-table
:data="userData"
key="row.id"
style="width: 100%">
style="width: 100%"
highlight-current-row
@current-change="loadUserBusType"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
prop="username"
@ -218,20 +221,12 @@
min-width="30%"
>
<template slot-scope="scope">
<el-button
type="text"
size="small" :disabled="!configParms.basicInv"
@click.native="delWarehouseUser(scope.row.id)">
移除
</el-button>
<el-button
type="text"
size="small" :disabled="!configParms.basicInv"
@click.native="relBusttype(scope.row)">
关联单据类型
</el-button>
</template>
</el-table-column>
</el-table>
@ -246,6 +241,9 @@
</el-card>
<el-card style="width: 49%; float: right; margin-left: 0px;">
<div slot="header" class="clearfix">
<span>{{ busTableTitle }}</span>
</div>
<el-table
:data="bussinessTypeData"
key="row.id"
@ -261,19 +259,6 @@
label="单据类型名称"
min-width="30%">
</el-table-column>
<el-table-column
label="操作"
min-width="20%"
>
<template slot-scope="scope">
<el-button
type="text"
size="small" :disabled="!configParms.basicInv"
@click.native="delWarehouseBussinessType(scope.row.id)">
移除
</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination
@ -730,7 +715,6 @@ import {
deleteWarehouse, warehouseBussinessTypeList,
warehouseUserList, saveWarehouseBussinessType,
saveWarehouseUser, updateDirector, disableWarehouse,
deleteWarehouseUser, deleteWarehouseBussinessType,
bindThrWarehouse, unbindThrWarehouse, filterThridSubByInv, getThrsysDetail
} from "../../api/basic/invWarehouse";
import {
@ -747,6 +731,7 @@ import {findConfig} from "@/api/thrsys/spsSyncStatus";
import {isBlank} from "@/utils/strUtil";
import relBusUserDialog from "./invWarehouseRelBusTypes";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {filterUserBusTypeList} from "@/api/inventory/invRelBusTypes";
const formJson = {
id: null,
@ -872,6 +857,7 @@ export default {
},
busTotal: 0,
curSeleUser: null,
busTableTitle: null
};
},
methods: {
@ -1238,6 +1224,8 @@ export default {
this.subRadioCheck = row.id;
this.currentCode = row.code;
this.currentRow = row;
this.curSeleUser = null;
this.busTableTitle = row.name + " 仓库关联单据类型";
this.loadLinkData(row)
},
@ -1263,6 +1251,7 @@ export default {
this.busQuery.page = 1;
this.userQuery.code = row.code;
this.busQuery.code = row.code;
this.curSeleUser = null;
//
this.loadUserList();
@ -1282,16 +1271,21 @@ export default {
});
},
loadBusList(val) {
if (val != null) {
this.busQuery.page = val;
//
if (this.curSeleUser == null) {
if (val != null) {
this.busQuery.page = val;
}
//
warehouseBussinessTypeList(this.busQuery).then((res) => {
this.bussinessTypeData = res.data.list;
this.busTotal = res.data.total;
}).catch((error) => {
this.$message.error("单据类型数据加载失败")
});
} else {
this.getUserBusTypeList(val);
}
//
warehouseBussinessTypeList(this.busQuery).then((res) => {
this.bussinessTypeData = res.data.list;
this.busTotal = res.data.total;
}).catch((error) => {
this.$message.error("单据类型数据加载失败")
});
},
addUser(row) {
this.currentCode = row.code;
@ -1464,48 +1458,12 @@ export default {
this.$message.error("设置失败");
});
},
delWarehouseUser(id) {
let params = {id: id};
deleteWarehouseUser(params).then((res) => {
if (res.code == 20000) {
this.$message.success("已移除");
for (let i = 0; i < this.userData.length; i++) {
if (this.userData[i].id == id) {
this.userData.splice(i, 1);
return;
}
}
} else {
this.$message.error(res.message);
}
}).catch((error) => {
this.$message.error("移除失败");
})
},
relBusttype(row) {
this.curSeleUser = row;
this.relBusUserVisile = true;
},
delWarehouseBussinessType(id) {
let params = {id: id};
deleteWarehouseBussinessType(params).then((res) => {
if (res.code == 20000) {
this.$message.success("已移除");
for (let i = 0; i < this.bussinessTypeData.length; i++) {
if (this.bussinessTypeData[i].id == id) {
this.bussinessTypeData.splice(i, 1);
return;
}
}
} else {
this.$message.error("移除失败");
}
}).catch((error) => {
this.$message.error("移除失败");
})
},
//
bindThrWarehouse() {
this.thrWareHouseVisible = false;
@ -1655,6 +1613,27 @@ export default {
}
});
},
loadUserBusType(row) {
this.busTableTitle = row.employeeName + " 用户关联单据类型";
this.curSeleUser = row;
this.getUserBusTypeList(1);
},
getUserBusTypeList(page) {
let queryParam = {
subInvCode: this.currentCode,
userId: this.curSeleUser.userid,
page: page,
limit: 10
};
filterUserBusTypeList(queryParam).then((res) => {
if (res.code === 20000) {
this.bussinessTypeData = res.data.list || [];
this.bussinessTypeTotal = res.data.total || 0;
}
}).catch((error) => {
})
},
}
,
filters: {

@ -203,7 +203,7 @@
<el-row :gutter="20">
<el-col :span="2">
<div class="ao-text">
<span>所属部门</span>
<span>使用科室</span>
</div>
</el-col>
<el-col :span="8">
@ -471,6 +471,7 @@ import selectRlDialog from "./DialogSelectRl";
import editCodeDialog from "./editCode";
import A from "../../plugin/KeyScaner"
import {isBlank} from "@/utils/strUtil";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
export default {
@ -561,6 +562,7 @@ export default {
checkSuccess: false,
codeDetail: null,
editTitle: "编辑条码",
enableDept: false
};
},
components: {
@ -1259,6 +1261,15 @@ export default {
}
}
this.findSubInvByInv(this.formData.locStorageCode);
//
selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
if (res.code === 20000) {
if (res.data.paramValue === "0") {
this.enableDept = true;
}
}
})
}
};
</script>

@ -259,6 +259,23 @@
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>进口产品代理商:&nbsp;</span>
</div>
<el-input
style="width: 60%"
size="small"
placeholder="请输入内容"
v-model.trim="newProductData.cpdls"
></el-input>
</div>
</el-col>
</el-row>
</div>
<div style='text-align: center; margin-bottom: 10px;'>
@ -307,6 +324,7 @@ export default {
qxlb: null,
cpms: null,
thirdSys: null,
cpdls: null
},
thirdSys: [],
}

Loading…
Cancel
Save