修改样式

src/components/tradePavilion/VehicleManagement.vue

@@ -127,6 +127,14 @@
             "
           ></span>
         </div>
+        <div class="searchInput" style="width: 200px; margin-bottom: 10px">
+          <el-select size="small" v-model="msg.UserId" :filter-method="ChangeListName" filterable  @change="(msg.pageIndex = 1), getList()"
+            placeholder="请选择">
+            <el-option label="不限" :value="0"></el-option>
+            <el-option v-for="item in userList" :key="item.Id" :label="item.Name" :value="item.Id">
+            </el-option>
+          </el-select>
+        </div>
         <el-date-picker
           class="indataPicker"
           type="daterange"
@@ -183,8 +191,8 @@
           </template>
         </el-table-column>
         <el-table-column prop="CarrierSize" label="商业体量"> </el-table-column>
-        <el-table-column prop="LayersNum" width="150" label="商业层数">
-        </el-table-column>
+        <el-table-column prop="LayersNum" width="150" label="商业层数"></el-table-column>
+        <el-table-column prop="UserName" width="100" label="用户认证"></el-table-column>
         <el-table-column label="操作" width="100">
           <template slot-scope="scope">
             <el-tooltip
@@ -288,7 +296,18 @@ export default {
         StartOpenTime: "", //开业开始时间
         EndOpenTime: "", //	开业截止时间
         ExcelEnumIds: [],
+        UserId:0,
       },
+      usermsg: {
+            pageIndex: 1,
+            pageSize: 20,
+            Name: '',
+            Source: 0,
+            MemberGrade: 0,
+            Id: 0,
+            Moblie: ''
+      },
+      userList:[],
       addMsg: {},
       dialogVisible: false,
       dateStr: [], //日期
