Merge pull request '更新' (#3) from caolc into master

Reviewed-on: #3

src/api/finance/openTicketApi.js

@@ -11,7 +11,7 @@ export default {
   },
   getByCustomerPage(page) { // 分页查询
     return request({
-      url: `/${service_name}/${group_name}/getByCustomerPage`,
+      url: `/${service_name}/saasCustomerInvoicRecord/getByCustomerPage`,
       method: 'post',
       data: page
     })

src/views/finance/order/OrderInfoList.vue

@@ -1038,7 +1038,7 @@ export default {
           prop: "createTime",
           minWidth: 160,
           sortable: "custom",
-          label: "创建时间",
+          label: "订单时间",
           show: true,
           render: (row, column, cell) => {
             return cell;

src/views/finance/order/OrderPersonalInfoList.vue

@@ -31,13 +31,13 @@
               </el-form-item>
               <el-form-item>
                 <el-select v-model="page.params.orderStatus" placeholder="订单状态" clearable>
-                  <el-option label="支付失败" :value="-1" />
-                  <el-option label="待支付" :value="0" />
-                  <el-option label="支付成功" :value="1" />
-                  <el-option label="已取消" :value="2" />
-                  <el-option label="已退款" :value="3" />
-                  <el-option label="退款中" :value="4" />
-                  <el-option label="退款失败" :value="5" />
+                  <el-option label="支付失败" :value="'-1'" />
+                  <el-option label="待支付" :value="'0'" />
+                  <el-option label="支付成功" :value="'1'" />
+                  <el-option label="已取消" :value="'2'" />
+                  <el-option label="已退款" :value="'3'" />
+                  <el-option label="退款中" :value="'4'" />
+                  <el-option label="退款失败" :value="'5'" />
                 </el-select>
               </el-form-item>
               <el-form-item>
@@ -638,7 +638,7 @@ export default {
           prop: "orderTime",
           minWidth: 160,
           sortable: "custom",
-          label: "创建时间",
+          label: "订单时间",
           show: true,
           render: (row, column, cell) => {
             return cell;

src/views/finance/order/OrderTfInfoList.vue

@@ -117,7 +117,7 @@
                 <gl-date-time-picker
                   style="width: 424px"
                   v-model="page.params.btw_createTime"
-                  msg="创建时间"
+                  msg="订单时间"
                   @keyup.enter.native="getByPage"
                 />
               </el-form-item>
@@ -677,8 +677,8 @@ export default {
                 </div>
                 <div class="column-info-content">
                   <div class="column-info-content-item">
-                    {row.name
-                      ? row.name
+                    {row.userName
+                      ? row.userName
                       : "暂无"}
                     -
                     {row.phone
@@ -690,7 +690,7 @@ export default {
                     v-show={row.payAccountType === 1}
                     class="column-info-content-item"
                   >
-                    {row.name ? row.name : "暂无"}
+                    {row.userName ? row.userName : "暂无"}
                   </div>
                   <div class="column-info-content-item" v-show={!row.editor}>
                     <span>{row.plateNumber}</span>
@@ -845,7 +845,7 @@ export default {
           prop: "orderTime",
           minWidth: 160,
           sortable: "custom",
-          label: "创建时间",
+          label: "订单时间",
           show: true,
           render: (row, column, cell) => {
             return cell;
@@ -977,7 +977,7 @@ export default {
   methods: {
     searchUserInfo(info) {
       if (info && info !== "") {
-        sysCustomerInfoApi.searchInfo(info).then((res) => {
+        sysCustomerInfoApi.liekQuery(info).then((res) => {
           this.sysCustomerList = res.data;
         });
       }
@@ -1287,6 +1287,10 @@ export default {
       // 分页查询
       this.addDialog = false;
       this.page.params.convertCompanyCode = 1;
+      this.page.params = Object.assign(this.page.params,{
+        dateStartTime:this.page.params.btw_createTime?this.page.params.btw_createTime.split('~')[0]:'',
+        dateStartEnd:this.page.params.btw_createTime?this.page.params.btw_createTime.split('~')[1]:''
+      })
       orderInfoApi.getByPage(this.page).then((res) => {
         this.dataPage = res.data;
         this.page.totalCount = this.dataPage.totalCount;

vue.config.js

@@ -26,7 +26,7 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         // target: "http://uat.xingoil.com/adminapi",
         // target: 'https://www.xingoil.com/adminapi',
-        target: `http://192.168.0.22:38080`,
+        target: `http://192.168.0.27:38080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''