Browse Source

修改bug

chenrui 2 years ago
parent
commit
f9d799b9c5

+ 22 - 30
src/views/financialManagement/companyCollectionPayment/detail.vue

@@ -30,29 +30,25 @@
       </a-card>
       </a-card>
       <!-- 收款明细 -->
       <!-- 收款明细 -->
       <a-card size="small" :bordered="false" class="companyCollectionPaymentDetail-cont">
       <a-card size="small" :bordered="false" class="companyCollectionPaymentDetail-cont">
-        <a-collapse :activeKey="['1']">
-          <a-collapse-panel key="1" header="收款明细">
-            <!-- alert -->
-            <a-alert type="info" style="margin-bottom:10px">
-              <div slot="message">
-                共 <strong>{{ total }}</strong> 条明细,
-                金额合计 <strong>{{ (basicInfoData&&(basicInfoData.totalSettleAmount || basicInfoData.totalSettleAmount==0)) ? toThousands(basicInfoData.totalSettleAmount) : '--' }}</strong> ,
-                结算金额合计 <strong>{{ (basicInfoData&&(basicInfoData.realSettleAmount || basicInfoData.realSettleAmount==0)) ? toThousands(basicInfoData.realSettleAmount) : '--' }}</strong>
-              </div>
-            </a-alert>
-            <!-- 列表 -->
-            <s-table
-              class="sTable"
-              ref="table"
-              size="small"
-              :rowKey="(record) => record.id"
-              :columns="columns"
-              :data="loadData"
-              :defaultLoadData="false"
-              bordered>
-            </s-table>
-          </a-collapse-panel>
-        </a-collapse>
+        <!-- alert -->
+        <a-alert type="info" style="margin-bottom:10px">
+          <div slot="message">
+            共 <strong>{{ total }}</strong> 条明细,
+            金额合计 <strong>{{ (basicInfoData&&(basicInfoData.totalSettleAmount || basicInfoData.totalSettleAmount==0)) ? toThousands(basicInfoData.totalSettleAmount) : '--' }}</strong> ,
+            结算金额合计 <strong>{{ (basicInfoData&&(basicInfoData.realSettleAmount || basicInfoData.realSettleAmount==0)) ? toThousands(basicInfoData.realSettleAmount) : '--' }}</strong>
+          </div>
+        </a-alert>
+        <!-- 列表 -->
+        <s-table
+          class="sTable"
+          ref="table"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :defaultLoadData="false"
+          bordered>
+        </s-table>
       </a-card>
       </a-card>
     </a-spin>
     </a-spin>
   </div>
   </div>
@@ -120,22 +116,18 @@ export default {
       settleUnitDetail({ id: this.$route.params.id }).then(res => {
       settleUnitDetail({ id: this.$route.params.id }).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           this.basicInfoData = res.data
           this.basicInfoData = res.data
+          this.$nextTick(() => {
+            this.$refs.table.refresh(true)
+          })
         } else {
         } else {
           this.basicInfoData = null
           this.basicInfoData = null
         }
         }
       })
       })
     }
     }
   },
   },
-  mounted () {
-    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
-      this.$refs.table.refresh(true)
-      this.getDetail()
-    }
-  },
   activated () {
   activated () {
     // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
     // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
     if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
     if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
-      this.$refs.table.refresh(true)
       this.getDetail()
       this.getDetail()
     }
     }
   },
   },

+ 1 - 1
src/views/salesManagement/salesQuery/edit.vue

@@ -6,7 +6,7 @@
         <template slot="subTitle">
         <template slot="subTitle">
           <a id="salesEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <a id="salesEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <a style="margin: 0 15px;color: #666;font-size: 18px;font-weight: 600;">单号:{{ detailData&&detailData.salesBillNo || '--' }}</a>
           <a style="margin: 0 15px;color: #666;font-size: 18px;font-weight: 600;">单号:{{ detailData&&detailData.salesBillNo || '--' }}</a>
-          <span style="margin: 0 10px;color: #666;">客户名称:{{ detailData&&detailData.buyerNameCurrent || '--' }}</span>
+          <span style="margin: 0 10px;color: #666;">客户名称:{{ detailData&&detailData.buyerNameCurrent?detailData.buyerName?detailData.buyerNameCurrent==detailData.buyerName?detailData.buyerNameCurrent:detailData.buyerNameCurrent+'('+detailData.buyerName+')':detailData.buyerNameCurrent:'--' }}</span>
           <a-button
           <a-button
             id="salesEdit-edit-btn"
             id="salesEdit-edit-btn"
             v-if="detailData&&detailData.salesTragetType != 'DEALER'"
             v-if="detailData&&detailData.salesTragetType != 'DEALER'"

+ 1 - 1
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -5,7 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
         <template slot="subTitle">
           <a id="salesReturnEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <a id="salesReturnEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <span style="margin: 0 15px;color: #666;">客户名称:{{ (ordeDetail&&ordeDetail.buyerNameCurrent) || '--' }}</span>
+          <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerNameCurrent?ordeDetail.buyerName?ordeDetail.buyerNameCurrent==ordeDetail.buyerName?ordeDetail.buyerNameCurrent:ordeDetail.buyerNameCurrent+'('+ordeDetail.buyerName+')':ordeDetail.buyerNameCurrent:'--' }}</span>
         </template>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra" v-if="$hasPermissions('B_salesReturnPrint')">
         <template slot="extra" v-if="$hasPermissions('B_salesReturnPrint')">

+ 1 - 1
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -5,7 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
         <template slot="subTitle">
           <a id="salesReturnGrabEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <a id="salesReturnGrabEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <span style="margin: 0 15px;color: #666;">客户名称:{{ (ordeDetail&&ordeDetail.buyerNameCurrent) || '--' }}</span>
+          <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerNameCurrent?ordeDetail.buyerName?ordeDetail.buyerNameCurrent==ordeDetail.buyerName?ordeDetail.buyerNameCurrent:ordeDetail.buyerNameCurrent+'('+ordeDetail.buyerName+')':ordeDetail.buyerNameCurrent:'--' }}</span>
         </template>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra" v-if="$hasPermissions('B_salesReturnPrint')">
         <template slot="extra" v-if="$hasPermissions('B_salesReturnPrint')">