diff --git a/.env.production b/.env.production index 04d349ea..63b005d4 100644 --- a/.env.production +++ b/.env.production @@ -27,6 +27,8 @@ VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/' # 平和县医院 # VUE_APP_BASE_API = 'http://192.168.0.43:9150/UDI_WMS_MC/' +VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/' + # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/' diff --git a/src/api/basic/basicDestinyRel.js b/src/api/basic/basicDestinyRel.js index f8b24261..653f9413 100644 --- a/src/api/basic/basicDestinyRel.js +++ b/src/api/basic/basicDestinyRel.js @@ -1,84 +1,84 @@ import axios from "@/utils/request"; export function getBasicDestinyfilter(query) { - return axios({ - url: "/udiwms/basic/destiny/model/filter", - method: "get", - params: query - }); + return axios({ + url: "/udiwms/basic/destiny/model/filter", + method: "get", + params: query + }); } export function addModeldestiny(query) { - return axios({ - url: "/udiwms/basic/destiny/model/addModeldestiny", - method: "post", - data: query - }); + return axios({ + url: "/udiwms/basic/destiny/model/addModeldestiny", + method: "post", + data: query + }); } export function editModeldestiny(query) { - return axios({ - url: "/udiwms/basic/destiny/model/editModeldestiny", - method: "post", - data: query - }); + return axios({ + url: "/udiwms/basic/destiny/model/editModeldestiny", + method: "post", + data: query + }); } export function delectModeldestiny(query) { - return axios({ - url: "/udiwms/basic/destiny/model/delectModeldestiny", - method: "post", - data: query - }); + return axios({ + url: "/udiwms/basic/destiny/model/delectModeldestiny", + method: "post", + data: query + }); } export function filterDestinyProduct(query) { - return axios({ - url: "/udiwms/basic/destiny/model/product/filter", - method: "get", - params: query - }); + return axios({ + url: "/udiwms/basic/destiny/model/product/filter", + method: "get", + params: query + }); } export function addModeldestinyProduct(query) { - return axios({ - url: "/udiwms/basic/destiny/model/addModeldestinyProduct", - method: "post", - data: query - }); + return axios({ + url: "/udiwms/basic/destiny/model/addModeldestinyProduct", + method: "post", + data: query + }); } export function filterDestinyDelect(query) { - return axios({ - url: "/udiwms/basic/destiny/model/filterDestinyDelect", - method: "get", - params: query - }); + return axios({ + url: "/udiwms/basic/destiny/model/filterDestinyDelect", + method: "get", + params: query + }); } export function delectModeldestinyProduct(query) { - return axios({ - url: "/udiwms/basic/destiny/model/delectModeldestinyProduct", - method: "get", - params: query - }); + return axios({ + url: "/udiwms/basic/destiny/model/delectModeldestinyProduct", + method: "get", + params: query + }); } export function uploadModeldestinyProduct(query) { - return axios({ - url: "/udiwms/basic/destiny/model/uploadModeldestinyProduct", - method: "post", - data: query - }); + return axios({ + url: "/udiwms/basic/destiny/model/uploadModeldestinyProduct", + method: "post", + data: query + }); } export function addDestinyProcess(query) { - return axios({ - url: "/udiwms/basic/destiny/model/addDestinyProcess", - method: "get", - params: query - }); + return axios({ + url: "/udiwms/basic/destiny/model/addDestinyProcess", + method: "get", + params: query + }); } diff --git a/src/api/inout/ioDestinyProcess.js b/src/api/inout/ioDestinyProcess.js index 2f0e421b..fd18b9c9 100644 --- a/src/api/inout/ioDestinyProcess.js +++ b/src/api/inout/ioDestinyProcess.js @@ -2,53 +2,53 @@ import axios from '@/utils/request' export function addDestinyDelect(query) { - return axios({ - url: "/udiwms/basic/destiny/model/addDestinyDelect", - method: "post", - data: query - }); + return axios({ + url: "/udiwms/basic/destiny/model/addDestinyDelect", + method: "post", + data: query + }); } export function filterDestinyDelect(query) { - return axios({ - url: "/udiwms/basic/destiny/model/filterDestinyProcessDelect", - method: "get", - params: query - }); + return axios({ + url: "/udiwms/basic/destiny/model/filterDestinyProcessDelect", + method: "get", + params: query + }); } export function filterDestinyProcess(query) { - return axios({ - url: "/udiwms/basic/destiny/model/filterDestinyProcess", - method: "get", - params: query - }); + return axios({ + url: "/udiwms/basic/destiny/model/filterDestinyProcess", + method: "get", + params: query + }); } export function checkDestinyProcess(query) { - return axios({ - url: "/udiwms/basic/destiny/model/checkDestinyProcess", - method: "get", - params: query - }); + return axios({ + url: "/udiwms/basic/destiny/model/checkDestinyProcess", + method: "get", + params: query + }); } export function filterDestinyProcessCode(query) { - return axios({ - url: "/udiwms/basic/destiny/model/filterDestinyProcessCode", - method: "get", - params: query - }); + return axios({ + url: "/udiwms/basic/destiny/model/filterDestinyProcessCode", + method: "get", + params: query + }); } export function delectDestinyProcess(query) { - return axios({ - url: "/udiwms/basic/destiny/model/delectDestinyProcess", - method: "get", - params: query - }); + return axios({ + url: "/udiwms/basic/destiny/model/delectDestinyProcess", + method: "get", + params: query + }); } diff --git a/src/views/basic/destiny/destiny.vue b/src/views/basic/destiny/destiny.vue index 58f290b6..24b31cb7 100644 --- a/src/views/basic/destiny/destiny.vue +++ b/src/views/basic/destiny/destiny.vue @@ -43,11 +43,11 @@ @@ -64,42 +64,42 @@ @@ -220,7 +220,7 @@ export default { this.formVisible = false; this.selectFormVisible = false; this.getList(); - this.delectList=[] + this.delectList = [] this.editQuery = {} }, handleDetail(row) { @@ -229,22 +229,22 @@ export default { }, filterDestinyDelect() { filterDestinyDelect(this.delectQuery) - .then((response) => { - this.loading = false; - if (response.code === 20000) { - this.delectList = response.data.list || []; - this.delectTotal = response.data.total || 0; - } else { - this.$message.error(response.message); - this.delectList = []; - this.delectTotal = 0; - } - }) - .catch(() => { - this.loading = false; + .then((response) => { + this.loading = false; + if (response.code === 20000) { + this.delectList = response.data.list || []; + this.delectTotal = response.data.total || 0; + } else { + this.$message.error(response.message); this.delectList = []; this.delectTotal = 0; - }); + } + }) + .catch(() => { + this.loading = false; + this.delectList = []; + this.delectTotal = 0; + }); }, } , diff --git a/src/views/basic/destiny/skProject.vue b/src/views/basic/destiny/skProject.vue new file mode 100644 index 00000000..f2058a73 --- /dev/null +++ b/src/views/basic/destiny/skProject.vue @@ -0,0 +1,362 @@ + + + diff --git a/src/views/basic/sicker/skPerson.vue b/src/views/basic/sicker/skPerson.vue new file mode 100644 index 00000000..982cf63a --- /dev/null +++ b/src/views/basic/sicker/skPerson.vue @@ -0,0 +1,361 @@ + + + diff --git a/src/views/inventory/InvPreInProductsDetail.vue b/src/views/inventory/InvPreInProductsDetail.vue index e766246c..3658cde9 100644 --- a/src/views/inventory/InvPreInProductsDetail.vue +++ b/src/views/inventory/InvPreInProductsDetail.vue @@ -48,7 +48,28 @@ style="width: 100%" > + + + + + + + + + + + - + + + + + + + + + + + { this.loading = false; diff --git a/src/views/inventory/InvProductsDetail.vue b/src/views/inventory/InvProductsDetail.vue index 5a089fc8..66e9c888 100644 --- a/src/views/inventory/InvProductsDetail.vue +++ b/src/views/inventory/InvProductsDetail.vue @@ -47,6 +47,29 @@ style="width: 100%" > + + + + + + + + + + + + + @@ -143,13 +166,14 @@ export default { data() { return { invProductDetailQuery: { + mainAction: null, code: null, relId: null, supId: null, batchNo: null, deptCode: null, invCode: null, - price:null, + price: null, page: 1, limit: 10 }, @@ -157,6 +181,38 @@ export default { total: 0, loading: false, defaultSort: {prop: 'orderTime', order: 'desc'}, + actDateRange: [], + pickerOptions: { + shortcuts: [ + { + text: "最近一周", + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); + picker.$emit("pick", [start, end]); + }, + }, + { + text: "最近一个月", + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); + picker.$emit("pick", [start, end]); + }, + }, + { + text: "最近三个月", + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 90); + picker.$emit("pick", [start, end]); + }, + }, + ], + }, }; }, methods: { @@ -165,17 +221,19 @@ export default { path: "", }); this.invProductDetailQuery = { + mainAction: null, code: null, relId: null, supId: null, batchNo: null, deptCode: null, invCode: null, - price:null, + price: null, page: 1, limit: 10 }; this.getList(); + this.actDateRange = []; }, onSubmit() { this.invProductDetailQuery.page = 1; @@ -200,11 +258,20 @@ export default { this.invProductDetailQuery.sort = 'asc' } this.invProductDetailQuery.orderBy = column.prop; + + this.getList(); }, getList() { this.loading = true; + if (this.actDateRange !== null) { + this.invProductDetailQuery.startTime = this.actDateRange[0]; + this.invProductDetailQuery.endTime = this.actDateRange[1]; + } else { + this.invProductDetailQuery.startTime = null; + this.invProductDetailQuery.endTime = null; + } this.invProductDetailQuery.relId = this.inputQuery.relId; this.invProductDetailQuery.supId = this.inputQuery.supId; this.invProductDetailQuery.invSpaceCode = this.inputQuery.invSpaceCode;