eoss-ui 0.6.38 → 0.6.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.6.38",
+  "version": "0.6.40",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -132,6 +132,7 @@
     "markdown-it-container": "^2.0.0",
     "mini-css-extract-plugin": "^0.4.1",
     "mocha": "^6.0.2",
+    "node-sass": "^4.11.0",
     "optimize-css-assets-webpack-plugin": "^5.0.1",
     "postcss": "^7.0.14",
     "progress-bar-webpack-plugin": "^1.11.0",

package/packages/data-table/src/column.vue

@@ -434,6 +434,7 @@
         :row="scope.row"
         :render="render"
         :index="indexs"
+        :options="optionDatas"
       >
       </expand-dom>
       <template v-else-if="dateFormat">
@@ -481,7 +482,8 @@ export default {
         column: {
           type: Object,
           default: null
-        }
+        },
+        options: Object
       },
       render: (h, ctx) => {
         const params = {
@@ -493,12 +495,16 @@ export default {
         }
         if (typeof ctx.props.render == 'string') {
           try {
-            return util.toFunction(ctx.props.render)(h, params);
+            return util.toFunction(ctx.props.render)(
+              h,
+              params,
+              ctx.props.options
+            );
           } catch (error) {
             throw error;
           }
         }
-        return ctx.props.render(h, params);
+        return ctx.props.render(h, params, ctx.props.options);
       }
     }
   },

package/packages/data-table/src/main.vue

@@ -165,7 +165,7 @@
         <span>已加载{{ list.length }}条</span>
       </div>
       <es-pagination
-        v-else-if="page"
+        v-else-if="page !== false && showPage !== false"
         ref="pagination"
         v-bind="config"
         class="es-table-page"
@@ -388,6 +388,10 @@ export default {
         return false;
       }
     },
