Merge remote-tracking branch 'origin/dev' into dev

packages/3.0.0/AppPartyHistoryClass/AppPartyHistoryClass.vue

@@ -7,7 +7,9 @@
       <template #content>
         <ai-search-bar>
           <template slot="left">
-            <el-button type="primary" icon="iconfont iconAdd" @click="handleAdd">添加</el-button>
+            <el-button type="primary" icon="iconfont iconAdd" @click="handleAdd"
+              >添加</el-button
+            >
           </template>
           <template slot="right">
             <el-input
@@ -16,9 +18,14 @@
               size="small"
               placeholder="请输入课程主题"
               clearable
-              v-throttle="() => {search.current = 1, getList()}"
+              v-throttle="
-              @clear="search.current=1, search.title = '', getList()"
+                () => {
-              suffix-icon="iconfont iconSearch">
+                  (search.current = 1), getList();
+                }
+              "
+              @clear="(search.current = 1), (search.title = ''), getList()"
+              suffix-icon="iconfont iconSearch"
+            >
             </el-input>
           </template>
         </ai-search-bar>
@@ -29,175 +36,224 @@
           :total="total"
           :current.sync="page.current"
           :size.sync="page.size"
-          style="margin-top: 10px;"
+          style="margin-top: 10px"
-          @getList="getList">
+          @getList="getList"
-          <el-table-column slot="options" label="操作" align="center" width="230px" fixed="right">
+        >
-            <div slot-scope="{row}" class="table-options">
+          <el-table-column
-              <el-button type="text" :title="row.status == 0 ? '发布' : '取消发布'" @click="handleChange(row)">{{ row.status == 0 ? '发布' : '取消发布' }}</el-button>
+            slot="options"
-              <el-button type="text" title="添加" @click="handleAddSeries(row)">添加剧集</el-button>
+            label="操作"
-              <el-button type="text" title="详情" @click="handleDetail(row)">详情</el-button>
+            align="center"
-              <el-button type="text" title="编辑" @click="handleEdit(row)">编辑</el-button>
+            width="230px"
-              <el-button type="text" title="删除" @click="handleDelete(row)">删除</el-button>
+            fixed="right"
+          >
+            <div slot-scope="{ row }" class="table-options">
+              <el-button
+                type="text"
+                :title="row.status == 0 ? '发布' : '取消发布'"
+                @click="handleChange(row)"
+                >{{ row.status == 0 ? "发布" : "取消发布" }}</el-button
+              >
+              <el-button type="text" title="添加" @click="handleAddSeries(row)"
+                >添加剧集</el-button
+              >
+              <el-button type="text" title="详情" @click="handleDetail(row)"
+                >详情</el-button
+              >
+              <el-button type="text" title="编辑" @click="handleEdit(row)"
+                >编辑</el-button
+              >
+              <el-button type="text" title="删除" @click="handleDelete(row)"
+                >删除</el-button
+              >
             </div>
           </el-table-column>
         </ai-table>
       </template>
     </ai-list>
-    <component :is="comp" v-else :row="row" :instance="instance" :dict="dict" :permissions="permissions" @back="back" :isEdit="isEdit"></component>
+    <component
+      :is="comp"
+      v-else
+      :row="row"
+      :instance="instance"
+      :dict="dict"
+      :permissions="permissions"
+      @back="back"
+      :isEdit="isEdit"
+    ></component>
   </section>
 </template>
 
 <script>
-  import partyClassAdd from "./components/partyClassAdd";
+import partyClassAdd from "./components/partyClassAdd";
-  import seriesManage from "./components/seriesManage";
+import seriesManage from "./components/seriesManage";
-  import {mapState} from "vuex";
+import { mapState } from "vuex";
 
