浏览代码

Merge branch 'develop_szhj' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_szhj

lilei 3 年之前
父节点
当前提交
1d51272067

+ 53 - 30
src/views/numsGoodsShelves/recallManagement/list.vue

@@ -23,17 +23,17 @@
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-item label="产品编码">
-                  <a-input allowClear placeholder="请输入产品编码" v-model.tirm="queryParam.code"/>
+                  <a-input allowClear placeholder="请输入产品编码" v-model.tirm="queryParam.productCode"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="产品名称">
-                  <a-input allowClear placeholder="请输入产品名称" v-model.tirm="queryParam.name"/>
+                  <a-input allowClear placeholder="请输入产品名称" v-model.tirm="queryParam.productName"/>
                 </a-form-item>
               </a-col>
             </template>
             <a-col :md="6" :sm="24">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="outboundOrderList-refresh" >查询</a-button>
+              <a-button type="primary" @click="getSumByType" :disabled="disabled" id="outboundOrderList-refresh" >查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="outboundOrderList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px" v-if="activeKey==0">
                 {{ advanced ? '收起' : '展开' }}
@@ -43,7 +43,7 @@
           </a-row>
         </a-form>
       </div>
-      <a-tabs type="card" v-model="queryParam.billState" @change="tabChange" class="replenishmentManagementList-tabs ">
+      <a-tabs type="card" v-model="queryParam.bizType" @change="tabChange" class="replenishmentManagementList-tabs">
         <a-tab-pane v-for="item in tabsList" :key="item.code">
           <p slot="tab">{{ item.name }}<span v-if="item.countNum&&item.code=='WAIT_CONFIRM'" style="color:red">({{ item.countNum }})</span></p>
         </a-tab-pane>
@@ -57,24 +57,27 @@
         :columns="columns"
         :data="loadData"
         :scroll="{ y:tableHeight }"
-        @expand="expand"
-        :defaultLoadData="true"
+        :expandedRowKeys="expandedRowKeys"
+        @expand="expandFun"
         :expandRowByClick="true"
-        :defaultExpandAllRows="true"
+        :defaultLoadData="false"
         bordered>
         <template slot="action" slot-scope="text, record">
           <a-button
             size="small"
             type="link"
+            v-if="record.billState=='WAIT_CONFIRM'"
             class="button-primary"
             @click.stop="handleRecall(record)"
             id="shelfMonitoringList-warehousing-btn">退库</a-button>
           <a-button
             size="small"
+            v-if="record.billState=='WAIT_CONFIRM'"
             type="link"
             class="button-primary"
             @click.stop="handleCancel(record)"
             id="shelfMonitoringList-warehousing-btn">取消调回单</a-button>
+          <span v-if="record.billState!='WAIT_CONFIRM'" style="display: inline-block;margin-left: 7px;">--</span>
         </template>
         <a-table
           v-if="innerData&&innerData[index]"
@@ -82,7 +85,7 @@
           class="inner-table"
           slot-scope="record,index"
           slot="expandedRowRender"
-          :rowKey="(rec) => rec.id"
+          :rowKey="(record) => record.id"
           :columns="innerColumns"
           :data-source="innerData[index].innerData"
           :pagination="false"
