diff --git a/src/api/inventory/invPreInSearch.js b/src/api/inventory/invPreInSearch.js index 96a420e..68579ff 100644 --- a/src/api/inventory/invPreInSearch.js +++ b/src/api/inventory/invPreInSearch.js @@ -26,4 +26,28 @@ export function deleterPrein(data) { }); } +export function getInvPreInProduct(params) { + return axios({ + url: "/spms/inv/pre/in/product/filter", + method: "get", + params: params + }); +} + +export function getInvPreInProductDetail(params) { + return axios({ + url: "/spms/inv/pre/in/product/filterDetail", + method: "get", + params: params + }); +} + +export function deleteInvPreInProduct(data) { + return axios({ + url: "/spms/inv/pre/in/product/delete", + method: "post", + data: data + }); +} + diff --git a/src/main.js b/src/main.js index 1c9cf17..8e90b9f 100644 --- a/src/main.js +++ b/src/main.js @@ -87,6 +87,7 @@ Vue.use(Element, { Vue.config.productionTip = false + new Vue({ el: '#app', router, diff --git a/src/router/index.js b/src/router/index.js index afe5086..126dd34 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,6 +1,5 @@ import Vue from 'vue' import Router from 'vue-router' - Vue.use(Router) /* Layout */ @@ -175,9 +174,13 @@ Router.prototype.push = function push(location) { return routerPush.call(this, location).catch(err => err) } + + export default new Router({ base: process.env.VUE_APP_CONTEXT_PATH, mode: 'hash', // 去掉url中的# scrollBehavior: () => ({ y: 0 }), - routes: constantRoutes + routes: constantRoutes, }) + + diff --git a/src/utils/request.js b/src/utils/request.js index a36d2ec..b02dfd7 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -6,6 +6,7 @@ import errorCode from '@/utils/errorCode' import {tansParams, blobValidate} from "@/utils/ruoyi"; import cache from '@/plugins/cache' import {saveAs} from 'file-saver' +import Cookies from 'js-cookie' let downloadLoadingInstance; // 是否显示重新登录 @@ -96,7 +97,8 @@ service.interceptors.response.use(res => { ).then(() => { isRelogin.show = false; store.dispatch('LogOut').then(() => { - location.href = process.env.VUE_APP_CONTEXT_PATH + "index"; + Cookies.remove() + location.href = process.env.VUE_APP_CONTEXT_PATH + "index"; }) }).catch(() => { isRelogin.show = false; diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue index eb4c83c..1f12f0d 100644 --- a/src/views/basic/busType/bussinessTypeModify.vue +++ b/src/views/basic/busType/bussinessTypeModify.vue @@ -126,18 +126,27 @@ - - - - + + + + + + + + + + + + + + + + + + @@ -183,14 +192,14 @@ - - - - - - - - + + + + + + + + + + + + 预验收使用结束退回 + + + + + + + + + + + 预验收使用结束退回 + + + @@ -327,7 +359,7 @@ @@ -368,7 +400,7 @@ @@ -1250,6 +1282,8 @@ export default { this.getList() this.findSpecialMethod() this.oldData = Object.assign({}, this.inputQuery) + this.inputQuery.codeFillCheck=false; + this.inputQuery.preInBack=false; } } diff --git a/src/views/inventory/InvPreInProductsDetail.vue b/src/views/inventory/InvPreInProductsDetail.vue new file mode 100644 index 0000000..708b6a3 --- /dev/null +++ b/src/views/inventory/InvPreInProductsDetail.vue @@ -0,0 +1,213 @@ + + + + + + diff --git a/src/views/inventory/InvSupPreInProducts.vue b/src/views/inventory/InvSupPreInProducts.vue new file mode 100644 index 0000000..e7ffcd9 --- /dev/null +++ b/src/views/inventory/InvSupPreInProducts.vue @@ -0,0 +1,365 @@ + + + + + + diff --git a/src/views/inventory/InvSupPreInSerach.vue b/src/views/inventory/InvSupPreInSerach.vue index c1b6bc0..303f1c5 100644 --- a/src/views/inventory/InvSupPreInSerach.vue +++ b/src/views/inventory/InvSupPreInSerach.vue @@ -100,7 +100,7 @@ - @@ -354,6 +354,7 @@ export default { batchNo: null, ylqxzcrbarmc: null, zczbhhzbapzbh: null, + manufactory: null, page: 1, limit: 10 }, @@ -372,25 +373,6 @@ export default { }, components: {}, methods: { - onReset() { - this.$router.push({ - path: "", - }); - this.getList(); - }, - onSubmit() { - this.loading = true; - - if (this.auditDateRange !== null) { - this.codeQuery.startAduditTime = this.auditDateRange[0]; - this.codeQuery.endAduditTime = this.auditDateRange[1]; - } else { - this.codeQuery.startAduditTime = null; - this.codeQuery.endAduditTime = null; - } - this.codeQuery.page = 1; - this.getList(); - }, hideSearch() { this.showSearch = !this.showSearch; }, @@ -428,64 +410,6 @@ export default { this.codeDetailList = []; this.codeTotal = 0; }, - //获取订单列表 - getList() { - this.loading = true; - this.currentRow = {billNo: ""}; - this.clearDetailList(); - this.filterQuery.fromCorp = store.getters.customerId - filterPrein(this.filterQuery) - .then((response) => { - this.loading = false; - if (response.code === 20000) { - this.list = response.data.list || []; - this.total = response.data.total || 0; - } else { - this.$message.error(response.message); - } - }) - .catch((error) => { - this.$message.error(error.message) - this.loading = false; - this.list = []; - this.total = 0; - }); - }, - deleteOrders(data) { - this.loading = true; - let delQuery = { - billNo: data, - } - deleterPrein(delQuery) - .then((response) => { - - if (response.code == 20000) { - this.getList(); - this.$message({ - type: "success", - message: "删除成功！", - }); - } else if (response.code == 520) { - this.$message.error("新增扫码单据列表已不存在该扫码单据！"); - this.getList(); - } - - }) - .catch(() => { - }); - }, - deleteDialog(row) { - this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.deleteOrders(row.billNo); - }) - .catch(() => { - }); - }, onCodeReset() { this.codeQuery = { orderIdFk: null, @@ -498,7 +422,7 @@ export default { keyup_submit(event) { this.filterQuery.page = 1; - this.getList(); + this.getCodeDetailList(); event.target.select(); }, @@ -572,7 +496,7 @@ export default { created() { this.codeQuery.invCode=this.$store.getters.locInvCode; this.getInvList(); - this.getList(); + this.getCodeDetailList(); let supId = this.$store.getters.customerId; if (supId == "110") { this.showSup = true; diff --git a/src/views/myLogin.vue b/src/views/myLogin.vue index 320dc7f..61a94b7 100644 --- a/src/views/myLogin.vue +++ b/src/views/myLogin.vue @@ -238,8 +238,6 @@ export default { }); this.getCookie(); - - } }; diff --git a/src/views/remind/invRemindMsg.vue b/src/views/remind/invRemindMsg.vue index 0d598d4..1dafb62 100644 --- a/src/views/remind/invRemindMsg.vue +++ b/src/views/remind/invRemindMsg.vue @@ -39,29 +39,15 @@ - + - - - - + @@ -302,6 +288,7 @@ export default { return { showSearch: true, filterQuery: { + productName: null, relId: null, batchNo: null, ggxh: null, @@ -355,7 +342,15 @@ export default { path: "", }); this.filterQuery = { - paramStatus: 1, + productName: null, + relId: null, + batchNo: null, + ggxh: null, + status: 1, + ignoreStatus: 0, + invCode: this.$store.getters.locInvCode, + invSpaceCode: null, + type: null, page: 1, limit: 20, }; diff --git a/src/views/remind/supInvRemindMsg.vue b/src/views/remind/supInvRemindMsg.vue index ad0e40d..568846d 100644 --- a/src/views/remind/supInvRemindMsg.vue +++ b/src/views/remind/supInvRemindMsg.vue @@ -5,29 +5,13 @@ - + - - - - + @@ -262,6 +246,7 @@ export default { return { showSearch: true, filterQuery: { + productName: null, relId: null, batchNo: null, ggxh: null, @@ -313,7 +298,15 @@ export default { path: "", }); this.filterQuery = { - paramStatus: 1, + productName: null, + relId: null, + batchNo: null, + ggxh: null, + status: 1, + ignoreStatus: 0, + invCode: this.$store.getters.locInvCode, + invSpaceCode: null, + type: null, page: 1, limit: 20, }; diff --git a/src/views/sync/SysUdimsData.vue b/src/views/sync/SysUdimsData.vue index 6acd5b8..b12356e 100644 --- a/src/views/sync/SysUdimsData.vue +++ b/src/views/sync/SysUdimsData.vue @@ -33,9 +33,10 @@ 查询 同步单据 + 同步单据类型