Merge pull request 'it_s' (#1) from it_s into master

Reviewed-on: #1

src/views/finance/oilCompanyMatch/OilCompanyMatchAdd.vue

@@ -162,7 +162,7 @@ export default {
   methods: {
     parentCompanyOrginQuery(value) { // 远程搜索企业
       if (value) {
-        oilCompanyInfoApi.getLikeByName({ 'name': value }).then(res => {
+        oilCompanyInfoApi.getLikeByNameSuccess({ 'name': value }).then(res => {
           this.companyList = res.data
         })
       }

src/views/finance/oilCompanyMatch/OilCompanyMatchList.vue

@@ -619,7 +619,7 @@ export default {
     companyRemoteMethod(value) {
       // 远程搜索企业
       if (value) {
-        oilCompanyInfoApi.getLike(value).then((res) => {
+        oilCompanyInfoApi.getLikeByNameSuccess({ 'name': value }).then((res) => {
           this.queryCompanyList = res.data;
         });
       }

src/views/finance/oilCompanyMatchRecord/OilCompanyMatchRecordList.vue

@@ -506,7 +506,7 @@ export default {
     companyRemoteMethod(value) {
       // 远程搜索企业
       if (value) {
-        oilCompanyInfoApi.getLike(value).then((res) => {
+        oilCompanyInfoApi.getLikeByNameSuccess({ 'name': value }).then((res) => {
           this.queryCompanyList = res.data;
         });
       }

src/views/finance/oilCompanyOrderMatchTask/OilCompanyOrderMatchTaskList.vue

@@ -603,7 +603,7 @@ export default {
     companyRemoteMethod(value) {
       // 远程搜索企业
       if (value) {
-        oilCompanyInfoApi.getLike(value).then((res) => {
+        oilCompanyInfoApi.getLikeByNameSuccess({ 'name': value }).then((res) => {
           this.queryCompanyList = res.data;
         });
       }

src/views/finance/order/OrderTfInfoList.vue

@@ -14,17 +14,15 @@
               class="search-form"
               :size="$store.getters.size"
             >
-              <el-form-item>
-                <el-input
-                  v-model="page.params.companyName"
-                  placeholder="请输入公司名称/ID检索"
-                  clearable
-                  @keyup.enter.native="getByPage"
-                />
-              </el-form-item>
+            <el-form-item>
+              <el-select v-model="page.params.companyId" clearable filterable remote reserve-keyword placeholder="企业名称"
+                :remote-method="companyRemoteMethod" @keyup.enter.native="getByPage">
+                <el-option v-for="item in queryCompanyList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
               <el-form-item>
                 <el-select
-                  v-model="page.params.eq_customerId"
+                  v-model="page.params.customerId"
                   filterable
                   remote
                   reserve-keyword
@@ -50,7 +48,7 @@
                   @keyup.enter.native="getByPage"
                 />
                 <!-- <el-select
-                v-model="page.params.eq_siteId"
+                v-model="page.params.siteId"
                 style="width:100%"
                 filterable
                 remote
@@ -69,7 +67,7 @@
               </el-select> -->
               </el-form-item>
               <!-- <el-form-item>
-                <el-select v-model="page.params.eq_payChannel" placeholder="支付渠道" clearable>
+                <el-select v-model="page.params.payChannel" placeholder="支付渠道" clearable>
                   <el-option value="BALANCE_PAYMENT" label="余额支付" />
                   <el-option value="WECHAT_MINIAPPS_PAYMENT" label="微信小程序支付" />
                   <el-option value="WECHAT_OFFICIAL_ACCOUNT_PAYMENT" label="微信公众号支付" />
@@ -84,21 +82,21 @@
               </el-form-item> -->
               <el-form-item>
                 <el-select
-                  v-model="page.params.eq_orderStatus"
+                  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>
-                <el-radio-group v-model="page.params.eq_payAccountType">
+                <el-radio-group v-model="page.params.payAccountType">
                   <el-radio-button :label="0">
                     <svg-icon icon-class="iconsiji1" /> 个人账户
                   </el-radio-button>
@@ -109,7 +107,7 @@
               </el-form-item> -->
               <el-form-item>
                 <el-input
-                  v-model="page.params.eq_orderSerialNumber"
+                  v-model="page.params.orderSerialNumber"
                   placeholder="输入订单号准确搜索"
                   clearable
                   @keyup.enter.native="getByPage"
@@ -578,6 +576,7 @@ import OrderInfoImport from "./OrderInfoImport";
 import OrderInfoSupplement from "./OrderInfoSupplement";
 import OrderInfoZeYiSupplement from "./OrderInfoZeYiSupplement";
 import rippleChart from "@/views/dashboard/admin/components/RippleChart";
+import oilCompanyInfoApi from "@/api/user/oilCompanyInfo";
 import { mapGetters } from "vuex";
 export default {
   components: {
@@ -598,6 +597,8 @@ export default {
         endPage: 1, // 导出结束页
         pageSize: 10, // 每页条数
       },
+      oilCompanyOrderMatchTask: {},
+      queryCompanyList: [], // 企业列表
       siteList: [],
       multipleSelection: [], // 选择表格数据集合
       importDialog: false, // 导入弹窗
@@ -684,6 +685,7 @@ export default {
                       ? row.phone
                       : "暂无"}
                   </div>
+                  <div v-show={row.companyName} class='column-info-content-item'>{row.companyName ? row.companyName : '暂无'}</div>
                   <div
                     v-show={row.payAccountType === 1}
                     class="column-info-content-item"
@@ -979,6 +981,14 @@ export default {
         });
       }
     },
+    companyRemoteMethod(value) {
+      // 远程搜索企业
+      if (value) {
+        oilCompanyInfoApi.getLikeByNameSuccess({ 'name': value }).then((res) => {
+          this.queryCompanyList = res.data;
+        });
+      }
+    },
     // 远程搜索主油站
     getSimpleOilSiteInfo(siteName) {
       if (siteName) {
@@ -1275,7 +1285,7 @@ export default {
     getByPage() {
       // 分页查询
       this.addDialog = false;
-      this.page.params.eq_convertCompanyCode = 1;
+      this.page.params.convertCompanyCode = 1;
       orderInfoApi.getByPage(this.page).then((res) => {
         this.dataPage = res.data;
         this.page.totalCount = this.dataPage.totalCount;