lilei 2 gadi atpakaļ
vecāks
revīzija
4779c3d43d

+ 1 - 0
src/views/allocationManagement/transferReturn/edit.vue

@@ -24,6 +24,7 @@
                   id="allocateEdit-allocateReturnTypeSn"
                   style="width: 220px;"
                   v-model="allocateTypeVal"
+                  :allowClear="false"
                   placeholder="请选择费用/调拨退货类型"
                   @change="changeAllocateType"></AllocateType>
               </a-descriptions-item>

+ 2 - 1
src/views/allocationManagement/transfersPrint/recordModal.vue

@@ -15,7 +15,8 @@
             {{ tipData&&tipData.allocateNo }}
           </a-descriptions-item>
           <a-descriptions-item label="调拨类型">
-            {{ tipData&&tipData.allocateTypeName }}
+            <span v-if="tipData&&tipData.allocateSortName">{{ tipData.allocateSortName || '--' }}</span>
+            <span v-if="tipData&&tipData.allocateTypeName">/{{ tipData.allocateTypeName || '--' }}</span>
           </a-descriptions-item>
           <a-descriptions-item label="调往对象">
             {{ tipData&&tipData.targetName }}

+ 5 - 1
src/views/common/allocateType.js

@@ -3,7 +3,7 @@ const AllocateType = {
   template: `
       <a-cascader
         :value="defaultVal"
-        allowClear
+        :allowClear="allowClear"
         :change-on-select="changeOnSelect"
         @change="handleChange"
         :options="list"
@@ -31,6 +31,10 @@ const AllocateType = {
       type: Boolean,
       default: false
     },
+    allowClear:{
+      type: Boolean,
+      default: true
+    },
     level:{
       type: [String,Number],
       default: ''

+ 13 - 3
src/views/reportData/transferReturnDetailReport/list.vue

@@ -124,11 +124,20 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 2960 }"
+        :scroll="{ x: 3050 }"
         :defaultLoadData="false"
         bordered>
+        <!-- 调拨类型 -->
+        <template slot="allocateType" slot-scope="text, record">
+          <div>
+            <span v-if="record.allocateSortName">{{ record.allocateSortName }}</span>
+            <span v-if="record.allocateSortName&&record.allocateReturnTypeName">/</span>
+            <span v-if="record.allocateReturnTypeName">{{ record.allocateReturnTypeName }}</span>
+          </div>
+        </template>
         <template slot="footer">
           <a-row :gutter="15">
+            <a-col :md="4" :sm="24"></a-col>
             <a-col :md="4" :sm="24">退货总数量:{{ (totalData && (totalData.returnQty || totalData.returnQty==0)) ? totalData.returnQty : '--' }}</a-col>
             <a-col :md="4" :sm="24">坏件总数量:{{ (totalData && (totalData.badQty || totalData.badQty==0)) ? totalData.badQty : '--' }}</a-col>
             <a-col :md="4" :sm="24">返库总数量:{{ (totalData && (totalData.backStockQty || totalData.backStockQty==0)) ? totalData.backStockQty : '--' }}</a-col>
@@ -243,9 +252,10 @@ export default {
         { title: '调拨退货单号', dataIndex: 'allocateReturnNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货完成日期', dataIndex: 'financeAuditTime', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', dataIndex: 'dealerEntity.provinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '调拨退货对象类型', dataIndex: 'targetTypeDictValue', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '调拨退货对象类型', dataIndex: 'targetTypeDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '调拨退货对象名称', dataIndex: 'targetName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '调拨退货类型', dataIndex: 'allocateReturnTypeName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '费用类型', dataIndex: 'costTypeName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调拨退货类型', scopedSlots: { customRender: 'allocateType' }, width: 120, align: 'center' },
         { title: '品牌', dataIndex: 'productEntity.productBrandName', width: 130, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '二级分类', dataIndex: 'productEntity.productTypeName2', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productEntity.name', width: 250, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },

+ 12 - 2
src/views/reportData/transferReturnReport/list.vue

@@ -86,8 +86,17 @@
         :scroll="{ x: 1100 }"
         :defaultLoadData="false"
         bordered>
+        <!-- 调拨类型 -->
+        <template slot="allocateType" slot-scope="text, record">
+          <div>
+            <span v-if="record.allocateSortName">{{ record.allocateSortName }}</span>
+            <span v-if="record.allocateSortName&&record.allocateReturnTypeName">/</span>
+            <span v-if="record.allocateReturnTypeName">{{ record.allocateReturnTypeName }}</span>
+          </div>
+        </template>
         <template slot="footer">
           <a-row :gutter="15">
+            <a-col :md="4" :sm="24"></a-col>
             <a-col :md="4" :sm="24">退货总数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
             <a-col :md="4" :sm="24">坏件总数量:{{ (totalData && (totalData.totalBadQty || totalData.totalBadQty==0)) ? totalData.totalBadQty : '--' }}</a-col>
             <a-col :md="4" :sm="24">返库总数量:{{ (totalData && (totalData.totalBackStockQty || totalData.totalBackStockQty==0)) ? totalData.totalBackStockQty : '--' }}</a-col>
@@ -170,9 +179,10 @@ export default {
       const arr = [
         { title: '退货单号', dataIndex: 'allocateReturnNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货完成日期', dataIndex: 'financeAuditTime', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调拨退货对象类型', dataIndex: 'targetTypeDictValue', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '调拨退货对象类型', dataIndex: 'targetTypeDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '调拨退货对象名称', dataIndex: 'targetName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '调拨退货类型', dataIndex: 'allocateReturnTypeName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '费用类型', dataIndex: 'costTypeName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调拨退货类型', scopedSlots: { customRender: 'allocateType' }, width: 120, align: 'center' },
         { title: '退货总数量', dataIndex: 'totalQty', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'totalBadQty', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '返库数量', dataIndex: 'totalBackStockQty', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },