From a078c593d7f059fa2d1db2f73100d14e52592ff1 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 23 十月 2024 14:17:04 +0800
Subject: [PATCH] 修改权限
---
src/components/view/b1-report-preparation.vue | 78 +++++++++++++++++++++----
src/components/view/b1-inspect-order-plan.vue | 2
static/js/menu.js | 2
src/components/view/a6-device-management.vue | 42 +++++++------
src/components/view/b1-expenses.vue | 9 ++
5 files changed, 96 insertions(+), 37 deletions(-)
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index 0cc801f..478341e 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -486,15 +486,17 @@
font: '妗ｆ淇',
type: 'text',
method: 'isUpdate'
- }, {
- id: 'handleConfig',
- font: '鏁伴噰閰嶇疆',
- type: 'text',
- method: 'handleConfig',
- disabFun: (row, index) => {
- return row.insProductItem === ''
- }
- }],
+ }
+ // , {
+ // id: 'handleConfig',
+ // font: '鏁伴噰閰嶇疆',
+ // type: 'text',
+ // method: 'handleConfig',
+ // disabFun: (row, index) => {
+ // return row.insProductItem === ''
+ // }
+ // }
+ ],
headNoShow:['enDeviceName'],
tagField: {
deviceStatus: {
@@ -613,17 +615,17 @@
config = true
}
}
- if (!config) {
- this.componentData.do.splice(2, 1)
- }
- if (!up) {
- this.componentData.do.splice(1, 1)
- }
- if (!del) {
- this.componentData.do.splice(0, 1)
- }
- this.addPower = add
- },
+ // if (!config) {
+ // this.componentData.do.splice(2, 1)
+ // }
+ if (!up) {
+ this.componentData.do.splice(1, 1)
+ }
+ if (!del) {
+ this.componentData.do.splice(0, 1)
+ }
+ this.addPower = add
+ },
// 鑾峰彇瀛楀吀
selectEnumByCategory() {
this.$axios.post(this.$api.enums.selectEnumByCategory, {
diff --git a/src/components/view/b1-expenses.vue b/src/components/view/b1-expenses.vue
index 9cab03f..9b23f1e 100644
--- a/src/components/view/b1-expenses.vue
+++ b/src/components/view/b1-expenses.vue
@@ -84,7 +84,7 @@
</div>
<div class="search_thing" style="padding-left: 70px;">鎬讳环锛歿{total}}</div>
<div class="search_thing" style="padding-left: 70px;">
- <el-button size="small" type="primary" @click="handleDown" :loading="outLoading">瀵煎嚭</el-button>
+ <el-button size="small" type="primary" @click="handleDown" :loading="outLoading" v-if="isExport">瀵煎嚭</el-button>
</div>
</div>
<div class="table">
@@ -218,7 +218,8 @@
current: -1,
size: -1,
},
- outLoading:false
+ outLoading:false,
+ isExport:false
}
},
mounted() {
@@ -332,6 +333,10 @@
if (power[i].menuMethod == 'addInsOrder') {
add = true
}
+ //
+ if (power[i].menuMethod == 'export') {
+ this.isExport = true
+ }
}
if (!up) {
this.componentData.do.splice(4, 1)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 41402db..ca20a17 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -892,7 +892,7 @@
if (power[i].menuMethod == 'scanInsOrderState') {
this.scanInsOrderState = true
}
- if (power[i].menuMethod == 'selectWarehouse') {
+ if (power[i].menuMethod == 'scanInsOrderState') {
this.selectWarehouse = true
this.selectList()
}
diff --git a/src/components/view/b1-report-preparation.vue b/src/components/view/b1-report-preparation.vue
index 74f279d..e368aa6 100644
--- a/src/components/view/b1-report-preparation.vue
+++ b/src/components/view/b1-report-preparation.vue
@@ -157,9 +157,9 @@
<img src="../../../static/img/no-full.svg" alt="" v-else style="cursor: pointer;" @click="fullscreen=false;" >
</div>
<div style="height: 78vh;" v-if="issuedVisible">
- <!-- <onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;" /> -->
- <filePreview v-if="issuedVisible" :fileUrl="currentFile.url"
- :currentFile="currentFile" style="max-height: 100%;overflow-y: auto;"/>
+ <onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;" />
+ <!-- <filePreview v-if="issuedVisible" :fileUrl="currentFile.url"
+ :currentFile="currentFile" style="max-height: 100%;overflow-y: auto;"/> -->
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="issuedReasonVisible=true" :disabled="loadingIssued">涓嶉�氳繃</el-button>
@@ -182,9 +182,9 @@
<img src="../../../static/img/no-full.svg" alt="" v-else style="cursor: pointer;" @click="fullscreen=false;" >
</div>
<div style="height: 78vh;" v-if="approveVisible">
- <!-- <onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;" /> -->
- <filePreview v-if="approveVisible" :fileUrl="currentFile.url"
- :currentFile="currentFile" style="max-height: 100%;overflow-y: auto;"/>
+ <onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;" />
+ <!-- <filePreview v-if="approveVisible" :fileUrl="currentFile.url"
+ :currentFile="currentFile" style="max-height: 100%;overflow-y: auto;"/> -->
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="approveReasonVisible=true" :disabled="loadingApprove">涓嶆壒鍑�</el-button>
@@ -586,9 +586,27 @@
// console.log(this.$refs.Word.getValue())
},
async selectAllByOne(row) {
- let url = row.urlS ? row.urlS : row.url;
- this.currentFile.url = this.javaApi + url;
- this.lookFileVisible = true
+ // let url = row.urlS ? row.urlS : row.url;
+ // this.currentFile.url = this.javaApi + url;
+ let fileName = (row.urlS===null||row.urlS==='')?row.url:row.urlS
+ fileName = fileName.replace('/word/','')
+ const userName = JSON.parse(localStorage.getItem("user")).name;
+ //鍙傝�僾abOnlyOffice缁勪欢鍙傛暟閰嶇疆
+ const { href } = this.$router.resolve({
+ path: `/wordEdit`,
+ query: {
+ url: this.javaApi + "/word/" + fileName,
+ isEdit: false,
+ fileType: "docx",
+ title: fileName,
+ lang: 'zh-CN',
+ isPrint: true,
+ user_id: 1,
+ user_name: userName,
+ }
+ })
+ window.open(href, '_blank');
+ // this.lookFileVisible = true
},
download(row) {
let url = row.urlS ? row.urlS : row.url;
@@ -611,8 +629,25 @@
},
handleIssued(row) {
this.currentInfo = row;
- let url = row.urlS ? row.urlS : row.url;
- this.currentFile.url = this.javaApi + url;
+ // let url = row.urlS ? row.urlS : row.url;
+ // this.currentFile.url = this.javaApi + url;
+ let fileName = (row.urlS===null||row.urlS==='')?row.url:row.urlS
+ fileName = fileName.replace('/word/','')
+ const userName = JSON.parse(localStorage.getItem("user")).name;
+ //鍙傝�僾abOnlyOffice缁勪欢鍙傛暟閰嶇疆
+ const { href } = this.$router.resolve({
+ path: `/wordEdit`,
+ query: {
+ url: this.javaApi + "/word/" + fileName,
+ isEdit: false,
+ fileType: "docx",
+ title: fileName,
+ lang: 'zh-CN',
+ isPrint: true,
+ user_id: 1,
+ user_name: userName,
+ }
+ })
this.issuedVisible = true;
},
// 瀹℃牳閫氳繃
@@ -637,8 +672,25 @@
},
handleApprove(row) {
this.currentInfo = row;
- let url = row.urlS ? row.urlS : row.url;
- this.currentFile.url = this.javaApi + url;
+ // let url = row.urlS ? row.urlS : row.url;
+ // this.currentFile.url = this.javaApi + url;
+ let fileName = (row.urlS===null||row.urlS==='')?row.url:row.urlS
+ fileName = fileName.replace('/word/','')
+ const userName = JSON.parse(localStorage.getItem("user")).name;
+ //鍙傝�僾abOnlyOffice缁勪欢鍙傛暟閰嶇疆
+ const { href } = this.$router.resolve({
+ path: `/wordEdit`,
+ query: {
+ url: this.javaApi + "/word/" + fileName,
+ isEdit: false,
+ fileType: "docx",
+ title: fileName,
+ lang: 'zh-CN',
+ isPrint: true,
+ user_id: 1,
+ user_name: userName,
+ }
+ })
this.approveVisible = true;
},
// 鎵瑰噯閫氳繃
diff --git a/static/js/menu.js b/static/js/menu.js
index f52ada3..ed7e16a 100644
--- a/static/js/menu.js
+++ b/static/js/menu.js
@@ -45,7 +45,7 @@
v: "鏍峰搧绠＄悊",
i: "font icon-erjidaohang",
u: "b1-sample",
- p: "selectWarehouse"
+ p: "scanInsOrderState"
},{
v: "涓嶅悎鏍肩鐞�",
i: "font icon-erjidaohang",
--
Gitblit v1.9.3