zhangdan 3 vuotta sitten
vanhempi
commit
86c17fbc6f

+ 3 - 3
src/views/numsGoodsShelves/recallManagement/list.vue

@@ -17,7 +17,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="货架名称">
-                <shelfList @change="shelfChange"></shelfList>
+                <shelfList ref="shelfList" @change="shelfChange"></shelfList>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
@@ -254,13 +254,13 @@ export default {
     // 取消掉回单
     handleCancel (row) {
       const _this = this
-      _this.spinning = true
       this.$confirm({
         title: '提示',
         content: '确定取消调回单吗?',
         centered: true,
         onOk: () => {
-          shelfRecallCancel({}).then(res => {
+          _this.spinning = true
+          shelfRecallCancel({ recallBillSn: row.recallBillSn }).then(res => {
             if (res.status == 200) {
               _this.$message.success(res.message)
               _this.spinning = false

+ 1 - 0
src/views/numsGoodsShelves/withdrawalManagement/applyWithdrawal.vue

@@ -111,6 +111,7 @@ export default {
               setTimeout(() => {
                 _this.opened = false
                 _this.$emit('close')
+                _this.$emit('refresh')
                 _this.spinning = false
               }, 1000)
             } else {

+ 2 - 2
src/views/numsGoodsShelves/withdrawalManagement/list.vue

@@ -40,7 +40,7 @@
       </s-table>
     </a-spin>
     <!-- 申请提现 -->
-    <applyWithdrawal :isOpenModal="showModal" :currentData="currentData" @close="showModal=false" @refresh="$refs.table.refresh(true)"></applyWithdrawal>
+    <applyWithdrawal :isOpenModal="showModal" :currentData="currentData" @close="showModal=false" @refresh="getPageInfo"></applyWithdrawal>
   </a-card>
 </template>
 
@@ -75,7 +75,7 @@ export default {
         { 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: 'operName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '状态', dataIndex: 'state', width: '5%', 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 || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象