doway-coms 2.11.46 → 2.11.48

package/packages/HistoryModal/index.js

@@ -1,8 +1,8 @@
-// 导入组件，组件必须声明 name
-import HistoryModal from './src/index.vue';
-// 为组件提供 install 安装方法，供按需引入
-HistoryModal.install = function(Vue) {
-    Vue.component(HistoryModal.name, HistoryModal);
-};
-// 默认导出组件
-export default HistoryModal;
+// 导入组件，组件必须声明 name
+import HistoryModal from './src/index.vue';
+// 为组件提供 install 安装方法，供按需引入
+HistoryModal.install = function(Vue) {
+    Vue.component(HistoryModal.name, HistoryModal);
+};
+// 默认导出组件
+export default HistoryModal;

package/packages/HistoryModal/src/index.vue

@@ -1,154 +1,155 @@
-<template>
-  <div>
-    <vxe-modal
-        v-model="visible"
-        width="90%"
-        height="90%"
-        title="历史记录"
-        :mask="true"
-        :lock-view="true"
-        :lock-scroll="true"
-        :resize="true"
-        :position="{top: '5%',left: '5%'}"
-        @close="handleClose"
-    >
-      <div ref="gridContent">
-        <vue-element-loading
-            :active="gridLoading"
-            v-if="gridLoading"
-            spinner="bar-fade-scale"
-            color="#41B883"
-        />
-        <BaseGrid
-            ref="gridView"
-            :columns="innerColumns"
-            :height="gridHeight"
-            :rows="gridRows"
-            :dataCode="dataCode"
-            :moduleCode="moduleCode"
-            :pager="gridPager"
-            :showCheckBox="false"
-            :editStates="['view']"
-        ></BaseGrid>
-      </div>
-    </vxe-modal>
-  </div>
-</template>
-
-<script>
-import { objectAuditLogApi } from "../../utils/api";
-import { controlType } from "../../utils/enum";
-
-export default {
-  name: 'HistoryModal',
-  props: {
-    columns: {
-      type: Array,
-      required: true
-    },
-    dataCode: {
-      type: String,
-      default: '',
-    },
-    moduleCode: {
-      type: String,
-      default: '',
-    }
-  },
-  data() {
-    return {
-      innerColumns: [],
-      visible: false,
-      gridPager: {
-        totalRows: 0,
-      },
-      gridHeight: 500,
-      gridLoading: false,
-      gridRows: [],
-      formId: null
-    }
-  },
-  methods: {
-    show(id) {
-      this.innerColumns = JSON.parse(JSON.stringify(this.columns.filter(item => item.controlType !== 'operation')))
-      this.innerColumns = this.innerColumns.map(item => {
-        delete item.filterExpression
-        return {
-          ...item,
-        }
-      })
-      this.innerColumns.unshift(...[{
-        field: 'createUserName',
-        title: '操作人',
-        controlType:controlType.text,
-        width: 120,
-        filters: true,
-        sortable: true,
-      },{
-        field: 'createTime',
-        title: '操作时间',
-        controlType:controlType.datetime,
-        width: 150,
-        filters: true,
-        sortable: true,
-      },{
-        field: 'logOperationName',
-        title: '操作类型',
-        controlType:controlType.text,
-        width: 120,
-        filters: true,
-        sortable: true,
-      }])
-      let postData = {
-        begin: 1,
-        size: 0,
-        expression: {
-          expressions: [
-            {
-              field: 'logDataKeyId',
-              operator: 'EQ',
-              value: id
-            }
-          ],
-          operator: 'and'
-        },
-        sorts: [['createTime', 'asc']]
-      }
-      objectAuditLogApi(postData).then(res => {
-        // this.gridRows = [JSON.parse(res.content[0].logData)]
-        this.gridRows = res.content.map(item=>{
-          return{
-            ...JSON.parse(item.logData),
-            createUserName:item.createUserName,
-            createTime:item.createTime,
-            logOperationName:item.logOperationName
-          }
-        })
-        this.gridPager.totalRows = res.content.length
-        console.log('res', res)
-      })
-      console.log('innerColumns', this.innerColumns)
-      this.visible = true
-      this.$nextTick(() => {
-        // 设置表格高度，减去头部和边距
-        this.gridHeight = this.$refs.gridContent.offsetHeight - 20
-      })
-    },
-    handleClose() {
-      this.visible = false
-    },
-    setGridData(rows, total) {
-      this.gridRows = rows
-      this.gridPager.totalRows = total
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-//.vxe-modal {
-//  .vxe-modal--body {
-//    padding: 10px 20px;
-//  }
-//}
-</style>
+<template>
+  <div>
+    <vxe-modal
+        v-model="visible"
+        width="90%"
+        height="90%"
+        title="历史记录"
+        :mask="true"
+        :lock-view="true"
+        :lock-scroll="true"
+        :zIndex="1000000"
+        :resize="true"
+        :position="{top: '5%',left: '5%'}"
+        @close="handleClose"
+    >
+      <div ref="gridContent">
+        <vue-element-loading
+            :active="gridLoading"
+            v-if="gridLoading"
+            spinner="bar-fade-scale"
+            color="#41B883"
+        />
+        <BaseGrid
+            ref="gridView"
+            :columns="innerColumns"
+            :height="gridHeight"
+            :rows="gridRows"
+            :dataCode="dataCode"
+            :moduleCode="moduleCode"
+            :pager="gridPager"
+            :showCheckBox="false"
+            :editStates="['view']"
+        ></BaseGrid>
+      </div>
+    </vxe-modal>
+  </div>
+</template>
+
+<script>
+import { objectAuditLogApi } from "../../utils/api";
+import { controlType } from "../../utils/enum";
+
+export default {
+  name: 'HistoryModal',
+  props: {
+    columns: {
+      type: Array,
+      required: true
+    },
+    dataCode: {
+      type: String,
+      default: '',
+    },
+    moduleCode: {
+      type: String,
+      default: '',
+    }
+  },
+  data() {
+    return {
+      innerColumns: [],
+      visible: false,
+      gridPager: {
+        totalRows: 0,
+      },
+      gridHeight: 500,
+      gridLoading: false,
+      gridRows: [],
+      formId: null
+    }
+  },
+  methods: {
+    show(id) {
+      this.innerColumns = JSON.parse(JSON.stringify(this.columns.filter(item => item.controlType !== 'operation')))
+      this.innerColumns = this.innerColumns.map(item => {
+        delete item.filterExpression
+        return {
+          ...item,
+        }
+      })
+      this.innerColumns.unshift(...[{
+        field: 'createUserName',
+        title: '操作人',
+        controlType:controlType.text,
+        width: 120,
+        filters: true,
+        sortable: true,
+      },{
+        field: 'createTime',
+        title: '操作时间',
+        controlType:controlType.datetime,
+        width: 150,
+        filters: true,
+        sortable: true,
+      },{
+        field: 'logOperationName',
+        title: '操作类型',
+        controlType:controlType.text,
+        width: 120,
+        filters: true,
+        sortable: true,
+      }])
+      let postData = {
+        begin: 1,
+        size: 0,
+        expression: {
+          expressions: [
+            {
+              field: 'logDataKeyId',
+              operator: 'EQ',
+              value: id
+            }
+          ],
+          operator: 'and'
+        },
+        sorts: [['createTime', 'asc']]
+      }
+      objectAuditLogApi(postData).then(res => {
+        // this.gridRows = [JSON.parse(res.content[0].logData)]
+        this.gridRows = res.content.map(item=>{
+          return{
+            ...JSON.parse(item.logData),
+            createUserName:item.createUserName,
+            createTime:item.createTime,
+            logOperationName:item.logOperationName
+          }
+        })
+        this.gridPager.totalRows = res.content.length
+        console.log('res', res)
+      })
+      console.log('innerColumns', this.innerColumns)
+      this.visible = true
+      this.$nextTick(() => {
+        // 设置表格高度，减去头部和边距
+        this.gridHeight = this.$refs.gridContent.offsetHeight - 20
+      })
+    },
+    handleClose() {
+      this.visible = false
+    },
+    setGridData(rows, total) {
+      this.gridRows = rows
+      this.gridPager.totalRows = total
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+//.vxe-modal {
+//  .vxe-modal--body {
+//    padding: 10px 20px;
+//  }
+//}
+</style>

package/packages/LeaveAMessage/index.js

@@ -1,8 +1,8 @@
-// 导入组件，组件必须声明 name
-import LeaveAMessage from './src/index.vue';
-// 为组件提供 install 安装方法，供按需引入
-LeaveAMessage.install = function(Vue) {
-    Vue.component(LeaveAMessage.name, LeaveAMessage);
-};
-// 默认导出组件
+// 导入组件，组件必须声明 name
+import LeaveAMessage from './src/index.vue';
+// 为组件提供 install 安装方法，供按需引入
+LeaveAMessage.install = function(Vue) {
+    Vue.component(LeaveAMessage.name, LeaveAMessage);
+};
+// 默认导出组件
 export default LeaveAMessage;