Merge branch 'develop' into develop-zhouyi

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

@@ -21,7 +21,8 @@
     "viewerjs": "^1.10.2",
     "vue": "^2.6.11",
     "vue-router": "^3.2.0",
-    "vuex": "^3.4.0"
+    "vuex": "^3.4.0",
+    "currency.js": "^1.2.2"
   },
   "files": [
     "dist",

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/baseDataSelect/index.vue

 <template>
   <div class="rbc-basedata">
-    <el-popover trigger="manual" v-model="dataListShow" :visible-arrow="false" :width="searchPopperMinWidth">
+    <el-popover ref="popover" trigger="manual" v-model="dataListShow" :visible-arrow="false" :width="searchPopperMinWidth">
       <div class="select-box" slot="reference">
         <Input ref="searchInput" v-model="selectValue" :disabled="disabled" :readonly="readonly || multiple" :class="{'multiple-input': multiple && !readonly}" placeholder="" @on-change="handleChange" @on-focus="handleFocus" @on-blur="handleBlur" @keydown.down.native="handleSelectNext" @keydown.up.native="handleSelectPrev" @keydown.enter.native="handleSelected">
           <Icon type="ios-close-circle" :class="{'clear-icon': true, 'hidden-icon': disabled || readonly || !selectValue }" slot="suffix" @click="clearList" />
@@ -104,9 +104,38 @@ export default {
     }
   },
   mounted () {
+    this.addDomListener()
     addResizeListener(this.$el, this.handleResize)
   },
