浏览代码

修改bug

chenrui 2 年之前
父节点
当前提交
b2d30a1c17

+ 8 - 1
src/views/financialManagement/allocateReturnConfirmation/list.vue

@@ -43,6 +43,11 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="transferReturnConfirmation-refresh">查询</a-button>
@@ -95,11 +100,12 @@ import { commonMixin } from '@/utils/mixin'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { STable, VSelect } from '@/components'
 import AllocateReturnDetailModal from './detailModal.vue'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { allocateReturnQueryConfirmPage, allocateReturnFinanceAudit } from '@/api/allocateReturn'
 export default {
   name: 'AllocateReturnConfirmationList',
   mixins: [commonMixin],
-  components: { STable, VSelect, AllocateReturnDetailModal, rangeDate },
+  components: { STable, VSelect, AllocateReturnDetailModal, rangeDate, chooseWarehouse },
   data () {
     return {
       spinning: false,
@@ -144,6 +150,7 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货单号', scopedSlots: { customRender: 'allocateReturnNo' }, width: '16%', align: 'center' },
         { title: '调拨退货客户', dataIndex: 'targetName', align: 'center', width: '15%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓库', dataIndex: 'warehouseName', align: 'center', width: '15%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '是否抓单', dataIndex: 'grabFlagDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货总数量', dataIndex: 'totalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'totalBadQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 55 - 45
src/views/financialManagement/collectionDetailStatic/list.vue

@@ -18,23 +18,23 @@
             <a-col :md="6" :sm="24">
               <a-form-item label="收款打印状态">
                 <v-select
-                    v-model="queryParam.printStatus"
-                    code="PRINT_STATUS"
-                    placeholder="请选择收款打印状态"
-                    allowClear
-                  ></v-select>
+                  v-model="queryParam.printStatus"
+                  code="PRINT_STATUS"
+                  placeholder="请选择收款打印状态"
+                  allowClear
+                ></v-select>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-                <a-form-item label="开票状态">
-                  <v-select
-                    v-model="queryParam.invoiceStatus"
-                    code="FINANCE_BOOK_INVOICE_STATUS"
-                    placeholder="请选择开票状态"
-                    allowClear
-                  ></v-select>
-                </a-form-item>
-              </a-col>
+              <a-form-item label="开票状态">
+                <v-select
+                  v-model="queryParam.invoiceStatus"
+                  code="FINANCE_BOOK_INVOICE_STATUS"
+                  placeholder="请选择开票状态"
+                  allowClear
+                ></v-select>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="申请人">
                 <employee style="width: 100%;" id="collectionDetail-Employee" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
@@ -46,19 +46,19 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-                <a-form-item label="付款方类型">
-                  <v-select
-                    v-model="queryParam.payerType"
-                    code="PAYER_TYPE"
-                    placeholder="请选择付款方类型"
-                  ></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="付款方">
-                  <a-input id="financialCollectionList-payerName" v-model.trim="queryParam.payerName" allowClear placeholder="请输入付款方"/>
-                </a-form-item>
-              </a-col>
+              <a-form-item label="付款方类型">
+                <v-select
+                  v-model="queryParam.payerType"
+                  code="PAYER_TYPE"
+                  placeholder="请选择付款方类型"
+                ></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="付款方">
+                <a-input id="financialCollectionList-payerName" v-model.trim="queryParam.payerName" allowClear placeholder="请输入付款方"/>
+              </a-form-item>
+            </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-item label="财务编码">
@@ -113,6 +113,11 @@
                   <Area id="collectionDetail-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24" v-if="isShowWarehouse">
+                <a-form-model-item label="仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
             </template>
             <a-col :md="24" :sm="24" style="text-align:center;">
               <a-button type="primary" @click="searchForm" :disabled="disabled" id="collectionDetail-refresh">查询</a-button>
@@ -214,11 +219,12 @@ import invoiceModal from './invoiceModal.vue'
 import plInvoiceModal from './plInvoiceModal.vue'
 import noteModal from './noteModal.vue'
 import printModal from './printModal.vue'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { financeBookDetailQueryPage, financeBookDetailExport, financeBookReportDetailCount, financeBookDetailUpdateBatch } from '@/api/financeBook.js'
 export default {
   name: 'CollectionDetailStaticList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, employee, dealerSubareaScopeList, subarea, Area, invoiceModal, plInvoiceModal, noteModal, printModal },
+  components: { STable, VSelect, rangeDate, employee, dealerSubareaScopeList, subarea, Area, invoiceModal, plInvoiceModal, noteModal, printModal, chooseWarehouse },
   data () {
     return {
       spinning: false,
@@ -238,7 +244,7 @@ export default {
         fullPaymentFlag: undefined,
         bankAccount: undefined,
         bankName: undefined,
-        subareaArea:{
+        subareaArea: {
           subareaSn: undefined,
           subareaAreaSn: undefined
         },
@@ -248,7 +254,8 @@ export default {
         invoiceDateType: undefined,
         invoiceBeginDate: '',
         invoiceEndDate: '',
-        payerType: undefined
+        payerType: undefined,
+        warehouseSn: undefined // 仓库
       },
       invoiceIsShow: false,
       noteIsShow: false,
@@ -341,6 +348,9 @@ export default {
         { title: '收款打印状态', scopedSlots: { customRender: 'printStatus' }, align: 'center', width: '8%' },
         { title: '备注', scopedSlots: { customRender: 'note' }, align: 'center', width: '8%' }
       ]
+      if (this.isShowWarehouse) {
+        arr.splice(4, 0, { title: '仓库', dataIndex: 'warehouseName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true })
+      }
       return arr
     }
   },
@@ -352,7 +362,7 @@ export default {
       this.noteIsShow = false
       this.printIsShow = false
       this.plinvoiceIsShow = false
-      if(flag === 1){
+      if (flag === 1) {
         this.searchForm()
       }
     },
@@ -371,9 +381,9 @@ export default {
         return false
       }
 
-      if(e.key == 1){ // 批量允许打印
-        const dataList = rows.filter(item => !(item.printStatus=='NO_PRINT' || item.printStatus=='PRINT'))
-        if(dataList.length){
+      if (e.key == 1) { // 批量允许打印
+        const dataList = rows.filter(item => !(item.printStatus == 'NO_PRINT' || item.printStatus == 'PRINT'))
+        if (dataList.length) {
           this.$confirm({
             title: '批量允许打印',
             content: `已选有效数据 ${dataList.length} 条,确认将收款打印状态变更为允许打印吗?`,
@@ -384,37 +394,37 @@ export default {
               // 批量允许打印接口
               const data = []
               dataList.map(item => {
-                  data.push({id: item.id, printStatus: 'NO_PRINT' })
+                data.push({ id: item.id, printStatus: 'NO_PRINT' })
               })
               _this.plUpdateStatus(data)
             }
           })
-        }else{
+        } else {
           _this.$message.warning('没有可操作的有效数据!')
         }
       }
 
-      if(e.key == 2){ // 批量开票
+      if (e.key == 2) { // 批量开票
         const data = []
         rows.map(item => {
-          data.push({id: item.id, invoiceDate: '', remarks: '' })
+          data.push({ id: item.id, invoiceDate: '', remarks: '' })
         })
         _this.plinvoiceInfo = data
         _this.plinvoiceIsShow = true
       }
     },
     // 批量操作
-    plUpdateStatus(data){
+    plUpdateStatus (data) {
       this.spinning = true
       financeBookDetailUpdateBatch(data).then(res => {
-        if(res.status == 200){
+        if (res.status == 200) {
           this.searchForm()
         }
         this.spinning = false
       })
     },
     // 确定批量开票
-    plinvoiceOk(data){
+    plinvoiceOk (data) {
       this.plinvoiceInfo.map(item => {
         item.invoiceDate = data.invoiceDate
         item.remarks = data.remarks
@@ -450,11 +460,11 @@ export default {
       this.queryParam.auditBeginDate = date[0] ? date[0] : ''
       this.queryParam.auditEndDate = date[1] ? date[1] : ''
     },
-    searchForm(){
+    searchForm () {
       this.$refs.table.refresh(true)
       this.$refs.table.clearSelected()
     },
-    subareaChange(val){
+    subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
@@ -499,7 +509,7 @@ export default {
       this.queryParam.printStatus = undefined
       this.queryParam.invoiceStatus = undefined
       this.queryParam.payerType = undefined
-      if(this.advanced){
+      if (this.advanced) {
         this.$refs.subarea.clearData()
       }
       this.searchForm()
@@ -533,7 +543,7 @@ export default {
         payerName: con.payerName,
         bookDetailSn: con.bookDetailSn,
         invoiceDate: con.invoiceDate,
-        remarks: con.remarks ? con.remarks : '',
+        remarks: con.remarks ? con.remarks : ''
       }
       this.invoiceInfo = obj
       this.$nextTick(() => {

+ 9 - 1
src/views/financialManagement/inventoryConfirmation/list.vue

@@ -16,6 +16,11 @@
                 <a-input id="inventoryConfirmationList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="仓库">
+                <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryConfirmationList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryConfirmationList-reset">重置</a-button>
@@ -66,11 +71,12 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { checkWarehouseList, checkWarehouseReCheck, checkWarehouseFinanceAudit } from '@/api/checkWarehouse'
 export default {
   name: 'InventoryConfirmationList',
   mixins: [commonMixin],
-  components: { STable, VSelect },
+  components: { STable, VSelect, chooseWarehouse },
   data () {
     return {
       spinning: false,
@@ -115,6 +121,7 @@ export default {
           { title: '盘点状态', dataIndex: 'checkStateDictValue', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '监盘状态', dataIndex: 'checkSuperviseStateDictValue', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '盘点人', dataIndex: 'checkPersonName', align: 'center', width: '14%', customRender: function (text) { return text || '--' }, ellipsis: true },
+          { title: '仓库', dataIndex: 'warehouseName', align: 'center', width: '14%', customRender: function (text) { return text || '--' }, ellipsis: true },
           { title: '盘点时间', dataIndex: 'checkTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '监盘人', dataIndex: 'checkSupervisePersonName', align: 'center', width: '14%', customRender: function (text) { return text || '--' }, ellipsis: true },
           { title: '监盘时间', dataIndex: 'checkSuperviseTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -127,6 +134,7 @@ export default {
           { title: '盘点状态', dataIndex: 'checkStateDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '监盘状态', dataIndex: 'checkSuperviseStateDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '盘点人', dataIndex: 'checkPersonName', align: 'center', width: '16%', customRender: function (text) { return text || '--' }, ellipsis: true },
+          { title: '仓库', dataIndex: 'warehouseName', align: 'center', width: '16%', customRender: function (text) { return text || '--' }, ellipsis: true },
           { title: '盘点时间', dataIndex: 'checkTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '监盘人', dataIndex: 'checkSupervisePersonName', align: 'center', width: '16%', customRender: function (text) { return text || '--' }, ellipsis: true },
           { title: '监盘时间', dataIndex: 'checkSuperviseTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },

+ 8 - 1
src/views/financialManagement/returnConfirmation/list.vue

@@ -43,6 +43,11 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="returnConfirmationList-refresh">查询</a-button>
@@ -96,11 +101,12 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import { STable, VSelect } from '@/components'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import confirmationDetailModal from './detailModal.vue'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { salesReturnFinancialList, salesReturnFinancial } from '@/api/salesReturn'
 export default {
   name: 'ReturnConfirmationList',
   mixins: [commonMixin],
-  components: { STable, VSelect, confirmationDetailModal, dealerSubareaScopeList, rangeDate },
+  components: { STable, VSelect, confirmationDetailModal, dealerSubareaScopeList, rangeDate, chooseWarehouse },
   data () {
     return {
       spinning: false,
@@ -146,6 +152,7 @@ export default {
         { title: '单据来源', dataIndex: 'salesReturnBillSourceDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '15%', align: 'center' },
         { title: '客户名称', dataIndex: 'buyerName', align: 'center', width: '15%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓库', dataIndex: 'warehouseName', align: 'center', width: '15%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '申请退货数量', dataIndex: 'totalInitialQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓库实收数量', dataIndex: 'totalReceiveQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '退货金额', dataIndex: 'totalAmount', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 13 - 2
src/views/financialManagement/warehousingConfirmation/list.vue

@@ -21,6 +21,11 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24" v-if="isShowWarehouse">
+              <a-form-model-item label="仓库">
+                <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="warehousingConfirmationList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="warehousingConfirmationList-reset">重置</a-button>
@@ -98,17 +103,19 @@
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import confirmationDetailModal from './detailModal.vue'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { stockPutList, stockPutConfirm } from '@/api/stockPut'
 export default {
   name: 'WarehousingConfirmationList',
   mixins: [commonMixin],
-  components: { STable, VSelect, confirmationDetailModal },
+  components: { STable, VSelect, confirmationDetailModal, chooseWarehouse },
   data () {
     return {
       spinning: false,
       queryParam: { //  查询条件
         stockPutNo: '', //  入库单号
-        auditState: undefined //  状态
+        auditState: undefined, //  状态
+        warehouseSn: undefined // 仓库
       },
       tableHeight: 0,
       disabled: false, //  查询、重置按钮是否可操作
@@ -151,9 +158,13 @@ export default {
         { title: '备注', dataIndex: 'remark', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
+      if (this.isShowWarehouse) {
+        arr.splice(3, 0, { title: '仓库', dataIndex: 'warehouseName', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true })
+      }
       if (this.$hasPermissions('M_warehousingConfirmationList_costPrice')) { // 成本价权限
         arr.splice(4, 0, { title: '入库成本', dataIndex: 'productTotalCost', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
+
       return arr
     }
   },

+ 6 - 3
src/views/salesReturnManagement/pickUp/list.vue

@@ -48,9 +48,9 @@
                   ></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
+              <a-col :md="6" :sm="24" v-if="isShowWarehouse">
                 <a-form-model-item label="出库仓库">
-                  <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+                  <chooseWarehouse ref="warehouse" @change="handleWarehouse" :isPermission="true"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
             </template>
@@ -190,9 +190,12 @@ export default {
         { title: '发货方', dataIndex: 'dealerEntity.dealerName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收货人', dataIndex: 'receiverName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', dataIndex: 'stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '出库仓库', dataIndex: 'warehouse', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        // { title: '出库仓库', dataIndex: 'warehouse', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
+      if (this.isShowWarehouse) {
+        arr.splice(11, 0, { title: '出库仓库', dataIndex: 'warehouse', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
+      }
       return arr
     }
   },

+ 7 - 4
src/views/salesReturnManagement/receiveCheck/list.vue

@@ -32,9 +32,9 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="出库仓库">
-                <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+            <a-col :md="6" :sm="24" v-if="isShowWarehouse">
+              <a-form-model-item label="出库仓库" >
+                <chooseWarehouse ref="warehouse" @change="handleWarehouse" :isPermission="true"></chooseWarehouse>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -176,7 +176,7 @@ export default {
         { title: '审核时间', dataIndex: 'auditTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '10%', align: 'center' },
         { title: '客户名称', dataIndex: 'buyerName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '出库仓库', dataIndex: 'warehouse', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        // { title: '出库仓库', dataIndex: 'warehouse', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '申请退货数量', dataIndex: 'totalInitialQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓库实收数量', dataIndex: 'totalReceiveQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'totalBadQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -185,6 +185,9 @@ export default {
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
+      if (this.isShowWarehouse) {
+        arr.splice(4, 0, { title: '出库仓库', dataIndex: 'warehouse', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
+      }
       return arr
     }
   },