Merge branch 'develop-zhouyi' into 'develop'

feat(@gms/gms-plugin-billexpand): 把审批意见加到签章子表

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

develop/@gms/gms-plugin-billexpand/src/actions/agreeAction.js

@@ -2,6 +2,7 @@ import Bridge from '../components-control/util/bridge'
 import SelectApprovers from '../components-control/select-approvers.vue'
 import { compareData } from "../components-control/util/dataChange"
 import { showSignModal, saveBill, verifyBill } from './util'
+import { BILL_GLOBAL_PARAM } from '../constant'
 
 export default {
   execute: function (bill, param) {
@@ -10,7 +11,7 @@ export default {
         GMS.$hideContainer.$Message.error('验签失败')
         return
       }
-      if (!bill.getGlobalParam('reviewParam') || !bill.getGlobalParam('reviewParam').taskId) {
+      if (!bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT) || !bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).taskId) {
         GMS.$hideContainer.$Message.error('请配置审批轨迹')
         return
       }
@@ -72,7 +73,7 @@ export default {
         bill.getMasterData().setValue('APPROVERPROPERTIES', data, null, 'none')
       }
 
-      let taskId = bill.getGlobalParam('reviewParam').taskId;
+      let taskId = bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).taskId;
       bill.setControlsSate(param["_control_name_"], "enable", false)
       let selectedApprovers = []
       window.GMS.$http.get(`/bpm/bill/selectApprover/ApproverList/${taskId}`).then((res) => {
@@ -148,8 +149,11 @@ export default {
     }
   },
   executeApproval: function(bill, param) {
-    let taskId = bill.getGlobalParam('reviewParam').taskId;
-    let comments = bill.getGlobalParam('reviewParam').suggestions ? bill.getGlobalParam('reviewParam').suggestions : "";
+    let taskId = bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).taskId;
+    let comments =
+      bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).suggestions
+      ? bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).suggestions
+      : '';
 
     const fn = () => {
       saveBill(bill, param).then(() => {
@@ -210,7 +214,7 @@ export default {
     let approver = []
     $.ajax({
 			type: "GET",
-			url: `${osConfig.baseUrl}/rbc/workflow/confirmApprover/getUserId/${bill.getGlobalParam('reviewParam').taskId}`,
+			url: `${osConfig.baseUrl}/rbc/workflow/confirmApprover/getUserId/${bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).taskId}`,
 			async: false,
 			contentType: "application/json;",
 			beforeSend: function (request) {

develop/@gms/gms-plugin-billexpand/src/actions/rejectAction.js

 import Bridge from '../components-control/util/bridge'
 import { compareData } from "../components-control/util/dataChange"
-import { SIGNATURE_TABLE_NAME } from '../constant'
+import { SIGNATURE_TABLE_NAME, BILL_GLOBAL_PARAM } from '../constant'
 import { saveBill } from './util'
 
 export default {
@@ -51,12 +51,15 @@ export default {
     }
   },
   approval: function(bill, param){
-      if (!bill.getGlobalParam('reviewParam') || !bill.getGlobalParam('reviewParam').taskId) {
+      if (!bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT) || !bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).taskId) {
         GMS.$hideContainer.$Message.error('请配置审批轨迹')
         return
       }
-      let taskId = bill.getGlobalParam('reviewParam').taskId;
-      let comments = bill.getGlobalParam('reviewParam').suggestions ? bill.getGlobalParam('reviewParam').suggestions:"";
+      let taskId = bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).taskId;
+      let comments =
+        bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).suggestions
+        ? bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).suggestions
+        : ''
 
       bill.clearSubDatas(SIGNATURE_TABLE_NAME)
       saveBill(bill, param).then(() => {
@@ -99,7 +102,7 @@ export default {
     let approver = []
     $.ajax({
 			type: "GET",
-			url: `${osConfig.baseUrl}/rbc/workflow/confirmApprover/getUserId/${bill.getGlobalParam('reviewParam').taskId}`,
+			url: `${osConfig.baseUrl}/rbc/workflow/confirmApprover/getUserId/${bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).taskId}`,
 			async: false,
 			contentType: "application/json;",
 			beforeSend: function (request) {

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

@@ -49,6 +49,10 @@ export const showSignModal = (bill, param, nodeName) => {
 
   const saveSubTableData = ({ signatureValue, operateTime, imgData }) => {
     bill.addSubData(SIGNATURE_TABLE_NAME)
+    const approvalComment =
+      bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT)
+      && bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).suggestions
+      || ''
     const subDataObj = bill.getSubData(SIGNATURE_TABLE_NAME)
     const tableLength = subDataObj.length || 0
     const subDataIndex = tableLength  - 1
@@ -62,6 +66,12 @@ export const showSignModal = (bill, param, nodeName) => {
       null,
       'none'
     )
+    subDataObj[subDataIndex].setValue(
+      SIGNATURE_TABLE.APPROVAL_COMMENT,
+      approvalComment,
+      null,
+      'none'
+    )
     bill.refreshSubDataRow(SIGNATURE_TABLE_NAME)
   }
 

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

@@ -6,10 +6,12 @@ export const SIGNATURE_TABLE = {
   CREATE_TIME: 'createTime',
   SIGN_IMAGE: 'signImage',
   PROTECT_FIELDS: 'guardFields',
+  APPROVAL_COMMENT: 'approvalComment',
 }
 
 export const BILL_GLOBAL_PARAM = {
   SIGNATURE_FIELDS: 'signatureFields',
+  APPROVAL_COMMENT: 'approvalComment',
 }
 
 export const GLOBAL_EVENT = {

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

@@ -124,6 +124,8 @@
 <script>
 const TABLE_NAME = "MD_SPYJ"
 import ConfirmPopover from './confirm-popover'
+import { BILL_GLOBAL_PARAM } from '../../constant';
+
 export default {
   name: 'ApprovalUserControl',
   components: {
@@ -179,15 +181,15 @@ export default {
   watch: {
     value(newV) {
       this.reviewParam['suggestions'] = newV;
-      this.context.bill.setGlobalParam('reviewParam',this.reviewParam);
+      this.context.bill.setGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT,this.reviewParam);
     }
   },
   mounted() {
     this.reviewParam['taskId'] = GMS.workflowTaskId
     this.taskId = GMS.workflowTaskId;
     // this.reviewParam['billid'] = this.$route.query.id;
-    this.context.bill.setGlobalParam('reviewParam',this.reviewParam);
-    this.value = this.context.bill.getGlobalParam('reviewParam').suggestions
+    this.context.bill.setGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT,this.reviewParam);
+    this.value = this.context.bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).suggestions
     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)