+  beforeDestroy() {
+    this.removeDomListener()
+  },
   methods: {
+    addDomListener() {
+      if (this.isVxe) {
+        let doms = document.querySelectorAll('.rootClass')
+        if (doms.length) {
+          doms.forEach(item => {
+            item.addEventListener('scroll', this.refreshPopover)
+          })
+        }
+      }
+    },
+    removeDomListener() {
+      if (this.isVxe) {
+        let doms = document.querySelectorAll('.rootClass')
+        if (doms.length) {
+          doms.forEach(item => {
+            item.removeEventListener('scroll', this.refreshPopover)
+          })
+        }
+      }
+    },
+    refreshPopover() {
+      if (this.dataListShow) {
+        this.$refs.popover.updatePopper()
+      }
+    },
     handleResize () {
      this.searchPopperMinWidth = this.$el.getBoundingClientRect().width
     },

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和单据类型，通过在当前页签打开形式进行跳转",
@@ -1242,7 +1249,8 @@ export default {
 			},
 			"description": "",
 			"title": "查看详情[showDetailAction]",
-			"value": "showDetailAction"
+			"value": "showDetailAction",
+			"alwaysUse":true
 		},
 		{
 			"discard": false,
@@ -1514,7 +1522,8 @@ export default {
 			},
 			"description": "",
 			"title": "编辑常用审批意见",
-			"value": "approvalEditModalOpen"
+			"value": "approvalEditModalOpen",
+			"alwaysUse":true
 		},
 		{
 			"discard": false,
@@ -1576,7 +1585,8 @@ export default {
 			},
 			"description": "",
 			"title": "添加常用审批意见",
-			"value": "approvalMessageAdd"
+			"value": "approvalMessageAdd",
+			"alwaysUse":true
 		},
 		{
 			"discard": false,
@@ -3910,6 +3920,22 @@ export default {
 			"extends": {
 				"info": {
 					"param": [],
+					"name": "EqualsMasterAndSubField",
+					"description": "主子表字段比较公式 e.g. EqualsMasterAndSubField(BXD_H.BXJEXX,BXD_I1.BXJEX1)",
+					"title": "主子表字段比较公式",
+					"return": 1
+				}
+			},
+			"description": "",
+			"title": "主子表字段比较公式",
+			"value": "EqualsMasterAndSubField"
+		},
+		{
+			"discard": false,
+			"path": "通用",
+			"extends": {
+				"info": {
+					"param": [],
 					"name": "CheckReferenceRelation",
 					"description": "校验单据是否被引用 e.g. CheckReferenceRelation('REF_FLAG','1','当前单据已被引用，暂时无法删除。')",
 					"title": "校验单据是否被引用",

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

 import _ from "./FormulaConstants";
-
+import currency from 'currency.js/dist/currency.js'
 /**
  * 金额比较公式
  * 比较左右两个操作数是否相等 参数可以是返回值类型为number的公式
@@ -13,8 +13,8 @@ export default {
             let leftOperand = arguments[0][0];
             let rightOperand = arguments[0][1];
             if (leftOperand && rightOperand) {
-                leftOperand = _.getFormulaParamValue(leftOperand);
-                rightOperand = _.getFormulaParamValue(rightOperand);
+                leftOperand = currency(_.getFormulaParamValue(leftOperand)).value
+                rightOperand = currency(_.getFormulaParamValue(rightOperand)).value
                 if (_.isNumber(leftOperand) && _.isNumber(rightOperand)) {
                     return _.isAmountEqual(leftOperand, rightOperand);
                 } else {

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

@@ -19,7 +19,7 @@ export default {
                 let tempAllSubData = allSubData[tempSubTableObject.title]
                 if (tempAllSubData && tempAllSubData instanceof Array) {
                     tempAllSubData.forEach(e => {
-                        if (e.getValue(sfjdField.FieldCode)) {
+                        if (e.getValue(sfjdField.FieldCode) === 1 || e.getValue(sfjdField.FieldCode) === "1") {
                             flag = true;
                         }
                         tempArray.push(e.getValue(subBillNameField.FieldCode))

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

+import _ from 'lodash'
+import util from './FormulaConstants'
+
+/**
+ * 主子表字段比较公式
+ * 暂时仅实现 主表基础数据子表基础数据的比较
+ * @author fengjiansheng
+ * @date 2022-02-16
+ */
+export default {
+    formulaName: "EqualsMasterAndSubField",
+    execute: function () {
+        if (arguments && arguments[0] && arguments[0].length === 3) {
+            let context = arguments[1]
+            let compType = util.getFormulaParamValue(arguments[0][0])
+            let masterField = arguments[0][1]
+            if (compType !== 1) {
+                return true
+            }
+            masterField = util.getFormulaParamValue(masterField).id
+            let tempSubTableObject = context.getTableType(arguments[0][2].FieldTableCode);
+            if (!_.isEqual(tempSubTableObject.type, "sub")) {
+                return false
+            }
+            let allSubData = context.getAllSubData();
+            if (!allSubData || _.isEmpty(allSubData)) {
+                return true
+            }
+            let tempAllSubData = context.getAllSubData()[tempSubTableObject.title];
+            if (!tempAllSubData || _.isEmpty(tempAllSubData)) {
+                return true
+            }
+            if (tempAllSubData instanceof Array) {
+                for (const tempSubData of tempAllSubData) {
+                    let tempData = tempSubData.getValue(arguments[0][2].FieldCode).id
+                    if (masterField !== tempData) {
+                        return false
+                    }
+                }
+            }
+            return true
+        } else {
+            console.error(this.formulaName + _.ERROR_MSG.PARAM_NUM)
+            return false
+        }
+    },
+    getResultType: function () {
+        return util.resultType.boolean
+    }
+}

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

@@ -174,6 +174,7 @@ import LoginUserIsContianRole from "@/formula/SubTableJointString"
 import SubTableSetBaseData from "@/formula/SubTableSetBaseData"
 import UpdateBillReferenceRelationshipFunction from "./formula/UpdateBillReferenceRelationshipFunction";
 import AmountComp from "./formula/AmountComp";
+import EqualsMasterAndSubField from "./formula/EqualsMasterAndSubField";
 export default {
     actions: {
         updateFieldAction,
@@ -352,6 +353,7 @@ export default {
         ClearImageInfoRefState,
         CheckReferenceRelation,
         AmountComp,
+        EqualsMasterAndSubField,
     },
     routes : {
         showPrint: {

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
             })
         }
     }