浏览代码

修改bug

chenrui 6 月之前
父节点
当前提交
4d3c7d5692

+ 1 - 1
public/version.json

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

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

@@ -5,11 +5,11 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <span class="billno">【数字货架】:{{ 名称名称 }}</span>
-          <a-button type="link" class="button-default" @click="isShowBisiceInfo=!isShowBisiceInfo" style="margin-left:10px;vertical-align:middle;">
+          <a-button id="onlinePayDetail-seeInfo-btn" type="link" class="button-default" @click="isShowBisiceInfo=!isShowBisiceInfo" style="margin-left:10px;vertical-align:middle;">
             <a-icon :type="isShowBisiceInfo ? 'eye-invisible' : 'eye'"/>
             {{ isShowBisiceInfo?'隐藏':'查看' }}信息
           </a-button>
-          <a-button id="purchaseNewOrderEdit-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button>
+          <a-button id="onlinePayDetail-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button>
         </template>
       </a-page-header>
       <div class="sales-detail-body">
@@ -27,51 +27,51 @@
         </a-card>
         <a-card size="small" :bordered="false" class="pages-wrap">
           <div ref="tableSearch" class="table-page-search-wrapper">
-            <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+            <a-form layout="inline" id="onlinePayDetail-form" @keyup.enter.native="$refs.table.refresh(true)">
               <a-row :gutter="15">
                 <a-col :xl="6" :lg="6" :md="12" :sm="24">
                   <a-form-item label="下单时间">
-                    <rangeDate id="unSettlement-time" ref="orderDate" :value="orderDate" @change="orderDateChange" />
+                    <rangeDate id="onlinePayDetail-time" ref="orderDate" :value="orderDate" @change="orderDateChange" />
                   </a-form-item>
                 </a-col>
                 <a-col :xl="6" :lg="6" :md="12" :sm="24">
                   <a-form-item label="付款时间">
-                    <rangeDate id="unSettlement-qhtime" ref="rangeDate" :value="time" @change="dateChange" />
+                    <rangeDate id="onlinePayDetail-qhtime" ref="rangeDate" :value="time" @change="dateChange" />
                   </a-form-item>
                 </a-col>
                 <a-col :xl="6" :lg="6" :md="12" :sm="24">
                   <a-form-item label="退款时间">
-                    <rangeDate id="unSettlement-time" ref="orderDate" :value="orderDate" @change="orderDateChange" />
+                    <rangeDate id="onlinePayDetail-time" ref="orderDate" :value="orderDate" @change="orderDateChange" />
                   </a-form-item>
                 </a-col>
                 <a-col :xl="6" :lg="6" :md="12" :sm="24">
                   <a-form-item label="采购单号">
-                    <a-input id="unSettlement-orderNo" placeholder="请输入采购单号" v-model.trim="queryParam.orderBillNo" allowClear/>
+                    <a-input id="onlinePayDetail-orderNo" placeholder="请输入采购单号" v-model.trim="queryParam.orderBillNo" allowClear/>
                   </a-form-item>
                 </a-col>
                 <a-col :xl="6" :lg="6" :md="12" :sm="24">
                   <a-form-item label="销售单号">
-                    <a-input id="unSettlement-orderNo" placeholder="请输入销售单号" v-model.trim="queryParam.orderBillNo" allowClear/>
+                    <a-input id="onlinePayDetail-orderNo" placeholder="请输入销售单号" v-model.trim="queryParam.orderBillNo" allowClear/>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="业务状态">
-                    <v-select id="settle-settleType" code="SHELF_SETTLE_TYPE" v-model="queryParam.settleType" allowClear placeholder="请选择业务状态"></v-select>
+                    <v-select id="onlinePayDetail-settleType" code="SHELF_SETTLE_TYPE" v-model="queryParam.settleType" allowClear placeholder="请选择业务状态"></v-select>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="财务状态">
-                    <v-select id="settle-settleType" code="SHELF_SETTLE_TYPE" v-model="queryParam.settleType" allowClear placeholder="请选择财务状态"></v-select>
+                    <v-select id="onlinePayDetail-settleType" code="SHELF_SETTLE_TYPE" v-model="queryParam.settleType" allowClear placeholder="请选择财务状态"></v-select>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="到账状态">
-                    <v-select id="settle-settleType" code="SHELF_SETTLE_TYPE" v-model="queryParam.settleType" allowClear placeholder="请选择到账状态"></v-select>
+                    <v-select id="onlinePayDetail-settleType" code="SHELF_SETTLE_TYPE" v-model="queryParam.settleType" allowClear placeholder="请选择到账状态"></v-select>
                   </a-form-item>
                 </a-col>
                 <a-col :xl="24" :lg="24" :md="24" :sm="24" style="text-align:center;">
-                  <a-button type="primary" @click="getRefresh" :disabled="disabled" id="withdrawa-refresh" >查询</a-button>
-                  <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="withdrawa-reset">重置</a-button>
+                  <a-button type="primary" @click="getRefresh" :disabled="disabled" id="onlinePayDetail-refresh" >查询</a-button>
+                  <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="onlinePayDetail-reset">重置</a-button>
                 </a-col>
               </a-row>
             </a-form>
