eoss-ui 0.6.58 → 0.6.60

package/packages/flow-list/src/main.vue

@@ -26,6 +26,7 @@
           v-bind="item"
           :data="returnData(item.type)"
           @btn-click="handleBtnClick"
+          @selection-change="handleSelectionChange"
         ></es-data-table>
       </div>
     </div>
@@ -96,6 +97,8 @@ import {
   pressListJson,
   pendedhistoryListWithCircularReadJson,
   deleteFlow,
+  taskReadWithDraw,
+  fyListJson,
   circularReadWithdraw
 } from 'eoss-ui/src/config/api';
 import FileList from '../../flow/src/component/FileList.vue';
@@ -110,6 +113,10 @@ export default {
       type: String,
       default: ''
     },
+    getListCount: {
+      type: Function,
+      default: () => {}
+    },
     hide: {
       type: String,
       default: ''
@@ -152,9 +159,13 @@ export default {
       pressLoading: false,
       pressTableList: [],
       circularData: [],
+      selectList:[],
+      untreatedReadData: [],
+      processedReadData: [],
       hasCircularReadWithdrawAuthority: false,
       currentPage: 1,
       pageSize: 20,
+      flowListCount: {},
       currentUserHasPresetInfoAuth: false,
       pressThead: [
         {
@@ -336,7 +347,29 @@ export default {
             type: 'text',
             contents: '传阅列表'
           }
+        ],
+        untreatedRead: [
+          {
+            type: 'text',
+            contents: '未处理分阅列表'
+          },
+          {
+            type: 'button',
+            contents: [
+              {
+                text: '撤销分阅',
+                fun:'recallRead'
+              }
+            ],
+          }
+        ],
+        processedRead: [
+          {
+            type: 'text',
+            contents: '已处理分阅列表'
+          }
         ]
+        // Reading situation
       };
     },
     pageInfo() {
@@ -855,6 +888,134 @@ export default {
               }
             }
           }
+        ],
+        untreatedRead: [
+          {
+            label: '步骤',
+            field: 'itemid',
+            align: 'center',
+            key: 'bz',
+            showOverflowTooltip: true,
+            width: this.theadWidth.itemid || 110
+          },
+          {
+            label: '办理人',
+            field: 'userName',
+            align: 'center',
+            key: 'blr',
+            showOverflowTooltip: true,
+            width: this.theadWidth.userName
+          },
+          {
+            label: '办理状态',
+            field: 'pendstate',
+            key: 'blzt',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: this.theadWidth.pendstate || 110,
+            render: (h, params) => {
+              return h('span', {
+                style: {
+                  color:
+                    params.row.pendstate == 0 || params.row.pendstate == 3
+                      ? 'red'
+                      : params.row.pendstate == 1
+                      ? 'green'
+                      : 'deepskyblue'
+                },
+                domProps: { innerHTML: params.row.querykeywords }
+              });
+            }
+          },
+          {
+            label: '创建时间',
+            field: 'createtime',
+            align: 'center',
+            key: 'cjsj',
+            showOverflowTooltip: true,
+            width: this.theadWidth.createtime || 150,
+            render: (h, params) => {
+              return h(
+                'span',
+                {},
+                params.row.doetime
+                  ? util.formatDate(params.row.createtime, 'yyyy-MM-dd HH:mm')
+                  : ''
+              );
+            }
+          }
+        ],
+        processedRead: [
+          {
+            label: '步骤',
+            field: 'itemid',
+            align: 'center',
+            key: 'bz',
+            showOverflowTooltip: true,
+            width: this.theadWidth.itemid || 110
+          },
+          {
+            label: '办理人',
+            field: 'userName',
+            align: 'center',
+            key: 'blr',
+            showOverflowTooltip: true,
+            width: this.theadWidth.userName
+          },
+          {
+            label: '办理状态',
+            field: 'pendstate',
+            key: 'blzt',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: this.theadWidth.pendstate || 110,
+            render: (h, params) => {
+              return h('span', {
+                style: {
+                  color:
+                    params.row.pendstate == 0 || params.row.pendstate == 3
+                      ? 'red'
+                      : params.row.pendstate == 1
+                      ? 'green'
+                      : 'deepskyblue'
+                },
+                domProps: { innerHTML: params.row.querykeywords }
+              });
+            }
+          },
+          {
+            label: '办理时间',
+            field: 'doetime',
+            align: 'center',
+            key: 'blsj',
+            showOverflowTooltip: true,
+            width: this.theadWidth.doetime || 150,
+            render: (h, params) => {
+              return h(
+                'span',
+                {},
+                params.row.doetime
+                  ? util.formatDate(params.row.doetime, 'yyyy-MM-dd HH:mm')
+                  : ''
+              );
+            }
+          },
+          {
+            label: '代办人',
+            field: 'douserid',
+            align: 'center',
+            key: 'dbr',
+            showOverflowTooltip: true,
+            width: this.theadWidth.douserid
+          },
+          {
+            label: '意见',
+            field: 'doresult',
+            align: 'center',
+            key: 'yj',
+            showOverflowTooltip: true,
+            width: this.theadWidth.doresult
+          }
         ]
       };
     },
