n20-common-lib 1.3.126 → 1.3.128

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -4,7 +4,7 @@
     <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" class="m-b">
+          <el-form-item :label="'抄送' | $lc">
             <el-input
               :value="carbonCopyList.map((c) => c.uname).join(', ')"
               type="textarea"
@@ -14,7 +14,7 @@
           </el-form-item>
         </div>
         <div v-if="authList.includes('isAddtask')" class="flex-1">
-          <el-form-item :label="'加签' | $lc" class="m-b">
+          <el-form-item :label="'加签' | $lc" :error="addMsg">
             <label slot="label">
               <span>{{ '加签' | $lc }}</span>
               <el-tooltip placement="top">
@@ -26,7 +26,7 @@
               </el-tooltip>
             </label>
             <div class="flex-box">
-              <el-select v-model="addTaskType" :placeholder="'请选择审批方式' | $lc" style="width: 10em">
+              <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" />
@@ -155,6 +155,7 @@ export default {
       showBtn: true,
       setCarboncopyV: false,
       carbonCopyList: [],
+      addMsg: undefined,
       setAddtaskV: false,
       addTaskList: [],
       addTaskType: undefined,
@@ -266,6 +267,12 @@ export default {
         this.goFrom()
       }
     },
+    addErrFn() {
+      this.addMsg = '审批方式不能为空'
+      setTimeout(() => {
+        this.addMsg = undefined
+      }, 1000)
+    },
     errMsgFn(str = '') {
       this.$refs['msg-input'].focus()
       this.errMsg = str + '操作，意见不能为空'
@@ -324,6 +331,10 @@ export default {
     },
     // 审批
     approvalFn() {
+      if (this.addTaskList.length > 0 && !this.addTaskType) {
+        return this.addErrFn()
+      }
+
       this.beforeFn(this.$attrs.beforeRatify, () => {
         axios.post('/bems/activiti/admin/todo/advance', this.getParam()).then(({ data }) => {
           this.thenMsg(data, $lc('批准'))
@@ -360,6 +371,7 @@ export default {
     },
     setAddtaskOk(list) {
       this.addTaskList = list
+      if (this.addTaskList.length > 0 && !this.addTaskType) this.addTaskType = '2'
 
       this.setAddtaskV = false
     }

package/src/components/ApprovalButtons/setCarboncopyProp.vue

@@ -35,7 +35,7 @@
       </div>
       <div class="flex-item bd-a">
         <div class="text-c" style="height: 44px; line-height: 44px; background: var(--background-color-base)">
-          抄送对象
+          {{ type != 'addtask' ? '抄送对象' : '加签对象' }}
         </div>
         <div v-for="item in selectArr" :key="item.uno" class="flex-box p-a-s">
           <span

package/src/components/FileUploadTable/index.vue

@@ -393,6 +393,10 @@ export default {
       type: Function,
       default: undefined
     },
+    successCode: {
+      type: [String, Number],
+      default: 200
+    },
     getFileMethod: {
       type: Function,
       default: undefined
@@ -545,16 +549,25 @@ export default {
       this.$set(row, '_percent', percent <= 99 ? Math.round(percent) : 99)
     },
     onSuccessFn(response, file, fileList, row) {
-      console.log(row)
       this.$set(row, '_name', file.name)
-      this.$set(row, '_percent', 100)
+      if (typeof response.data === 'object') {
+        if (response.data.code === 200) {
+          this.$set(row, '_percent', 100)
+          this.$set(row, '_status', 'success')
+        } else {
+          this.$set(row, '_percent', 99)
+          this.$set(row, '_status', 'exception')
+        }
+      } else {
+        this.$set(row, '_status', 'success')
+        this.$set(row, '_percent', 100)
+      }
 
       row[this.keys.time] = dayjs().format('YYYY-MM-DD HH:mm:ss')
 
       row[this.keys.url] = response.data
       // if (!row[this.keys.name]) { row[this.keys.name] = file.name }
       row[this.keys.name] = file.name
-      this.$set(row, '_status', 'success')
 
       this.$emit('on-success', file, row)
     },