n20-common-lib 2.1.9 → 2.1.11

package/package.json

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

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

@@ -104,7 +104,8 @@ $--input-max: 224px;
   font-size: 16px;
 }
 
-.el-input__inner {
+.el-input__inner,
+.el-textarea__inner {
   padding-left: 10px;
   padding-right: 10px;
   &[oreadonly] {

package/src/assets/css/cl-layout-header.scss

@@ -29,6 +29,7 @@ $--header-color: #3d4a57;
   }
   .news-btn {
     font-size: 20px;
+    margin-left: 24px;
     cursor: pointer;
   }
 

package/src/components/ApprovalButtons/index.vue

@@ -3,75 +3,71 @@
   <div>
     <el-form label-position="right" :label-width="_lang === 'zh' ? '5em' : '10em'">
       <div v-if="taskId && showBtn" class="flex-box">
-        <div v-if="authList.includes('isCarboncopy')" class="flex-1">
-          <el-form-item :label="'抄送' | $lc">
+        <el-form-item v-if="authList.includes('isCarboncopy')" :label="'抄送' | $lc" class="flex-1 m-b-s">
+          <el-input
+            :value="carbonCopyList.map((c) => c.uname).join(', ')"
+            type="textarea"
+            :autosize="{ minRows: 1 }"
+            @focus="setCarboncopyV = true"
+          />
+        </el-form-item>
+        <el-form-item v-if="authList.includes('isAddtask')" :label="'加签' | $lc" :error="addMsg" class="flex-1 m-b-s">
+          <label slot="label">
+            <span>{{ '加签' | $lc }}</span>
+            <el-tooltip placement="top">
+              <span class="n20-icon-xinxitishi m-l-ss" style="position: static"></span>
+              <div slot="content" style="width: 16em; line-height: 1.6">
+                {{ '会签并行：增加一个会签节点，全部审批人同意才可通过审批' | $lc }}<br />
+                {{ '普通串行：按照加签人数增加节点，每个节点审批通过才可完成当前加签流程' | $lc }}
+              </div>
+            </el-tooltip>
+          </label>
+          <div class="flex-box">
+            <el-select v-model="addTaskType" clearable :placeholder="'请选择审批方式' | $lc" style="width: 10em">
+              <!-- <el-option :label="'普通节点' | $lc" value="1" /> -->
+              <el-option :label="'会签并行' | $lc" value="2" />
+              <el-option :label="'普通串行' | $lc" value="3" />
+            </el-select>
             <el-input
-              :value="carbonCopyList.map((c) => c.uname).join(', ')"
+              class="flex-item"
               type="textarea"
+              :value="addTaskList.map((c) => c.uname).join(', ')"
               :autosize="{ minRows: 1 }"
-              @focus="setCarboncopyV = true"
-            />
-          </el-form-item>
-        </div>
-        <div v-if="authList.includes('isAddtask')" class="flex-1">
-          <el-form-item :label="'加签' | $lc" :error="addMsg">
-            <label slot="label">
-              <span>{{ '加签' | $lc }}</span>
-              <el-tooltip placement="top">
-                <span class="n20-icon-xinxitishi m-l-ss" style="position: static"></span>
-                <div slot="content" style="width: 16em; line-height: 1.6">
-                  {{ '会签并行：增加一个会签节点，全部审批人同意才可通过审批' | $lc }}<br />
-                  {{ '普通串行：按照加签人数增加节点，每个节点审批通过才可完成当前加签流程' | $lc }}
-                </div>
-              </el-tooltip>
-            </label>
-            <div class="flex-box">
-              <el-select v-model="addTaskType" clearable :placeholder="'请选择审批方式' | $lc" style="width: 10em">
-                <!-- <el-option :label="'普通节点' | $lc" value="1" /> -->
-                <el-option :label="'会签并行' | $lc" value="2" />
-                <el-option :label="'普通串行' | $lc" value="3" />
-              </el-select>
-              <el-input
-                class="flex-item"
-                type="textarea"
-                :value="addTaskList.map((c) => c.uname).join(', ')"
-                :autosize="{ minRows: 1 }"
-                @focus="setAddtaskV = true"
-              />
-            </div>
-          </el-form-item>
-        </div>
-      </div>
-      <el-form-item :label="'审批意见' | $lc" :error="errMsg">
-        <el-input
-          ref="msg-input"
-          v-model="messageC"
-          type="textarea"
-          :placeholder="
-            ('请输入操作意见（' + messageMax + '字以内），批准该意见为非必填，驳回/作废该意见为必填！') | $lc
-          "
-          :maxlength="messageMax"
-          :autosize="{ minRows: 1 }"
-        />
-      </el-form-item>
-      <template v-if="taskId && showBtn">
-        <el-form-item v-if="authList.includes('showAppOpi') || authList.includes('showOtherAtt')" label=" ">
-          <div class="flex-box">
-            <show-app-opi
-              v-if="authList.includes('showAppOpi')"
-              class="flex-1"
-              :task-id="taskId"
-              :message.sync="messageC"
-            />
-            <show-other-att
-              v-if="authList.includes('showOtherAtt')"
-              class="flex-1"
-              :task-id="taskId"
-              :other-att="otherAtt"
+              @focus="setAddtaskV = true"
             />
           </div>
         </el-form-item>
-      </template>
+      </div>
+      <div class="flex-box">
+        <el-form-item class="flex-1" :label="'审批意见' | $lc" :error="errMsg" style="width: 70%">
+          <el-input
+            ref="msg-input"
+            v-model="messageC"
+            type="textarea"
+            :placeholder="
+              ('请输入操作意见（' + messageMax + '字以内），批准该意见为非必填，驳回/作废该意见为必填！') | $lc
+            "
+            :maxlength="messageMax"
+            :autosize="{ rows: 1 }"
+          />
+        </el-form-item>
+        <template v-if="taskId && showBtn">
+          <show-app-opi
+            v-if="authList.includes('showAppOpi')"
+            class="flex-1 m-l-s"
+            :task-id="taskId"
+            :message.sync="messageC"
+            style="width: 20%"
+          />
+          <show-other-att
+            v-if="authList.includes('showOtherAtt')"
+            class="flex-1 m-l"
+            :task-id="taskId"
+            :other-att="otherAtt"
+            style="width: 18%"
+          />
+        </template>
+      </div>
     </el-form>
 
     <div class="text-c">

package/src/components/ApprovalButtons/showAppOpi.vue

@@ -1,7 +1,14 @@
 <template>
-  <div class="flex-box">
-    <span class="m-r">管理部审批意见</span>
-    <el-select v-model="approveMsgSlt" class="flex-item" clearable multiple collapse-tags @change="changeFn">
+  <div class="approve-msg-slt">
+    <el-select
+      v-model="approveMsgSlt"
+      class="w-100p"
+      clearable
+      multiple
+      collapse-tags
+      placeholder="请选择审批意见"
+      @change="changeFn"
+    >
       <el-option v-for="(item, i) in approveMsgList" :key="i" :label="item.suggestion" :value="item.suggestion" />
     </el-select>
   </div>
@@ -32,7 +39,7 @@ export default {
   },
   methods: {
     getData() {
-      axios.post('/bems/activiti/actAppOpi/queryAppOpi').then(({ data }) => {
+      axios.post('/bems/activiti/actAppOpi/queryAppOpiAndUser').then(({ data }) => {
         this.approveMsgList = data.list || []
       })
     },
@@ -45,4 +52,11 @@ export default {
 }
 </script>
 
-<style></style>
+<style>
+.approve-msg-slt .el-select__tags {
+  flex-wrap: nowrap;
+}
+.approve-msg-slt .el-tag {
+  max-width: calc(100% - 36px);
+}
+</style>

package/src/components/ApprovalButtons/showOtherAttr.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="flex-box">
-    <span class="m-l m-r">{{ otherattname || '--' }}</span>
+    <span class="p-t-s m-r-s">{{ otherattname || '--' }}</span>
     <el-select v-model="otherattvalue" class="flex-item" clearable @change="changeFn">
       <el-option v-for="(item, i) in otherattjson" :key="i" :label="item.name" :value="item.value" />
     </el-select>

package/src/components/FileUploadTable/index.vue

@@ -72,7 +72,7 @@
             {{ $options.filters.fileName(row, keys.url) || row[keys.name] }}
           </slot>
         </el-table-column>
-        <el-table-column :label="'附件上传' | $lc">
+        <el-table-column v-if="!readonly" :label="'附件上传' | $lc">
           <slot slot="header" slot-scope="scope" name="upload-header" :column="scope.column">{{
             '附件上传' | $lc
           }}</slot>

package/src/components/InputNumber/index.vue

@@ -104,14 +104,13 @@ export default {
     value: {
       handler(val) {
         if (val && typeof val === 'string') {
-          val = Number(val.replace(/,/g, ''))
+          val = NumberP(val)
 
           this.$emit('input', isNaN(val) ? undefined : val)
           this.valueStr = this.num2str(val)
           return
         }
         this.valueStr = this.num2str(val)
-        this.preValue = this.valueStr
       },
       immediate: true
     }
@@ -133,28 +132,29 @@ export default {
       this.isFocus = true
       if (!this.disabled && this.valueStr) {
         this.valueStr = this.valueStr.replace(/,/g, '')
+        this.preValue = this.valueStr
       }
     },
     blurFn() {
       this.isFocus = false
-      let val = Number(this.valueStr.replace(/,/g, ''))
-      if (isNaN(val)) {
-        this.valueStr = ''
-      } else {
-        this.valueStr = this.num2str(val)
-      }
 
+      this.changeFn(this.valueStr)
       this.$emit('blur')
     },
     stepFn(ev) {
-      if (ev.code === 'ArrowUp' || ev.code === 'ArrowDown') {
-        let val = Number(this.valueStr.replace(/,/g, ''))
+      if ((ev.code === 'ArrowUp' || ev.code === 'ArrowDown') && !this.disabled) {
+        let val = NumberP(this.valueStr)
         if (!isNaN(val)) {
           ev.preventDefault()
           val = ev.code === 'ArrowUp' ? val + this.step : val - this.step
+          if (val < this.min) {
+            val = this.min
+          } else if (val > this.max) {
+            val = this.max
+          }
+
           let valueStr = Number(val.toFixed(9)).toString()
           this.valueStr = valueStr
-          this.changeFn(valueStr)
         }
       }
     },
@@ -166,16 +166,22 @@ export default {
       }
     },
     changeFn(valStr) {
-      valStr = valStr.replace(/,/g, '')
+      if (this.changeIng) return
+      this.changeIng = true
+      setTimeout(() => {
+        this.changeIng = false
+      })
+
+      valStr = valStr.trim()
+      let val = NumberP(valStr)
 
-      if (!valStr.trim() || isNaN(valStr)) {
+      if (isNaN(val)) {
         this.valueStr = ''
         this.$emit('input', undefined)
         this.$emit('change', undefined)
         return
       }
 
-      let val = Number(valStr)
       if (val < this.min) {
         val = this.min
       } else if (val > this.max) {
@@ -218,4 +224,15 @@ export default {
     }
   }
 }
+
+function NumberP(val) {
+  if (typeof val === 'string') {
+    val = val.replace(/,/g, '').trim()
+  }
+  if (val === undefined || val === null || val === '') {
+    return NaN
+  } else {
+    return Number(val)
+  }
+}
 </script>

package/src/components/Layout/HeaderWrap/indexN.vue

@@ -65,7 +65,7 @@
       <span class="set-user-btn iconfont icon-kehuduanxiazai header-color m-l-lg" @click="dowApp"></span>
     </el-tooltip>
 
-    <el-badge :hidden="noticeNum === 0" :value="noticeNum" class="m-l-lg">
+    <el-badge :hidden="noticeNum === 0" :value="noticeNum">
       <span v-popover:noticePop class="news-btn iconfont icon-xiaoxi header-color"></span>
     </el-badge>
 

package/src/components/LoginSetting/setItem.vue

@@ -97,7 +97,7 @@
             </el-form-item>
             <el-form-item label="系统标识图片设置" class="is-required">
               <div class="login-form-bg-box">
-                <img :key="keyS[i]" class="login-preview" :src="systemItem.ICON || `/server-assets/N0${i + 1}.png`" />
+                <img :key="keyS[i]" class="login-preview" :src="systemItem | realUrl" />
                 <div>
                   <div class="flex-box">
                     <span class="m-r">上传图片</span>
@@ -142,8 +142,19 @@
 
 <script>
 import { $lc } from '../../utils/i18n/index'
+import realUrl from '../../assets/realUrl'
+import IconMap from '../LoginTemporary/systemIconMap'
 
 export default {
+  filters: {
+    realUrl(item) {
+      if (item.ICON) {
+        return item.ICON
+      } else {
+        return realUrl(IconMap[item.NO])
+      }
+    }
+  },
   props: {
     idNo: {
       type: String,

package/src/components/LoginTemporary/form.vue

@@ -415,6 +415,9 @@ export default {
           } else if (supplier === 'netca') {
             // 网证通
             window.sessionStorage.setItem('signType', 'netcaSign')
+          } else if (supplier === 'NetSM3') {
+            // 网证通
+            window.sessionStorage.setItem('signType', 'NetSM3')
           } else {
             // 信安CA
             window.sessionStorage.setItem('signType', 'inetSign')

package/src/components/LoginTemporary/indexN.vue

@@ -702,12 +702,13 @@ export default {
 .login-wrap-2 .sys-item {
   width: 190px;
   height: 205px;
-  background: linear-gradient(180deg, rgba(153, 165, 186, 0.53), rgba(96, 108, 133, 0.15));
-  border-radius: 6px;
+  background: url('./item2.png');
+  background-size: 100% 100%;
 }
 .login-wrap-2 .sys-item:hover,
 .login-wrap-2 .sys-item.active {
-  background: linear-gradient(180deg, #327bff, rgba(74, 102, 158, 0.3));
+  background: url('./item2-active.png');
+  background-size: 100% 100%;
 }
 .login-wrap-2 .sys-item-title {
   height: 58px;