同步修改

.env.development

@@ -16,21 +16,21 @@ VUE_APP_BASE_REPORT_API = 'https://www.szjyxt.com/raqsoft'
 # index 最小的地址被默认激活
 # singleApp  是否单体应用 0：否，1：是
 # ---测试环境 192.168.2.99
-VUE_APP_BASE_API_0_0_TEST=http://127.0.0.1:5100/ibps
+# VUE_APP_BASE_API_0_0_TEST=http://127.0.0.1:5100/ibps
 # ---后端开发环境
-VUE_APP_BASE_API_1_0_DEV=http://127.0.0.1:5100/ibps
+# VUE_APP_BASE_API_1_0_DEV=http://127.0.0.1:5100/ibps
 # ---前端开发环境
 VUE_APP_BASE_API_2_0_FRONT=https://www.szjyxt.com/ibps
 # ---集成环境
-VUE_APP_BASE_API_3_0_STAGING=https://www.szjyxt.com/ibps
+# VUE_APP_BASE_API_3_0_STAGING=https://www.szjyxt.com/ibps
 # ---生产环境
-VUE_APP_BASE_API_4_0_PRODUCTION=https://www.szjyxt.com/ibps
+# VUE_APP_BASE_API_4_0_PRODUCTION=https://www.szjyxt.com/ibps
 # ---mock环境
-VUE_APP_BASE_API_5_0_MOCK=https://www.szjyxt.com/ibps
+# VUE_APP_BASE_API_5_0_MOCK=https://www.szjyxt.com/ibps
 # ---本地环境 
-VUE_APP_BASE_API_6_0_110=https://www.szjyxt.com/ibps
+# VUE_APP_BASE_API_6_0_110=https://www.szjyxt.com/ibps
 # ---多域名环境 
-VUE_APP_BASE_API_7_0_DOMAIN=https://www.szjyxt.com/ibps
+# VUE_APP_BASE_API_7_0_DOMAIN=https://www.szjyxt.com/ibps
 #120.78.154.31
 
 

.eslintrc.js