@@ -95,7 +95,7 @@
             <!-- 操作 -->
             <template slot="action" slot-scope="text, record">
               <a-button
-                :id="'sales-detail-out-'+record.id"
+                :id="'online-pay-detail-'+record.id"
                 size="small"
                 type="link"
                 v-if="record.oosFlag == 0 && (isOwerEdit || isAudit)"

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

@@ -1,5 +1,5 @@
 <template>
-  <a-card size="small" :bordered="false" class="accountManagementList-wrap jg-page-wrap">
+  <a-card size="small" :bordered="false" class="onlinePayInvoiceList-wrap jg-page-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
@@ -7,17 +7,17 @@
           <a-row :gutter="15">
             <a-col :md="5" :sm="24">
               <a-form-item label="货架名称">
-                <shelfList id="settle-shelfsn" style="max-width:300px;" v-model="queryParam.shelfSn"></shelfList>
+                <shelfList id="onlinePayInvoice-shelfsn" style="max-width:300px;" v-model="queryParam.shelfSn"></shelfList>
               </a-form-item>
             </a-col>
             <a-col :md="5" :sm="24">
               <a-form-item label="关联客户">
-                <custList id="settle-customerName" ref="custList" @change="custChange" v-model="queryParam.customerName"></custList>
+                <custList id="onlinePayInvoice-customerName" ref="custList" @change="custChange" v-model="queryParam.customerName"></custList>
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="settle-refresh" >查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="settle-reset">重置</a-button>
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="onlinePayInvoice-refresh" >查询</a-button>
+              <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="onlinePayInvoice-reset">重置</a-button>
             </a-col>
           </a-row>
         </a-form>
@@ -47,7 +47,7 @@
             type="link"
             class="button-primary"
             @click="handleUndetail(record)"
-            :id="'settle-detail-btn-'+record.id">明细</a-button>
+            :id="'onlinePayInvoice-detail-btn-'+record.id">明细</a-button>
         </template>
       </s-table>
     </a-spin>
@@ -206,7 +206,7 @@ export default {
     // 计算表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 225
     },
     // 初始化页面
     pageInit () {

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

@@ -20,7 +20,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="客户名称">
-                <custList id="customerReport-salesTargetName" ref="custSatelliteList" @change="custSatelliteChange"></custList>
+                <custList id="billFlowModal-custList" ref="custSatelliteList" @change="custSatelliteChange"></custList>
               </a-form-model-item>
             </a-col>
             <a-col :md="7" :sm="24">

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

@@ -1,5 +1,5 @@
 <template>
-  <a-card size="small" :bordered="false" class="accountManagementList-wrap jg-page-wrap">
+  <a-card size="small" :bordered="false" class="withdrawalManagementNew-wrap jg-page-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
@@ -7,12 +7,12 @@
           <a-row :gutter="15">
             <a-col :xl="6" :lg="6" :md="12" :sm="24">
               <a-form-item label="提现时间">
-                <rangeDate id="withdrawa-time" ref="rangeDate" v-model="time" @change="dateChange" />
+                <rangeDate id="withdrawal-time" ref="rangeDate" v-model="time" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="6" :md="6" :sm="6">
-              <a-button type="primary" @click="getRefresh" :disabled="disabled" id="withdrawa-refresh" >查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="withdrawa-reset">重置</a-button>
+              <a-button type="primary" @click="getRefresh" :disabled="disabled" id="withdrawal-refresh" >查询</a-button>
+              <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="withdrawal-reset">重置</a-button>
             </a-col>
           </a-row>
         </a-form>
@@ -22,8 +22,8 @@
           账户总金额:¥100.00(包含可提现金额:<span>{{ pageInfo&&pageInfo.activeAmount?toThousands(pageInfo.activeAmount):'--' }}</span>,在途金额:¥12.00)
           <p style="margin-top:10px;">(提示:①提现手续费为0.5元/笔;②资金到账周期为工作日+1天;③销售单需审核通过后才能提现;④销售单审核不通过或修理厂取消订单后将会在1-3个工作日原路返回到修理厂)</p>
         </div>
-        <a-button id="withdrawa-tixian" type="primary" class="button-primary" @click="handleTX">申请提现</a-button>
-        <a-button id="withdrawa-tixian" class="button-info" @click="showBillFlowModal=true">账单流水</a-button>
+        <a-button id="withdrawal-tixian" type="primary" class="button-primary" @click="handleTX">申请提现</a-button>
+        <a-button id="withdrawal-tixian" class="button-info" @click="showBillFlowModal=true">账单流水</a-button>
       </div>
       <s-table
         class="sTable fixPagination"
@@ -142,7 +142,7 @@ export default {
     // 计算表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 265
+      this.tableHeight = window.innerHeight - tableSearchH - 300
     },
     // 页面初始化
     pageInit () {

+ 2 - 2
vue.config.js

@@ -209,8 +209,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.100:88/qpls-md',
-        target: 'https://p.iscm.360arrow.com/qpls-md',
+        target: 'http://192.168.2.113:8550/qpls-md',
+        // target: 'https://p.iscm.360arrow.com/qpls-md',
         // target: 'https://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,