diff --git a/src/api/basic/busChangeType.js b/src/api/basic/busChangeType.js index 8788771..ae744b6 100644 --- a/src/api/basic/busChangeType.js +++ b/src/api/basic/busChangeType.js @@ -8,6 +8,14 @@ export function getChangeBusType(query) { }); } +export function filterAll(query) { + return axios({ + url: "/spms/busTypeChange/filter", + method: "get", + params: query + }); +} + export function addChangeBusType(query) { return axios({ diff --git a/src/router/index.js b/src/router/index.js index 7dcfd07..bdbfa5d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -28,6 +28,7 @@ import invWarehouse from "../views/basic/invWarehouse" import BussinessType from "../views/basic/BussinessType.vue"; import BussinessTypeLocl from "../views/basic/BussinessTypeLocl.vue"; import bussinessTypeThird from "../views/basic/BussinessTypeThird.vue"; +import otherTypeChange from "../views/basic/OtherTypeChange.vue"; import bussinessTypeChange from "../views/basic/BusTypeChange.vue"; @@ -362,6 +363,15 @@ export const asyncRouterMap = [ } }, + { + path: "otherTypeChange", + name: "耗材领用设置", + component: otherTypeChange, + meta: { + authRule: ["admin/otherTypeChange"] + } + }, + ] }, @@ -472,7 +482,7 @@ export const asyncRouterMap = [ redirect: "/platformManage/platform", icon: "", meta: { - authRule: [""] + authRule: ["platformManage"] }, children: [ { @@ -1055,7 +1065,7 @@ export const asyncRouterMap = [ component: stockOrderRecedLog, name: "单据接收日志", meta: { - authRule: ["busOrderUpload/uploadLog"] + authRule: ["busOrderUpload/RecedLog"] } } diff --git a/src/views/basic/BusTypeChange.vue b/src/views/basic/BusTypeChange.vue index 194696a..5447e92 100644 --- a/src/views/basic/BusTypeChange.vue +++ b/src/views/basic/BusTypeChange.vue @@ -16,12 +16,6 @@ style="width: 200px" > - - - - - - @@ -37,21 +31,17 @@ - - - - + + + + + + - - - - - + diff --git a/src/views/basic/BussinessTypeLoclModify.vue b/src/views/basic/BussinessTypeLoclModify.vue index bf3e71b..c1a09aa 100644 --- a/src/views/basic/BussinessTypeLoclModify.vue +++ b/src/views/basic/BussinessTypeLoclModify.vue @@ -124,21 +124,21 @@ - -
- - 自动补单 - -
- - -
- 全量补单 - -
- + + + + + + + + + + + + + + + - - - + - diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue index d7e49f0..def16ca 100644 --- a/src/views/basic/UdiInfoManage.vue +++ b/src/views/basic/UdiInfoManage.vue @@ -488,10 +488,6 @@
- 以使用单元数量入库 - 是否禁用 @@ -512,6 +508,23 @@ + + +
+ 启用使用单元 + + 允许科室多次使用出库 + +
+ + + @@ -538,7 +551,7 @@
- 最小包装单元内包含使用单元数量:  + 最小包装内包含使用单元数量: 
+ + + +
+
+ 最小包装可使用次数:  +
+ +
+ + + @@ -1071,7 +1103,8 @@ export default { selectLocalVisible: false, //关联UDI isUseDyCheck: false, lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"}, - activeNames: ['1'] + activeNames: ['1'], + useNumEnable: true, }; }, @@ -1131,6 +1164,28 @@ export default { this.detailList = []; }); }, + + useDyCheckChange(val) { + this.editQuery.useNum = 0; + }, + useDyCountChange(val) { + if (val) { + this.editQuery.useNum = this.editQuery.zxxsbzbhsydysl; + } else { + this.editQuery.useNum = 0; + } + }, + useMutiChange(val) { + if (val) { + this.useNumEnable = false; + this.editQuery.useNum = this.editQuery.zxxsbzbhsydysl; + } else { + this.useNumEnable = true; + this.editQuery.useNum = 0; + } + + }, + keyup_submit(event) { this.filterQuery.page = 1; this.getList(); @@ -1569,7 +1624,7 @@ export default { float: left; text-align: left; margin-top: 10px; - width: 25%; + width: 35%; } .text { diff --git a/src/views/basic/UdiInfoManageSp.vue b/src/views/basic/UdiInfoManageSp.vue index 4839b61..793671c 100644 --- a/src/views/basic/UdiInfoManageSp.vue +++ b/src/views/basic/UdiInfoManageSp.vue @@ -683,7 +683,7 @@
以使用单元数量入库 + >启用使用单元 是否禁用 diff --git a/src/views/basic/UdiRlDetailDialog.vue b/src/views/basic/UdiRlDetailDialog.vue index c554957..9b38d7e 100644 --- a/src/views/basic/UdiRlDetailDialog.vue +++ b/src/views/basic/UdiRlDetailDialog.vue @@ -360,7 +360,7 @@ 以使用单元数量入库 + >启用使用单元 @@ -385,15 +385,15 @@ export default { data() { return { sysList: [], - checked:false, - detailList:[], - loading:false, + checked: false, + detailList: [], + loading: false, } }, methods: { getThirdSysDetail() { let query = { - id: this.editQuery.rlId, + id: this.editQuery.rlId, }; thirdSysDetail(query) diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index 812584f..cb01c64 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -1543,8 +1543,9 @@ export default { var busQuery = { code: this.currentCode, page: 1, - limit: 10000 + limit: 50 } + warehouseBussinessTypeList(busQuery).then((res) => { this.userBussinessTypeList = res.data.list; }).catch((error) => { @@ -1592,9 +1593,10 @@ export default { var busQuery = { code: this.currentCode, page: 1, - limit: 100000 + limit: 50 } warehouseBussinessTypeList(busQuery).then((res) => { + this.userBussinessTypeList = res.data.list || []; }).catch((error) => { }); diff --git a/src/views/business/addOrder.vue b/src/views/business/addOrder.vue deleted file mode 100644 index d481327..0000000 --- a/src/views/business/addOrder.vue +++ /dev/null @@ -1,512 +0,0 @@ - - - - - - - diff --git a/src/views/business/stockOrder.vue b/src/views/business/stockOrder.vue index 687599b..5ff30cf 100644 --- a/src/views/business/stockOrder.vue +++ b/src/views/business/stockOrder.vue @@ -365,8 +365,6 @@ import stockOrderDistribution from "./stockOrderDistribution"; import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail"; import stockQRCodeExport from "./stockQRCodeExport"; import draggable from "vuedraggable"; -import codeDetail from "./errorCode"; -import addOrder from "./addOrder"; import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf"; import store from "../../store"; import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType"; diff --git a/src/views/business/stockOrderEdit.vue b/src/views/business/stockOrderEdit.vue index fb18dd2..2ec00f3 100644 --- a/src/views/business/stockOrderEdit.vue +++ b/src/views/business/stockOrderEdit.vue @@ -477,15 +477,12 @@ import { uploadStockOrderDetail, uploadStockOrderDetailCount, generateStockOrderQRCodeText } from "../../api/inout/stockOrder"; -import {BASE_URL} from "../../config/app"; import stockOrderDistribution from "./stockOrderDistribution"; import stockOrderEditDistribution from "./stockOrderEditDistribution"; import stockQRCodeExport from "./stockQRCodeExport"; import selectThrOrder from "./selectThrOrderDialog"; import selectReceiveOrderDialog from "../inout/selectReceiveOrderDialog"; import draggable from "vuedraggable"; -import codeDetail from "./errorCode"; -import addOrder from "./addOrder"; import store from "../../store"; import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType"; import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf"; diff --git a/src/views/business/stockOrderEditor.vue b/src/views/business/stockOrderEditor.vue index 675b817..0835e01 100644 --- a/src/views/business/stockOrderEditor.vue +++ b/src/views/business/stockOrderEditor.vue @@ -163,13 +163,13 @@ - + @@ -91,9 +91,13 @@ - - + + + + + + diff --git a/src/views/purchase/purApplyEditDiaolog.vue b/src/views/purchase/purApplyEditDiaolog.vue index 4a5a2b7..53f38c4 100644 --- a/src/views/purchase/purApplyEditDiaolog.vue +++ b/src/views/purchase/purApplyEditDiaolog.vue @@ -62,7 +62,8 @@ - - + @@ -148,7 +149,7 @@ prop="manufactory" show-overflow-tooltip > - + - + + + + - + + @@ -86,9 +87,11 @@ - - + + + + diff --git a/src/views/purchase/purPlanDetailDialog.vue b/src/views/purchase/purPlanDetailDialog.vue index 4903f91..ba1c5b8 100644 --- a/src/views/purchase/purPlanDetailDialog.vue +++ b/src/views/purchase/purPlanDetailDialog.vue @@ -87,30 +87,88 @@
- 采购说明： + 审核说明：
- - + +
- 审核说明： + 采购说明：
- + + + + + 是否生成采购入库单 + + + + + + + +
+ 入库仓库： +
+ + + + + + + {{ item.name }} + + + + + + +
+ 入库单据类型： +
+ + + + + + {{ item.localName }} + + + + + + + @@ -199,6 +257,7 @@
@@ -210,6 +269,7 @@ import stockOrderNewSelectProduct from "../business/stockOrderNewSelectProduct"; import {auditOrder, delApplyDetail, listApplyDetail} from "@/api/purchase/purPlan"; import {filterAllByUser} from "@/api/basic/invWarehouse"; import {filterSubByInv} from "@/api/basic/invSubWarehouse"; +import {getLocalJoinByUser} from "@/api/basic/busLocalType"; export default { name: "idQuery", @@ -244,6 +304,10 @@ export default { locStorageCode: null, invWarehouseCode: null, auditRemark: null, + autoPurchase: false, + targetInv: 1000, + targetSubInv: null, + targetBillAction: null, }, formRules: {}, codeArray: [], @@ -275,8 +339,10 @@ export default { thisData: {}, storageList: [], subInvList: [], + tarSubList: [], invQueryData: {}, + }; }, components: { @@ -446,6 +512,38 @@ export default { .catch(() => { }); }, + + findTargetSubInvs() { + this.tarSubList = []; + let query = { + pcode: 1000 + }; + filterSubByInv(query) + .then((response) => { + this.tarSubList = response.data || []; + if (this.tarSubList != null && this.tarSubList.length == 1) { + this.formData.targetSubInv = this.tarSubList[0].code; + this.targetInvChange(); + } + }) + .catch(() => { + }); + }, + targetInvChange() { + let query = { + code: this.formData.targetSubInv, + enabled: true, + spUse: true, + }; + getLocalJoinByUser(query) + .then((response) => { + this.busTypes = response.data.list || []; + // this.formData.targetBillAction = this.busTypes[0].localAction; + }) + .catch(() => { + }); + }, + locInChange(item) { if (this.formData.invWarehouseCode != null) { this.formData.invWarehouseCode = ""; @@ -467,6 +565,7 @@ export default { this.query.limit = 100; this.query.orderIdFk = this.idQuery.id; this.formData = this.idQuery.formData; + this.formData.targetInv = 1000; this.orderEditor = true; this.sValue = this.formData.corpName; this.getStockOrderDetailList(); @@ -479,10 +578,16 @@ export default { deptCode: null, locStorageCode: null, invWarehouseCode: null, + auditRemark: null, + autoPurchase: false, + targetInv: 1000, + targetSubInv: null, + targetBillAction: null, }; this.orderEditor = false; } this.getStorage(); + this.findTargetSubInvs(); this.codeArray = []; }, }; diff --git a/src/views/purchase/purPlanEditDialog.vue b/src/views/purchase/purPlanEditDialog.vue index 1864308..4f17a49 100644 --- a/src/views/purchase/purPlanEditDialog.vue +++ b/src/views/purchase/purPlanEditDialog.vue @@ -55,25 +55,25 @@ - -
- 采购类型： -
- - - - - - {{ item.originName }} - - - - + + + + + + + + + + + + + + + + + + +
@@ -107,9 +107,7 @@ - -
采购说明： @@ -120,34 +118,49 @@ + + +
+ 拒绝原因： +
+ + + + + + + - -
-                            拒绝原因： -                       
-                    -                    -                        -                            -                        -                    + + - - 产品录入 - - + + + + + + 产品录入 + + 选入申购单 + + + + + @@ -162,27 +175,43 @@ prop="spec" show-overflow-tooltip > - - - - + + + + + + + + + + + + - + + @@ -85,9 +86,11 @@ - - + + + + diff --git a/src/views/purchase/pureApplyAudit.vue b/src/views/purchase/pureApplyAudit.vue index 86f1e55..2249d73 100644 --- a/src/views/purchase/pureApplyAudit.vue +++ b/src/views/purchase/pureApplyAudit.vue @@ -52,7 +52,8 @@ {{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }} - + + @@ -95,9 +96,11 @@ - - + + + + diff --git a/src/views/purchase/pureApplyDetailDialog.vue b/src/views/purchase/pureApplyDetailDialog.vue index a51ba04..d4afd11 100644 --- a/src/views/purchase/pureApplyDetailDialog.vue +++ b/src/views/purchase/pureApplyDetailDialog.vue @@ -89,35 +89,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- 当前仓库： + 申购说明：
- - - - - {{ item.name }} - - - - - {{ item.name }} - - + + @@ -128,25 +140,25 @@ - -
- 生成采购计划： -
- - - - - - {{ item.originName }} - - - - + + + + + + + + + + + + + + + + + + +
@@ -159,6 +171,14 @@ autosize> + + + + + + 是否生成采购计划 + + @@ -180,10 +200,11 @@ prop="spec" show-overflow-tooltip > - + + - - + + - - + + + + + 以使用单元数量入库 + >启用使用单元 diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue index 7a9c134..a98bd8f 100644 --- a/src/views/thrsys/thrOrderNew.vue +++ b/src/views/thrsys/thrOrderNew.vue @@ -476,11 +476,7 @@ export default { if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") { return this.$message.error('单据数量不能为0'); } - if (this.$isBlank(this.codeArray[i].batchNo)) { - return this.$message.error('批次号不能为空'); - } - - + } } if (status === '0') {