Merge branch 'develop-yuancheng' into 'develop'

Develop yuancheng

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

develop/@gms/gms-plugin-billexpand/src/components-control/typesBill.vue

@@ -17,6 +17,7 @@
         :id="billId"
         :type="billId ? 'load' : 'init'"
         :state="state"
+        :hideButtonGroup="hideButtonGroup"
         @loadFinish="loadFinishFun"
         v-if="init"
       ></gms-bill-form>
@@ -39,6 +40,7 @@ export default {
       isReadOnly: false,
       billClass: null,
       oldBillData: null,
+      hideButtonGroup: false
     };
   },
   watch: {

develop/@gms/gms-plugin-billexpand/src/control/buttonGrouop.vue

@@ -40,6 +40,14 @@ export default {
       },
       immediate: true
     },
+    'tmpBill.$attrs.hideButtonGroup': {
+      handler(nv) {
+        if (nv) {
+          this.buttonShow = false
+        }
+      },
+      immediate: true
+    },
   },
 
   mounted() {

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

@@ -702,7 +702,14 @@ export default {
 						"type": "field",
 						"title": "单据id",
 						"key": "billId"
-					}
+					},
+					{
+						"isRequired": true,
+						"ref": "columnField",
+						"type": "Boolean",
+						"title": "隐藏工具栏",
+						"key": "hideButton"
+					},
 				]
 			},
 			"description": "指定跳转页面，配置单据id和单据类型，通过在当前页签打开形式进行跳转",

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

@@ -24,7 +24,8 @@ export default {
                 {
                     templateName: context.selects[0][param.viewName],
                     id: context.selects[0][param.billId],
-                    state: 'readOnly'
+                    state: 'readOnly',
+                    hideButtonGroup: param.hideButton? true: false
                 },
                 {
                     openWay: "FUNCTAB",
@@ -39,6 +40,7 @@ export default {
                 c.modal_visible = true;
                 c.isReadOnly = true
                 c.state = 'readOnly'
+                c.hideButtonGroup = param.hideButton? true: false
             })
         }
     }