n20-common-lib 2.18.17 → 2.19.0

package/package.json

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

package/src/components/ApprovalButtons/indexApp.vue

@@ -101,7 +101,7 @@
           </div>
         </el-form-item>
       </div>
-      <el-form-item :label="'审批意见' | $lc" :error="errMsg" :required="requiredC" class="m-t-s">
+      <el-form-item v-if="approveBtns" :label="'审批意见' | $lc" :error="errMsg" :required="requiredC" class="m-t-s">
         <el-input
           ref="msg-input"
           v-model="messageC"
@@ -127,26 +127,6 @@
           />
         </template> -->
       </el-form-item>
-      <el-form-item v-if="fileKitT">
-        <span slot="label">
-          <span v-if="mustUploadWidget" style="color: red">*</span>
-          {{ $lc('附件上传') }}
-        </span>
-        <cl-upload
-          class="upload-224"
-          :file-name.sync="fileName"
-          multiple
-          :data="fileData"
-          :file-url.sync="fileUrl"
-          :on-success="onSuccess"
-          :on-remove="onRemove"
-          show-file-list
-          :action="
-            apiPrefix ? apiPrefix + `/neams/eamsbaserecord/batchSavejson` : `/neams/eamsbaserecord/batchSavejson`
-          "
-          msg-type="message"
-        />
-      </el-form-item>
     </el-form>
     <!-- 加签按钮 -->
     <div v-if="authList.includes('byAddTask') && addTaskList.length > 0" class="text-c">
@@ -165,6 +145,7 @@
     </div>
 
     <div v-else-if="!authList.includes('byAddTask')" class="text-c">
+      <div v-if="!approveBtns" style="text-align: center; font-size: 18px">请点击左上角返回处，进入OA待办页面</div>
       <!-- 特殊会签按钮 START -->
       <el-button v-if="authList.includes('pass')" type="primary" @click="checkFlowFn">{{
         btnsNames['pass']
@@ -172,7 +153,7 @@
       <el-button v-if="authList.includes('refuse')" plain @click="rejectFn">{{ btnsNames['refuse'] }}</el-button>
       <el-button v-if="authList.includes('takeOff')" plain @click="qjFn">{{ btnsNames['takeOff'] }}</el-button>
       <!-- END -->
-      <el-button v-if="authList.includes('approval')" type="primary" @click="showAdvancePop">{{
+      <el-button v-if="authList.includes('approval') && approveBtns" type="primary" @click="showAdvancePop">{{
         btnsNames['approval']
       }}</el-button>
       <!--  <el-button v-if="authList.includes('approval') && nextApproval && nextBtn" type="primary" @click="approvalNext">
@@ -182,7 +163,9 @@
         >{{ btnsNames['approval'] }}{{ '至' | $lc }}</el-button
       >
       <el-button v-if="authList.includes('rejectTo')" plain @click="rejectToB">{{ btnsNames['rejectTo'] }}</el-button> -->
-      <el-button v-if="authList.includes('reject')" plain @click="rejectFn">{{ btnsNames['reject'] }}</el-button>
+      <el-button v-if="authList.includes('reject') && approveBtns" plain @click="rejectFn">{{
+        btnsNames['reject']
+      }}</el-button>
       <!-- <el-button v-if="authList.includes('rejectPre')" plain @click="rejectPreFn">{{
         btnsNames['rejectPre']
       }}</el-button>
@@ -515,7 +498,8 @@ export default {
         approval: this.$l('批 准'),
         discard: this.$l('作 废'),
         rejectTo: this.$l('驳回至')
-      }
+      },
+      approveBtns: true
     }
   },
   computed: {
@@ -557,36 +541,7 @@ export default {
   methods: {
     // 查询选择审批人
     async showAdvancePop() {
-      // 附件上传校验
-      if (this.mustUploadWidget && this.fileDtos.length === 0) {
-        this.$message.warning($lc(`请先上传附件`))
-        return false
-      }
-      this.beforeFn(this.beforeRatify, async () => {
-        try {
-          const res = await this.$axios.post(
-            '/bems/activiti/admin/todo/showAdvancePop',
-            {
-              isAgentcy: this.$route.query.isAgentcy,
-              taskId: this.$route.query.taskId
-            },
-            {
-              loading: false,
-              noMsg: true
-            }
-          )
-          // 如果返回正常 且有返回值 且showNextEgwOutgoingNodeName跟showNextNodeAssignee有一个为true
-          if (res.code === 200 && res.data && (res.data.showNextEgwOutgoingNodeName || res.data.showNextNodeAssignee)) {
-            this.setSpr = true
-            this.selectSprList = res.data
-          } else {
-            this.checkFlowFn()
-          }
-        } catch (error) {
-          console.log(error)
-          this.checkFlowFn()
-        }
-      })
+      this.checkFlowFn()
     },
     // 选择审批人
     selectSprListFn(data) {
@@ -675,7 +630,6 @@ export default {
     // 动态获取按钮
     getBtns() {
       if (!this.taskId || !this.showBtn) return false
-
       axios
         .get('/bems/activiti/admin/todo/authList/' + this.taskId, null, {
           loading: false,
@@ -824,7 +778,7 @@ export default {
       } else {
         this.$emit('afterFn', str)
         this.$message.success(str + $lc('成功'))
-        setTimeout(this.goFrom, 300)
+        this.approveBtns = false
       }
     },
     addErrFn() {