修改

src/components/tradePavilion/VehicleManagement.vue

@@ -15,8 +15,8 @@
   <div class="VehicleManagement">
     <div class="head-title">
       载体管理
-     <el-button style="float:right;margin-top: -5px;" size="small" type="primary"
-          @click="CommonJump('editVehicle')">新增载体</el-button>
+      <el-button style="float:right;margin-top: -5px;" size="small" type="primary" @click="CommonJump('editVehicle')">
+        新增载体</el-button>
     </div>
     <div class="content">
       <div>
@@ -57,6 +57,8 @@
         </el-date-picker>
       </div>
       <el-table :data="tableData" v-loading="loading" border style="width: 100%;margin:20px 0">
+        <el-table-column prop="CarrierName" width="200" label="载体名称">
+        </el-table-column>
         <el-table-column prop="CarrierMetroList" label="地铁信息" width="200">
           <template slot-scope="scope">
             <div v-for="(item,index) in scope.row.CarrierMetroList" :key="index" class="CarrierList">
@@ -64,21 +66,12 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="BannerList" label="载体图片">
-          <template slot-scope="scope">
-            <img :src="item" style="width:40px;" v-for="(item,index) in scope.row.BannerList" :key="index">
-          </template>
-        </el-table-column>
-        <el-table-column prop="ID" label="载体id" width="80">
-        </el-table-column>
-        <el-table-column prop="CarrierName" width="200" label="载体名称">
-        </el-table-column>
-        <el-table-column prop="Logo" width="150" label="logo">
+        <el-table-column prop="Logo" width="100" label="logo">
           <template slot-scope="scope">
             <img :src="scope.row.Logo" style="width:50px;" />
           </template>
         </el-table-column>
-        <el-table-column prop="VideoUrl" width="150" label="载体视频">
+        <el-table-column prop="VideoUrl" width="200" label="载体视频">
         </el-table-column>
         <el-table-column prop="Address" width="200" label="载体地址">
         </el-table-column>
@@ -87,6 +80,9 @@
         <el-table-column prop="OpenTime" width="180" label="开业时间">
         </el-table-column>
         <el-table-column prop="ProjectType" width="100" label="项目类型">
+          <template slot-scope="scope">
+            {{getProject(scope.row.ProjectType)}}
+          </template>
         </el-table-column>
         <el-table-column prop="CarrierSize" width="100" label="商业体量">
         </el-table-column>
@@ -136,11 +132,13 @@
         dateStr: [], //日期
         total: 0,
         tableData: [], //数据列表
-        isShowAdd:false, //新增修改载体
+        isShowAdd: false, //新增修改载体
+        ProjectTypeList: [], //项目类型
       };
     },
     created() {
       this.getList();
+      this.getTypeEnumList();
     },
     methods: {
       getList() {
@@ -163,7 +161,7 @@
         })
       },
       //删除
