lilei 1 rok temu
rodzic
commit
8a7f4f567a

+ 1 - 1
src/views/reportData/urchaseDetailReturn/detailList.vue

@@ -60,7 +60,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="出库仓库">
-                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
+                  <chooseWarehouse isPermission ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">

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

@@ -27,6 +27,11 @@
                 <supplier v-model="queryParam.supplierSn" isPermission placeholder="请输入供应商名称"></supplier>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+                <a-form-model-item label="出库仓库">
+                  <chooseWarehouse isPermission ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="退货原因">
                 <v-select
@@ -100,12 +105,13 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import supplier from '@/views/common/supplier.js'
 import { hdExportExcel } from '@/libs/exportExcel'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import reportModal from '@/views/common/reportModal.vue'
 import { sparePartsReturnReportList, sparePartsReturnReportStat, sparePartsReturnReportExport } from '@/api/reportData'
 export default {
   name: 'UrchaseReturn',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, supplier, reportModal },
+  components: { STable, VSelect, rangeDate, supplier, reportModal, chooseWarehouse },
   data () {
     return {
       spinning: false,
@@ -121,6 +127,7 @@ export default {
         endDate: getDate.getCurrMonthDays().endtime,
         sparePartsReturnNo: undefined,
         supplierSn: undefined,
+        warehouseSn: undefined,
         returnReason: undefined
       },
       rules: {
@@ -154,6 +161,7 @@ export default {
         { title: '采购退货单号', dataIndex: 'sparePartsReturnNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货完成日期', dataIndex: 'auditDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '供应商名称', dataIndex: 'supplierName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '出库仓库', dataIndex: 'warehouseName', width: 150, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '退货原因', dataIndex: 'returnReasonDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '补充说明', dataIndex: 'explainInfo', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '附件', width: 120, align: 'center', scopedSlots: { customRender: 'attachmentList' } },
@@ -231,6 +239,7 @@ export default {
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.sparePartsReturnNo = ''
       this.queryParam.supplierSn = undefined
+      this.queryParam.warehouseSn = undefined
       this.queryParam.returnReason = undefined
       this.totalData = null
       this.$refs.ruleForm.resetFields()