diff --git a/src/api/basic/unitMaintain.js b/src/api/basic/unitMaintain.js new file mode 100644 index 0000000..953339c --- /dev/null +++ b/src/api/basic/unitMaintain.js @@ -0,0 +1,44 @@ +import axios from "../../utils/axios"; + +export function getUnitMaintain(query) { + return axios({ + url: "/warehouse/unitMaintain/filter", + method: "get", + params: query + }); +} + +export function combine(query) { + return axios({ + url: "/udiwms/basic/unit/maintain/combine", + method: "post", + data: query + }); +} + +export function deleteUnitMaintain(query) { + return axios({ + url: "/warehouse/unitMaintain/delete", + method: "post", + data: query + }); +} + +export function addUnit(query) { + return axios({ + url: "/warehouse/unitMaintain/add", + method: "post", + data: query + }); +} + +export function modifyUnit(query) { + return axios({ + url: "/warehouse/unitMaintain/modify", + method: "post", + data: query + }); +} + + + diff --git a/src/api/inout/order.js b/src/api/inout/order.js index 6aa821f..6bbd6b7 100644 --- a/src/api/inout/order.js +++ b/src/api/inout/order.js @@ -357,3 +357,14 @@ export function updateOrder(data) { data: data }) } + + +export function uploadSpms(query) { + return axios( + { + url: "/warehouse/inout/order/uploadSpms", + method: "post", + data: query + } + ); +} diff --git a/src/router/index.js b/src/router/index.js index c8579af..17c0ae7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -158,6 +158,7 @@ import purPlanAudit from "../views/purchase/purPlanAudit"; import purPlanSearch from "../views/purchase/purPlanSearch"; import platform from "../views/userManage/platform"; +import bindPlatform from "@/views/userManage/bindPlatform"; // Vue.use(VueRouter); @@ -452,14 +453,35 @@ export const asyncRouterMap = [ ] }, { - path: "platform", - component: platform, - name: "医院自助平台", + path: "/platformManage", + component: Empty, + name: "医院客户管理", + redirect: "/platformManage/platform", icon: "", meta: { - authRule: ["userManage/platform"] - } - }, + authRule: [""] + }, + children: [ + { + path: "platform", + component: platform, + name: "医院自助平台", + icon: "", + meta: { + authRule: ["userManage/platform"] + } + }, + { + path: "bindPlatform", + component: bindPlatform, + name: "医院客户", + icon: "", + meta: { + authRule: ["userManage/bindPlatform"] + } + } + ] + } // { // path: "bussinessType", diff --git a/src/views/basic/CorpMaintain.vue b/src/views/basic/CorpMaintain.vue index edf903c..482e212 100644 --- a/src/views/basic/CorpMaintain.vue +++ b/src/views/basic/CorpMaintain.vue @@ -372,10 +372,15 @@ export default { value: 2, label: "供应商" }, + { + value: 5, + label: "医院客户" + }, { value: 4, label: "特殊往来" } + ], formRules: { // name: [ diff --git a/src/views/business/stockOrderDelSearch.vue b/src/views/business/stockOrderDelSearch.vue index 2b0369e..8705f80 100644 --- a/src/views/business/stockOrderDelSearch.vue +++ b/src/views/business/stockOrderDelSearch.vue @@ -24,7 +24,7 @@ - + @@ -153,13 +153,12 @@ >撤回 - 提交 + @click.native.stop="uploadSpms(scope.row)" + >提交 - @@ -349,10 +348,11 @@ import DialogcChangeNewOrder from "./DialogcChangeNewOrder"; import draggable from "vuedraggable"; import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf"; import store from "../../store"; -import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType"; -import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; +import {getLocalJoinByUser} from "../../api/basic/busLocalType"; +import {filterAllByUser} from "@/api/basic/invWarehouse"; import StockOrderEdit from "@/views/business/stockOrderEdit"; import {filterSubByInv} from "@/api/basic/invSubWarehouse"; +import {uploadSpms} from "@/api/inout/order"; export default { name: "stockOrderDelSearch", @@ -419,7 +419,7 @@ export default { "2": "第三方系统", "3": "扫码单据转换", }, - + detailFormVisible: false, stockOrderEditVisible: false, stockChangeVisible: false, @@ -947,6 +947,65 @@ export default { }).catch(() => { this.$message.info('回退失败'); }); + }, + uploadSpms(row) { + if (row.uploadStatus == "1") { + //单据已经提交，重新提交需要给提示 + this.$confirm('单据已上传，是否确认重新上传到 “' + row.fromCorp + '” 的UDI自助平台？', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let orderIds = []; + orderIds.push(row.orderId); + let query = {orderIds: orderIds}; + row.uploadStatus = 1; + uploadSpms(query) + .then((response) => { + if (response.code == 20000) { + this.$message.success(response.data); + this.getList(); + } else { + this.$message.error(response.message); + } + }) + .catch(() => { + }); + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消' + }); + }); + } else { + this.$confirm('是否确认提交到 “' + row.fromCorp + '” 的UDI自助平台？', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let orderIds = []; + orderIds.push(row.orderId); + let query = {orderIds: orderIds}; + row.uploadStatus = 1; + uploadSpms(query) + .then((response) => { + if (response.code == 20000) { + this.$message.success(response.data); + this.getList(); + } else { + this.$message.error(response.message); + } + }) + .catch(() => { + }); + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消' + }); + }); + } + } }, components: { diff --git a/src/views/userManage/bindPlatform.vue b/src/views/userManage/bindPlatform.vue new file mode 100644 index 0000000..3359e82 --- /dev/null +++ b/src/views/userManage/bindPlatform.vue @@ -0,0 +1,684 @@ + + + + +