Browse Source

Merge branch 'develop_yh12' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh12

lilei 2 years ago
parent
commit
5394f5996d

+ 18 - 4
src/views/purchasingManagement/purchaseReturn/addModal.vue

@@ -53,10 +53,24 @@
             placeholder="具体描述下退货原因"
             allowClear />
         </a-form-model-item>
+        <a-form-model-item label="附件" help="(支持图片、word、excel、PDF等格式,最多10个附件)" :label-col="{span:4}" :wrapper-col="{span:18}">
+          <Upload
+            style="height: 100%;"
+            id="allocateBill-attachList"
+            v-model="form.attachmentList"
+            ref="attachList"
+            :fileSize="10"
+            :maxNums="10"
+            fileType="*"
+            uploadType="attach"
+            :action="attachAction"
+            @change="changeAttach"
+            upText="上传附件"></Upload>
+        </a-form-model-item>
       </a-form-model>
       <div class="btn-cont">
-        <a-button type="primary" id="bulkWarehousingOrder-basicInfo-modal-save" @click="handleSave">保存</a-button>
-        <a-button id="bulkWarehousingOrder-basicInfo-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
+        <a-button id="bulkWarehousingOrder-basicInfo-modal-back" @click="isShow = false">取消</a-button>
+        <a-button style="margin-left: 15px;" type="primary" id="bulkWarehousingOrder-basicInfo-modal-save" @click="handleSave">确定</a-button>
       </div>
     </a-spin>
   </a-modal>
