eoss-mobiles 0.2.28 → 0.2.30

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

@@ -0,0 +1,225 @@
+<template>
+  <div class="em-flow-list">
+    <div v-if="isgw && processList.length > 0" class="list">
+      <div
+        v-for="(item, index) in processList"
+        :key="index"
+        class="item"
+        :class="{ 'success-icon': item.flowList.length > 0 }"
+      >
+        <!-- 预备("预备", -1),
+        未签收("未签收", 0),
+        已签收("未办理", 1),
+        已完成("已办理", 2),
+        驳回("驳回", 3),
+        撤回("撤回", 4),
+        串行会签预备("串行会签预备", 5),
+        自动办理("自动办理", 6); -->
+        <i class="iconfont icon-gou" v-if="item.flowList.length > 0" />
+        <div v-else class="process-pending">
+          <i class="process-pending-yuan" />
+        </div>
+        <div class="item-box">
+          <div class="one">
+            <div class="label">
+              {{ item.shortName }}
+            </div>
+          </div>
+          <div
+            v-for="x in item.showMore
+              ? item.flowList
+              : item.flowList.slice(0, 2)"
+            :key="x.id"
+          >
+            <div class="two">
+              <img
+                style="width:100px;height:100px"
+                v-if="x.doresult && x.doresult.startsWith('http')"
+                :src="x.doresult"
+                alt=""
+              />
+              <span v-else>{{ x.doresult }}</span>
+              <span v-if="x.handleInfo" style="color:#ADADA5">{{
+                (x.doresult ? '&' : '') + x.handleInfo
+              }}</span>
+            </div>
+            <div class="tree">
+              <div style="display:flex;align-items:center">
+                <span>{{ x.userName }}</span>
+                <span style="margin-left:10px">{{
+                  x.createtime | transformTimestamp
+                }}</span>
+              </div>
+              <em-tag
+                type="primary"
+                :color="
+                  x.pendstate != 2 && x.pendstate != 6 ? '#FEF6EB' : '#F2F8EC'
+                "
+                :text-color="
+                  x.pendstate != 2 && x.pendstate != 6 ? '#EB9A3D' : '#82B656'
+                "
+                size="medium"
+                >{{
+                  x.pendstate == 2 || x.pendstate == 6 ? '已办理' : '办理中'
+                }}</em-tag
+              >
+            </div>
+          </div>
+          <span
+            v-if="item.flowList.length > 2"
+            class="more"
+            style="display:inline-block;width: 100%;text-align: center;"
+            @click="changeMore(index)"
+            >{{ item.showMore ? '收起' : '展示更多' }}</span
+          >
+        </div>
+      </div>
+    </div>
+    <div v-else-if="processList.length > 0" class="list">
+      <div
+        v-for="(item, index) in processList"
+        :key="index"
+        class="item"
+        :class="{ 'success-icon': item.pendstate == 2 || item.pendstate == 6 }"
+      >
+        <!-- 预备("预备", -1),
+        未签收("未签收", 0),
+        已签收("未办理", 1),
+        已完成("已办理", 2),
+        驳回("驳回", 3),
+        撤回("撤回", 4),
+        串行会签预备("串行会签预备", 5),
+        自动办理("自动办理", 6); -->
+        <i
+          class="iconfont icon-gou"
+          v-if="item.pendstate == 2 || item.pendstate == 6"
+        />
+        <div v-else class="process-pending">
+          <i class="process-pending-yuan" />
+        </div>
+        <div class="item-box">
+          <div class="one">
+            <div class="label">
+              {{ item.itemname }}
+            </div>
+          </div>
+          <div class="two">
+            <img
+              style="width:100px;height:100px"
+              v-if="item.isImageOpinion == 1"
+              :src="item.doresult"
+              alt=""
+            />
+            <span v-else>{{ item.doresult }}</span>
+            <span v-if="item.handleInfo" style="color:#ADADA5">{{
+              (item.doresult ? '&' : '') + item.handleInfo
+            }}</span>
+          </div>
+          <div class="tree">
+            <div style="display:flex;align-items:center">
+              <span>{{ item.userid }}</span>
+              <span style="margin-left:10px">{{
+                item.createTime | transformTimestamp
+              }}</span>
+            </div>
+            <em-tag
+              type="primary"
+              :color="
+                item.pendstate != 2 && item.pendstate != 6
+                  ? '#FEF6EB'
+                  : '#F2F8EC'
+              "
+              :text-color="
+                item.pendstate != 2 && item.pendstate != 6
+                  ? '#EB9A3D'
+                  : '#82B656'
+              "
+              size="medium"
+              >{{
+                item.pendstate == 2 || item.pendstate == 6 ? '已办理' : '办理中'
+              }}</em-tag
+            >
+          </div>
+        </div>
+      </div>
+    </div>
+    <em-empty
+      v-else
+      class="custom-image"
+      image="https://img01.yzcdn.cn/vant/custom-empty-image.png"
+      description="暂无数据"
+    />
+  </div>
+</template>
+<script>
+import { pendedhistoryList } from '../../../src/config/api.js';
+import request from '../../../src/utils/http.js';
+import $ from '../../../src/utils/util';
+export default {
+  name: 'EmFlowList',
+  props: {
+    businessId: {
+      type: String,
+      default: ''
+    }, 
+    type: {
+      type: String,
+      default: '0'
+    },
+    data: {
+      type: Array,
+      default: () => []
+    },
+    isgw: {
+      type: Boolean,
+      default: false
+    }
+  },
+  filters: {
+    transformTimestamp(val) {
+      return $.formatDate(Number(val), 'yyyy-MM-dd');
+    }
+  },
+  data() {
+    return {
+      processList: []
+    };
+  },
+  watch: {
+    businessId: {
+      handler(val) {
+        if (val && this.data.length === 0) {
+          this.getFlowList(val);
+        } else {
+          this.processList = this.data;
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  methods: {},
+  methods: {
+    getFlowList(apprecordId) {
+      request({
+        url: pendedhistoryList,
+        type: 'post',
+        params: {
+          type: this.type,
+          apprecordId
+        }
+      }).then(res => {
+        const { rCode, msg, results } = res;
+        if (rCode === 0) {
+          this.processList = results;
+        } else {
+          this.$toast(msg);
+        }
+      });
+    },
+    changeMore(i) {
+      this.$emit('changeMore', i);
+    }
+  }
+};
+</script>

package/packages/radio/src/main.vue

@@ -9,8 +9,9 @@
       <van-radio
         v-for="item of newData"
         :key="item[valueKey]"
-        v-bind="item"
+        v-bind="exclAttribute({ data: item, attrs: 'checkedColor' })"
         :disabled="item.disabled"
+        :checked-color="checkedColor || item.checkedColor"
         :name="item[valueKey]"
       >
        <span v-html="item[labelKey]"></span> 
@@ -22,6 +23,7 @@
 <script>
 import { findSysCode } from '../../../src/config/api';
 import request from '../../../src/utils/http.js';
+import util from '../../../src/utils/util'
 export default {
   name: 'EmRadioGroup',
   inheritAttrs: false,
@@ -38,10 +40,7 @@ export default {
       default: () => []
     },
     //所有单选框的选中状态颜色
-    groupCheckedColor: {
-      type: String,
-      default: '#1989fa'
-    },
+    checkedColor:String,
     //所有单选框的图标大小，默认单位为px
     groupIconSize: {
       type: [String, Number],
@@ -125,6 +124,9 @@ export default {
     }
   },
   methods: {
+    exclAttribute({ data, attrs }) {
+      return util.exclAttribute({ data, attrs });
+    },
     /**
      * handleChange
      * @desc:当绑定值变化时触发的事件

package/packages/selector/src/selector-tree.vue

@@ -542,8 +542,8 @@ export default {
     }
   },
   mounted() {
-    typeof this.selectList != 'string' &&
-      (this.list = $.deepClone(this.selectList));
+    // typeof this.selectList != 'string' &&
+    //   (this.list = $.deepClone(this.selectList));
 
     // this.$nextTick(() => {
     //   if (this.nodeList) {
@@ -561,7 +561,16 @@ export default {
     getNodeList(isSearch) {
       this.personnel = this.nodeList;
 
-      !isSearch && (this.list = $.deepClone(this.selectList));
+      // !isSearch && (this.list = $.deepClone(this.selectList));
+      if (!isSearch) {
+        if (typeof this.selectList == 'string') {
+          this.selectData = [];
+          this.list = this.getSelectData(this.personnel);
+          this.$emit('update:selectList', this.list);
+        } else {
+          this.list = $.deepClone(this.selectList);
+        }
+      }
       let _this = this;
       if (this.list && this.list.length > 0) {
         this.list.filter(r => {
@@ -752,7 +761,8 @@ export default {
           if (
             res.results.length > 0 &&
             res.results[0].nocheck == false &&
-            this.isAllCheck && this.multiple
+            this.isAllCheck &&
+            this.multiple
           ) {
             res.results.unshift({
               showshortname: '全选',
@@ -771,7 +781,7 @@ export default {
               }
             });
           });
-          if (this.isAllCheck  && this.multiple) {
+          if (this.isAllCheck && this.multiple) {
             let checkList = obj.children
               .slice(1, obj.children.length)
               .filter(x => x.checked);
@@ -860,7 +870,7 @@ export default {
         }
       }
     },
-    open(res, isStart, isNode) {
+    open(res, isStart, isNode,key) {
       const _that = this;
       _that.oldIsSearch = _that.isSearch;
       // debugger
@@ -868,12 +878,15 @@ export default {
         this.$listeners['node-click'] &&
         (this.$listeners['left-icon'] || (this.showMore && !this.isDefaultNode))
       ) {
-        if (this.$listeners['left-icon'] && !isNode) {
+        if (this.$listeners['left-icon'] && key === 'node') {
           this.getChiled(res, isStart, 'left-icon');
-        } else if (this.showMore && !isNode) {
+        } else if (this.showMore && this.$listeners['right-icon'] && key === 'node') {
           this.getChiled(res, isStart, 'right-icon');
+        }else if((!this.isDefaultNode && key==="title") || (this.$listeners['node-click'] && this.$listeners['left-icon'] && !this.showMore && !this.isDefaultNode)){
+_that.$listeners['node-click'](res.obj, !!res.obj.children);
+        }else{
+          this.getChiled(res, isStart, 'node-click');
         }
-        isNode && _that.$listeners['node-click'](res.obj, !!res.obj.children);
       } else if (
         this.$listeners['node-click'] ||
         this.$listeners['left-icon'] ||
@@ -946,7 +959,7 @@ export default {
         }, []);
         if (model.length - 1 === checkList.length) {
           this.$set(model[0], 'checked', true);
-        } else{
+        } else {
           this.$set(model[0], 'checked', false);
         }
       }

package/packages/selector/src/tree.vue

@@ -22,13 +22,13 @@
             </div>
             <div
               v-if="isTreeIcon"
-              v-tap="{ methods: handleClickIcon, obj: item }"
+              v-tap.stop="{ methods: handleClickIcon, obj: item }"
             >
               <slot name="tree-icon" :value="item"></slot>
             </div>
            <span v-tap.stop="{ methods: opened, obj: item }">{{ item[labelKey] }}</span> 
           </div>
-          <van-icon name="arrow"  v-tap="{ methods: handleClickIcon, obj: item }" class="right" v-if="showMore" />
+          <van-icon name="arrow"  v-tap.stop="{ methods: handleClickIcon, obj: item }" class="right" v-if="showMore" />
           <i
             class="iconfont icon-gou select-icon"
             v-show="
@@ -245,13 +245,11 @@ export default {
   },
   methods: {
     handleClickIcon(res, isStart){
-      console.log('点击了open2')
       if(!this.$listeners['left-icon'] && !this.showMore) return
-       this.$emit('popen', res, res.isStart || isStart);
+       this.$emit('popen', res, res.isStart || isStart,true,'node');
     },
     opened(res, isStart) {
-      console.log('点击了open')
-      this.$emit('popen', res, res.isStart || isStart,true);
+      this.$emit('popen', res, res.isStart || isStart,true,'title');
     },
     checke(res) {
       let model = undefined

package/packages/theme-chalk/lib/flow-btn.css

@@ -0,0 +1 @@
+@charset "UTF-8";.em-flow-btn .btn-list{position:fixed;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;background-color:#fff;padding:10px 10px 34px;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;bottom:-1px;left:0;z-index:998;-webkit-box-shadow:0 -7px 7px -7px #ddd;box-shadow:0 -7px 7px -7px #ddd}.em-flow-btn .btn-list .left{display:-webkit-box;display:-ms-flexbox;display:flex}.em-flow-btn .btn-list .left .item{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;margin-right:35px}.em-flow-btn .btn-list .left .item:last-child{margin-right:0}.em-flow-btn .btn-list .left .item .icon{width:18px;height:auto}.em-flow-btn .btn-list .left .item .label{color:#666;font-weight:400;font-size:14px;margin-top:4px}.em-flow-btn .btn-list .right-one .audit{width:160px;height:40px;line-height:40px;background-color:#12278B;color:#fff;border-radius:20px;text-align:center;font-size:18px}.em-flow-btn .btn-list .right-two{display:-webkit-box;display:-ms-flexbox;display:flex}.em-flow-btn .btn-list .right-two .reject{width:80px;height:40px;line-height:40px;background-color:#fff;color:#12278B;text-align:center;border:1px solid #12278B;font-size:18px;border-radius:20px 0 0 20px}.em-flow-btn .btn-list .right-two .audit{width:80px;height:40px;line-height:40px;background-color:#12278B;color:#fff;border:1px solid #12278B;border-radius:0 20px 20px 0;text-align:center;font-size:18px}.em-flow-btn .btn-list-1{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.em-flow-btn .more-list{position:fixed;background-color:#fff;width:100%;bottom:83px;color:#999;padding:10px}.em-flow-btn .more-list .item{padding:10px;border-bottom:1px solid #999}

package/packages/theme-chalk/lib/flow-list.css

@@ -0,0 +1 @@
+@charset "UTF-8";.em-flow-list{width:100%;background-color:#fff}.em-flow-list .list{padding:32px 16px 0}.em-flow-list .list .item{position:relative;border-left:1px solid #eee;padding:10px 0;margin:10px 0}.em-flow-list .list .item .icon-gou{position:absolute;top:-15px;left:-8px;color:#12278B}.em-flow-list .list .item .process-pending{position:absolute;top:-15px;left:-8.5px;width:16px;height:16px;border-radius:50%;background:rgba(18,39,139,.1);display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.em-flow-list .list .item .process-pending .process-pending-yuan{display:inline-block;width:6px;height:6px;border-radius:50%;background:#12278B}.em-flow-list .list .item:last-child{border-left-color:transparent;height:auto}.em-flow-list .list .item .icon-finish{width:16px;height:auto;position:relative;left:-8px}.em-flow-list .list .item .icon-ing{width:34px;height:auto;position:relative;left:-14px}.em-flow-list .list .item .item-box{padding-left:29px;width:100%}.em-flow-list .list .item .item-box .one{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:absolute;top:-18px}.em-flow-list .list .item .item-box .one .label{font-size:14px;font-family:PingFang SC;font-weight:400;color:#666}.em-flow-list .list .item .item-box .one .time{font-size:12px;font-family:PingFang SC;font-weight:400;color:#999}.em-flow-list .list .item .item-box .two{font-size:16px;font-family:PingFang SC;font-weight:400;color:#333;padding-bottom:10px;border-bottom:1px solid #eee}.em-flow-list .list .item .item-box .tree{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;font-size:12px;font-family:PingFang SC;color:#999;line-height:16px;margin-bottom:16px;margin-top:10px}.em-flow-list .list .item .time{text-align:right;color:#333;font-size:13px;padding-top:10px;height:16px;line-height:15px}.em-flow-list .list .success-icon{border-left-color:#12278B}.em-flow-list .more{color:#12278B}.em-flow-list .custom-image .van-empty__image{width:90px;height:90px}