n20-common-lib 2.9.50 → 2.9.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.9.50",
+  "version": "2.9.52",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/ApprovalButtons/index.vue

@@ -1,16 +1,17 @@
 /* 审批按钮组 */
 <template>
   <div :class="prefixCls">
-    <el-form ref="approveBtnGroup" label-position="right">
-      <div v-if="taskId && showBtn" class="m-b-s">
-        <show-other-att-new
-          v-if="authList.includes('isShowOtherAtt')"
-          ref="showOtherAttNew"
-          :task-id="taskId"
-          :form="customizationDtos"
-        />
+    <el-form ref="approveBtnGroup" label-position="right" :label-width="_lang === 'zh' ? '12em' : '12em'">
+      <div
+        v-if="taskId && showBtn && authList.includes('isShowOtherAtt')"
+        class="m-b-lg p-b-lg p-t-lg p-r-lg"
+        style="border: 1px dashed var(--border-color-base); border-radius: 5px"
+      >
+        <!-- <div class="p-l-lg p-t-lg p-b-s font-w600">{{ '审查意见' }}</div> -->
+        <show-other-att-new ref="showOtherAttNew" :task-id="taskId" :form="customizationDtos" />
       </div>
-
+    </el-form>
+    <el-form ref="approveBtnGroup" label-position="right" :label-width="_lang === 'zh' ? '6em' : '12em'">
       <div v-if="taskId && showBtn" class="flex-box">
         <el-form-item v-if="authList.includes('isCarboncopy')" :label="'抄送' | $lc" class="flex-1 m-b-s">
           <el-input
@@ -94,7 +95,7 @@
         <template v-if="taskId && showBtn">
           <show-app-opi
             v-if="opiAndUser || authList.includes('showAppOpi')"
-            class="flex-1 m-l-s"
+            class="m-l-s"
             :task-id="taskId"
             :message.sync="messageC"
             :and-user="opiAndUser"
@@ -138,6 +139,7 @@
         />
       </el-form-item>
     </el-form>
+
     <div v-if="authList.includes('byAddTask') && addTaskList.length > 0" class="text-c">
       <el-button v-if="authList.includes('approval')" type="primary" @click="checkFlowFn">{{
         '加 签' | $lc

package/src/components/ApprovalButtons/showOtherAttrNew.vue

@@ -1,12 +1,16 @@
 <template>
   <div class="w-100p flex-column">
-    <div v-for="(item, i) in otherAttData" :key="i" class="flex-box">
-      <el-form-item class="m-r-ss m-b-s" :label="item.cfgName">
-        <el-input v-if="item.cfgType === '11'" v-model="item.cfgVal" class="flex-item" clearable />
+    <div v-for="(item, i) in otherAttData" :key="i" class="flex-box flex-v">
+      <el-form-item
+        class="m-r-ss m-b-s"
+        :class="item.cfgHasRemark === '1' ? 'flex-auto' : 'flex-1'"
+        :label="item.cfgName"
+      >
+        <el-input v-if="item.cfgType === '11'" v-model="item.cfgVal" placeholder="请输入" class="input-w" clearable />
         <el-select
           v-if="['21'].includes(item.cfgType)"
           v-model="item.cfgVal"
-          class="flex-item"
+          class="flex-item input-w"
           clearable
           @change="(val) => changeFn(val, item)"
         >
@@ -17,24 +21,37 @@
           v-model="selectList"
           multiple
           collapse-tags
-          class="flex-item"
+          class="flex-item input-w"
           clearable
           @change="(val) => changeFn(val, item)"
         >
           <el-option v-for="(row, i) in JSON.parse(item.cfgJson)" :key="i" :label="row.value" :value="row.code" />
         </el-select>
-        <el-radio-group v-if="item.cfgType === '22'" v-model="item.cfgVal" @change="(val) => changeFn(val, item)">
+        <el-radio-group
+          v-if="item.cfgType === '22'"
+          v-model="item.cfgVal"
+          class="input-w"
+          @change="(val) => changeFn(val, item)"
+        >
           <el-radio v-for="(row, i) in JSON.parse(item.cfgJson)" :key="i" :label="row.code">{{ row.value }}</el-radio>
         </el-radio-group>
-        <el-checkbox-group v-if="item.cfgType === '32'" v-model="checkList" @change="(val) => changeFn(val, item)">
+        <el-checkbox-group
+          v-if="item.cfgType === '32'"
+          v-model="checkList"
+          class="input-w"
+          @change="(val) => changeFn(val, item)"
+        >
           <el-checkbox v-for="(row, i) in JSON.parse(item.cfgJson || '[]')" :key="i" :label="row.code">{{
             row.value
           }}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
-      <el-form-item v-if="item.cfgHasRemark === '1'" class="m-r-ss m-b-s">
-        <el-input v-model="item.cfgRemark" />
-      </el-form-item>
+      <el-input
+        v-if="item.cfgHasRemark === '1'"
+        v-model="item.cfgRemark"
+        class="w-100p m-r-ss m-b-s flex-1"
+        placeholder="请输入备注"
+      />
     </div>
   </div>
 </template>
@@ -100,5 +117,3 @@ export default {
   }
 }
 </script>
-
-<style></style>

package/src/components/HandlingAdvice/index.vue

@@ -0,0 +1,71 @@
+<template>
+  <div>
+    <el-dialog :visible.sync="visible" width="600px" :title="'提醒' | $lc">
+      <el-form style="margin-bottom: 50px">
+        <el-form-item :label="'请确认提交内容' | $lc">
+          <el-select v-model="reasonSelect" class="w-100p" @change="changeReasonSelect">
+            <el-option v-for="(item, i) in flowOptions" :key="i" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model="reason" type="textarea" rows="5" class="w-100p" />
+        </el-form-item>
+      </el-form>
+      <span slot="footer">
+        <el-button type="primary" @click="submit">{{ $lc('提交') }}</el-button>
+        <el-button plain @click="visible = false">{{ $lc('取消') }}</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { $lc } from '../../utils/i18n/index'
+export default {
+  name: 'HandlingAdvice',
+  data() {
+    return {
+      visible: false,
+      flowOptions: [],
+      cb: null,
+      reasonSelect: '',
+      reason: ''
+    }
+  },
+  methods: {
+    /**
+     *
+     * @param typeCode {String} 业务类型编码
+     * @param cb {Function?} 回调函数
+     */
+    async getHandlingAdvice(typeCode, cb) {
+      const { data, code } = await this.$axios.post(`/bems/activiti/admin/todo/isFlowStartWithOptions`, { typeCode })
+      if (code === 200) {
+        this.visible = data.whether ?? false
+        this.flowOptions = data?.opinions?.map((d) => {
+          return {
+            label: d,
+            value: d
+          }
+        })
+        if (!this.visible) {
+          this.cb = cb
+          cb && cb()
+        }
+      }
+    },
+    changeReasonSelect(val) {
+      this.reason = val
+    },
+    submit(cb) {
+      this.visible = false
+      if (cb) {
+        cb(this.reason)
+      } else if (this.cb) {
+        this.cb(this.reason)
+      }
+      this.$emit('submit', this.reason)
+    }
+  }
+}
+</script>

package/src/i18n.json

@@ -1080,7 +1080,7 @@
     "vi": "Một cột hiển thị cột"
   },
   "最近一月": {
-    "en": "Last January",
+    "en": "Last month",
     "th": "เดือนมกราคมที่แล้ว",
     "vi": "Tháng 1 vừa qua"
   },
