qymljy hace 9 meses
padre
commit
aa562e6502

+ 6 - 1
src/HManagement/clueManage/clue_private/index.vue

@@ -59,6 +59,7 @@
               $refs.basicLayout.param.content.pageNumber = 1;
               $refs.basicLayout.param.content.where.status = status;
               $refs.basicLayout.listData();
+              param = $refs.basicLayout.param
             "
           >
             <el-option
@@ -83,6 +84,7 @@
               $refs.basicLayout.param.content.where.allocationstatus =
                 allocationstatus;
               $refs.basicLayout.listData();
+              param = $refs.basicLayout.param
             "
           >
             <el-option :label="$t(`待分配`)" value="待分配"> </el-option>
@@ -101,6 +103,7 @@
               $refs.basicLayout.param.content.pageNumber = 1;
               $refs.basicLayout.param.content.where.tradefield = tradefield;
               $refs.basicLayout.listData();
+              param = $refs.basicLayout.param
             "
           >
             <el-option
@@ -124,6 +127,7 @@
               $refs.basicLayout.param.content.pageNumber = 1;
               $refs.basicLayout.param.content.where.tag = tag;
               $refs.basicLayout.listData();
+              param = $refs.basicLayout.param
             "
             multiple
           >
@@ -198,7 +202,7 @@
             }}
           </span>
         </div>
-        <div v-else-if="scope.data.column.columnname === 'tag'">
+        <div v-else-if="scope.data.column.columnname === 'alltag'">
           <div v-if="scope.data.column.data.sys_tag">
             <div
               v-for="item in scope.data.column.data.sys_tag"
@@ -276,6 +280,7 @@
               scope.data.column.data.city
             }}-{{ scope.data.column.data.county }}</span
           >