@@ -178,9 +178,9 @@ module.exports = {
         //     'vars': 'all',
         //     'args': 'none'
         // }],
-        // 当存在定义而未使用的组件时，关闭报错
+        // 褰撳瓨鍦ㄥ畾涔夎€屾湭浣跨敤鐨勭粍浠舵椂锛屽叧闂�姤閿�
         'vue/no-unused-components': 'off',
-        // 当存在定义而未使用的变量时，关闭报错
+        // 褰撳瓨鍦ㄥ畾涔夎€屾湭浣跨敤鐨勫彉閲忔椂锛屽叧闂�姤閿�
         'no-unused-vars': 'off',
         'no-useless-call': 2,
         'no-useless-computed-key': 2,

src/business/platform/bpmn/form-ext/reject.vue

@@ -1,229 +1,272 @@
 <template>
-  <el-dialog
-    :visible.sync="dialogVisible"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-    :title="actionTitle"
-    :class="className"
-    class="bpmn-reject-dialog"
-    append-to-body
-    top="30vh"
-    width="40%"
-    @open="getFormData"
-    @close="closeDialog"
-  >
-    <el-form
-      ref="form"
-      v-loading="dialogLoading"
-      :element-loading-text="$t('common.loading')"
-      :model="form"
-      :rules="rules"
-      label-width="120px"
-      @submit.native.prevent
+    <el-dialog
+        :visible.sync="dialogVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        :title="actionTitle"
+        :class="className"
+        class="bpmn-reject-dialog"
+        append-to-body
+        top="30vh"
+        width="40%"
+        @open="getFormData"
+        @close="closeDialog"
     >
-      <el-form-item v-if="actionName === 'reject' " label="退回位置:" prop="rejectMode">
-        <el-radio-group v-model="form.rejectMode" @change="changeBackHandMode">
-          <el-radio label="reject">退回上一步</el-radio>
-          <el-radio label="rejectDest">退回指定步骤</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <p style="color: #0000CC;width: 100%; text-align:center; height:80px;font-size: 18px;" v-if="actionTitle=='退回检测'"><i class="el-icon-sort"/> 请确定退回，当前检测任务将重新检测！</p>
-    <!--  <el-form-item
-        v-if="actionName === 'reject' || actionName === 'rejectToStart' && actionTitle!='退回检测'  "
-        label="返回方式:"
-        prop="backHandMode"
-      >
-        <el-radio-group v-model="form.backHandMode" @change="changeBackHandMode">
-          <el-radio label="normal">按流程图重新执行</el-radio>
-          <el-radio label="direct">回到当前任务</el-radio>
-        </el-radio-group>
-
-      </el-form-item> -->
-      <el-form-item
-        v-if="actionName === 'reject' && form.rejectMode==='rejectDest'"
-        prop="destination"
-      >
-        <span slot="label" v-html="'驳回到节点<br>('+(form.backHandMode==='direct'?'直来直往':'按流程图')+'):'" />
-        <el-select v-model="form.destination" placeholder="请选择" style="margin-top: 20px;">
-          <el-option v-for="item in userNodeList " :key="item.nodeId" :value="item.nodeId" :label="item.name" />
-        </el-select>
-      </el-form-item>
-      <el-form-item v-if="!hideOpinion" label="审批意见:" prop="opinion">
-        <approval-opinion
-          v-model="form.opinion"
-          :action="action"
-        />
-      </el-form-item>
-
-    </el-form>
-    <div slot="footer" class="el-dialog--center">
-      <el-button type="primary" icon="ibps-icon-save" @click="handleSave()">确 定 退 回</el-button>
-      <el-button icon="el-icon-circle-close" type="danger" @click="closeDialog()">取 消</el-button>
-    </div>
-  </el-dialog>
+        <el-form
+            ref="form"
+            v-loading="dialogLoading"
+            :element-loading-text="$t('common.loading')"
+            :model="form"
+            :rules="rules"
+            label-width="120px"
+            @submit.native.prevent
+        >
+            <el-form-item
+                v-if="actionName === 'reject'"
+                label="退回位置:"
+                prop="rejectMode"
+            >
+                <el-radio-group
+                    v-model="form.rejectMode"
+                    @change="changeBackHandMode"
+                >
+                    <el-radio label="reject">退回上一步</el-radio>
+                    <el-radio label="rejectDest">退回指定步骤</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <!-- <p
+                style="
+                    color: #0000cc;
+                    width: 100%;
+                    text-align: center;
+                    height: 80px;
+                    font-size: 18px;
+                "
+                v-if="actionTitle == '退回检测'"
+            >
+                <i class="el-icon-sort" /> 请确定退回，当前检测任务将重新检测！
+            </p>
+            <el-form-item
+                v-if="actionName === 'reject' || (actionName === 'rejectToStart' && actionTitle != '退回检测')"
+                label="返回方式:"
+                prop="backHandMode"
+            >
+                <el-radio-group
+                    v-model="form.backHandMode"
+                    @change="changeBackHandMode"
+                >
+                    <el-radio label="normal">按流程图重新执行</el-radio>
+                    <el-radio label="direct">回到当前任务</el-radio>
+                </el-radio-group>
+            </el-form-item> -->
+            <el-form-item
+                v-if="actionName === 'reject' && form.rejectMode === 'rejectDest'"
+                prop="destination"
+            >
+                <span
+                    slot="label"
+                    v-html="'驳回到节点<br>(' +(form.backHandMode === 'direct' ? '直来直往' : '按流程图') + '):' "
+                />
+                <el-select
+                    v-model="form.destination"
+                    placeholder="请选择"
+                    style="margin-top: 20px;"
+                >
+                    <el-option
+                        v-for="item in userNodeList"
+                        :key="item.nodeId"
+                        :value="item.nodeId"
+                        :label="item.name"
+                    />
+                </el-select>
+            </el-form-item>
+            <el-form-item v-if="!hideOpinion" label="审批意见:" prop="opinion">
+                <approval-opinion v-model="form.opinion" :action="action" />
+            </el-form-item>
+        </el-form>
+        <div slot="footer" class="el-dialog--center">
+            <el-button
+                type="primary"
+                icon="ibps-icon-save"
+                @click="handleSave()"
+            >确 定 退 回</el-button>
+            <el-button
+                icon="el-icon-circle-close"
+                type="danger"
+                @click="closeDialog()"
+            >取 消</el-button>
+        </div>
+    </el-dialog>
 </template>
 <script>
-import { toReject, toRejectToPrevious, toRejectToStart } from '@/api/platform/bpmn/bpmTask'
-import ApprovalOpinion from '@/business/platform/bpmn/components/approval-opinion'
-import { queryIncludeNull } from '@/api/platform/bpmn/bpmCommonStatment'
-import ActionUtils from '@/utils/action'
+    import { toReject, toRejectToPrevious, toRejectToStart } from '@/api/platform/bpmn/bpmTask'
+    import ApprovalOpinion from '@/business/platform/bpmn/components/approval-opinion'
+    import { queryIncludeNull } from '@/api/platform/bpmn/bpmCommonStatment'
+    import ActionUtils from '@/utils/action'
 
-export default {
-  components: {
-    ApprovalOpinion
-  },
-  props: {
-    className: String,
-    visible: Boolean,
-    action: String,
-    title: String,
-    taskId: String,
-    data: [String, Object],
-    hideOpinion: { // 隐藏意见
-      type: Boolean,
-      default: false
-    },
-    formOpinion: { // 表单意见
-      type: String
-    }
-  },
-  data() {
-    return {
-      dialogVisible: this.visible,
-      dialogLoading: false,
-      formName: 'form',
-      formLabelWidth: '130px',
-      actionName: '',
-      userNodeList: [],
-      bpmExecUserNode: [],
-      bpmExecGoMapUserNode: [],
-      form: {
-        rejectMode: 'reject',
-        backHandMode: 'normal',
-        destination: '',
-        opinion: ''
-      },
-      rules: {
-        destination: [{ required: true, message: this.$t('validate.required') }],
-        opinion: [{ required: true, message: this.$t('validate.required') }]
-      }
-    }
-  },
-  computed: {
-    actionTitle() {
-      if (this.title) {
-        return this.title
-      }
-      if (this.actionName === 'rejectToPrevious') {
-        return '驳回上一步'
-      } else if (this.actionName === 'rejectToStart') {
-        return '驳回发起人'
-      } else if (this.actionName === 'reject') {
-        return '驳回审批'
-      } else {
-        return '驳回'
-      }
-    }
-  },
-  watch: {
-    visible: {
-      handler: function(val, oldVal) {
-        this.dialogVisible = this.visible
-        this.actionName = this.action
-      },
-      immediate: true
-    }
-  },
-  methods: {
-    openedDialog() {
-      if (this.$utils.isNotEmpty(this.formOpinion)) {
-        this.form.opinion = this.formOpinion
-      } else {
-        queryIncludeNull(ActionUtils.formatParams(
-          {
-            'Q^ACTION_^S': this.action,
-            'Q^CREATE_BY_^S': this.$store.getters.userId
-          })).then(response => {
-          const data = response.variables && response.variables.def ? response.variables.def.value || '' : ''
-          if (this.$utils.isNotEmpty(data)) {
-            this.form.opinion = data
-          }
-        })
-      }
-    },
-    changeBackHandMode() {
-      if (this.actionName === 'reject' && this.form.rejectMode === 'rejectDest') {
-        this.formValidate()
-        this.userNodeList = this.form.backHandMode === 'normal' ? this.bpmExecGoMapUserNode : this.bpmExecUserNode
-      }
-    },
-    closeDialog() {
-      this.form.opinion = ''
-      this.$emit('close', false)
-    },
-    handleSave() {
-      this.$refs[this.formName].validate(valid => {
-        if (valid) {
-          this.$emit('action-event', this.action, this.form)
-        } else {
-          ActionUtils.saveErrorMessage()
+    export default {
+        components: {
+            ApprovalOpinion
+        },
+        props: {
+            className: String,
+            visible: Boolean,
+            action: String,
+            title: String,
+            taskId: String,
+            data: [String, Object],
+            hideOpinion: {
+                // 隐藏意见
+                type: Boolean,
+                default: false
+            },
+            formOpinion: {
+                // 表单意见
+                type: String
+            }
+        },
+        data() {
+            return {
+                dialogVisible: this.visible,
+                dialogLoading: false,
+                formName: 'form',
+                formLabelWidth: '130px',
+                actionName: '',
+                userNodeList: [],
+                bpmExecUserNode: [],
+                bpmExecGoMapUserNode: [],
+                form: {
+                    rejectMode: 'reject',
+                    backHandMode: 'normal',
+                    destination: '',
+                    opinion: ''
+                },
+                rules: {
+                    destination: [
+                        {
+                            required: true,
+                            message: this.$t('validate.required')
+                        }
+                    ],
+                    opinion: [
+                        {
+                            required: true,
+                            message: this.$t('validate.required')
+                        }
+                    ]
+                }
+            }
+        },
+        computed: {
+            actionTitle() {
+                if (this.title) {
+                    return this.title
+                }
+                if (this.actionName === 'rejectToPrevious') {
+                    return '驳回上一步'
+                } else if (this.actionName === 'rejectToStart') {
+                    return '驳回发起人'
+                } else if (this.actionName === 'reject') {
+                    return '驳回审批'
+                } else {
+                    return '驳回'
+                }
+            }
+        },
+        watch: {
+            visible: {
+                handler: function (val, oldVal) {
+                    this.dialogVisible = this.visible
+                    this.actionName = this.action
+                },
+                immediate: true
+            }
+        },
+        methods: {
+            openedDialog() {
+                if (this.$utils.isNotEmpty(this.formOpinion)) {
+                    this.form.opinion = this.formOpinion
+                } else {
+                    queryIncludeNull(
+                        ActionUtils.formatParams({
+                            'Q^ACTION_^S': this.action,
+                            'Q^CREATE_BY_^S': this.$store.getters.userId
+                        })
+                    ).then((response) => {
+                        const data = response.variables && response.variables.def ? response.variables.def.value || '' : ''
+                        if (this.$utils.isNotEmpty(data)) {
+                            this.form.opinion = data
+                        }
+                    })
+                }
+            },
+            changeBackHandMode() {
+                if (this.actionName === 'reject' && this.form.rejectMode === 'rejectDest') {
+                    this.formValidate()
+                    this.userNodeList = this.form.backHandMode === 'normal' ? this.bpmExecGoMapUserNode : this.bpmExecUserNode
+                }
+            },
+            closeDialog() {
+                this.form.opinion = ''
+                this.$emit('close', false)
+            },
+            handleSave() {
+                this.$refs[this.formName].validate((valid) => {
+                    if (valid) {
+                        this.$emit('action-event', this.action, this.form)
+                    } else {
+                        ActionUtils.saveErrorMessage()
+                    }
+                })
+            },
+            /**
+             * 表单验证
+             */
+            formValidate() {
+                this.$nextTick(() => {
+                    this.$refs[this.formName].validate(() => {})
+                })
+            },
+            getFormData() {
+                this.openedDialog()
+                this.$nextTick(() => {
+                    this.$refs[this.formName].resetFields()
+                })
+                this.dialogLoading = true
+                switch (this.actionName) {
+                    case 'reject': // 驳回
+                        toReject({ taskId: this.taskId }).then((response) => {
+                            this.formValidate()
+                            this.dialogLoading = false
+                            const data = response.data
+                            this.userNodeList = this.bpmExecUserNode = data.bpmExecUserNode
+                            this.bpmExecGoMapUserNode = data.bpmExecGoMapUserNode
+                        }).catch(() => {
+                            this.dialogLoading = false
+                        })
+                        break
+                    case 'rejectToPrevious': // 驳回上一步
+                        toRejectToPrevious({ taskId: this.taskId }).then((response) => {
+                            this.formValidate()
+                            this.dialogLoading = false
+                            // TODO:默认意见
+                        }).catch(() => {
+                            this.dialogLoading = false
+                        })
+                        break
+                    case 'rejectToStart':
+                        toRejectToStart({ taskId: this.taskId }).then((response) => {
+                            this.formValidate()
+                            this.dialogLoading = false
+                            // TODO:默认意见
+                        }).catch(() => {
+                            this.dialogLoading = false
+                        })
+                        break
+                    default:
+                        break
+                }
+            }
         }
-      })
-    },
-    /**
-     * 表单验证
-     */
-    formValidate() {
-      this.$nextTick(() => {
-        this.$refs[this.formName].validate(() => {})
-      })
-    },
-    getFormData() {
-      this.openedDialog()
-      this.$nextTick(() => {
-        this.$refs[this.formName].resetFields()
-      })
-      this.dialogLoading = true
-      switch (this.actionName) {
-        case 'reject': // 驳回
-          toReject({
-            taskId: this.taskId
-          }).then(response => {
-            this.formValidate()
-            this.dialogLoading = false
-            const data = response.data
-            this.userNodeList = this.bpmExecUserNode = data.bpmExecUserNode
-            this.bpmExecGoMapUserNode = data.bpmExecGoMapUserNode
-          }).catch(() => {
-            this.dialogLoading = false
-          })
-          break
-        case 'rejectToPrevious': // 驳回上一步
-          toRejectToPrevious({
-            taskId: this.taskId
-          }).then(response => {
-            this.formValidate()
-            this.dialogLoading = false
-            // TODO:默认意见
-          }).catch(() => {
-            this.dialogLoading = false
-          })
-          break
-        case 'rejectToStart':
-          toRejectToStart({
-            taskId: this.taskId
-          }).then(response => {
-            this.formValidate()
-            this.dialogLoading = false
-            // TODO:默认意见
-          }).catch(() => {
-            this.dialogLoading = false
-          })
-          break
-        default:
-          break
-      }
     }
-  }
-}
 </script>

src/business/platform/bpmn/form/action.js

@@ -17,7 +17,6 @@ export default {
         // 设置是否过审的状态
         setData(title) {
             let data = title
-            console.log(this.getFormEL())
             if (!title) {
                 //获取当前流程步骤名
                 data = "已" + this.getFormEL().formDefData.flowName
@@ -108,11 +107,12 @@ export default {
                 case 'rejectToStart':// 驳回发起人
                 case 'reject':// 驳回
                     this.setData("已退回")
-                    if (this.isBpmOpinionHide && actionName === 'rejectToPrevious') {
-                        this.handleDirectActionEvent(actionName)
-                    } else {
-                        this.rejectDialogVisible = true
-                    }
+                    // if (this.isBpmOpinionHide && actionName === 'rejectToPrevious') {
+                    //     this.handleDirectActionEvent(actionName)
+                    // } else {
+                    //     this.rejectDialogVisible = true
+                    // }
+                    this.rejectDialogVisible = true
                     break
                 case 'delegate':// 转办
                     this.delegateReadonly = false
@@ -425,7 +425,6 @@ export default {
                 })
             }).catch((err) => {
                 loading.close()
-                console.error(err)
             })
         },
         /**
@@ -459,7 +458,6 @@ export default {
                 })
             }).catch((err) => {
                 loading.close()
-                console.error(err)
             })
         },
         /**

src/views/platform/bpmn/bpmInstHis/list.vue

@@ -239,7 +239,7 @@
                         // { prop: 'subject', label: '任务标题', link: 'dialog', width: 250 },
                         { prop: 'tYear', label: '年份', width: 60 },
                         { prop: 'tDept', label: '部门', width: 90 },
-                        { prop: 'procDefName', label: '表单名称', sortable: 'custom', width: 250 },
+                        { prop: 'procDefName', label: '表单名称', sortable: 'custom', formatter: this.replaceFormName, width: 250 },
                         { prop: 'subject', label: '事务说明', formatter: this.getDesc, 'min-width': 300 },
                         { prop: 'tUser', label: '编制人', width: 80 },
                         { prop: 'endTime', label: '完成时间', sortable: 'custom', dateFormat: 'yyyy-MM-dd', width: 90}
@@ -270,6 +270,13 @@
             }
         },
         methods: {
+            replaceFormName (row, column, cellValue, index) {
+                let t = cellValue === '管理评审计划'
+                if (t) {
+                    return '管理评审'
+                }
+                return cellValue
+            },
             // 截取事务说明字段内容
             getDesc(row, column, cellValue, index) {
                 let hasDesc = cellValue.includes('#')

src/views/platform/bpmn/bpmInstHis/oldFilesUploadList.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="main-container">
-
     <div slot="west">
       <ibps-type-tree :width="width"
                       :height="height"
@@ -40,9 +39,8 @@
                      :def-id="defId"
                      :pk-value="pkValue"
                      :form-key="formKey"
-                     @callback=""
                      :addDataCont="addDataCont"
-                     @close="visible => dialogFormVisible = visible" />``
+                     @close="visible => dialogFormVisible = visible" />
 
     <el-dialog :close-on-click-modal="false"
                :close-on-press-escape="false"
@@ -71,6 +69,7 @@ import BpmnFormrender from '@/business/platform/bpmn/form/dialog'
 import curdPost from '@/business/platform/form/utils/custom/joinCURD.js' //增删改查规则
 import IbpsAttachment from '@/business/platform/file/attachment/selector'
 import GetReport from './corresponding/getReport.js'
+import { number } from 'echarts/lib/export.js'
 export default {
   components: {
     IbpsTypeTree,
@@ -109,7 +108,19 @@ export default {
       height: document.clientHeight,
       reportAll: [],
       listData: [],
-      pagination: { limit: 0, page: 0, totalCount: 0, totalPages: 0 },
+      bianlistData: {
+        dataResult: [],
+        pageResult: {
+          limit: 0,
+          page: 0,
+          totalCount: 0,
+          totalPages: 0
+        }
+      },
+      selectListData: [],
+      pagination: {
+        limit: 20, page: 1
+      },
       paginations: 20,
       page: 1,
       sorts: {},
@@ -138,11 +149,13 @@ export default {
         // 表格字段配置
         columns: [
           { prop: 'fen_lei_', label: '记录表单分类', width: 120 },
-          { prop: 'biao_dan_ming_che', label: '表单名称', width: 300 },
-          { prop: 'nian_du_', label: '年度', width: 120 },
-          { prop: 'bian_zhi_shi_jian', label: '上传时间', width: 150 },
-          { prop: 'bm_name', label: '上传部门', width: 120 },
-          { prop: 'ry_name', label: '上传人', width: 120 },
+          { prop: 'biao_dan_ming_che', label: '表单名称', width: 350 },
+          { prop: 'shi_wu_shuo_ming_', label: '事务说明', width: 350 },
+
+          { prop: 'nian_du_', label: '年度', width: 80 },
+          { prop: 'bian_zhi_shi_jian', label: '上传时间', width: 100 },
+        //   { prop: 'bm_name', label: '上传部门', width: 120 },
+          { prop: 'ry_name', label: '上传人', width: 100 },
           { prop: 'fu_jian_', label: '附件', slotName: "wenjinachayue", width: 300 }
         ],
       }
@@ -179,7 +192,7 @@ export default {
     openTask(id) {
       this.dialogFormVisible = true
       this.defId = id
-      this.addDataCont = { fenLei: this.tableTitle, fenLeiId: this.typeId, biaoDanMingCheng: '1111' }
+      this.addDataCont = { fenLei: this.tableTitle, fenLeiId: this.typeId }
     },
     // 加载数据
     loadData() {
@@ -202,8 +215,28 @@ export default {
         )
         let sql = 'select * FROM t_ywyxjlb jl  LEFT JOIN lh_bm_ry ry ON ry.ry_id  = jl.bian_zhi_ren_' + nianduWhere + ' order by bian_zhi_shi_jian desc'
         curdPost('sql', sql).then(response => {
-          this.listData = this.handlePage(response.variables.data, this.paginations, this.page)
-
+          let tableDatas = response.variables.data
+          if (tableDatas.length !== 0) {
+            this.selectListData = JSON.parse(JSON.stringify(tableDatas))
+            let filterDatas = []
+            this.bianlistData.pageResult.totalCount = tableDatas.length
+            this.bianlistData.pageResult.totalPages = Math.ceil(tableDatas.length / this.pagination.limit)
+            this.bianlistData.pageResult.limit = this.pagination.limit
+            this.bianlistData.pageResult.page = this.pagination.page
+            if (this.pagination.limit > tableDatas.length) {
+              filterDatas = JSON.parse(JSON.stringify(tableDatas))
+            } else {
+              for (let index = 0; index < 20; index++) {
+                filterDatas.push(tableDatas[index])
+              }
+            }
+            this.bianlistData.dataResult = filterDatas
+            ActionUtils.handleListData(this, this.bianlistData)
+          } else {
+            ActionUtils.handleListData(this, [])
+            this.pagination.limit = 20
+            this.pagination.page = 1
+          }
           this.loading = false
         }).catch(() => {
           this.loading = false
@@ -235,11 +268,29 @@ export default {
         let sql = `select * FROM t_ywyxjlb jl  LEFT JOIN lh_bm_ry ry ON ry.ry_id  = jl.bian_zhi_ren_   ` + idwhere + ` order by bian_zhi_shi_jian desc`
 
         curdPost('sql', sql).then(response => {
-          this.listData = this.handlePage(response.variables.data, this.paginations, this.page)
-          this.pagination['limit'] = this.paginations
-          this.pagination['page'] = this.page
-          this.pagination['totalCount'] = this.handlePage(response.variables.data, this.paginations, this.page).length
-          this.pagination['totalPages'] = Math.ceil(this.handlePage(response.variables.data, this.paginations, this.page).length / this.paginations);
+          let tableDatas = response.variables.data
+          if (tableDatas.length !== 0) {
+            this.selectListData = JSON.parse(JSON.stringify(tableDatas))
+            let filterDatas = []
+            this.bianlistData.pageResult.totalCount = tableDatas.length
+            this.bianlistData.pageResult.totalPages = Math.ceil(tableDatas.length / this.pagination.limit)
+            this.bianlistData.pageResult.limit = this.pagination.limit
+            this.bianlistData.pageResult.page = this.pagination.page
+            if (this.pagination.limit > tableDatas.length) {
+              filterDatas = JSON.parse(JSON.stringify(tableDatas))
+            } else {
+              for (let index = 0; index < 20; index++) {
+                filterDatas.push(tableDatas[index])
+              }
+            }
+            this.bianlistData.dataResult = filterDatas
+            ActionUtils.handleListData(this, this.bianlistData)
+          } else {
+            ActionUtils.handleListData(this, [])
+            this.pagination.limit = 20
+            this.pagination.page = 1
+          }
+
           this.loading = false
         }).catch(() => {
           this.loading = false
@@ -270,43 +321,47 @@ export default {
      */
     getSearcFormData() {
       const params = this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {}
-      this.niandu = params.nianDu ? params.nianDu : '' // 年度
-      this.startTime = params.b ? params.b : '' // 开始时间
-      this.endTime = params.i ? params.i : '' // 结束时间
+      if (JSON.stringify(params) == "{}") {
+        this.niandu = '' // 年度
+        this.startTime = '' // 开始时间
+        this.endTime = '' // 结束时间
+      } else {
+        this.niandu = params.nianDu ? params.nianDu : '' // 年度
+        this.startTime = params.b ? params.b : '' // 开始时间
+        this.endTime = params.i ? params.i : '' // 结束时间
+      }
     },
     /**
      * 处理分页事件
      */
     handlePaginationChange(page) {
-      this.paginations = page.limit
-      this.page = page.page
-      this.loadData()
-    },
-
-    /* 分页数据处理 */
-    handlePage(data, pagination, page) {
-      let handleDatas = []
-      if (data.length !== 0) {
-        for (let i = pagination * page - pagination; i < pagination * page - 1; i++) {
-          if (data[i]) {
-            handleDatas.push(data[i])
-            continue;
-          } else {
-            break;
-          }
+      ActionUtils.setPagination(this.pagination, page)
+      this.bianlistData.pageResult.limit = page.limit
+      this.bianlistData.pageResult.page = page.page
+      let filterDatas = []
+      if (this.selectListData.length >= (page.limit * page.page)) {
+        for (let index = (page.limit * page.page) - page.limit; index < (page.limit * page.page); index++) {
+          filterDatas.push(this.selectListData[index])
         }
-        return handleDatas
+        this.bianlistData.dataResult = JSON.parse(JSON.stringify(filterDatas))
       } else {
-        return []
+        for (let index = (page.limit * page.page) - page.limit; index < this.selectListData.length; index++) {
+          filterDatas.push(this.selectListData[index])
+        }
+        this.bianlistData.dataResult = JSON.parse(JSON.stringify(filterDatas))
       }
+      ActionUtils.handleListData(this, this.bianlistData)
     },
+
+
     /**
      * 查询
      */
     search() {
+      this.pagination.limit = 20
+      this.pagination.page = 1
       this.getSearcFormData()
       this.loadData()
-
     },
     /* 防止多次快速查询*/
     numbersClick() {

src/views/system/dashboard/components/new-home.vue

@@ -596,14 +596,24 @@
                     parameters: [],
                     sorts: []
                 }
-                let sql = `select id_, shi_wu_id_ as taskId from t_gqswb where position('${userId}' in chu_li_ren_id_)`
-                Promise.all([pending(params), curdPost('sql', sql)]).then(([res1, res2]) => {
+                let sql = `select id_, shi_wu_id_ as taskId from t_gqswb where position('${userId}' in chu_li_ren_id_) FOR UPDATE`
+                // Promise.all([pending(params), curdPost('sql', sql)]).then(([res1, res2]) => {
+                //     let workData = res1.data && res1.data.dataResult
+                //     let noticeData = res2.variables && res2.variables.data
+                //     if (!workData || !workData.length) {
+                //         return
+                //     }
+                //     this.dealData(workData, noticeData)
+                // })
+                pending(params).then(res1 => {
                     let workData = res1.data && res1.data.dataResult
-                    let noticeData = res2.variables && res2.variables.data
-                    if (!workData || !workData.length) {
-                        return
-                    }
-                    this.dealData(workData, noticeData)
+                    curdPost('sql', sql).then(res2 => {
+                        let noticeData = res2.variables && res2.variables.data
+                        if (!workData || !workData.length) {
+                            return
+                        }
+                        this.dealData(workData, noticeData)
+                    })
                 })
             },
             // 处理数据
@@ -627,6 +637,7 @@
                     }
                     result.all.push(item)
                 })
+                // console.log('处理后数据：', result)
                 // 有过期数据才执行过期数据处理
                 if (result.expire.length) {
                     this.dealExpile(result.expire, noticeList)
@@ -662,6 +673,8 @@
             },
             // 处理已过期数据
             dealExpile(data, noticeList) {
+                // console.log('已过期流程数据：', data)
+                // console.log('过期事务表数据：', noticeList)
                 const { userId } = this.$store.getters
                 let addList = []
                 let sendList = []
@@ -712,7 +725,8 @@
                             subject: msgTitle[item.workType],
                             content: `<p>事务【${item.workName}】${msgContent[item.workType]}<p>`,
                             receiverId: userId,
-                            canreply: '0'
+                            canreply: '0',
+                            taskId: item.taskId
                         }
                         sendList.push(msg)
                     }
@@ -721,7 +735,7 @@
                     tableName: 't_gqswb',
                     paramWhere: addList
                 }
-                console.log(addList, sendList)
+                // console.log('新增过期事务表数据：', addList, '发送消息数据', sendList)
                 if (addList.length) {
                     curdPost('add', JSON.stringify(addParams))
                 }
@@ -739,6 +753,7 @@
                         deleteList.push(item.id_)
                     }
                 })
