changhaoning 1 год назад
Родитель
Сommit
444fa8cccb

+ 2 - 7
src/view/report/detail-report/setting.js

@@ -213,7 +213,6 @@ const data = {
       {itemCode: 'nonStdCode'},
       {itemCode: 'whName'},
       {itemCode: 'skuName'},
-      {itemCode: 'flgViewItem',valueKind:'SWITCH',itemName:'查看明细'},
     ],
     // 列表列
     columns: [
@@ -221,7 +220,7 @@ const data = {
       {field: 'skuName'},
       {field: 'skuModel'},
       {field: 'brandName'},
-      {field: 'categoryName'},
+      {field: 'categoryName',title:$t('catName')},
       {field: 'unitName'},
       {field: 'conversionFactor'},
       {field: 'seriesName'},
@@ -230,7 +229,7 @@ const data = {
       {field: 'priceStandard'},
       {field: 'priceWholesale'},
       {field: 'priceLimited'},
-      {field: 'skuImages'},
+      {field: 'path', title:$t('skuImages'),type:'image'},
       {field: 'nonStdCode'},
       {field: 'invQty',dataType: 'number',align:'right', digits: 2, sum: true},
       {field: 'outingQty',dataType: 'number',align:'right', digits: 2, sum: true},
@@ -240,10 +239,6 @@ const data = {
       {field: 'priceInto'},
       {field: 'remarks', width: 'auto'}
     ],
-    detailColumns:[
-      {field: 'orgCode1'},
-      {field: 'orgName2'},
-    ]
   },
   // 采购明细表
   'pur-detail-report': {

+ 3 - 3
src/view/sale/order-track-report/index.vue

@@ -84,7 +84,7 @@
     </DkCollapse>
     <!--    出库单-->
     <DkCollapse @on-change="changeCollapse" ref="collapse" v-if="this.tabsModel ==='outbound' ">
-      <DkTabs v-model="tabsModelOut" :options="tabsOptionsOut" @on-click="tabsClickOut"></DkTabs>
+      <DkTabs v-model="tabsModelOut" :options="tabsOptionsOut" @on-click="tabsClickOut" v-if="tabsOptionsOut.length>0"></DkTabs>
       <DkPanel prop="essentialInformation">
         <!--  单据信息  -->
         <DkForm slot="content" ref="formInline" v-model="ordOutboundData"
@@ -174,7 +174,7 @@
     </DkCollapse>
     <!-- 退货单-->
     <DkCollapse @on-change="changeCollapse" ref="collapse" v-if="this.tabsModel ==='ordOutReturn' ">
-      <DkTabs v-model="tabsModelOutReturn" :options="tabsOptionsOutReturn" @on-click="tabsClickOutReturn"></DkTabs>
+      <DkTabs v-model="tabsModelOutReturn" :options="tabsOptionsOutReturn" @on-click="tabsClickOutReturn" v-if="tabsOptionsOutReturn.length>0"></DkTabs>
       <DkPanel prop="essentialInformation">
         <!--  单据信息  -->
         <DkForm slot="content" ref="formInline" v-model="ordOutReturnData"
@@ -255,7 +255,7 @@
     </DkCollapse>
     <!--   订单收款-->
     <DkCollapse @on-change="changeCollapse" ref="collapse" v-if="this.tabsModel ==='ordRecPay' ">
-      <DkTabs v-model="tabsModelRecPay" :options="tabsOptionsRecPay" @on-click="tabsClickRecPay"></DkTabs>
+      <DkTabs v-model="tabsModelRecPay" :options="tabsOptionsRecPay" @on-click="tabsClickRecPay" v-if="tabsOptionsRecPay.length>0"></DkTabs>
       <DkPanel prop="essentialInformation">
         <!--  单据信息  -->
         <DkForm slot="content" ref="formInline" v-model="ordRecPayData"