yuanrf 3 ay önce
ebeveyn
işleme
03cfd00f48
1 değiştirilmiş dosya ile 17 ekleme ve 11 silme
  1. 17 11
      src/components/Finance/Cost.vue

+ 17 - 11
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,13 +4264,15 @@ export default {
                         }
                     }
 
-                    await this.getGroupInfo();
-                    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;
+                    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) {
@@ -6527,8 +6529,12 @@ export default {
                     }).then((res) => {
                         //console.log(res);
                         if (res.data.code == 200) {
-                            this.grouptitleinfo.visitPNumber = res.data.data.visitPNumber;
-                            resolve(true);
+                            if (this.grouptitleinfo.visitPNumber != res.data.data.visitPNumber) {
+                                this.grouptitleinfo.visitPNumber = res.data.data.visitPNumber;
+                                resolve(true);
+                            } else {
+                                resolve(false);
+                            }
                         } else {
                             resolve(false);
                         }