diff --git a/src/api/basic/busLocalType.js b/src/api/basic/busLocalType.js deleted file mode 100644 index f72ab98c..00000000 --- a/src/api/basic/busLocalType.js +++ /dev/null @@ -1,75 +0,0 @@ -import axios from "../../utils/request"; - -export function getLocalBusType(query) { - return axios({ - url: "/udiwms/localBusType/filter", - method: "get", - params: query - }); -} - -export function getLocalJoinBusType(query) { - return axios({ - url: "/udiwms/localBusType/filterJoin", - method: "get", - params: query - }); -} - -export function getLocalJoinByUser(query) { - return axios({ - url: "/udiwms/localBusType/filterJoinByUser", - method: "get", - params: query - }); -} - -export function getLocalJoinNoUse(query) { - return axios({ - url: "/udiwms/localBusType/filterUnUse", - method: "get", - params: query - }); -} - -export function filterByBus(query) { - return axios({ - url: "/udiwms/localBusType/filterByBus", - method: "get", - params: query - }); -} - - -export function addLocalBusType(query) { - return axios({ - url: "/udiwms/localBusType/add", - method: "post", - data: query - }); -} - - -export function deleteLocalBusType(query) { - return axios({ - url: "/udiwms/localBusType/delete", - method: "post", - data: query - }); -} - -export function updateLocalBusType(query) { - return axios({ - url: "/udiwms/localBusType/update", - method: "post", - data: query - }); -} - -export function filterForThirdSys() { - return axios({ - url: "/udiwms/localBusType/filterForThirdSys", - method: "get", - param: null - }) -} diff --git a/src/api/basic/busOriginType.js b/src/api/basic/busOriginType.js index 2ae1fa5e..d99fc36d 100644 --- a/src/api/basic/busOriginType.js +++ b/src/api/basic/busOriginType.js @@ -30,8 +30,6 @@ export function delBussinessType(query) { }); } - - export function downloadBussinessType(query) { return axios({ url: "/udiwms/originBusType/download", diff --git a/src/api/basic/busType.js b/src/api/basic/busType.js index 4111656c..0d18c7e9 100644 --- a/src/api/basic/busType.js +++ b/src/api/basic/busType.js @@ -57,3 +57,11 @@ export function exportFile(query) { responseType: 'arraybuffer', //一定要设置响应类型,否则页面会是空白pdf }); } + +export function filterForThirdSys() { + return axios({ + url: "/udiwms/bussinessType/filterForThirdSys", + method: "get", + params: null + }) +} diff --git a/src/api/basic/busTypePre.js b/src/api/basic/busTypePre.js new file mode 100644 index 00000000..990e874a --- /dev/null +++ b/src/api/basic/busTypePre.js @@ -0,0 +1,49 @@ +import axios from "../../utils/request"; + +export function getBusTypePreResList(params) { + return axios({ + url: "/spms/busTypePre/filterList", + method: "get", + params: params + }); +} + +export function getBusTypePreList(params) { + return axios({ + url: "/spms/busTypePre/filter", + method: "get", + params: params + }); +} + +export function removeBusTypePre(data) { + return axios({ + url: "/spms/busTypePre/remove", + method: "post", + data: data + }); +} + +export function deleteBusTypePre(data) { + return axios({ + url: "/spms/busTypePre/delete", + method: "post", + data: data + }); +} + +export function updateBusTypePre(data) { + return axios({ + url: "/spms/busTypePre/update", + method: "post", + data: data + }); +} + +export function addBusTypePre(data) { + return axios({ + url: "/spms/busTypePre/insert", + method: "post", + data: data + }); +} diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index ed308b8d..92bbf180 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -74,6 +74,7 @@ overflow: hidden !important; text-overflow: ellipsis !important; white-space: nowrap !important; + height: 45px; //侧边菜单栏高度 } // menu hover diff --git a/src/views/basic/busType/busTypeAdvancedSettings.vue b/src/views/basic/busType/busTypeAdvancedSettings.vue new file mode 100644 index 00000000..cfd32aa7 --- /dev/null +++ b/src/views/basic/busType/busTypeAdvancedSettings.vue @@ -0,0 +1,233 @@ + + + + + 单据设置: + + + + 启用单据类型 + + + + 允许手动输入客户信息 + + + 允许科室多次使用出库 + + + 手持终端提交单据至自助平台 + + + + + + + + + + 允许验收自助平台单据 + + + 寄售类型单据 + + + 预验收 + + + 允许供应商使用 + + + + + + + + + 单据默认选项: + + + + 单据默认自动补单 + + + 出库时必须校验预验收库存 + + + 是否只允许有库存产品出库 + + + 采集UDI码时进行三期校验 + + + + + + + + + + 需要校验的单据来源类型(一次复核) + + + + + + + + + web端新增单据 + + + 手持终端未校验单据 + + + 手持终端已校验单据 + + + UDIMS平台 + + + + + + + + + + + UDI扫码通 + + + + 自助平台同步 + + + 自动补单 + + + 平衡补单 + + + + + + + + + + + 手动补单 + + + + + + + + + + + 需要单据复核的单据来源类型(二次复核) + + + + + + + + + web端新增单据 + + + 手持终端未校验单据 + + + 手持终端已校验单据 + + + UDIMS平台 + + + + + + + + + UDI扫码通 + + + 自助平台同步 + + + 自动补单 + + + 平衡补单 + + + + + + + + + 手动补单 + + + + + + + + + + + + + + diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue index c9ec257b..b078c80f 100644 --- a/src/views/basic/busType/bussinessType.vue +++ b/src/views/basic/busType/bussinessType.vue @@ -46,43 +46,41 @@ - - - - + + + + {{ mainActionMap[scope.row.mainAction] }} - + {{ enableMap[scope.row.enable] }} - + {{ enableMap[scope.row.checkEnable] }} - + {{ enableMap[scope.row.secCheckEnable] }} - + 编辑 删除 - - + 提交 - 取消 @@ -117,17 +115,17 @@ - + 提交 @@ -177,7 +175,6 @@ export default { mainAction: "", thirdSysFk: "", id: "", - localAction: null, checkEnable: false, genUnit: false, innerOrder: false, @@ -218,6 +215,10 @@ export default { defaultInv: null, defaultSubInv: null, orderVisibleType: 0, + advanceType: null, + preIn: null, + originAction: null, + comments: null, }, enableMap: { true: "是", @@ -232,7 +233,7 @@ export default { multipleSelection: [], uploadFileUrl: null, headers: {}, - configParms: {}, + configParams: {}, loading: false, }; @@ -285,21 +286,18 @@ export default { onAddSubmit() { if (isBlank(this.inputQuery.name)) { - this.$message.error("扫码单据类型名称不能为空!"); + this.$message.error("单据类型名称不能为空!"); return; } if (this.$isBlank(this.inputQuery.corpType)) { this.$message.error("往来信息类型不能为空!"); return; } - if (this.inputQuery.enable && this.inputQuery.localAction == "") { - this.$message.error("本地单据类型不能为空!"); - return; - } if (this.inputQuery.mainAction == "" || this.inputQuery.mainAction == null) { this.$message.error("出入库类型不能为空!"); return; } + this.inputQuery.enable = 1; insertBusType(this.inputQuery) .then((response) => { if (response.code == 20000) { @@ -357,65 +355,13 @@ export default { }); }, - handleAddClick() { this.inputQuery = {enable: false, expireTip: true}; this.addDialogVisible = true; }, handleModifyClick(row) { - this.inputQuery = { - id: row.id, - remark: row.remark, - action: row.action, - name: row.name, - enable: row.enable, - mainAction: row.mainAction, - localAction: row.localAction, - thirdSysFk: row.thirdSysFk, - checkEnable: row.checkEnable, - genUnit: row.genUnit, - innerOrder: row.innerOrder, - spUse: row.spUse, - secCheckEnable: row.secCheckEnable, - checkUdims: row.checkUdims, - checkPdaEd: row.checkPdaEd, - checkPdaUn: row.checkPdaUn, - checkPc: row.checkPc, - checkWebNew: row.checkWebNew, - checkChange: row.checkChange, - secCheckUdims: row.secCheckUdims, - secCheckPdaEd: row.secCheckPdaEd, - secCheckPdaUn: row.secCheckPdaUn, - secCheckPc: row.secCheckPc, - secCheckWebNew: row.secCheckWebNew, - secCheckChange: row.secCheckChange, - thirdAction: row.thirdAction, - corpType: row.corpType + "", - storageCode: row.storageCode, - secCheckSp: row.secCheckSp, - checkSp: row.checkSp, - supplementOrderType: row.supplementOrderType, - checkBalacne: row.checkBalacne, - secCheckBalacne: row.secCheckBalacne, - defaultUnit: row.defaultUnit, - useDyCount: row.useDyCount, - expireTip: row.expireTip, - prefix: row.prefix, - outTospms: row.outTospms, - ullageFill: row.ullageFill, - scanPreIn: row.scanPreIn, - vailInv: row.vailInv, - entrutSpms: row.entrutSpms, - codeFillCheck: row.codeFillCheck, - changeEnable: row.changeEnable, - defaultSubInv: row.defaultSubInv, - defaultInv: row.defaultInv, - orderVisibleType: row.orderVisibleType, - checkCopy: row.checkCopy, - secCheckCopy: row.secCheckCopy, - - }; + this.inputQuery = row; this.modifyDialogVisible = true; }, @@ -432,14 +378,6 @@ export default { }); }, - - getActionName(action) { - for (let i = 0; i < this.busTypes.length; i++) { - if (this.busTypes[i].localAction === action) { - return this.busTypes[i].localName; - } - } - }, deleteOrders(data) { this.loading = true; let tquery = { @@ -484,7 +422,7 @@ export default { findConfig() .then((response) => { if (response.code == 20000) { - this.configParms = response.data; + this.configParams = response.data; } }) .catch(() => { @@ -503,3 +441,9 @@ export default { }, }; + + diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue index 89ae7f6a..9f68bdc9 100644 --- a/src/views/basic/busType/bussinessTypeModify.vue +++ b/src/views/basic/busType/bussinessTypeModify.vue @@ -1,15 +1,15 @@ - + - + - + - @@ -28,9 +28,13 @@ - + - + - + @@ -59,12 +65,14 @@ - + - + - + > @@ -101,6 +111,29 @@ + + + + + + {{ item.name }} + {{ + item.action + }} + + + + + + @@ -111,186 +144,47 @@ - - 单据设置: - - - 启用单据类型 - 允许手动输入客户信息 - - 允许科室多次使用出库 - - 手持终端提交单据至自助平台 - - 允许验收自助平台单据 - - - - - - - 单据默认选项: - - - - 单据默认自动补单 - - 出库时必须校验预验收库存 - - 是否只允许有库存产品出库 - - 采集UDI码时进行三期校验 - - - - - - - - - - 需要校验的单据来源类型(一次复核) - - - - - - - web端新增单据 - - - - - - 手持终端未校验单据 - - - - - - 手持终端已校验单据 - - - - - - UDIMS平台 - - - - - - UDI扫码通 - - - - - - - - 自助平台同步 - - - - - 自动补单 - - - - - - 平衡补单 - - - - - - 手动补单 - - + + 高级设置 + - - - - - 需要单据复核的单据来源类型(二次复核) - - - - - - - - - web端新增单据 - - - - - - 手持终端未校验单据 - - - - - - 手持终端已校验单据 - - - - - - UDIMS平台 - - - - - - UDI扫码通 - - - + + - - - - - 自助平台同步 - - - - - - 自动补单 - - - - - - 平衡补单 - - - - - - 手动补单 - - - - - - + + diff --git a/src/views/inventory/InvSpaceManage.vue b/src/views/inventory/InvSpaceManage.vue index 57cff1a6..c0213bf9 100644 --- a/src/views/inventory/InvSpaceManage.vue +++ b/src/views/inventory/InvSpaceManage.vue @@ -8,9 +8,9 @@ 查询 新增货位 @@ -39,34 +39,33 @@ 编辑 删除 - - + @@ -76,7 +75,6 @@ placeholder="请输入货位编码"> - - @@ -99,7 +96,6 @@ - @@ -109,7 +105,6 @@ - 提交 @@ -146,7 +141,7 @@ export default { invStorageCode: null, key: null, page: 1, - limit: 20, + limit: 10, customerId: null, }, list: [], @@ -204,7 +199,7 @@ export default { invWarehouseCode: this.invInfo.invWarehouseCode, invStorageCode: this.invInfo.invStorageCode, page: 1, - limit: 20, + limit: 10, }; this.getList(); }, @@ -239,19 +234,19 @@ export default { cancelButtonText: "取消", type: "warning", }) - .then(() => { - let params = {id: rowId}; - deleteSpace(params).then((res) => { - if (res.code === 20000) { - this.$message.success("删除成功!"); - this.getList(); - } else { - this.$message.error(res.message); - } - }) + .then(() => { + let params = {id: rowId}; + deleteSpace(params).then((res) => { + if (res.code === 20000) { + this.$message.success("删除成功!"); + this.getList(); + } else { + this.$message.error(res.message); + } }) - .catch(() => { - }); + }) + .catch(() => { + }); }, cancelDialog() { this.modifySpaceVisible = false @@ -260,11 +255,11 @@ export default { getStorage() { this.storageList = []; filterUplLocInv() - .then((response) => { - this.storageList = response.data || []; - }) - .catch(() => { - }); + .then((response) => { + this.storageList = response.data || []; + }) + .catch(() => { + }); }, resetForm() { if (this.$refs["formData"]) { diff --git a/src/views/system/dept/invRelBusType.vue b/src/views/system/dept/invRelBusType.vue new file mode 100644 index 00000000..9fb46a27 --- /dev/null +++ b/src/views/system/dept/invRelBusType.vue @@ -0,0 +1,95 @@ + + + + + + + + + 重置 + + 查询 + + 选入单据类型 + + + + + + + + + + + 移除 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/system/dept/invRelUsers.vue b/src/views/system/dept/invRelUsers.vue new file mode 100644 index 00000000..a9fe949f --- /dev/null +++ b/src/views/system/dept/invRelUsers.vue @@ -0,0 +1,312 @@ + + + + + + + + + 重置 + + 查询 + + 选入用户 + + + + + + + + + + + + + + 移除 + + + + + + + + + + 管理单据类型 + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/system/dept/invUserRelBusTypes.vue b/src/views/system/dept/invUserRelBusTypes.vue index 2b8458a6..a1b0109e 100644 --- a/src/views/system/dept/invUserRelBusTypes.vue +++ b/src/views/system/dept/invUserRelBusTypes.vue @@ -1,9 +1,17 @@ + > + + + + {{ scope.option.label }} + + + + 提交 @@ -115,5 +123,13 @@ export default { diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue index f3dfb187..c78f7275 100644 --- a/src/views/system/dept/invWarehouse.vue +++ b/src/views/system/dept/invWarehouse.vue @@ -54,8 +54,9 @@ label="上级仓库" > - + + 编辑 + + 用户管理 + + + + 单据类型 + + - + - - - - {{ currentRow.name }}-用户列表 - - + + + + - 重置 - - 查询 - - 选入用户 - + 查询 - + type="index" + label="序号" + > + prop="code" + label="仓库编码" + > - - - 移除 - - - - - - - - - - 管理单据类型 - - - - - {{ currentRow.name }}-单据类型 - - - - - - - 重置 - - 查询 - - 选入单据类型 - - - - - - - - - - - 移除 - - + - - - + + + + + + + + + + + + + + + + + + + + + {{ currentRow.name }}-货位信息 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -437,16 +330,17 @@ import { import {getHospitalUserList, selectNotSelectUser} from "@/api/auth/authUser"; import {getJoinBussinessType} from "@/api/basic/bussinessType"; import {findConfig} from "@/api/thrsys/spsSyncStatus"; -import relBusUserDialog from "./invUserRelBusTypes"; import {selectSysParamByKey} from "@/api/system/param/systemParamConfig"; import invSpaceManage from "@/views/inventory/InvSpaceManage"; import { - addWarehouseUser, deleteWarehouseBussinessType, deleteWarehouseUser, filterList, + addWarehouseUser, deleteWarehouseBussinessType, deleteWarehouseUser, filterList, filterThridSubByInv, warehouseBussinessTypeList, warehouseUserList } from "@/api/system/invWarehouse"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import Treeselect from "@riophae/vue-treeselect"; +import InvRelBusType from "@/views/system/dept/invRelBusType"; +import InvRelUsers from "@/views/system/dept/invRelUsers"; export default { data() { @@ -484,47 +378,20 @@ export default { subData: {}, fromDeptOptions: [], invOptions: [], - - - //---------------仓库-用户相关--------------------- - userQuery: { - code: null, - page: 1, - limit: 10 - }, - userData: [], - userTotal: 0, - //---------------仓库添加用户----- - selectUserQuery: { - code: null, - page: 1, - limit: 10 - }, - userFormVisible: false, - userloading: false, - selectUserList: [], - selectUserToatl: 0, - selectAddUser: [], - //------用户-单据类型相关----------------------- - curSeleUser: null, - relBusUserVisile: false, - userBussinessTypeList: [], - - bussinessTypeTotal: 0, - bussinessTypeQuery: { - enabled: true, + thirdSubQuery: { + parentId: null, + name: null, page: 1, limit: 10, - ids: "" + thirdSysFk: "thirdId", }, + thrSubWareHouseVisible: false, + thrSubWarehouseData: [], + checkSubThrWarehouseRow: null, + subTotal: 0, - busQuery: { - code: null, - page: 1, - limit: 10 - }, - selectBussinessTypeList: [], - bussinessTypeFormVisible: false, + relBusTypeVisible: false, + relUserVisible: false, //管理货位 currentInvInfo: { @@ -546,7 +413,6 @@ export default { name: "", status: "", }; - this.userQuery.page = 1; this.busQuery.page = 1; this.getList(); }, @@ -571,7 +437,6 @@ export default { }); }, handleSubForm(data, formName) { //新增,编辑 - this.formName = formName; if (formName === "edit") { this.subData = JSON.parse(JSON.stringify(data)); @@ -661,165 +526,104 @@ export default { this.currentCode = row.code; this.currentRow = row; this.curSeleUser = null; - //加载用户信息 - this.loadLinkData(row) //加载单据类型 this.selsectBussinessType(row); //加载货位信息 this.invSpaceManage(row); }, - - - //------仓库-用户相关------------------ - loadUserList(val) { //获取仓库用户列表 - if (val != null) { - this.userQuery.page = val; + //关联第三方仓库信息 + intentSubSelect(row) { + if (row != null) { + if (row.sysId != null && row.sysId != undefined) { + this.thirdSubQuery.thirdSysFk = row.sysId; + } } - //加载用户数据 - warehouseUserList(this.userQuery).then((res) => { - this.userData = res.data.list; - this.userTotal = res.data.total; + this.thrSubWarehouseData = []; + this.thrSubWareHouseVisible = true; + filterThridSubByInv(this.thirdSubQuery).then((res) => { + if (res.code == 20000) { + this.thrSubWarehouseData = res.data.list; + this.subTotal = res.data.total || 0; + } else { + this.$message.error(res.message); + } + }).catch((error) => { - this.$message.error("用户数据加载失败") + this.thrWarehouseData = []; + this.subTotal = 0; + this.$message.error("第三方分库库数据加载失败"); }); }, - rmInvUser(row) { //移除仓库关联用户 - this.$confirm("确定移除该仓库关联用户?", "提示", { + changeSubThrWarehouse(row) { + this.checkSubThrWarehouseRow = row; + }, + hideThrWarehouseTable() { + this.thrWareHouseVisible = false; + this.thrSubWareHouseVisible = false; + }, + //绑定第三方分库 + bindSubThrWarehouse() { + let params = { + id: this.subData.id, + thridWarehouseId: this.checkSubThrWarehouseRow.code, + sysId: this.checkSubThrWarehouseRow.thirdSysFk + } + bindThrSubWarehouse(params).then((res) => { + if (res.code == 20000) { + this.$message.success("绑定成功") + this.getSubThrsysDetailData(); + } + this.thrSubWareHouseVisible = false; + }).catch((error) => { + this.$message.error("绑定失败"); + this.thrSubWareHouseVisible = false; + }) + }, + //解绑第三方分库 + unbindSubThrWarehouse(row) { + + this.$confirm("确定解绑已关联第三方仓库信息?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", }) .then(() => { - let params = {id: row.id}; - deleteWarehouseUser(params).then((res) => { - if (res.code == 20000) { - this.loadUserList(); - } else { - this.$message.error(res.message); - } + let params = { + id: this.subData.id, + sysId: row.sysId + }; + unbindSubThrWarehouse(params).then((res) => { + this.$message.success("解绑成功"); + this.getSubThrsysDetailData(); }).catch((error) => { - }); - - + this.$message.error("解绑失败"); + }) }) .catch(() => { }); - }, - - - loadLinkData(row) { - this.userQuery.page = 1; - this.userQuery.code = row.code; - this.curSeleUser = null; - //加载用户数据 - this.loadUserList(); - }, - - //添加仓库关联用户 - addUser() { - this.currentCode = this.currentRow.code; - this.userFormVisible = true; - this.selectUserQuery.code = this.currentRow.code; - this.selectUserQuery.page = 1; - this.getSelectUser(); - }, - - handleUserSelectionChange(val) { - this.selectAddUser = val; - }, - getSelectUser() { - selectNotSelectUser(this.selectUserQuery).then((res) => { - this.selectUserList = res.data.list; - this.selectUserToatl = res.data.total; - }).catch((error) => { - this.$message.error("用户数据加载失败") - }); }, - addUserData() { - let query = { - code: this.currentCode, - userList: JSON.stringify(this.selectAddUser) - }; - addWarehouseUser(query).then((res) => { - if (res.code === 20000) { - this.userFormVisible = false; - this.$message.success("添加成功"); - this.userQuery = { - code: this.currentCode, - page: 1, - limit: 10 - } - //重新加载数据 - warehouseUserList(this.userQuery).then((res) => { - this.userData = res.data.list; - this.userTotal = res.data.total; - }).catch((error) => { - this.userData = []; - this.userTotal = 0; - }); - } else { - this.$message.error(res.message); - } - }).catch((error) => { - this.$message.error("添加失败"); - }); + popInvRelBustype(row) { + this.relBusTypeVisible = true; + this.currentRow = row; }, - - relBusttype(row) { - this.curSeleUser = row; - this.relBusUserVisile = true; + cancelRelBustype() { + this.relBusTypeVisible = false; }, - cancelRelBusDiaolog() { - this.relBusUserVisile = false; - this.getUserBusTypeList(1); + popInvRelUser(row) { + this.relUserVisible = true; + this.currentRow = row; }, - - selsectBussinessType() { - var busQuery = { - code: this.currentCode, - page: 1, - limit: 50 - } - warehouseBussinessTypeList(busQuery).then((res) => { - this.userBussinessTypeList = res.data.list; - }).catch((error) => { - this.$message.error("单据类型数据加载失败") - }); + cancelRelUser() { + this.relUserVisible = false; }, - delWarehouseBussinessType(id) { - let params = {id: id}; - deleteWarehouseBussinessType(params).then((res) => { - if (res.code == 20000) { - this.$message.success("已移除"); - this.bussinessTypeData = []; - this.selectWhouseBussinessType(); - var busQuerys = { - code: this.currentCode, - page: 1, - limit: 10 - } - warehouseBussinessTypeList(busQuerys).then((res) => { - this.bussinessTypeData = res.data.list; - }).catch((error) => { - this.$message.error("单据类型数据加载失败") - }); - - } else { - this.$message.error(res.message); - } - }).catch((error) => { - this.$message.error("移除失败"); - }) - }, - addBussinessType(row) { var action = []; for (var i = 0; i < this.userBussinessTypeList.length; i++) { @@ -885,7 +689,8 @@ export default { mounted() { }, components: { - relBusUserDialog, + InvRelUsers, + InvRelBusType, invSpaceManage, Treeselect }, created() { diff --git a/src/views/system/dept/invWarehouseRelBusTypes.vue b/src/views/system/dept/invWarehouseRelBusTypes.vue deleted file mode 100644 index f91619b4..00000000 --- a/src/views/system/dept/invWarehouseRelBusTypes.vue +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - - - - - - - - - 提交 - - 取消 - - - - - - - diff --git a/src/views/system/param/busTypeChange.vue b/src/views/system/param/busTypeChange.vue new file mode 100644 index 00000000..023e05e5 --- /dev/null +++ b/src/views/system/param/busTypeChange.vue @@ -0,0 +1,435 @@ + + + + + + + + + + + + + 重置 + 查询 + 新增 + + 导出单据类型 + + 导入单据类型 + + + + + + + + + + + + {{ mainActionMap[scope.row.mainAction] }} + + + + + + {{ enableMap[scope.row.enable] }} + + + + + {{ enableMap[scope.row.checkEnable] }} + + + + + {{ enableMap[scope.row.secCheckEnable] }} + + + + + 编辑 + + 删除 + + + + + + + + + + + + + 提交 + + 取消 + + + + + + + + + + + diff --git a/src/views/system/param/busTypePre.vue b/src/views/system/param/busTypePre.vue new file mode 100644 index 00000000..2816acc9 --- /dev/null +++ b/src/views/system/param/busTypePre.vue @@ -0,0 +1,339 @@ + + + + + + + + + + + + + 重置 + 查询 + 新增 + + + + + + + + + + + + {{ typeMap[scope.row.type] }} + + + + + {{ enableMap[scope.row.enable] }} + + + + + {{ enableMap[scope.row.enable] }} + + + + + + 编辑 + + 删除 + + + + + + + + + + + + + + + + + + diff --git a/src/views/system/param/busTypePreModify.vue b/src/views/system/param/busTypePreModify.vue new file mode 100644 index 00000000..528c0274 --- /dev/null +++ b/src/views/system/param/busTypePreModify.vue @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + {{item.name}} + {{item.action}} + + + + + + + + + + + + + + + + + + + + 备 注 + + + + + + + + + + + + diff --git a/src/views/thirdSys/api/index.vue b/src/views/thirdSys/api/index.vue index d2724374..8e43e9d5 100644 --- a/src/views/thirdSys/api/index.vue +++ b/src/views/thirdSys/api/index.vue @@ -382,7 +382,7 @@ import { import {getOriginBusType} from "@/api/basic/busOriginType"; import modifyDialog from "./BasicThirdSysModify"; import modifyDetailDialog from "./BasicThirdSysDetailModify"; -import {filterForThirdSys} from "@/api/basic/busLocalType"; +import {filterForThirdSys} from "@/api/basic/busType"; import {isBlank} from "@/utils/strUtil"; export default { diff --git a/src/views/thirdSys/busType/busTypeModify.vue b/src/views/thirdSys/busType/busTypeModify.vue index c721db70..dc6ad292 100644 --- a/src/views/thirdSys/busType/busTypeModify.vue +++ b/src/views/thirdSys/busType/busTypeModify.vue @@ -75,10 +75,6 @@ import { getBasicThirdSys, } from "@/api/thrsys/basicThirdSys"; -import { - getLocalBusType, -} from "@/api/basic/busLocalType"; - export default { name: "inputQuery", props: { diff --git a/src/views/thirdSys/inv/index.vue b/src/views/thirdSys/inv/index.vue index e974d1ee..b8a062b8 100644 --- a/src/views/thirdSys/inv/index.vue +++ b/src/views/thirdSys/inv/index.vue @@ -9,13 +9,6 @@ placeholder="关键字搜索" > - - - - - - - @@ -33,7 +26,7 @@ 查询 添加仓库 + >添加部门/科室 - - - {{ enableMap[scope.row.advanceType] }} - - + + + + + + + {{ getThirdSysFkName(scope.row.thirdSysFk) }} @@ -82,7 +75,7 @@ size="small" @click.native.stop="handleSubForm( scope.row, 'add')" :disabled="!configParms.basicThirdInv" - >添加分库 + >添加仓库 @@ -112,56 +105,59 @@ :limit.sync="query.limit" @pagination="getList" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + 编辑 + + 删除 + + + + + + - - - - - - + + + + + +