浏览代码

Merge branch 'deploy_qbyc' of chelingzhu-web/zyyc_channe_html into master

lilei 4 年之前
父节点
当前提交
c2d4667cec

+ 1 - 1
.env.qbpre

@@ -1,6 +1,6 @@
 NODE_ENV=production
 VUE_APP_PREVIEW=true
-VUE_APP_API_BASE_URL=https://channel.test.qiubcar.com/zyyc-channel/
+VUE_APP_API_BASE_URL=https://channel.test.zyucgj.com/zyyc-channel/
 VUE_APP_VERSION=V1.0.1
 VUE_APP_PRO_NAME=合作商运营管理平台-pro
 VUE_APP_ANOTHEN_NAME=丘比养车

+ 40 - 40
src/components/Cron/language/en.js

@@ -1,54 +1,54 @@
 export default {
     Seconds:{
-        name:'Seconds',
-        every:'Every second',
-        interval:['Every','second(s) starting at second'],
-        specific:'Specific second (choose one or many)',
-        cycle:['Every second between second','and second']
+        name:'',
+        every:'每一秒钟',
+        interval:['每隔','秒执行 从','秒开始'],
+        specific:'具体秒数(可多选)',
+        cycle:['周期从','到','秒']
     },
     Minutes:{
-        name:'Minutes',
-        every:'Every minute',
-        interval:['Every','minute(s) starting at minute'],
-        specific:'Specific minute (choose one or many)',
-        cycle:['Every minute between minute','and minute']
+        name:'',
+        every:'每一分钟',
+        interval:['每隔','分执行 从','分开始'],
+        specific:'具体分钟数(可多选)',
+        cycle:['周期从','到','分']
     },
     Hours:{
-        name:'Hours',
-        every:'Every hour',
-        interval:['Every','hour(s) starting at hour'],
-        specific:'Specific hour (choose one or many)',
-        cycle:['Every hour between hour','and hour']
+        name:'',
+        every:'每一小时',
+        interval:['每隔','小时执行 从','小时开始'],
+        specific:'具体小时数(可多选)',
+        cycle:['周期从','到','小时']
     },
     Day:{
-        name:'Day',
-        every:'Every day',
-        intervalWeek:['Every','day(s) starting on'],
-        intervalDay:['Every','day(s) starting at the','of the month'],
-        specificWeek:'Specific day of week (choose one or many)',
-        specificDay:'Specific day of month (choose one or many)',
-        lastDay:'On the last day of the month',
-        lastWeekday:'On the last weekday of the month',
-        lastWeek:['On the last',' of the month'],
-        beforeEndMonth:['day(s) before the end of the month'],
-        nearestWeekday:['Nearest weekday (Monday to Friday) to the','of the month'],
-        someWeekday:['On the','of the month'],
+        name:'',
+        every:'每一天',
+        intervalWeek:['每隔','周执行 从','开始'],
+        intervalDay:['每隔','天执行 从','天开始'],
+        specificWeek:'具体星期几(可多选)',
+        specificDay:'具体天数(可多选)',
+        lastDay:'在这个月的最后一天',
+        lastWeekday:'在这个月的最后一个工作日',
+        lastWeek:['在这个月的最后一个'],
+        beforeEndMonth:['在本月底前','天'],
+        nearestWeekday:['最近的工作日(周一至周五)至本月','日'],
+        someWeekday:['在这个月的第','个'],
     },
-    Week:['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'],
+    Week:['天','一','二','三','四','五','六'].map(val=>'星期'+val),
     Month:{
-        name:'Month',
-        every:'Every month',
-        interval:['Every','month(s) starting in'],
-        specific:'Specific month (choose one or many)',
-        cycle:['Every month between','and']
+        name:'',
+        every:'每一月',
+        interval:['每隔','月执行 从','月开始'],
+        specific:'具体月数(可多选)',
+        cycle:['从','到','月之间的每个月']
     },
     Year:{
-        name:'Year',
-        every:'Any year',
-        interval:['Every','year(s) starting in'],
-        specific:'Specific year (choose one or many)',
-        cycle:['Every year between','and']
+        name:'',
+        every:'每一年',
+        interval:['每隔','年执行 从','年开始'],
+        specific:'具体年份(可多选)',
+        cycle:['从','到','年之间的每一年']
     },
-    Save:'Save',
-    Close:'Close'
+    Save:'保存',
+    Close:'关闭'
 }

