Merge branch 'lx-dev' of gitee.com:cabbage_qd/web-base-admin into lx-online

src/components/Delivery/yihandeled.vue

@@ -1261,7 +1261,7 @@ export default {
             printWindow.document.close()
             printWindow.focus()
             printWindow.print()
-            printWindow.close()
+            // printWindow.close()
           } else {
             const printContent = document.getElementById('print-content2')
             const printWindow = window.open('', '_blank') // 这句解决edge浏览器打不开的问题
@@ -1269,7 +1269,7 @@ export default {
             printWindow.document.close()
             printWindow.focus()
             printWindow.print()
-            printWindow.close()
+            // printWindow.close()
           }
         })
     },

src/views/information/specialBusiness/emptyOrder/rigiestList.vue

@@ -1,9 +1,3 @@
-<!--
- * @Descripttion:
- * @version:
- * @Author: kBank
- * @Date: 2022-10-24 15:45:01
--->
 <template>
   <div class="page">
     <topBar
@@ -52,35 +46,37 @@
               </el-form-item>
             </el-col>
             <el-col :span="4">
-              <el-form-item label="真实奖衔">
+              <el-form-item label="荣誉奖衔">
-                <el-input
+                <el-select
                   v-model="select.pkAwards"
                   clearable
-                />
+                  :placeholder="'请选择'"
-              </el-form-item>
+                >
-            </el-col>
+                  <el-option
-            <el-col :span="4">
+                    v-for="item in awardsList"
-              <el-form-item label="结算国家">
+                    :key="item.pkId"
-                <el-input
+                    :label="item.awardsName"
-                  v-model="select.pkSettleCountry"
+                    :value="item.pkId"
-                  clearable
+                  />
-                />
+                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item label="自然国家">
-                <el-input
-                  v-model="select.pkCountry"
-                  clearable
-                />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item label="是否结算">
-                <el-input
+                <el-select
                   v-model="select.settlementFlag"
                   clearable
-                />
+                  placeholder="请选择"
+                >
+                  <el-option
+                    label="是"
+                    :value="0"
+                  />
+                  <el-option
+                    label="否"
+                    :value="1"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
             <!-- <el-col :span="4">
@@ -146,6 +142,7 @@
             align="center"
             prop="memberCode"
             label="会员编号"
+            min-width="110"
           />
           <el-table-column
             align="center"
@@ -156,16 +153,19 @@
             align="center"
             prop="phone"
             label="联系方式"
+            min-width="130"
           />
           <el-table-column
             align="center"
             prop="parentCode"
             label="推荐编号"
+            min-width="110"
           />
           <el-table-column
             align="center"
             prop="placeParentCode"
             label="安置编号"
+            min-width="110"
           />
           <el-table-column
             align="center"
@@ -188,20 +188,11 @@
             prop="orderSourceVal"
             label="注册类型"
           />
-          <el-table-column
+
-            align="center"
-            prop="settleCountryName"
-            label="结算国家"
-          />
-          <el-table-column
-            align="center"
-            prop="countryName"
-            label="自然国家"
-          />
           <el-table-column
             align="center"
             prop="pkAwardKeyVal"
-            label="真实奖衔"
+            label="荣誉奖衔"
           />
           <el-table-column
             align="center"
@@ -306,6 +297,9 @@
 <script>
 import topBar from '@/components/topBar'
 import * as api from '@/api/specialBusiness.js'
+import {
+  getAwardsListChiose
+} from '@/api/level'
 export default {
   name: 'Bzpz',
   components: {
@@ -339,14 +333,20 @@ export default {
           name: '注册列表',
           path: 'rigiestList'
         }
-      ]
+      ],
+      awardsList: []
     }
   },
   mounted() {
-    // 获取列表
     this.getDataList()
+    this.getAwardsListOpts()
   },
   methods: {
+    getAwardsListOpts() {
+      getAwardsListChiose().then((res) => {
+        this.awardsList = res.rows
+      })
+    },
     handleChange1() {},
     reset() {
       this.select = {}

src/views/settlementCenter/bonusDetail/index.vue

@@ -224,15 +224,6 @@
               :label="'服务收益' + '($)'"
               :formatter="stateFormat"
             /> -->
-
-            <el-table-column
-              v-if="allTxt.cloudPurIncomeOri"
-              align="center"
-              prop="cloudPurIncomeOri"
-              width="130"
-              :label="$t('极差收益') + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
             <!-- <el-table-column
               v-if="allTxt.cloudPurIncome"
               align="center"

src/views/settlementCenter/sourceBonus/index.vue

@@ -347,7 +347,7 @@
               align="center"
               prop="pkAwardsVal"
               width="130"
-              :label="'真实奖衔'"
+              :label="'荣誉奖衔'"
             />
             <!--            <el-table-column-->
             <!--              v-for="item in menuList"-->

src/views/settlementCenter/totalBonus/index.vue

@@ -426,14 +426,7 @@
               :label="'首购实发小计' + '($)'"
               :formatter="stateFormat"
             /> -->
-            <el-table-column
+
-              v-if="allTxt.cloudRealSubtotalOri"
-              align="center"
-              prop="cloudRealSubtotalOri"
-              width="130"
-              :label="'云代实发小计' + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
             <!-- <el-table-column
               v-if="allTxt.cloudRealSubtotal"
               align="center"
@@ -1079,17 +1072,6 @@ export default {
 
       this.getDataList()
     },
-    getMenu(e, id) {
-      if (e && id == 0) {
-        this.menuList.forEach((item) => {
-          this.$set(item, 'checked', true)
-        })
-      } else if (!e && id == 0) {
-        this.menuList.forEach((item) => {
-          this.$set(item, 'checked', false)
-        })
-      }
-    },
     getData() {
       api.accountList().then((res) => {
         this.acList = res.data