-      delManage(obj){
+      delManage(obj) {
         let that = this;
         that.Confirm("是否删除?", function () {
           that.apipost(
@@ -186,6 +184,26 @@
         this.msg.pageIndex = val;
         this.getList();
       },
+      //获取项目类型
+      getTypeEnumList() {
+        this.apipost("/api/Trade/GetProjectTypeEnumList", {}, res => {
+          if (res.data.resultCode == 1) {
+            this.ProjectTypeList = res.data.data;
+            console.log(res, '类型');
+          }
+        })
+      },
+
+      //获取项目类型
+      getProject(type) {
+        let str = ''
+        this.ProjectTypeList.forEach(x => {
+          if (x.Id == type) {
+            str = x.Name
+          }
+        })
+        return str;
+      }
     },
     mounted() {}
   };

src/components/tradePavilion/editVehicle.vue

@@ -5,11 +5,11 @@
     </div>
     <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="150px">
       <el-card shadow="never" style="margin-top:10px" class="box-card">
-        <el-form-item label="载体名称" prop="Name">
+        <el-form-item label="载体名称" prop="CarrierName">
           <el-input v-model="addMsg.CarrierName" style="width:690px" size="small">
           </el-input>
         </el-form-item>
-        <el-form-item label="Logo">
+        <el-form-item label="Logo" prop="Logo">
           <div>
             <el-tooltip class="item" effect="dark" content="建议尺寸:88*88" placement="top-start">
               <el-button size="small" @click="choicImg=true,type=1">选择文件</el-button>
@@ -20,10 +20,10 @@
             <img v-else src="../../assets/img/default.png" alt="" />
           </div>
         </el-form-item>
-        <el-form-item label="媒体介绍图(多张)">
+        <el-form-item label="介绍图(多张)">
           <div class="nav_Main">
             <div class="nav_IconContent">
-              <div v-for="(item, index) in addMsg.BannerList" :key="index+'2'"
+              <div v-for="(item, index) in introImgList" :key="index+'2'"
                 style="margin-right: 20px; position: relative; ">
                 <div class="colapp-image" :style="{
                                   backgroundImage: 'url(' + item + ')'
@@ -37,11 +37,16 @@
             </div>
           </div>
         </el-form-item>
+        <el-form-item label="开发商" prop="Developers">
+          <el-input v-model="addMsg.Developers" style="width:690px" size="small" placeholder="请输入内容"></el-input>
+        </el-form-item>
         <el-form-item label="载体视频">
           <el-input v-model="addMsg.VideoUrl" style="width:690px" size="small" placeholder="请输入内容">
             <el-button @click="changeState1 = true" slot="append">添加视频</el-button>
           </el-input>
-          <a v-if="addMsg.VideoUrl != ''" class="blue noline" :href="addMsg.VideoUrl" target="_blank">视频链接</a>
+          <div>
+            <a v-if="addMsg.VideoUrl != ''" class="blue noline" :href="addMsg.VideoUrl" target="_blank">视频链接</a>
+          </div>
         </el-form-item>
         <el-form-item label="载体地址">
           <el-input v-model="addMsg.Address" style="width:690px" size="small" placeholder="请输入内容"></el-input>
@@ -51,14 +56,12 @@
             <el-button @click="isShowMap = true" slot="append">展开地图</el-button>
           </el-input>
         </el-form-item>
-        <el-form-item label="开发商">
-          <el-input v-model="addMsg.Developers" style="width:690px" size="small" placeholder="请输入内容"></el-input>
-        </el-form-item>
-        <el-form-item label="开业时间">
-          <el-date-picker v-model="addMsg.OpenTime" size="small" type="datetime" placeholder="选择开业时间">
+        <el-form-item label="开业时间" prop="OpenTime">
+          <el-date-picker v-model="addMsg.OpenTime" value-format="yyyy-MM-dd HH:mm:ss" size="small"
+           type="datetime" placeholder="选择开业时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="项目类型">
+        <el-form-item label="项目类型" prop="ProjectType">
           <el-select style="width:220px;" v-model="addMsg.ProjectType" size="small" placeholder="请选择">
             <el-option v-for="item in ProjectTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
             </el-option>
@@ -74,7 +77,8 @@
           </el-input>
         </el-form-item>
         <el-form-item label="车位数量">
-          <el-input v-model="addMsg.CarNum" @keyup.native="checkInteger(addMsg,'CarNum')" style="width:690px" size="small" placeholder="请输入内容">
+          <el-input v-model="addMsg.CarNum" @keyup.native="checkInteger(addMsg,'CarNum')" style="width:690px"
+            size="small" placeholder="请输入内容">
           </el-input>
         </el-form-item>
         <el-form-item label="生态规则">
@@ -94,14 +98,14 @@
           </el-input>
         </el-form-item>
         <el-form-item label="地铁信息">
-            <div v-for="(item,index) in addMsg.CarrierMetroList" :key="index" style="position:relative;">
-                <el-input v-model="item.MetroNum" style="width:200px" size="small" placeholder="地铁线路"/>  
-                <el-input v-model="item.MetroName" style="width:200px" size="small" placeholder="站点名称"/>  
-                <el-input v-model="item.Distance" style="width:200px" size="small" placeholder="距离"/> 
-                <el-button @click="delCarrier(index)" class="delCarrClose" type="danger" icon="el-icon-close" circle>
-                </el-button>
-            </div>
-            <el-button type="primary" @click="addMetroList" icon="el-icon-plus" circle></el-button>
+          <div v-for="(item,index) in MetroList" :key="index" style="position:relative;width:690px;">
+            <el-input v-model="item.MetroNum" @keyup.native="checkInteger(item,'MetroNum')" style="width:200px" size="small" placeholder="地铁线路" />
+            <el-input v-model="item.MetroName" style="width:200px" size="small" placeholder="站点名称" />
+            <el-input v-model="item.Distance" style="width:200px" size="small" placeholder="距离" />
+            <el-button @click="delCarrier(index)" class="delCarrClose" type="danger" icon="el-icon-close" circle>
+            </el-button>
+          </div>
+          <el-button type="primary" @click="addMetroList" icon="el-icon-plus" circle></el-button>
         </el-form-item>
       </el-card>
     </el-form>
@@ -132,6 +136,20 @@
   export default {
     name: "editVehicle",
     data() {
+      let validataType = (rule, value, callback) => {
+        if (this.addMsg.ProjectType == 0) {
+          return callback(new Error('请选择项目类型'));
+        } else {
+          callback();
+        }
+      }
+      let validataLogo = (rule, value, callback) => {
+        if (this.addMsg.Logo == '') {
+          return callback(new Error('请上传Logo'));
+        } else {
+          callback();
+        }
+      }
       return {
         pageloading: false,
         addMsg: {
@@ -145,7 +163,7 @@
           Developers: '', //开发商
           OpenTime: '', //开业时间
           ProjectType: 0, //项目类型
-          CarrierSize: '', //商业体量
+          CarrierSize: 0, //商业体量
           LayersNum: '', //商业层数
           CarNum: 0, //车位数量
           CarrierPlan: '', //业态规划
@@ -155,23 +173,40 @@
           CarrierMetroList: [] //地铁信息
         },
         rules: {
-          Name: [{
+          CarrierName: [{
             required: true,
-            message: '请输入供应商名称',
+            message: '请输入载体名称',
             trigger: 'blur'
-          }, ],
-          Mobile: [{
+          }],
+          Developers: [{
             required: true,
-            message: '请输入电话',
+            message: '请输入开发商',
             trigger: 'blur'
-          }, ],
+          }],
+          OpenTime: [{
+            required: true,
+            message: '请输入开业时间',
+            trigger: 'blur'
+          }],
+          ProjectType: [{
+            required: true,
+            validator: validataType,
+            trigger: 'change'
+          }],
+          Logo: [{
+            required: true,
+            validator: validataLogo,
+            trigger: 'change'
+          }]
         },
         ID: 0,
         type: -1,
         choicImg: false,
         changeState1: false,
         isShowMap: false, //显示地图
+        MetroList:[],//地铁信息数据
         ProjectTypeList: [], //项目类型数组
+        introImgList:[], //介绍图
       }
     },
     components: {
@@ -191,40 +226,54 @@
       getTypeEnumList() {
         this.apipost("/api/Trade/GetProjectTypeEnumList", {}, res => {
           if (res.data.resultCode == 1) {
-            console.log(res, '项目类型');
             this.ProjectTypeList = res.data.data;
+            let obj = {
+              Name: '不限',
+              Id: 0
+            }
+            this.ProjectTypeList.unshift(obj);
           }
         })
       },
       //新增地铁信息
-      addMetroList(){
+      addMetroList() {
         let obj = {
-          MetroNum:'',
-          MetroName:'',
-          Distance:''  
+          MetroNum: '',
+          MetroName: '',
+          Distance: ''
         }
-        this.addMsg.CarrierMetroList.push(obj);
+        this.MetroList.push(obj);
       },
       //删除地铁信息
-      delCarrier(index){
-
+      delCarrier(index) {
+        this.MetroList.splice(index, 1);
       },
       Save(formName) {
         this.$refs[formName].validate((valid) => {
           if (valid) {
-
-            if (this.addMsg.Introducer == '') {
-              this.addMsg.Introducer = 0
-            }
-            if (this.addMsg.Introducer == 0) {
-              this.addMsg.SupplierCommissionList = []
+            if(this.MetroList.length>0){
+                for(var i=0;i<this.MetroList.length;i++){
+                    if(this.MetroList[i].MetroNum==''){
+                        this.Error(`请填写第地铁信息${i+1}行地铁线路`);
+                        return;
+                    }
+                    if(this.MetroList[i].MetroName==''){
+                        this.Error(`请填写第地铁信息${i+1}行站点名称`);
+                        return;
+                    }
+                    if(this.MetroList[i].Distance==''){
+                        this.Error(`请填写第地铁信息${i+1}行距离`);
+                        return;
+                    }
+                }
             }
-            this.apipost('/api/Supplier/SetSupplier', this.addMsg,
+            this.addMsg.CarrierMetroList = this.MetroList;
+            this.addMsg.BannerList = this.introImgList;
+            this.apipost('/api/Trade/GetSetCarrier', this.addMsg,
               res => {
                 if (res.data.resultCode === 1) {
-                  this.CommonJump('supplierManage')
+                  this.CommonJump('VehicleManagement')
                   this.Success(res.data.message)
-
                 } else {
                   this.Error(res.data.message);
                 }
@@ -245,18 +294,16 @@
           this.pageloading = false;
           if (res.data.resultCode == 1) {
             let data = res.data.data
-            // this.addMsg.ID = data.ID;
-            // this.addMsg.Name = data.Name;
-            // this.addMsg.Mobile = data.Mobile;
-            // this.addMsg.Address = data.Address;
-            // this.addMsg.Introducer = data.Introducer;
-            // this.addMsg.ClientBankAccount.ID = data.ClientBankAccount.ID;           
-            // this.addMsg.ClientBankAccount.AccountClassify = data.ClientBankAccount.AccountClassify;
-            // this.addMsg.ClientBankAccount.OpenBankName = data.ClientBankAccount.OpenBankName;
-            // this.addMsg.ClientBankAccount.AccountHolder = data.ClientBankAccount.AccountHolder;
-            // this.addMsg.ClientBankAccount.CardNum = data.ClientBankAccount.CardNum;
-            // this.addMsg.ClientBankAccount.AccountAlias = data.ClientBankAccount.AccountAlias;
-            // this.search.Name = data.IntroducerName;
+            this.addMsg = res.data.data;
+            if(res.data.data.CarrierMetroList&&res.data.data.CarrierMetroList.length>0){
+                this.MetroList = res.data.data.CarrierMetroList
+            }
+            if(res.data.data.BannerList&&res.data.data.BannerList.length>0){
+                this.introImgList = res.data.data.BannerList
+            }
+            if(res.data.data.OpenTime){
+                this.addMsg.OpenTime = this.addMsg.OpenTime.replace('T',' ');
+            }    
           } else {
             this.Error(res.data.message);
           }
@@ -268,12 +315,12 @@
           this.addMsg.Logo = this.getIconLink(msg.url);
         }
         if (this.type == 2) {
-          this.addMsg.BannerList.push(msg.url);
+          this.introImgList.push(msg.url);
         }
         this.choicImg = false;
       },
       ClearCarouse(index) {
-        this.addMsg.BannerList.splice(index, 1);
+        this.introImgList.splice(index, 1);
       },
       Selectvideo(val) {
         this.addMsg.VideoUrl = val.Path;
@@ -348,11 +395,13 @@
     top: -8px;
     padding: 4px 4px !important;
   }
-  .delCarrClose{
+
+  .delCarrClose {
     position: absolute;
-    right: 0;
-    top: 0;
+    right: 53px;
+    top: 8px;
     padding: 4px 4px !important;
 
   }
+
 </style>

src/components/tradePavilion/realAuthentication.vue

@@ -22,7 +22,7 @@
           </el-table-column>
           <el-table-column prop="BusinessLicense" width="150" label="营业执照">
             <template slot-scope="scope">
-              <img :src="scope.row.BusinessLicense" alt="" />
+              <img :src="scope.row.BusinessLicense" style="width:50px;" alt="" />
             </template>
           </el-table-column>
           <el-table-column prop="UnifiedCode" label="统一社会信用代码">
@@ -57,6 +57,9 @@
           style="margin:0 9px;color:#C0C4CC">/</span><span>详情</span>
       </div>
       <div class="content">
+        <div style="margin:20px 0;font-weight:bold;">
+            <span class="tradeLine"></span>公司信息
+        </div>
         <el-row style="margin-bottom:20px;">
             <el-col :span="6">
                 公司id:{{listInfo.CompanyId}}
@@ -65,7 +68,7 @@
                 企业名称：{{listInfo.CompanyName}}
             </el-col>
             <el-col :span="6">
-                营业执照：{{listInfo.BusinessLicense}}
+                法人：{{listInfo.LegalPerson}}
             </el-col>
             <el-col :span="6">
                 统一社会信用代码：{{listInfo.UnifiedCode}}
@@ -81,12 +84,14 @@
             <el-col :span="6">
                 联系电话：{{listInfo.Mobile}}
             </el-col>
-            <el-col :span="6">
-                法人：{{listInfo.LegalPerson}}
+            <el-col :span="6" style="display:flex;">
+                营业执照：<img :src="listInfo.BusinessLicense" style="width:40px;" />
             </el-col>
         </el-row>
         <template v-if="listInfo.BrandModel">
-            <div style="margin:20px 0;">品牌信息</div>
+            <div style="margin:20px 0;font-weight:bold;">
+                <span class="tradeLine"></span>品牌信息
+            </div>
             <el-row style="margin-bottom:20px;">
                 <el-col :span="6">
                     客户群体：<span v-for="(item,index) in listInfo.BrandModel.CustomerTypeInfo" :key="index">{{item}}</span>
@@ -163,7 +168,6 @@
         this.apipost("/api/Trade/GetCompanyPageList", this.msg, res => {
           this.loading = false;
           if (res.data.resultCode == 1) {
-            console.log(res, '数据来了');
             this.total = res.data.data.count;
             let pageData = res.data.data.pageData;
             this.tableData = pageData;
@@ -184,7 +188,6 @@
           if (res.data.resultCode == 1) {
             this.isShowInfo = true;
             this.listInfo = res.data.data;
-            console.log(res,'详情数据！');
           }
         })
       },
@@ -235,5 +238,11 @@
     padding: 20px;
     box-sizing: border-box;
   }
-
+  .realAuthentication .tradeLine{
+    display: inline-block;
+    width:3px;
+    height:10px;
+    margin-right:5px;
+    background-color: #409EFF;
+  }
 </style>