chenrui 6 ヶ月 前
コミット
16ddb128b4

+ 2 - 2
src/config/router.config.js

@@ -715,7 +715,7 @@ export const asyncRouterMap = [
             meta: {
               title: '线上支付账单',
               icon: 'monitor',
-              permission: 'M_onlinePayInvoice'
+              permission: 'M_onlinePayInvoiceList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -777,7 +777,7 @@ export const asyncRouterMap = [
             meta: {
               title: '提现管理',
               icon: 'monitor',
-              permission: 'M_withdrawalManagementNew'
+              permission: 'M_withdrawalManagementNewList'
             },
             hideChildrenInMenu: true,
             children: [

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

@@ -26,7 +26,7 @@
         <div class="alert-message">
           账单总金额:<strong>{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }}</strong>;
           其中收款金额:<strong>{{ detailData&&(detailData.skAmount || detailData.skAmount==0) ? toThousands(detailData.skAmount) : '--' }}</strong>;
-          退款金额:<strong>{{ detailData&&(detailData.tkzAmount || detailData.tkzAmount==0) ? toThousands(detailData.tkzAmount) : '--' }}</strong>;
+          退款金额:<strong>{{ detailData&&(detailData.tkzAmount || detailData.tkzAmount==0) ? toThousands(detailData.tkzAmount) : '--' }}</strong>;
           已退款金额:<strong>{{ detailData&&(detailData.tkAmount || detailData.tkAmount==0) ? toThousands(detailData.tkAmount) : '--' }}</strong>;
         </div>
       </div>
@@ -49,7 +49,7 @@
             v-if="$hasPermissions('M_onlinePayInvoiceDetail')"
             @click="handleUndetail(record)"
             :id="'onlinePayInvoice-detail-btn-'+record.id">明细</a-button>
-            <div v-else>--</div>
+          <div v-else>--</div>
         </template>
       </s-table>
     </a-spin>
@@ -87,7 +87,7 @@ export default {
         { title: '关联客户', dataIndex: 'customerName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '账单总金额', dataIndex: 'totalAmount', width: '15%', align: 'right', customRender: function (text) { return _this.toThousands(text, 2) || '--' } },
         { title: '收款金额', dataIndex: 'skAmount', width: '15%', align: 'right', customRender: function (text) { return _this.toThousands(text, 2) || '--' } },
-        { title: '退款金额', dataIndex: 'tkzAmount', width: '15%', align: 'right', customRender: function (text) { return _this.toThousands(text, 2) || '--' } },
+        { title: '退款金额', dataIndex: 'tkzAmount', width: '15%', align: 'right', customRender: function (text) { return _this.toThousands(text, 2) || '--' } },
         { title: '已退款金额', dataIndex: 'tkAmount', width: '15%', align: 'right', customRender: function (text) { return _this.toThousands(text, 2) || '--' } },
         { title: '操作', width: '15%', align: 'center', scopedSlots: { customRender: 'action' } }
       ],

+ 17 - 9
src/views/numsGoodsShelves/withdrawalManagementNew/applyWithdrawal.vue

@@ -22,14 +22,15 @@
           <a-input-number
             v-model="form.amount"
             :min="0.1"
-            style="width: 100%;"
+            style="width: 73%;"
             :precision="2"
+            :max="activeAmount-0.5"
             id="applyWithdrawal-amount"
-            placeholder="请输入正数(最多两位小数)"
-            allowClear />
+            placeholder="请输入正数(最多两位小数)" />
+          <a-button type="primary" class="button-primary" @click="handleAmount" id="applyWithdrawal-getNum-btn">全部</a-button>
         </a-form-model-item>
         <a-form-model-item label="实际扣除金额">
-          <span>{{ (serviceCharge||serviceCharge==0)?toThousands(serviceCharge,2):'--' }}元 </span><span style="color: #999;">(申请提现金额+提现手续费)</span>
+          <span>{{ (activeAmount||activeAmount==0)?toThousands(activeAmount,2):'--' }}元 </span><span style="color: #999;">(申请提现金额+提现手续费)</span>
         </a-form-model-item>
         <a-form-model-item label="提现账户">
           <span style="display: block;" v-if="pageInfo">{{ pageInfo.merchantBankAccountEntity?pageInfo.merchantBankAccountEntity.bankAccount:'' }}{{ ' ( '+ pageInfo.dealerName +' ) ' }}</span>
@@ -53,13 +54,17 @@ export default {
     isOpenModal: {
       type: Boolean,
       default: false
+    },
+    activeAmount: {
+      type: [Number, String],
+      default: 0
     }
   },
-  computed: {
-    serviceCharge () {
-      return this.form.amount ? this.form.amount + 0.5 : 0
-    }
-  },
+  // computed: {
+  //   serviceCharge () {
+  //     return (this.activeAmount || this.activeAmount == 0) ? this.activeAmount * 1 + 0.5 : 0
+  //   }
+  // },
   data () {
     return {
       formItemLayout: {
@@ -78,6 +83,9 @@ export default {
     }
   },
   methods: {
+    handleAmount () {
+      this.form.amount = this.activeAmount - 0.5
+    },
     // 获取详情信息
     getPageInfo () {
       this.spinning = true

+ 10 - 10
src/views/numsGoodsShelves/withdrawalManagementNew/billFlowModal.vue

@@ -15,7 +15,7 @@
           <a-row :gutter="15">
             <a-col :md="7" :sm="24">
               <a-form-item label="创建时间">
-                <rangeDate id="billFlowModal-createDate" ref="createDate" v-model="time" @change="createDateChange" />
+                <rangeDate id="billFlowModal-createDate" ref="rangeDate" v-model="time" @change="createDateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -24,8 +24,8 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="关联财务单号">
-                <a-input id="billFlowModal-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入关联财务单号"/>
+              <a-form-item label="关联单号">
+                <a-input id="billFlowModal-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入关联单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="5" :sm="24">
@@ -68,13 +68,13 @@
       </div>
       <div class="table-operator">
         <div class="alert-message">
-          收入金额:<strong>{{ detailData&&(detailData.skAmount || detailData.skAmount==0) ? toThousands(detailData.skAmount) : '--' }}</strong>
-          其中到账金额:<strong>{{ detailData&&(detailData.skdzAmount || detailData.skdzAmount==0) ? toThousands(detailData.skdzAmount) : '--' }}</strong>
-          在途金额:<strong>{{ detailData&&(detailData.skztAmount || detailData.skztAmount==0) ? toThousands(detailData.skztAmount) : '--' }}</strong>
-          支出金额:<strong>{{ detailData&&(detailData.kkAmount || detailData.kkAmount==0) ? toThousands(detailData.kkAmount) : '--' }}</strong>
-          其中退款金额:<strong>{{ detailData&&(detailData.tkAmount || detailData.tkAmount==0) ? toThousands(detailData.tkAmount) : '--' }}</strong>
-          提现金额:<strong>{{ detailData&&(detailData.txAmount || detailData.txAmount==0) ? toThousands(detailData.txAmount) : '--' }}</strong>
-          提现服务费:<strong>{{ detailData&&(detailData.txfwfAmount || detailData.txfwfAmount==0) ? toThousands(detailData.txfwfAmount) : '--' }}</strong>
+          收入金额:<strong>{{ detailData&&(detailData.skAmount || detailData.skAmount==0) ? toThousands(detailData.skAmount) : '--' }}</strong>
+          其中到账金额:<strong>{{ detailData&&(detailData.skdzAmount || detailData.skdzAmount==0) ? toThousands(detailData.skdzAmount) : '--' }}</strong>
+          在途金额:<strong>{{ detailData&&(detailData.skztAmount || detailData.skztAmount==0) ? toThousands(detailData.skztAmount) : '--' }}</strong>
+          支出金额:<strong>{{ detailData&&(detailData.kkAmount || detailData.kkAmount==0) ? toThousands(detailData.kkAmount) : '--' }}</strong>
+          其中退款金额:<strong>{{ detailData&&(detailData.tkAmount || detailData.tkAmount==0) ? toThousands(detailData.tkAmount) : '--' }}</strong>
+          提现金额:<strong>{{ detailData&&(detailData.txAmount || detailData.txAmount==0) ? toThousands(detailData.txAmount) : '--' }}</strong>
+          提现服务费:<strong>{{ detailData&&(detailData.txfwfAmount || detailData.txfwfAmount==0) ? toThousands(detailData.txfwfAmount) : '--' }}</strong>
         </div>
       </div>
       <!-- 列表 -->

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

@@ -20,7 +20,7 @@
       <div style="margin:10px 0">
         <div style="margin:10px 0">
           账户总金额:{{ pageInfo&&pageInfo.totalAmount?toThousands(pageInfo.totalAmount):'--' }}(包含可提现金额:<span>{{ pageInfo&&pageInfo.activeAmount?toThousands(pageInfo.activeAmount):'--' }}</span>,在途金额:{{ pageInfo&&pageInfo.floatAmount?toThousands(pageInfo.floatAmount):'--' }})
-          <p style="margin-top:10px;">(提示:①提现手续费为0.5元/笔;②资金到账周期为工作日+1天;③销售单需审核通过后才能提现;④销售单审核不通过或修理厂取消订单后将会在1-3个工作日原路返回到修理厂)</p>
+          <p style="margin-top:10px;">(提示:①提现手续费为0.5元/笔;②资金到账周期为工作日+1天;③线上支付订单需审核通过后才能提现;④订单被审核不通过或修理厂取消订单后将会在1-3个工作日原路返回到修理厂)</p>
         </div>
         <a-button id="withdrawal-tixian" v-if="$hasPermissions('B_withdrawalAudit')" type="primary" class="button-primary" @click="handleTX">申请提现</a-button>
         <a-button id="withdrawal-zhangdan" class="button-info" v-if="$hasPermissions('B_billFlow')" @click="showBillFlowModal=true">账单流水</a-button>
@@ -39,7 +39,7 @@
       </s-table>
     </a-spin>
     <!-- 申请提现 -->
-    <applyWithdrawal :isOpenModal="showModal" @close="showModal=false" @refresh="getPageInfo"></applyWithdrawal>
+    <applyWithdrawal :activeAmount="pageInfo&&pageInfo.activeAmount" :isOpenModal="showModal" @close="showModal=false" @refresh="getPageInfo"></applyWithdrawal>
     <!-- 交易流水 -->
     <billFlowModal :openModal="showBillFlowModal" @close="showBillFlowModal=false"></billFlowModal>
   </a-card>

+ 6 - 15
src/views/salesManagement/salesQuery/detail.vue

@@ -96,21 +96,12 @@
           <!-- 产品编码 -->
           <template slot="productCode" slot-scope="text, record">
             <div v-if="detailData">
-              <div v-if="isOwerEdit">
-                <a-badge count="急" v-if="record.oosFlag == 1">
-                  <div style="padding-right: 15px;">{{ text }}</div>
-                </a-badge>
-                <span v-else>{{ text }}</span>
-              </div>
-              <div v-else>
-                <a-badge count="急" v-if="isAudit&&record.oosFlag == 1">
-                  <div style="padding-right: 15px;">{{ text }}</div>
-                </a-badge>
-                <a-badge count="缺" v-else-if="!isAudit&&(!record.currentStockQty || record.currentStockQty < record.qty)">
-                  <div style="padding-right: 15px;">{{ text }}</div>
-                </a-badge>
-                <span v-else>{{ text }}</span>
-              </div>
+              <span>{{ text }}</span>
+              <a-badge count="急" v-if="(isOwerEdit&&record.oosFlag == 1) || (!isOwerEdit&&isAudit&&record.oosFlag == 1)" :number-style="{ zoom:'80%',marginLeft:'5px' }"></a-badge>
+              <a-badge count="缺" v-if="!isOwerEdit&&!isAudit&&(!record.currentStockQty || record.currentStockQty < record.qty)" :number-style="{ zoom:'80%',marginLeft:'5px' }"></a-badge>
+              <a-badge count="赠" v-if="record.promoProductType=='GIFT_PRODUCT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%',marginLeft:'5px' }"></a-badge>
+              <a-badge count="券" v-if="record.promoProductType=='TICKET_PRODUCT'" :number-style="{ backgroundColor: '#FF5500', zoom:'80%',marginLeft:'5px' }"></a-badge>
+              <a-badge count="特" v-if="record.promoProductType=='SPECIAL_PRODUCT'" :number-style="{ backgroundColor: '#FED714',zoom:'80%',marginLeft:'5px' }"></a-badge>
             </div>
           </template>
           <!-- 操作 -->

+ 1 - 1
src/views/salesManagement/salesQuery/list.vue

@@ -343,7 +343,7 @@ export default {
         this.disabled = true
         this.spinning = true
         // 是否包含废弃单
-        this.queryParam.disuseStateList = this.isAbandonOrder ? ['CANCEL'] : undefined
+        this.queryParam.disuseFlag = this.isAbandonOrder ? '1' : '0'
         // 查询总计
         salesCount(Object.assign(parameter, this.queryParam)).then(res => {
           this.totalData = res.data

+ 6 - 15
src/views/salesManagement/salesQueryNew/detail.vue

@@ -102,21 +102,12 @@
             <!-- 产品编码 -->
             <template slot="productCode" slot-scope="text, record">
               <div v-if="detailData">
-                <div v-if="isOwerEdit">
-                  <a-badge count="急" v-if="record.oosFlag == 1">
-                    <div style="padding-right: 15px;">{{ text }}</div>
-                  </a-badge>
-                  <span v-else>{{ text }}</span>
-                </div>
-                <div v-else>
-                  <a-badge count="急" v-if="isAudit&&record.oosFlag == 1">
-                    <div style="padding-right: 15px;">{{ text }}</div>
-                  </a-badge>
-                  <a-badge count="缺" v-else-if="!isAudit&&(!record.currentStockQty || record.currentStockQty < record.qty)">
-                    <div style="padding-right: 15px;">{{ text }}</div>
-                  </a-badge>
-                  <span v-else>{{ text }}</span>
-                </div>
+                <span>{{ text }}</span>
+                <a-badge count="急" v-if="(isOwerEdit&&record.oosFlag == 1) || (!isOwerEdit&&isAudit&&record.oosFlag == 1)" :number-style="{ zoom:'80%',marginLeft:'5px' }"></a-badge>
+                <a-badge count="缺" v-if="!isOwerEdit&&!isAudit&&(!record.currentStockQty || record.currentStockQty < record.qty)" :number-style="{ zoom:'80%',marginLeft:'5px' }"></a-badge>
+                <a-badge count="赠" v-if="record.promoProductType=='GIFT_PRODUCT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%',marginLeft:'5px' }"></a-badge>
+                <a-badge count="券" v-if="record.promoProductType=='TICKET_PRODUCT'" :number-style="{ backgroundColor: '#FF5500', zoom:'80%',marginLeft:'5px' }"></a-badge>
+                <a-badge count="特" v-if="record.promoProductType=='SPECIAL_PRODUCT'" :number-style="{ backgroundColor: '#FED714',zoom:'80%',marginLeft:'5px' }"></a-badge>
               </div>
             </template>
             <!-- 操作 -->

+ 1 - 1
src/views/salesManagement/salesQueryNew/list.vue

@@ -347,7 +347,7 @@ export default {
         this.disabled = true
         this.spinning = true
         // 是否包含废弃单
-        this.queryParam.disuseStateList = this.isAbandonOrder ? ['CANCEL'] : undefined
+        this.queryParam.disuseFlag = this.isAbandonOrder ? '1' : '0'
         // 查询总计
         salesCount(Object.assign(parameter, this.queryParam)).then(res => {
           this.totalData = res.data