lilei пре 3 година
родитељ
комит
bfbc5c9b06

+ 2 - 2
src/views/numsGoodsShelves/accountManagement/applyWithdrawal.vue

@@ -28,13 +28,13 @@
           <span>{{}}</span>
         </a-form-model-item>
         <a-form-model-item label="实际到账">
-          <span>{{}}(申请提现金额-提现手续费)</span>
+          <span>{{}}元 </span><span style="color: #999;">(申请提现金额-提现手续费)</span>
         </a-form-model-item>
         <a-form-model-item label="提现账户">
           <span>{{}}</span>
         </a-form-model-item>
         <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
-          <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="applyWithdrawal-btn-submit">保存</a-button>
+          <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="applyWithdrawal-btn-submit">确定</a-button>
           <a-button @click="cancel" style="margin-left: 15px" id="applyWithdrawal-btn-back">取消</a-button>
         </a-form-model-item>
       </a-form-model>

+ 12 - 11
src/views/numsGoodsShelves/accountManagement/list.vue

@@ -10,24 +10,24 @@
                 <a-range-picker v-model="time" allowClear :disabledDate="disabledDate" format="YYYY-MM-DD"/>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="6" :md="6" :sm="6" style="padding-top: 4px;">
+            <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 style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="outboundOrderList-reset">重置</a-button>
             </a-col>
           </a-row>
         </a-form>
       </div>
-      <a-alert type="info" style="margin:10px 0">
-        <div slot="message" style="display: flex;align-items: center;padding: 2px 0;">
+      <div style="margin:10px 0">
+        <div style="display: flex;align-items: center;padding: 2px 0;">
           <div>
-            账户余额:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? totalData.totalAmount : '--' }}</strong>元;
-            可提现金额:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
+            账户余额:<strong>¥986.00 </strong>元;
+            可提现金额:<strong>¥500.00</strong>;
           </div>
           <div>
             <a-button size="small" type="primary" class="button-primary" @click="handleTX">申请提现</a-button>
           </div>
         </div>
-      </a-alert>
+      </div>
       <s-table
         class="sTable fixPagination"
         ref="table"
@@ -64,11 +64,12 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '交易时间', dataIndex: 'createDate', width: '15%', align: 'center' },
-        { title: '调回单号', dataIndex: 'name', width: '30%', align: 'center' },
-        { title: '货架名称', dataIndex: 'remarks', width: '10%', align: 'center' },
-        { title: '状态', dataIndex: 'remarks', width: '10%', align: 'center' },
-        { title: '调回总量', dataIndex: 'remarks', width: '10%', align: 'center' },
-        { title: '操作', width: '10%', align: 'center', scopedSlots: { customRender: 'action' } }
+        { title: '交易说明', dataIndex: 'name', width: '30%', align: 'center' },
+        { title: '交易类型', dataIndex: 'remarks', width: '10%', align: 'center' },
+        { title: '交易金额', dataIndex: 'remarks', width: '10%', align: 'center' },
+        { title: '手续费', dataIndex: 'remarks', width: '10%', align: 'center' },
+        { title: '账户变动', dataIndex: 'remarks', width: '10%', align: 'center' },
+        { title: '变动后余额', dataIndex: 'remarks', width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {