Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/Finance/Cost.vue

@@ -3370,7 +3370,8 @@ export default {
                 visitDate: '',
                 visitPNumber: 0,
                 visitDays: 0
-            }
+            },
+            excludeGroupList: [2836],
         };
     },
     watch: {
@@ -4361,10 +4362,8 @@ export default {
                         this.AGroupCostParameter.lyjrs = number;
                     }
 
-                    var excludeGroupList = [2836];
-
                     ////console.log(pNumber, 'pNumber-------------');
-                    if (this.grouptitleinfo.visitPNumber != pNumber && !excludeGroupList.includes(this.diid)) {
+                    if (this.grouptitleinfo.visitPNumber != pNumber && !this.excludeGroupList.includes(this.diid)) {
                         this.$message.error('团组人数与房间人数不一致！')
                         return resolve(false);
                     }
@@ -5036,12 +5035,24 @@ export default {
                 rightSum += Number(that.calculateDRBJ(x));
             })
 
+            //总人数价格
+            if (this.excludeGroupList.includes(this.diid)) {
+                leftSum = leftSum * this.grouptitleinfo.visitPNumber;
+                rightSum = rightSum * this.grouptitleinfo.visitPNumber;
+            }
+
+
             for (var i = 0; i < paramArr.length; i++) {
                 var costPersonPrice = 0;
                 var singleQuotePrice = 0;
                 for (var j = 0; j < paramArr[i].costPerson.length; j++) {
                     var costPersonKey = paramArr[i].costPerson[j];
                     var price = Number(that.AGroupCostParameter[costPersonKey]);
+
+                    if (this.excludeGroupList.includes(this.diid) && costPersonKey.indexOf('gwc') != -1) {
+                        price = price * this.grouptitleinfo.visitPNumber;
+                    }
+
                     if (costPersonKey.indexOf('tbr') != -1) {
                         price = price / 2;
                     }
@@ -5050,6 +5061,11 @@ export default {
                 for (var k = 0; k < paramArr[i].singleQuote.length; k++) {
                     var singleQuoteKey = paramArr[i].singleQuote[k];
                     var price = Number(that.calculateDRBJ(singleQuoteKey));
+
+                    if (this.excludeGroupList.includes(this.diid) && costPersonKey.indexOf('gwc') != -1) {
+                        price = price * this.grouptitleinfo.visitPNumber;
+                    }
+
                     if (singleQuoteKey.indexOf('tbr') != -1) {
                         price = price / 2;
                     }