+ 21 - 20
src/config/router.config.js

@@ -136,28 +136,29 @@ export const asyncRouterMap = [{
     ]
   },
   {
-	  path: '/FinancialManagement',
-	  name: 'FinancialManagement',
-	  component: PageView,
-	  meta: { title: '财务管理', icon: 'account-book', permission: 'M_cwgn' },
-	  children: [
+    path: '/FinancialManagement',
+    name: 'FinancialManagement',
+    redirect: '/FinancialManagement/VerificationRecords',
+    component: PageView,
+    meta: { title: '财务管理', icon: 'account-book', permission: 'M_cwgn' },
+    children: [
       {
-			  path: '/SetmealSales/VerificationRecords',
-			  name: 'VerificationRecords',
-			  component: () => import('@/views/SetmealSales/VerificationRecords.vue'),
-			  meta: {
-			    title: '核销记录',
-			    icon: 'file-text',
-			    permission: 'M_hxjl_list'
-			  }
+        path: '/FinancialManagement/VerificationRecords',
+        name: 'VerificationRecords',
+        component: () => import('@/views/SetmealSales/VerificationRecords.vue'),
+        meta: {
+          title: '核销记录',
+          icon: 'file-text',
+          permission: 'M_hxjl_list'
+        }
       },
-	    {
-	      path: 'PaySettlementRecords/list',
-	      name: 'PaySettlementRecords',
-	      component: () => import(/* webpackChunkName: "writeOff" */ '@/views/FinancialManagement/PaySettlementRecords.vue'),
-	      meta: { title: '应付结算记录-套餐', icon: 'form', permission: 'M_yfjs_js_list' }
-	    }
-	  ]
+      {
+        path: '/FinancialManagement/PaySettlementRecords',
+        name: 'PaySettlementRecords',
+        component: () => import(/* webpackChunkName: "writeOff" */ '@/views/FinancialManagement/PaySettlementRecords.vue'),
+        meta: { title: '应付结算记录-套餐', icon: 'form', permission: 'M_yfjs_js_list' }
+      }
+    ]
   },
   {
     path: '/auth',

+ 10 - 11
src/views/FinancialManagement/PaySettlementRecords.vue

@@ -29,7 +29,7 @@
     </div>
     <!-- 合计 -->
     <a-alert type="info" showIcon style="margin-bottom:15px">
-      <div class="ftext" slot="message">共<span>{{ orderTotal }}</span>单,实收<span>¥{{ amountTotal }}</span>元</div>
+      <div class="ftext" slot="message">共<span>{{ orderTotal || 0 }}</span>单,实收<span>¥{{ amountTotal || 0 }}</span>元</div>
     </a-alert>
     <!-- 列表 -->
     <div>
@@ -118,13 +118,12 @@ export default {
         width: '150px',
         align: 'center'
       },
-	{
-	  title: '销售合作商',
-	  dataIndex: 'salesChannelName',
-	  width: '150px',
-	  align: 'center'
-	},
-			
+      {
+        title: '销售合作商',
+        dataIndex: 'salesChannelName',
+        width: '150px',
+        align: 'center'
+      },
       {
         title: '结算时间',
         dataIndex: 'settleDate',
@@ -172,7 +171,7 @@ export default {
       } else {
         this.openWriteOffModal = true
       }
-	  console.log(this.itemId, record.settleType)
+      console.log(this.itemId, record.settleType)
     },
     // 查询
     refresh () {
@@ -209,11 +208,11 @@ export default {
       settlementRecordsListTotal(params).then(res => {
         if (res.status == 200) {
           if (res.data) {
-            this.orderTotal = res.data.orderNum || 0
             this.amountTotal = res.data.amount || 0
+            this.orderTotal = res.data.orderNum || 0
           } else {
-            this.orderTotal = 0
             this.amountTotal = 0
+            this.orderTotal = 0
           }
         }
       })

+ 5 - 4
src/views/Service/PurchasedServiceDetail.vue

@@ -104,11 +104,12 @@ export default {
       return ''
     },
     isPay () {
-      return this.orderBundle.orderFlag === 'PAED'
+      //  结算状态为已支付或已退款都应存在支付时间与支付金额
+      return this.orderBundle.orderFlag === 'PAED' || this.orderBundle.orderFlag === 'RUND'
+    },
+    isRund () {
+      return this.orderBundle.orderFlag === 'RUND'
     },
-		isRund(){
-			return this.orderBundle.orderFlag === 'RUND'
-		},
     isCancel () {
       return this.orderBundle.orderFlag === 'CAEL' || this.orderBundle.orderFlag === 'SYCA'
     },

+ 2 - 2
src/views/Service/PurchasedServiceList.vue

@@ -301,7 +301,7 @@ export default {
         if (res.status == 200) {
           if (res.data) {
             this.orderTotal = res.data.cnt || 0
-            this.totalAmounts = res.data.totalAmounts || 0
+            this.totalAmounts = res.data.payedAmount || 0
           } else {
             this.orderTotal = 0
             this.totalAmounts = 0
@@ -400,7 +400,7 @@ export default {
   },
   mounted () {
     this.getSalesChannel()
-	this.getTotal()
+    this.getTotal()
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {

+ 3 - 3
src/views/SetmealSales/PurchasedSetmeal.vue

@@ -74,8 +74,8 @@
     <!-- 合计 -->
     <div class="total">
       <a-icon type="info-circle" class="iconImg" />
-      <strong>总计:</strong><span v-model="orderTotal">{{ orderTotal || 0 }} 单</span>
-      <strong style="margin-left: 15px;">收款金额:</strong><span v-model="totalAmounts">{{ totalAmounts || 0 }} 元</span>
+      <strong>总计:</strong><span>{{ orderTotal || 0 }} 单</span>
+      <strong style="margin-left: 15px;">收款金额:</strong><span>{{ totalAmounts || 0 }} 元</span>
     </div>
     <!-- 列表 -->
     <s-table
@@ -216,7 +216,7 @@ export default {
         if (res.status == 200) {
           if (res.data) {
             this.orderTotal = res.data.cnt || 0
-            this.totalAmounts = res.data.totalAmounts || 0
+            this.totalAmounts = res.data.payedAmount || 0
           } else {
             this.orderTotal = 0
             this.totalAmounts = 0

+ 1 - 3
src/views/SetmealSales/SetmealDetailModal.vue

@@ -94,8 +94,6 @@
             :dataSource="recordData"
             :pagination="false"
             bordered>
-            <!-- 车牌号 -->
-            <span slot="vehicleNum" slot-scope="text, record">{{ record.vehicleNum || '--' }}</span>
             <!-- 服务门店 -->
             <span slot="usedStoreName" slot-scope="text, record">{{ record.usedStoreName || '--' }}</span>
           </a-table>
@@ -147,7 +145,7 @@ export default {
       recordColumns: [
         { title: '序号', dataIndex: 'no', width: 60, align: 'center' },
         { title: '使用时间', dataIndex: 'usedTime', width: 100, align: 'center' },
-        { title: '服务内容', dataIndex: 'itemName', width: 100, align: 'center' },
+        { title: '服务内容', dataIndex: 'itemName', width: 100, align: 'center', customRender: function (text) { return (text || '--') } },
         { title: '服务门店', scopedSlots: { customRender: 'usedStoreName' }, width: 100, align: 'center' },
         { title: '核销单号', dataIndex: 'bizNum', width: 100, align: 'center' }
       ],

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'https://channel.test.zyucgj.com/zyyc-channel/',
+        target: 'https://channel.test.zyucgj.com/zyyc-channel/',
         // target: 'http://192.168.16.103:7103/zyyc-channel/',
-        target: 'https://channel.qiubcar.com/zyyc-channel/',
+        // target: 'https://channel.qiubcar.com/zyyc-channel/',
         ws: false,
         changeOrigin: true,
         pathRewrite: {