Merge remote-tracking branch 'airkoon/master'

artRepairFile.js

@@ -12,6 +12,7 @@ import ArtSystem from './artSystem';
 
 class ArtRepairFile {
     constructor(params = {}) {
+        this.cellsysType = "ArtRepairFile";
         this.id = params.id;
         this.name = params.name;
         this.description = params.description;
@@ -41,6 +42,7 @@ class ArtRepairFile {
         //发布状态有关逻辑
         this.isPublish = params.is_publish;
         this.isUnlock = params.is_unlock;
+        this.publishRange=params.publish_range
     }
 
     //艺术品封面图

artRepairPlan.js

@@ -78,7 +78,7 @@ class ArtRepairPlan {
     //变更修复方案
     modificationRepairPlan(params) {
         let editTask = new EditTask(artApi.repairPlanInsert);
-        editTask.addParam('_repair_record_id', this.id);
+        editTask.addParam('_repair_record_id',  params.repairRecordId);
         editTask.addParam('_id', params.id);
         editTask.addParam('_name', params.name);
         editTask.addParam('_repair_nodes', params.repairNodes);

components/Signature/write.vue

@@ -31,15 +31,15 @@
 </template>
 
 <script>
-import { artApi } from '../../artApi.js';
-import { ElMessageBox } from 'element-plus';
-import { base64toFile } from '../../utils/utils.js';
+import {artApi} from '../../artApi.js';
+import {ElMessageBox} from 'element-plus';
+import {base64toFile} from '../../utils/utils.js';
 import ArtSystem from '../../artSystem.js';
-import { VueSignaturePad } from 'vue-signature-pad';
+import {VueSignaturePad} from 'vue-signature-pad';
 
 export default {
   name: 'write',
-    components: { VueSignaturePad },
+  components: {VueSignaturePad},
   emits: ['save', 'close'],
   props: {
     role: String,
@@ -65,9 +65,9 @@ export default {
   },
   mounted() {
     // 如果是移动端设备，强制横屏
-        if (window.innerWidth < window.innerHeight) {
-            this.lockOrientation();
-        }
+    // if (window.innerWidth < window.innerHeight) {
+    //     this.lockOrientation();
+    // }
   },
   beforeUnmount() {
     //组件销毁时退出横屏
@@ -127,7 +127,7 @@ export default {
         module: this.module,
       })
           .then((res) => {
-                    let { code, data, message } = res;
+            let {code, data, message} = res;
             if (code !== 200) {
               this.$message({
                 message: '签名图片提交失败！原因：' + message,
@@ -190,20 +190,22 @@ export default {
 .signature-pad {
   width: 100%;
   height: 100%;
-    display: flex;
   padding: 5px;
 }
+
 .container {
   width: 100%;
-    height: 100%;
+  height: calc(100% - 120px);
   padding: 8px;
   border: 1px solid;
 }
+
 .dialog-footer {
   display: flex;
-    flex-direction: column;
+  flex-direction: row;
   justify-content: space-around;
   align-items: center;
+  height: 100px;
 
   .otherSet {
     width: 40%;
@@ -254,10 +256,12 @@ export default {
     }
   }
 }
+
 :deep(.el-card) {
   height: 25%;
   width: 50%;
 }
+
 :deep(.el-card__body) {
   height: 100%;
   display: flex;
@@ -265,6 +269,7 @@ export default {
   justify-content: center;
   align-items: center;
 }
+
 .svgClass {
   width: 5rem;
   height: 5rem;