Просмотр исходного кода

修复流程归档多子表时不更新快照字段bug

cfort 2 лет назад
Родитель
Сommit
65b669844e

+ 1 - 1
src/business/platform/bpmn/form/action.js

@@ -655,7 +655,7 @@ export default {
             if (!code) {
                 return
             }
-            const sql = `select * from t_lcidglbdbb where shi_fou_zi_biao_ = 't_${code}' and ti_jiao_kuai_zhao = '是' and gui_dang_lei_xing = 'process' and (liu_cheng_xuan_ze = (select PROC_DEF_KEY_ from ibps_bpm_inst where id_ = '${instId}' limit 1) or liu_cheng_xuan_ze = (select PROC_DEF_KEY_ from ibps_bpm_inst_his where id_ = '${instId}' limit 1))`
+            const sql = `select * from t_lcidglbdbb where tablekey_ = '${code}' and ti_jiao_kuai_zhao = '是' and gui_dang_lei_xing = 'process' and (liu_cheng_xuan_ze = (select PROC_DEF_KEY_ from ibps_bpm_inst where id_ = '${instId}' limit 1) or liu_cheng_xuan_ze = (select PROC_DEF_KEY_ from ibps_bpm_inst_his where id_ = '${instId}' limit 1))`
             const { first = '' } = this.$store.getters.level
             this.$common.request('sql', sql).then(async res => {
                 const { data = [] } = res.variables || {}

+ 8 - 8
src/business/platform/bpmn/setting/bpmn-setting/mixins/addRecord.js

@@ -30,6 +30,10 @@ export default {
             })
         },
         addRecord () {
+            if (!this.boCode) {
+                this.$message.warning('请先绑定业务对象!')
+                return
+            }
             if (this.flag || this.liu_cheng_xuan_ze) return this.updateRecord()
             this.add()
         },
@@ -37,6 +41,7 @@ export default {
             const params = {
                 tableName: 't_lcidglbdbb',
                 paramWhere: [{
+                    tableKey_: this.boCode,
                     bao_biao_lu_jing_: this.bao_biao_lu_jing_,
                     fu_jian_nei_rong_: this.fu_jian_nei_rong_,
                     liu_cheng_xuan_ze: this.data.id,
@@ -49,10 +54,7 @@ export default {
             }
             curdPost('add', params).then(() => {
                 this.flag = true
-                this.$message({
-                    message: '添加成功',
-                    type: 'success'
-                })
+                this.$message.success('添加成功!')
             })
         },
         updateRecord () {
@@ -64,6 +66,7 @@ export default {
                             liu_cheng_xuan_ze: this.liu_cheng_xuan_ze
                         },
                         param: {
+                            tableKey_: this.boCode,
                             bao_biao_lu_jing_: this.bao_biao_lu_jing_,
                             fu_jian_nei_rong_: this.fu_jian_nei_rong_,
                             guan_lian_zi_duan: this.guan_lian_zi_duan,
@@ -75,10 +78,7 @@ export default {
                 ]
             }
             curdPost('update', params).then(() => {
-                this.$message({
-                    message: '修改成功',
-                    type: 'warning'
-                })
+                this.$message.info('修改成功')
             })
         }
     }

+ 82 - 82
src/business/platform/bpmn/setting/bpmn-setting/settings/bo-setting.vue

@@ -1,24 +1,24 @@
 <template>
-  <div class="panel-body">
-    <el-form v-model="bo" label-width="100px" @submit.native.prevent>
-      <el-form-item label="保存方式:">
-        <el-radio-group v-model="bo.saveMode" :disabled="disabled">
-          <el-radio label="table">业务表</el-radio>
-          <el-radio label="instance">实例表</el-radio>
-        </el-radio-group>
+    <div class="panel-body">
+        <el-form v-model="bo" label-width="100px" @submit.native.prevent>
+            <el-form-item label="保存方式:">
+                <el-radio-group v-model="bo.saveMode" :disabled="disabled">
+                    <el-radio label="table">业务表</el-radio>
+                    <el-radio label="instance">实例表</el-radio>
+                </el-radio-group>
 
-      </el-form-item>
-      <el-form-item label="绑定对象:">
-        <bo-def-selector
-          v-model="bo.code"
-          :version="bo.version"
-          :disabled="disabled"
-          value-key="code"
-          @change="changeBo"
-        />
-      </el-form-item>
-    </el-form>
-  </div>
+            </el-form-item>
+            <el-form-item label="绑定对象:">
+                <bo-def-selector
+                    v-model="bo.code"
+                    :version="bo.version"
+                    :disabled="disabled"
+                    value-key="code"
+                    @change="changeBo"
+                />
+            </el-form-item>
+        </el-form>
+    </div>
 </template>
 <script>
 import { findTreeData } from '@/api/platform/bo/boDef'
@@ -26,74 +26,74 @@ import { mapActions } from 'vuex'
 import BoDefSelector from '@/business/platform/bo/def/selector'
 
 export default {
-  components: {
-    BoDefSelector
-  },
-  props: {
-    data: {
-      type: Object
+    components: {
+        BoDefSelector
     },
-    hasCallActivity: {
-      type: Boolean,
-      default: false
+    props: {
+        data: {
+            type: Object
+        },
+        hasCallActivity: {
+            type: Boolean,
+            default: false
+        },
+        parentDefKey: String // 父类key
     },
-    parentDefKey: String // 父类key
-  },
-  data() {
-    return {
-      oldCode: '',
-      init: false
-    }
-  },
-  computed: {
-    bo() {
-      return this.data
+    data () {
+        return {
+            oldCode: '',
+            init: false
+        }
     },
-    disabled() {
-      return this.$utils.isNotEmpty(this.parentDefKey)
-    }
-  },
-  watch: {
-    'bo.code'(val, oldVal) {
-      if (val !== oldVal && !this.init) {
-        this.init = true
-        this.oldCode = val
-      }
-      this.setBoData(val)
-    }
-  },
-  methods: {
-    ...mapActions({
-      setBoDefData: 'ibps/bpmn/setBoDefData'
-    }),
-    changeBo(data) {
-      this.bo.name = data ? data.name : ''
-      this.bo.version = data ? data.version : ''
-      const code = data ? data.code : ''
-      if (code !== this.oldCode) {
-        this.init = false
-        // 有子流程节点提示
-        if (this.hasCallActivity) {
-          this.$alert('业务对象发生变化,请注意修改外部子流程配置,否则无法正常工作!', '提示', {
-            confirmButtonText: '确定',
-            type: 'warning'
-          })
+    computed: {
+        bo () {
+            return this.data
+        },
+        disabled () {
+            return this.$utils.isNotEmpty(this.parentDefKey)
         }
-        // 清空表单
-        this.$emit('clean')
-      }
     },
-    setBoData(code) {
-      if (this.$utils.isEmpty(code)) {
-        this.setBoDefData([])
-        return
-      }
-      findTreeData({ code: code }).then(response => {
-        this.setBoDefData(response.data)
-      }).catch(() => {
-      })
-    }
+    watch: {
+        'bo.code' (val, oldVal) {
+            if (val !== oldVal && !this.init) {
+                this.init = true
+                this.oldCode = val
+            }
+            this.setBoData(val)
+        }
+    },
+    methods: {
+        ...mapActions({
+            setBoDefData: 'ibps/bpmn/setBoDefData'
+        }),
+        changeBo (data) {
+            this.bo.name = data ? data.name : ''
+            this.bo.version = data ? data.version : ''
+            const code = data ? data.code : ''
+            if (code !== this.oldCode) {
+                this.init = false
+                // 有子流程节点提示
+                if (this.hasCallActivity) {
+                    this.$alert('业务对象发生变化,请注意修改外部子流程配置,否则无法正常工作!', '提示', {
+                        confirmButtonText: '确定',
+                        type: 'warning'
+                    })
+                }
+                // 清空表单
+                this.$emit('clean')
+            }
+        },
+        setBoData (code) {
+            if (this.$utils.isEmpty(code)) {
+                this.setBoDefData([])
+                return
+            }
+            findTreeData({ code: code }).then(response => {
+                this.setBoDefData(response.data)
+            }).catch(() => {
+            })
+        }
 
-  }
+    }
 }
 </script>

+ 1 - 1
src/business/platform/bpmn/setting/bpmn-setting/types/global.vue

@@ -104,7 +104,7 @@ export default {
         }
     },
     computed: {
-    // 业务对象
+        // 业务对象
         boData () {
             return this.data ? this.data.bo || {} : {}
         },

+ 6 - 9
src/views/platform/org/employee/edit/index.vue

@@ -423,13 +423,13 @@ export default {
             const sql = `select * from t_wxyh where xing_ming_ = '${data.name}' and shou_ji_ = '${data.mobile}'`
             this.$common.request('sql', sql).then(res => {
                 const { data = [] } = res.variables || {}
-                if (data.length > 0) {
-                    this.wxyhId = data[0].id_
+                if (!data.length) {
+                    return
                 }
+                this.wxyhId = data[0].id_
             })
         },
         updateWxyh () {
-            const ryjbqkList = []
             const obj = {
                 where: {
                     id_: this.wxyhId
@@ -439,15 +439,12 @@ export default {
                     shou_ji_: this.employee.mobile
                 }
             }
-            ryjbqkList.push(obj)
 
-            const params1 = {
+            const params = {
                 tableName: 't_wxyh',
-                updList: ryjbqkList
+                updList: [obj]
             }
-            this.$common.request('update', params1
-            ).then(response => {
-            })
+            this.$common.request('update', params)
         }
     }
 }