Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/administrative/AllianceContract.vue

@@ -78,6 +78,10 @@
                   prop="CustomerName"
                   :label="$t('salesModule.storeName')"
                   width="150">
+                  <template slot-scope="scope">
+                    {{ scope.row.CustomerName }}
+                      <span v-if="scope.row.IsMain == 1"  style="color: #E95252">({{$t('Operation.Op_zhu')}})</span>
+                  </template>
                 </el-table-column>
                 <el-table-column prop="PredictPrice" :label="$t('restaurant.res_fy')">
                   <template slot-scope="scope">

src/components/administrative/ElectronicAudit.vue

@@ -409,7 +409,7 @@
             <div class="shenheInfoCenter">{{ ContractInfor.Tourists_Email }}</div>
           </el-col>
           <el-col :span="24" class="shenheInfoBox">
-            <p class="shenheInfoTitle">身份证正面:</p>
+            <p class="shenheInfoTitle">身份证正反面:</p>
             <div class="shenheInfoCenter">
               <el-image 
                 style="width: 20px; height: 20px"
@@ -443,7 +443,7 @@
             <p class="shenheInfoTitle">开户人:</p>
             <div class="shenheInfoCenter">{{ ContractInfor.AccountHolder }}</div>
           </el-col>
-          <el-col :span="12" class="shenheInfoBox">
+          <el-col :span="24" class="shenheInfoBox">
             <p class="shenheInfoTitle">卡号:</p>
             <div class="shenheInfoCenter">{{ ContractInfor.CardNum }}</div>
           </el-col>
@@ -509,7 +509,7 @@
         <br/>
         <el-col :span="12" class="shenheInfoBox">
           <el-radio v-model="isBoHui" :label="Number(2)" @change="auditMsg.AuditContract=isBoHui">{{$t('visa.v_tongguo')}}</el-radio>
-          <el-radio v-model="isBoHui" :label="Number(1)" @change="auditMsg.AuditContract=isBoHui">{{$t('fnc.bohui')}}</el-radio>
+          <el-radio v-model="isBoHui" :label="Number(1)" @change="auditMsg.AuditContract=3">{{$t('fnc.bohui')}}</el-radio>
         </el-col>
       </el-row>
       <div slot="footer" class="dialog-footer">

src/components/administrative/LianMengManagementList.vue

@@ -24,17 +24,19 @@
         <th>{{$t('system.table_operation')}}</th>
       </tr>
       <tr v-for="(item,index) in dataList" :key="index">
-         <td>{{item.CustomerName}} <span v-if="item.IsMain == 1"  style="color: #E95252">({{$t('Operation.Op_zhu')}})</span> </td>
+         <td>{{item.CustomerName}} 
+          <!-- <span v-if="item.IsMain == 1"  style="color: #E95252">({{$t('Operation.Op_zhu')}})</span>  -->
+        </td>
          <td>{{item.Contact}}</td>
          <td>{{item.ContactNumber}}</td>
          <td>{{item.IsMember == 1 ? $t('pub.yes') : $t('pub.no')}}</td>
          <td class="_icon_btn">
-            <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.administrative.shiezhizmd')" placement="top">
+            <!-- <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.administrative.shiezhizmd')" placement="top">
               <i class="iconfont icon-guanli2" @click="clickSetAdmin(item)"></i>
-            </el-tooltip>
-              <!-- <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.administrative.yichumend')" placement="top">
-              <i class="iconfont icon-img_delete_small icon-guanli2" @click="DelAllianceChild(item)"></i>
             </el-tooltip> -->
+              <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.administrative.yichumend')" placement="top">
+              <i class="iconfont icon-img_delete_small icon-guanli2" @click="DelAllianceChild(item)"></i>
+            </el-tooltip>
           </td>
       </tr>
     </table>