列表样式，事务说明，功能隐藏，选择器回显

.env.development

@@ -3,11 +3,11 @@
 ENV = 'development'
 
 # ========base api======================
-VUE_APP_BASE_API = ''http://127.0.0.1:5100/ibps''
+VUE_APP_BASE_API = ''http://dev1.local/ibps''
 VUE_APP_BASE_WEBSOCKET_API = 'ws://127.0.0.1:5888'
 
 # ========report api======================
-VUE_APP_BASE_REPORT_API = 'http://127.0.0.1:8080/raqsoft'
+VUE_APP_BASE_REPORT_API = 'http://dev1.local:5100/raqsoft'
 
 # ---API的域名  二级域名之间用“,”分割，注意是英文状态下的逗号
 VUE_APP_API_DOMAIN_NAME=a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12,a13,a14,a15,a16,a17,a18,a19,a20
@@ -20,11 +20,11 @@ VUE_APP_API_DOMAIN_NAME=a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12,a13,a14,a15,a16,a
 # index 最小的地址被默认激活
 # singleApp  是否单体应用 0：否，1：是
 # ---测试环境
-VUE_APP_BASE_API_0_0_TEST=http://127.0.0.1:5100/ibps
+VUE_APP_BASE_API_0_0_TEST=http://dev1.local/ibps
 # ---后端开发环境
 VUE_APP_BASE_API_1_0_DEV=http://127.0.0.1:5100/ibps
 # ---前端开发环境
-VUE_APP_BASE_API_2_0_FRONT=http://127.0.0.1:5100/ibps
+VUE_APP_BASE_API_2_0_FRONT=http://dev1.local/ibps
 # ---集成环境
 VUE_APP_BASE_API_3_0_STAGING=http://127.0.0.1:5100/ibps
 # ---生产环境

public/config.js

