Merge branch 'develop-zhouyi' into 'develop'

fix(@gms/gms-plugin-billexpand): 工会预算按钮调整

See merge request GFP/RBC/rbc-frontend!188

develop/@gms/gms-plugin-billexpand/src/actions/labourUnion/gh_rejectAction.js

@@ -59,7 +59,7 @@ export default {
       bill.clearSubDatas(SIGNATURE_TABLE_NAME)
       saveBill(bill, param).then(() => {
         GMS.$http.post(
-          `/rbc/bill/action/zgh/change/work/${param.define}/bill.Basic.accept`,
+          `/rbc/bill/action/zgh/change/work/${param.define}/bill.Basic.reject`,
           { approvalComments: comments },
         ).then(
           function (response) {

develop/@gms/gms-plugin-billexpand/src/actions/util/index.js

@@ -141,6 +141,8 @@ export const showCommentModal = (bill, param, checkComment) => {
       },
     }
   )
+  window.GMS.vbus.$emit(GLOBAL_EVENT.APPROVAL_USER_CONTROL_RESETVALUE)
+
   return GMS.$hideContainer.$msgbox({
     title: '审批意见',
     message: vNode,
@@ -152,7 +154,7 @@ export const showCommentModal = (bill, param, checkComment) => {
         let comments =
           bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT)
           && bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).suggestions
-        if (comments) {
+        if (comments || !checkComment) {
           done()
         }
         else {

develop/@gms/gms-plugin-billexpand/src/constant.js

@@ -16,4 +16,6 @@ export const BILL_GLOBAL_PARAM = {
 
 export const GLOBAL_EVENT = {
   VERIFY_SIGNATURE_FAIL: 'verifySignatureFail',
+  APPROVAL_USER_CONTROL_RESETVALUE: 'approvalUserControlResetValue',
+
 }

develop/@gms/gms-plugin-billexpand/src/control/approval-user-control/approval-user-control.vue

@@ -133,7 +133,7 @@
 <script>
 const TABLE_NAME = "MD_SPYJ"
 import ConfirmPopover from './confirm-popover'
-import { BILL_GLOBAL_PARAM } from '../../constant';
+import { BILL_GLOBAL_PARAM, GLOBAL_EVENT } from '../../constant';
 
 export default {
   name: 'ApprovalUserControl',
@@ -203,6 +203,7 @@ export default {
     this.currentTagId = window.nros.context.getCurrTag()
     window.GMS.vbus.$on('approval-user-control-edit', this.openEditModal)
     window.GMS.vbus.$on('approval-user-control-add', this.handleAdd)
+    window.GMS.vbus.$on(GLOBAL_EVENT.APPROVAL_USER_CONTROL_RESETVALUE, this.resetValue)
     this.getSuggestionOptions()
   },
   beforeDestroy() {
@@ -210,6 +211,10 @@ export default {
     window.GMS.vbus.$off('approval-user-control-add', this.handleAdd)
   },
   methods: {
+    resetValue() {
+      if (this.currentTagId && this.currentTagId != window.nros.context.getCurrTag()) return
+      this.value = ''
+    },
     showDeletePopover(suggestion) {
       this.$set(suggestion, 'visible', true)
     },