+    showPage: {
+      type: Boolean,
+      default: true
+    },
     // 渲染树形数据指定field
     treeKey: {
       type: String,

package/packages/data-table-form/src/table.vue

@@ -53,7 +53,7 @@
           v-bind="exclAttribute({ data: item, attrs: 'width' })"
           v-model="selectValue"
           ref="tableSelect"
-          :style="style"
+          :style="styles"
           :data="options[item.field || item.prop]"
           @hide-menu="selectShow = false"
           @change="
@@ -83,7 +83,7 @@
           v-bind="exclAttribute({ data: item, attrs: 'width' })"
           v-model="dateValue"
           ref="tableDate"
-          :style="style"
+          :style="styles"
           @hidePicker="dateShow = false"
           @change="
             (value) => {
@@ -148,7 +148,7 @@ export default {
       selectShow: false,
       target: null,
       field: null,
-      style: {},
+      styles: {},
       dateValue: '',
       dateShow: false,
       selectorShow: false,
@@ -199,9 +199,9 @@ export default {
         left = style.left;
         top = style.top;
       }
-      this.style.left = res ? res.left - left + 'px' : '';
-      this.style.top = res ? res.top - top + 'px' : '';
-      this.style.width = res ? res.width + 'px' : '';
+      this.styles.left = res ? res.left - left + 'px' : '';
+      this.styles.top = res ? res.top - top + 'px' : '';
+      this.styles.width = res ? res.width + 'px' : '';
       this.target = data;
       this.field = field;
     },

package/packages/error-page/src/main.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="es-error-page">
-    <div class="es-error-page-image" :style="style"></div>
+    <div class="es-error-page-image" :style="styles"></div>
   </div>
 </template>
 <script>
@@ -8,7 +8,7 @@ export default {
   name: 'EsErrorPage',
   inheritAttrs: false,
   computed: {
-    style() {
+    styles() {
       let url = this.image[this.type];
 
       return url

package/packages/flow/src/component/CommonOpinions.vue

@@ -14,7 +14,7 @@
           clear="inp"
           placeholder="请输入意见"
           @change="changeOpinion"
-          :rows="10"
+          :rows="rows"
         ></el-input>
       </el-form-item>
     </el-form>
@@ -141,6 +141,10 @@ export default {
     nodeFixedOpinionSelectList: {
       type: Array,
       default: () => []
+    },
+    rows: {
+      type: Number,
+      default: 10
     }
   },
   mounted() {

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

@@ -33,6 +33,7 @@
               : infoList.nextCurrentOrgObj
           "
           :multiple="newMultiple"
+          :mix="currentMix"
           @change="
             changeSelectUser(
               $event,
@@ -41,12 +42,15 @@
           "
           :types="
             type == 'takeAdvice'
-              ? ['department', 'employee']
+              ? currentOrgTabs.length > 0
+                ? currentOrgTabs
+                : ['department', 'employee']
               : type == 'startDraf'
               ? ['enterprise', 'employee']
               : ['enterprise']
           "
           :params="params"
+          :tabs="currentOrgTabsParam"
           :disabled="disabled"
           :onlyName="onlyName"
         />
@@ -60,12 +64,16 @@
           :nextUser="infoList.nextOtherOrgObj"
           :multiple="newMultiple"
           @change="changeSelectUser($event, 'nextOtherOrgObj')"
+          :mix="otherMix"
           :types="
-            isChoiceOtherOrgDept == 'true'
+            foreignOrgTabs.length > 0
+              ? foreignOrgTabs
+              : isChoiceOtherOrgDept == 'true'
               ? ['enterprise', 'department']
               : ['enterprise']
           "
           :params="otherParams"
+          :tabs="foreignOrgTabsParam"
         />
       </el-form-item>
       <el-form-item
@@ -83,9 +91,11 @@
             v-for="item of infoList.noticeList"
             :key="item.cciValue"
             :label="item.cciValue"
-            :disabled="readOnlyNotificationType
-                  ? readOnlyNotificationType.indexOf(item.cciValue) != -1
-                  : false"
+            :disabled="
+              readOnlyNotificationType
+                ? readOnlyNotificationType.indexOf(item.cciValue) != -1
+                : false
+            "
           >
             {{ item.shortName }}
           </el-checkbox>
@@ -109,15 +119,14 @@
         />
         <!-- <span>{{ infoList.noticeInfo }}</span> -->
       </el-form-item>
-      <el-form-item>
-        <div style="text-align: right">
+      
+    </el-form>
+    <div style="text-align: right">
           <el-button type="primary" size="small" @click="subMit">
             确定
           </el-button>
           <el-button @click="quit" size="small"> 取消 </el-button>
         </div>
-      </el-form-item>
-    </el-form>
   </div>
 </template>
 
@@ -161,6 +170,8 @@ export default {
       opinion: '', //办理意见
       readOnlyNotificationType: '',
       notificationMessageReadOnly: false,
+      otherMix:false,
+      currentMix:false,
       infoList: {
         nextOtherOrgObj: [],
         nextCurrentOrgObj: [],
@@ -169,6 +180,10 @@ export default {
         opinion: ''
       },
       onlyName: '',
+      currentOrgTabs: [],
+      foreignOrgTabs: [],
+      foreignOrgTabsParam: {},
+      currentOrgTabsParam: {},
       currentOrgProcessKey: '',
       isSubFlow: true,
       choiceDeptId: '',
@@ -182,7 +197,7 @@ export default {
       isHideOtherOrg: '',
       isHideCurrentOrg: 0,
       isOpinionRequired: 0,
-      otherParams: { filid: 'all' },
+      otherParams: { filid: 'other' },
       loading: false
     };
   },
@@ -198,11 +213,6 @@ export default {
       if (val == 7 || val == 9 || val == 11) {
         this.newMultiple = false;
       }
-      if (this.type == 'takeAdvice') {
-        this.params.filid = JSON.parse(
-          sessionStorage.getItem('mainConfig')
-        ).userModel.orgId;
-      }
     },
     subTaskReview() {
       let {
@@ -320,6 +330,44 @@ export default {
                 }
               }
             } = res;
+            if (res.data.customizedConfig) {
+              if (res.data.customizedConfig.currentOrgSelectorCustomized) {
+                this.currentMix = res.data.customizedConfig.currentOrgSelectorSelectMix == 'true';
+                this.currentOrgTabs =
+                  res.data.customizedConfig.currentOrgSelectorItemList.split(
+                    ','
+                  );
+                let param =
+                  res.data.customizedConfig.currentOrgSelectorRangeList.split(
+                    ','
+                  );
+                this.currentOrgTabs.map((x, i) => {
+                  this.params[x] = { filid: param[i] == 'my'? this.params.filid = JSON.parse(
+                    sessionStorage.getItem('mainConfig')
+                  ).userModel.orgId : param[i]};
+                });
+              } else {
+                if (this.type == 'takeAdvice') {
+                  this.params.filid = JSON.parse(
+                    sessionStorage.getItem('mainConfig')
+                  ).userModel.orgId;
+                }
+              }
+              if (res.data.customizedConfig.foreignOrgSelectorCustomized) {
+                this.otherMix = res.data.customizedConfig.foreignOrgSelectorSelectMix == 'true';
+                this.foreignOrgTabs =
+                  res.data.customizedConfig.foreignOrgSelectorItemList.split(
+                    ','
+                  );
+                let param =
+                  res.data.customizedConfig.foreignOrgSelectorRangeList.split(
+                    ','
+                  );
+                this.foreignOrgTabs.map((x, i) => {
+                  this.otherParams[x] = { filid: param[i] };
+                });
+              }
+            }
             this.readOnlyNotificationType = readOnlyNotificationType;
             this.notificationMessageReadOnly =
               notificationMessageReadOnly == 'true';
@@ -384,15 +432,13 @@ export default {
       } = this;
       if (
         (type == 'takeAdvice' &&
-          (nextCurrentOrgObj == '' ||
-            (nextCurrentOrgObj == null && isHideCurrentOrg == 0))) ||
-        (isHideOtherOrg == 0 && nextOtherOrgObj == '') ||
-        nextOtherOrgObj == null
+          (!nextCurrentOrgObj && isHideCurrentOrg == 0)) &&
+        (isHideOtherOrg == 0 && !nextOtherOrgObj) 
       ) {
         return this.$message.warning('请选择处理对象!');
       } else if (
         isHideCurrentOrg == 0 &&
-        (nextOtherOrgObj == '' || nextOtherOrgObj == null)
+        !nextOtherOrgObj && !nextCurrentOrgObj
       ) {
         return this.$message.warning('请选择处理对象!');
       }
@@ -432,6 +478,7 @@ export default {
         method: 'POST'
       };
       this.loading = true;
+      console.log(param.data,nextCurrentOrgObj,'data')
       util
         .ajax(param)
         .then((res) => {
@@ -457,15 +504,25 @@ export default {
     },
     changeSelectUser(val, type) {
       const { nextUser, options } = val;
-      let newNextUser = '';
+      let newNextUser = [];
+      let obj = {}
       options.map((item) => {
-        if (newNextUser) {
-          newNextUser += `,${item.stype}-${item.id}`;
-        } else {
-          newNextUser = `${item.stype}-${item.id}`;
+        if(obj[item.stype]){
+          obj[item.stype].push(item.id)
+        }else{
+          obj[item.stype] = [item.id]
         }
+        // if (newNextUser) {
+        //   newNextUser += `,${item.stype}-${item.id}`;
+        // } else {
+        //   newNextUser = `${item.stype}-${item.id}`;
+        // }
       });
-      this.infoList[type] = newNextUser;
+      for(let key in obj){
+        newNextUser.push(`${key}-${obj[key].join(',')}`)
+      }
+      
+      this.infoList[type] = newNextUser.join('|');
     },
     getNodeType() {
       util
@@ -481,7 +538,6 @@ export default {
           this.loading = false;
           if (status === 'success') {
             this.infoList.noticeList = data;
-            
           }
         })
         .catch((err) => {