chenrui 5 mesiacov pred
rodič
commit
3a8087f87b

+ 6 - 1
src/views/numsGoodsShelves/withdrawalManagementNew/list.vue

@@ -11,7 +11,7 @@
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="6" :md="6" :sm="6">
-              <a-button type="primary" @click="getPageInfo" :disabled="disabled" id="withdrawal-refresh" >查询</a-button>
+              <a-button type="primary" @click="handleSearch" :disabled="disabled" id="withdrawal-refresh" >查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="withdrawal-reset">重置</a-button>
             </a-col>
           </a-row>
@@ -134,6 +134,11 @@ export default {
         }
       })
     },
+    // 查询
+    handleSearch () {
+      this.getPageInfo()
+      this.$refs.table.refresh(true)
+    },
     // 重置
     resetSearchForm () {
       this.time = []

+ 4 - 2
src/views/salesManagement/onlinePayOrder/detail.vue

@@ -77,8 +77,10 @@
               急件总款数:<strong>{{ detailData&&(detailData.oosCategory || detailData.oosCategory==0) ? detailData.oosCategory : '--' }}</strong>;
               急件总数量:<strong>{{ detailData&&(detailData.oosQty || detailData.oosQty==0) ? detailData.oosQty : '--' }}</strong>;<br/>
               总售价:<strong>{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }}</strong>;
-              总成本:<strong>{{ detailData&&(detailData.totalCost || detailData.totalCost==0) ? toThousands(detailData.totalCost) : '--' }}</strong>;
-              总毛利:<strong>{{ detailData&&(detailData.grossProfit || detailData.grossProfit==0) ? toThousands(detailData.grossProfit) : '--' }}</strong>;
+              <template v-if="showCost">
+                总成本:<strong>{{ detailData&&(detailData.totalCost || detailData.totalCost==0) ? toThousands(detailData.totalCost) : '--' }}</strong>;
+                总毛利:<strong>{{ detailData&&(detailData.grossProfit || detailData.grossProfit==0) ? toThousands(detailData.grossProfit) : '--' }}</strong>;
+              </template>
               <span v-if="detailData&&detailData.sourceType&&detailData.sourceType==='XPRH_PURCHASE'"> 返券金额:<strong>{{ detailData&&(detailData.totalGiveAmount || detailData.totalGiveAmount==0) ? toThousands(detailData.totalGiveAmount) : '--' }}</strong>;</span>
             </div>
             <div>