UDI
/
spms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.调整功能菜单名称

Browse Source 
2.优化仓库字典页面操作
3.部分页面文字展示内容调整
4.新建单据时根据用户是否启用多级仓库判断是否展示部分输入框
featFunction
x_z 3 years ago
parent 8307190a07
commit bac7aac8af
8 changed files with 129 additions and 94 deletions
Show Stats Download Patch File Download Diff File

10
src/api/inventory/invRelBusTypes.js
Unescape Escape View File

@ -9,7 +9,6 @@ export function filterSelectInvUser(query) {
});
}
export function updateInvUser(query) {
return axios(
{
@ -20,3 +19,12 @@ export function updateInvUser(query) {
)
}
export function filterUserBusTypeList(query) {
return axios(
{
url: "spms/bus/user/filterUserBusList",
method: "get",
params: query
}
)
}

4
src/router/index.js
Unescape Escape View File

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

17
src/views/basic/UdiInfoManage.vue
Unescape Escape View File

@ -688,6 +688,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">
@ -849,6 +865,7 @@ export default {
allowNoBatch: null,
allowNoExpire: null,
allowNoProduct: null,
cpdls: null
},
defaultSys: null,
isImport: false,

18
src/views/basic/basicCompanyProducts.vue
Unescape Escape View File

@ -728,6 +728,19 @@
></el-input>
</div>
</el-col>
<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">
@ -1785,7 +1798,6 @@ export default {
});
},
handleSelectionChange(val) {
console.log("----" + val);
this.multipleSelection = val;
},
closeSelDialog(val) {
@ -1814,7 +1826,6 @@ export default {
page: 1,
limit: 10,
};
console.log("this.editQuery.isUseDy = " + this.editQuery.isUseDy);
this.getDetailList(ttquery);
this.getThirdSysDetail();
@ -1864,7 +1875,6 @@ export default {
page: 1,
limit: 10,
};
console.log("this.editQuery.isUseDy = " + this.editQuery.isUseDy);
this.getDetailList(ttquery);
this.getThirdSysDetail();
@ -1927,7 +1937,6 @@ export default {
this.uuid = this.editQuery.uuid;
this.originUuid = this.editQuery.originUuid;
this.relId = this.editQuery.rlId;
console.log(this.uuid + "\n" + this.originUuid);
},
closeDialog() {
this.selectErpDialogVisible = false;
@ -1946,7 +1955,6 @@ export default {
this.relevanceEdit.isUseDy = 0;
}
this.relevanceEdit.id = this.editQuery.rlId,
console.log(this.relevanceEdit.isUseDy);
updatetUdiInfos(this.relevanceEdit)
.then((response) => {
this.loading = false;

12
src/views/basic/basicCompanyProductsImport.vue
Unescape Escape View File

@ -555,14 +555,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="true"
>以使用单元数量入库
</el-checkbox>
</el-form-item>
</el-col>
</el-row>
</el-form>
@ -712,7 +704,6 @@ export default {
handleDetail(row) {
this.editQuery = row;
console.log(row);
},
combine() {
@ -744,7 +735,6 @@ export default {
this.loading = false;
if (response.code == 20000) {
this.$message.success(response.data);
console.log("关闭弹窗");
this.$emit("closeSelDialog", true);
this.closeSelDialog();
} else {
@ -798,7 +788,6 @@ export default {
});
},
handleSelectionChange(val) {
console.log("----" + val);
this.multipleSelection = val;
},
@ -821,7 +810,6 @@ export default {
page: 1,
limit: 10,
};
console.log("this.editQuery.isUseDy = " + this.editQuery.isUseDy);
this.getDetailList(ttquery);
this.getThirdSysDetail();

125
src/views/basic/invWarehouse.vue
Unescape Escape View File

@ -161,14 +161,14 @@
type="text"
size="small" :disabled="!configParms.basicInv"
@click.native.stop="addUser(scope.row)"
>添加用户
>管理用户
</el-button
>
<el-button
type="text"
size="small" :disabled="!configParms.basicInv"
@click.native.stop="addBussinessType(scope.row)"
>添加单据类型
>管理单据类型
</el-button
>
<el-button
@ -198,7 +198,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"
@ -215,12 +218,6 @@
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"
@ -243,6 +240,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"
@ -258,19 +258,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
@ -723,7 +710,7 @@
</div>
</el-dialog>
<!--用戶關聯單據類型-->
<!--用户关联单据类型-->
<el-dialog
title="业务类型关联"
:visible.sync="relBusUserVisile"
@ -745,7 +732,7 @@ import {
deleteWarehouse, warehouseBussinessTypeList,
warehouseUserList, saveWarehouseBussinessType,
saveWarehouseUser, updateDirector, disableWarehouse,
deleteWarehouseUser, deleteWarehouseBussinessType,
deleteWarehouseBussinessType,
bindThrWarehouse, unbindThrWarehouse, filterThridSubByInv, getThrsysDetail
} from "../../api/basic/invWarehouse";
import {
@ -762,6 +749,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,
@ -898,6 +886,7 @@ export default {
},
bussinessTypeTotal: 0,
curSeleUser: null,
busTableTitle: null
};
},
methods: {
@ -1264,21 +1253,20 @@ export default {
this.subRadioCheck = row.id;
this.currentCode = row.code;
this.currentRow = row;
this.curSeleUser = null;
this.busTableTitle = row.name + " 仓库关联单据类型";
this.loadLinkData(row)
},
loadSubData(parentId) {
this.userData = [];
this.bussinessTypeData = [];
let subQuery = {
parentId: parentId,
}
filterSubAll(subQuery).then((res) => {
if (res.code == 20000) {
this.subList = res.data;
}
}).catch((error) => {
});
@ -1289,6 +1277,7 @@ export default {
this.busQuery.page = 1;
this.userQuery.code = row.code;
this.busQuery.code = row.code;
this.curSeleUser = null;
//加载用户数据
this.loadUserList();
@ -1308,16 +1297,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;
@ -1499,27 +1493,6 @@ 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;
@ -1694,8 +1667,28 @@ 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: {
statusFilterType(status) {
const statusMap = {
@ -1703,8 +1696,7 @@ export default {
1: "success",
};
return statusMap[status];
}
,
},
statusFilterName(status) {
const statusMap = {
0: "禁用",
@ -1712,12 +1704,9 @@ export default {
};
return statusMap[status];
}
,
}
,
},
mounted() {
}
,
},
components: {
relBusUserDialog,
},
@ -1727,9 +1716,7 @@ export default {
this.getList();
this.getSyncConfig();
}
,
}
;
};
</script>
<style type="text/scss" lang="scss">

17
src/views/thrsys/ThrProductsAdd.vue
Unescape Escape View File

@ -240,6 +240,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: 60%"
size="small"
placeholder="请输入内容"
v-model.trim="newProductData.cpdls"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="20" class="el-col" style="margin-top: 12px">
@ -307,6 +323,7 @@ export default {
qxlb: null,
cpms: null,
thirdSys: null,
cpdls: null
},
thirdSys: [],
}

20
src/views/warehouse/addHosOrder.vue
Unescape Escape View File

@ -203,10 +203,10 @@
</el-col>
</el-row>
<el-row :gutter="20">
<el-row :gutter="20" v-if="enableDept">
<el-col :span="2">
<div class="ao-text">
<span>所属部门：</span>
<span>使用科室：</span>
</div>
</el-col>
<el-col :span="8">
@ -471,14 +471,14 @@ import {filterSubByInv} from "../../api/basic/invSubWarehouse";
import draggable from "vuedraggable";
import {parseTime} from "../../filtres/index";
import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
import {deleteWarehouse, filterAllByLoc, filterAllByUser} from "@/api/basic/invWarehouse";
import {getLocalBusType, getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
import {filterAllByLoc, filterAllByUser} from "@/api/basic/invWarehouse";
import {getLocalJoinByUser} from "../../api/basic/busLocalType";
import DialogSelectUnit from "./DialogSelectUnit";
import selectRlDialog from "./DialogSelectRl";
import editCodeDialog from "./editCode";
import A from "../../plugin/KeyScaner"
import {deleteLog} from "@/api/basic/udiinfolog";
import {filterDepts} from "@/api/auth/authDept";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
export default {
@ -571,6 +571,7 @@ export default {
codeDetail: null,
editTitle: "编辑条码",
fromDeptOptions: [],
enableDept: false
};
},
components: {
@ -1048,6 +1049,7 @@ export default {
filterSubByInv(cQuery)
.then((response) => {
this.fromSubStorageOptions = response.data || [];
this.formData.fromSubInvCode = this.fromSubStorageOptions[0].code;
})
.catch(() => {
});
@ -1260,6 +1262,14 @@ export default {
// this.findSubStorageMethod();
this.getBusType();
//查询是否启用多级仓库，判断是否启用部门
selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
if (res.code === 20000) {
if (res.data.paramValue === "0") {
this.enableDept = true;
}
}
})
},
};

Write Preview
Loading…
Cancel
Save