物料标签打印修改、检测档案bug修复

src/business/platform/form/formrender/dynamic-form/components/print.vue → src/business/platform/data/templaterender/components/print.vue

@@ -14,7 +14,7 @@
                 <div
                     v-for="(item, index) in list"
                     :key="index"
-                    :class="(index + 1) % 9 === 9 ? ['box', 'next-page'] : 'box'"
+                    :class="(index + 1) % 9 === 0 ? ['box', 'next-page'] : 'box'"
                 >
                     <template v-for="(o, i) in modelList">
                         <div v-if="item[o.value]" class="item" :style="`width: ${o.width};`">

src/business/platform/data/templaterender/form/action.js

@@ -8,7 +8,6 @@ export default {
     emitEventHandler(actionKey, args) {
       const action = args && args.attributes ? args.attributes.button_type || actionKey : actionKey
       this.actionName = actionKey
-      // console.log(actionKey,'货币慧慧68687')
       switch (action) {
         case 'close': // 关闭窗口
           this.closeDialog()
@@ -97,7 +96,6 @@ export default {
     // 保存
     handleSave() {
       // 验证表单是否正确
-      // console.log('认为非我方2131321')
       this.validate(valid => {
         if (valid) {
           // 表单提交校验

src/business/platform/data/templaterender/templates/list.vue

@@ -242,12 +242,13 @@
       @close="loadFlowFData"
     />
     <Scan
-    :currentScan = "scanName"
-    :scanVisible = "scanVisible"
-    :obj = "obj"
-    v-if="scanVisible"
-    @scanOff = "scanOff"
+      :currentScan = "scanName"
+      :scanVisible = "scanVisible"
+      :obj = "obj"
+      v-if="scanVisible"
+      @scanOff = "scanOff"
     />
+    <print :show="showPrint" :list="printList" :type="printType"/>
   </div>
 </template>
 <script>
@@ -308,7 +309,8 @@ export default {
     IbpsAddress,
     IbpsImage,
     DictionaryFormat,
-    Scan
+    Scan,
+    Print: () => import('../components/print')
    // BpmnFormrender
     // DataTemplateFormat
   },
@@ -404,7 +406,10 @@ export default {
       dialogTemplate: null,
       dialogTemplateAtts: {},
       formPrintTemplateDialogVisible: false,
-      printTemplateId: ''
+      printTemplateId: '',
+      showPrint: false,
+      printType: '',
+      printList: []
     }
   },
   computed: {
@@ -772,6 +777,12 @@ export default {
       this.scanName = val
       this.obj = obj
     },
+    // 标签打印
+    printTag(data, type) {
+      this.showPrint = true
+      this.printList = data
+      this.printType = type
+    },
     /* 返回关闭*/
     scanOff(val){
       this.scanVisible = false

src/business/platform/form/formbuilder/right-aside/editors/editor-options.vue

@@ -21,7 +21,7 @@
             <!---=================自定义=============---->
             <div v-if="datasource === 'custom' || !datasource">
                 <!-- 下拉框静态数据新增是否可创建 -->
-                <el-form-item v-if="fieldType === 'select'">
+                <el-form-item v-if="fieldType === 'select'" class="label">
                     <template slot="label">是否可添加<help-tip prop="allowCreate" /></template>
                     <el-switch v-model="fieldOptions.allowCreate"/>
                 </el-form-item>
@@ -424,4 +424,9 @@
             margin-right: 0;
         }
     }
+    .label {
+        ::v-deep .el-form-item__label {
+            width: 100px !important;
+        }
+    }
 </style>

src/business/platform/form/formrender/index.vue

@@ -61,7 +61,6 @@
                 ref="customComponent"
                 v-bind="customComponentAtts"
             />
-            <print :show="showPrint" :list="printList" :type="printType"/>
         </ibps-watermark>
     </div>
 </template>
@@ -79,8 +78,7 @@
         components: {
             DynamicForm,
             panle,
-            IbpsWatermark,
-            Print: () => import('./dynamic-form/components/print')
+            IbpsWatermark
         },
         props: {
             isDialog: {
@@ -148,10 +146,7 @@
                 number: 0,
                 // 个性定制
                 customComponent: null,
-                customComponentAtts: {},
-                showPrint: false,
-                printType: '',
-                printList: []
+                customComponentAtts: {}
             }
         },
         computed: {
@@ -560,12 +555,6 @@
             // 更新store
             updateStore(action, data) {
                 this.$store.dispatch(action, data)
-            },
-            // 标签打印
-            print(data, type) {
-                this.showPrint = true
-                this.printList = data
-                this.printType = type
             }
         }
     }

src/views/platform/bpmn/bpmInstHis/component/testingRecord.vue

@@ -233,7 +233,7 @@
             }
         },
         data () {
-            reportList[1].path = this.info.path
+            reportList[1].path = this.info.reportPath
             return {
                 searchList,
                 reportList,