@@ -1550,7 +1550,7 @@
     "vi": "Từ chối"
   },
   "最近三月": {
-    "en": "Last March",
+    "en": "Last three",
     "th": "เดือนมีนาคมที่แล้ว",
     "vi": "Tháng ba vừa qua"
   },
@@ -2165,7 +2165,7 @@
     "vi": "Kiểu thường dùng"
   },
   "最近六月": {
-    "en": "Last June",
+    "en": "Last six",
     "th": "เมื่อเดือนมิถุนายนล่าสุด",
     "vi": "Tháng 6 gần đây nhất"
   },

package/src/index.js

@@ -70,6 +70,7 @@ import Preview from './components/Preview/index.vue'
 import SelectTreePro from './components/SelectTree/pro.vue'
 import Tree from './components/Tree/index.vue'
 import AttachmentPass from './components/AttachmentPass/index.vue'
+import HandlingAdvice from './components/HandlingAdvice/index.vue'
 
 // 新版日期选择框
 import BusiDatePicker from './components/DateSelect/busiDate.vue'
@@ -228,6 +229,7 @@ const components = [
   ElectronicArchive,
   Preview,
   AttachmentPass,
+  HandlingAdvice,
   /* old */
   TableO,
   FiltersO,
@@ -367,6 +369,7 @@ export {
   UploadMsg,
   WorkCard,
   WornPagination,
+  HandlingAdvice,
   asyncGetRelaNos,
   // 方法
   auth,

package/src/plugins/Sign/NetV3/index.js

@@ -59,6 +59,17 @@ function getUserCert(uno) {
       let dn = getDN()
       let sd = data.sd === 'd'
 
+      /**
+       * （方法 RSA）生成 P10 包，新容器
+       * 参数一：签名密钥或加密密钥标识,”true”/”false”
+       * 参数二：密钥长度 512，1024， 2048，4096
+       * 参数三：主题 DN，空值 DN 请赋值””空串
+       * 参数四：摘要算法 OID，使用默认值请赋值””空串
+       * 参数五：公钥算法 OID，，使用默认值请赋值””空串
+       * 参数六：签名算法 OID，，使用默认值请赋值””空串
+       * 参数七：私钥是否可导出,”true”/”false”
+       * 参数八：是否启用增强密钥保护,”true”/”false”
+       */
       const res = IWSA_rsa_csp_genContainerP10('true', alg, data.subjectDN || dn, '', '', '', 'false', 'false')
       if (res[0] === '0') {
         let dto = {
@@ -68,6 +79,11 @@ function getUserCert(uno) {
         }
         axios.post(`/bems/prod_1.0/dssc/sign/getRadsCert`, dto).then(({ code, data }) => {
           if (code === 200) {
+            /**
+             * （方法 RSA）导入签名证书 X509
+             * 参数一：容器名，支持””：使用产生 P10 时的容器
+             * 参数二：X509 证书，Base64 编码
+             */
             const certData = IWSA_rsa_csp_importSignX509Cert(res[1], data.signCer)
             if (certData[0] === '0') {
               Message.success('证书导入成功')