-  export default {
+export default {
-    name: "AppPartyHistoryClass",
+  name: "AppPartyHistoryClass",
-    label: "党员学习",
+  label: "党员学习",
-    components: {partyClassAdd, seriesManage},
+  components: { partyClassAdd, seriesManage },
-    props: {
+  props: {
-      instance: Function,
+    instance: Function,
-      dict: Object,
+    dict: Object,
-      permissions: Function
+    permissions: Function,
-    },
+  },
-    data() {
+  data() {
-      return {
+    return {
-        comp: "",
+      comp: "",
-        tableData: [],
+      tableData: [],
-        total: 0,
+      total: 0,
-        row: {},
+      row: {},
-        showList: true,
+      showList: true,
-        search: {},
+      search: {},
-        topOrgId: "",
+      topOrgId: "",
-        partyList: [],
+      partyList: [],
-        treeData: [],
+      treeData: [],
-        organizationId: "",
+      organizationId: "",
-        organizationName: "",
+      organizationName: "",
-        isEdit: false,
+      isEdit: false,
-        page: {
+      page: {
-          current: 1,
+        current: 1,
-          size: 10
+        size: 10,
-        }
-      }
-    },
-    computed: {
-      ...mapState(["user"]),
-      colConfigs() {
-        return [
-          {label: "课程主题", prop: "title"},
-          {
-            label: "更新状态",
-            render: (h, {row}) => [ < span > {this.dict.getLabel('classroomUpdateStatus', row.updateStatus)} < /span>]
-          },
-          {label: "更新时间", prop: "updateDate"},
-          {label: "发布时间", prop: "createDate"},
-          {
-            label: "发布状态",
-            render: (h, {row}) => [ < span > {this.dict.getLabel('newsCenterStatus', row.status)} < /span>]
-          },
-          {label: "发布组织", prop: "organizationName"},
-          {slot: "options"}
-        ];
-      }
       },
-      methods: {
+    };
-        handleChange(row) {
+  },
-          this.$confirm(`是否确定要${row.status==0?'发布':'取消发布'}?`).then(_ => {
+  computed: {
-            this.instance.post("/app/apppartyclassroom/addOrUpdate", {
+    ...mapState(["user"]),
+    colConfigs() {
+      return [
+        { label: "课程主题", prop: "title" },
+        {
+          label: "更新状态",
+          render: (h, { row }) => [
+            <span>
+              {" "}
+              {this.dict.getLabel(
+                "classroomUpdateStatus",
+                row.updateStatus
+              )}{" "}
+            </span>,
+          ],
+        },
+        { label: "更新时间", prop: "updateDate" },
+        { label: "发布时间", prop: "createDate" },
+        {
+          label: "发布状态",
+          render: (h, { row }) => [
+            <span> {this.dict.getLabel("newsCenterStatus", row.status)} </span>,
+          ],
+        },
+        { label: "发布组织", prop: "organizationName" },
+        { slot: "options" },
+      ];
+    },
+  },
+  methods: {
+    handleChange(row) {
+      this.$confirm(`是否确定要${row.status == 0 ? "发布" : "取消发布"}?`).then(
+        (_) => {
+          this.instance
+            .post("/app/apppartyclassroom/addOrUpdate", {
               id: row.id,
-              status: row.status == 0 ? 1 : 0
+              status: row.status == 0 ? 1 : 0,
-            }).then(res=>{
+            })
-              if(res.code==0){
+            .then((res) => {
-                this.$message.success(`${row.status == 0?'发布成功':'取消发布成功'}`);
+              if (res.code == 0) {
+                this.$message.success(
+                  `${row.status == 0 ? "发布成功" : "取消发布成功"}`
+                );
                 this.getList();
               }
-            })
+            });
-          })
-        },
-        handleAddSeries(row) {
-          this.showList = false;
-          this.comp = "seriesManage";
-          this.row = row;
-        },
-        handleDelete({id}){
-          this.$confirm("确定要删除吗？").then(_=>{
-            this.instance.post("/app/apppartyclassroom/delete", null, {
-              params: {
-                ids:id
-              }
-            }).then(res => {
-              if (res.code==0) {
-                this.$message.success("删除成功");
-                this.getList();
-              }
-            })
-          })
-        },
-        handleEdit(row) {
-          this.showList = false;
-          this.isEdit = true;
-          this.comp = "partyClassAdd";
-          this.row = row;
-        },
-        handleDetail(row) {
-          this.showList = false;
-          this.isEdit = false;
-          this.comp = "partyClassAdd";
-          this.row = row;
-        },
-        changeParty(e) {
-          if (!e.length) return
-          this.organizationName = e[0]?.name;
-          this.resetSearch();
-        },
-        resetSearch() {
-          this.page.current = 1;
-          this.getList();
-        },
-        // 点击树节点
-        handleNodeClick(data) {
-          this.partyList = data;
-        },
-        back() {
-          this.comp = "";
-          this.showList = true;
-          this.isEdit = false;
-
-          this.getList()
-        },
-        handleAdd() {
-          this.comp = "partyClassAdd";
-          this.showList = false;
-          this.isEdit = true;
-          this.row = {};
-        },
-        getList() {
-          this.instance.post("/app/apppartyclassroom/list", null, {
-            params: {
-              ...this.page,
-              ...this.search,
-            }
-          }).then(res => {
-            if (res?.data) {
-              this.tableData = res.data.records;
-              this.total = res.data.total;
-            }
-          })
         }
-      },
+      );
-      created() {
+    },
-        this.topOrgId = this.user.info?.organizationId;
+    handleAddSeries(row) {
-        this.organizationId = this.user.info?.organizationId;
+      this.showList = false;
-        this.organizationName = this.user.info?.organizationName;
+      this.comp = "seriesManage";
-        this.dict.load("classroomUpdateStatus",'newsCenterStatus');
+      this.row = row;
-        this.getList();
+    },
-      }
+    handleDelete({ id }) {
-    }
+      this.$confirm("确定要删除吗？").then((_) => {
+        this.instance
+          .post("/app/apppartyclassroom/delete", null, {
+            params: {
+              ids: id,
+            },
+          })
+          .then((res) => {
+            if (res.code == 0) {
+              this.$message.success("删除成功");
+              this.getList();
+            }
+          });
+      });
+    },
+    handleEdit(row) {
+      this.showList = false;
+      this.isEdit = true;
+      this.comp = "partyClassAdd";
+      this.row = row;
+    },
+    handleDetail(row) {
+      this.showList = false;
+      this.isEdit = false;
+      this.comp = "partyClassAdd";
+      this.row = row;
+    },
+    changeParty(e) {
+      if (!e.length) return;
+      this.organizationName = e[0]?.name;
+      this.resetSearch();
+    },
+    resetSearch() {
+      this.page.current = 1;
+      this.getList();
+    },
+    // 点击树节点
+    handleNodeClick(data) {
+      this.partyList = data;
+    },
+    back() {
+      this.comp = "";
+      this.showList = true;
+      this.isEdit = false;
+
+      this.getList();
+    },
+    handleAdd() {
+      this.comp = "partyClassAdd";
+      this.showList = false;
+      this.isEdit = true;
+      this.row = {};
+    },
+    getList() {
+      this.instance
+        .post("/app/apppartyclassroom/list", null, {
+          params: {
+            ...this.page,
+            ...this.search,
+          },
+        })
+        .then((res) => {
+          if (res?.data) {
+            this.tableData = res.data.records;
+            this.total = res.data.total;
+          }
+        });
+    },
+  },
+  created() {
+    this.topOrgId = this.user.info?.organizationId;
+    this.organizationId = this.user.info?.organizationId;
+    this.organizationName = this.user.info?.organizationName;
+    this.dict.load("classroomUpdateStatus", "newsCenterStatus");
+    this.getList();
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-  .AppFoundingHundred {
+.AppFoundingHundred {
-    height: 100%;
+  height: 100%;
-  }
+}
 </style>

packages/3.0.0/AppPropertyAdministration/AppPropertyAdministration.vue

@@ -0,0 +1,36 @@
+<template>
+  <div class="AppPropertyAdministration">
+    <AppPropertyAdministration
+      slot="content"
+      :instance="instance"
+      :dict="dict"
+      :permissions="permissions">
+    </AppPropertyAdministration>
+  </div>
+</template>
+
+<script>
+import AppPropertyAdministration from './components/AppPropertyAdministration.vue'
+export default {
+  name: "AppPropertyAdministration",
+  label: "产权管理",
+  components: {
+    AppPropertyAdministration,
+  },
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  data() {
+    return {}
+  },
+  methods: {},
+}
+</script>
+
+<style lang="scss" scoped>
+.AppPropertyAdministration {
+  height: 100%;
+}
+</style>

packages/3.0.0/AppPropertyAdministration/components/AppPropertyAdministration.vue

@@ -0,0 +1,29 @@
+<template>
+  <ai-list class="loansAudit">
+    <template slot="title">
+      <ai-title title="产权管理" isShowBottomBorder  :isShowBottomBorder="true" :isShowArea="true" v-model="areaId"></ai-title>
+    </template>
+    <template slot="content">
+    </template>
+
+  </ai-list>
+</template>
+
+<script>
+export default {
+  name: "loansAudit",
+  props: {
+    instance: Function,
+    dict: Object
+  },
+  data() {
+    return {
+    }
+  },
+  methods: {}
+}
+</script>
+
+<style lang="scss" scoped>
+.loansAudit {}
+</style>

project/xiushan/apps/AppPortalUser/pumList.vue

@@ -5,6 +5,10 @@
                 @change="page.current=1,getTableData()"/>
       <template #content>
         <ai-search-bar>
+          <template #left>
+            <ai-select v-model="select.enterpriseType" @change="typeChange" placeholder="企业类型" :selectList="$dict.getDict('enterpriseType')"></ai-select>
+            <ai-select v-model="select.enterpriseStatus" @change="statusChange" placeholder="认证状态" :selectList="$dict.getDict('userEnterpriseStatus')"></ai-select>
+          </template>
           <template #right>
             <el-input size="small" placeholder="搜索企业名称、法人姓名、登录账号" v-model="search.enterpriseName" clearable
                       @change="page.current=1,getTableData()"/>
@@ -40,23 +44,24 @@ export default {
     return {
       search: {name: ""},
       page: {current: 1, size: 10, total: 0},
+      select: {enterpriseType: '', enterpriseStatus: ''},
       tableData: [],
       colConfigs: [
         {label: "企业名称", prop: "enterpriseName"},
         {label: "企业类型", prop: "enterpriseType", dict: "enterpriseType"},
-        {label: "所属地区", prop: "areaName"},
+        {label: "所属区划", prop: "areaName"},
         {label: "法人姓名", prop: "legalPersonName"},
         {label: "联系方式", prop: "phone"},
         {label: "创建时间", prop: "createTime"},
         {label: "登录账号", prop: "loginAccount"},
-        {slot: "options"}
+        {slot: "options"},
       ]
     }
   },
   methods: {
     getTableData() {
       this.instance.post("/appportaluserenterprise/list", null, {
-        params: {...this.page, ...this.search, status: 1}
+        params: {...this.page, ...this.search, status: 1,...this.select}
       }).then(res => {
         if (res?.data) {
           this.tableData = res.data?.records
@@ -66,9 +71,18 @@ export default {
     },
     showDetail(id) {
       this.$router.push({query: {id}})
+    },
+    typeChange(v) {
+      this.select.enterpriseType = v
+      this.getTableData()
+    },
+    statusChange(v) {
+      this.select.enterpriseStatus = v
+      this.getTableData()
     }
   },
   created() {
+    this.dict.load('userEnterpriseStatus')
     this.getTableData()
     this.search.areaId = this.user.info.areaId
   }