eoss-mobiles 0.2.80 → 0.2.82

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-mobiles",
-  "version": "0.2.80",
+  "version": "0.2.82",
   "description": "eoss内部移动端业务组件",
   "main": "lib/eoss-mobile.common.js",
   "files": [

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

@@ -70,6 +70,15 @@
               v-model="addSignUserSelectList"
               @change="disposeAppUser($event, 'addSignUserSelectList')"
             />
+            <em-input v-if="isCanPreAddSign" label="加签模式">
+              <template slot="input">
+                <em-radio-group
+                  v-model="form.addSignMode"
+                  direction="horizontal"
+                  :data="AddSignList"
+                />
+              </template>
+            </em-input>
           </div>
           <!-- 减签 -->
           <div
@@ -496,7 +505,12 @@ export default {
   },
   data() {
     return {
+      AddSignList: [
+        { name: '前置加签', value: 'preAddSign' },
+        { name: '后置加签', value: 'postAddSign' }
+      ],
       nextNodeDefault: 0,
+      isCanPreAddSign: false,
       showAppUnit: false, // 弹窗单位
       handleFlow: true,
       isReject: false,
@@ -516,6 +530,7 @@ export default {
       isHiddenOftenOpinion: undefined, //是否隐藏常用意见
       isAddSignList: [{ name: '是', value: '1' }, { name: '否', value: '2' }],
       form: {
+        addSignMode: 'postAddSign',
         opinion: undefined, // 审批意见
         isImageOpinion: 0,
         isAddSign: undefined, //是否加签
@@ -808,10 +823,10 @@ export default {
         this.$toast('请选择办理人');
         return;
       }
-      if (this.form.isAddSign == '1' && !this.form.addSignUserId) {
-        this.$toast('请选择办理人');
-        return;
-      }
+      // if (this.form.isAddSign == '1' && !this.form.addSignUserId) {
+      //   this.$toast('请选择办理人');
+      //   return;
+      // }
       if (
         !this.form.nextNodeId &&
         this.nodeList &&
@@ -911,6 +926,9 @@ export default {
         _that.form.nextOperate == 0 || _that.form.nextOperate == 1
           ? _that.form.nextNodeId || nodeInfoMapInfo.nodeExtAttr.defaultNextNode
           : '';
+      if (!_that.isCanPreAddSign) {
+        delete _that.form.addSignMode;
+      }
       let formData = new FormData();
       if (_that.form.isImageOpinion == 1) {
         formData.append('file', _that.file);
@@ -1201,10 +1219,12 @@ export default {
                 currentOrgName,
                 otherOrgName,
                 defaultNotificationMessage,
-                defaultNotificationType
+                defaultNotificationType,
+                isCanPreAddSign
               }
             } = res;
             that.currentOrgName = currentOrgName;
+            that.isCanPreAddSign = isCanPreAddSign;
             that.otherOrgName = otherOrgName;
             that.taskExamineInfo = taskExamine;
             that.form.isReturnSubmitter = taskExamine.isReturnSubmitter;

package/packages/table/src/main.vue

@@ -170,8 +170,7 @@ export default {
     }
     if (this.full && !this.height) {
       this.$nextTick(() => {
-        console.log(this.$refs.emTable.clientHeight, 'emTable');
-        this.height = this.page?this.$refs.emTable.clientHeight - 40 : this.$refs.emTable.clientHeight;
+        this.tableClientHeight = this.page?this.$refs.emTable.clientHeight - 40 : this.$refs.emTable.clientHeight;
         // this. = this.$refs.emTable.clientHeight - 40;
       });
     }
@@ -988,7 +987,7 @@ export default {
         ref: 'emTable',
         class: 'em-table-box',
         style: {
-          height: this.isForm ? '100%' : '0',
+          height: '100%',
           position: 'relative'
         }
       },

package/packages/theme-chalk/lib/form.css

@@ -1 +1 @@
-.em-form,.em-form-content{-webkit-box-direction:normal;height:0}.em-form{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column}.em-form-content{-webkit-box-flex:1;-ms-flex:1;flex:1;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column}.em-form .van-tab__pane{height:calc(100% - 10px)}.em-form .van-tab__pane>div{height:100%}
+.em-form,.em-form-content{-webkit-box-direction:normal}.em-form{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;height:auto}.em-form-content{-webkit-box-flex:1;-ms-flex:1;flex:1;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;height:0}.em-form .van-tab__pane{height:calc(100% - 10px)}.em-form .van-tab__pane>div{height:100%}