diff --git a/.env.development b/.env.development
index e82ae5f7..c36d00d3 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
ENV = 'development'
# 开发环境
-VUE_APP_BASE_API = 'http://192.168.1.11:9991'
+VUE_APP_BASE_API = 'http://192.168.0.166:9991'
VUE_APP_SYNC_API ="http://127.0.0.1:10001"
diff --git a/.env.production b/.env.production
index e3cfc2ad..34ff415f 100644
--- a/.env.production
+++ b/.env.production
@@ -29,6 +29,9 @@ VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
+# 长泰医院
+# VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/'
+
# 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'
diff --git a/src/views/purchase/purApply/purApply.vue b/src/views/purchase/purApply/purApply.vue
index 232d77fd..ed739b8e 100644
--- a/src/views/purchase/purApply/purApply.vue
+++ b/src/views/purchase/purApply/purApply.vue
@@ -9,8 +9,25 @@
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
-
+
-
+
@@ -38,9 +55,6 @@
-
-
-
@@ -87,8 +101,9 @@
:default-sort="defaultSort" @sort-change="handleSortChange">
-
-
+
+
+
{{ emergencyMap[scope.row.emergency] }}
@@ -204,9 +219,10 @@ export default {
idQuery: {},
total: 0,
thirdSys: [],
- invList: {},
+ invList: [],
+ targetInvList: [],
+ deptList: [],
invCodebe: null,
- deptList: {},
thirdSysDetail: null,
busTypes: [],
originTypes: [],
@@ -323,7 +339,7 @@ export default {
this.filterQuery.endDate = null;
}
this.loading = true;
- this.filterQuery.isUser=true
+ this.filterQuery.isUser = true
console.log(this.filterQuery)
listApply(this.filterQuery)
.then((response) => {
@@ -430,6 +446,20 @@ export default {
this.formName = "add";
this.newSpDistributionVisible = true;
},
+
+ getCurInvCode() {
+
+ },
+
+ getCurInvList() {
+ getInvListByUser()
+ .then((response) => {
+ this.invList = response.data || [];
+ })
+ .catch(() => {
+ });
+ },
+
getInvList() {
var query = {
parentId: this.filterQuery.targetDeptCode,
@@ -438,7 +468,7 @@ export default {
this.filterQuery.targetInvCode = null
this.$forceUpdate()
filterGroupBySpuse(query).then((res) => {
- this.invList = res.data || [];
+ this.targetInvList = res.data || [];
})
},
getDeptList() {
@@ -485,6 +515,7 @@ export default {
,
created() {
this.initActDateRange()
+ this.getCurInvList();
this.getDeptList();
}
,
diff --git a/src/views/purchase/purApply/pureApplyAudit.vue b/src/views/purchase/purApply/pureApplyAudit.vue
index d6e3703a..d6511791 100644
--- a/src/views/purchase/purApply/pureApplyAudit.vue
+++ b/src/views/purchase/purApply/pureApplyAudit.vue
@@ -40,9 +40,22 @@
-
-
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
@@ -88,6 +101,7 @@
+
{{ emergencyMap[scope.row.emergency] }}
@@ -159,7 +173,7 @@ import pureApplyDetail from "./pureApplyDetailDialog";
import {delApply, auditOrder, listApplyDetail, auditListApply} from "@/api/purchase/purApply";
import {filterAll, getInvListByUser} from "@/api/system/invWarehouse";
import {getDeptListByUser} from "@/api/auth/authDept";
-import {filterSubAll} from "@/api/system/invSubWarehouse";
+import {filterGroupBySpuse, filterSubAll} from "@/api/system/invSubWarehouse";
export default {
data() {
@@ -207,8 +221,9 @@ export default {
thirdSysDetail: null,
busTypes: [],
originTypes: [],
- invList: {},
- deptList: {},
+ invList: [],
+ targetInvList: [],
+ deptList: [],
list: [],
detailList: [],
loading: false,
@@ -302,8 +317,8 @@ export default {
this.filterQuery.endDate = null;
}
this.loading = true;
- this.filterQuery.status=2
- this.filterQuery.isInvCode=true
+ this.filterQuery.status = 2
+ this.filterQuery.isInvCode = true
auditListApply(this.filterQuery)
.then((response) => {
if (response.code == 20000) {
@@ -423,6 +438,16 @@ export default {
this.getList();
});
},
+ getCurInvList() {
+ var query = {
+ spUse: true,
+ }
+ this.filterQuery.targetInvCode = null
+ this.$forceUpdate()
+ filterGroupBySpuse(query).then((res) => {
+ this.targetInvList = res.data || [];
+ })
+ },
}
,
components: {
@@ -450,6 +475,7 @@ export default {
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
this.actDateRange = [start, end];
this.getDeptList();
+ this.getCurInvList();
}
,
}
diff --git a/src/views/purchase/purApply/pureApplyMySearch.vue b/src/views/purchase/purApply/pureApplyMySearch.vue
index 5dcd22bf..673fe1a8 100644
--- a/src/views/purchase/purApply/pureApplyMySearch.vue
+++ b/src/views/purchase/purApply/pureApplyMySearch.vue
@@ -10,8 +10,25 @@
-
-
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
-
+
@@ -36,9 +53,6 @@
-
-
-
@@ -97,8 +111,9 @@
:default-sort="defaultSort" @sort-change="handleSortChange">
-
-
+
+
+
{{ emergencyMap[scope.row.emergency] }}
@@ -217,8 +232,9 @@ export default {
thirdSysDetail: null,
busTypes: [],
originTypes: [],
- invList: {},
- deptList: {},
+ invList: [],
+ targetInvList: [],
+ deptList: [],
list: [],
detailList: [],
loading: false,
@@ -355,7 +371,7 @@ export default {
}
this.loading = true;
this.filterQuery.status = 3;
- this.filterQuery.isUser=true
+ this.filterQuery.isUser = true
listApply(this.filterQuery)
.then((response) => {
if (response.code == 20000) {
@@ -442,7 +458,14 @@ export default {
this.getList();
this.detailList = [];
},
-
+ getCurInvList() {
+ getInvListByUser()
+ .then((response) => {
+ this.invList = response.data || [];
+ })
+ .catch(() => {
+ });
+ },
newDistributionForm(index, row) {
this.idQuery.id = '';
@@ -459,7 +482,7 @@ export default {
parentId: this.filterQuery.targetDeptCode
}
filterSubAll(query).then((res) => {
- this.invList = res.data || [];
+ this.targetInvList = res.data || [];
})
},
getDeptList() {
@@ -499,6 +522,7 @@ export default {
,
created() {
this.getDeptList();
+ this.getCurInvList();
}
,
}
diff --git a/src/views/purchase/purApply/pureApplySearch.vue b/src/views/purchase/purApply/pureApplySearch.vue
index 9dc3d5ec..0d420c48 100644
--- a/src/views/purchase/purApply/pureApplySearch.vue
+++ b/src/views/purchase/purApply/pureApplySearch.vue
@@ -11,7 +11,8 @@
-
+
-
-
-
+
+
+
+
+ {{ item.name }}
+
+
+
+
@@ -51,15 +63,15 @@
@@ -97,8 +109,9 @@
:default-sort="defaultSort" @sort-change="handleSortChange">
-
-
+
+
+
{{ emergencyMap[scope.row.emergency] }}
@@ -172,7 +185,7 @@ import pureApplyDetail from "./pureApplyDetailDialog";
import {delApply, auditOrder, listApplyDetail, auditListApply} from "@/api/purchase/purApply";
import {filterAll, getInvListByUser} from "@/api/system/invWarehouse";
import {getDeptListByUser} from "@/api/auth/authDept";
-import {filterSubAll} from "@/api/system/invSubWarehouse";
+import {filterGroupBySpuse, filterSubAll} from "@/api/system/invSubWarehouse";
export default {
data() {
@@ -217,8 +230,9 @@ export default {
thirdSysDetail: null,
busTypes: [],
originTypes: [],
- invList: {},
- deptList: {},
+ invList: [],
+ targetInvList: [],
+ deptList: [],
list: [],
detailList: [],
loading: false,
@@ -355,7 +369,7 @@ export default {
}
this.loading = true;
this.filterQuery.status = 12;
- this.filterQuery.isInvCode=true
+ this.filterQuery.isInvCode = true
auditListApply(this.filterQuery)
.then((response) => {
if (response.code == 20000) {
@@ -474,6 +488,16 @@ export default {
this.getInvList();
});
},
+ getCurInvList() {
+ var query = {
+ spUse: true,
+ }
+ this.filterQuery.targetInvCode = null
+ this.$forceUpdate()
+ filterGroupBySpuse(query).then((res) => {
+ this.targetInvList = res.data || [];
+ })
+ },
}
,
components: {
@@ -497,6 +521,8 @@ export default {
,
created() {
this.getDeptList();
+ this.getCurInvList();
+
}
,
}