doway-coms 1.6.74 → 1.6.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "1.6.74",
+  "version": "1.6.76",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/AuditsList/index.js

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

package/packages/AuditsList/src/index.vue

@@ -0,0 +1,227 @@
+<template>
+  <div>
+    <div class="icon" @click="showModal = !showModal">
+      <a-icon type="edit" style="font-size: 30px; color: #fff" />
+    </div>
+    <vxe-modal
+      v-model="showModal"
+      :height="600"
+      :width="300"
+      :zIndex="1000"
+      :showHeader="false"
+      :mask="false"
+      :mask-closable="true"
+      :position="{
+        left: '78%',
+        top: '15%'
+      }"
+      destroy-on-close
+    >
+      <div class="history" v-if="historyList.length>0">
+        <div class="title">修改记录</div>
+        <div
+          class="box"
+          v-for="(item,index) in historyList"
+          :key="index"
+          @click="historyData(item)"
+        >
+          <div class="item">
+            <div
+              class="status"
+              :style="{color:textColor(item.logOperation)}"
+            >{{item.logOperation|filterData}}</div>
+            <div class="time">{{item.createTime}}</div>
+            <div class="name">{{item.createUserName}}</div>
+          </div>
+          <div class="divider">
+            <div></div>
+          </div>
+        </div>
+      </div>
+      <div v-else class="history">暂无数据</div>
+    </vxe-modal>
+  </div>
+</template>
+
+<script>
+import { objectAuditLogApi } from "../../utils/api";
+export default {
+  name: "auditsList",
+  props: {
+    formId: {
+      type: String
+    }
+  },
+  components: {},
+  watch: {
+    showModal(newVal, oldVal) {
+      console.log(newVal);
+      if (newVal) {
+        this.getHistoryData();
+      }
+    },
+    immediate: true
+  },
+  filters: {
+    filterData(val) {
+      switch (val) {
+        case "update":
+          return "修改";
+        case "add":
+          return "新增";
+        default:
+          return val;
+      }
+    }
+  },
+  mounted() {},
+  data() {
+    return {
+      historyList: [],
+      showModal: false
+    };
+  },
+  methods: {
+    getHistoryData() {
+      let postData = {
+        begin: 1,
+        size: 0,
+        expression: {
+          expressions: [
+            {
+              field: "logDataKeyId",
+              operator: "EQ",
+              value: this.formId
+            }
+          ],
+          operator: "and"
+        },
+        sorts: [["createTime", "asc"]]
+      };
+      objectAuditLogApi(postData).then(res => {
+        res.content.forEach(item => {
+          item.logData = JSON.parse(item.logData);
+        });
+        this.historyList = res.content;
+      });
+    },
+    historyData(val) {
+      this.$emit("historyData", val);
+    },
+    textColor(val) {
+      switch (val) {
+        case "add":
+          return "green";
+        case "update":
+          return "orange";
+      }
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+.icon {
+  position: fixed;
+  top: 46%;
+  right: 5px;
+  z-index: 100;
+  cursor: pointer;
+  width: 40px;
+  height: 40px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 5px;
+  background: #089def;
+}
+::v-deep .vxe-modal--wrapper .vxe-modal--content {
+  padding: 0;
+}
+.history {
+  width: 100%;
+  height: 100%;
+  overflow-x: hidden;
+  overflow-y: auto;
+  .title {
+    text-align: center;
+    padding: 10px;
+    font-size: 15px;
+    font-weight: bold;
+  }
+  .box {
+    .item {
+      height: 40px;
+      max-height: 40px;
+      display: flex;
+      cursor: pointer;
+      .time {
+        flex: 2.5;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+      .status {
+        flex: 1;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+      .name {
+        flex: 1;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+    }
+    .item:hover {
+      background: #e3e5e7;
+      transition: all 0.5s;
+    }
+    .divider {
+      height: 5px;
+      max-height: 5px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      div {
+        width: 180px;
+        height: 1px;
+        background: #eee;
+      }
+    }
+  }
+}
+/*滚动条整体部分*/
+.history::-webkit-scrollbar {
+  width: 5px;
+  height: 5px;
+  z-index: 10;
+}
+/*滚动条的轨道*/
+.history::-webkit-scrollbar-track {
+  background-color: #ffffff;
+  z-index: 10;
+}
+/*滚动条里面的小方块，能向上向下移动*/
+.history::-webkit-scrollbar-thumb {
+  background-color: #bfbfbf;
+  border-radius: 5px;
+  border: 1px solid #f1f1f1;
+  box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  z-index: 10;
+}
+.history::-webkit-scrollbar-thumb:hover {
+  background-color: #a8a8a8;
+  z-index: 10;
+}
+.history::-webkit-scrollbar-thumb:active {
+  background-color: #787878;
+  z-index: 10;
+}
+/*边角，即两个滚动条的交汇处*/
+.history::-webkit-scrollbar-corner {
+  background-color: #ffffff;
+  z-index: 10;
+}
+</style>

package/packages/index.js

@@ -23,6 +23,7 @@ import BaseKanbanEmpty from "./BaseKanbanEmpty/index";
 import BaseSearch from "./BaseSearch/index";
 import BaseButton from "./BaseButton/index";
 import LeaveAMessage from "./LeaveAMessage/index";
+import AuditsList from "./AuditsList/index";
 
 import store from './utils/store'
 import request from './utils/request'
@@ -34,7 +35,7 @@ const components = [
 	BaseTextArea, BaseSelect, BaseSelectMulti, BaseTime, BasePagination,
 	BaseNumberInput, BaseTool, BaseToolStatus, BasePulldown, BaseIntervalInput,
 	BaseForm, BasePictureCard, BaseGrid, BasePrintPreview, BaseGantt,
-	BaseKanbanEmpty, BaseSearch, BaseButton,LeaveAMessage
+	BaseKanbanEmpty, BaseSearch, BaseButton,LeaveAMessage,AuditsList
 ];
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，则所有的组件都将被注册
 
@@ -163,6 +164,7 @@ export {
 	BaseSearch,
 	BaseButton,
 	LeaveAMessage,
+	AuditsList,
 	store,
 	request,
 }

package/packages/utils/api.js

@@ -86,4 +86,11 @@ export function userInfoSearchApi(data) {
     method: 'get',
     params: data
   })
+}
+export function objectAuditLogApi(data) {
+  return request({
+    url: store.getters.baseUrl + '/v1/objectAuditLog/search',
+    method: 'get',
+    params: data
+  })
 }

package/packages/utils/store.js

@@ -10,6 +10,7 @@ Vue.use(Vuex)
 export default new Vuex.Store({
     state: {
         umsUrl:'',
+        baseUrl:'',
         msgUrl:'',
         wmsUrl:'',
         identityUrl:'',
@@ -142,6 +143,9 @@ export default new Vuex.Store({
         SET_UMS_URL:(state,url) => {
           state.umsUrl = url
         },
+        SET_BASE_URL:(state,url) => {
+          state.baseUrl = url
+        },
         SET_WMS_URL:(state,url) => {
               state.wmsUrl = url
         },
@@ -245,6 +249,7 @@ export default new Vuex.Store({
         industryVersion:state=>state.industryVersion,
         isGenerateMatCode:state=>state.isGenerateMatCode,
         umsUrl:state=>state.umsUrl,
+        baseUrl:state=>state.baseUrl,
         msgUrl:state=>state.msgUrl,
         identityUrl:state=>state.identityUrl,
         token: state => state.token,