Merge branch 'master' of http://121.196.213.68:3000/caoliancun/dispacth_zhongpin into lifei

Reviewed-on: #12

src/views/finance/oilCompanyMatch/OilCompanyMatchList.vue

@@ -575,7 +575,7 @@ export default {
       ],
       addDialog: false, // 添加弹窗
       updateDialog: false, // 修改弹窗
-      oilCompanyMatch: {},
+      oilCompanyMatch: null,
     };
   },
   computed: {
@@ -705,8 +705,8 @@ export default {
       this.getByPage();
     },
     toAdd() {
-      // 跳转到添加
       this.oilCompanyMatch = {};
+      // 跳转到添加
       this.addDialog = true;
     },
     toUpdate(id) {

src/views/finance/order/OrderPersonalInfoList.vue

@@ -694,7 +694,7 @@ export default {
               <div>
                 <div>
                   来源：
-                  {cell}
+                  { this.markData.ORDER_SOURCE[cell] }
                 </div>
                 <div>
                   支付：

src/views/site/oilSiteInfo/OilSiteInfoInfo.vue

@@ -193,10 +193,10 @@
                 class="kg"
                 render="row"
               >
-                <el-tag type="danger" v-if="oilSiteInfo.globalEnable === 0"
+                <el-tag type="danger" v-if="oilSiteInfo.globalEnable === 'DISABLE'"
                   >禁用</el-tag
                 >
-                <el-tag type="success" v-if="oilSiteInfo.globalEnable === 1"
+                <el-tag type="success" v-if="oilSiteInfo.globalEnable === 'ENABLE'"
                   >启用</el-tag
                 >
                 <!-- <el-switch
@@ -384,10 +384,10 @@
             <div class="cell-item">
               <span class="color-999 test-tst">油站性质</span>
               <br />
-              <span v-if="oilSiteInfo.siteNature === 1" class="inner-data"
+              <span v-if="oilSiteInfo.siteNature === 'OIL_OPERATION'" class="inner-data"
                 >自营油站</span
               >
-              <span v-if="oilSiteInfo.siteNature === 0" class="inner-data"
+              <span v-if="oilSiteInfo.siteNature === 'CHANNEL_STATION'" class="inner-data"
                 >渠道油站</span
               >
             </div>
@@ -659,42 +659,46 @@
               <span class="color-999 test-tst">是否为高速 </span>
               <br />
 
-              <span v-if="oilSiteInfo.highSpeedMark === 0" class="inner-data"
+              <span v-if="oilSiteInfo.highSpeedMark === 'NO_SPEED'" class="inner-data"
                 >非高速</span
               >
-              <span v-if="oilSiteInfo.highSpeedMark === 1" class="inner-data"
+              <span v-if="oilSiteInfo.highSpeedMark === 'HIGH_SPEED'" class="inner-data"
                 >高速</span
               >
             </div>
             <div class="cell-item">
               <span class="color-999 test-tst">司机二维码支付 </span>
               <br />
-              <span v-if="oilSiteInfo.qrcodePay === 0" class="inner-data"
+              <span>{{oilSiteInfo.qrcodePay== 0 ? '禁用' : oilSiteInfo.qrcodePay== 1 ? '启用' : '暂无数据'}}
+              </span>
+              <!-- <span v-if="oilSiteInfo.qrcodePay === 0" class="inner-data"
                 >禁用</span
               >
               <span v-if="oilSiteInfo.qrcodePay === 1" class="inner-data"
                 >启用</span
-              >
+              > -->
             </div>
           </div>
           <div class="my-cell">
             <div class="cell-item">
               <span class="color-999 test-tst">扫描油站二维码支付</span>
               <br />
-              <span v-if="oilSiteInfo.qrcodeSitePay === 0" class="inner-data"
+              <span>{{oilSiteInfo.qrcodeSitePay== 0 ? '禁用' : oilSiteInfo.qrcodeSitePay== 1 ? '启用' : '暂无数据'}}
+              </span>
+              <!-- <span v-if="oilSiteInfo.qrcodeSitePay === 0" class="inner-data"
                 >禁用</span
               >
               <span v-if="oilSiteInfo.qrcodeSitePay === 1" class="inner-data"
                 >启用</span
-              >
+              > -->
             </div>
             <div class="cell-item">
               <span class="color-999 test-tst">司机主动支付</span>
               <br />
-              <span v-if="oilSiteInfo.activePay === 0" class="inner-data"
+              <span v-if="oilSiteInfo.activePay === 'DISABLE'" class="inner-data"
                 >禁用</span
               >
-              <span v-if="oilSiteInfo.activePay === 1" class="inner-data"
+              <span v-if="oilSiteInfo.activePay === 'ENABLE'" class="inner-data"
                 >启用</span
               >
             </div>
@@ -703,17 +707,22 @@
             <div class="cell-item">
               <span class="color-999 test-tst">支付方式</span>
               <br />
-              <span v-if="oilSiteInfo.payMethod === 2" class="inner-data"
+              <span>{{oilSiteInfo.payMethod== 2 ? '联名卡支付' : oilSiteInfo.payMethod== 1 ? '普通支付方式' : '暂无数据'}}
+              </span>
+              <!-- <span v-if="oilSiteInfo.payMethod === 2" class="inner-data"
                 >联名卡支付</span
               >
               <span v-if="oilSiteInfo.payMethod === 1" class="inner-data"
-                >普通支付方式</span
-              >
+                >普通支付方式</span -->
+              
             </div>
             <div class="cell-item">
               <span class="color-999 test-tst">油站详情提示文案</span>
               <br />
-              <span class="inner-data">{{ oilSiteInfo.detailContent }}</span>
+              <!-- <span v-if="oilSiteInfo.detailContent !== detailContent" class="inner-data"
+                >暂无数据</span> -->
+              <span class="inner-data">  {{oilSiteInfo.detailContent== detailContent ? '' :  '暂无数据'}}
+              </span>
             </div>
           </div>
 
@@ -722,35 +731,37 @@
               <span class="color-999 test-tst">全局禁用启用</span>
               <br />
 
-              <span v-if="oilSiteInfo.globalEnable === 0" class="inner-data"
+              <span v-if="oilSiteInfo.globalEnable === 'DISABLE'" class="inner-data"
                 >禁用</span
               >
-              <span v-if="oilSiteInfo.globalEnable === 1" class="inner-data"
+              <span v-if="oilSiteInfo.globalEnable === 'ENABLE'" class="inner-data"
                 >启用</span
               >
             </div>
             <div class="cell-item">
               <span class="color-999 test-tst">上架标识</span>
               <br />
-              <span v-if="oilSiteInfo.putawayMark === 0" class="inner-data"
+              <span>{{oilSiteInfo.putawayMark== 0 ? '下架' : oilSiteInfo.putawayMark== 1 ? '上架' : '暂无数据'}}
+              </span>
+              <!-- <span v-if="oilSiteInfo.putawayMark === 0" class="inner-data"
                 >下架</span
               >
               <span v-if="oilSiteInfo.putawayMark === 1" class="inner-data"
                 >上架</span
-              >
+              > -->
             </div>
           </div>
           <div class="my-cell">
             <div class="cell-item">
               <span class="color-999 test-tst">审核标识</span>
               <br />
-              <span v-if="oilSiteInfo.auditMark === 0" class="inner-data"
+              <span v-if="oilSiteInfo.auditMark === 'WAITING'" class="inner-data"
                 >待审核</span
               >
-              <span v-if="oilSiteInfo.auditMark === 1" class="inner-data"
+              <span v-if="oilSiteInfo.auditMark === 'SUCCESS'" class="inner-data"
                 >审核通过</span
               >
-              <span v-if="oilSiteInfo.auditMark === -1" class="inner-data"
+              <span v-if="oilSiteInfo.auditMark === '- FAIL'" class="inner-data"
                 >审核不通过</span
               >
             </div>