1

src/assets/common/lang/EN/fill.js

@@ -2859,7 +2859,7 @@ export const obj = {
       shifouzdff: 'Whether it is automatically issued ',
       buzhidongfaf: 'Not automatically issued ',
       wankuanhzdfaf: 'Automatic release after payment ',
-      fafangxianlu: 'Release line ',
+      fafangxianlu: 'Expansion circuit ',
       shifoupengz: 'Does it swell ',
       pengzhnagj: 'Expansion gold ',
       shurugjzhccx: 'Please enter keyword, press enter ',
@@ -3142,6 +3142,7 @@ export const obj = {
       zhifuchengg: 'Payment success ',
       weiscewmdjsc: 'No QR code is generated, please click the QR code to make payment ',
       dindanrs: 'Number of orders ',
+      pzGuestNum: 'Expanding the number of people',
       col: {
         t1: 'Paid price ',
         t2: 'Price receivable ',

src/assets/common/lang/Japan/fill.js

@@ -2859,7 +2859,7 @@ export const obj = {
       shifouzdff: '自動リリースするかどうか',
       buzhidongfaf: '自動リリースしない',
       wankuanhzdfaf: '支払いが完了すると自動的に発行される',
-      fafangxianlu: '発行ライン',
+      fafangxianlu: '膨張ライン',
       shifoupengz: '膨張するかどうか',
       pengzhnagj: '膨張金',
       shurugjzhccx: 'キーワードを入力して、車に戻って調べてください',
@@ -3142,6 +3142,7 @@ export const obj = {
       zhifuchengg: '支払いに成功しました',
       weiscewmdjsc: 'QRコードが生成されていません。QRコードの支払い生成をクリックしてください',
       dindanrs: '注文者数',
+      pzGuestNum: '膨張人数',
       col: {
         t1: '実収価格',
         t2: '受取価格',

src/assets/common/lang/zhCN/fill.js

@@ -2859,7 +2859,7 @@ export const obj = {
       shifouzdff: '是否自动发放',
       buzhidongfaf: '不自动发放',
       wankuanhzdfaf: '完款后自动发放',
-      fafangxianlu: '发放线路',
+      fafangxianlu: '膨胀线路',
       shifoupengz: '是否膨胀',
       pengzhnagj: '膨胀金',
       shurugjzhccx: '请输入关键字，回车查询',
@@ -3142,6 +3142,7 @@ export const obj = {
       zhifuchengg: '支付成功',
       weiscewmdjsc: '未生成二维码，请点击二维码付款生成',
       dindanrs: '订单人数',
+      pzGuestNum: '膨胀人数',
       col: {
         t1: '实收价格',
         t2: '应收价格',

src/assets/common/lang/zhTW/fill.js

@@ -2859,7 +2859,7 @@ export const obj = {
       shifouzdff: '是否自動發放',
       buzhidongfaf: '不自動發放',
       wankuanhzdfaf: '完款後自動發放',
-      fafangxianlu: '發放線路',
+      fafangxianlu: '膨脹線路',
       shifoupengz: '是否膨脹',
       pengzhnagj: '膨脹金',
       shurugjzhccx: '請輸入關鍵字，回車查詢',
@@ -3142,6 +3142,7 @@ export const obj = {
       zhifuchengg: '支付成功',
       weiscewmdjsc: '未生成二維碼，請點擊二維碼付款生成',
       dindanrs: '訂單人數',
+      pzGuestNum: '膨脹人數',
       col: {
         t1: '實收價格',
         t2: '應收價格',

src/components/DirectCustomer/components/directCustomerList.vue

@@ -347,11 +347,11 @@
       <el-table-column :label="$t('system.table_operation')" width="150" v-if="pagesTitle!='全部'">
         <template slot-scope="scope">
           <el-tooltip class="item" effect="dark" :content="$t('salesModule.BlackList')" placement="top" v-if="scope.row.Blacklist==2">
-            <el-button @click="getBlacklist(item)" type="primary" icon="iconfont icon-jiaruheimingdan" circle>
+            <el-button @click="getBlacklist(scope.row)" type="primary" icon="iconfont icon-jiaruheimingdan" circle>
             </el-button>
           </el-tooltip>
            <el-tooltip class="item" effect="dark" :content="$t('salesModule.RemoveBlackList')" placement="top" v-if="scope.row.Blacklist!=2">
-            <el-button @click="getBlacklist(item)" type="primary" icon="iconfont icon-yichuheimingdan" circle>
+            <el-button @click="getBlacklist(scope.row)" type="primary" icon="iconfont icon-yichuheimingdan" circle>
             </el-button>
           </el-tooltip>
             <el-tooltip class="item" effect="dark" :content="$t('visaT.Accountmanagement')" placement="top-start">
@@ -441,7 +441,7 @@
       },
       getBlacklist(item) {
         let DisabledType
-        let CustomerId = item.CustomerId.split('|')[0]
+        let CustomerId = item.Id;
         if (item.Blacklist == 2) {
           DisabledType = 1
           this.$confirm(this.$t('objFill.v101.Rest.shifoujruhmdan'), this.$t('tips.tips'), {
@@ -451,14 +451,14 @@
             })
             .then(() => {
               this.apipost(
-                "app_customer_DisabledCustomer", {
-                  CustomerId: CustomerId,
+                "post_DisabledDirectCustomer", {
+                  Id: CustomerId,
                   DisabledType: DisabledType
                 },
                 res => {
                   if (res.data.resultCode == 1) {
                     this.$message.success(this.$t('objFill.v101.Rest.jiaruhemindcgo'));
-                    this.getList();
+                    this.selectResource();
                   }
                 },
                 err => {}
@@ -467,7 +467,7 @@
             .catch(() => {
               this.$message.info(this.$t('objFill.v101.Rest.yiquxiaojiaru'));
             });
-        } else if (item.CustomerStatus == 1) {
+        } else {
           DisabledType = 2
           this.$confirm(this.$t('objFill.v101.Rest.shifouyichmdan'), this.$t('tips.tips'), {
               confirmButtonText: this.$t('pub.sureBtn'),
@@ -476,8 +476,8 @@
             })
             .then(() => {
               this.apipost(
-                "app_customer_DisabledCustomer", {
-                  CustomerId: CustomerId,
+                "post_DisabledDirectCustomer", {
+                  Id: CustomerId,
                   DisabledType: DisabledType
                 },
                 res => {

src/components/activity/CouponList.vue

@@ -316,6 +316,11 @@
               <el-input @input="maxValue" maxlength="20" class="w217" type="number" v-model="addMsg.denomination"
                 :placeholder="$t('active.cl_dkjezk')"></el-input>
             </el-form-item>
+          </el-col>
+            <el-col :span="12">
+            <el-form-item :label="$t('objFill.v101.traveltrip.dindanrs')">
+              <el-input v-model="addMsg.orderGuestNum" class="w217" type="number" />
+            </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('active.cl_couponNum')" prop="couponCount">
@@ -453,7 +458,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('objFill.v101.traveltrip.dindanrs')">
+            <el-form-item :label="$t('objFill.v101.traveltrip.pzGuestNum')">
               <el-input v-model="addMsg.expansionModel.orderGuestNum" class="w217" type="number" />
             </el-form-item>
           </el-col>
@@ -715,6 +720,7 @@
           },
           TeamStartDate: "",
           TeamEndDate: "",
+          orderGuestNum:0,
         },
         pwdMsg: {
           Id: "",
@@ -759,7 +765,8 @@
           customerIds: '',
           customerIdList: [],
           customerType: 0,
-          customerInfo: ""
+          customerInfo: "",
+          orderGuestNum:0,
         },
         EditBtn: false,
         ScopeOfUseList: [],
@@ -1065,7 +1072,8 @@
         this.addMsg.checkInLineList = item.checkInLineList
         this.addMsg.lineIdList = item.lineIdList
         this.addMsg.lineteamIdList = item.lineteamIdList
-        this.addMsg.customerType = item.customerType
+        this.addMsg.customerType = item.customerType,
+        this.addMsg.orderGuestNum = item.orderGuestNum
         if (item.expansionModel === null) {
           this.addMsg.expansionModel = {
             orderType: "",
@@ -1182,6 +1190,7 @@
           lineteamId: [],
           checkInLineList: [],
           isExpansion: 0,
+          orderGuestNum:0,
           expansionModel: {
             orderTyperderType: "",
             denomination: "",