Merge branch 'develop-zhouyi' into 'develop'

Develop zhouyi

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

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

 import { getUUID } from "../query-actions/util/lib";
+import Bridge from '../components-control/util/bridge'
 import SelectApprovers from '../components-control/select-approvers.vue'
 export default {
   execute: function (bill, param) {
@@ -91,27 +92,12 @@ export default {
             window.osConfig.appOpenMode &&
             window.osConfig.appOpenMode == "apploader"
           ) {
-            GMS.$hideContainer.$portalAPI.emit('nros-tag-close')
-            GMS.$hideContainer.$portalAPI.emit(
-              "open-new-page", //打开一个新的页签
-              getUUID(),
-              "runner-bill-form",
-              {
-                templateName: param.param.viewName,
-                id: billId,
-                state:'readOnly'
-              },
-              {
-                openWay: "FUNCTAB",
-                title: "单据详情",
-              }
-            );
+            GMS.$hideContainer.$portalAPI.emit('entry-tag-close')
           }
-          else {
-            GMS.$hideContainer.$router.push({
-              path: "/showInnerBillForm/" + param.param.viewName + "/" + billId
-            })
+          else if (Bridge.vm) {
+            Bridge.vm.modal_visible = false
           }
+          window.GMS.vbus.$emit('refresh-workflow-job-view')
         }
       }.bind(this)
     )

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

 import { getUUID } from "../query-actions/util/lib";
+import Bridge from '../components-control/util/bridge'
 export default {
   execute: function (bill, param) {
       if(bill){
@@ -42,27 +43,12 @@ export default {
                     window.osConfig.appOpenMode &&
                     window.osConfig.appOpenMode == "apploader"
                   ) {
-                    GMS.$hideContainer.$portalAPI.emit('nros-tag-close')
-                    GMS.$hideContainer.$portalAPI.emit(
-                      "open-new-page", //打开一个新的页签
-                      getUUID(),
-                      "runner-bill-form",
-                      {
-                        templateName: param.param.viewName,
-                        id: billId,
-                        state:'readOnly'
-                      },
-                      {
-                        openWay: "FUNCTAB",
-                        title: "单据详情",
-                      }
-                    );
+                    GMS.$hideContainer.$portalAPI.emit('entry-tag-close')
                   }
-                  else {
-                    GMS.$hideContainer.$router.push({
-                      path: "/showInnerBillForm/" + param.param.viewName + "/" + billId
-                    })
+                  else if (Bridge.vm) {
+                    Bridge.vm.modal_visible = false
                   }
+                  window.GMS.vbus.$emit('refresh-workflow-job-view')
               }
           }.bind(this)
       )

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

@@ -3,29 +3,29 @@ import { getUUID } from "../query-actions/util/lib";
 export default {
   execute: function (bill, param) {
     if (bill) {
-      const masterData = bill.getMasterData()
-      // 驳回状态
-      // 此时保存创建一张新单据
-      if (masterData.getValue('billState') == 91) {
-        ;[
-          'billCode',
-          'billState',
-          'flowFinishTime',
-          'flowProcessId',
-          'flowState',
-          'flowSubmitTime',
-          'orgCode',
-          'createTime',
-          'modifyTime',
-        ].forEach((key) => {
-          if (masterData.getValue(key))
-            masterData.setValue(key, '')
-          bill.billdata.masterFiled[key] = ''
-        })
-        masterData.setValue('orgId', '00000000-0000-0000-000000000000')
-        masterData.setValue('recver', 0)
-        masterData.setValue('id', getUUID())
-      }
+      // const masterData = bill.getMasterData()
+      // // 驳回状态
+      // // 此时保存创建一张新单据
+      // if (masterData.getValue('billState') == 91) {
+      //   ;[
+      //     'billCode',
+      //     'billState',
+      //     'flowFinishTime',
+      //     'flowProcessId',
+      //     'flowState',
+      //     'flowSubmitTime',
+      //     'orgCode',
+      //     'createTime',
+      //     'modifyTime',
+      //   ].forEach((key) => {
+      //     if (masterData.getValue(key))
+      //       masterData.setValue(key, '')
+      //     bill.billdata.masterFiled[key] = ''
+      //   })
+      //   masterData.setValue('orgId', '00000000-0000-0000-000000000000')
+      //   masterData.setValue('recver', 0)
+      //   masterData.setValue('id', getUUID())
+      // }
       
       bill.runFormulaCheckData(param, function (msg) {
         if (msg.length == 0) {

develop/@gms/gms-plugin-billexpand/src/control/workflow-track.vue

@@ -165,7 +165,17 @@ export default {
         bizObjId: this.context.bill.getMasterData().getValue('id'),
       },
     }).then((res) => {
-      this.data = res && res[0]
+      res = res || []
+      let count = 0
+      for (let o of res) {
+        if (o.procState == 1) {
+          this.data = o
+          ;++count
+        }
+      }
+      if (count > 1) {
+        this.$Message.error('工作流数据异常')
+      }
       if (!this.data) return
       this.data.steps.push({
         title: "提交申请",

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

@@ -1156,7 +1156,8 @@ export default {
 			"description": "",
 			"title": "财务_查询草稿[CW_draftSearchAction]",
 			"value": "draftSearchAction",
-			"btnDisable": "false"
+			"btnDisable": "false",
+			"btnDisable": "billReadOnly;90;91;92"
 		}, {
 			"discard": false,
 			"path": "单据/复制单据",

develop/@gms/gms-plugin-billexpand/src/query-actions/examineAction.js

@@ -36,6 +36,15 @@ export default {
         }
       );
     } else {
+      let href = window.location.href
+      if (href.indexOf('taskId') > -1) {
+        href = href.substring(0, href.indexOf('taskId'))
+        href += 'taskId=' + context.selects[0][param.taskId]
+      }
+      else {
+        href += '?taskId=' + context.selects[0][param.taskId]
+      }
+      window.location.href = href
       GMS.$hideContainer.addComponent(typesBill, {}, function(c) {
         c.templateName = templateName;
         c.billId = billId;

develop/@gms/gms-plugin-billexpand/src/query-actions/goToDetail.js

@@ -7,7 +7,12 @@ export default {
             context.dom.$Message.info("请配置跳转页面的参数");
             return;
         }
-
+        GMS.queryObject = {//上张下张用
+            currentDataQueryConditionSet: context.currentDataQueryConditionSet,
+            index: context.selects[0]._index,
+            templateName: context.selects[0][param.viewName],
+            isReadOnly: true,
+        }
         if (
             window.osConfig.appOpenMode &&
             window.osConfig.appOpenMode == "apploader"
@@ -33,6 +38,7 @@ export default {
                 c.init = true;
                 c.modal_visible = true;
                 c.isReadOnly = true
+                c.state = 'readOnly'
             })
         }
     }

develop/@rbc/workflow-job-view/src/app.vue

@@ -104,6 +104,9 @@ export default {
         this.templateName = this.templateOptionList[0]?.templateName;
         this.handleSearch();
       });
+    window.GMS.vbus.$on('refresh-workflow-job-view', () => {
+      this.handleSearch()
+    })
   },
 
   methods: {