From e383e5e6b40e8939a17227438b51924c4a09b0cc Mon Sep 17 00:00:00 2001
From: longyvfengyun <496960745@qq.com>
Date: 星期四, 21 十二月 2023 14:05:05 +0800
Subject: [PATCH] 附件内容和sop内容修改
---
src/pages/resourceManage/materialsCenter/list.vue | 67 +++++++++++++++++++++------------
1 files changed, 43 insertions(+), 24 deletions(-)
diff --git a/src/pages/resourceManage/materialsCenter/list.vue b/src/pages/resourceManage/materialsCenter/list.vue
index dbbf010..058eafa 100644
--- a/src/pages/resourceManage/materialsCenter/list.vue
+++ b/src/pages/resourceManage/materialsCenter/list.vue
@@ -522,6 +522,7 @@
data = res.data2.list.map((v) => {
const model = v.subModel;
const reg = /(.*)(-|_)A/;
+
const rootModel = reg.test(model) ? model.match(reg)[1] : "";
const isCanUse = this.getAttachIsCanUse(v);
return {
@@ -712,7 +713,6 @@
this.resize();
},
panelShow(obj) {
- console.log(obj);
const { id, dwgUrl, attachLocks, subModel } = obj;
this.currentObj = obj;
let reg = new RegExp("^" + subModel, "i");
@@ -737,33 +737,52 @@
});
},
getAttachIsCanUse(obj) {
- const {dwgUrl, attachLocks} = obj;
- let result = false;
- if(attachLocks.length !== 0) { // 瀛樺湪鏈攣瀹�/閿佸畾鏉＄洰
- let isHasUnlock = false;
- for(let i=0; i<attachLocks.length; i++) {
- if(attachLocks[i].lockFlag === 0) {
- isHasUnlock = true;
- break;
- }
- }
-
- if(isHasUnlock) { // 瀛樺湪鏈攣瀹氶檮浠�
- result = true;
- }else if(dwgUrl){ // 瀛樺湪鍥剧焊
- let isInList = false;
- for(let i=0; i<attachLocks.length; i++) {
- let reg = new RegExp(attachLocks[i].attachName, 'i');
- if(reg.test(dwgUrl)) {
- isInList = true;
+ const {dwgUrl, attachLocks, attachFileList} = obj;
+ let isHasNewFile = true; // 鏍囪瘑鏄惁瀛樻湁鏂囦欢锛屾病鏈夐攣瀹氬拰鏈攣瀹氭棩蹇�
+ if(attachFileList) {
+ for(let i=0; i<attachFileList.length; i++) {
+ const itemI = attachFileList[i];
+ for(let j=0; j<attachLocks.length; j++) {
+ const itemJ = attachLocks[j];
+ if(itemI === itemJ.attachName) {
+ isHasNewFile = false;
break;
}
}
- result = !isInList;
- }else {
- result = false;
}
- }else result = !!dwgUrl;
+ }else {
+ isHasNewFile = false;
+ }
+ let result = false;
+ if(isHasNewFile) {
+ result = true;
+ }else {
+ if(attachLocks.length !== 0) { // 瀛樺湪鏈攣瀹�/閿佸畾鏉＄洰
+ let isHasUnlock = false;
+ for(let i=0; i<attachLocks.length; i++) {
+ if(attachLocks[i].lockFlag === 0) {
+ isHasUnlock = true;
+ break;
+ }
+ }
+
+ if(isHasUnlock) { // 瀛樺湪鏈攣瀹氶檮浠�
+ result = true;
+ }else if(dwgUrl){ // 瀛樺湪鍥剧焊
+ let isInList = false;
+ for(let i=0; i<attachLocks.length; i++) {
+ let reg = new RegExp(attachLocks[i].attachName, 'i');
+ if(reg.test(dwgUrl)) {
+ isInList = true;
+ break;
+ }
+ }
+ result = !isInList;
+ }else {
+ result = false;
+ }
+ }else result = !!dwgUrl;
+ }
return result;
},
fileListCancel() {
--
Gitblit v1.9.1