增加name字段，目的是在首页卡片显示

材料卡片图片数据

artApi.js

@@ -31,6 +31,7 @@ const artApi = {
     conditionCheckUpdate: '/rpc/conditionCheckUpdate', //修改状况检查
     conditionCheckDelete: '/rpc/conditionCheckDelete', //删除状况检查
     viewConditionCheck: '/rpc/viewConditionCheck', //查询状况检查
+    viewOrgUnionRepairRecord:'/rpc/viewOrgUnionRepairRecord',//查询联合档案列表
     viewRepairRecord: '/rpc/viewRepairRecord', //查询修复档案列表
     repairRecordInsert: '/rpc/repairRecordInsert', //创建修复档案
     repairRecordUpdate: '/rpc/repairRecordUpdate', //编辑修复档案

artRepairFile.js

@@ -9,6 +9,7 @@ import ArtRepairLog from './artRepairLog';
 import { EditType } from '@airkoon/cellsys/cellsysUtil';
 import { PublishStatus, PublishTarget } from '@airkoon/cellsys/cellsysEnum';
 import ArtSystem from './artSystem';
+import RepairFileAudit from "./repairFileAudit";
 
 class ArtRepairFile {
     constructor(params = {}) {
@@ -39,20 +40,22 @@ class ArtRepairFile {
                 return { name: name };
             });
         }
+        this.orgName = params.org_name;
         //发布状态有关逻辑
         this.isPublish = params.is_publish;
         this.isUnlock = params.is_unlock;
-        this.publishRange = params.publish_range;
+        this.publishRange=params.publish_range
         this.publishGroup = params.publish_group ? params.publish_group : []; //发布的群组
     }
 
     //艺术品封面图
     get coverImageUrl() {
-        if (this.artworkRecord['artworkImages'] && this.artworkRecord['artworkImages'].length > 0) {
+        if (this.artworkRecord && this.artworkRecord['artworkImages'].length > 0) {
             return this.artworkRecord['artworkImages'][0].compressionUrl;
         }
     }
 
+    //艺术品封面图
     get oldNameFormat() {
         return `《${this.artworkRecord['oldName']}》`;
     }
@@ -169,6 +172,7 @@ class ArtRepairFile {
         editTask.addParam('_datetime', params.datetime);
         editTask.addParam('_links', params.links);
         editTask.addParam('_geometry', params.geometry);
+        editTask.addParam('_geometry_name', params.geometryName);
         return new Promise((resolve, reject) => {
             editTask
                 .execute()
@@ -256,6 +260,44 @@ class ArtRepairFile {
             pageInfo,
         });
     }
+    //查询修复档案归档申请列表
+    queryRepairFileArchive(params = {}) {
+        let { pageInfo, order, filters } = params;
+        let query = new Query();
+        if (pageInfo) {
+            query.setCurrPage(pageInfo.currPage);
+            query.setPageSize(pageInfo.pageSize);
+        }
+        query.addFilter('repair_record_id', '=', this.id); //查询审核中的记录
+        if (filters && filters.length > 0) {
+            filters.forEach((item) => {
+                query.addFilter(item['name'], item['operator'], item['value']);
+            });
+        }
+        let queryTask = new QueryTask(artApi.viewRepairRecordArchiveReview, !!pageInfo);
+        return new Promise((resolve, reject) => {
+            queryTask
+                .execute(query)
+                .then((res) => {
+                    if (pageInfo) {
+                        if (res.data) {
+                            res.data = res.data.map((item) => {
+                                return new RepairFileAudit(item);
+                            });
+                            resolve(res);
+                        }
+                    } else {
+                        let resArr = res.map((item) => {
+                            return new RepairFileAudit(item);
+                        });
+                        resolve(resArr);
+                    }
+                })
+                .catch((err) => {
+                    reject(err);
+                });
+        });
+    }
 }
 
 export default ArtRepairFile;

artRepairLog.js

@@ -11,6 +11,7 @@ class ArtRepairLog extends CellsysEvent {
         this.id = params.id;
         this.repairRecordId = params.repair_record_id;
         this.repairNode = params.repair_node;
+        this.name = params.repair_node;
         this.restorers = params.restorers;
         this.description = params.description;
         this.datetime = params.datetime;
@@ -68,6 +69,7 @@ class ArtRepairLog extends CellsysEvent {
         editTask.addParam('_datetime', params.datetime);
         editTask.addParam('_links', params.links);
         editTask.addParam('_geometry', params.geometry);
+        editTask.addParam('_geometry_name', params.geometryName);
 
         return new Promise((resolve, reject) => {
             editTask

artSystem.js

@@ -20,7 +20,10 @@ import ArtworkEquipmentType from './equipmentType';
 import EquipmentData from './equipmentData';
 
 class ArtSystem {
-    constructor(orgId) {}
+    constructor(orgId) {
+
+    }
+    static unionStatus=null
     static token = null;
 
     //查询艺术品材质字典
@@ -351,13 +354,20 @@ class ArtSystem {
     //查询系统修复档案列表
     static queryRepairFiles(params) {
         let query = new Query();
-        let { filter, pageInfo } = params;
+        let { filter, pageInfo,getUnion } = params;
         if (filter) {
             filter.forEach((item) => {
                 query.addFilter(item['name'], item['operator'], item['value']);
             });
         }
-        let queryTask = new QueryTask(artApi.viewRepairRecord, !!pageInfo);
+        let queryType=artApi.viewRepairRecord
+        if ( ArtSystem.unionStatus&&getUnion === true) {
+            //联合状态为父级组织，并且需要获取联合信息
+            queryType = artApi.viewOrgUnionRepairRecord;
+        } else {
+            query.setOrder({ org_id: 'asc', id: 'desc' });
+        }
+        let queryTask = new QueryTask(queryType, !!pageInfo);
         return new Promise((resolve, reject) => {
             queryTask
                 .execute(query)

components/equData/eqDataForm.vue

@@ -193,6 +193,7 @@ export default {
         return {
             form: new EquipmentData(),
             rules: {
+                name: [{ required: true, message: '请填写数据名称', trigger: 'blur' }],
                 dateTime: [{ required: true, message: '请选择时间', trigger: 'blur' }],
             },
             isReadonly: false,
@@ -222,6 +223,8 @@ export default {
             this.equipment = this.currentEquipment;
             this.queryLaboratoryInfo();
             if (this.mode === 'details') {
+
+              this.isReadonly=true
                 this.form = this.currentEquData;
                 let { images } = this.form;
                 //图片填充

components/materialCard.vue

@@ -76,7 +76,7 @@
                     <el-image
                         fit="contain"
                         style="width: 200px; height: 200px"
-                        :src="material.imageUrlPreviewPath">
+                        :src="material.compressionUrl">
                         <template #error>
                             <div class="image-slot">
                                 &lt;!&ndash;

package.json

@@ -8,7 +8,7 @@
     "license": "ISC",
     "description": "美院相关",
     "dependencies": {
-        "@airkoon/cellsys": "git+http://zhangqg:12345678@airkoon.cn:8418/airkoon/cellsysBase.git#V1.16.4",
+        "@airkoon/cellsys": "git+http://airkoon.cn:8418/airkoon/cellsysBase.git#V1.16.4",
         "axios": "^1.4.0",
         "dayjs": "~1.10.6",
         "element-plus": "^2.3.7",