@@ -64,13 +78,13 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
-import { VSelect } from '@/components'
+import { VSelect, Upload } from '@/components'
 import { supplierAllList } from '@/api/supplier'
 import { sparePartsSave } from '@/api/spareParts'
 export default {
   name: 'BulkWarehousingOrderBasicInfoModal',
   mixins: [commonMixin],
-  components: { VSelect },
+  components: { VSelect, Upload },
   props: {
     openModal: { //  弹框显示状态
       type: Boolean,

+ 17 - 3
src/views/purchasingManagement/purchaseReturn/detailModal.vue

@@ -4,17 +4,26 @@
     class="confirmationDetail-modal"
     :footer="null"
     :maskClosable="false"
-    title="详情"
+    title="采购退货详情"
     v-model="isShow"
     @cancel="isShow=false"
     :width="960">
     <div>
       <a-descriptions size="small" :column="4" style="margin-bottom: 10px;">
+        <a-descriptions-item label="采购退货单号">{{ nowData&&nowData.stockPutNo || '--' }}</a-descriptions-item>
         <a-descriptions-item label="入库单号">{{ nowData&&nowData.stockPutNo || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="批次号">{{ nowData&&nowData.stockPutNo || '--' }}</a-descriptions-item>
         <a-descriptions-item label="供应商名称">{{ nowData&&nowData.putTime || '--' }}</a-descriptions-item>
         <a-descriptions-item label="退货原因">{{ nowData&&nowData.putBizTypeDictValue || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="退货金额">{{ nowData&&nowData.putBizTypeDictValue || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="补充说明">{{ nowData&&nowData.putBizTypeDictValue || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="附件">{{ nowData&&nowData.putBizTypeDictValue || '--' }}</a-descriptions-item>
       </a-descriptions>
+      <!-- 退货金额 -->
+      <a-alert type="info" style="margin-bottom:10px">
+        <div slot="message">
+          <span>退货金额 <strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? productTotal.totalPrice : '--' }}</strong></span>
+        </div>
+      </a-alert>
       <s-table
         class="sTable"
         ref="table"
@@ -27,6 +36,8 @@
       </s-table>
       <div class="auditProgress">审核进度</div>
       <a-divider />
+      <div class="tip">说明:以下信息来自钉钉</div>
+      <div class="tip">提审时间:2022-12-29 16:16:04</div>
       <a-table :columns="auditColumns" :data-source="data" bordered>
       </a-table>
       <div class="btn-cont"><a-button id="confirmationDetail-modal-back" @click="isShow = false">返回列表</a-button></div>
@@ -143,6 +154,9 @@ export default {
     margin-top:24px;
   }
   .ant-divider-horizontal{
-    margin:10px 0 24px;
+    margin:20px 0 4px;
+  }
+  .tip{
+    line-height: 30px;
   }
 </style>

+ 32 - 4
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -23,14 +23,40 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="提交时间">
+              <a-form-item label="创建时间">
                 <rangeDate ref="rangeDate" @change="dateChange" />
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="入库单号">
+                <a-input id="bulkWarehousingOrderList-sparePartsNo" v-model.trim="queryParam.sparePartsNo" allowClear placeholder="请输入入库单号"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="退货原因">
+                <v-select
+                  v-model="queryParam.state"
+                  ref="state"
+                  id="bulkWarehousingOrderList-state"
+                  code="SPARE_PARTS_STATE"
+                  placeholder="请选择退货原因"
+                  allowClear
+                ></v-select>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderList-refresh">查询</a-button>
                 <a-button style="margin-left: 5px" @click="resetSearchForm()" :disabled="disabled" id="bulkWarehousingOrderList-reset">重置</a-button>
+                <a-button
+                  style="margin-left: 10px"
+                  v-if="$hasPermissions('B_sparePartsExport')"
+                  type="primary"
+                  class="button-warning"
+                  @click="handleExport"
+                  :disabled="disabled"
+                  :loading="exportLoading"
+                >导出明细</a-button>
               </span>
             </a-col>
           </a-row>
@@ -47,7 +73,7 @@
           @click="handleExport"
           :disabled="disabled"
           :loading="exportLoading"
-        >导出明细</a-button>
+        >同步到ERP</a-button>
         <span style="margin-left: 8px">
           <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
         </span>
@@ -93,7 +119,7 @@
             v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_sparePartsEdit')"
             @click="handleEdit(record)"
             class="button-info"
-            id="bulkWarehousingOrderList-edit-btn">详情</a-button>
+            id="bulkWarehousingOrderList-edit-btn">同步到ERP</a-button>
           <a-button
             size="small"
             type="link"
@@ -127,6 +153,7 @@ import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import addModal from './addModal.vue'
 import detailModal from './detailModal.vue'
+import rangeDate from '@/views/common/rangeDate.vue'
 import chooseDepartUserModal from './chooseDepartUserModal.vue'
 import reportModal from '@/views/common/reportModal.vue'
 import { hdExportExcel } from '@/libs/exportExcel'
@@ -134,7 +161,7 @@ import { sparePartsList, sparePartsDelete, sparePartsAudit, sparePartsDetailExpo
 export default {
   name: 'BulkWarehousingOrderList',
   mixins: [commonMixin],
-  components: { STable, VSelect, reportModal, detailModal, addModal, chooseDepartUserModal },
+  components: { STable, VSelect, reportModal, detailModal, addModal, chooseDepartUserModal, rangeDate },
   data () {
     return {
       spinning: false,
@@ -185,6 +212,7 @@ export default {
 	    const arr = [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
 	      { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+	      { title: '采购退货单号', scopedSlots: { customRender: 'sparePartsNo' }, width: '15%', align: 'center' },
 	      { title: '入库单号', scopedSlots: { customRender: 'sparePartsNo' }, width: '15%', align: 'center' },
 	      { title: '供应商名称', dataIndex: 'supplierName', align: 'center', width: '15%', customRender: function (text) { return text || '--' }, ellipsis: true },
 	      { title: '退回原因', dataIndex: 'remark', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },

+ 10 - 8
src/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue

@@ -10,10 +10,14 @@
       <a-card size="small" :bordered="false" class="outboundOrderDetail-cont">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="基础信息">
-            <a-descriptions size="small" :column="3" style="margin-bottom: 10px;">
+            <a-descriptions size="small" :column="4" style="margin-bottom: 10px;">
+              <a-descriptions-item label="采购退货单号">CT20221229000001</a-descriptions-item>
               <a-descriptions-item label="入库单号">SJ221222000001</a-descriptions-item>
+              <a-descriptions-item label="批次号">SJ221222000001</a-descriptions-item>
               <a-descriptions-item label="供应商名称">东莞市绿冠滤清器有限公司</a-descriptions-item>
-              <a-descriptions-item label="创建时间">2022-12-30 14:22</a-descriptions-item>
+              <a-descriptions-item label="退货原因">2022-12-30 14:22</a-descriptions-item>
+              <a-descriptions-item label="补充说明">2022-12-30 14:22</a-descriptions-item>
+              <a-descriptions-item label="附件">2022-12-30 14:22</a-descriptions-item>
             </a-descriptions>
           </a-collapse-panel>
         </a-collapse>
@@ -66,8 +70,6 @@
           ref="table"
           size="small"
           :rowKey="(record) => record.id"
-          :row-selection="{ columnWidth: 40 }"
-          @rowSelection="rowSelectionFun"
           :columns="columns"
           :data="loadData"
           :defaultLoadData="false"
@@ -235,10 +237,10 @@ export default {
         { title: '退款金额', dataIndex: 'returnReason', align: 'center', width: '13%', scopedSlots: { customRender: 'returnReason' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(4, 0, { title: '参考退货单价', dataIndex: 'price', align: 'center', width: '8%', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(7, 0, { title: '参考退货金额', align: 'center', dataIndex: 'totalAmount', width: '8%', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-      }
+      // if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      //   arr.splice(4, 0, { title: '参考退货单价', dataIndex: 'price', align: 'center', width: '8%', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+      //   arr.splice(7, 0, { title: '参考退货金额', align: 'center', dataIndex: 'totalAmount', width: '8%', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+      // }
       return arr
     }
   },

+ 11 - 9
src/views/purchasingManagement/purchaseReturn/queryPart.vue

@@ -31,6 +31,8 @@
       ref="table"
       size="small"
       :rowKey="(record) => record.id"
+      :row-selection="{ columnWidth: 40 }"
+      @rowSelection="rowSelectionFun"
       :columns="columns"
       :data="loadData"
       :customRow="handleClickRow"
@@ -179,15 +181,15 @@ export default {
         { title: '申请退货数量', dataIndex: 'qty', width: '9%', align: 'center', scopedSlots: { customRender: 'qty' } },
         { slots: { title: 'customTitle' }, scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
-      let i = 5
-      if (this.$hasPermissions('B_isShowPrice') && this.isShowPrice) { //  售价权限
-        arr.splice(4, 0, { title: '当前售价', dataIndex: 'productPrice', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        i = 6
-      }
-      // 实收数量是否显示
-      if (this.showReceiveQty) {
-        arr.splice(i, 0, { title: '仓库实收数量', dataIndex: 'receiveQty', width: '9%', align: 'center', scopedSlots: { customRender: 'receiveQty' } })
-      }
+      // let i = 5
+      // if (this.$hasPermissions('B_isShowPrice') && this.isShowPrice) { //  售价权限
+      //   arr.splice(4, 0, { title: '当前售价', dataIndex: 'productPrice', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+      //   i = 6
+      // }
+      // // 实收数量是否显示
+      // if (this.showReceiveQty) {
+      //   arr.splice(i, 0, { title: '仓库实收数量', dataIndex: 'receiveQty', width: '9%', align: 'center', scopedSlots: { customRender: 'receiveQty' } })
+      // }
       this.columns = arr
       this.resetSearchForm()
     },

+ 16 - 21
src/views/reportData/urchaseDetailReturn/detailList.vue

@@ -62,11 +62,11 @@
                     v-model="productType" />
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
+              <!-- <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
                   <subarea id="salesReturnDetailList-subareaSn" v-model="queryParam.subareaSn"></subarea>
                 </a-form-model-item>
-              </a-col>
+              </a-col> -->
               <a-col :md="12" :sm="24">
                 <a-row>
                   <a-form-model-item label="地区">
@@ -233,41 +233,36 @@ export default {
   computed: {
     columns () {
       const arr = [
-        { title: '区域', dataIndex: 'subareaNames', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '采购退货单号', dataIndex: 'subareaNames', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库单号', dataIndex: 'salesReturnBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', dataIndex: 'dealerProvinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '供应商名称', dataIndex: 'dealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '退货原因', dataIndex: 'returnReason', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '补充说明', dataIndex: 'returnReason', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '附件', dataIndex: 'returnReason', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货完成日期', dataIndex: 'salesReturnDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productBrandName', width: 130, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '二级分类', dataIndex: 'productTypeName2', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品编码', dataIndex: 'productCode', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: 150, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'productUnit', width: 50, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '入库单价', dataIndex: 'initialQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '入库数量', dataIndex: 'receiveQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '已退数量', dataIndex: 'badQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '申请退货数量', dataIndex: 'goodQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '申请退货数量', dataIndex: 'goodQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作员', dataIndex: 'goodQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
 
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        const ind = this.$hasPermissions('B_isShowCost') ? 29 : 28
-        arr.splice(20, 0, { title: '退货开单价', dataIndex: 'price', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(21, 0, { title: '退货开单金额', dataIndex: 'totalPrice', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(22, 0, { title: '退货实售价', dataIndex: 'realPrice', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(23, 0, { title: '退货实售金额', dataIndex: 'totalRealAmount', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(24, 0, { title: '市级价金额', dataIndex: 'totalWholesalePrice2', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(25, 0, { title: '直接差价', dataIndex: 'directRebateAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(26, 0, { title: '间接差价', dataIndex: 'indirectRebateAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(ind, 0, { title: '正常退货金额', dataIndex: 'totalNormalPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-      }
-      if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
-        const ind = this.$hasPermissions('B_isShowPrice') ? 27 : 20
-        arr.splice(ind, 0, { title: '再入库单价', dataIndex: 'cost', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(ind + 3, 0, { title: '正常再入库金额', dataIndex: 'totalNormalCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(ind + 4, 0, { title: '正常退货入库差额', dataIndex: 'totalNormalBalance', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        // const ind = this.$hasPermissions('B_isShowCost') ? 29 : 28
+        arr.splice(13, 0, { title: '入库单价', dataIndex: 'price', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(17, 0, { title: '退货金额', dataIndex: 'totalPrice', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
+      // if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
+      //   const ind = this.$hasPermissions('B_isShowPrice') ? 27 : 20
+      //   arr.splice(ind, 0, { title: '再入库单价', dataIndex: 'cost', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+      //   arr.splice(ind + 3, 0, { title: '正常再入库金额', dataIndex: 'totalNormalCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+      //   arr.splice(ind + 4, 0, { title: '正常退货入库差额', dataIndex: 'totalNormalBalance', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+      // }
       return arr
     }
   },

+ 9 - 10
src/views/reportData/urchaseReturn/list.vue

@@ -100,11 +100,11 @@
         bordered>
         <template slot="footer">
           <a-row :gutter="15">
-            <a-col :md="4" :sm="24">总数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
+            <!-- <a-col :md="4" :sm="24">总数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
             <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">入库单据量:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</a-col>
             <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">供应商数量:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? totalData.totalRealAmount : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">入库数量:{{ (totalData && (totalData.totalWholesalePrice2 || totalData.totalWholesalePrice2==0)) ? totalData.totalWholesalePrice2 : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">已退数量:{{ (totalData && (totalData.totalWholesalePrice1 || totalData.totalWholesalePrice1==0)) ? totalData.totalWholesalePrice1 : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">入库数量:{{ (totalData && (totalData.totalWholesalePrice2 || totalData.totalWholesalePrice2==0)) ? totalData.totalWholesalePrice2 : '--' }}</a-col> -->
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">申请退货数量:{{ (totalData && (totalData.totalWholesalePrice1 || totalData.totalWholesalePrice1==0)) ? totalData.totalWholesalePrice1 : '--' }}</a-col>
             <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">退货金额:{{ (totalData && (totalData.totalWholesalePrice3 || totalData.totalWholesalePrice3==0)) ? totalData.totalWholesalePrice3 : '--' }}</a-col>
           </a-row>
         </template>
@@ -186,21 +186,20 @@ export default {
   computed: {
     columns () {
       const arr = [
+        { title: '采购退货单号', dataIndex: 'salesReturnBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库单号', dataIndex: 'salesReturnBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货完成日期', dataIndex: 'salesReturnDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '供应商名称', dataIndex: 'dealerName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '退货原因', dataIndex: 'dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '补充说明', dataIndex: 'dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '附件', dataIndex: 'dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { 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: 'totalBadQty', 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: 'operatorName', width: 130, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(7, 0, { title: '入库单据量', dataIndex: 'totalAmount', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(8, 0, { title: '供应商数量', dataIndex: 'totalWholesalePrice2', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(9, 0, { title: '入库数量', dataIndex: 'totalWholesalePrice1', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(10, 0, { title: '已退数量', dataIndex: 'totalWholesalePrice3', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(11, 0, { title: '退货金额', dataIndex: 'totalRealAmount', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(7, 0, { title: '入库单价', dataIndex: 'totalAmount', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(10, 0, { title: '退货金额', dataIndex: 'totalRealAmount', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
       return arr
     }

+ 15 - 23
src/views/supplierManagement/costSetRecord/list.vue

@@ -16,7 +16,7 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="品牌">
+              <a-form-item label="产品品牌">
                 <ProductBrand id="associatedProduct-productBrandSn" v-model="queryParam.product.productBrandSn"></ProductBrand>
               </a-form-item>
             </a-col>
@@ -94,6 +94,20 @@ export default {
           productTypeSn3: '' //  产品三级分类
         }
       },
+      columns: [
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '变更时间', dataIndex: 'product.name', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'product.name', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'product.code', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '成本价(¥)', dataIndex: 'cost', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '原厂编码', dataIndex: 'product.origCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品品牌', dataIndex: 'product.productBrandName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '18%', align: 'center' },
+        { title: '供应商名称', dataIndex: 'supplierName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '变更前', dataIndex: 'supplierName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '变更后', dataIndex: 'supplierName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } }
+
+      ],
       disabled: false, //  查询、重置按钮是否可操作
       productType: [],
       // 加载数据方法 必须为 Promise 对象
@@ -116,28 +130,6 @@ export default {
       }
     }
   },
-  computed: {
-    columns () {
-      const arr = [
-        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '变更时间', dataIndex: 'product.name', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'product.name', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'product.code', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        // { title: '成本价(¥)', dataIndex: 'cost', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '原厂编码', dataIndex: 'product.origCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品品牌', dataIndex: 'product.productBrandName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '18%', align: 'center' },
-        { title: '供应商名称', dataIndex: 'supplierName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '变更前', dataIndex: 'supplierName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '变更后', dataIndex: 'supplierName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } }
-
-      ]
-      if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
-        arr.splice(6, 0, { title: '成本价(¥)', dataIndex: 'cost', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-      }
-      return arr
-    }
-  },
   methods: {
     //  重置
     resetSearchForm () {