Merge branch 'develop-yangchen' into 'develop'

Develop yangchen

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

develop/@gms/gms-plugin-billexpand/package.json

@@ -9,6 +9,8 @@
   },
   "dependencies": {
     "@rbc/icon": "^0.0.1",
+    "@yhs/components": "^1.1.0-SNAPSHOT",
+    "@yhs/icon": "^1.1.0-SNAPSHOT",
     "core-js": "^3.6.5",
     "currency.js": "^1.2.2",
     "element-ui": "^2.15.6",

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

+import approvalUserControl from  '../../control/approvalOpinionControl.vue'
+
+export default {
+  execute: function (bill, param) {
+
+    /* 审批组件值发生改变时  会触发事件on-change */
+    let title = '审批意见'
+    GMS.$hideContainer.$Modal.confirm({
+      width: 700,
+      top:100,
+      render: (h) => {
+        return h(
+          approvalUserControl,
+          {
+            props: {
+              title,
+            },
+            on: {
+              'on-change': (val) => {
+                console.log('on-change',val)
+              }
+            }
+          }
+        )
+      },
+      onOk: () => {
+        console.log('OK')
+      },
+      onCancel: () => {
+        console.log('cancel')
+      }
+    });
+   
+  },
+  approvalLogical: function (bill, param) {
+
+  },
+  executeApproval: function(bill, param) {
+   
+  },
+  isApproverEqulloginer: function (bill, param) {
+ 
+  }
+}
\ No newline at end of file

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

@@ -162,7 +162,6 @@ export default {
         });
       window.open(routeData.href, "_blank");
       });
-      
     },
     executeAction() {
       this.context.bill.executeAction(this.button.config.action);

develop/@gms/gms-plugin-billexpand/src/control/util/dynamic-from-common.less

+.input-height{
+  /deep/.ivu-input-default{
+      height: 100%;
+  }
+} 
+.input-center{
+  /deep/.ivu-input-default{
+      text-align: center;
+  }
+}
+.input-left{
+  /deep/.ivu-input-default{
+      text-align: left;
+  }
+}
+.input-right{
+  /deep/.ivu-input-default{
+      text-align: right;
+  }
+}
+.input-control-wrapper{
+display: inline-block;
+width: 100%;
+position: relative;
+}
\ No newline at end of file

develop/@gms/gms-plugin-billexpand/src/control/vxeTableExpand/SubjectControl.vue

+<template>
+  <div class="input-control-wrapper">
+    <!-- <SubjectModalTree
+      v-if="!isContent && controlDisplay"
+      :systemFlag="systemFlag"
+      :nodeKey="nodeKey"
+      :multiple="define.config.multiple"
+      :placeholder="define.config.placeholder"
+      :entryTitle="define.config.title"
+      :modalName="define.config.title"
+      :onlyChooseLeaf="define.config.isLeaf"
+      :defaultExpandAll="defaultExpandAll"
+      :lazy="lazy"
+      :customListFunc="customListFunc"
+      :customTreeFunc="customTreeFunc"
+      :value="value"
+      @on-subject-selected="subjectSelectedHandler"
+    />
+    <div v-if="isContent">
+      {{ getValue() }}
+    </div> -->
+  </div>
+</template>
+<script>
+import input from "../util/bc_input.js";
+/* import { SubjectModalTree } from "@yhs/components"; */
+export default {
+  mixins: [input],
+  /* components: {
+    SubjectModalTree,
+  }, */
+  props: {
+    rowIndex: {
+      type: Number,
+      default: -1,
+    },
+    isVxe: {},
+  },
+  data() {
+    return {
+      systemFlag: "finance",
+      nodeKey: "code",
+      multiple: false,
+      defaultExpandAll: false,
+      lazy: false,
+      value: "",
+    };
+  },
+  methods: {
+    stopPropagation(event) {
+      event.stopPropagation()
+    },
+    subjectSelectedHandler(selectedObj) {
+      console.log(selectedObj)
+      const code = selectedObj.code;
+      const name = selectedObj.name || selectedObj.title
+      let nv = code + " " + name;
+      this.value = code;
+      this.setDataObjectValue(nv);
+    },
+    customListFunc(callback) {
+      GMS.$http
+        .post("/rbc/acct-sys/subject/list", { pagination: false })
+        .then((res) => {
+          console.log(res);
+          let data = res.data.data.rows;
+          callback(data);
+        });
+    },
+    customTreeFunc(callback) {
+      GMS.$http
+        .post("/rbc/acct-sys/subject/tree", { pagination: false })
+        .then((res) => {
+          console.log(res);
+          let data = res.data.data;
+          callback(data);
+        });
+    },
+    getSubjectDataList() {},
+    getSubjectDataTree() {},
+  },
+};
+</script>
+<style lang="less" scoped>
+@import "../util/dynamic-from-common.less";
+.input-control-wrapper {
+  /deep/ .ivu-input-suffix {
+    z-index: 999;
+  }
+  /deep/ .ivu-input-suffix i {
+    position: relative;
+    top: 50%;
+    transform: translate(0, -50%);
+  }
+}
+</style>
\ No newline at end of file

develop/@gms/gms-plugin-billexpand/src/control/vxeTableExpand/VxeSubjectControl.js

+import SubjectControl from './SubjectControl.vue'
+export default {
+    renderEdit:(h, renderOpts, params,hide)=>{
+        const {
+            row,
+            column,
+            rowIndex
+        } = params;
+        let props = column.editRender.props; 
+        let define = props.define;
+        let context = props.context;
+        return [
+            h(SubjectControl, {
+                class:"InputControl",
+                attrs:{
+                    id:props.id
+                },
+                props: {
+                    define:define,
+                    context:context,
+                    rowIndex:rowIndex,
+                    isVxe:{width:props.colItem.width,height:props.colItem.height}
+                },
+                on: {},
+            })
+        ]
+    }
+}
+

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

@@ -84,6 +84,7 @@ import IntroduceInputControl from './control/IntroduceInputControl.vue'
 import InputModalControl from './control/InputModalControl.vue'
 import TabContainer from './control/tab-container/tab-container.vue'
 import Achievements from './control/vxe-achievements/achievements.vue'
+import VxeSubjectControl from './control/vxeTableExpand/VxeSubjectControl.js'
 //formula
 
 import GeneralImportFile from './formula/GeneralImportFile.js';
@@ -265,7 +266,8 @@ export default {
         IntroduceInputControl,
         InputModalControl,
         TabContainer,
-        Achievements
+        Achievements,
+        VxeSubjectControl
     },
     formula: {
         SubTableSetBaseData,

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

@@ -5,6 +5,9 @@ import '@rbc/icon/iconfont'
 import '@rbc/icon/iconfont.css'
 import '@rbc/icon/icon.css'
 import './styles/common/normalize.less'
+import '@yhs/icon/iconfont.css'
+import '@yhs/icon/iconfont.js'
+import '@yhs/icon/icon.css'
 
 (function() {
   if (window.__rcb_bjcawebsign__) return
@@ -27,6 +30,7 @@ import './styles/common/normalize.less'
   })
 })()
 
+
 export default {
   install: function(){
     GMS.getContext().getCollector().addElements(mcon);  // 收集所有配置文件