Merge branch 'develop-yuancheng' into 'develop'

Develop yuancheng

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

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

@@ -3,8 +3,12 @@ import SelectApprovers from '../components-control/select-approvers.vue'
 export default {
   execute: function (bill, param) {
     if (bill) {
-      bill.setControlsSate(param["_control_name_"], "enable", false)
+      if (!bill.getGlobalParam('reviewParam') || !bill.getGlobalParam('reviewParam').taskId) {
+        GMS.$hideContainer.$Message.error('请配置审批轨迹')
+        return
+      }
       let taskId = bill.getGlobalParam('reviewParam').taskId;
+      bill.setControlsSate(param["_control_name_"], "enable", false)
       let selectedApprovers = []
       window.GMS.$http.get(`/bpm/bill/selectApprover/ApproverList/${taskId}`).then((res) => {
         if (res.data.code == 204) {
@@ -64,23 +68,23 @@ export default {
     }
   },
   executeApproval: function(bill, param) {
-    if (param.param.isNeedSave) {
+    if (param.param.actions) {
       let saveParam = {
-        actions: "bill.Basic.save",
-        afterAction: "",
-        confirmTitle: "",
-        customSaveAction: "",
-        noCheckCardDepressPeriod: true,
-        noCheckSubTable: true,
-        viewName: ""
+        actions: param.param.actions,
+        // afterAction: "",
+        // confirmTitle: "",
+        // customSaveAction: "",
+        // noCheckCardDepressPeriod: true,
+        // noCheckSubTable: true,
+        // viewName: ""
       }
       bill.executeServerAction(saveParam, function (code, data) {
         if (code === 200) {
           this.approval(bill, param);
-          bill.setControlsSate(param["_control_name_"], "loading", false)
+          // bill.setControlsSate(param["_control_name_"], "loading", false)
         } else {
           bill.setControlsSate(param["_control_name_"], "enable", true)
-          bill.setControlsSate(param["_control_name_"], "loading", false)
+          // bill.setControlsSate(param["_control_name_"], "loading", false)
           GMS.$hideContainer.$message.error("操作异常请联系管理员");
         }
       }.bind(this));

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

@@ -3,22 +3,16 @@ export default {
   execute: function (bill, param) {
       if(bill){
         bill.setControlsSate(param["_control_name_"], "enable", false)
-          if(param.param.isNeedSave){
+          if(param.param.actions){
               let saveParam = {
-                  actions: "bill.Basic.save",
-                  afterAction: "",
-                  confirmTitle: "",
-                  customSaveAction: "",
-                  noCheckCardDepressPeriod: true,
-                  noCheckSubTable: true,
-                  viewName: ""
+                  actions: param.param.actions,
               }
               bill.executeServerAction(saveParam,function(code,data){
                   if(code===200){
                       this.approval(bill, param);
-                      bill.setControlsSate(param["_control_name_"],"loading",false)
+                    //   bill.setControlsSate(param["_control_name_"],"loading",false)
                   }else{
-                      bill.setControlsSate(param["_control_name_"],"loading",false)
+                    //   bill.setControlsSate(param["_control_name_"],"loading",false)
                       bill.setControlsSate(param["_control_name_"], "enable", true)
                       GMS.$hideContainer.$message.error("操作异常请联系管理员");
                   }
@@ -31,6 +25,10 @@ export default {
       }
   },
   approval: function(bill, param){
+      if (!bill.getGlobalParam('reviewParam') || !bill.getGlobalParam('reviewParam').taskId) {
+        GMS.$hideContainer.$Message.error('请配置审批轨迹')
+        return
+      }
       let taskId = bill.getGlobalParam('reviewParam').taskId;
       let comments = bill.getGlobalParam('reviewParam').suggestions ? bill.getGlobalParam('reviewParam').suggestions:"";
       GMS.$http.post('/gms/workflow/task/completed/' + taskId + '?result=3&comments='+comments).then(

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

@@ -1626,12 +1626,20 @@ export default {
 			"path": "资产/通用",
 			"extends": {
 				"param": [
+					// {
+					// 	"ref": "bill",
+					// 	"type": "metaData",
+					// 	"title": "成功跳转页面",
+					// 	"key": "viewName"
+					// },
 					{
-						"ref": "bill",
-						"type": "metaData",
-						"title": "成功跳转页面",
-						"key": "viewName"
-					}
+						"clearable": true,
+						"ref": "gams2.bill",
+						"type": "select",
+						"title": "执行动作",
+						"key": "actions",
+						"innerRef": "actions"
+					},
 				]
 			},
 			"description": "",
@@ -1678,12 +1686,20 @@ export default {
 			"path": "资产/通用",
 			"extends": {
 				"param": [
+					// {
+					// 	"ref": "bill",
+					// 	"type": "metaData",
+					// 	"title": "成功跳转页面",
+					// 	"key": "viewName"
+					// },
 					{
-						"ref": "bill",
-						"type": "metaData",
-						"title": "成功跳转页面",
-						"key": "viewName"
-					}
+						"clearable": true,
+						"ref": "gams2.bill",
+						"type": "select",
+						"title": "执行动作",
+						"key": "actions",
+						"innerRef": "actions"
+					},
 				]
 			},
 			"description": "",

develop/@gms/gms-plugin-mainpage-fileList/src/views/gms-app.vue

@@ -61,10 +61,11 @@ export default {
     async getFileLList() {
       const url = `/common/attachment/owner/00000000-0000-0000-0000-000000000000`
       const { data } = await GMS.$http.get(url)
-      this.fileList = data.filter(item => item.category === this.groupId)
-      console.log('groupId', this.groupId)
-      console.log('fileList', this.fileList)
-      console.log({ data })
+      if (this.groupId === 'rbc-0') {
+        this.fileList = data
+      } else {
+        this.fileList = data.filter(item => item.category === this.groupId)
+      }
     },
     handleMore() {
       this.modalShow = true

develop/@gms/gms-plugin-mainpage-fileList/src/views/property.vue

@@ -39,7 +39,7 @@ export default {
       },
       fileGroup:  [
         {
-          label: '默认分组',
+          label: '全部',
           value: '0'
         },
         {

develop/@rbc/file-management/src/views/file-management.vue

@@ -76,7 +76,7 @@ export default {
       tableData: [],
       fileGroup: [
         {
-          label: '默认分组',
+          label: '全部',
           value: '0'
         },
         {
@@ -131,13 +131,17 @@ export default {
     },
     handleUpload(){
       this.$refs.upload.modalShow = true
+      this.$refs.upload.files = []
     },
     async getTableData() {
       const url = `/common/attachment/owner/00000000-0000-0000-0000-000000000000`
       const { data } = await GMS.$http.get(url)
       let category = 'rbc-' + this.fileGroupId
-      this.tableData = data.filter(item => item.category === category)
-      console.log({ data })
+      if (this.fileGroupId === '0') {
+        this.tableData = data
+      } else {
+        this.tableData = data.filter(item => item.category === category)
+      }
     },
   },
 }