eoss-mobiles 0.3.10 → 0.3.12

package/packages/flow/src/components/taskUnionExamine.vue

@@ -19,7 +19,9 @@
             :isAllCheck="isAllCheck"
             :tabs="
               type == 'takeAdvice'
-                ? 'department,employee'
+                ? currentOrgTabs.length > 0
+                  ? currentOrgTabs
+                  : 'department,employee'
                 : type == 'startDraf'
                 ? 'enterprise,employee'
                 : 'enterprise'
@@ -27,6 +29,7 @@
             :param="params"
             :baseUrl="apiBaseUrl"
             :paddingTop="paddingTop"
+            :mix="currentMix"
             :disabled="disabled"
             @change="
               changeSelectUser(
@@ -57,8 +60,11 @@
             v-model="nextOtherOrgObj"
             :multiple="newMultiple"
             :isAllCheck="isAllCheck"
+            :mix="otherMix"
             :tabs="
-              isChoiceOtherOrgDept == 'true'
+              foreignOrgTabs.length > 0
+                ? foreignOrgTabs
+                : isChoiceOtherOrgDept == 'true'
                 ? 'enterprise,department'
                 : 'enterprise'
             "
@@ -70,6 +76,7 @@
           />
         </div>
         <Message
+        v-if="showMessage"
           ref="message"
           :code="'notification_type'"
           :baseUrl="baseUrl"
@@ -89,6 +96,7 @@
 </template>
 <script>
 import {
+  findUserBaseInfo,
   isCanStartSubFlow,
   toTaskUnionExamine,
   toTaskTakeAdvice,
@@ -137,13 +145,18 @@ export default {
     return {
       opinion: '', //办理意见
       isImageOpinion: 0,
-      readOnlyNotificationType:'',
-      notificationMessageReadOnly:false,
+      readOnlyNotificationType: '',
+      otherMix: false,
+      currentMix: false,
+      notificationMessageReadOnly: false,
+      currentOrgTabs: [],
+      foreignOrgTabs: [],
+      showMessage:false,
       file: '',
       infoList: {
         nextOtherOrgObj: [],
         nextCurrentOrgObj: [],
-        noticeType: [],
+        noticeType: '',
         noticeInfo: '',
         opinion: ''
       },
@@ -169,6 +182,7 @@ export default {
   },
   components: { Opinion, Message },
   created() {
+    this.getuserInfo();
     this.style = {
       'padding-top': sessionStorage.getItem('pt')
         ? sessionStorage.getItem('pt') + 'px'
@@ -202,6 +216,11 @@ export default {
     }
   },
   methods: {
+    getuserInfo() {
+      request({ url: findUserBaseInfo }).then((res) => {
+        localStorage.setItem('userInfo', JSON.stringify(res.results));
+      });
+    },
     onInputOpintion(val) {
       const { opinion, isImageOpinion, file } = val;
       this.opinion = opinion;
@@ -219,7 +238,7 @@ export default {
         type: 'post',
         headers: { Accept: 'application/json,text/plain' }
       };
-      request(params).then(res => {
+      request(params).then((res) => {
         if (res.message === 'success') {
           this.getInfo();
         } else {
@@ -237,12 +256,13 @@ export default {
         userId: this.userId
       };
       request({ url: getNotificationMsg, params, methods: 'post' })
-        .then(res => {
+        .then((res) => {
+          this.$toast.clear();http://localhost:8080/#/Selector
           if (res.status === 'success') {
             this.infoList.noticeInfo = res.message;
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$toast(err.message);
           }
@@ -252,7 +272,7 @@ export default {
       request({
         url: findSysCodes
       })
-        .then(res => {
+        .then((res) => {
           const { status, message } = res;
           this.$toast.clear();
           if (status === 'success') {
@@ -260,8 +280,9 @@ export default {
           } else {
             this.$toast(message || '系统错误，请联系管理员！');
           }
+          this.showMessage = true
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
           if (err.message && err.message !== 'canceled') {
             this.$toast(err.message);
@@ -270,15 +291,24 @@ export default {
     },
     changeSelectUser(val, type) {
       const { list } = val;
-      let newNextUser = '';
-      list.map(item => {
-        if (newNextUser) {
-          newNextUser += `,${item.selecttype}-${item.showid}`;
-        } else {
-          newNextUser = `${item.selecttype}-${item.showid}`;
+      let newNextUser = [];
+      let obj = {}
+      list.map((item) => {
+        if(obj[item.mixType]){
+          obj[item.mixType].push(item.showid)
+        }else{
+          obj[item.mixType] = [item.showid]
         }
+        // if (newNextUser) {
+        //   newNextUser += `,${item.selecttype}-${item.showid}`;
+        // } else {
+        //   newNextUser = `${item.selecttype}-${item.showid}`;
+        // }
       });
-      this.infoList[type] = newNextUser;
+      for(let key in obj){
+        newNextUser.push(`${key}-${obj[key].join(',')}`)
+      }
+      this.infoList[type] = newNextUser.join('|');
       this[type] = list;
     },
     isMultiple(val) {
@@ -295,7 +325,7 @@ export default {
         params: { pendingId: this.pendingId }
       };
       request(params)
-        .then(res => {
+        .then((res) => {
           const { status, message } = res;
           this.loading = false;
           if (status === 'success') {
@@ -313,7 +343,7 @@ export default {
             this.$$toast.error(message || '系统错误，请联系管理员！');
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
           if (err.message && err.message !== 'canceled') {
             this.$toast(err.message);
@@ -343,7 +373,7 @@ export default {
         duration: 0
       });
       request(params)
-        .then(res => {
+        .then((res) => {
           const { message, status } = res;
           this.loading = false;
           if (status == 'success') {
@@ -367,7 +397,9 @@ export default {
                 }
               }
             } = res;
-            this.notificationMessageReadOnly = notificationMessageReadOnly == 'true';
+
+            this.notificationMessageReadOnly =
+              notificationMessageReadOnly == 'true';
             this.readOnlyNotificationType = readOnlyNotificationType;
             this.isSinglePage = taskExamine.isSinglePage;
             this.isSubFlow = taskExamine.isSubFlow;
@@ -391,6 +423,54 @@ export default {
               this.infoList.nextOtherOrgObj.push(taskExamine.nextOtherOrgObj);
             }
             this.isMultiple(userSelectionType);
+            if (res.data.customizedConfig) {
+              if (res.data.customizedConfig.currentOrgSelectorCustomized) {
+                this.currentMix =
+                  res.data.customizedConfig.currentOrgSelectorSelectMix ==
+                  'true';
+                this.currentOrgTabs =
+                  res.data.customizedConfig.currentOrgSelectorItemList;
+                let param =
+                  res.data.customizedConfig.currentOrgSelectorRangeList.split(
+                    ','
+                  );
+                res.data.customizedConfig.currentOrgSelectorItemList
+                  .split(',')
+                  .map((x, i) => {
+                    this.params[x] = {
+                      pid:
+                        param[i] == 'my'
+                          ? (this.params.pid = JSON.parse(
+                             $.getStorage('userInfo')
+                            ).orgId)
+                          : param[i]
+                    };
+                  });
+              } else {
+                if (this.type == 'takeAdvice') {
+                  this.params.pid = JSON.parse(
+                    $.getStorage('userInfo')
+                  ).orgId;
+                }
+              }
+              if (res.data.customizedConfig.foreignOrgSelectorCustomized) {
+                this.otherMix =
+                  res.data.customizedConfig.foreignOrgSelectorSelectMix ==
+                  'true';
+                this.foreignOrgTabs =
+                  res.data.customizedConfig.foreignOrgSelectorItemList;
+                let param =
+                  res.data.customizedConfig.foreignOrgSelectorRangeList.split(
+                    ','
+                  );
+                // res.data.customizedConfig.foreignOrgSelectorItemList
+                //   .split(',')
+                //   .map((x, i) => {
+                //     this.otherParams[x] = { pid: param[i] };
+                    
+                //   });
+                }
+            }
             this.getFind();
             this.getMessage();
           } else {
@@ -400,7 +480,7 @@ export default {
             this.$toast.error(message || '系统错误，请联系管理员！');
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
           if (err.message && err.message !== 'canceled') {
             this.$toast(err.message);
@@ -409,7 +489,8 @@ export default {
     },
     // 通知消息回调
     onInputMsg(obj) {
-      this.infoList.noticeType = obj.notificationType;
+      console.log(obj)
+      this.infoList.noticeType = JSON.parse(JSON.stringify(obj.notificationType));
       this.infoList.noticeInfo = obj.notificationMsg;
     },
     goBack() {
@@ -453,8 +534,8 @@ export default {
         (type == 'takeAdvice' &&
           isHideCurrentOrg == 0 &&
           (!nextCurrentOrgObj || nextCurrentOrgObj.length == 0) &&
-          (isHideOtherOrg == 0 &&
-            (!nextOtherOrgObj || nextOtherOrgObj.length == 0))) ||
+          isHideOtherOrg == 0 &&
+          (!nextOtherOrgObj || nextOtherOrgObj.length == 0)) ||
         (type != 'takeAdvice' &&
           isHideOtherOrg == 0 &&
           (!nextOtherOrgObj || nextOtherOrgObj.length == 0))
@@ -520,7 +601,7 @@ export default {
         duration: 0
       });
       request(param)
-        .then(res => {
+        .then((res) => {
           const { message, status } = res;
           this.$toast.clear();
           if (status == 'success') {
@@ -530,7 +611,7 @@ export default {
             this.$toast(message || '系统错误，请联系管理员！');
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.$toast.clear();
           if (err.message && err.message !== 'canceled') {
             this.$toast(err.message);
@@ -559,7 +640,7 @@ export default {
         params: {
           pendingId: this.pendingId
         }
-      }).then(res => {
+      }).then((res) => {
         //  const {
         //     status,
         //     message,

package/packages/flow/src/main.vue

@@ -7,8 +7,9 @@
       :beforeSubmit="beforeSubmit"
     />
     <Handle
-      v-else-if="type === 'handle'"
+      v-else-if="type === 'handle' || type === 'freeStart'"
       v-bind="$attrs"
+      :type="type"
       :userId="userId"
       :identityIds="userId"
       :beforeSubmit="beforeSubmit"

package/packages/form/src/main.vue

@@ -25,15 +25,15 @@
           v-if="item.type === 'tab'"
         >
           <em-tab v-bind="{ ...z }" v-for="(z, i) in item.contents" :key="i">
-            <div v-for="(x, j) in z.contents" :key="j">
+            <div style="height: 100%" v-for="(x, j) in z.contents" :key="j">
               <em-input
                 v-if="
                   x.type === 'text' ||
-                    x.type === 'textarea' ||
-                    x.type == 'number' ||
-                    x.type == 'digit' ||
-                    x.type == 'password' ||
-                    x.type == 'tel'
+                  x.type === 'textarea' ||
+                  x.type == 'number' ||
+                  x.type == 'digit' ||
+                  x.type == 'password' ||
+                  x.type == 'tel'
                 "
                 class="em-table-input"
                 v-bind="{ ...$attrs, ...x }"
@@ -77,7 +77,7 @@
                 v-model="model[x.name]"
                 :columns="x.data || []"
                 @confirm="
-                  value => {
+                  (value) => {
                     handleChange(item.name, value);
                   }
                 "
@@ -85,14 +85,14 @@
               <em-date
                 v-else-if="
                   x.date ||
-                    x.type == 'date' ||
-                    x.type == 'year' ||
-                    x.type == 'year-month' ||
-                    x.type == 'month-day' ||
-                    x.type == 'time' ||
-                    x.type == 'datetimeSecond' ||
-                    x.type == 'datetime' ||
-                    x.type == 'datehour'
+                  x.type == 'date' ||
+                  x.type == 'year' ||
+                  x.type == 'year-month' ||
+                  x.type == 'month-day' ||
+                  x.type == 'time' ||
+                  x.type == 'datetimeSecond' ||
+                  x.type == 'datetime' ||
+                  x.type == 'datehour'
                 "
                 ref="date"
                 v-bind="{ ...$attrs, ...x }"
@@ -122,7 +122,7 @@
                     :disabled="x.disabled || disabled || x.readonly || readonly"
                     :data="x.data"
                     @change="
-                      value => {
+                      (value) => {
                         handleChange(x.name, value);
                       }
                     "
@@ -142,7 +142,7 @@
                     v-model="model[x.name]"
                     :disabled="x.disabled || disabled || x.readonly || readonly"
                     @change="
-                      value => {
+                      (value) => {
                         handleChange(x.name, value);
                       }
                     "
@@ -162,7 +162,7 @@
                     v-on="{ ...x.events }"
                     :disabled="x.disabled || disabled || x.readonly || readonly"
                     @change="
-                      value => {
+                      (value) => {
                         handleChange(x.name, value);
                       }
                     "
@@ -179,7 +179,7 @@
                 :label-position="x.labelPosition || labelPosition"
                 :disabled="x.disabled || disabled || x.readonly || readonly"
                 @change="
-                  value => {
+                  (value) => {
                     handleChange(x.name, value);
                   }
                 "
@@ -205,11 +205,11 @@
         <em-input
           v-if="
             item.type === 'text' ||
-              item.type === 'textarea' ||
-              item.type == 'number' ||
-              item.type == 'digit' ||
-              item.type == 'password' ||
-              item.type == 'tel'
+            item.type === 'textarea' ||
+            item.type == 'number' ||
+            item.type == 'digit' ||
+            item.type == 'password' ||
+            item.type == 'tel'
           "
           class="em-table-input"
           v-bind="{ ...$attrs, ...item }"
@@ -253,7 +253,7 @@
           v-model="model[item.name]"
           :columns="item.data || []"
           @confirm="
-            value => {
+            (value) => {
               handleChange(item.name, value);
             }
           "
@@ -261,14 +261,14 @@
         <em-date
           v-else-if="
             item.date ||
-              item.type == 'date' ||
-              item.type == 'year' ||
-              item.type == 'year-month' ||
-              item.type == 'month-day' ||
-              item.type == 'time' ||
-              item.type == 'datetimeSecond' ||
-              item.type == 'datetime' ||
-              item.type == 'datehour'
+            item.type == 'date' ||
+            item.type == 'year' ||
+            item.type == 'year-month' ||
+            item.type == 'month-day' ||
+            item.type == 'time' ||
+            item.type == 'datetimeSecond' ||
+            item.type == 'datetime' ||
+            item.type == 'datehour'
           "
           ref="date"
           v-bind="{ ...$attrs, ...item }"
@@ -298,7 +298,7 @@
               :disabled="item.disabled || disabled || item.readonly || readonly"
               :data="item.data"
               @change="
-                value => {
+                (value) => {
                   handleChange(item.name, value);
                 }
               "
@@ -318,7 +318,7 @@
               v-model="model[item.name]"
               :disabled="item.disabled || disabled || item.readonly || readonly"
               @change="
-                value => {
+                (value) => {
                   handleChange(item.name, value);
                 }
               "
@@ -338,7 +338,7 @@
               v-on="{ ...item.events }"
               :disabled="item.disabled || disabled || item.readonly || readonly"
               @change="
-                value => {
+                (value) => {
                   handleChange(item.name, value);
                 }
               "
@@ -355,7 +355,7 @@
           :label-position="item.labelPosition || labelPosition"
           :disabled="item.disabled || disabled || item.readonly || readonly"
           @change="
-            value => {
+            (value) => {
               handleChange(item.name, value);
             }
           "
@@ -371,10 +371,10 @@
           isForm
           :form="
             !item.disabled &&
-              !disabled &&
-              !item.readonly &&
-              !readonly &&
-              item.form
+            !disabled &&
+            !item.readonly &&
+            !readonly &&
+            item.form
           "
           v-on="{ ...item.events }"
           @btn-click="handleBtnClick"
@@ -447,16 +447,16 @@ export default {
   },
   computed: {
     btnList() {
-      return this.contents.filter(x => x.type === 'submit');
+      return this.contents.filter((x) => x.type === 'submit');
     },
     newContent: {
       get() {
-        let tableList = this.contents.filter(x => x.type == 'table');
+        let tableList = this.contents.filter((x) => x.type == 'table');
         if (tableList.length > 0) {
-          tableList.map(x => {
-            x.tHead.map(z => {
+          tableList.map((x) => {
+            x.tHead.map((z) => {
               if (z.type == 'handle' && z.events) {
-                z.events.map(y => {
+                z.events.map((y) => {
                   y['native-type'] = 'button';
                 });
               }
@@ -475,7 +475,7 @@ export default {
   },
   methods: {
     handleFailed(values) {
-      this.$refs.emFormTable.map(item => {
+      this.$refs.emFormTable.map((item) => {
         item.validate();
       });
       this.$emit('failed', { errors: values.errors, values: this.model });
@@ -483,7 +483,7 @@ export default {
     handleSubmit() {
       let errForm = false;
       if (this.$refs.emFormTable) {
-        this.$refs.emFormTable.map(item => {
+        this.$refs.emFormTable.map((item) => {
           if (!item.validate()) {
             errForm = true;
           }

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

@@ -45,6 +45,7 @@
         :departmentValueKey="departmentValueKey"
         :namelike="namelike"
         :nodeKey="nodeKey"
+        :disableds="disableds"
         :showCount="showCount"
         :countKey="countKey"
         :selectType="newParam.selecttype"
@@ -152,6 +153,10 @@ export default {
       type: String,
       default: '人'
     },
+    disableds:{
+      type:Array,
+      default: () => []
+    },
     showSearch: {
       type: Boolean,
       default: true
@@ -588,9 +593,15 @@ export default {
         }
       }
       let newtabs = [];
+      console.log(copyTabs,this.param,'copyTabs')
       copyTabs.map(x => {
+        if(this.param[x]){
+          obj[x].param ={...obj[x].param,...this.param[x]};
+          console.log(this.param[x],'this.param[x]')
+        }
         newtabs.push(obj[x]);
       });
+      console.log(newtabs,'newtabs')
       return newtabs;
     }
   },
@@ -728,7 +739,7 @@ export default {
         overlay: true,
         duration: 0
       });
-      this.newParam = JSON.parse(JSON.stringify(this.param));
+      this.newParam = {...JSON.parse(JSON.stringify(this.param))};
       this.newParam.selecttype = this.newTabs[
         this.selectIndex
       ].param.selecttype;
@@ -737,7 +748,7 @@ export default {
         this.newParam.myUserid =
           this.newParam.myUserid || $.getStorage('userId');
       } else {
-        this.newParam.pid = this.param.pid || 'root';
+        this.newParam.pid =this.newTabs[this.selectIndex].param.pid || this.param.pid || 'root';
       }
       request({
         url: this.url
@@ -988,6 +999,9 @@ export default {
     },
     checked(res, model) {
       this.oldIsSearch = this.isSearch;
+      if(!res.obj.mixType){
+        this.$set(res.obj, 'mixType', this.newTabs[this.selectIndex].name);
+      }
       if (res.obj.checked) {
         if (res.obj.isAllCheck) {
           model.map(x => {

package/packages/selector/src/tree.vue

@@ -68,7 +68,7 @@
               v-if="showMore"
             />
             <i
-              class="iconfont icon-gou select-icon"
+              :class="`iconfont icon-gou select-icon ${isDisabled(item) ? 'disabled' : '' }`"
               v-show="
                 (enterprise ||
                   (department &&
@@ -79,7 +79,7 @@
               v-if="item.checked"
             ></i>
             <i
-              class="iconfont icon-quan select-icon"
+              :class="`iconfont icon-quan select-icon ${isDisabled(item) ? 'disabled' : '' }`"
               v-show="
                 (enterprise ||
                   (department &&
@@ -114,6 +114,7 @@
             :nameSize="nameSize"
             :selectType="selectType"
             :unit="unit"
+            :disableds="disableds"
             :showMore="showMore"
             :enterprise="enterprise"
             :selectLabel="selectLabel"
@@ -202,12 +203,12 @@
             "
           >
             <i
-              class="iconfont icon-gou"
+              :class="`iconfont icon-gou ${isDisabled(item) ? 'disabled' : '' }`"
               v-tap="{ methods: checke, obj: item }"
               v-if="item.checked"
             ></i>
             <i
-              class="iconfont icon-quan"
+              :class="`iconfont icon-quan ${isDisabled(item) ? 'disabled' : '' }`"
               v-tap="{ methods: checke, obj: item }"
               v-else
             ></i>
@@ -325,6 +326,10 @@ export default {
       type:Boolean,
       default:false
     },
+    disableds: {
+      type: Array,
+      default: () => []
+    },
     oldIsSearch: Boolean,
     isSearch: Boolean
   },
@@ -354,6 +359,12 @@ export default {
     });
   },
   methods: {
+    isDisabled(item) {
+      if(this.disableds && this.disableds.length>0){
+        return this.disableds.includes(item[this.valueKey]);
+      }
+      return item.disabled
+    },
     getUserInfo(attr) {
       let info = JSON.parse(attr);
       return `${info.username}-${info.orgName}-${info.depShortName}`;
@@ -370,6 +381,7 @@ export default {
       this.$emit('popen', res, res.isStart || isStart, true, 'title');
     },
     checke(res) {
+      if (this.isDisabled(res.obj)) return;
       let model = undefined;
       if (this.isAllCheck) model = this.model;
       this.$emit('checke', res, model);