Selaa lähdekoodia

Merge commit 'ea538a4d1a0c39fd2ca66033e1fffd362b4e7135' into HEAD

gitadmin 2 kuukautta sitten
vanhempi
commit
2ce8b98884

+ 1 - 2
src/views/salesManagement/salesQuery/detail.vue

@@ -61,7 +61,7 @@
               急件总款数:<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>;
-              <template v-if="showCost">
+              <template v-if="!showCell.includes('totalCost')">
                 总成本:<strong>{{ detailData&&(detailData.totalCost || detailData.totalCost==0) ? toThousands(detailData.totalCost) : '--' }}</strong>;
                 总毛利:<strong>{{ detailData&&(detailData.grossProfit || detailData.grossProfit==0) ? toThousands(detailData.grossProfit) : '--' }}</strong>;
               </template>
@@ -150,7 +150,6 @@ export default {
       showPage: false, // 是否显示组件
       spinning: false, // 加载动画
       disabled: false, // 禁用按钮
-      showCost: false, // 是否显示成本价
       printOrgCode: false, // 打印原创编码
       printAllName: false, // 打印全部名称
       showOutInModal: false, // 出库弹框

+ 1 - 2
src/views/salesManagement/salesQueryNew/detail.vue

@@ -68,7 +68,7 @@
               急件总款数:<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>;
-              <template v-if="showCost">
+              <template v-if="!showCell.includes('totalCost')">
                 总成本:<strong>{{ detailData&&(detailData.totalCost || detailData.totalCost==0) ? toThousands(detailData.totalCost) : '--' }}</strong>;
                 总毛利:<strong>{{ detailData&&(detailData.grossProfit || detailData.grossProfit==0) ? toThousands(detailData.grossProfit) : '--' }}</strong>;
               </template>
@@ -157,7 +157,6 @@ export default {
       showPage: false, // 是否显示组件
       spinning: false,
       disabled: false,
-      showCost: false, // 是否显示成本价
       printOrgCode: false, // 是否打印原创编码
       printAllName: false, // 是否打印全部名称
       printRemarks: false, // 是否打印备注