Quellcode durchsuchen

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

liuhj vor 3 Monaten
Ursprung
Commit
ed7abbbb37
1 geänderte Dateien mit 43 neuen und 2 gelöschten Zeilen
  1. 43 2
      src/components/Finance/Cost.vue

+ 43 - 2
src/components/Finance/Cost.vue

@@ -899,7 +899,7 @@
                                                     }}</span>
                                                 <span v-else :title="scope.row[itemcabinone.prop]">{{
                                                     scope.row[itemcabinone.prop]
-                                                    }}</span>
+                                                }}</span>
 
                                             </template>
                                         </el-table-column>
@@ -949,7 +949,7 @@
                                                     }}</span>
                                                 <span v-else :title="scope.row[itemcabinone.prop]">{{
                                                     scope.row[itemcabinone.prop]
-                                                    }}</span>
+                                                }}</span>
 
                                             </template>
                                         </el-table-column>
@@ -4264,6 +4264,16 @@ export default {
                         }
                     }
 
+                    var isChange = await this.getGroupInfo();
+                    if (isChange) {
+                        var number = this.grouptitleinfo.visitPNumber;
+                        this.AGroupCostParameter.visaRS = number;
+                        this.AGroupCostParameter.bxrs = number;
+                        this.AGroupCostParameter.djrs = number;
+                        this.AGroupCostParameter.gwrs = number;
+                        this.AGroupCostParameter.lyjrs = number;
+                    }
+
                     //console.log(pNumber, 'pNumber-------------');
                     if (this.grouptitleinfo.visitPNumber != pNumber) {
                         this.$message.error('团组人数与房间人数不一致!')
@@ -6501,6 +6511,37 @@ export default {
                 return null;
             };
         },
+        //重新获取人数
+        getGroupInfo() {
+            return new Promise((resolve, reject) => {
+                var url = "/api/Groups/GetGroupInfo"
+                if (this.diid != undefined) {
+                    this.$axios({
+                        method: 'post',
+                        url: url,
+                        headers: {
+                            Authorization: 'Bearer ' + this.token
+                        },
+                        data: {
+                            portType: 1,
+                            id: this.diid
+                        }
+                    }).then((res) => {
+                        //console.log(res);
+                        if (res.data.code == 200) {
+                            if (this.grouptitleinfo.visitPNumber != res.data.data.visitPNumber) {
+                                this.grouptitleinfo.visitPNumber = res.data.data.visitPNumber;
+                                resolve(true);
+                            } else {
+                                resolve(false);
+                            }
+                        } else {
+                            resolve(false);
+                        }
+                    })
+                }
+            })
+        },
     },
     updated() {
         this.$emit('transfer', true)