Merge branch 'master' of http://121.40.40.223:3000/zizhong.wang/Lexus-media

src/App.vue

@@ -38,7 +38,7 @@ export default {
     return {
       navTitle1: ' > 数据管理',
       navTitle2: '',
-      isManufacturer: 'distributor', // distributor 经销商 manufacturer 厂商
+      isManufacturer: 'manufacturer', // distributor 经销商 manufacturer 厂商
       userAccount: ''
     }
   },

src/components/Modal.vue

@@ -53,7 +53,7 @@
             <div>{{ selectedPlatform }}</div>
           </div>
           <div class="contentCol2">
-            <span>发布板块</span
+            <span>发布版块</span
             ><select name="" id="" v-model="releaseP">
               <option
                 v-for="(item, index) in releaseMedia"

src/components/modalcopy.vue

@@ -53,7 +53,7 @@
             <div>{{ selectedPlatform }}</div>
           </div>
           <div class="contentCol2">
-            <span>发布板块</span
+            <span>发布版块</span
             ><select name="" id="" v-model="releaseP">
               <option
                 v-for="(item, index) in releasePlate"

src/views/account/AccountIndex.vue

@@ -25,9 +25,13 @@
         </div>
         <div class="selectPlate">
           <p>媒体平台</p>
-          <select v-model="plateValue">
+          <select v-model="plateValue" @change="platChange($event)">
             <option value="">请选择</option>
-            <option v-for="(item, index) in platesList" :key="index">
+            <option
+              v-for="(item, index) in platesList"
+              :key="index"
+              :data-index="index"
+            >
               {{ item.dictName }}
             </option>
           </select>
@@ -81,6 +85,7 @@ export default {
       sum: 0,
       pageSize: 20,
       onlineUrl: "http://8.136.230.133:8080",
+      platIndex: 0,
     };
   },
   computed: {
@@ -131,17 +136,28 @@ export default {
       };
       this.getDealerListRequest(req);
     },
