zhangdan 3 tahun lalu
induk
melakukan
fa7f3a4d90

+ 10 - 8
src/views/numsGoodsShelves/recallManagement/list.vue

@@ -105,6 +105,7 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import { STable } from '@/components'
 import recallModal from './recallModal.vue'
 import getDate from '@/libs/getDate.js'
+import { toThousands } from '@/libs/tools.js'
 import shelfList from '@/views/common/shelfList.vue'
 import { shelfRecallList, shelfRecallDetailList, shelfRecallCancel, shelfRecallStateCount } from '@/api/shelfRecall.js'
 export default {
@@ -137,18 +138,18 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调回单号', dataIndex: 'recallBillNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '货架名称', dataIndex: 'shelfInfo.shelfName', width: '25%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '货架名称', dataIndex: 'shelfInfo.shelfName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '状态', dataIndex: 'billStateDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调回总量', dataIndex: 'totalQty', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '实退总量', dataIndex: 'totalConfirmQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
+        { title: '调回总量', dataIndex: 'totalQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? toThousands(text) : '--' } },
+        { title: '实退总量', dataIndex: 'totalConfirmQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? toThousands(text) : '--' } },
         { title: '操作', width: '10%', align: 'left', scopedSlots: { customRender: 'action' } }
       ],
       innerColumns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '产品编码', dataIndex: 'product.code', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'product.name', width: '30%', align: 'left', customRender: function (text) { return text || '--' } },
-        { title: '调回数量', dataIndex: 'qty', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '实退数量', dataIndex: 'confirmQty', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'product.name', width: '30%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '调回数量', dataIndex: 'qty', width: '15%', align: 'center', customRender: function (text) { return (text || text == 0) ? toThousands(text) : '--' } },
+        { title: '实退数量', dataIndex: 'confirmQty', width: '15%', align: 'center', customRender: function (text) { return (text || text == 0) ? toThousands(text) : '--' } },
         { title: '单位', dataIndex: 'product.unit', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       innerData: [],
@@ -205,13 +206,14 @@ export default {
     // 获取各类型下的数量
     getSumByType () {
       const params = JSON.parse(JSON.stringify(this.queryParam))
+      params.billState = params.bizType == 'ALL' ? '' : params.bizType
       delete params.bizType
       shelfRecallStateCount(params).then(res => {
         if (res.status == 200) {
           this.tabsList = [
             { code: 'ALL', name: '全部', countNum: 0 }, { code: 'WAIT_CONFIRM', name: '待退库', countNum: 0 }, { code: 'FINISH', name: '已完成', countNum: 0 }, { code: 'CANCEL', name: '已取消', countNum: 0 }
           ]
-          this.queryParam.bizType = 'ALL'
+          // this.queryParam.bizType = 'ALL'
           this.tabsList[1].countNum = res.data.WAIT_CONFIRM || 0
           this.tabsList[2].countNum = res.data.FINISH || 0
           this.tabsList[3].countNum = res.data.CANCEL || 0
@@ -258,7 +260,7 @@ export default {
     },
     resetData () {
       this.$refs.rangeDate.resetDate(this.time)
-      this.queryParam.bizType = this.currentType
+      this.queryParam.bizType = 'ALL'
       this.queryParam = {
         beginDate: getDate.getCurrMonthDays().starttime, // 开始时间
         endDate: getDate.getCurrMonthDays().endtime, // 结束时间

+ 6 - 8
src/views/numsGoodsShelves/settlementManagement/detailModal.vue

@@ -23,7 +23,7 @@
         </a-descriptions>
         <!-- 可导入数据 -->
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :rowKey="(record) => record.allocateSn"
@@ -31,7 +31,7 @@
           :data="loadData"
           :loading="loading"
           :defaultLoadData="true"
-          :scroll="{ y: 200 }"
+          :scroll="{ y: 600 }"
           bordered>
         </s-table>
       </div>
@@ -70,14 +70,13 @@ export default {
         { title: '货位号', dataIndex: 'shelfPlaceCode', width: '7%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品编码', width: '15%', dataIndex: 'productCode', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', width: '20%', dataIndex: 'productName', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品售价', width: '10%', dataIndex: 'salePrice', align: 'right', customRender: function (text) { return toThousands(text, 2) || '--' } },
+        { title: '结算价', width: '10%', dataIndex: 'settlePrice', align: 'right', customRender: function (text) { return toThousands(text, 2) || '--' } },
         { title: '下单数量', width: '8%', dataIndex: 'totalQty', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '合计金额', width: '10%', dataIndex: 'saleAmount', align: 'right', customRender: function (text) { return toThousands(text, 2) || '--' } }
       ],
       loadData: parameter => {
         this.spinning = true
-        const paramsPage = Object.assign(parameter)
-        paramsPage.settleBillSn = this.settleData ? this.settleData.settleBillSn : ''
+        const paramsPage = Object.assign(parameter, { settleBillSn: this.settleData && this.settleData.settleBillSn ? this.settleData.settleBillSn : '' })
         return queryOrderBillDetailPage(paramsPage).then(res => {
           let data
           if (res.status == 200) {
@@ -106,13 +105,12 @@ export default {
     isShow (newValue, oldValue) {
       if (!newValue) {
         this.$emit('close')
+      } else {
+        this.$refs.table.refresh(true)
       }
     },
     settleData (newValue, oldValue) {
       if (this.isShow && newValue) {
-        if (this.settleData && this.settleData.settleBillSn) {
-          this.$refs.table.refresh(true)
-        }
       }
     }
   }

+ 1 - 0
src/views/numsGoodsShelves/settlementManagement/list.vue

@@ -139,6 +139,7 @@ export default {
         _this.disabled = true
         _this.spinning = true
         const paramsPage = Object.assign(parameter, this.queryParam) //  有分页
+        paramsPage.payState = 'FINISH'
         if (this.checkValueRange()) {
           return queryShelfSettleRulePage(paramsPage).then(res => {
             let data

+ 2 - 2
src/views/numsGoodsShelves/settlementManagement/settlementDetail.vue

@@ -89,10 +89,10 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: '12.5%', align: 'center' },
-        { title: '结算时间', dataIndex: 'payDate', width: '25%', align: 'center', scopedSlots: { customRender: 'name' } },
+        { title: '结算时间', dataIndex: 'payDate', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '结算金额', dataIndex: 'settleAmount', width: '25%', align: 'right', customRender: function (text) { return toThousands(text, 2) || '--' } },
         { title: '支付方式', dataIndex: 'payWayDictValue', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', width: '12.5%', align: 'right', scopedSlots: { customRender: 'action' } }
+        { title: '操作', width: '12.5%', align: 'left', scopedSlots: { customRender: 'action' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 10 - 3
src/views/numsGoodsShelves/withdrawalManagement/applyWithdrawal.vue

@@ -109,8 +109,7 @@ export default {
             if (res.status == 200) {
               _this.$message.success(res.message)
               setTimeout(() => {
-                _this.opened = false
-                _this.$emit('close')
+                _this.cancel()
                 _this.$emit('refresh')
                 _this.spinning = false
               }, 1000)
@@ -133,7 +132,15 @@ export default {
   watch: {
     isOpenModal (nVal, oVal) {
       this.opened = nVal
-      this.getPageInfo()
+      // this.getPageInfo()
+    },
+    opend (nVal, oVal) {
+      if (nVal) {
+        this.getPageInfo()
+      } else {
+        this.form.amount = ''
+        this.$emit('close')
+      }
     }
   }
 }

+ 8 - 4
src/views/numsGoodsShelves/withdrawalManagement/list.vue

@@ -11,7 +11,7 @@
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="6" :md="6" :sm="6">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="outboundOrderList-refresh" >查询</a-button>
+              <a-button type="primary" @click="getRefresh" :disabled="disabled" id="outboundOrderList-refresh" >查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="outboundOrderList-reset">重置</a-button>
             </a-col>
           </a-row>
@@ -20,7 +20,7 @@
       <div style="margin:10px 0">
         <div style="display: flex;align-items: center;padding: 2px 0;">
           <div style="display: flex;align-items: center;">
-            可提现金额:<span>{{ pageInfo?toThousands(pageInfo.activeAmount,2):'--' }}</span>
+            可提现金额:<span>{{ pageInfo &&pageInfo.activeAmount?toThousands(pageInfo.activeAmount,2):'--' }}</span>
             <a-button size="small" type="primary" class="button-primary" @click="handleTX">申请提现</a-button>
             <span>(提示:① 提现手续费为0.5元/笔;② 资金到账周期为工作日+1天)</span>
           </div>
@@ -73,8 +73,8 @@ export default {
         { title: '提现单号', dataIndex: 'cashOutNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '提现时间', dataIndex: 'cashOutDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '申请提现金额', dataIndex: 'amount', width: '10%', align: 'right', customRender: function (text) { return toThousands(text, 2) || '--' } },
-        { title: '开户名', dataIndex: 'bankAccount', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '银行卡号', dataIndex: 'bankCard', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '开户名', dataIndex: 'bankAccount', width: '15%', align: 'center', customRender: function (text) { return text || '--' },ellipsis: true },
+        { title: '银行卡号', dataIndex: 'bankCard', width: '20%', align: 'center', customRender: function (text) { return text || '--' },ellipsis: true },
         { title: '提现人', dataIndex: 'operName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', dataIndex: 'stateDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '备注', dataIndex: 'remarks', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
@@ -125,6 +125,10 @@ export default {
         }
       })
     },
+    getRefresh(){
+      this.getPageInfo()
+      this.$refs.table.refresh(true)
+    },
     // 重置
     resetSearchForm () {
       this.time = []