@@ -102,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 {
@@ -117,6 +121,8 @@ export default {
       currentData: null,
       activeKey: 0, // 默认的tab
       tabsList: [],
+      currentType: 'ALL',
+      expandedRowKeys: [],
       time: [
         getDate.getCurrMonthDays().starttime,
         getDate.getCurrMonthDays().endtime
@@ -126,24 +132,24 @@ export default {
         endDate: getDate.getCurrMonthDays().endtime, // 结束时间
         recallBillNo: '',
         shelfSn: undefined, // 数字货架sn
-        billState: 'ALL'
+        bizType: 'ALL'
       },
       columns: [
         { 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 || '--' } },
+        { 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: [],
@@ -151,10 +157,10 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
+        this.expandedRowKeys = []
+        parameter.billState = this.queryParam.bizType == 'ALL' ? '' : this.queryParam.bizType
         const params = this.queryParam
-        if (params.billState == 'ALL') {
-          params.billState = ''
-        }
+        // delete params.bizType
         return shelfRecallList(Object.assign(parameter, params)).then(res => {
           let data
           if (res.status == 200) {
@@ -190,29 +196,39 @@ export default {
     // 切换tab
     tabChange (key) {
       console.log(key)
-      this.activeKey = key
-      this.queryParam.billState = key
-      this.$refs.table.refresh(true)
+      this.expandedRowKeys = []
+      setTimeout(() => {
+        this.queryParam.bizType = key
+        this.$refs.table.refresh(true)
+        this.currentType = key
+      }, 100)
     },
     // 获取各类型下的数量
     getSumByType () {
-      shelfRecallStateCount({}).then(res => {
+      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.billState = '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
-          this.$refs.table.refresh()
+          this.$refs.table.refresh(true)
         }
       })
     },
     // 点击行或图标触发接口
-    expand (expanded, record) {
+    expandFun (expanded, record) {
       if (expanded) {
+        this.expandedRowKeys.push(record.id)
         this.getinnerData(record) // 获取表格内部数据
+      } else {
+        const i = this.expandedRowKeys.findIndex(item => item == record.id)
+        this.expandedRowKeys.splice(i, 1)
       }
     },
     // 获取子表格数据
@@ -235,16 +251,23 @@ export default {
     },
     // 重置
     resetSearchForm () {
+      // this.$refs.rangeDate.resetDate(this.time)
+      // this.queryParam.billState = this.currentType
+      // this.queryParam = {
+      this.resetData()
+
+      this.getSumByType()
+    },
+    resetData () {
       this.$refs.rangeDate.resetDate(this.time)
+      this.queryParam.bizType = 'ALL'
       this.queryParam = {
         beginDate: getDate.getCurrMonthDays().starttime, // 开始时间
         endDate: getDate.getCurrMonthDays().endtime, // 结束时间
         recallBillNo: '', // 调回单号
-        shelfSn: undefined, // 数字货架sn
-        billState: 'ALL'
+        shelfSn: undefined // 数字货架sn
       }
       this.$refs.shelfList.resetForm()
-      this.$refs.table.refresh(true)
     },
     // 退库
     handleRecall (row) {
@@ -287,7 +310,7 @@ export default {
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()
-      this.resetSearchForm()
+      this.resetData()
     }
   },
   watch: {
@@ -305,7 +328,7 @@ export default {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
       this.pageInit()
-      this.resetSearchForm()
+      this.resetData()
     }
     // 仅刷新列表,不重置页面
     if (this.$store.state.app.updateList) {

+ 21 - 3
src/views/numsGoodsShelves/recallManagement/recallModal.vue

@@ -24,9 +24,12 @@
         :scroll="{ y:500 }"
         :pagination="false"
         bordered>
-        <template slot="confirmQty" slot-scope="text, record">
+        <template slot="confirmQty" slot-scope="text,record,index">
           <a-input-number
-            id="inputNumber"
+            size="small"
+            id="recallModal-inputNumber"
+            @focus="currentInd=index"
+            @change="changeNum"
             v-model="record.confirmQty"
             :precision="0"
             :min="0"
@@ -64,6 +67,7 @@ export default {
   },
   data () {
     return {
+      currentInd: 0,
       formItemLayout: {
         labelCol: { span: 6 },
         wrapperCol: { span: 15 }
@@ -89,6 +93,12 @@ export default {
   },
 
   methods: {
+    changeNum (val) {
+      console.log(val)
+      this.list[this.currentInd].confirmQty = val
+      this.list.splice()
+      console.log(this.list[this.currentInd].confirmQty, '调回数量')
+    },
     // 保存
     handleSave () {
       const _this = this
@@ -111,7 +121,7 @@ export default {
           })
           const params = {
             shelfSn: _this.list[0].shelfSn,
-            recallBillSn: _this.list.recallBillSn,
+            recallBillSn: _this.list[0].recallBillSn,
             recallBillNo: _this.list[0].recallBillNo,
             detailList: arr
           }
@@ -136,6 +146,7 @@ export default {
           const no = 0
           for (var i = 0; i < this.list.length; i++) {
             this.list[i].no = no + i + 1
+            this.list[i].confirmQty = this.list[i].qty
           }
         } else {
           this.list = []
@@ -153,6 +164,13 @@ export default {
       this.opened = nVal
       if (nVal) {
         this.getData()
+        // if (this.currentData) {
+        //   this.currentData.map((item, index) => {
+        //     item.no = index + 1
+        //     item.confirmQty = item.qty
+        //   })
+        // }
+        // this.list = JSON.parse(JSON.stringify(this.currentData || []))
       }
     }
   }

+ 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 => {

+ 26 - 24
src/views/numsGoodsShelves/shelfMonitoring/list.vue

@@ -52,8 +52,8 @@
                     <a-row>
                       <a-col :span="11">
                         <a-input-number
-                          id="shelfMonitoringList-beginDate"
-                          v-model="queryParam.beginDate"
+                          id="shelfMonitoringList-unsalableDaysBegin"
+                          v-model="queryParam.unsalableDaysBegin"
                           :precision="0"
                           :min="0"
                           :max="999999"
@@ -63,8 +63,8 @@
                       <a-col :span="2"><span style="display: block;text-align: center;line-height: 32px;">至</span></a-col>
                       <a-col :span="11">
                         <a-input-number
-                          id="shelfMonitoringList-endDate"
-                          v-model="queryParam.endDate"
+                          id="shelfMonitoringList-unsalableDaysEnd"
+                          v-model="queryParam.unsalableDaysEnd"
                           :precision="0"
                           :min="0"
                           :max="999999"
@@ -172,21 +172,23 @@ export default {
         productCode: '',
         productName: '',
         state: undefined,
-        beginDate: undefined,
-        endDate: undefined
+        unsalableDaysBegin: undefined,
+        unsalableDaysEnd: undefined
       },
       rules: {
         'shelfSn': [{ required: true, message: '请选择货架', trigger: 'change' }]
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '货位号', dataIndex: 'shelfPlaceCode', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '绑定产品编码', dataIndex: 'productCode', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '绑定产品名称', dataIndex: 'productName', width: '23%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '货位产品状态', scopedSlots: { customRender: 'state' }, width: '15%', align: 'center' },
+        { title: '货位号', dataIndex: 'shelfPlaceCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '绑定产品编码', dataIndex: 'productCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '绑定产品名称', dataIndex: 'productName', width: '18%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '货位产品状态', dataIndex: 'stateDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '补货在途', dataIndex: 'replenishBillQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '调回在途', dataIndex: 'recallBillQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '当前库存', dataIndex: 'qty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '最大库容', dataIndex: 'maxQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '滞销天数', dataIndex: 'unsalableDays', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '滞销天数', dataIndex: 'unsalableDays', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'left' }
       ],
       // 加载数据方法 必须为 Promise 对象
@@ -232,29 +234,29 @@ export default {
   methods: {
     // 校验滞销天数数值范围
     checkValueRange () {
-      const isONull = this.queryParam.beginDate === null || this.queryParam.beginDate === undefined
-      const isOEmpty = this.queryParam.beginDate === ''
-      const isOZero = this.queryParam.beginDate === 0
-      const isTNull = this.queryParam.endDate === null || this.queryParam.endDate === undefined
-      const isTEmpty = this.queryParam.endDate === ''
-      const isTZero = this.queryParam.endDate === 0
+      const isONull = this.queryParam.unsalableDaysBegin === null || this.queryParam.unsalableDaysBegin === undefined
+      const isOEmpty = this.queryParam.unsalableDaysBegin === ''
+      const isOZero = this.queryParam.unsalableDaysBegin === 0
+      const isTNull = this.queryParam.unsalableDaysEnd === null || this.queryParam.unsalableDaysEnd === undefined
+      const isTEmpty = this.queryParam.unsalableDaysEnd === ''
+      const isTZero = this.queryParam.unsalableDaysEnd === 0
       //  第一个为空(可为null可为空字符)第二个不为空
       //  第一个不为空第二个为空(可为null可为空字符)
       //  第一个大于第二个
-      if ((isONull || isOEmpty) && (this.queryParam.endDate || isTZero)) {
+      if ((isONull || isOEmpty) && (this.queryParam.unsalableDaysEnd || isTZero)) {
         this.$message.info('请输入正确的滞销天数查询范围!')
         return false
       }
-      if ((this.queryParam.beginDate || isOZero) && (isTNull || isTEmpty)) {
+      if ((this.queryParam.unsalableDaysBegin || isOZero) && (isTNull || isTEmpty)) {
         this.$message.info('请输入正确的滞销天数查询范围!')
         return false
       }
-      if (this.queryParam.beginDate > this.queryParam.endDate) {
+      if (this.queryParam.unsalableDaysBegin > this.queryParam.unsalableDaysEnd) {
         this.$message.info('请输入正确的滞销天数查询范围!')
         return false
       }
-      this.queryParam.beginDate = this.queryParam.beginDate > 999999999 ? 999999999 : this.queryParam.beginDate
-      this.queryParam.endDate = this.queryParam.endDate > 999999999 ? 999999999 : this.queryParam.endDate
+      this.queryParam.unsalableDaysBegin = this.queryParam.unsalableDaysBegin > 999999999 ? 999999999 : this.queryParam.unsalableDaysBegin
+      this.queryParam.unsalableDaysEnd = this.queryParam.unsalableDaysEnd > 999999999 ? 999999999 : this.queryParam.unsalableDaysEnd
       return true
     },
     rowSelectionFun (obj) {
@@ -286,8 +288,8 @@ export default {
       this.queryParam.productCode = ''
       this.queryParam.productName = ''
       this.queryParam.state = undefined
-      this.queryParam.beginDate = undefined
-      this.queryParam.endDate = undefined
+      this.queryParam.unsalableDaysBegin = undefined
+      this.queryParam.unsalableDaysEnd = undefined
       this.handleSearch()
     },
     // 新增调回单

+ 6 - 2
src/views/numsGoodsShelves/shelfMonitoring/warehouseDetail.vue

@@ -58,6 +58,10 @@
           :data="loadData"
           :defaultLoadData="false"
           bordered>
+          <template slot="qty" slot-scope="text, record">
+            {{ (record.bizType == 'PUT_REPLENISH_BILL' || record.bizType == 'MONTH') ? '+' : (record.bizType == 'OUT_RECALL_BILL' || record.bizType == 'OUT_ORDER_BILL') ? '-':'' }}
+            {{ (record.qty || record.qty==0) ? record.qty : '--' }}
+          </template>
         </s-table>
       </a-card>
     </a-spin>
@@ -89,8 +93,8 @@ export default {
         { title: '产品编码', dataIndex: 'productCode', width: '17%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: '24%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '关联单据类型', dataIndex: 'bizTypeDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '关联单据号', dataIndex: 'bizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '数量', dataIndex: 'qty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '关联单据号', dataIndex: 'bizNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '数量', scopedSlots: { customRender: 'qty' }, width: '8%', align: 'center' }
         // { title: '状态', dataIndex: 'stateDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 5 - 2
src/views/numsGoodsShelves/shelfSet/bindProductModal.vue

@@ -163,6 +163,9 @@ export default {
           if (this.type != 'bind') { // 修改信息、更换产品
             form.shelfProductSn = _this.nowData && _this.nowData.shelfProductApiEntity && _this.nowData.shelfProductApiEntity.shelfProductSn
           }
+          if (this.type == 'replace') { // 更换产品
+            form.updateProductFlag = 1
+          }
           _this.spinning = true
           shelfProductSave(form).then(res => {
             if (res.status == 200) {
@@ -185,7 +188,7 @@ export default {
       shelfProductDetail({ shelfPlaceSn: this.nowData && this.nowData.shelfPlaceSn }).then(res => {
         if (res.status == 200 && res.data) {
           this.productInfo = res.data
-          if(this.type == 'edit'){
+          if (this.type == 'edit') {
             this.form.productSn = res.data.productSn
             this.form.productCode = res.data.productCode
           }
@@ -198,7 +201,7 @@ export default {
         }
       })
     },
-    resetData(){
+    resetData () {
       this.form.productSn = undefined
       this.form.productCode = undefined
       this.form.price = ''

+ 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 = []