fix: 修复每日安全检查记录bug

src/business/platform/bpmn/form/dialog.vue

@@ -1,8 +1,9 @@
 <template>
   <van-popup
-    v-model="dialogVisible"
+    :value="visible"
     class="ibps-fullscreen-popup"
     position="bottom"
+    @input="(e) => $emit('close', e)"
     @opened="loadFormData"
   >
     <van-nav-bar :title="title" fixed @click-left="closeDialog">
@@ -10,7 +11,9 @@
         <van-icon name="cross" class="ibps-nav-bar__close-icon" />
       </template>
     </van-nav-bar>
+    <!-- v-if="visible" 修复点击不同数据闪屏问题 -->
     <bpmn-formrender
+      v-if="visible"
       ref="bpmnFormrender"
       :def-id="defId"
       :pro-inst-id="proInstId"
@@ -26,7 +29,7 @@
 <script>
 import BpmnFormrender from './index'
 export default {
-  name: 'bpmn-formrender-dialog',
+  name: 'BpmnFormrenderDialog',
   components: {
     BpmnFormrender
   },
@@ -63,17 +66,7 @@ export default {
     title: String
   },
   data() {
-    return {
-      dialogVisible: this.visible
-    }
-  },
-  watch: {
-    visible: {
-      handler: function (val, oldVal) {
-        this.dialogVisible = this.visible
-      },
-      immediate: true
-    }
+    return {}
   },
   methods: {
     loadFormData() {

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

@@ -405,17 +405,16 @@ export default {
             })
         }
         // this.title = this.$utils.isEmpty(this.title) ? data.title : this.title
-
-        // 表单定义
         this.formDef = this.$utils.parseData(formModel.formData) || {}
-
+        this.formDef.flowName = this.getFlowName(data.attributes)
+        // this.formDef.processName = this.processName
+        // 表单定义
         this.formData = {
           // 表单数据
           responses: this.$utils.parseData(data.boData) || {},
           // 表单权限
           permissions: this.$utils.parseData(data.permissions) || {}
         }
-
         // 一些参数
         this.attributes = this.initAttributes(data)
         this.formParams.nodeId = this.attributes.nodeId
@@ -481,6 +480,14 @@ export default {
         this.initUrlForm(urlForm)
       }
     },