@@ -307,8 +326,21 @@ export default {
     this.getList();
     this.getTypeEnumList();
     this.getDown();
+    this.getuserList()
   },
   methods: {
+    ChangeListName(val) {
+        this.usermsg.Name = val;
+        this.getuserList();
+    },
+    getuserList() {
+        this.apipost("/api/user/GetMemberUserDropDownList", this.usermsg, res => {
+        if (res.data.resultCode == 1) {
+            let pageData = res.data.data.pageData;
+            this.userList = pageData;
+        }
+        })
+    },
     getList() {
       this.loading = true;
       if (this.dateStr && this.dateStr.length > 0) {

src/components/tradePavilion/brandManagement.vue

@@ -63,6 +63,14 @@
               :key="y"
             ></el-option>
           </el-select>
+          <span style="margin-left: 10px">认证用户</span>
+
+          <el-select size="small" v-model="msg.UserId" :filter-method="ChangeListName" filterable  @change="(msg.pageIndex = 1), getList()"
+            placeholder="请选择">
+            <el-option label="不限" :value="0"></el-option>
+            <el-option v-for="item in userList" :key="item.Id" :label="item.Name" :value="item.Id">
+            </el-option>
+          </el-select>
         </div>
       </div>
       <div
@@ -222,6 +230,7 @@
         </el-table-column>
         <el-table-column prop="CustomerType" label="客群定位" width="160">
         </el-table-column>
+        <el-table-column prop="UserName" width="100" label="用户认证"></el-table-column>
         <el-table-column fixed="right" label="操作" width="120">
           <template slot-scope="scope">
             <el-tooltip
@@ -333,7 +342,18 @@ export default {
         XinFeng: -1, //新风（0-否1-有）
         BrandClassId: 0, //分类
         ExcelEnumIds: [],
+        UserId:0,//用户认证
+      },
+      usermsg: {
+            pageIndex: 1,
+            pageSize: 20,
+            Name: '',
+            Source: 0,
+            MemberGrade: 0,
+            Id: 0,
+            Moblie: ''
       },
+      userList:[],
       addMsg: {},
       dialogVisible: false,
       dataList: [],
@@ -349,14 +369,39 @@ export default {
     };
   },
   created() {
+    if(this.$route.query && this.$route.query.UserId){
+      this.msg.UserId = Number(this.$route.query.UserId) 
+      this.usermsg.Id = Number(this.$route.query.UserId) 
+      this.getuserList(1)
+    }else{
+      this.getuserList()
+    }
     this.getBrandClassList();
     this.getProjectType();
     this.getDown();
+   
+
   },
   mounted() {
     this.getList();
+
   },
   methods: {
+    ChangeListName(val) {
+        this.usermsg.Name = val;
+        this.getuserList();
+    },
+    getuserList(type=0) {
+        this.apipost("/api/user/GetMemberUserDropDownList", this.usermsg, res => {
+        if (res.data.resultCode == 1) {
+            let pageData = res.data.data.pageData;
+            this.userList = pageData;
+            if(type==1){
+              this.usermsg.Id = 0
+            }
+        }
+        })
+    },
     Export() {
       this.msg.ExcelEnumIds = this.checkedCities;
       let msg = JSON.parse(JSON.stringify(this.msg));

src/components/tradePavilion/realAuthentication.vue

@@ -159,6 +159,7 @@
                         class="w120"
                         placeholder="店铺开口尺寸"
                         maxlength="80"
+                        disabled
                       />
                     </div>
                     <div class="brandShuxing_item">
@@ -173,6 +174,7 @@
                         class="w120"
                         placeholder="燃气备注"
                         maxlength="80"
+                        disabled
                       />
                     </div>
                   </div>
@@ -189,6 +191,7 @@
                         class="w120"
                         placeholder="排烟量"
                         maxlength="80"
+                        disabled
                       />
                     </div>
                      <div class="brandShuxing_item">
@@ -203,6 +206,7 @@
                         class="w120"
                         placeholder="电量"
                         maxlength="80"
+                        disabled
                       />
                     </div>
                   </div>
@@ -249,8 +253,7 @@
                   <div class="brandShuxing">
                     
                     <div class="brandShuxing_item">
-                      <el-form-item label="开点意愿:">{{listInfo.BrandModel.OpenShopWish!=-1?'是':'否'}}</el-form-item>
-                     
+                      <el-form-item label="开点意愿:">
                         <el-rate
                           disabled
                           style="margin-top: 10px;"
@@ -259,6 +262,12 @@
                           v-if="listInfo.BrandModel.OpenShopWish!=-1"
                           :colors="colors">
                         </el-rate>
+                        <span v-else>
+                          暂无意愿
+                        </span>
+                      </el-form-item>
+                     
+                     
                     </div>
                   </div>
                 </el-form>
@@ -431,7 +440,28 @@
         } else {
           str = '确定审核失败？'
         }
+        if(type==1){
           that.Confirm(str, function () {
+          let msg = {
+            CompanyId: that.listInfo.CompanyId,
+            CompanyStatus: type,
+            Remark:'',
+          }
+          const loading = that.$loading({
+              lock: true,
+              text: '审核中...',
+              spinner: 'el-icon-loading',
+            });
+          that.apipost("/api/Trade/UpdateCompanyStatus", msg, res => {
+            loading.close();
+            if (res.data.resultCode == 1) {
+              that.Success(res.data.message)
+              that.isShowInfo = false;
+              that.getList();
+            }
+          })
+        });
+        }else{
           let msg = {
             CompanyId: that.listInfo.CompanyId,
             CompanyStatus: type,
@@ -445,15 +475,15 @@
           that.apipost("/api/Trade/UpdateCompanyStatus", msg, res => {
             loading.close();
             if (res.data.resultCode == 1) {
-              if(type == 2){
                 that.resondialog2 = false
-              }
               that.Success(res.data.message)
               that.isShowInfo = false;
               that.getList();
             }
           })
-        });
+   
+        }
+        
       },
       auditfail(){//失败理由
         this.resondialog2 = true;

src/components/tradePavilion/wishList.vue

@@ -9,6 +9,7 @@
       </div>
       <div class="content">
         <div>
+          <span style="margin-left: 10px">品牌信息</span>
           <div class="searchInput" style="width:250px">
             <el-input @keyup.enter.native="msg.pageIndex=1,getList()" @clear="msg.pageIndex=1,getList()"
               style="display:inline-block;width:225px;height:30px" placeholder="品牌信息" v-model="msg.BranchName" size="small"
@@ -17,6 +18,7 @@
             <span @click="msg.pageIndex=1,getList()" class="el-icon-search"
               style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
           </div>
+          <span style="margin-left: 10px">对标载体</span>
           <div class="searchInput" style="width:250px">
             <el-input @keyup.enter.native="msg.pageIndex=1,getList()" @clear="msg.pageIndex=1,getList()"
               style="display:inline-block;width:225px;height:30px" placeholder="对标载体" v-model="msg.CarrierName" size="small"
@@ -25,8 +27,8 @@
             <span @click="msg.pageIndex=1,getList()" class="el-icon-search"
               style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
           </div>
-          
-          <el-select size="small" v-model="msg.UserId" :filter-method="ChangeListName" filterable
+          <span style="margin-left: 10px">认证用户</span>
+          <el-select size="small" v-model="msg.UserId" :filter-method="ChangeListName" filterable  @change="(msg.pageIndex = 1), getList()"
             placeholder="请选择">
             <el-option label="不限" :value="0"></el-option>
             <el-option v-for="item in userList" :key="item.Id" :label="item.Name" :value="item.Id">
@@ -36,7 +38,11 @@
 
         <el-table :data="tableData" v-loading="loading" border style="width: 100%;margin:20px 0">
         
-          <el-table-column prop="UserName"  label="用户名称"></el-table-column>
+          <el-table-column prop="UserName"  label="用户名称">
+            <template slot-scope="scope">
+              <span>{{scope.row.UserName}} <span style="cursor: pointer;text-decoration: underline;" @click="guanlianbrand(scope.row.UserId)">{{scope.row.UserId}}</span> </span>
+             </template>
+          </el-table-column>
         
           <el-table-column prop="BranchName"  label="品牌信息">
           </el-table-column>
@@ -49,12 +55,11 @@
              <img :src="scope.row.NameCard" alt="" style="width: 100px;height: 40px;border-radius: 3px;">
             </template>
           </el-table-column>
-          <el-table-column prop="Status"  label="详情">
+          <!-- <el-table-column prop="Status"  label="详情">
             <template slot-scope="scope">
-                <!-- <div class="activityContent" v-html="scope.row.Description"></div> -->
                 <div style="cursor: pointer;text-decoration: underline;" @click="Description =scope.row.Description,resondialog = true ">查看详情</div>
             </template>
-          </el-table-column>
+          </el-table-column> -->
 
           <el-table-column prop="Status"  label="状态">
             <template slot-scope="scope">
@@ -65,7 +70,11 @@
           <el-table-column prop="UpdateDate" width="200" label="时间">
           </el-table-column>
           <el-table-column label="操作" width="130">
+          
             <template slot-scope="scope">
+              <el-tooltip class="item" effect="dark" content="查看详情" placement="top">
+                <img src="../../assets/img/userman/icon-show.png" alt="" class="imgstyle" @click="Description =scope.row.Description,resondialog = true ">
+              </el-tooltip>
                 <el-tooltip
                 class="item"
                 effect="dark"
@@ -180,6 +189,15 @@
                 );
             });
           },
+          guanlianbrand(UserId){
+            this.$router.push({
+              name: "brandManagement",
+              query: {
+                UserId: UserId,
+                blank: "y",
+              },
+      });
+          }
   
       },
       mounted() {}