Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

project/oms/apps/AppDeploy/AppDeploy.vue

@@ -7,6 +7,10 @@
           <template #left>
             <el-button type="primary" icon="iconfont iconAdd" @click="dialog=true">增加</el-button>
           </template>
+          <template #right>
+            <el-input size="small" placeholder="搜索项目/系统" v-model="search.name" clearable
+                      @change="page.current=1,getTableData()"/>
+          </template>
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
                   @getList="getTableData" :col-configs="colConfigs" :dict="dict">
@@ -87,7 +91,19 @@ export default {
       })
     },
     handleDownload(row) {
+      let loading = this.$loading({
+        lock: true, text: "正在打包文件...",
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      }), {id} = row
+      this.instance.post("/node/autodeploy/getZip", null, {
+        params: {id}
+      }).then(res => {
+        loading.close()
+        if (res?.code == 0) {
 
+        }
+      })
     },
     handleEdit(row) {
       this.form = JSON.parse(JSON.stringify(row))

project/xiushan/apps/AppPortalUser/pumDetail.vue

@@ -3,7 +3,9 @@
     <ai-detail>
       <ai-title slot="title" title="经营主体详情" isShowBottomBorder isShowBack @onBackClick="$router.push({query:{}})"/>
       <template #content>
-        <el-form size="small" label-width="160px">
+        <ai-sidebar :tabTitle="menuList" v-model="index" @change="change"></ai-sidebar>
+        <template v-if="index==0">
+          <el-form size="small" label-width="160px">
           <ai-card title="营业执照">
             <template #content>
               <el-form-item label="企业名称">{{ detail.enterpriseName }}</el-form-item>
@@ -38,7 +40,17 @@
               <el-form-item label="备注说明">{{ detail.auditDescription }}</el-form-item>
             </template>
           </ai-card>
-        </el-form>
+          </el-form>
+        </template>
+        <template v-if="index==1">
+          <ai-card title="股权结构">
+            <!-- <el-button type="text">+添加股东</el-button> -->
+            <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
+                      @getList="getTableData" :col-configs="colConfigs">
+              
+            </ai-table>
+          </ai-card>
+        </template>
 
       </template>
     </ai-detail>
@@ -56,11 +68,25 @@ export default {
   computed: {
     isAuthing() {
       return this.detail.status == "0"
+    },
+    colConfigs() {
+      return [
+        {prop: "", label: "股东名称", width: 150},
+        {prop: "", label: "股东类型", width: 150},
+        {prop: "", label: "身份证/信用代码", width: 240},
+        {prop: "", label: "持股数量", width: 150},
+        {prop: "", label: "持股占比", width: 150},
+        {prop: "", label: "股权证", width: 200},
+      ]
     }
   },
   data() {
     return {
       detail: {},
+      menuList: ['基本信息','股权结构'],
+      index: 0,
+      tableData: [],
+      page: {current: 1, size: 10, total: 0},
     }
   },
   methods: {
@@ -74,6 +100,20 @@ export default {
         }
       })
     },
+    change(index) {
+      this.currentMenu = index
+      this.getDetail()
+    },
+    getTableData() {
+      // this.instance.post("/app/appdvcpconfig/list", null, {
+      //   params: {...this.page, ...this.search}
+      // }).then(res => {
+      //   if (res?.data) {
+      //     this.tableData = res.data?.records
+      //     this.page.total = res.data.total
+      //   }
+      // })
+    },
   },
   created() {
     this.getDetail()

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
   }

project/xiushan/apps/finance/AppFinanceOrgMember/AppFinanceOrgMember.vue

@@ -76,7 +76,7 @@ export default {
       colConfigs: [
         {label: "所属金融机构", prop: "organizationName"},
         {label: "成员姓名", prop: "name"},
-        {label: "成员职务", prop: "userRole", dict: "financialOrganizationUserRole"},
+        {label: "成员角色", prop: "userRole", dict: "financialOrganizationUserRole"},
         {label: "创建人", prop: "createUserName", align: 'center', width: "120px"},
         {label: "创建时间", prop: "createTime"},
         {slot: "options"}