+
+
+
+
医院UDI自助平台
+
+
禁用
正常
- 未验证
+
diff --git a/src/views/userManage/customerManage.vue b/src/views/userManage/customerManage.vue
index 91d0753..f1ac0b5 100644
--- a/src/views/userManage/customerManage.vue
+++ b/src/views/userManage/customerManage.vue
@@ -4,7 +4,8 @@
@@ -54,32 +55,32 @@
{{
- scope.row.userFlag | statusFilterName
+ scope.row.userFlag | statusFilterName
}}
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -158,54 +159,54 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -218,7 +219,7 @@
{{
- item.name
+ item.name
}}
@@ -323,274 +324,274 @@
diff --git a/src/views/warehouse/AdditionalOrder.vue b/src/views/warehouse/AdditionalOrder.vue
index 67220df..2d87a2c 100644
--- a/src/views/warehouse/AdditionalOrder.vue
+++ b/src/views/warehouse/AdditionalOrder.vue
@@ -25,6 +25,18 @@
+
+
+
+ {{ item.name }}
+
+
+
-
+
-
-
-
- 选择往来单位
-
-
-
- {{ scope.row.fromCorp }}
-
-
-
+ {{ scope.row.fromCorp }}
+
+
+
+
+ {{ getStorageName(scope.row.locStorageCode) }}
-
@@ -102,7 +98,7 @@
-
+
{
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;
@@ -508,6 +503,22 @@ export default {
}
}
},
+ getStorage() {
+ this.storageList = [];
+ filterAllByUser()
+ .then((response) => {
+ this.storageList = response.data || [];
+ })
+ .catch(() => {
+ });
+ },
+ getStorageName(code) {
+ for (let i = 0; i < this.storageList.length; i++) {
+ if (this.storageList[i].code === code) {
+ return this.storageList[i].name;
+ }
+ }
+ },
addOrders(row) {
console.log(row)
this.idQuery.id = '';
@@ -539,6 +550,7 @@ export default {
};
},
created() {
+ this.getStorage();
this.getBusType();
let query = this.$route.query;
this.filterQuery = Object.assign(this.filterQuery, query);
diff --git a/src/views/warehouse/IOCheckErrOrder.vue b/src/views/warehouse/IOCheckErrOrder.vue
index 47c60aa..700fca4 100644
--- a/src/views/warehouse/IOCheckErrOrder.vue
+++ b/src/views/warehouse/IOCheckErrOrder.vue
@@ -13,16 +13,16 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
绑定产品
+ >选择产品
绑定供应商
+ >选择供应商
+
@@ -377,6 +378,13 @@
>查询
+ 确定
+
@@ -384,7 +392,7 @@
v-loading="loading"
:data="unitlist"
style="width: 100%"
- @row-click="selectUnit"
+ @current-change="handleDetail"
>
@@ -490,6 +498,7 @@ import selectErpOrder from "./DialogSelectErpOrder";
import selectRlDialog from "./DialogSelectRl";
import {getBussinessType} from "../../api/basic/bussinessType";
import {filterAllByUser} from "@/api/basic/invWarehouse";
+import {getLocalJoinByUser} from "@/api/basic/busLocalType";
const formJson = {
site_id: "",
@@ -569,6 +578,7 @@ export default {
idQuery: {
id: "",
},
+ curUnitRow: null,
storageList: [],
curIndex: "",
adListNoDataText: "无数据",
@@ -940,12 +950,10 @@ export default {
this.getList();
},
- selectUnit(row) {
- console.log(row.id);
-
+ selectUnit() {
let query = {
id: this.curRow.id,
- supId: row.erpId,
+ supId: this.curRow.erpId,
};
updateBindSup(query).then((response) => {
if (response.code == 20000) {
@@ -1060,7 +1068,7 @@ export default {
let query = {
enabled: true,
};
- getBussinessType(query)
+ getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;
@@ -1198,6 +1206,9 @@ export default {
this.$message.error("选入失败");
}
},
+ handleDetail(row) {
+ this.curUnitRow = row;
+ },
cancelDialog() {
this.addDialogVisible = false;
},
diff --git a/src/views/warehouse/IOErrorOrder.vue b/src/views/warehouse/IOErrorOrder.vue
index 70260b3..92cc6dd 100644
--- a/src/views/warehouse/IOErrorOrder.vue
+++ b/src/views/warehouse/IOErrorOrder.vue
@@ -255,6 +255,7 @@ import addOrder from "./addOrder";
import store from "../../store";
import {getBussinessType} from "../../api/basic/bussinessType";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
+import {getLocalJoinByUser} from "@/api/basic/busLocalType";
const formJson = {
site_id: "",
@@ -500,7 +501,7 @@ export default {
let query = {
enabled: true,
};
- getBussinessType(query)
+ getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;
diff --git a/src/views/warehouse/IONewOrder.vue b/src/views/warehouse/IONewOrder.vue
index ba47c67..95246e0 100644
--- a/src/views/warehouse/IONewOrder.vue
+++ b/src/views/warehouse/IONewOrder.vue
@@ -6,7 +6,6 @@
-
@@ -26,7 +25,8 @@
-
+
立即提交
+ >立即处理
@@ -312,6 +312,7 @@ import addHosOrder from "./addHosOrder";
import store from "../../store";
import {getBussinessType} from "../../api/basic/bussinessType";
import {filterAllByUser} from "@/api/basic/invWarehouse";
+import {getLocalJoinByUser} from "@/api/basic/busLocalType";
const formJson = {
site_id: "",
@@ -441,7 +442,7 @@ export default {
let query = {
enabled: true,
};
- getBussinessType(query)
+ getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;
diff --git a/src/views/warehouse/IOSearchOrder.vue b/src/views/warehouse/IOSearchOrder.vue
index 0f39733..b7315d1 100644
--- a/src/views/warehouse/IOSearchOrder.vue
+++ b/src/views/warehouse/IOSearchOrder.vue
@@ -419,6 +419,7 @@ import selectErpOrder from "./DialogSelectErpOrder";
import {getBussinessType} from "../../api/basic/bussinessType";
import {formatDate} from "../../utils/date";
import {filterAllByUser} from "@/api/basic/invWarehouse";
+import {getLocalJoinByUser} from "@/api/basic/busLocalType";
const formJson = {
site_id: "",
@@ -923,7 +924,7 @@ export default {
let query = {
enabled: true,
};
- getBussinessType(query)
+ getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;
diff --git a/src/views/warehouse/IOWaitOrder.vue b/src/views/warehouse/IOWaitOrder.vue
index 34f6a62..e1cebaf 100644
--- a/src/views/warehouse/IOWaitOrder.vue
+++ b/src/views/warehouse/IOWaitOrder.vue
@@ -415,6 +415,7 @@ import {downloadInoutOrderSuccessPDF} from "../../api/itextpdf/itextpdf";
import selectErpOrder from "./DialogSelectErpOrder";
import {getBussinessType} from "../../api/basic/bussinessType";
import {filterAllByUser} from "@/api/basic/invWarehouse";
+import {getLocalJoinByUser} from "@/api/basic/busLocalType";
const formJson = {
site_id: "",
@@ -942,7 +943,7 @@ export default {
let query = {
enabled: true,
};
- getBussinessType(query)
+ getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;
diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue
index 5d7886e..0336d9e 100644
--- a/src/views/warehouse/addHosOrder.vue
+++ b/src/views/warehouse/addHosOrder.vue
@@ -51,6 +51,56 @@
+
+
+
+ 单据类型：
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 当前仓库：
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
往来信息：
@@ -110,51 +160,6 @@
>
-
-
- 单据类型：
-
-
-
-
-
-
- {{ item.name }}
-
-
-
-
-
-
-
-
-
-
- 当前仓库：
-
-
-
-
-
-
-
-
-
-
- {{ item.name }}
-
-
-
-
@@ -242,7 +247,7 @@ import draggable from "vuedraggable";
import {parseTime} from "../../filtres/index";
import store from "../../store";
import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
-import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
+import {filterAll, filterAllByLoc, filterAllByUser} from "@/api/basic/invWarehouse";
import {getLocalBusType, getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
export default {
@@ -478,7 +483,9 @@ export default {
});
},
-
+ locCHange() {
+ this.findStorageMethod();
+ },
findMethod(query) {
console.log(query);
this.fromOptions = [];
@@ -496,12 +503,13 @@ export default {
},
findStorageMethod(query) {
- console.log(query);
+ if (this.formData.locStorageCode == null)
+ return;
this.fromStorageOptions = [];
let cQuery = {
- key: query,
+ locInvCode: this.formData.locStorageCode ,
};
- filterAllByUser(cQuery)
+ filterAllByLoc(cQuery)
.then((response) => {
this.fromStorageOptions = response.data || [];
})
@@ -517,7 +525,6 @@ export default {
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
- this.fromStorageOptions = response.data || [];
})
.catch(() => {
});
diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue
index 755cf8d..9c15cea 100644
--- a/src/views/warehouse/addOrder.vue
+++ b/src/views/warehouse/addOrder.vue
@@ -480,6 +480,7 @@ export default {
this.formData.actDate = new Date();
this.codeArray = [];
this.formData.fromCorp = store.getters.companyName;// store.getters.customerId === 110 ? '医院' : store.getters.companyName;
+ this.formData.fromCorpId = store.getters.customerId;
this.formData.customerId = store.getters.customerId;
this.getBusType();
this.getStorage();
diff --git a/src/views/warehouse/stockOrder.vue b/src/views/warehouse/stockOrder.vue
index ab1f8a7..5d3cd87 100644
--- a/src/views/warehouse/stockOrder.vue
+++ b/src/views/warehouse/stockOrder.vue
@@ -1,361 +1,361 @@
-
-
-
+
+
-
-
-
-
-
-
-
- {{ item.localName }}
-
-
-
-
-
-
-
-
-
-
- {{ item.name }}
-
-
-
-
- 单据日期:
-
-
-
+ >
+
+
+
+
+
+
+
+ {{ item.localName }}
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+ 单据日期:
+
+
+
-
-
-
- 查询
- 生成码
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ sourceMap[scope.row.sourceType] }}
-
-
-
-
-
- {{ scope.row.status | statusFilterName }}
-
-
-
-
- {{ getActionName(scope.row.billType) }}
-
-
+
+
+
+ 查询
+ 生成码
+
+
+
-
-
- {{ getStorageName(scope.row.locStorageCode) }}
-
-
-
-
-
-
-
-
-
- 内部码详情
-
- 标签打印
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ sourceMap[scope.row.sourceType] }}
+
+
+
+
+
+ {{ scope.row.status | statusFilterName }}
+
+
+
+
+ {{ getActionName(scope.row.billType) }}
+
+
-
+
+ {{ getStorageName(scope.row.locStorageCode) }}
+
+
+
+
+
+
+
+
+
+ 内部码详情
+
-
-
+
标签打印
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
-
-
-
- 产品通用名：
-
-
-
-
-
-
-
-
-
- 包装规格：
-
-
-
-
-
-
-
-
-
-
-
- 单据数量：
-
-
-
-
-
-
-
-
-
- 实际数量：
-
-
-
-
-
-
-
-
-
-
-
- 生产日期：
-
-
-
-
-
-
-
-
-
- 失效日期：
-
-
-
-
-
-
-
-
-
-
-
- 批次号：
-
-
-
-
-
-
-
-
-
- 扫码数量：
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
+
+ 产品通用名：
+
+
+
+
+
+
+
+
+
+ 包装规格：
+
+
+
+
+
+
+
+
+
+
+
+ 单据数量：
+
+
+
+
+
+
+
+
+
+ 实际数量：
+
+
+
+
+
+
+
+
+
+
+
+ 生产日期：
+
+
+
+
+
+
+
+
+
+ 失效日期：
+
+
+
+
+
+
+
+
+
+
+
+ 批次号：
+
+
+
+
+
+
+
+
+
+ 扫码数量：
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue
index 2f86552..92b3530 100644
--- a/src/views/warehouse/stockOrderDelSearch.vue
+++ b/src/views/warehouse/stockOrderDelSearch.vue
@@ -33,7 +33,7 @@
-
+
@@ -107,7 +107,7 @@
-
+
@@ -165,6 +165,12 @@
+
+
+
+
+
+
-
-
-
-
-
{
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;
diff --git a/src/views/warehouse/stockOrderEditor.vue b/src/views/warehouse/stockOrderEditor.vue
index 688489c..89c7a08 100644
--- a/src/views/warehouse/stockOrderEditor.vue
+++ b/src/views/warehouse/stockOrderEditor.vue
@@ -23,7 +23,7 @@
-
+
@@ -492,7 +492,7 @@ import draggable from "vuedraggable";
import codeDetail from "./errorCode";
import addOrder from "./addOrder";
import store from "../../store";
-import {getLocalJoinBusType} from "../../api/basic/busLocalType";
+import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
@@ -519,6 +519,7 @@ export default {
},
list: [],
storageList: [],
+ isSp: store.getters.customerId,
busTypes: [],
detailList: [],
total: 0,
@@ -528,9 +529,9 @@ export default {
formData: {},
detailCountMax: false,
sourceMap: {
- "1": "网页新增",
+ "1": "web端新增单据",
"2": "第三方系统",
- "3": "扫码单据",
+ "3": "扫码单据转换",
},
statusMap: {
"1": "草稿",
@@ -567,7 +568,6 @@ export default {
filterUDIType: false,
selectThrOrderVisible: false,
thisData: {},
- storageList: [],
actDateRange: [],
pickerOptions: {
shortcuts: [
@@ -849,7 +849,7 @@ export default {
let query = {
enabled: true,
};
- getLocalJoinBusType(query)
+ getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;
diff --git a/src/views/warehouse/stockOrderInCode.vue b/src/views/warehouse/stockOrderInCode.vue
index b02a9b1..b5c5ccd 100644
--- a/src/views/warehouse/stockOrderInCode.vue
+++ b/src/views/warehouse/stockOrderInCode.vue
@@ -326,9 +326,9 @@ export default {
loading: false,
detailLoading: false,
sourceMap: {
- "1": "网页新增",
+ "1": "web端新增单据",
"2": "第三方系统",
- "3": "扫码单据",
+ "3": "扫码单据转换",
},
idQuery: {
id: "",
diff --git a/src/views/warehouse/stockOrderNew.vue b/src/views/warehouse/stockOrderNew.vue
index ef7a0d6..b05b8d3 100644
--- a/src/views/warehouse/stockOrderNew.vue
+++ b/src/views/warehouse/stockOrderNew.vue
@@ -23,7 +23,7 @@
-
+
@@ -447,7 +447,7 @@ import stockOrderNewDistribution from "./stockOrderNewDistribution";
import stockHospOrderNew from "./stockHospOrderNew";
import store from "../../store";
import draggable from "vuedraggable";
-import {getLocalJoinBusType} from "../../api/basic/busLocalType";
+import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
import {selectSysParamByKey} from "../../api/param/systemParamConfig";
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
@@ -456,9 +456,9 @@ export default {
data() {
return {
query: {
- billType:null,
- corpName:null,
- locStorageCode:null,
+ billType: null,
+ corpName: null,
+ locStorageCode: null,
billNo: "",
status: "1",
page: 1,
@@ -485,9 +485,9 @@ export default {
"3": "待校验",
},
sourceMap: {
- "1": "网页新增",
+ "1": "web端新增单据",
"2": "第三方系统",
- "3": "扫码单据",
+ "3": "扫码单据转换",
},
typeMap: {
1: "预入库",
@@ -498,7 +498,7 @@ export default {
},
newDistributionVisible: false,
newSpDistributionVisible: false,
-
+ isSp: store.getters.customerId,
detailFormRules: {
batchNo: [
{required: true, message: "请输入批次号", trigger: "blur"}
@@ -842,7 +842,7 @@ export default {
let query = {
enabled: true,
};
- getLocalJoinBusType(query)
+ getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;
diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue
index e9b4d30..5bf938b 100644
--- a/src/views/warehouse/stockOrderSearch.vue
+++ b/src/views/warehouse/stockOrderSearch.vue
@@ -33,7 +33,7 @@
-
+
@@ -58,10 +58,6 @@
-
-
-
-
{{ getStorageName(scope.row.locStorageCode) }}
-
-
-
-
-
+
+
+
+
+
@@ -146,11 +142,11 @@
type="text"
size="small"
@click.native="printOrder(scope.row)"
- v-if="haveDistributionVisible"
+
>单据打印
-
+
@@ -189,38 +185,41 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
+
-
+