n20-common-lib 1.2.8 → 1.2.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "1.2.8",
+  "version": "1.2.11",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/assets/css/cl-form-item.scss

@@ -151,6 +151,43 @@ $--input-max: 304px;
     }
   }
 }
+.el-form.label-width-8em {
+  margin-left: 66px;
+  margin-right: 38px;
+  .n20-title {
+    margin-left: -66px;
+    margin-right: -38px;
+  }
+  .el-form-item.col-span-24 {
+    @media only screen and (min-width: ($--l + 1px)) {
+      .el-textarea {
+        max-width: calc(25% + 1.5em + #{$--input-max});
+        width: calc(50% - 3em);
+      }
+    }
+
+    @media only screen and (max-width: $--l) {
+      .el-textarea {
+        max-width: calc(33.33% + 2em + #{$--input-max});
+        width: calc(66.66% - 2em);
+      }
+    }
+
+    @media only screen and (max-width: $--m) {
+      .el-textarea {
+        max-width: calc(50% + 3em + #{$--input-max});
+        width: 100%;
+      }
+    }
+
+    @media only screen and (max-width: $--s) {
+      .el-form-item {
+        max-width: none;
+        width: 100%;
+      }
+    }
+  }
+}
 .el-form.label-width-10em {
   margin-left: 40px;
   margin-right: 70px;
@@ -188,8 +225,123 @@ $--input-max: 304px;
     }
   }
 }
+.el-form.label-width-12em {
+  margin-left: 10px;
+  margin-right: 96px;
+  .n20-title {
+    margin-left: -10px;
+    margin-right: -96px;
+  }
+  .el-form-item.col-span-24 {
+    @media only screen and (min-width: ($--l + 1px)) {
+      .el-textarea {
+        max-width: calc(25% + 3em + #{$--input-max});
+        width: calc(50% - 6em);
+      }
+    }
+
+    @media only screen and (max-width: $--l) {
+      .el-textarea {
+        max-width: calc(33.33% + 4em + #{$--input-max});
+        width: calc(66.66% - 4em);
+      }
+    }
+
+    @media only screen and (max-width: $--m) {
+      .el-textarea {
+        max-width: calc(50% + 6em + #{$--input-max});
+        width: 100%;
+      }
+    }
+
+    @media only screen and (max-width: $--s) {
+      .el-form-item {
+        max-width: none;
+        width: 100%;
+      }
+    }
+  }
+}
+.el-form.label-width-14em {
+  margin-left: 0px;
+  margin-right: 96px;
+  .n20-title {
+    margin-left: 0px;
+    margin-right: -96px;
+  }
+  .el-form-item.col-span-24 {
+    @media only screen and (min-width: ($--l + 1px)) {
+      .el-textarea {
+        max-width: calc(25% + 4.66em + #{$--input-max});
+        width: calc(50% - 7em);
+      }
+    }
+
+    @media only screen and (max-width: $--l) {
+      .el-textarea {
+        max-width: calc(33.33% + 4.66em + #{$--input-max});
+        width: calc(66.66% - 4.66em);
+      }
+    }
+
+    @media only screen and (max-width: $--m) {
+      .el-textarea {
+        max-width: calc(50% + 7em + #{$--input-max});
+        width: 100%;
+      }
+    }
+
+    @media only screen and (max-width: $--s) {
+      .el-form-item {
+        max-width: none;
+        width: 100%;
+      }
+    }
+  }
+}
+.el-form.label-width-16em {
+  margin-left: 0px;
+  margin-right: 98px;
+  .n20-title {
+    margin-left: 0px;
+    margin-right: -96px;
+  }
+  .el-form-item.col-span-24 {
+    @media only screen and (min-width: ($--l + 1px)) {
+      .el-textarea {
+        max-width: calc(25% + 4em + #{$--input-max});
+        width: calc(50% - 8em);
+      }
+    }
+
+    @media only screen and (max-width: $--l) {
+      .el-textarea {
+        max-width: calc(33.33% + 5.33em + #{$--input-max});
+        width: calc(66.66% - 5.33em);
+      }
+    }
+
+    @media only screen and (max-width: $--m) {
+      .el-textarea {
+        max-width: calc(50% + 8em + #{$--input-max});
+        width: 100%;
+      }
+    }
+
+    @media only screen and (max-width: $--s) {
+      .el-form-item {
+        max-width: none;
+        width: 100%;
+      }
+    }
+  }
+}
 .el-form.label-width-6em,
-.label-width-10em {
+.el-form.label-width-8em,
+.el-form.label-width-10em,
+.el-form.label-width-12em,
+.el-form.label-width-14em,
+.el-form.label-width-16em {
   .el-form-item {
     width: 50%;
     display: inline-block;

package/src/components/ApprovalButtons/index.vue

@@ -126,7 +126,7 @@ export default {
     },
     // 获取提交参数
     getParam() {
-      let { typeCode, taskId, groupNo } = this.$route.query
+      let { typeCode, taskId, groupNo, isAgentcy } = this.$route.query
       return [
         {
           typeCode,
@@ -135,7 +135,8 @@ export default {
           taskDefKey: this.taskDefKey,
           message: this.messageC,
           formData: JSON.stringify(this.formData),
-          signText: this.signText
+          signText: this.signText,
+          isAgentcy: isAgentcy
         }
       ]
     },

package/src/components/CascaderArea/index.vue

@@ -36,6 +36,10 @@ export default {
     clearable: {
       type: Boolean,
       default: true
+    },
+    isUrban: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -47,7 +51,9 @@ export default {
     if (!window._china_area_tree_) {
       this.getAreaTree()
     } else {
-      this.areaTree = window._china_area_tree_
+      this.areaTree = this.isUrban
+        ? window._china_urban_tree_
+        : window._china_area_tree_
     }
   },
   methods: {
@@ -55,8 +61,10 @@ export default {
       axios
         .get('/bems/1.0/area', { isEnable: 1 }, { loading: false })
         .then(({ data }) => {
+          let dataAr = JSON.parse(JSON.stringify(data))
+          let dataUb = JSON.parse(JSON.stringify(data))
           let areaTree = list2tree(
-            data,
+            dataAr,
             'regionNo',
             'fatherNo',
             'children',
@@ -70,7 +78,21 @@ export default {
           window._china_area_tree_ = areaTree.filter(
             (a) => a.regionLevel === '1'
           )
-          this.areaTree = window._china_area_tree_
+
+          let urbanTree = list2tree(
+            dataUb.filter((d) => d.regionLevel !== '3'),
+            'regionNo',
+            'fatherNo',
+            'children',
+            'regionNo'
+          )
+
+          window._china_urban_tree_ = urbanTree.filter(
+            (a) => a.regionLevel === '1'
+          )
+          this.areaTree = this.isUrban
+            ? window._china_urban_tree_
+            : window._china_area_tree_
         })
     },
     updateArea() {

package/src/components/InputNumber/index.vue

@@ -6,7 +6,7 @@
       :class="{ 'n20-num--rate': type === 'rate' }"
       :value="valueStr"
       :disabled="disabled"
-      :placeholder="$attrs.placeholder"
+      :placeholder="phd"
       @focus="focusFn"
     />
     <el-input-number
@@ -17,6 +17,7 @@
       :controls="false"
       v-bind="$attrs"
       :value="valueNum"
+      :placeholder="phd"
       v-on="listeners"
       @blur="blurFn"
       @change="changeFn"
@@ -53,6 +54,10 @@ export default {
       type: Boolean,
       default: false
     },
+    placeholder: {
+      type: String,
+      default: undefined
+    },
     dNum: {
       type: Number,
       default: undefined
@@ -74,6 +79,17 @@ export default {
       showStr: true
     }
   },
+  computed: {
+    phd() {
+      if (this.placeholder) {
+        return this.placeholder
+      } else if (this.type === 'rate') {
+        return '请输入利率'
+      } else {
+        return '请输入金额'
+      }
+    }
+  },
   watch: {
     value: {
       handler(val) {

package/src/components/LoginTemporary/form.vue

@@ -21,7 +21,7 @@
         :hide-required-asterisk="true"
         @submit.native.prevent="submitLogin"
       >
-        <el-form-item class="m-b" label="帐号" prop="username">
+        <el-form-item class="m-b" label="账号" prop="username">
           <el-input v-model="form.username" placeholder="请输入账号" />
         </el-form-item>
         <el-form-item class="m-b" label="密码" prop="password">
@@ -110,7 +110,7 @@
         :hide-required-asterisk="true"
         @submit.native.prevent="submitLogin"
       >
-        <el-form-item class="m-b" label="帐号" prop="username">
+        <el-form-item class="m-b" label="账号" prop="username">
           <el-input v-model="form.username" placeholder="请输入账号" />
         </el-form-item>
         <el-form-item class="m-b" label="密码" prop="password">