diff --git a/public/ps.html b/public/ps.html index d83b6ec..9840498 100644 --- a/public/ps.html +++ b/public/ps.html @@ -3,20 +3,24 @@ + 物资详情
-
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index 0635b5c..2bc42c4 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -44,6 +44,23 @@ + +
+
+ 当前库存 + +
+
+
+
+
+
+ {{totaldata.kucun}} + 库存 +
+
+
+
@@ -67,7 +84,8 @@ "month": { "ruku": 0, "chuku": 0 - } + }, + "kucun":0 } } }, diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 46cc687..7ca1495 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -118,6 +118,9 @@ }, async loadChart(){ let that = this + that.lineArr.xArr = [] + that.lineArr.series[0].data = [] + that.lineArr.series[1].data = [] await stocksCharts({ start_time: this.start_time, end_time: this.end_time diff --git a/src/views/outbounds/component/printoutbounds.vue b/src/views/outbounds/component/printoutbounds.vue index f7a8219..63300b6 100644 --- a/src/views/outbounds/component/printoutbounds.vue +++ b/src/views/outbounds/component/printoutbounds.vue @@ -5,7 +5,7 @@
苏州市河道管理处物资领用审批表
业务科室:{{form.jieyongbumen}} - 编号: + 编号:{{form.chukushijian}}-{{form.id}}
@@ -151,7 +151,8 @@ } } else { this.id = '' - this.type = '' + this.type = '' + this.form={} this.mingxiList = [] } } diff --git a/src/views/outbounds/index.vue b/src/views/outbounds/index.vue index 5db776c..1e81dd0 100644 --- a/src/views/outbounds/index.vue +++ b/src/views/outbounds/index.vue @@ -29,7 +29,7 @@ - + @@ -98,7 +98,8 @@ customForm: { customFormId: "", tableName: "" - }, + }, + wuziguanli_oatoken:'', form: [], total: 0, list: [], @@ -232,11 +233,11 @@ typeid = parseInt(typeObj[k]) } } - let res = await getOatoken() + // let res = await getOatoken() // = this.chukuType=='领用'?31:(this.chukuType=='处置'?32:33) // http://suzhouhedaooa.langye.net/admin/flow/create/31?username=admin&default_json={%22bianhao%22:%22100%22} let url = - `${process.env.VUE_APP_OA_URL}/admin/flow/create/${typeid}?wuziguanli_oatoken=${res.oatoken}&username=${this.userName}&default_json=${JSON.stringify(default_json)}` + `${process.env.VUE_APP_OA_URL}/admin/flow/create/${typeid}?wuziguanli_oatoken=${this.wuziguanli_oatoken}&username=${this.userName}&default_json=${JSON.stringify(default_json)}` let seeBuy = window.open(url, 'follow', `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0` ) @@ -270,7 +271,11 @@ this.window.top = (window.screen.height - 30 - this.window.height) / 2 this.window.left = (window.screen.width - 10 - this.window.width) / 2 this.getUserName() - this.getindex() + this.getindex() + getOatoken().then(res=>{ + this.wuziguanli_oatoken =res.oatoken + }) + } } diff --git a/src/views/stocks/component/addRuku.vue b/src/views/stocks/component/addRuku.vue index 5417b8e..7ade640 100644 --- a/src/views/stocks/component/addRuku.vue +++ b/src/views/stocks/component/addRuku.vue @@ -314,7 +314,8 @@ authName:'', rukuTypeName: '盘点', tableName: 'stocks', - importstableName: 'stocks_items', + importstableName: 'stocks_items', + wuziguanli_oatoken:'', customFormId: 8, importForm: [], cangkuList: [], @@ -564,7 +565,10 @@ } }, created() { - this.getCangku() + this.getCangku() + getOatoken().then(res=>{ + this.wuziguanli_oatoken =res.oatoken + }) }, methods: { // 导入入库明细 @@ -669,10 +673,10 @@ this.getQs() }, async toQsFollow(id){ - let res = await getOatoken() + // let res = await getOatoken() let url = - `${process.env.VUE_APP_OA_URL}/admin/flow/view/${id}?wuziguanli_oatoken=${res.oatoken}` + `${process.env.VUE_APP_OA_URL}/admin/flow/view/${id}?wuziguanli_oatoken=${this.wuziguanli_oatoken}` console.log("url",url) let seeBuy = window.open(url, 'seeBuy','location=0') }, @@ -784,12 +788,24 @@ } this.showList = res.data this.showTotal = res.total + }, + // + getIds(url,name) { + var reg = new RegExp("(^|&)" + name.toLowerCase() + "=([^&]*)(&|$)"); + var r = url.match(reg); + if (r != null) { + return unescape(r[2].replace(new RegExp(/(%25)/g), '%').replace(new RegExp(/(%25)/g), '%')); + } + return null }, async getKucunShow(e) { console.log(e) let id = '' - if (e) { - id = e.split('-')[1] + if (e) { + + // id = e.split('-')[1] + id = e.substring(e.indexOf('=') + 1, e.indexOf('&')); + console.log("id",id) this.$nextTick(() => { this.$refs.huikubianma.blur() }) diff --git a/src/views/stocks/component/detailContract.vue b/src/views/stocks/component/detailContract.vue index 26d3df7..41bd88a 100644 --- a/src/views/stocks/component/detailContract.vue +++ b/src/views/stocks/component/detailContract.vue @@ -243,9 +243,9 @@ }) return } - let res = await getOatoken() + // let res = await getOatoken() let url = - `${process.env.VUE_APP_OA_URL}/admin/flow/view/${this.detail.purchase_last_flow_id}?wuziguanli_oatoken=${res.oatoken}` + `${process.env.VUE_APP_OA_URL}/admin/flow/view/${this.detail.purchase_last_flow_id}?wuziguanli_oatoken=${this.wuziguanli_oatoken}` let seeBuy = window.open(url, 'seeBuy', `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0` ) @@ -260,9 +260,9 @@ }) return } - let res = await getOatoken() + // let res = await getOatoken() let url = - `${process.env.VUE_APP_OA_URL}/admin/flow/view/${this.detail.invite_last_flow_id}?wuziguanli_oatoken=${res.oatoken}` + `${process.env.VUE_APP_OA_URL}/admin/flow/view/${this.detail.invite_last_flow_id}?wuziguanli_oatoken=${this.wuziguanli_oatoken}` let seeBidding = window.open(url, 'seeBidding', `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0` ) @@ -277,9 +277,9 @@ }) return } - let res = await getOatoken() + // let res = await getOatoken() let url = - `${process.env.VUE_APP_OA_URL}/admin/flow/view/${this.detail.join_last_flow_id}?wuziguanli_oatoken=${res.oatoken}` + `${process.env.VUE_APP_OA_URL}/admin/flow/view/${this.detail.join_last_flow_id}?wuziguanli_oatoken=${this.wuziguanli_oatoken}` let seeSign = window.open(url, 'seeSign', `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0` ) @@ -298,7 +298,7 @@ let res = await getOatoken() console.log(url) let url = - `${process.env.VUE_APP_OA_URL}/admin/flow/view/${this.detail.req_last_flow_id}?wuziguanli_oatoken=${res.oatoken}` + `${process.env.VUE_APP_OA_URL}/admin/flow/view/${this.detail.req_last_flow_id}?wuziguanli_oatoken=${this.wuziguanli_oatoken}` let seeAsk = window.open(url, 'seeAsk', `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0` ) @@ -369,7 +369,11 @@ this.window.width = screen.availWidth * 0.95 this.window.height = screen.availHeight * 0.95 this.window.top = (window.screen.height - 30 - this.window.height) / 2 - this.window.left = (window.screen.width - 10 - this.window.width) / 2 + this.window.left = (window.screen.width - 10 - this.window.width) / 2 + getOatoken().then(res=>{ + this.wuziguanli_oatoken =res.oatoken + }) + } }