Browse Source

线上支付订单

chenrui 6 months ago
parent
commit
b96400141d

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
 {
   "message": "发现有新版本发布,确定更新系统?",
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
   "vendorJsVersion": "",
-  "version": 1734061607009
+  "version": 1734315513079
 }
 }

+ 6 - 6
src/views/numsGoodsShelves/onlinePayInvoice/detail.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
-  <div v-if="showPage" class="jg-page-wrap salesDetail-wrap">
+  <div v-if="showPage" class="jg-page-wrap onlinePayDetail-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
     <a-spin :spinning="spinning" tip="Loading...">
-      <a-page-header :ghost="false" :backIcon="false" class="salesDetail-cont">
+      <a-page-header :ghost="false" :backIcon="false" class="onlinePayDetail-cont">
         <!-- 自定义的二级文字标题 -->
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
         <template slot="subTitle">
           <span class="billno">【数字货架】:{{ 名称名称 }}</span>
           <span class="billno">【数字货架】:{{ 名称名称 }}</span>
@@ -14,7 +14,7 @@
       </a-page-header>
       </a-page-header>
       <div class="sales-detail-body">
       <div class="sales-detail-body">
         <!-- 数据统计 -->
         <!-- 数据统计 -->
-        <a-card size="small" :bordered="false" class="salesDetail-cont" v-show="isShowBisiceInfo">
+        <a-card size="small" :bordered="false" class="onlinePayDetail-cont" v-show="isShowBisiceInfo">
           <a-descriptions size="small" :column="4">
           <a-descriptions size="small" :column="4">
             <div slot="title" style="display:flex;justify-content:space-between;align-items:center;">
             <div slot="title" style="display:flex;justify-content:space-between;align-items:center;">
               数据统计
               数据统计