@@ -864,6 +1025,9 @@ export default {
       if (this.contents.indexOf('circular') != -1) {
         newContents = newContents.filter((item) => item != 'splitReading');
       }
+      if (newContents.indexOf('readingSituation') != -1) {
+        newContents = ['untreatedRead', 'processedRead'];
+      }
       let contents = newContents.map((item) => {
         if (typeof item === 'string') {
           let data = [];
@@ -887,6 +1051,7 @@ export default {
           }
           return {
             type: item,
+            checkbox:newContents.indexOf('untreatedRead') !=-1,
             toolbar: this.toolbars[item],
             thead: data.length > 0 ? data : this.theads[item],
             showFormBtn: false
@@ -1021,19 +1186,58 @@ export default {
       return table;
     }
   },
-  mounted() {
+   async mounted() {
     this.loading = util.loading(this.$loading, '加载中...');
-    if (this.contents.indexOf('circular') != -1) {
-      this.getCircularReadList();
+    if (this.contents.indexOf('readingSituation') != -1) {
+      await this.getFyListJson(1);
+      await this.getFyListJson(2);
+      this.getListCount(this.flowListCount);
+      this.show = true;
+    } else {
+      this.getFlowList();
     }
-    this.getFlowList();
     this.getSysInfo('preset_type');
     this.getSysInfo('is_edit');
     this.getListInfo();
   },
 
   methods: {
-    handledraw(pendedHistoryId) {
+    recallReadFun(){
+      const _that = this
+      let pendingIds = _that.selectList.map(x => x.id).join(',');
+      let params = {
+        url:taskReadWithDraw,
+        params:{
+          pendingIds
+        }
+      }
+       _that.loading = util.loading(_that.$loading, '撤销中...');
+      util.ajax(params).then(async res=>{
+        _that.loading.close();
+        if(res.rCode == 0 || res.status=='success'){
+          _that.$message.success('撤销成功！');
+          await _that.getFyListJson(1);
+        _that.getListCount(_that.flowListCount);
+        }else{
+          _that.$message.error(res.message);
+        }
+        
+      })
+    },
+    recallRead(){
+      if(this.selectList.length == 0) return this.$message.warning('请选择需要撤销的分阅')
+      this.$confirm('是否确认撤销选中的分阅?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.recallReadFun()
+      })
+    },
+    handleSelectionChange(val){
+      this.selectList = val
+    },
+     handledraw(pendedHistoryId) {
       let params = {
         url: circularReadWithdraw,
         params: { pendedHistoryId }
@@ -1060,29 +1264,44 @@ export default {
         .catch(() => {});
     },
     getCircularReadList() {
+      const _that = this;
       let params = {
         url: pendedhistoryListWithCircularReadJson,
-        params: { apprecordid: this.businessId }
+        params: { apprecordid: _that.businessId }
       };
       util.ajax(params).then((res) => {
         if (res.status == 'success' || res.rCode == 0) {
-          this.circularData = res.data.fyHistoryList;
-          this.hasCircularReadWithdrawAuthority =
+          _that.circularData = res.data.fyHistoryList;
+          _that.hasCircularReadWithdrawAuthority =
             res.data.hasCircularReadWithdrawAuthority;
+          _that.$nextTick(() => {
+            _that.getListCount(_that.flowListCount);
+          });
         }
       });
     },
     returnData(type) {
       switch (type) {
         case 'preset':
+          this.flowListCount.preset = this.presetData.length;
           return this.presetData;
         case 'sign':
+          this.flowListCount.sign = this.signData.length;
           return this.signData;
         case 'splitReading':
+          this.flowListCount.splitReading = this.splitReadingData.length;
           return this.splitReadingData;
         case 'circular':
+          this.flowListCount.circular = this.circularData.length;
           return this.circularData;
+        case 'untreatedRead':
+          this.flowListCount.untreatedRead = this.untreatedReadData.length;
+          return this.untreatedReadData;
+        case 'processedRead':
+          this.flowListCount.processedRead = this.processedReadData.length;
+          return this.processedReadData;
         default:
+          this.flowListCount.flow = this.flowData.length;
           return this.flowData;
       }
     },
@@ -1099,9 +1318,12 @@ export default {
       }
     },
     handleBtnClick(data) {
+    // recallRead
       const { handle, row } = data;
       if (handle.text == '删除') {
         this.del(row.id);
+      }else if(handle.fun == 'recallRead'){
+        this[handle.fun]()
       }
     },
     /**
@@ -1250,6 +1472,22 @@ export default {
       this.loading = util.loading(this.$loading, '加载中...');
       this.getFlowList();
     },
+   async getFyListJson(type) {
+      let params = {
+        url: fyListJson,
+        params: {
+          appRecordId: this.businessId,
+          status: type
+        }
+      };
+     await util.ajax(params).then((res) => {
+        if (type == 1) {
+          this.untreatedReadData = res.data;
+        } else {
+          this.processedReadData = res.data;
+        }
+      });
+    },
     /**
      * getFlowList
      * @desc:获取流程列表
@@ -1300,6 +1538,13 @@ export default {
             this.splitReadingData = fyHistoryList;
             this.modify = modify;
             this.show = true;
+            if (this.contents.indexOf('circular') != -1) {
+              this.getCircularReadList();
+            } else {
+              this.$nextTick(() => {
+                this.getListCount(this.flowListCount);
+              });
+            }
           } else {
             this.$message.error(message || '系统错误，请联系管理员！');
           }

package/packages/icons/src/icon.json

@@ -1 +1 @@
-["zuomian","monitor","maximize","pointer-up","pointer-left","pointer-down","tri-down","retrograde","rainfall","caveat","print","alarm","table","duigouquan","bumen","mm","accelerate","quanping","password","qing","kaifa","daoru","piaochongicon","instructions","notice","wifi","tishicuo","minganciguanli","switch-off","switch-on","narrow","yidongduan","web","upload","message","go-back","close","shujutongji","folder","edit","enter","dian","wendu","shangwu","shenbao","magnifier","project-add","xiexian","caidan","tupian","yinyu","wenhao","template","daiban","set","zhengwen","cuowu","chenggong","indent","increase","ziliaoku","tuichu","quit","leaf","refresh","statistic","gengduo","lvyou","mail","user","zhishi","weizhi","jinggao","zuzhijigou","xue","fenxiang","jinrong","shanchu","jianhao","jiahao","yinzhang","renyuanqiehuan","gouxuanzhong1","circle","fuxuankuang1","fangkuang","application","wenjianjia","jiaren","xiugai","duanxinguanli","workbench","rizhi","gongwen","qingshi","shiwu","official","baogao","document","wodeyouxiang","ziliaojiaohuan","denglu","podium","fangkuai","xuewei","duoyun","pm","xiajia","huanbao","dunpai","shu","gongzuozheng","more","fenlei","delete","fengsu","bar","yuanqu","duomeiti","youjian","qiye","zuixinzixun","biaoge","omit","diaotou","jiantou-left","jiantou-right","jiantou-up","roles","jiantou-next","chijiuhuacunchu","zhuanhuan","cloudy","form","wuye","tri-up","pointer-right","bianji","tri-right","tri-left","daimaguanli","jiankong","kaifazhong","fujian","bingtu","zhuzhuangtu","lose","rmb","move","xiazai","yiban","laoshi","clear","jinyong","yunxing","weihu","chakan","pifu","ren","gouwuche","loading2","yulan","ziliao","yidong","fenxiang11","kaoqin","change","shidu","portfolio","info","yanjing","laba","camera","xitongxiaoxi","xitongguanli","webduan","wagnz","group","shengqian","jiantou-prev","attention","look","guanzhu","daikuan","tubiao","duigou","star","dayin","xinzeng","reduce","goup","calendar","tree","yingyong","caution","zhuanfa","add","zongtiqixian","daochu","gongwu","ihouse","chilun","weixiu","chengguo","trophy","duiwu","qiehuanjiaose","door","shebei","fangjian","microscope","huaxue","shiyanshianquan","shiyan","qiyexinxi","yewuxinxi","lab","shiyanguanli","yuqing","big-screen","signal-search","database","star-mark","cng","professor","informatization","code","science","price","xunhuan","savings","administration","aid","biao","line","xietong","jingzheng","enterprise","datatable","toubiao","bingdu","keji2","qiyeku5","touzi5","zijinliu","zhishichanquan3","kejifuwu2","zhishichanquan2","zijinanquan","kejifuwu1","geju","yiqingfangkong","kejifuwu","anquanfangkong","shujufuwu","shujuceng","shujugongxiang","flows","setup","shujulian","caiwujianguan","caiwuliushui","mubiaogeju","juxing","fuwuqi","touzijigou","xiezilou","jianzhu","logo","touzhi","zijin","fintech","touzixiangmu","library","touziguanli","zhongda","ziyuan","shujutai","shujudongtai","bank","shujuzhongxin","zhongyaomubiao","touzishijian","caiwuguanli","mingzhong","touzishenpi","jingzhenggeju","property","keji","qiyeku","zhongyaojihui","touzilicai","zhishichanquan","touzi","tzz","menu","xiangmushu","pdf","jiazai","gongsi","rise","jbxx","zwxx","jypx","jcgl","ndkh","grjl","shgx","gou","shijian","fukuan","guoji","shoukuan","down","gongzuotai","gaigedongtai","xitongshezhi","relation","zuzhirenshi","kaohepingjia","caiwujiandu","sanzhongyida","mima","xianshi","zhanghao","bangongshi","checked","checke","help","kuoda","banli","xiaoxi","shouqicaidan","shouqicaidan-right","smile","tongzhi","guanji","shuaxin","guiji","tianjiawenjianjia","yunxiazai","del","touzifangan","zongheguanli","sanzhongyida_mian","gongwenguanli1","heguiguanli","jingyingfenxi","txl","diannao","renliziyuan","caiwuxitong","shiwuguanli","shouye","bangongyongpin","sidebar","zhidulashi","log","fawenguanli","huiyiguanli","zuzhishishi","gongwenqianshou","jinxiupeixun","gongwenbao","jiaohuan","daibanshixiang","richeng","tongxunlu","yongche","yanzheng","daibanxinxi","shuben","fanfu","guangbo","shuzhuangtu","bengqiye","tongguo","dengdai","cross","daichuli","zhenggai","shouli","shujuhecha","guanli","paper-file","wenjian","dakaiwenjian","yewu","jiance","jiheguanli","jinru","arrow-right","lingdao","rencai","prev","next","jianpan","qrcode","bohui","homepage","download","gantanhao","dingding","weixin","pad","ios","android","txt","doc","audioo","video","zip","shuru","duanxin","saoma","youxiang","word","excel","fileword","picture","ppt","ca","usb-key","wenjianjiadakai","yingyonglan","home","tiyanxinban","shiyongjiuban","zhuomian","scan","youbian","zuobian","saomadenglu","zhanghaodenglu","zhengfangti","tingzhi","youxiangdenglu","duanxindenglu","liaotian","zhixiangyou","zhixiangshang","zhixiangxia","zhixiangzuo"]
+["zuomian","monitor","maximize","pointer-up","pointer-left","pointer-down","tri-down","retrograde","rainfall","caveat","print","alarm","table","duigouquan","bumen","mm","accelerate","quanping","password","qing","kaifa","daoru","piaochongicon","instructions","notice","wifi","tishicuo","minganciguanli","switch-off","switch-on","narrow","yidongduan","web","upload","message","go-back","close","shujutongji","folder","edit","enter","dian","wendu","shangwu","shenbao","magnifier","project-add","xiexian","caidan","tupian","yinyu","wenhao","template","daiban","set","zhengwen","cuowu","chenggong","indent","increase","ziliaoku","tuichu","quit","leaf","refresh","statistic","gengduo","lvyou","mail","user","zhishi","weizhi","jinggao","zuzhijigou","xue","fenxiang","jinrong","shanchu","jianhao","jiahao","yinzhang","renyuanqiehuan","gouxuanzhong1","circle","fuxuankuang1","fangkuang","application","wenjianjia","jiaren","xiugai","duanxinguanli","workbench","rizhi","gongwen","qingshi","shiwu","official","baogao","document","wodeyouxiang","ziliaojiaohuan","denglu","podium","fangkuai","xuewei","duoyun","pm","xiajia","huanbao","dunpai","shu","gongzuozheng","more","fenlei","delete","fengsu","bar","yuanqu","duomeiti","youjian","qiye","zuixinzixun","biaoge","omit","diaotou","jiantou-left","jiantou-right","jiantou-up","roles","jiantou-next","chijiuhuacunchu","zhuanhuan","cloudy","form","wuye","tri-up","pointer-right","bianji","tri-right","tri-left","daimaguanli","jiankong","kaifazhong","fujian","bingtu","zhuzhuangtu","lose","rmb","move","xiazai","yiban","laoshi","clear","jinyong","yunxing","weihu","chakan","pifu","ren","gouwuche","loading2","yulan","ziliao","yidong","fenxiang11","kaoqin","change","shidu","portfolio","info","yanjing","laba","camera","xitongxiaoxi","xitongguanli","webduan","wagnz","group","shengqian","jiantou-prev","attention","look","guanzhu","daikuan","tubiao","duigou","star","dayin","xinzeng","reduce","goup","calendar","tree","yingyong","caution","zhuanfa","add","zongtiqixian","daochu","gongwu","ihouse","chilun","weixiu","chengguo","trophy","duiwu","qiehuanjiaose","door","shebei","fangjian","microscope","huaxue","shiyanshianquan","shiyan","qiyexinxi","yewuxinxi","lab","shiyanguanli","yuqing","big-screen","signal-search","database","star-mark","cng","professor","informatization","code","science","price","xunhuan","savings","administration","aid","biao","line","xietong","jingzheng","enterprise","datatable","toubiao","bingdu","keji2","qiyeku5","touzi5","zijinliu","zhishichanquan3","kejifuwu2","zhishichanquan2","zijinanquan","kejifuwu1","geju","yiqingfangkong","kejifuwu","anquanfangkong","shujufuwu","shujuceng","shujugongxiang","flows","setup","shujulian","caiwujianguan","caiwuliushui","mubiaogeju","juxing","fuwuqi","touzijigou","xiezilou","jianzhu","logo","touzhi","zijin","fintech","touzixiangmu","library","touziguanli","zhongda","ziyuan","shujutai","shujudongtai","bank","shujuzhongxin","zhongyaomubiao","touzishijian","caiwuguanli","mingzhong","touzishenpi","jingzhenggeju","property","keji","qiyeku","zhongyaojihui","touzilicai","zhishichanquan","touzi","tzz","menu","xiangmushu","pdf","jiazai","gongsi","rise","jbxx","zwxx","jypx","jcgl","ndkh","grjl","shgx","gou","shijian","fukuan","guoji","shoukuan","down","gongzuotai","gaigedongtai","xitongshezhi","relation","zuzhirenshi","kaohepingjia","caiwujiandu","sanzhongyida","mima","xianshi","zhanghao","bangongshi","checked","checke","help","kuoda","banli","xiaoxi","shouqicaidan","shouqicaidan-right","smile","tongzhi","guanji","shuaxin","guiji","tianjiawenjianjia","yunxiazai","del","touzifangan","zongheguanli","sanzhongyida_mian","gongwenguanli1","heguiguanli","jingyingfenxi","txl","diannao","renliziyuan","caiwuxitong","shiwuguanli","shouye","bangongyongpin","sidebar","zhidulashi","log","fawenguanli","huiyiguanli","zuzhishishi","gongwenqianshou","jinxiupeixun","gongwenbao","jiaohuan","daibanshixiang","richeng","tongxunlu","yongche","yanzheng","daibanxinxi","shuben","fanfu","guangbo","shuzhuangtu","bengqiye","tongguo","dengdai","cross","daichuli","zhenggai","shouli","shujuhecha","guanli","paper-file","wenjian","dakaiwenjian","yewu","jiance","jiheguanli","jinru","arrow-right","lingdao","rencai","prev","next","jianpan","qrcode","bohui","homepage","download","gantanhao","dingding","weixin","pad","ios","android","txt","doc","audioo","video","zip","shuru","duanxin","saoma","youxiang","word","excel","fileword","picture","ppt","ca","usb-key","wenjianjiadakai","yingyonglan","home","tiyanxinban","shiyongjiuban","zhuomian","scan","youbian","zuobian","saomadenglu","zhanghaodenglu","zhengfangti","tingzhi","youxiangdenglu","duanxindenglu","liaotian","zhixiangyou","zhixiangshang","zhixiangxia","zhixiangzuo","HarmonyOs"]

package/packages/login/src/main.vue

@@ -1299,6 +1299,9 @@ export default {
       if (res.linuxDownloadUrl) {
         downloads['linux'] = res.linuxDownloadUrl;
       }
+      if (res.harmonyDownloadUrl) {
+        downloads['harmony'] = res.harmonyDownloadUrl;
+      }
       this.sysName = res.subsystemName;
       this.secret = res.secret;
       this.setup = res.setup;
@@ -1389,6 +1392,10 @@ export default {
         if (res.subsystemExtend.uosDownloadUrl) {
           downloads.uos = res.subsystemExtend.uosDownloadUrl;
         }
+
+        if (res.subsystemExtend.harmonyDownloadUrl) {
+          downloads.harmony = res.subsystemExtend.harmonyDownloadUrl;
+        }
         if (res.subsystemExtend.warningText) {
           this.warningText = res.subsystemExtend.warningText;
         }