+                // console.log('过期事务表中需删除的数据：', deleteList)
                 if (!deleteList.length) {
                     return
                 }
@@ -882,8 +897,8 @@
                 .btn {
                     height: 30px;
                     margin-left: 10px;
-                    background-color: #01a394;
-                    border-color: #01a394;
+                    background-color: #409eff;
+                    border-color: #409eff;
                     font-size: 12px;
                     border-radius: 3px;
                     padding: 7px 15px;
@@ -901,7 +916,7 @@
         overflow: scroll;
     }
     .app-container .el-table th {
-        background-color: #84d5cf !important;
+        background-color: #a7d6f8 !important;
         font-size: 14px;
         font-weight: bold;
         color: #000000;
@@ -911,11 +926,11 @@
         padding: 4px;
     }
     .app-container .el-table .warning-row {
-        background: #e0f0ee ;
+        background: #d3ebfc;
         color: #000000;
     }
     .app-container .el-table .success-row {
         background: #f9ffff;
         color: #000000;
     }
-</style>
+</style>

src/views/system/jbdHome/board/checkBoard.vue

@@ -69,7 +69,8 @@
                         data: [],
                         rowNum: 7,
                         // columnWidth: ['300','100','150','150','100']
-                        columnWidth: ['400','150','150','100']
+                        columnWidth: ['400','150','150','100'],
+                        waitTime: 1500
                     },
                     acceptData:[],
                     taskData: [],

src/views/system/jbdScan/goods/kucuntag.vue

@@ -147,7 +147,7 @@ export default {
       this.getLook(idStr)
     },
     getLook(id) {
-      let sql = `select * from t_cgysjlb where wai_jian_ in (${id})`
+      let sql = `select * from t_cgysjlb where wai_jian_ in (${id}) UNION ALL SELECT * FROM t_wlzpysjlb WHERE wai_jian_ IN (${id})`
       repostCurd("sql", sql).then(res => {
         if (res.state === 200) {
           for (var i of res.variables.data) {