-    plateOption: function (e) {
-      let index = e.target.options.selectedIndex;
-      console.log(index);
+    platChange: function (e) {
+      this.platIndex = e.target.options.selectedIndex;
     },
     submit: function () {
-      let req = {
-        localArea: this.areaValue,
-        platformName: this.plateValue,
-        page: this.currentPage,
-        rows: this.pageSize,
-      };
+      console.log(this.platIndex);
+      let index = this.platIndex;
+      let req = {}
+      if (index > 0) {
+        let platformId = this.platesList[index - 1]["id"];
+        req = {
+          localArea: this.areaValue,
+          platformId,
+          page: this.currentPage,
+          rows: this.pageSize,
+        };
+      } else {
+        req = {
+          localArea: this.areaValue,
+          page: this.currentPage,
+          rows: this.pageSize,
+        }
+      }
       this.getDealerListRequest(req);
     },
     editData: function (i, isAttesta, fansNum, accountCode) {
@@ -259,6 +275,7 @@ export default {
         .then((res) => {
           if (res.data && res.data.code === 200) {
             this.platesList = res.data.data;
+            console.log(this.platesList, "aa");
           } else {
             console.log(res);
           }

src/views/account/AccountManage.vue

@@ -74,6 +74,9 @@ export default {
       let data = {
         id: editData["id"],
         authentication: flag === "是" ? true : false,
+        
+        // authentication: isAttesta === "是" ? true : false,
+        
         fansCount: fansNum,
         accountCode: account,
       };

src/views/data/UploadInfor.vue

@@ -297,7 +297,7 @@ export default {
     // 关闭提示框
     closeTipModal: function () {
       this.tipModalFlag = false;
-      this.$router.go(0);
+      this.$router.push({path:'/uploadRecord'});
     },
     // 获取某一页面的数据，展示在表格
     changePage: function (page) {
@@ -466,8 +466,14 @@ export default {
               let endData = this.currentPage * this.pageSize;
               this.tableData = this.allDlr.slice(startData, endData);
               // 自定义添加  提示
+              let include = this.dlrList.indexOf(this.addByCustomize);
+              if (include < 0 && addBySelfFlag) {
+                alert('没有找到该进销商');
+                return
+              }
               if (this.sum === nowSum && addBySelfFlag) {
-                alert("该小组已在列表中，不用重复添加");
+                alert("该进销商已在列表中，不用重复添加");
+                return
               }
             }
           } else {

src/views/data/UploadRecord.vue

@@ -76,7 +76,6 @@ export default {
       this.inputValue = "";
     },
     search: function () {
-      console.log(this.inputValue);
       let data = {};
       if (this.inputValue !== "请输入要搜索的资料名") {
         data = {
@@ -160,6 +159,7 @@ export default {
           id: i,
           page: this.currentPage,
           rows: this.pageSize,
+          asc: this.asc
         },
       });
     },

src/views/data/components/UploadLinksTable.vue

@@ -40,8 +40,8 @@
            
           <td>{{ obj.carTypeName }}</td>
           <td>{{ obj.carPlatformName }}</td>
-          <td>{{ obj.publishSourceName || '-' }}</td>
-          <td>{{ obj.publishPlatformName }}</td>
+          <td>{{ obj.publishPlatformName || '-' }}</td>
+          <td>{{ obj.publishSourceName }}</td>
           <td>{{ obj.projectTypeName || '-'}}</td>
           <td>{{ obj.mediaTypeName }}</td>
           <td>{{ obj.contentTypeName || '-'}}</td>

src/views/data/components/UploadRecordDetail.vue

@@ -102,6 +102,7 @@ export default {
     let req = {
       page: this.page,
       rows: this.rows,
+      asc: this.asc
     };
     console.log(req);
     this.getFirmsUploadList(req);
@@ -117,6 +118,7 @@ export default {
       optionValue: "",
       filesList: [],
       index: (this.$route.query && this.$route.query.id) || "",
+      asc: (this.$route.query && this.$route.query.asc) || true,
       rows: (this.$route.query && this.$route.query.rows) || 20,
       page: (this.$route.query && this.$route.query.page) || 20,
       detailData: {},
@@ -244,7 +246,7 @@ export default {
     },
     // 导出   接口
     exportTem: function (reqStr) {
-      let url = this.onlineUrl + "/export?" + reqStr;
+      let url = this.onlineUrl + "/export?informationId" + reqStr;
       window.open(url);
     },
     // 分页获取所有进销商信息接口
@@ -347,6 +349,9 @@ export default {
         .filesName {
           p {
             color: #0056a0;
+            &:hover{
+              cursor: pointer;
+            }
           }
         }
       }

src/views/parameter/Grouping.vue

@@ -165,7 +165,6 @@ export default {
       })
         .then((res) => {
           if (res.data && res.data.code === 200) {
-            console.log(res);
             this.tableData = res.data.data;
             this.sum = res.data.count;
           } else {
@@ -188,9 +187,7 @@ export default {
           },
         })
           .then((res) => {
-            console.log(res, 1111);
             if (res.data && res.data.code === 200) {
-              console.log(res);
               resolve();
             } else {
               alert("编辑失败，请重试");

src/views/parameter/PlatformModule.vue

@@ -122,7 +122,7 @@ export default {
         this.selectPublishPlatformPage(this.currentPage, this.pageSize);
       });
     },
-    // 点击平台板块
+    // 点击平台版块
     jumpRouter: function (index) {
       // 页面变化
       this.$router.push({

src/views/parameter/components/Grouping/GroupMember.vue

@@ -100,7 +100,7 @@ export default {
         this.selectAgentInfoPage(this.groupId, this.currentPage, this.pageSize);
       });
     },
-    // 新增车型模态框 保存
+    // 新增 保存
     submit: function (list) {
       let strReq = list.join(",");
       let req = {
@@ -131,8 +131,14 @@ export default {
       })
         .then((res) => {
           if (res.data && res.data.code === 200) {
-            console.log(res, "列表");
-            this.tableData = res.data.data;
+            this.tableData = [];
+            let arr = res.data.data;
+            arr.map((item) => {
+              this.tableData.push(
+                Object.assign({},item, {flag: true})
+              )
+            })
+            console.log(this.tableData, 222);
             this.sum = res.data.count;
           } else {
             console.log(res);

src/views/parameter/components/Grouping/GroupMemberModal.vue

@@ -117,6 +117,7 @@ export default {
     submit: function () {
       this.dlrIdList();
       if (this.idList.length !== 0) {
+        console.log(this.idList , 444); 
         this.$emit("submit", this.idList);
       } else {
         alert('请选择要添加的成员');
@@ -240,6 +241,7 @@ export default {
                 hash[next.id] ? "" : (hash[next.id] = true && item.push(next));
                 return item;
               }, []);
+              console.log(this.allDlr, 222);
               this.sum = this.allDlr.length;
               // 添加以后跳到最后一页
               this.currentPage = this.totalPage;
@@ -247,8 +249,14 @@ export default {
               let endData = this.currentPage * this.pageSize;
               this.tableData = this.allDlr.slice(startData, endData);
               // 自定义添加  提示
+              let include = this.dlrList.indexOf(this.addByCustomize);
+              if (include < 0 && addBySelfFlag) {
+                alert('没有找到该进销商');
+                return
+              }
               if (this.sum === nowSum && addBySelfFlag) {
-                alert("该小组已在列表中，不用重复添加");
+                alert("该进销商已在列表中，不用重复添加");
+                return
               }
             }
           } else {
@@ -281,7 +289,11 @@ export default {
   },
   created() {
     this.getDlrData({}, true);
-    this.tableData = this.tableList;
+    this.tableList.forEach((item) => {
+      this.allDlr.push(item);
+    })
+    this.tableData = this.allDlr.slice(0, this.pageSize);
+    this.sum = this.tableList.length;
     this.getAreaList();
   },
 };

src/views/parameter/components/PlatformModule/DetailPage.vue

@@ -127,7 +127,7 @@ export default {
         );
       });
     },
-    // 新增板块模态框 保存
+    // 新增版块模态框 保存
     submit: function (platName) {
       let parentId = this.parentId;
       this.currentPage = Math.ceil((this.sum + 1) / this.pageSize);

src/views/parameter/components/PlatformModule/DetailPageModal.vue

@@ -3,7 +3,7 @@
     <div class="vehicle_servies_modal" @mousewheel="mousewheel">
       <div class="modal_content">
         <div class="input">
-          <p>板块名称</p>
+          <p>版块名称</p>
           <input type="text" v-model="platName" />
         </div>
         <div class="btn">

src/views/parameter/components/PlatformModule/DetailPageTable.vue

@@ -3,7 +3,7 @@
     <table>
       <thead>
         <tr>
-          <td>板块</td>
+          <td>版块</td>
           <td>操作</td>
         </tr>
       </thead>
@@ -76,7 +76,7 @@ export default {
     // 确认编辑
     submitEdit: function (i) {
       if (!this.newName) {
-        alert("板块名称不能为空");
+        alert("版块名称不能为空");
       } else if (this.newName === this.tableData[i].module) {
         this.newName = ""; // 没有改
       } else {