From f8f141f7ca5a1d85e1a792ed55c64f28af61c45b Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Fri, 2 Sep 2022 13:33:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E6=96=B0git=E5=9D=80=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4-?= =?UTF-8?q?=E6=9C=80=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/api/user.js | 24 + vue/src/components/WMSOutOrder/index.vue | 0 vue/src/layout/components/Navbar.vue | 8 +- vue/src/router/index.js | 16 + vue/src/views/profileuser/index.vue | 85 ++ vue/src/views/profileuser/resetPwd.vue | 80 ++ vue/src/views/profileuser/userInfo.vue | 79 ++ vue/src/views/ux/backGroundWork/index.vue | 17 +- .../ux/billManage/FisUpdateExport/index.vue | 267 +++--- .../billManage/kanbanOutOrder copy/detail.vue | 907 ++++++++++++++++++ .../billManage/kanbanOutOrder copy/index.vue | 504 ++++++++++ .../ux/billManage/wmsCusomerKanban/detail.vue | 2 +- .../views/ux/vw/dataInput/hq_open/index.vue | 4 +- vue/static/config.js | 35 +- 14 files changed, 1873 insertions(+), 155 deletions(-) create mode 100644 vue/src/components/WMSOutOrder/index.vue create mode 100644 vue/src/views/profileuser/index.vue create mode 100644 vue/src/views/profileuser/resetPwd.vue create mode 100644 vue/src/views/profileuser/userInfo.vue create mode 100644 vue/src/views/ux/billManage/kanbanOutOrder copy/detail.vue create mode 100644 vue/src/views/ux/billManage/kanbanOutOrder copy/index.vue diff --git a/vue/src/api/user.js b/vue/src/api/user.js index 196669c0..32f96ed7 100644 --- a/vue/src/api/user.js +++ b/vue/src/api/user.js @@ -29,3 +29,27 @@ export function getMenu() { }) } +// //加载用户登录信息 +// export function loadLoginUserInfo() { +// return request({ +// url: baseURL + '/api/identity/my-profile', +// method: 'get' +// }) +// } +// //修改登录用户基本信息 +// export function putLoginUserInfo(data) { +// return request({ +// url: baseURL + '/api/identity/my-profile', +// method: 'put', +// data +// }) +// } +// //修改登录用户的密码-强密码规则 +// export function postLoginUserInfo(data) { +// return request({ +// url: baseURL + '/api/identity/my-profile/change-password', +// method: 'post', +// data +// }) +// } + diff --git a/vue/src/components/WMSOutOrder/index.vue b/vue/src/components/WMSOutOrder/index.vue new file mode 100644 index 00000000..e69de29b diff --git a/vue/src/layout/components/Navbar.vue b/vue/src/layout/components/Navbar.vue index 943357b6..d264d39c 100644 --- a/vue/src/layout/components/Navbar.vue +++ b/vue/src/layout/components/Navbar.vue @@ -18,7 +18,6 @@ class="nav-item" @click.native="navItemsClick(item.type)" > - @@ -200,9 +199,10 @@ export default { *进入个人中心 */ if (type === "person") { - this.$router.push({ - name: "person", - }); + // this.$router.push({ + // name: "person", + // }); + this.$router.push({ name: "Profileuser" }); } }, getCurrentOrg() { diff --git a/vue/src/router/index.js b/vue/src/router/index.js index f318990a..d4898803 100644 --- a/vue/src/router/index.js +++ b/vue/src/router/index.js @@ -120,6 +120,22 @@ export const constantRoutes = [ } ] }, + { + path: '/profileuser', + component: Layout, + redirect: '/profileuser/index', + hidden: true, + children: [{ + path: 'index', + component: () => import('@/views/profileuser/index'), + name: 'Profileuser', + meta: { + title: '个人中心', + icon: 'user', + noCache: true + } + }] + }, { path: '/viewCc', component: Layout, diff --git a/vue/src/views/profileuser/index.vue b/vue/src/views/profileuser/index.vue new file mode 100644 index 00000000..8eade950 --- /dev/null +++ b/vue/src/views/profileuser/index.vue @@ -0,0 +1,85 @@ + + + diff --git a/vue/src/views/profileuser/resetPwd.vue b/vue/src/views/profileuser/resetPwd.vue new file mode 100644 index 00000000..84e5c368 --- /dev/null +++ b/vue/src/views/profileuser/resetPwd.vue @@ -0,0 +1,80 @@ + + + diff --git a/vue/src/views/profileuser/userInfo.vue b/vue/src/views/profileuser/userInfo.vue new file mode 100644 index 00000000..c34167af --- /dev/null +++ b/vue/src/views/profileuser/userInfo.vue @@ -0,0 +1,79 @@ + + + diff --git a/vue/src/views/ux/backGroundWork/index.vue b/vue/src/views/ux/backGroundWork/index.vue index 354ddeeb..e6f73ea5 100644 --- a/vue/src/views/ux/backGroundWork/index.vue +++ b/vue/src/views/ux/backGroundWork/index.vue @@ -64,7 +64,7 @@ 说明：每间隔30秒进行自动刷新！说明：每间隔30秒进行自动刷新, {{ "剩余时间" + times + "秒" }}! @@ -495,6 +495,7 @@ export default { data() { return { crmType: "backJob", + times: 30, selectValue: "", selectNameValue: "", // 是否显示详细弹出层 @@ -565,7 +566,7 @@ export default { this.timer = setInterval(() => { this.listQuery.taskId = ""; this.listQuery.stateName = ""; - setTimeout(this.getList, 0); + //setTimeout(this.getList, 0); }, 1000 * 30); //30秒刷新一次页面 // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。 this.$once("hook:beforeDestroy", () => { @@ -573,6 +574,7 @@ export default { }); }, created() { + this.getTime(); this.getList(); }, beforeDestroy() { @@ -622,6 +624,17 @@ export default { }, }, methods: { + getTime() { + this.timer = setInterval(() => { + this.times--; + if (this.times === 0) { + clearInterval(this.timer); + this.timer = null; + this.times = 30; + setTimeout(this.getList, 0); + } + }, 1000); + }, // 下载模板操作 downloadTemplate() { let downfilename = "系统导入模板.rar"; diff --git a/vue/src/views/ux/billManage/FisUpdateExport/index.vue b/vue/src/views/ux/billManage/FisUpdateExport/index.vue index 23ea2467..1b60c631 100644 --- a/vue/src/views/ux/billManage/FisUpdateExport/index.vue +++ b/vue/src/views/ux/billManage/FisUpdateExport/index.vue @@ -48,7 +48,7 @@ 说明：每间隔15秒进行自动刷新！说明：每间隔30秒进行自动刷新, {{ "剩余时间" + times + "秒" }}! @@ -151,17 +151,9 @@ - + @@ -201,6 +193,56 @@ @pagination="getList" /> + + + + + + + + + + + + + + + + + +
+ 取消 + + 确认 +
+ @@ -220,6 +262,7 @@ export default { data() { return { crmType: "backJob", + times: 30, rules: { versionValue: [ { required: true, message: "必须输入！", trigger: "change" }, @@ -311,6 +354,7 @@ export default { kenncode: undefined, chassisNumber: undefined, sapCode: undefined, + versionValue: undefined, // name: "未结算对比", // settledate: "", // materialCode: "", @@ -372,8 +416,8 @@ export default { this.timer = setInterval(() => { this.listQuery.taskId = ""; this.listQuery.stateName = ""; - setTimeout(this.getList, 0); - }, 1000 * 15); //15秒刷新一次页面 + //setTimeout(this.getList, 0); + }, 1000 * 30); //15秒刷新一次页面 // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。 this.$once("hook:beforeDestroy", () => { clearInterval(timer); @@ -381,6 +425,7 @@ export default { //this.disabledDateCp5(); }, created() { + this.getTime(); this.getAllVersionList(); this.getMaterialGroup(); this.getList(); @@ -431,6 +476,17 @@ export default { }, }, methods: { + getTime() { + this.timer = setInterval(() => { + this.times--; + if (this.times === 0) { + clearInterval(this.timer); + this.timer = null; + this.times = 30; + setTimeout(this.getList, 0); + } + }, 1000); + }, dblhandleCurrentChange(row, column, cell, event) { if (column.label === "说明") { row.isEditCell = true; @@ -602,20 +658,44 @@ export default { }, getAllVersionList() { - this.$axios - .posts("/api/settleaccount/CentralizedControl/openlist") - .then((response) => { - this.versionList = []; - response.forEach((element) => { - let options = {}; - options.value = element.version; - options.label = element.version; - this.versionList.push(options); - }); - }) - .catch(() => { - this.listLoading = false; - }); + this.versionList = []; + + let yy_now = new Date().getFullYear(); + let mm_now = new Date().getMonth() + 1; + + let mm_last = new Date().getMonth(); + if (mm_last.toString().length == 1) { + mm_last = "0" + mm_last.toString(); + } + let options_last = {}; + var date_last = yy_now.toString() + mm_last.toString(); + options_last.value = date_last; + options_last.label = date_last; + this.versionList.push(options_last); + + if (mm_now.toString().length == 1) { + mm_now = "0" + mm_now.toString(); + } + let options_now = {}; + var date_now = yy_now.toString() + mm_now.toString(); + options_now.value = date_now; + options_now.label = date_now; + this.versionList.push(options_now); + + // this.$axios + // .posts("/api/settleaccount/CentralizedControl/openlist") + // .then((response) => { + // this.versionList = []; + // response.forEach((element) => { + // let options = {}; + // options.value = element.version; + // options.label = element.version; + // this.versionList.push(options); + // }); + // }) + // .catch(() => { + // this.listLoading = false; + // }); }, //获取物料组车型 getMaterialGroup() { @@ -646,101 +726,62 @@ export default { this.startTime = ""; this.endTime = ""; }, + + handleCreate() { + this.$nextTick(() => { + this.$refs["formCount"].resetFields(); + }); + this.formTitle = "更新FIS数据"; + this.form = {}; + this.dialogFormVisible = true; + }, save() { this.$refs.formCount.validate((valid) => { if (valid) { - this.formLoading = true; - this.listExportQuery.version = this.formCount.versionValue; //版本 - if (this.formCount.materialCode != "") { - this.listExportQuery.materialCode = this.formCount.materialCode; //物料号 - } - if (this.formCount.sapMaterialCode != "") { - this.listExportQuery.sapCode = this.formCount.sapMaterialCode; //厂内物料号 - } - if (this.formCount.kennCode != "") { - this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号 - } - - this.listExportQuery.begin = this.startTime - ? this.startTime - : undefined; - this.listExportQuery.end = this.endTime ? this.endTime : undefined; - if (this.formCount.chassisNumber != "") { - this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号 - } - if (this.formCount.materialGroupValue != "") { - this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型 - } - - console.log( - "FIS更新-导出条件：" + JSON.stringify(this.listExportQuery) - ); - this.$axios - .posts( - "/api/settleaccount/ReportMakeService/FisUpdateExportService", - this.listExportQuery - ) - .then((res) => { - let taskid = res; - if (Number.isInteger(taskid)) { - this.$notify({ - title: "成功", - message: "任务生成成功！任务号:" + taskid, - type: "success", - duration: 2000, + this.$confirm("是否生成FIS更新任务?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.formLoading = true; + this.listExportQuery.version = this.formCount.versionValue; //版本 + console.log( + "FIS更新-生成条件：" + JSON.stringify(this.listExportQuery) + ); + this.$axios + .posts( + "/api/settleaccount/ReportMakeService/FisUpdateExportService", + this.listExportQuery + ) + .then((res) => { + let taskid = res; + if (Number.isInteger(taskid)) { + this.$notify({ + title: "成功", + message: "任务生成成功！任务号:" + taskid, + type: "success", + duration: 2000, + }); + } + this.getList(); + this.formLoading = false; + this.dialogFormVisible = false; + }) + .catch(() => { + this.formLoading = false; + this.dialogFormVisible = false; }); - } - this.getList(); - this.formLoading = false; - this.dialogFormVisible = false; }) .catch(() => { - this.formLoading = false; - this.dialogFormVisible = false; + this.$message({ + type: "info", + message: "已取消操作", + }); }); } }); }, - handleCreate() { - this.$confirm("是否生成FIS更新任务?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.formLoading = true; - console.log("FIS更新-生成条件：" + JSON.stringify(this.listExportQuery)); - this.$axios - .posts( - "/api/settleaccount/ReportMakeService/FisUpdateExportService", - this.listExportQuery - ) - .then((res) => { - let taskid = res; - if (Number.isInteger(taskid)) { - this.$notify({ - title: "成功", - message: "任务生成成功！任务号:" + taskid, - type: "success", - duration: 2000, - }); - } - this.getList(); - this.formLoading = false; - this.dialogFormVisible = false; - }) - .catch(() => { - this.formLoading = false; - this.dialogFormVisible = false; - }); - }) - .catch(() => { - this.$message({ - type: "info", - message: "已取消操作", - }); - }); - }, filterHandler(value, row, column) { const property = column["property"]; @@ -856,7 +897,7 @@ export default { //导入界面中超链接过来的参数 this.listQuery.name = "Fis发货数据更新状态"; //this.listQuery.type = this.JobversionValue; - console.log("FIS更新传入条件："+this.listQuery) + //console.log("FIS更新传入条件：" + this.listQuery); this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { diff --git a/vue/src/views/ux/billManage/kanbanOutOrder copy/detail.vue b/vue/src/views/ux/billManage/kanbanOutOrder copy/detail.vue new file mode 100644 index 00000000..34648100 --- /dev/null +++ b/vue/src/views/ux/billManage/kanbanOutOrder copy/detail.vue @@ -0,0 +1,907 @@ + + + + + + + + diff --git a/vue/src/views/ux/billManage/kanbanOutOrder copy/index.vue b/vue/src/views/ux/billManage/kanbanOutOrder copy/index.vue new file mode 100644 index 00000000..045f8358 --- /dev/null +++ b/vue/src/views/ux/billManage/kanbanOutOrder copy/index.vue @@ -0,0 +1,504 @@ + + + + + + + + diff --git a/vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue b/vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue index 425aaed7..de8eadb8 100644 --- a/vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue +++ b/vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue @@ -516,7 +516,7 @@ export default { cancelButtonText: "取消", type: "warning", }) - .then(() => { + .bn(() => { this.$axios .posts( "/api/settleaccount/WMSCusomerKanbanoutput/WmsCustomerKanbanOutPut-Pass", diff --git a/vue/src/views/ux/vw/dataInput/hq_open/index.vue b/vue/src/views/ux/vw/dataInput/hq_open/index.vue index 9db2bbf2..fa0d9cc6 100644 --- a/vue/src/views/ux/vw/dataInput/hq_open/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_open/index.vue @@ -294,8 +294,8 @@ export default { width: 170, }); tempsTabs.push({ label: "数量", prop: "qty", width: 100 }); - // tempsTabs.push({ label: "单价", prop: "price", width: 100 }); - // tempsTabs.push({ label: "金额", prop: "amt", width: 100 }); + tempsTabs.push({ label: "单价", prop: "price", width: 100 }); + tempsTabs.push({ label: "金额", prop: "amt", width: 100 }); tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 }); tempsTabs.push({ label: "存储地点", diff --git a/vue/static/config.js b/vue/static/config.js index 6757964e..a7fba232 100644 --- a/vue/static/config.js +++ b/vue/static/config.js @@ -37,8 +37,8 @@ if (process.env.NODE_ENV === 'development') { configJSON = { base: { - //ip: 'http://192.168.0.67', - ip: 'http://192.168.0.140', + ip: 'http://192.168.0.67', + //ip: 'http://192.168.0.140', //ip: 'http://149.223.116.5', //ip: 'http://124.220.28.250', //ip: 'http://10.123.148.162', @@ -71,36 +71,5 @@ if (process.env.NODE_ENV === 'development') { } } } -// 开发环境 -// export default { -// base: { -// ip: 'http://localhost', -// auth_port: '44323', -// public_port: '44350', -// backend_port: '44350' -// }, -// basic: {}, -// upload: { -// ip: 'http://localhost' -// }, -// authServer: { -// ip: 'http://localhost' -// }, -// crm: { -// ip: 'http://localhost' -// }, -// oms: { -// ip: 'http://localhost' -// }, -// wx: { -// ip: 'http://localhost', -// basicPort: '' -// }, -// client: { -// client_id: 'abpvnext_master_App', -// client_secret: '1q2w3e*', -// grant_type: 'password' -// } -// } export default configJSON