Merge branch 'master' of http://119.23.210.103:3000/wy/mj_firm_former

src/business/platform/form/formbuilder/right-aside/field-types/ibps-field-current-user.vue

@@ -21,7 +21,7 @@
       <!-- 布局设置 -->
       <editor-layout
         :field-item="fieldItem"
-        types="hideLabel,abelWidth,width,customClass,mobile"
+        types="hideLabel,labelWidth,width,customClass,mobile"
       />
     </el-form>
   </div>

src/business/platform/form/utils/custom/getDateRule.js

@@ -4,7 +4,7 @@ const getDate = () => {
                     var year= date.getFullYear() ;
                     var month= trans(date.getMonth() + 1) ;
                     var day= trans(date . getDate());
-                      return year + '' + month +'' + day;
+                      return year + '-' + month +'-' + day;
             }
 function trans(val){
               return val < 10 ? '0' + val : val;

src/layout/header-aside/components/header-architecture/index.vue

@@ -18,7 +18,7 @@ export default {
 
   methods: {
     open() {
-      this.$alert('<img src="'+imgSrc+'" alt="" srcset="" style = "width:100%">', '系统架构图', {
+      this.$alert('<img src="'+imgSrc+'" alt="" srcset="" style = "width:100%;height:100%;">', '系统架构图', {
         dangerouslyUseHTMLString: true,
         center: true,
         showConfirmButton: false,
@@ -30,6 +30,11 @@ export default {
 </script>
 <style>
 .headerArchitectureMessageCss{
-  width: 85%;
+  width: 100%;
+  height: 100%;
+  overflow-y:scroll;
+}
+.headerArchitectureMessageCss::-webkit-scrollbar {
+    display: none;
 }
 </style>

src/layout/header-aside/components/header-message/index.vue

@@ -1,52 +1,81 @@
 <template>
-    <div class="ibps-mr-5">
-        <el-tooltip v-if="messageCount === 0" :content="tooltipContent" effect="dark" placement="bottom">
-            <el-button class="ibps-ml-0 ibps-mr btn-text can-hover" type="text" @click="clickMore">
-                <el-badge :max="9999" :value="messageCount">
-                    <ibps-icon name="bell-o" size="16" />
-                </el-badge>
-            </el-button>
-        </el-tooltip>
-        <el-popover v-else v-model="popShow" placement="bottom-end" width="350" trigger="manual"
-            popper-class="header-message-popper">
-            <el-button slot="reference" class="ibps-ml-0 ibps-mr btn-text can-hover" type="text" @click="openPop">
-                <el-badge :max="9999" :value="messageCount">
-                    <ibps-icon name="bell-o" size="16" />
-                </el-badge>
-            </el-button>
-            <el-card body-style="padding:0;">
-                <div slot="header" style="font-size: 20px; font-weight: 600;">
-                    {{ $t('layout.header-aside.header-message.message-count', { messageCount: messageCount }) }}
+  <div class="ibps-mr-5">
+    <el-tooltip v-if="messageCount === 0"
+                :content="tooltipContent"
+                effect="dark"
+                placement="bottom">
+      <el-button class="ibps-ml-0 ibps-mr btn-text can-hover"
+                 type="text"
+                 @click="clickMore">
+        <el-badge :max="9999"
+                  :value="messageCount">
+          <ibps-icon name="bell-o"
+                     size="16" />
+        </el-badge>
+      </el-button>
+    </el-tooltip>
+    <el-popover v-else
+                v-model="popShow"
+                placement="bottom-end"
+                width="350"
+                trigger="manual"
+                popper-class="header-message-popper">
+      <el-button slot="reference"
+                 class="ibps-ml-0 ibps-mr btn-text can-hover"
+                 type="text"
+                 @click="openPop">
+        <el-badge :max="9999"
+                  :value="messageCount">
+          <ibps-icon name="bell-o"
+                     size="16" />
+        </el-badge>
+      </el-button>
+      <el-card body-style="padding:0;">
+        <div slot="header"
+             style="font-size: 20px; font-weight: 600;">
+          {{ $t('layout.header-aside.header-message.message-count', { messageCount: messageCount }) }}
+        </div>
+        <div style="height: 250px;">
+          <el-scrollbar style="height: 100%; width: 100%;"
+                        wrap-class="ibps-scrollbar-wrapper ">
+            <ibps-list class="ibps-p-10">
+              <ibps-list-item v-for="(message, index) in messageList"
+                              :key="index"
+                              @click.native="handelInteriorClick(message)">
+                <ibps-list-item-meta :title="message.subject"
+                                     :description="message.ownerName">
+                  <el-avatar slot="avatar"
+                             :icon="message.messageType === 'bulletin' ? 'ibps-icon-bullhorn' : 'ibps-icon-user'"
+                             shape="circle"
+                             style="background-color: #87d068;" />
+                </ibps-list-item-meta>
+                <div slot="extra">
+                  {{ message.createTime | formatRelativeTime({ year: 'yyyy-MM-dd' }) }}
                 </div>
-                <div style="height: 250px;">
-                    <el-scrollbar style="height: 100%; width: 100%;" wrap-class="ibps-scrollbar-wrapper ">
-                        <ibps-list class="ibps-p-10">
-                            <ibps-list-item v-for="(message, index) in messageList" :key="index"
-                                @click.native="handelInteriorClick(message)">
-                                <ibps-list-item-meta :title="message.subject" :description="message.ownerName">
-                                    <el-avatar slot="avatar"
-                                        :icon="message.messageType === 'bulletin' ? 'ibps-icon-bullhorn' : 'ibps-icon-user'"
-                                        shape="circle" style="background-color: #87d068;" />
-                                </ibps-list-item-meta>
-                                <div slot="extra">
-                                    {{ message.createTime | formatRelativeTime({ year: 'yyyy-MM-dd' }) }}
-                                </div>
-                            </ibps-list-item>
-                        </ibps-list>
-                    </el-scrollbar>
-                </div>
-                <div class="message-more">
-                    <el-link type="primary" @click="clickMore">{{ $t('layout.header-aside.header-message.viewmore')
+              </ibps-list-item>
+            </ibps-list>
+          </el-scrollbar>
+        </div>
+        <div class="message-more">
+          <el-link type="primary"
+                   @click="clickMore">{{ $t('layout.header-aside.header-message.viewmore')
                     }}</el-link>
-                </div>
-            </el-card>
-        </el-popover>
+        </div>
+      </el-card>
+    </el-popover>
 
-        <!-- 消息明细 -->
-        <inner-detail-dialog :id="editId" :subId="subId" :visible="dialogFormVisible" :type="type"
-            :title="$t('layout.header-aside.header-message.details')" inside readonly @callback="loadData"
-            @close="closeDialog" />
-    </div>
+    <!-- 消息明细 -->
+    <inner-detail-dialog :id="editId"
+                         :subId="subId"
+                         :visible="dialogFormVisible"
+                         :type="type"
+                         :tableId="tableId"
+                         :title="$t('layout.header-aside.header-message.details')"
+                         inside
+                         readonly
+                         @callback="loadData"
+                         @close="closeDialog" />
+  </div>
 </template>
 
 <script>
@@ -56,154 +85,157 @@ import { getMsgList, queryReceivePageList } from '@/api/platform/message/innerMe
 import InnerDetailDialog from '@/views/platform/message/inner/detail/dialog'
 import Watermark from './watermark/watermark-cont.js'
 export default {
-    components: {
-        InnerDetailDialog
+  components: {
+    InnerDetailDialog
+  },
+  data() {
+    return {
+      editId: '',
+      subId: '',
+      type: '',
+      tableId: '',
+      dialogFormVisible: false,
+      isControl: true,
+      messageList: [],
+      messageCount: 0,
+      infoMessage: '',
+      countNumber: 0,
+      popShow: false
+    }
+  },
+  computed: {
+    tooltipContent() {
+      return this.messageCount === 0 ? this.$t('layout.header-aside.header-message.empty') : ''
+    }
+  },
+  mounted() {
+    //轮询弹窗任务提醒
+    // setTimeout(() => {
+    //     this.isControl=true
+    //     this.loadData()
+    // }, 1000)
+    // Watermark.set('线上试用版本','深圳市金源信通')
+    this.loadData()
+  },
+  beforeDestroy() {
+    Watermark.set('', '')
+  },
+  methods: {
+    // 加载数据
+    loadData() {
+      getMsgList({
+        parameters: [
+          // { key: 'Q^subject^SL', value: '提醒' },
+          // { key: 'Q^messageType^SL', value: 'system' }
+        ],
+        requestPage: { limit: 5, pageNo: 1, totalCount: 0 },
+        sorts: []
+      }).then((response) => {
+        const data = response.data
+        this.messageList = data.dataResult
+        this.messageCount = data.pageResult ? data.pageResult.totalCount : 0
+        this.countNumber = data.pageResult.totalCount
+        // if (this.countNumber == 0) {
+        //     // if(response.data.pageResult.totalCount>0){
+        //     //     this.$message.warning('您有'+response.data.pageResult.totalCount+'条未处理的 [ 待审批 / 被驳回任务消息 ]，请及时处理！！！')
+        //     // }
+        // } else if (this.countNumber < data.pageResult.totalCount) {
+        //     //如果上次记录数量低于本次  进行提醒，准备待办
+        //     let _this = this
+        //     let h = this.$createElement
+        //     let num = data.pageResult.totalCount - this.countNumber
+        //     this.infoMessage = this.$notify({
+        //         title: '您有新的待办任务产生！',
+        //         message: h('p', null, [
+        //             h('span', null, '任务内容: ' + data.dataResult[0].subject),
+        //             h('br'),
+        //             h('span', null, '生成时间: '),
+        //             h('span', { style: 'color: #FF8C00;font-size:12px;' }, data.dataResult[0].createTime),
+        //             h('br'),
+        //             h('el-button', {
+        //                 attrs: {
+        //                     size: 'mini',
+        //                     type: 'primary',
+        //                     plain: true
+        //                 },
+        //                 on: {
+        //                     click: () => {
+        //                         _this.cancelInfo()
+        //                     }
+        //                 }
+        //             }, '进入办理'),
+        //             h('el-button', {
+        //                 attrs: {
+        //                     size: 'mini',
+        //                     plain: true
+        //                 },
+        //                 on: {
+        //                     click: () => {
+        //                         _this.$notify.closeAll()
+        //                     } // 路由加载之后，调用关闭消息弹窗的方法
+        //                 }
+        //             }, '忽略全部')
+        //         ]),
+        //         type: 'warning',
+        //         duration: 0
+        //     })
+        // }
+        // if (this.countNumber == 0) {
+        //     this.countNumber = data.pageResult.totalCount
+        //     // setInterval(() => {
+        //     //     if(this.isControl &&  response.message == "获取收到的内部消息列表成功！"){
+        //     //         this.loadData()
+        //     //     }
+        //     // }, 60000)
+        // } else {
+        //     this.countNumber = data.pageResult.totalCount
+        // }
+      }).catch(() => {
+        this.isControl = false
+      })
     },
-    data() {
-        return {
-            editId: '',
-            subId: '',
-            type: '',
-            dialogFormVisible: false,
-            isControl: true,
-            messageList: [],
-            messageCount: 0,
-            infoMessage: '',
-            countNumber: 0,
-            popShow: false
-        }
+    cancelInfo() {
+      this.$router.push('/officeDesk/pendingItems')
+      this.$notify.closeAll()
     },
-    computed: {
-        tooltipContent() {
-            return this.messageCount === 0 ? this.$t('layout.header-aside.header-message.empty') : ''
-        }
+    handelInteriorClick(message) {
+      this.subId = message.subId
+      this.editId = message.id
+      this.dialogFormVisible = true
+      this.type = message.tableName ? message.tableName : ''
+      this.tableId = message.tableId ? message.tableId : ''
+      this.readonly = message.tableName ? true : false
     },
-    mounted() {
-        //轮询弹窗任务提醒
-        // setTimeout(() => {
-        //     this.isControl=true
-        //     this.loadData()
-        // }, 1000)
-        // Watermark.set('线上试用版本','深圳市金源信通')
+    openPop() {
+      this.popShow = !this.popShow
+      if (this.popShow) {
         this.loadData()
+      }
     },
-    beforeDestroy() {
-        Watermark.set('', '')
-    },
-    methods: {
-        // 加载数据
-        loadData() {
-            getMsgList({
-                parameters: [
-                    // { key: 'Q^subject^SL', value: '提醒' },
-                    // { key: 'Q^messageType^SL', value: 'system' }
-                ],
-                requestPage: { limit: 5, pageNo: 1, totalCount: 0 },
-                sorts: []
-            }).then((response) => {
-                const data = response.data
-                this.messageList = data.dataResult
-                this.messageCount = data.pageResult ? data.pageResult.totalCount : 0
-                this.countNumber = data.pageResult.totalCount
-                // if (this.countNumber == 0) {
-                //     // if(response.data.pageResult.totalCount>0){
-                //     //     this.$message.warning('您有'+response.data.pageResult.totalCount+'条未处理的 [ 待审批 / 被驳回任务消息 ]，请及时处理！！！')
-                //     // }
-                // } else if (this.countNumber < data.pageResult.totalCount) {
-                //     //如果上次记录数量低于本次  进行提醒，准备待办
-                //     let _this = this
-                //     let h = this.$createElement
-                //     let num = data.pageResult.totalCount - this.countNumber
-                //     this.infoMessage = this.$notify({
-                //         title: '您有新的待办任务产生！',
-                //         message: h('p', null, [
-                //             h('span', null, '任务内容: ' + data.dataResult[0].subject),
-                //             h('br'),
-                //             h('span', null, '生成时间: '),
-                //             h('span', { style: 'color: #FF8C00;font-size:12px;' }, data.dataResult[0].createTime),
-                //             h('br'),
-                //             h('el-button', {
-                //                 attrs: {
-                //                     size: 'mini',
-                //                     type: 'primary',
-                //                     plain: true
-                //                 },
-                //                 on: {
-                //                     click: () => {
-                //                         _this.cancelInfo()
-                //                     }
-                //                 }
-                //             }, '进入办理'),
-                //             h('el-button', {
-                //                 attrs: {
-                //                     size: 'mini',
-                //                     plain: true
-                //                 },
-                //                 on: {
-                //                     click: () => {
-                //                         _this.$notify.closeAll()
-                //                     } // 路由加载之后，调用关闭消息弹窗的方法
-                //                 }
-                //             }, '忽略全部')
-                //         ]),
-                //         type: 'warning',
-                //         duration: 0
-                //     })
-                // }
-                // if (this.countNumber == 0) {
-                //     this.countNumber = data.pageResult.totalCount
-                //     // setInterval(() => {
-                //     //     if(this.isControl &&  response.message == "获取收到的内部消息列表成功！"){
-                //     //         this.loadData()
-                //     //     }
-                //     // }, 60000)
-                // } else {
-                //     this.countNumber = data.pageResult.totalCount
-                // }
-            }).catch(() => {
-                this.isControl = false
-            })
-        },
-        cancelInfo() {
-            this.$router.push('/officeDesk/pendingItems')
-            this.$notify.closeAll()
-        },
-        handelInteriorClick(message) {
-            this.subId = message.subId
-            this.editId = message.id
-            this.dialogFormVisible = true
-            this.type = message.tableName ? message.tableName : ''
-        },
-        openPop() {
-            this.popShow = !this.popShow
-            if (this.popShow) {
-                this.loadData()
-            }
-        },
-        clickMore() {
-            // 更多消息
-            this.popShow = !this.popShow
-            this.$router.push('/message')
-        },
-        closeDialog(visible) {
-            this.dialogFormVisible = visible
-            this.loadData()
-        }
+    clickMore() {
+      // 更多消息
+      this.popShow = !this.popShow
+      this.$router.push('/message')
     },
-    // 销毁事件
-    beforeDestroy() {
-        this.isControl = false
+    closeDialog(visible) {
+      this.dialogFormVisible = visible
+      this.loadData()
     }
+  },
+  // 销毁事件
+  beforeDestroy() {
+    this.isControl = false
+  }
 }
 </script>
 <style lang="scss">
 .header-message-popper {
-    padding: 0 !important;
+  padding: 0 !important;
 
-    .message-more {
-        padding: 15px 0;
-        text-align: center;
-        border-top: 1px solid #ebeef5;
-    }
+  .message-more {
+    padding: 15px 0;
+    text-align: center;
+    border-top: 1px solid #ebeef5;
+  }
 }
 </style>

src/views/platform/bpmn/bpmDef/design.vue

@@ -17,7 +17,7 @@
       </template>
       <template v-else>
         <el-button type="primary" icon="ibps-icon-save" class="ibps-ml-5" @click="handleSave(true,false)">保存</el-button>
-        <el-button type="primary" icon="ibps-icon-clipboard" class="ibps-ml-5" @click="handleSave(true,true)">发布新版本</el-button>
+        <!-- <el-button type="primary" icon="ibps-icon-clipboard" class="ibps-ml-5" @click="handleSave(true,true)">发布新版本</el-button> -->
       </template>
       <el-upload
         ref="upload"

src/views/platform/message/inner/detail/dialog.vue

@@ -1,131 +1,186 @@
 <template>
-    <el-dialog :title="title" :visible.sync="dialogVisible" :close-on-click-modal="false" :close-on-press-escape="false"
-        :class="[inside ? 'inside-dialog' : 'inner-dialog']" append-to-body top="10vh" width="65%" @open="getFormData"
-        @close="closeDialog">
-        <inner-message :id="id" ref="innerMessage" :inside="inside" :type="type" :readonly="readonly"
-            @callback="handleCallback" />
-        <div slot="footer" class="el-dialog--center">
-            <ibps-toolbar :actions="toolbars" @action-event="handleActionEvent" />
-        </div>
-    </el-dialog>
+  <el-dialog :title="title"
+             :visible.sync="dialogVisible"
+             :close-on-click-modal="false"
+             :close-on-press-escape="false"
+             :class="[inside ? 'inside-dialog' : 'inner-dialog']"
+             append-to-body
+             top="10vh"
+             width="65%"
+             @open="getFormData"
+             @close="closeDialog">
+    <inner-message :id="id"
+                   ref="innerMessage"
+                   :inside="inside"
+                   :type="type"
+                   :readonly="readonly"
+                   @callback="handleCallback" />
+    <div slot="footer"
+         class="el-dialog--center">
+      <ibps-toolbar :actions="toolbars"
+                    @action-event="handleActionEvent" />
+    </div>
+  </el-dialog>
 </template>
 <script>
 import InnerMessage from './index'
+import curdPost from "@/business/platform/form/utils/custom/joinCURD.js";
+import getDate from "@/business/platform/form/utils/custom/getDateRule.js";
+import {
+  generateUUID
+} from '@/api/platform/file/attachment'
 export default {
-    components: { InnerMessage },
-    props: {
-        inside: {
-            type: Boolean,
-            default: false
-        },
-        visible: {
-            type: Boolean,
-            default: false
-        },
-        readonly: {
-            type: Boolean,
-            default: false
-        },
-        id: String,
-        // 子表ID
-        subId: String,
-        title: String,
-        type: String
+  components: { InnerMessage },
+  props: {
+    inside: {
+      type: Boolean,
+      default: false
     },
-    data() {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    readonly: {
+      type: Boolean,
+      default: false
+    },
+    type: {
+      type: String,
+      default: ''
+    },
+    tableId: {
+      type: String,
+      default: ''
+    },
+    id: String,
+    // 子表ID
+    subId: String,
+    title: String
+  },
+  data() {
+    return {
+      dialogVisible: this.visible,
+      dialogLoading: false,
+      toolbars: [{ key: 'cancel', label: '关闭' }]
+    }
+  },
+  watch: {
+    visible: {
+      handler: function (val, oldVal) {
+        this.dialogVisible = this.visible
+      },
+      immediate: true
+    },
+    type: {
+      handler: function (val, oldVal) {
         const btn1 = [
-            { key: 'confirm', label: '确认' },
-            { key: 'cancel', label: '关闭' }
+          { key: 'confirm', label: '确认' },
+          { key: 'cancel', label: '关闭' }
         ]
         const btn2 = [
-            { key: 'cancel', label: '关闭' }
+          { key: 'cancel', label: '关闭' }
         ]
-        const toolbars = this.type ? btn1 : btn2
-        return {
-            dialogVisible: this.visible,
-            dialogLoading: false,
-            toolbars
-        }
+        this.toolbars = val ? btn1 : btn2
+      }
+    }
+  },
+  methods: {
+    handleActionEvent({ key }) {
+      switch (key) {
+        case 'cancel':
+          this.closeDialog()
+          break
+        case 'confirm':
+          this.confirmMsg()
+          break
+        default:
+          break
+      }
     },
-    watch: {
-        visible: {
-            handler: function (val, oldVal) {
-                this.dialogVisible = this.visible
-            },
-            immediate: true
-        }
+    // 关闭当前窗口
+    closeDialog() {
+      this.$emit('close', false)
     },
-    methods: {
-        handleActionEvent({ key }) {
-            switch (key) {
-                case 'cancel':
-                    this.closeDialog()
-                    break
-                case 'confirm':
-                    this.confirmMsg()
-                    break
-                default:
-                    break
+    // 获取表单数据
+    getFormData() {
+      this.$nextTick(() => {
+        this.$refs.innerMessage.getFormData()
+        this.handleCallback(true)
+      })
+    },
+    // 消息确认，受控文件用
+    confirmMsg() {
+      // TODO
+      this.$confirm('是否已查阅受控文件？一经确认即代表该文件已发放并通知您', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+        showClose: false,
+        closeOnClickModal: false
+      }).then(() => {
+        // TODO 受控文件逻辑处理
+        const perInfosId = this.$store.getters.userInfo.user.id
+        const perInfosorgId = this.$store.getters.userInfo.org.id
+        let sql = "select qian_zi_tu_wen_ FROM t_ryjbqk WHERE parent_id_ = '" + perInfosId + "'"
+        curdPost("sql", sql).then((ryjbqkRes) => {
+          let ryjbqkDatas = ryjbqkRes.variables.data
+          let tempObj = {
+            id_: generateUUID(),
+            parent_id_: this.tableId,
+            tong_zhi_bu_men_i: perInfosorgId,
+            que_ren_qian_ming: JSON.stringify([{
+              id: ryjbqkDatas[0].qian_zi_tu_wen_,
+              fileName: '确认签名'
+            }]),
+            que_ren_ri_qi_: getDate(),
+            qian_ming_id_: ryjbqkDatas[0].qian_zi_tu_wen_
+          }
+          let returnParams = {
+            tableName: this.type,
+            paramWhere: [tempObj]
+          }
+          curdPost('add', JSON.stringify(returnParams)).then(() => { console.log('确认接收到发放文件') }).then(
+            () => {
+              this.type = ''
+              this.getFormData()
             }
-        },
-        // 关闭当前窗口
-        closeDialog() {
-            this.$emit('close', false)
-        },
-        // 获取表单数据
-        getFormData() {
-            this.$nextTick(() => {
-                this.$refs.innerMessage.getFormData()
-                this.handleCallback(true)
-            })
-        },
-        // 消息确认，受控文件用
-        confirmMsg() {
-            // TODO
-            this.$confirm('是否已查阅受控文件？一经确认即代表xxxxxx', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning',
-                showClose: false,
-                closeOnClickModal: false
-            }).then(() => {
-                // TODO 受控文件逻辑处理
-                console.log('暂无')
-                this.closeDialog()
-            }).catch(() => { })
-        },
-        handleCallback(res) {
-            this.$emit('callback', res)
-        }
+          )
+        });
+        this.closeDialog()
+      }).catch(() => { })
+    },
+    handleCallback(res) {
+      this.$emit('callback', res)
     }
+  }
 }
 </script>
 <style lang="scss">
 .inner-dialog {
-    .el-dialog__body {
-        padding: 20px 20px;
-        height: calc(40vh) !important;
-    }
+  .el-dialog__body {
+    padding: 20px 20px;
+    height: calc(40vh) !important;
+  }
 
-    .list {
-        .el-form-item__content {
-            margin-left: 0px !important;
+  .list {
+    .el-form-item__content {
+      margin-left: 0px !important;
 
-            .el-table--border {
-                height: 300px !important;
-            }
-        }
+      .el-table--border {
+        height: 300px !important;
+      }
     }
+  }
 
-    .ibps-container-crud__header {
-        display: none;
-    }
+  .ibps-container-crud__header {
+    display: none;
+  }
 }
 
 .inside-dialog {
-    .el-dialog__body {
-        padding: 20px 20px;
-        height: calc(50vh - 110px) !important;
-    }
+  .el-dialog__body {
+    padding: 20px 20px;
+    height: calc(50vh - 110px) !important;
+  }
 }
 </style>

src/views/platform/message/inner/detail/index.vue

@@ -26,7 +26,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="是否公告:" :hidden="!type">
+        <el-form-item label="是否公告:" >
           <div class="text-border">
             <el-tag :type="form.isPublic | optionsFilter(publicOrCanreplyOptions, 'type')">{{
               form.isPublic | optionsFilter(publicOrCanreplyOptions, 'label') }}</el-tag>
@@ -34,7 +34,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="是否可回复:" :hidden="!type">
+        <el-form-item label="是否可回复:">
           <div class="text-border">
             <el-tag :type="form.canreply | optionsFilter(publicOrCanreplyOptions, 'type')">{{
               form.canreply | optionsFilter(publicOrCanreplyOptions, 'label') }}</el-tag>
@@ -42,7 +42,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="24">
-        <el-form-item label="消息内容:" :hidden="!type">
+        <el-form-item label="消息内容:" >
           <span class="original-content" v-html="$utils.formatText(form.content)" />
         </el-form-item>
       </el-col>

src/views/platform/org/employee/list.vue

@@ -123,9 +123,10 @@ export default {
         columns: [
           { prop: 'name', label: this.$t('platform.org.employee.prop.name'),width:120 },
           { prop: 'account', label: this.$t('platform.org.employee.prop.account'),width:150},
-          //{ prop: 'wcAccount', label: this.$t('platform.org.employee.prop.wcAccount'),width:120},
+          // { prop: 'wcAccount', label: this.$t('platform.org.employee.prop.wcAccount'),width:250},
           { prop: 'orgName', label: this.$t('platform.org.employee.prop.orgPath'), sortable: false ,width:250},
-           { prop: 'status', label: this.$t('platform.org.employee.prop.status'), tags: statusOptions,width:100},
+          { prop: 'wcAccount', label: '客户单位名称',width:250},
+          { prop: 'status', label: this.$t('platform.org.employee.prop.status'), tags: statusOptions,width:100},
           { prop: 'createTime', label: this.$t('common.field.createTime')},
         ],
         rowHandle: {

src/views/platform/org/org/detail/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="main-container">
+    <div class="header">组织架构信息</div>
     <el-tabs
       v-model="activeName"
       @tab-click="handleTabClick"
@@ -95,3 +96,13 @@ export default {
   }
 }
 </script>
+<style lang="scss" scoped>
+    .main-container {
+        .header {
+            text-align: center;
+            font-size: 18px;
+            font-weight: bold;
+            width: 100%;
+        }
+    }
+</style>

src/views/platform/org/role/list.vue

@@ -11,6 +11,7 @@
       :row-handle="listConfig.rowHandle"
       :pagination="pagination"
       :loading="loading"
+      displayField="角色设置列表"
       @action-event="handleAction"
       @sort-change="handleSortChange"
       @pagination-change="handlePaginationChange"
@@ -118,22 +119,22 @@ export default {
           forms: [
             { prop: 'Q^NAME_^SL', label: '角色名称' },
             { prop: 'Q^ROLE_ALIAS_^SL', label: '角色别名' },
-            {
-              prop: 'Q^SYSTEM_ID_^SL',
-              label: '子系统',
-              fieldType: 'select',
-              valueKey: 'id',
-              labelKey: 'name',
-              resultField: 'data',
-              selectFetch: findAllSubsystem
-            }
+            // {
+            //   prop: 'Q^SYSTEM_ID_^SL',
+            //   label: '子系统',
+            //   fieldType: 'select',
+            //   valueKey: 'id',
+            //   labelKey: 'name',
+            //   resultField: 'data',
+            //   selectFetch: findAllSubsystem
+            // }
           ]
         },
         // 表格字段配置
         columns: [
-          { prop: 'name', label: '名称' },
+          { prop: 'name', label: '角色名称' },
           { prop: 'roleAlias', label: '角色别名' },
-          { prop: 'subSystemName', label: '子系统名称' }
+        //   { prop: 'subSystemName', label: '子系统名称' }
         ],
         rowHandle: {
           actions: [{

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

@@ -613,36 +613,33 @@
                     let isExist = !!noticeList.find(i => i.taskId === item.taskId)
                     // 筛选出不存在于主管提醒表的过期数据
                     if (!isExist) {
-                        // 无部门信息的用户不往过期事务表加数据
-                        if (this.orgInfo.groupID) {
-                            let obj = {
-                                // 事务ID
-                                shi_wu_id_: item.taskId,
-                                // 完整名称
-                                wan_zheng_ming_ch: item.subject,
-                                // 事务说明
-                                shi_wu_shuo_ming_: item.subject.includes('#') ? item.subject.split('#')[1] : '',
-                                // 事务名称
-                                shi_wu_ming_cheng: item.workName,
-                                // 事务状态
-                                shi_wu_zhuang_tai: `待${item.name}`,
-                                // 事务类型
-                                shi_wu_lei_xing_: item.workType,
-                                chu_li_ren_ming_: item.ownerName,
-                                chu_li_ren_id_: this.getInfoByName(item.ownerName, 'id'),
-                                chu_li_ren_dian_h: this.getInfoByName(item.ownerName, 'phone'),
-                                bu_men_: this.orgInfo.orgName,
-                                bu_men_id_: this.orgInfo.groupID,
-                                // 主管ID与当前用户id相等时将主管ID设置为主任【】的ID，主管电话设为空
-                                zhu_guan_id_: this.orgInfo.id === userId ? '990927120278487040' : this.orgInfo.id,
-                                zhu_guan_dian_hua: this.orgInfo.id === userId ? '' : this.orgInfo.mobile,
-                                bian_zhi_shi_jian: item.createTime,
-                                ti_xing_ci_shu_: 1,
-                                duan_xin_ci_shu_: 0,
-                                ti_xing_shi_jian_: nowTime
-                            }
-                            addList.push(obj)
+                        let obj = {
+                            // 事务ID
+                            shi_wu_id_: item.taskId,
+                            // 完整名称
+                            wan_zheng_ming_ch: item.subject,
+                            // 事务说明
+                            shi_wu_shuo_ming_: item.subject.includes('#') ? item.subject.split('#')[1] : '',
+                            // 事务名称
+                            shi_wu_ming_cheng: item.workName,
+                            // 事务状态
+                            shi_wu_zhuang_tai: `待${item.name}`,
+                            // 事务类型
+                            shi_wu_lei_xing_: item.workType,
+                            chu_li_ren_ming_: item.ownerName,
+                            chu_li_ren_id_: this.getInfoByName(item.ownerName, 'id'),
+                            chu_li_ren_dian_h: this.getInfoByName(item.ownerName, 'phone'),
+                            bu_men_: this.orgInfo.orgName,
+                            bu_men_id_: this.orgInfo.groupID,
+                            // 主管ID与当前用户id相等时将主管ID设置为主任【】的ID，主管电话设为空
+                            zhu_guan_id_: this.orgInfo.id === userId ? '990927120278487040' : this.orgInfo.id,
+                            zhu_guan_dian_hua: this.orgInfo.id === userId ? '' : this.orgInfo.mobile,
+                            bian_zhi_shi_jian: item.createTime,
+                            ti_xing_ci_shu_: 1,
+                            duan_xin_ci_shu_: 0,
+                            ti_xing_shi_jian_: nowTime
                         }
+                        addList.push(obj)
                         let msg = {
                             subject: msgTitle[item.workType],
                             content: `<p>事务【${item.workName}】${msgContent[item.workType]}<p>`,