+    getFlowName(attrs) {
+      if (!Array.isArray(attrs.opinionList)) {
+        return ''
+      } else {
+        const currentNodes = attrs.opinionList.slice(-1)[0]
+        return currentNodes ? currentNodes.taskName : ''
+      }
+    },
     // 初始化url表单
     initUrlForm(url) {
       if (url.startsWith('http')) {

src/business/platform/data/data-template/template.vue

@@ -61,7 +61,7 @@
                     class="titles"
                     :label-key="labelKey"
                     :data="data"
-                    :descField="labelField"
+                    :desc-field="labelField"
                     :field-options="comFieldOptions(labelField['name'])"
                     :field-type="comFieldType(labelField['name'])"
                     :template-fields="templateFields"
@@ -90,7 +90,7 @@
                           :data="data"
                           :template-fields="templateFields"
                           :field-options="item.fieldOptions"
-                          :descField="item"
+                          :desc-field="item"
                           :field-type="item.fieldType"
                           :tem="tem"
                         />
@@ -169,7 +169,6 @@
     </van-popup>
   </div>
 </template>
-
 <script>
 import { queryDataByKey, queryDataById } from '@/api/platform/data/dataTemplate'
 import { remoteRequest } from '@/utils/remote'
@@ -223,6 +222,7 @@ export default {
       type: String,
       default: 'children'
     },
+    label: String,
     queryKey: String,
     dynamicParams: Object, // 动态参数
     tem: Object
@@ -328,7 +328,7 @@ export default {
       deep: true
     },
     valueKey: {
-      handler(val, oldVal) {
+      handler() {
         this.initData()
       },
       deep: true
@@ -345,7 +345,9 @@ export default {
       this.loading = true
       this.onSearch()
     },
-    initData() {
+    async initData() {
+      // 等待动态参数
+      await this.$nextTick()
       const data = this.values
       this.checkedValue = []
       this.checkbox = []
@@ -353,7 +355,7 @@ export default {
         this.emitInitData([])
         return
       }
-      data.forEach((v) => {
+      data.forEach(async (v) => {
         // if (this.cacheData[v]) {
         //   this.checkedValue.push(v)
         // } else {
@@ -405,7 +407,6 @@ export default {
             if (data[this.valueKey]) {
               this.checkedValue.push(data[this.valueKey])
             }
-
             this.emitInitData(this.getSelectedData(this.checkedValue))
           }
         })
@@ -422,7 +423,6 @@ export default {
           })
       })
     },
-
     loadData(p, isInit) {
       console.log('触底加载')
       if (isInit) {

src/business/platform/data/form/dialog.vue

@@ -16,7 +16,7 @@
         ref="formrender"
         :form-def="formDef"
         :buttons="buttons"
-        :addDataCont="addDataCont"
+        :add-data-cont="addDataCont"
         :data="formData"
         :params="formParams"
         :readonly="readonly"

src/business/platform/data/index.vue

@@ -19,9 +19,8 @@
 <script>
 import DataTemplate from './templates'
 import Vue from 'vue'
-Vue.component(
-  'ibps-data-template-formrender',
-  () => import('@/business/platform/form/formrender/index.vue')
+Vue.component('IbpsDataTemplateFormrender', () =>
+  import('@/business/platform/form/formrender/index.vue')
 )
 
 export default {

src/business/platform/data/templaterender/custom-dialog/index.vue

@@ -67,6 +67,7 @@
       <input
         v-else
         :placeholder="placeholder"
+        :value="selectedValue"
         class="van-field__control"
         readonly
       />
@@ -76,11 +77,11 @@
         :visible="showPopup"
         :template-key="templateKey"
         :params="params"
-        :labelField="labelField"
+        :label-field="labelField"
         :values="selectedValue"
         :multiple="multiple"
-        :searchPlaceholder="searchPlaceholder"
-        :defaultFilterListCol="defaultFilterListCol"
+        :search-placeholder="searchPlaceholder"
+        :default-filter-list-col="defaultFilterListCol"
         :left-text="leftText"
         :id-key="idKey"
         :value-key="valueKey"
@@ -91,6 +92,7 @@
         :template-fields="templateFields"
         :field-type="fieldType"
         :dynamic-params="dynamicParams"
+        :label="label"
         @init-data="initData"
         @cancel="onCancel"
         @confirm="onConfirm"
@@ -123,7 +125,7 @@ import FieldFormatter from '@/business/platform/data/data-template/field-formatt
 import FieldFormatterr from '@/business/platform/data/data-template/field-formatter'
 import { buildLabelTitle } from '../utils/index'
 export default {
-  name: 'ibps-custom-dialog',
+  name: 'IbpsCustomDialog',
   components: {
     DataTemplatePopup,
     FieldFormatter,
@@ -270,6 +272,7 @@ export default {
     },
     initSelectedData() {
       this.selectedValue = this.getArrayValue(this.value)
+      // console.log('this.selectedValue===>', this.selectedValue)
     },
     getArrayValue(value) {
       if (this.$utils.isEmpty(value)) {
@@ -386,6 +389,7 @@ export default {
     },
     // 回调初始化数据
     initData(data) {
+      console.log('data===>', this.label, data)
       this.selectedData = data
       this._setInputValue()
       this.$nextTick(() => {

src/business/platform/data/templaterender/linkdata/index.vue

@@ -54,7 +54,7 @@
       <div v-if="$utils.isNotEmpty(selectedData)" class="van-field__control">
         <van-tag
           v-for="(item, index) in selectedData"
-          :key="item[valueKey] + index"
+          :key="item[linkValueKey] + index"
           type="primary"
           class="ibps-tag-span"
           size="medium"
@@ -125,7 +125,7 @@ import DataTemplatePopup from '../../data-template/template'
 import FieldFormatter from '../../data-template/field-formatter'
 
 export default {
-  name: 'ibps-linkdata',
+  name: 'IbpsLinkdata',
   components: {
     DataTemplatePopup,
     FieldFormatter
@@ -181,8 +181,7 @@ export default {
       showPopup: false, // 弹窗
       selectedData: [], // 选中的数据，这个值是用于展示的
       selectedValue: [], // 选中的值 是valueKey的值
-      tem: {},
-      valueKey: ''
+      tem: {}
     }
   },
   computed: {
@@ -259,7 +258,7 @@ export default {
       if (this.$utils.isEmpty(resultColumns)) {
         return
       }
-      // this.labelKey = resultColumns[0]['name']
+      // this.linkLabelKey = resultColumns[0]['name']
       if (dataTemplate.showType === 'tree') {
         // 树形
         this.isTree = true
@@ -289,7 +288,7 @@ export default {
             ? [this.$utils.parseData(value)]
             : this.$utils.parseData(value)
           return data.map((d) => {
-            return d[this.valueKey]
+            return d[this.linkValueKey]
           })
         } catch (error) {
           console.error(error)
@@ -303,11 +302,12 @@ export default {
         return value
       } else {
         return value.map((d) => {
-          return d[this.valueKey]
+          return d[this.linkValueKey]
         })
       }
     },
     getStoreValue(value) {
+      console.log('this.store==>', this.store, this.linkValueKey)
       const res = []
       if (this.store === 'json') {
         // json
@@ -319,21 +319,21 @@ export default {
             return true
           }
           const o = {}
-          o[this.valueKey] = v[this.valueKey]
-          o[this.labelKey] = v[this.labelKey]
+          o[this.linkValueKey] = v[this.linkValueKey]
+          o[this.linkLabelKey] = v[this.linkLabelKey]
           res.push(o)
         })
         return JSON.stringify(res)
       } else if (this.store === 'id') {
         // id
         value.forEach((v) => {
-          res.push(v[this.valueKey])
+          res.push(v[this.linkValueKey])
         })
         return res.join(this.storeSeparator)
       } else if (this.store === 'arrayId') {
         // 数组id
         return value.map((d) => {
-          return d[this.valueKey]
+          return d[this.linkValueKey]
         })
       } else {
         // 数组
@@ -359,8 +359,8 @@ export default {
         return
       }
       this.showPopup = false
-
       this.selectedData = selectedData
+      console.log('selectedDataselectedDataselectedData==>', selectedData)
       this.setInputValue(this.getStoreValue(selectedData))
     },
     onRightIconClick() {
@@ -371,6 +371,7 @@ export default {
     },
     setInputValue(value) {
       const result = this.formatData(value)
+      console.log('result===>', result)
       this.$emit('input', result)
       // 处理回调
       this.$nextTick(() => {
@@ -392,6 +393,7 @@ export default {
       }
     },
     formatData(data) {
+      console.log('222222222222222222222222222===>', data)
       if (this.$utils.isEmpty(data)) {
         return ''
       }
@@ -399,8 +401,8 @@ export default {
         // json
         const resutlList = JSON.parse(this.$utils.newData(data))
         resutlList.forEach((element) => {
-          element[this.dialogId] = element[this.valueKey]
-          element[this.dialogTitle] = element[this.labelKey]
+          element[this.dialogId] = element[this.linkValueKey]
+          element[this.dialogTitle] = element[this.linkLabelKey]
         })
         return JSON.stringify(resutlList)
       } else if (this.store === 'id') {

src/business/platform/form/dynamic-form/form-field.vue

@@ -388,7 +388,6 @@
     :rules="rules"
     v-on="$listeners"
   />
-
   <!-- 签名 -->
   <ibps-signature
     v-else-if="fieldType === 'signature'"
@@ -425,7 +424,6 @@
     :rules="rules"
     v-on="$listeners"
   />
-
   <!-- =======================自定义控件==============================-->
   <!-- 自定义组件 -->
   <div v-else-if="fieldType === 'component'">

src/business/platform/form/dynamic-form/form-item.vue

@@ -1,5 +1,9 @@
 <template>
-  <div v-show="!hidden" :data-field-type="field.field_type">
+  <div
+    v-show="!hidden"
+    :data-field-type="field.field_type"
+    :data-label-field="field.name"
+  >
     <!-- 子表-->
     <ibps-dynamic-form-table
       v-if="field.field_type === 'table'"
@@ -223,7 +227,6 @@ export default {
   },
   methods: {
     handleModels(name, val) {
-      console.log('22222222222222222222', name, JSON.parse(JSON.stringify(val)))
       this.models[name] = val
       this.$emit('update:models', {
         ...this.models,

src/business/platform/form/dynamic-form/form.vue

@@ -303,8 +303,9 @@ export default {
                   // this.models[fieldName] = await FormUtils.getFieldDefaultValue(
                   //   field
                   // )
-                  const defaultValue =
-                    await FormUtils.getFieldDefaultValue(field)
+                  const defaultValue = await FormUtils.getFieldDefaultValue(
+                    field
+                  )
                   this.models[fieldName] = defaultValue
                 }
               } else {
@@ -315,8 +316,9 @@ export default {
               // this.models[fieldName] = await FormUtils.getFieldDefaultValue(
               //   field
               // )
-              this.models[fieldName] =
-                await FormUtils.getFieldDefaultValue(field)
+              this.models[fieldName] = await FormUtils.getFieldDefaultValue(
+                field
+              )
               if (this.dynamicParams && this.dynamicParams[field.field_name]) {
                 this.models[fieldName] = this.dynamicParams[field.field_name]
               }

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

@@ -124,7 +124,6 @@ export default {
     formDefData() {
       return JSON.parse(JSON.stringify(this.formDef))
     },
-
     actions() {
       if (this.toolbars.length > this.btnNum) {
         return this.toolbars.slice(0, this.btnNum)

src/components/ibps-more-search/search-field.vue

@@ -1,20 +1,24 @@
 <template>
-  <van-form
-    :input-align="inputAlign"
-    :label-width="10"
-    class="ibps-search-form"
-  >
-    <van-collapse v-model="activeNames">
-      <template v-for="(item, i) in forms">
-        <van-cell
-          v-if="item.fieldType !== 'checker'"
+  <div>
+    <van-form
+      :input-align="inputAlign"
+      :label-width="10"
+      class="ibps-search-form"
+    >
+      <van-collapse v-model="activeNames">
+        <div
+          v-for="(item, i) in forms"
           :key="item.prop + i"
-          :title="item.label"
-          :border="false"
-          class="ibps-search-field__label"
-        />
-        <!-- IbpsChecker -->
-        <!-- <ibps-checker
+          :data-field-type="item.fieldType"
+        >
+          <van-cell
+            v-if="item.fieldType !== 'checker'"
+            :title="item.label"
+            :border="false"
+            class="ibps-search-field__label"
+          />
+          <!-- IbpsChecker -->
+          <!-- <ibps-checker
           v-else-if="item.fieldType==='checker'"
           :key="i"
           v-model="params[item.modelValue]"
@@ -27,108 +31,109 @@
           label=""
         /> -->
 
-        <van-collapse-item
-          v-else-if="item.fieldType === 'checker'"
-          :key="item.prop + i"
-          :title="item.label"
-          :name="item.modelValue + i"
-        >
-          <ibps-checker
+          <van-collapse-item
+            v-else-if="item.fieldType === 'checker'"
+            :key="item.prop + i"
+            :title="item.label"
+            :name="item.modelValue + i"
+          >
+            <ibps-checker
+              :key="i"
+              v-model="params[item.modelValue]"
+              :name="item.prop"
+              :value-key="item.valueKey"
+              :options="item.options"
+              :cols="item.cols"
+              :option-align="item.optionAlign || 'center'"
+              :input-align="inputAlign"
+              checker
+              label=""
+            />
+          </van-collapse-item>
+
+          <!-- 单行文本--数字--数字范围 -->
+          <van-field
+            v-if="
+              item.fieldType === 'text' ||
+              item.fieldType === 'textarea' ||
+              item.fieldType === 'number' ||
+              item.fieldType === 'numberRange' ||
+              item.fieldType === undefined
+            "
             :key="i"
             v-model="params[item.modelValue]"
             :name="item.prop"
-            :value-key="item.valueKey"
-            :options="item.options"
-            :cols="item.cols"
-            :option-align="item.optionAlign || 'center'"
+            :type="item.fieldType || 'text'"
             :input-align="inputAlign"
-            checker
-            label=""
+            placeholder="请输入"
+            autocomplete="off"
+            autosize
+            clearable
+            border
+          />
+          <!-- 隐藏域 -->
+          <input
+            v-else-if="item.fieldType === 'hidden'"
+            :key="i"
+            :value="value"
+            type="hidden"
+          />
+          <!-- 下拉 -->
+          <ibps-select
+            v-else-if="
+              item.fieldType === 'select' ||
+              item.fieldType === 'radio' ||
+              item.fieldType === 'checkbox'
+            "
+            :key="i"
+            v-model="params[item.modelValue]"
+            :input-align="inputAlign"
+            :name="item.prop"
+            :value-key="item.valueKey || 'val'"
+            :options="item.options"
+            placeholder="请选择"
+            label=" "
           />
-        </van-collapse-item>
-
-        <!-- 单行文本--数字--数字范围 -->
-        <van-field
-          v-if="
-            item.fieldType === 'text' ||
-            item.fieldType === 'textarea' ||
-            item.fieldType === 'number' ||
-            item.fieldType === 'numberRange' ||
-            item.fieldType === undefined
-          "
-          :key="i"
-          v-model="params[item.modelValue]"
-          :name="item.prop"
-          :type="item.fieldType || 'text'"
-          :input-align="inputAlign"
-          placeholder="请输入"
-          autocomplete="off"
-          autosize
-          clearable
-          border
-        />
-        <!-- 隐藏域 -->
-        <input
-          v-else-if="item.fieldType === 'hidden'"
-          :key="i"
-          :value="value"
-          type="hidden"
-        />
-        <!-- 下拉 -->
-        <ibps-select
-          v-else-if="
-            item.fieldType === 'select' ||
-            item.fieldType === 'radio' ||
-            item.fieldType === 'checkbox'
-          "
-          :key="i"
-          v-model="params[item.modelValue]"
-          :input-align="inputAlign"
-          :name="item.prop"
-          :value-key="item.valueKey || 'val'"
-          :options="item.options"
-          placeholder="请选择"
-          label=" "
-        />
 
-        <!-- 日期 -->
-        <ibps-date-picker
-          v-else-if="
-            item.fieldType === 'datePicker' ||
-            item.fieldType === 'date' ||
-            item.fieldType === 'datetime'
-          "
-          :key="i"
-          v-model="params[item.modelValue]"
-          placeholder="请选择"
-          :input-align="inputAlign"
-          :name="item.prop"
-          :type="getFieldOptions(item, 'datefmt_type', 'custom')"
-          :format="getFieldOptions(item, 'datefmt', 'yyyy-MM-dd')"
-          clearable
-          label=" "
-        />
-        <!-- 日期范围 -->
-        <ibps-date-range
-          v-else-if="item.fieldType === 'dateRange'"
-          :key="i"
-          ref="daterange"
-          v-model="params[item.modelValue]"
-          :input-align="inputAlign"
-          :type="getFieldOptions(item, 'datefmt_type', 'custom')"
-          :format="getFieldOptions(item, 'datefmt', 'yyyy-MM-dd')"
-          placeholder="请选择"
-          label=" "
-          @input="(val) => dateInput(val, item)"
-        />
+          <!-- 日期 -->
+          <ibps-date-picker
+            v-else-if="
+              item.fieldType === 'datePicker' ||
+              item.fieldType === 'date' ||
+              item.fieldType === 'datetime'
+            "
+            :key="i"
+            v-model="params[item.modelValue]"
+            placeholder="请选择"
+            :input-align="inputAlign"
+            :name="item.prop"
+            :type="getFieldOptions(item, 'datefmt_type', 'custom')"
+            :format="getFieldOptions(item, 'datefmt', 'yyyy-MM-dd')"
+            clearable
+            label=" "
+          />
+          <!-- 日期范围 -->
+          <ibps-date-range
+            v-else-if="item.fieldType === 'dateRange'"
+            :key="i"
+            ref="daterange"
+            v-model="params[item.modelValue]"
+            :input-align="inputAlign"
+            :type="getFieldOptions(item, 'datefmt_type', 'custom')"
+            :format="getFieldOptions(item, 'datefmt', 'yyyy-MM-dd')"
+            placeholder="请选择"
+            label=" "
+            @input="(val) => dateInput(val, item)"
+          />
 
-        <!-- 自定义插槽 -->
-        <template v-else>
-          <slot :name="item.slotName" :item="item" />
-        </template>
-      </template>
-    </van-collapse>
-  </van-form>
+          <!-- 自定义插槽 -->
+          <template v-else>
+            <slot :name="item.slotName" :item="item" />
+          </template>
+        </div>
+      </van-collapse>
+    </van-form>
+  </div>
 </template>
 <script>
 import IbpsSelect from '@/components/ibps-select'

src/views/platform/data/components/search-field/index.vue

@@ -194,32 +194,32 @@ import IbpsDesc from '@/business/platform/form/components/desc'
 import IbpsHyperlink from '@/business/platform/form/components/hyperlink'
 import IbpsAlert from '@/business/platform/form/components/alert'
 
-Vue.component('ibps-radio', IbpsRadio)
-Vue.component('ibps-checkbox', IbpsCheckbox)
-Vue.component('ibps-select', IbpsSelect)
-Vue.component('ibps-checker', IbpsChecker)
-Vue.component('ibps-date-picker', IbpsDatePicker)
-Vue.component('ibps-switch', IbpsSwitch)
-Vue.component('ibps-slider', IbpsSlider)
-Vue.component('ibps-rate', IbpsRate)
+Vue.component('IbpsRadio', IbpsRadio)
+Vue.component('IbpsCheckbox', IbpsCheckbox)
+Vue.component('IbpsSelect', IbpsSelect)
+Vue.component('IbpsChecker', IbpsChecker)
+Vue.component('IbpsDatePicker', IbpsDatePicker)
+Vue.component('IbpsSwitch', IbpsSwitch)
+Vue.component('IbpsSlider', IbpsSlider)
+Vue.component('IbpsRate', IbpsRate)
 
-Vue.component('ibps-editor', IbpsEditor)
-Vue.component('ibps-dictionary', IbpsDictionary)
-Vue.component('ibps-uploader', IbpsUploader)
-Vue.component('ibps-signature', IbpsSignature)
-Vue.component('ibps-address', IbpsAddress)
-Vue.component('ibps-selector', IbpsUserSelector)
-Vue.component('ibps-custom-dialog', IbpsCustomDialog)
-Vue.component('ibps-linkdata', IbpsLinkdata)
+Vue.component('IbpsEditor', IbpsEditor)
+Vue.component('IbpsDictionary', IbpsDictionary)
+Vue.component('IbpsUploader', IbpsUploader)
+Vue.component('IbpsSignature', IbpsSignature)
+Vue.component('IbpsAddress', IbpsAddress)
+Vue.component('IbpsSelector', IbpsUserSelector)
+Vue.component('IbpsCustomDialog', IbpsCustomDialog)
+Vue.component('IbpsLinkdata', IbpsLinkdata)
 
-Vue.component('ibps-approval-history', IbpsApprovalHistory)
-Vue.component('ibps-flow-diagram', IbpsFlowDiagram)
-Vue.component('ibps-bpm-inst-his', IbpsBpmInstHis)
-Vue.component('ibps-bpm-link', IbpsBpmLink)
+Vue.component('IbpsApprovalHistory', IbpsApprovalHistory)
+Vue.component('IbpsFlowDiagram', IbpsFlowDiagram)
+Vue.component('IbpsBpmInstHis', IbpsBpmInstHis)
+Vue.component('IbpsBpmLink', IbpsBpmLink)
 
-Vue.component('ibps-desc', IbpsDesc)
-Vue.component('ibps-hyperlink', IbpsHyperlink)
-Vue.component('ibps-alert', IbpsAlert)
+Vue.component('IbpsDesc', IbpsDesc)
+Vue.component('IbpsHyperlink', IbpsHyperlink)
+Vue.component('IbpsAlert', IbpsAlert)
 
 export default {
   props: {
@@ -246,7 +246,7 @@ export default {
   data() {
     const forms = this.forms
     const parameter = {}
-    forms.forEach((v, i) => {
+    forms.forEach((v) => {
       const propType = typeof v.prop
       if (propType === 'string') {
         v.modelValue = v.prop
@@ -269,7 +269,7 @@ export default {
         propType === 'object' &&
         Object.prototype.toString.call(v.prop) === '[object Array]'
       ) {
-        v.prop.forEach((vv, j) => {
+        v.prop.forEach((vv) => {
           parameter[vv] = ''
         })
       }

src/views/platform/data/template-list.vue

@@ -1173,7 +1173,7 @@ export default {
         if (callback) {
           callback(true)
         }
-        this.loadData()
+        this.onSearch()
       })
     },
     toCheckMode() {