+          <span v-else>--</span>
         </div>
         <div v-else-if="scope.data.column.columnname == 'tradefield'">
           {{

+ 12 - 6
src/HManagement/clueManage/clue_public/index.vue

@@ -12,6 +12,10 @@
       :apiId="{query:20221101094402,del:20221101100502}"
       :options="options"
       :detailPath="{path:'/clueDetail'}"
+      :isExport="false"
+      :isNewExport="true"
+      :columns="tablecols"
+      fileName="公海线索"
       @listCreate="list"
       @checkboxCallBack="checkboxCallBack"
     >
@@ -45,14 +49,14 @@
       </div>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
-          <span style="color:#cccccc" v-if="scope.data.column.data[[scope.data.column.columnname]] == '已过期'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#52C41A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '跟进中'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#FA8C16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '待跟进'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#999999" v-if="scope.data.column.data[[scope.data.column.columnname]] == '已过期'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#52c41a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '跟进中'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#3874f6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '待跟进'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
           <span style="color:#F60909" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已成交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
           <span style="color:#BBBBBB" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '无效'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
           <span v-else>{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </div>
-        <div v-else-if="scope.data.column.columnname === 'tag'">
+        <div v-else-if="scope.data.column.columnname === 'alltag'">
           <div v-if="scope.data.column.data.sys_tag">
             <div v-for="item in scope.data.column.data.sys_tag" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
               <el-tag  color="#3874F6" size="mini" type="primary" effect="dark">
@@ -116,7 +120,8 @@ export default {
       tradefields:[],
       selectList:[],
       tagData:[],
-      tag:''
+      tag:'',
+      tablecols:''
     }
   },
   provide() {
@@ -134,6 +139,7 @@ export default {
     this.tradefields = res3.data
     this.query_arealist()
     this.tagList()
+    this.tablecols = this.tool.tabelCol(this.$route.name)['cluePublicTable'].tablecols
   },
   methods: {
     statusChange () {
@@ -173,7 +179,7 @@ export default {
       this.selectList = row
     },
 
-  }
+  },
 }
 
 </script>

+ 4 - 1
src/HManagement/notice/index.vue

@@ -252,7 +252,10 @@ export default {
       let res = await this.$api.requested({
         id: 20221101094603,
         content: {
-          where: {},
+          isall:"1",
+          where: {
+            issecret:"1"
+          },
         },
       });
       res.data.unshift({ classname: "全部", sat_notice_classid: "" });

+ 6 - 4
src/SManagement/archives_ad/index.vue

@@ -41,7 +41,8 @@ export default {
           "nocache": true,
           "where": {
             "condition": "",
-            "sat_sharematerial_classid": null
+            "sat_sharematerial_classid1": "",
+            "sat_sharematerial_classid2": "",
           }
         }
       },
@@ -100,9 +101,10 @@ export default {
       this.params.content.sort = res.sort
     },
     /* 改变分类ID */
-    changeTypeId(id) {
-      console.log(id,'输出id')
-      this.params.content.where.sat_sharematerial_classid = id == 0 ? null : id;
+    changeTypeId(id,activeClass1,activeClass2) {
+      // this.params.content.where.sat_sharematerial_classid = id == 0 ? null : id;
+      this.params.content.where.sat_sharematerial_classid1 = activeClass1
+      this.params.content.where.sat_sharematerial_classid2 = activeClass2
       this.getFileList(true);
     },
     /* 开始搜索 */

+ 0 - 201
src/SManagement/archives_ad/indexCopy.vue

@@ -1,201 +0,0 @@
-<template>
-  <div>
-    <div class="normal-card">
-      <!-- 搜索及分类筛选 -->
-      <filterList :customParam="select" @changeTypeId="changeTypeId" @startSearch="startSearch">
-        <span style="flex: 1;display: flex;justify-content: flex-end;">
-          <hot-new-control @sortTypeChange="sortTypeChange" />
-        </span>
-      </filterList>
-      <!--素材列表-->
-      <list :fileData="fileData" @listItemClick="listItemClick" :isHandle="false">
-      </list>
-      <pagination :total="total" :pageSize="params.content.pageSize" :currentPage="params.content.pageNumber"
-        @pageChange="pageChange">
-      </pagination>
-      <detail ref="detail" v-if="currentFile" :currentSelectFile="currentFile"></detail>
-    </div>
-  </div>
-</template>
-
-<script>
-import filterList from "@/HManagement/archives_ad/modules/filterList.vue";
-import HotNewControl from '@/components/hot-new-control/HotNewControl'
-import CategorySelect from '@/components/category-select/CategorySelect'
-import list from '@/SManagement/archives_ad/components/list'
-import search from '@/components/search/index'
-import detail from '@/SManagement/archives_ad/components/detail'
-import Delete from '@/SManagement/archives_ad/components/delete'
-import Edit from '@/SManagement/archives_ad/components/Edit'
-import Pagination from '@/components/pagination/Pagination'
-export default {
-  name: 'index',
-  data() {
-    return {
-      params: {
-        "classname": "saletool.sharematerial.sharematerial",
-        "method": "selectList",
-        "content": {
-          "pageNumber": 1,
-          "pageSize": 12,
-          "nocache": true,
-          "where": {
-            "condition": "",
-            "sat_sharematerial_classid": null
-          }
-        }
-      },
-      //分类配置
-      select: {
-        "classname": "saletool.sharematerial.sharematerial",
-        "method": "select",
-        "content": {
-          "parentid": 0
-        }
-      },
-      fileData: [],
-      //列表数据
-      list: [],
-      //分类列表
-      total: 0,
-      //当前查看的素材
-      currentFile: ''
-    };
-  },
-  components: {
-    HotNewControl,
-    CategorySelect,
-    Pagination,
-    list,
-    search,
-    detail,
-    Delete,
-    Edit,
-    filterList
-  },
-  computed: {
-  },
-  created() {
-    this.getFileList()
-  },
-  methods: {
-    //获取文件数据
-    async getFileList(init = false) {
-      if (init) this.params.content.pageNumber = 1;
-      let res = await this.$api.requested(this.params)
-      this.total = res.total
-      for (let i = 0; i < res.data.length; i++) {
-        let list = this.fileType.fileList(res.data[i].attinfos)
-        if (!list.length) continue;
-        let obj = list.find(item => item.fileType == 'image')
-        if (!obj) continue;
-        res.data[i].cover = this.fileType.getSpecifiedImage(obj)
-        res.data.attinfos = list
-      }
-      let initID = '9999' + JSON.parse(window.sessionStorage.getItem("active_account")).userid;
-      let deleteList = [];
-      res.data.forEach(v => (initID == v.sat_sharematerial_classid && v.title == '') ? deleteList.push(v.sat_sharematerialid) : '');
-      if (deleteList.length != 0) this.handleDelete(deleteList);
-      this.fileData = res.data
-      this.params.content.sort = res.sort
-    },
-    /* 改变分类ID */
-    changeTypeId(id) {
-      this.params.content.where.sat_sharematerial_classid = id == 0 ? null : id;
-      this.getFileList(true);
-    },
-    /* 开始搜索 */
-    startSearch(value) {
-      this.params.content.where.condition = value;
-      this.getFileList(true);
-    },
-    /* 处理批量删除 */
-    handleDelete(list) {
-      this.$api.requested({
-        "classname": "webmanage.saletool.sharematerial.sharematerial",
-        "method": "delete",
-        "content": {
-          "sat_sharematerialid": list
-        }
-      }).then(res => {
-        if (res.msg == '成功') this.getList();
-      })
-    },
-    sortTypeChange(name) {
-      for (let i = 0; i < this.params.content.sort.length; i++) {
-        this.params.content.sort[i].sorted = this.params.content.sort[i].sortname == name ? 1 : 0
-      }
-      this.getFileList()
-    },
-    //列表单击事件
-    async listItemClick(data) {
-      let param = {
-        "classname": "saletool.sharematerial.sharematerial",
-        "method": "selectDetail",
-        "content": {
-          "sat_sharematerialid": data.sat_sharematerialid
-        }
-      }
-      let res = await this.$api.requested(param)
-      res.data.attinfos = this.fileType.fileList(res.data.attinfos)
-      this.currentFile = res.data
-      this.$nextTick(() => {
-        this.$refs.detail.isFileInfoPanlShow = true
-      })
-    },
-    clearData() {
-      this.params.content.where.condition = ''
-      this.getFileList()
-    },
-    uploadClick() {
-      this.$router.push({
-        path: '/upload_archives'
-      })
-    },
-    pageChange(n) {
-      this.params.content.pageNumber = n
-      this.getFileList()
-    }
-  },
-};
-</script>
-
-<style scoped>
-.normal-card {
-  min-height: calc(100vh - 138px);
-  box-sizing: border-box;
-  position: relative;
-}
-
-.normal-card .header-panl {
-  display: flex;
-  justify-content: space-between;
-  margin: 20px 0 30px 0;
-}
-
-.normal-card .header-panl .left {
-  display: flex;
-  align-items: center;
-}
-
-.normal-card .header-panl .left .select {
-  margin-right: 16px;
-  display: flex;
-  align-items: center;
-}
-
-.normal-card .header-panl .left .select span {
-  margin-right: 8px;
-}
-
-/deep/ .input-with-select {
-  height: 34px;
-}
-
-.el-pagination {
-  position: absolute;
-  right: 16px;
-  bottom: 0;
-  margin-top: 16px;
-}
-</style>

+ 2 - 0
src/SManagement/archives_admag/index.vue

@@ -155,6 +155,8 @@ export default {
     /* 改变分类ID */
     changeTypeId(id,activeClass1,activeClass2) {
       /*this.params.content.where.sat_sharematerial_classid = id == 0 ? null : id;*/
+      this.params.content.where.sat_sharematerial_classid1 = activeClass1
+      this.params.content.where.sat_sharematerial_classid2 = activeClass2
       this.getFileList(true);
     },
     /* 开始搜索 */

+ 4 - 1
src/SManagement/notice/index.vue

@@ -85,7 +85,10 @@ export default {
       let res = await this.$api.requested({
         "id":20221101094603,
         "content":{
-
+          "isall":"1",
+          "where": {
+            "issecret":"1"
+          },
         }
       })
       this.typeList = res.data