@@ -1,16 +1,17 @@
 (function (global) {
+  const BASE_URL = 'http://dev1.local:5100/'
   global.__IBPS_CONFIG__={
-
     // 是否启用配置
-    ENABLE_CONFIG:false,
+    ENABLE_CONFIG:true,
+    BASE_URL,
     //  api
-    BASE_API:'http://192.168.3.230:15100/ibps',
+    BASE_API:`${ BASE_URL }ibps`,
     // GATEWAY API
-    BASE_GATEWAY_API:'http://192.168.3.230:15100/ibps',
+    BASE_GATEWAY_API:`${ BASE_URL }ibps`,
     // WEBSOCKET api
     BASE_WEBSOCKET_API :'ws://192.168.3.230:15888',
     // report api
-    BASE_REPORT_API : 'http://192.168.3.230:8080/raqsoft',
+    BASE_REPORT_API : `${ BASE_URL }raqsoft`,
 
     //是否单体应用
     SINGLE:false,

src/business/platform/org/selector/index.vue

@@ -41,9 +41,28 @@
               name="add-o"
               class="van-cell__left-icon"
             /> -->
-            <div class="van-field__body">
+            <!-- <div class="van-field__body">
               <input :placeholder="defaultPlaceholder" class="van-field__control" readonly>
-            </div>
+            </div> -->
+            <van-tag
+              v-for="(item,index) in selectedData.slice(0,num) "
+              :key="item[valueKey]"
+              class="ibps-tag-span ibps-mr-8"
+              :color="color"
+              :text-color="textColor"
+              :plain="plain"
+            >
+              <template #default>
+                <div :class="multiple?'ibps-ellipsis':''">{{ item[labelKey] }}</div>
+                <div v-if="editable" class="ibps-tag-close"><van-icon name="clear" @click.stop="removeData(index)" /></div>
+              </template>
+            </van-tag>
+            <van-tag
+              v-if="selectedData.length>num"
+              :color="color"
+              :text-color="textColor"
+              :plain="plain"
+            >+{{ selectedData.length-num }}</van-tag>
           </template>
         </template>
         <template v-else>
@@ -499,7 +518,14 @@ export default {
       this._setInputValue()
     },
     removeData(index) {
+      console.log(this.selectedData, this.selectedValue, index, '11212121212')
       this.selectedData.splice(index, 1)
+      const mid = []
+      this.selectedData.forEach((it, i) => {
+        mid.push(it.id)
+      })
+      this.selectedValue.length = 0
+      this.selectedValue = mid
       this.$emit('input', this.getStoreValue(this.selectedData))
     },
 

src/views/layout/layout.vue

@@ -41,11 +41,11 @@ const imTabbars = [
     label: i18n.generateTitle('dashboard'),
     class: 'tabbar-dashboard'
   },
-  {
-    name: 'contacts',
-    icon: 'contacts',
-    label: i18n.generateTitle('contacts')
-  },
+  // {
+  //   name: 'contacts',
+  //   icon: 'contacts',
+  //   label: i18n.generateTitle('contacts')
+  // },
   {
     name: 'my',
     icon: 'user',
@@ -66,12 +66,12 @@ const defaultTabbars = [{
   activeIcon: 'volume',
   label: i18n.generateTitle('notice')
 },
-{
-  name: 'contacts',
-  icon: 'friends-o',
-  activeIcon: 'friends',
-  label: i18n.generateTitle('contacts')
-},
+// {
+//   name: 'contacts',
+//   icon: 'friends-o',
+//   activeIcon: 'friends',
+//   label: i18n.generateTitle('contacts')
+// },
 {
   name: 'my',
   icon: 'manager-o',

src/views/platform/bpmn/completed/index.vue

@@ -27,7 +27,7 @@
           v-for="(item,index) in listData"
           :key="item.id+index"
           :title="item.procDefName"
-          :label="item.subject"
+          :label="getTaskDesc(item.subject)"
           size="large"
           @click="onClick(item,index)"
         >
@@ -228,7 +228,12 @@ export default {
       this.typeId = data.id
       this.onMoreSearch({})
     },
-
+    getTaskDesc(v) {
+      if (!v.includes('#')) {
+        return ''
+      }
+      return v.split('#')[1] || ''
+    },
     onClick(item) {
       this.instId = item.id
       this.formrenderTitle = item.procDefName
@@ -238,3 +243,11 @@ export default {
 
 }
 </script>
+<style lang="scss" scoped>
+::v-deep .van-cell__title{
+  width: 65%;
+  .van-cell__label{
+    overflow-wrap: break-word;
+  }
+}
+</style>

src/views/platform/bpmn/handled/index.vue

@@ -28,7 +28,7 @@
           v-for="(item,index) in listData"
           :key="item.id+index"
           :title="item.taskName"
-          :label="item.subject"
+          :label="getTaskDesc(item.subject)"
           size="large"
           @click="onClick(item,index)"
         >
@@ -50,7 +50,7 @@
               :color="item.status | optionsFilter(bpmnStatusOptions,'type') | optionsFilter(colorOptions,'color','type')"
               :text-color="item.status | optionsFilter(bpmnStatusOptions,'type') | optionsFilter(colorOptions,'textColor','type')"
             >
-              {{ item.status| optionsFilter(bpmnStatusOptions) }}</van-tag>
+              {{ item.status=='submit'?'编辑':item.status| optionsFilter(bpmnStatusOptions) }}</van-tag>
           </div>
         </van-cell>
         <ibps-list-result-page
@@ -232,7 +232,12 @@ export default {
       this.typeId = data.id
       this.onMoreSearch({})
     },
-
+    getTaskDesc(v) {
+      if (!v.includes('#')) {
+        return ''
+      }
+      return v.split('#')[1] || ''
+    },
     onClick(item) {
       this.instId = item.procInstId
       this.formrenderTitle = item.taskName
@@ -242,3 +247,11 @@ export default {
 
 }
 </script>
+<style lang="scss" scoped>
+::v-deep .van-cell__title{
+  width: 65%;
+  .van-cell__label{
+    overflow-wrap: break-word;
+  }
+}
+</style>

src/views/platform/bpmn/my-draft/index.vue

@@ -30,7 +30,7 @@
             v-for="(item,index) in listData"
             :key="item.id+index"
             :title="item.procDefName"
-            :label="item.subject"
+            :label="getTaskDesc(item.subject)"
             @click="onClick(item,index)"
           >
             <template slot="icon">
@@ -253,7 +253,12 @@ export default {
     resetForm() {
       this.typeId = ''
     },
-
+    getTaskDesc(v) {
+      if (!v.includes('#')) {
+        return ''
+      }
+      return v.split('#')[1] || ''
+    },
     clickType() {
       this.typeTreePopup = true
     },
@@ -314,3 +319,11 @@ export default {
 
 }
 </script>
+<style lang="scss" scoped>
+::v-deep .van-cell__title{
+  width: 65%;
+  .van-cell__label{
+    overflow-wrap: break-word;
+  }
+}
+</style>

src/views/platform/bpmn/my-request/index.vue

@@ -30,7 +30,7 @@
         >
           <van-cell
             :title="item.procDefName"
-            :label="item.subject"
+            :label="getTaskDesc(item.subject)"
             @click="onClick(item,index)"
           >
             <template slot="icon">
@@ -240,7 +240,12 @@ export default {
       this.typeId = data.id
       this.onMoreSearch({})
     },
-
+    getTaskDesc(v) {
+      if (!v.includes('#')) {
+        return ''
+      }
+      return v.split('#')[1] || ''
+    },
     onClick(item) {
       this.instId = item.id
       this.proInstId = ''
@@ -261,3 +266,11 @@ export default {
 
 }
 </script>
+<style lang="scss" scoped>
+::v-deep .van-cell__title{
+  width: 65%;
+  .van-cell__label{
+    overflow-wrap: break-word;
+  }
+}
+</style>

src/views/platform/bpmn/my-revoke/index.vue

@@ -39,7 +39,7 @@
               <van-cell
                 :key="item.id+index"
                 :title="item.procDefName"
-                :label="item.subject"
+                :label="getTaskDesc(item.subject)"
                 @click="onClick(item,index)"
               >
                 <template slot="icon">
@@ -329,9 +329,22 @@ export default {
         this.checkedIds = []
       }
       this.checkMode = !this.checkMode
+    },
+    getTaskDesc(v) {
+      if (!v.includes('#')) {
+        return ''
+      }
+      return v.split('#')[1] || ''
     }
   }
 
 }
 </script>
-
+<style lang="scss" scoped>
+::v-deep .van-cell__title{
+  width: 65%;
+  .van-cell__label{
+    overflow-wrap: break-word;
+  }
+}
+</style>

src/views/platform/bpmn/new-process/index.vue

@@ -302,8 +302,14 @@ export default {
   }
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
   .new-process_size{
     font-size: 14px!important;
   }
+  ::v-deep .van-cell__title{
+    width: 65%;
+    .van-cell__label{
+      overflow-wrap: break-word;
+    }
+  }
 </style>

src/views/platform/bpmn/pending/index.vue

@@ -9,14 +9,14 @@
         @click-left="$router.push({ name: 'dashboard' })"
         @click-right="toCheckMode()"
       />
-      <van-tabs v-model="tabActive" @click="onSearch">
+      <!-- <van-tabs v-model="tabActive" @click="onSearch">
         <van-tab
           v-for="data in tabDatas"
           :key="data.name"
           :name="data.name"
           :title="data.title"
         />
-      </van-tabs>
+      </van-tabs> -->
       <van-search
         v-model="subject"
         show-action
@@ -45,7 +45,7 @@
             v-for="(item,index) in listData"
             :key="item.id+index"
             :title="item.procDefName"
-            :label="item.subject"
+            :label="getTaskDesc(item.subject)"
             @click="onClick(item,index)"
           >
             <template slot="icon">
@@ -164,7 +164,8 @@ export default {
   mixins: [random, bpmnStatus],
   data() {
     return {
-      tabActive: 'userType',
+      // tabActive: 'userType',
+      tabActive: 'user',
       tabDatas: [{
         name: 'user',
         title: '用户'
@@ -434,6 +435,12 @@ export default {
         })
       })
     },
+    getTaskDesc(v) {
+      if (!v.includes('#')) {
+        return ''
+      }
+      return v.split('#')[1] || ''
+    },
     recover() {
       if (this.checkedIds.length === 0) {
         this.$notify({
@@ -461,3 +468,11 @@ export default {
 
 }
 </script>
+<style lang="scss" scoped>
+::v-deep .van-cell__title{
+  width: 65%;
+  .van-cell__label{
+    overflow-wrap: break-word;
+  }
+}
+</style>

src/views/platform/my/index.vue

@@ -45,7 +45,7 @@
 
     <div class="divider" />
     <van-cell-group>
-      <van-cell :title="$t('platform.my.help')" icon="question" is-link :size="size" @click="help" />
+      <!-- <van-cell :title="$t('platform.my.help')" icon="question" is-link :size="size" @click="help" /> -->
       <van-cell :title="$t('platform.my.about')" icon-prefix="ibps-icon" icon="logo" is-link :size="size" @click="about" />
       <switch-environment v-if="$nodeEnv === 'development'" />
 

src/views/platform/my/lang-select.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <van-cell
+    <!-- <van-cell
       :title="$t('platform.my.lang-select.title')"
       :value="language"
       icon-prefix="ibps-icon"
@@ -8,7 +8,7 @@
       is-link
       size="large"
       @click="show = true"
-    />
+    /> -->
     <!-- <van-popup v-model="show" class="ibps-border-r-6" position="bottom">
       <van-picker
         show-toolbar