@@ -125,7 +125,7 @@ import PrintPanel from '@/views/common/printPanel.vue'
 import { salesDetailBySn, salesDetailPrint, salesDetailExport } from '@/api/sales'
 import { salesDetailBySn, salesDetailPrint, salesDetailExport } from '@/api/sales'
 import { salesDetailList } from '@/api/salesDetail'
 import { salesDetailList } from '@/api/salesDetail'
 export default {
 export default {
-  name: 'SalesDetail',
+  name: 'OnlinePayInvoiceDetail',
   components: { STable, VSelect, PrintPanel, rangeDate },
   components: { STable, VSelect, PrintPanel, rangeDate },
   mixins: [commonMixin],
   mixins: [commonMixin],
   props: {
   props: {
@@ -307,7 +307,7 @@ export default {
 </script>
 </script>
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
-  .salesDetail-wrap{
+  .onlinePayDetail-wrap{
     position: relative;
     position: relative;
     height: 100%;
     height: 100%;
     .billno{
     .billno{
@@ -321,7 +321,7 @@ export default {
     .ant-tag-green,.ant-tag-orange{
     .ant-tag-green,.ant-tag-orange{
       vertical-align: middle;
       vertical-align: middle;
     }
     }
-    .salesDetail-cont{
+    .onlinePayDetail-cont{
       margin-bottom: 10px;
       margin-bottom: 10px;
       /deep/ .ant-descriptions-title{
       /deep/ .ant-descriptions-title{
           margin-bottom: 10px;
           margin-bottom: 10px;

+ 24 - 24
src/views/salesManagement/onlinePayOrder/list.vue

@@ -1,14 +1,14 @@
 <template>
 <template>
-  <div class="jg-page-wrap salesManagementList-wrap">
+  <div class="jg-page-wrap onlinePayOrderList-wrap">
     <a-card size="small" :bordered="false" class="table-page-search-wrapper">
     <a-card size="small" :bordered="false" class="table-page-search-wrapper">
       <!-- 搜索条件 -->
       <!-- 搜索条件 -->
       <div ref="tableSearch">
       <div ref="tableSearch">
         <a-form layout="inline" @keyup.enter.native="searchForm">
         <a-form layout="inline" @keyup.enter.native="searchForm">
           <a-row type="flex" justify="start" :gutter="15">
           <a-row type="flex" justify="start" :gutter="15">
-            <a-col :span="6">
+            <a-col :md="6" :sm="24">
               <a-form-item label="创建时间">
               <a-form-item label="创建时间">
                 <rangeDate
                 <rangeDate
-                  id="salesManagementList-creatdate"
+                  id="onlinePayOrderList-creatdate"
                   :allowClear="isByCustQuery"
                   :allowClear="isByCustQuery"
                   :hasDisabledAreaTime="false"
                   :hasDisabledAreaTime="false"
                   ref="rangeDate"
                   ref="rangeDate"
@@ -16,14 +16,14 @@
                   @change="dateChange" />
                   @change="dateChange" />
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
-            <a-col :span="6">
+            <a-col :md="6" :sm="24">
               <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}" :required="isByCustQuery">
               <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}" :required="isByCustQuery">
-                <custList id="salesManagementList-custList" ref="custList" @change="custChange"></custList>
+                <custList id="onlinePayOrderList-custList" ref="custList" @change="custChange"></custList>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-item label="销售单号">
               <a-form-item label="销售单号">
-                <a-input id="salesManagementList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+                <a-input id="onlinePayOrderList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
@@ -32,7 +32,7 @@
                   style="width: 100%;"
                   style="width: 100%;"
                   v-model="queryParam.sourceType"
                   v-model="queryParam.sourceType"
                   ref="sourceType"
                   ref="sourceType"
-                  id="salesManagementList-sourceType"
+                  id="onlinePayOrderList-sourceType"
                   code="SALES_SOURCE"
                   code="SALES_SOURCE"
                   placeholder="请选择单据来源"
                   placeholder="请选择单据来源"
                   allowClear></v-select>
                   allowClear></v-select>
@@ -41,7 +41,7 @@
             <template v-if="advanced">
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="出库时间">
                 <a-form-item label="出库时间">
-                  <rangeDate id="salesManagementList-outWareTime" ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
+                  <rangeDate id="onlinePayOrderList-outWareTime" ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
@@ -51,7 +51,7 @@
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="采购单号">
                 <a-form-item label="采购单号">
-                  <a-input id="salesManagementList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
+                  <a-input id="onlinePayOrderList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
@@ -60,7 +60,7 @@
                     v-model="queryParam.billStatus"
                     v-model="queryParam.billStatus"
                     @change="setIsHomeNav($route.name, null)"
                     @change="setIsHomeNav($route.name, null)"
                     ref="billStatus"
                     ref="billStatus"
-                    id="salesManagementList-billStatus"
+                    id="onlinePayOrderList-billStatus"
                     code="SALES_BILL_STATUS"
                     code="SALES_BILL_STATUS"
                     placeholder="请选择业务状态"
                     placeholder="请选择业务状态"
                     allowClear></v-select>
                     allowClear></v-select>
@@ -68,14 +68,14 @@
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="审核时间">
                 <a-form-item label="审核时间">
-                  <rangeDate id="salesManagementList-auditTime" ref="auditRangeDate" v-model="auditTime" @change="auditDateChange" />
+                  <rangeDate id="onlinePayOrderList-auditTime" ref="auditRangeDate" v-model="auditTime" @change="auditDateChange" />
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="收款方式">
                 <a-form-item label="收款方式">
                   <v-select
                   <v-select
                     code="SETTLE_STYLE"
                     code="SETTLE_STYLE"
-                    id="salesManagementList-settleStyleSn"
+                    id="onlinePayOrderList-settleStyleSn"
                     v-model="queryParam.settleStyleSn"
                     v-model="queryParam.settleStyleSn"
                     allowClear
                     allowClear
                     placeholder="请选择收款方式"
                     placeholder="请选择收款方式"
@@ -84,7 +84,7 @@
               </a-col>
               </a-col>
               <a-col :span="6">
               <a-col :span="6">
                 <a-form-model-item label="铺货出库">
                 <a-form-model-item label="铺货出库">
-                  <v-select code="FLAG" id="salesManagementList-distributionFlag" v-model="queryParam.distributionFlag" allowClear placeholder="请选择是否铺货出库"></v-select>
+                  <v-select code="FLAG" id="onlinePayOrderList-distributionFlag" v-model="queryParam.distributionFlag" allowClear placeholder="请选择是否铺货出库"></v-select>
                 </a-form-model-item>
                 </a-form-model-item>
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
@@ -92,7 +92,7 @@
                   <v-select
                   <v-select
                     v-model="queryParam.financialStatus"
                     v-model="queryParam.financialStatus"
                     ref="financialStatus"
                     ref="financialStatus"
-                    id="salesManagementList-financialStatus"
+                    id="onlinePayOrderList-financialStatus"
                     code="FINANCIAL_RECEIVE_STATUS"
                     code="FINANCIAL_RECEIVE_STATUS"
                     placeholder="请选择财务状态"
                     placeholder="请选择财务状态"
                     allowClear></v-select>
                     allowClear></v-select>
@@ -117,8 +117,8 @@
                 </a-popover>
                 </a-popover>
               </div>
               </div>
               <div style="text-align:left;margin-left: -120px;width:50%;">
               <div style="text-align:left;margin-left: -120px;width:50%;">
-                <a-button id="salesManagementList-search" type="primary" :disabled="disabled" @click="searchForm">查询</a-button>
-                <a-button id="salesManagementList-reset" style="margin-left: 5px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+                <a-button id="onlinePayOrderList-search" type="primary" :disabled="disabled" @click="searchForm">查询</a-button>
+                <a-button id="onlinePayOrderList-reset" style="margin-left: 5px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                 <a-button
                 <a-button
                   type="primary"
                   type="primary"
                   v-if="$hasPermissions('B_salesExport')"
                   v-if="$hasPermissions('B_salesExport')"
@@ -126,8 +126,8 @@
                   @click="handleExport"
                   @click="handleExport"
                   :disabled="disabled"
                   :disabled="disabled"
                   :loading="exportLoading"
                   :loading="exportLoading"
-                  id="salesManagementList-export">导出</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 5px" id="salesManagementList-advanced">
+                  id="onlinePayOrderList-export">导出</a-button>
+                <a @click="advanced=!advanced" style="margin-left: 5px" id="onlinePayOrderList-advanced">
                   {{ advanced ? '收起' : '展开' }}
                   {{ advanced ? '收起' : '展开' }}
                   <a-icon :type="advanced ? 'up' : 'down'"/>
                   <a-icon :type="advanced ? 'up' : 'down'"/>
                 </a>
                 </a>
@@ -153,8 +153,8 @@
             已退款金额:<strong>{{ totalData&&(totalData.discountedAmount || totalData.discountedAmount==0) ? toThousands(totalData.discountedAmount) : '--' }}</strong>;
             已退款金额:<strong>{{ totalData&&(totalData.discountedAmount || totalData.discountedAmount==0) ? toThousands(totalData.discountedAmount) : '--' }}</strong>;
           </div>
           </div>
           <div class="action-buttons">
           <div class="action-buttons">
-            <a-button id="salesManagementList-add0" type="primary" class="button-error" v-if="$hasPermissions('B_salesNews')" @click="handleAdd(0)"><a-icon type="plus" /> 新增(零售)</a-button>
-            <a-button id="salesManagementList-add1" type="primary" class="button-error" v-if="$hasPermissions('B_salesNews')" @click="handleAdd(1)"><a-icon type="plus" /> 新增(铺货)</a-button>
+            <a-button id="onlinePayOrderList-add0" type="primary" class="button-error" v-if="$hasPermissions('B_salesNews')" @click="handleAdd(0)"><a-icon type="plus" /> 新增(零售)</a-button>
+            <a-button id="onlinePayOrderList-add1" type="primary" class="button-error" v-if="$hasPermissions('B_salesNews')" @click="handleAdd(1)"><a-icon type="plus" /> 新增(铺货)</a-button>
             <hideCellMenus placeholder="显示" :defHiddenKes="colsArr" v-model="showCell"></hideCellMenus>
             <hideCellMenus placeholder="显示" :defHiddenKes="colsArr" v-model="showCell"></hideCellMenus>
           </div>
           </div>
         </div>
         </div>
@@ -173,7 +173,7 @@
           bordered>
           bordered>
           <!-- 销售单号 -->
           <!-- 销售单号 -->
           <template slot="salesBillNo" slot-scope="text, record">
           <template slot="salesBillNo" slot-scope="text, record">
-            <span class="table-td-link" :id="'salesManagementList-detail-'+record.id" v-if="$hasPermissions('B_salesDetail')" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
+            <span class="table-td-link" :id="'onlinePayOrderList-detail-'+record.id" v-if="$hasPermissions('B_salesDetail')" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
             <span v-else>{{ record.salesBillNo }}</span>
             <span v-else>{{ record.salesBillNo }}</span>
             <a-badge count="改" :number-style="{ zoom:'80%',marginLeft:'5px' }" v-if="record.billStatus=='SUPERIOR_CHANGE'"></a-badge>
             <a-badge count="改" :number-style="{ zoom:'80%',marginLeft:'5px' }" v-if="record.billStatus=='SUPERIOR_CHANGE'"></a-badge>
           </template>
           </template>
@@ -199,7 +199,7 @@
           <!-- billStatus  WAIT_SUBMIT待提交   WAIT_AUDIT待审核    AUDIT_REJECT审核不通过  WAIT_OUT_WAREHOUSE待出库   FINISH已完结  SUPERIOR_CHANGE上级改单  CANCEL已取消 -->
           <!-- billStatus  WAIT_SUBMIT待提交   WAIT_AUDIT待审核    AUDIT_REJECT审核不通过  WAIT_OUT_WAREHOUSE待出库   FINISH已完结  SUPERIOR_CHANGE上级改单  CANCEL已取消 -->
           <template slot="action" slot-scope="text, record">
           <template slot="action" slot-scope="text, record">
             <a-button
             <a-button
-              :id="'salesManagementList-audit-'+record.id"
+              :id="'onlinePayOrderList-audit-'+record.id"
               size="small"
               size="small"
               type="link"
               type="link"
               class="button-primary"
               class="button-primary"
@@ -207,7 +207,7 @@
               @click="handleEexamine(record)"
               @click="handleEexamine(record)"
             >审核</a-button>
             >审核</a-button>
             <a-button
             <a-button
-              :id="'salesManagementList-outStock-'+record.id"
+              :id="'onlinePayOrderList-outStock-'+record.id"
               size="small"
               size="small"
               type="link"
               type="link"
               v-if="record.billStatus == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_salesStockOut')"
               v-if="record.billStatus == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_salesStockOut')"
@@ -241,7 +241,7 @@ import hideCellMenus from '@/views/common/hideCellMenus'
 import { salesList, salesDel, salesWriteAudit, salesWriteStockOut, salesCount, salesExport } from '@/api/sales'
 import { salesList, salesDel, salesWriteAudit, salesWriteStockOut, salesCount, salesExport } from '@/api/sales'
 import moment from 'moment'
 import moment from 'moment'
 export default {
 export default {
-  name: 'SalesList',
+  name: 'OnlinePayOrder',
   components: { STable, VSelect, rangeDate, auditModal, custList, stateIcon, hideCellMenus },
   components: { STable, VSelect, rangeDate, auditModal, custList, stateIcon, hideCellMenus },
   mixins: [commonMixin],
   mixins: [commonMixin],
   data () {
   data () {