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

project/xiushan/apps/AppGroupShareholders/components/Add.vue

@@ -14,13 +14,13 @@
             <el-form ref="form" :model="form" :rules="rules" size="small"  label-width="150px">
               <el-row type="flex">
                 <el-col :span="20">
-                  <el-form-item label="集体经济组织" prop="usePerson">
+                  <el-form-item label="集体经济组织" prop="organizationName">
-                    <el-input v-model="form.usePerson" placeholder="请输入集体经济组织名称"></el-input>
+                    <el-input v-model="form.organizationName" placeholder="请输入集体经济组织名称"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="20">
-                  <el-form-item label="统一社会信用代码" prop="houseNumber">
+                  <el-form-item label="统一社会信用代码" prop="unifiedCode">
-                    <el-input v-model="form.houseNumber" placeholder="请输入统一社会信用代码"></el-input>
+                    <el-input v-model="form.unifiedCode" placeholder="请输入统一社会信用代码"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -29,8 +29,8 @@
               </el-form-item>
               <el-row type="flex">
                 <el-col :span="12">
-                  <el-form-item label="股权证编号" prop="useCertificate">
+                  <el-form-item label="股权证编号" prop="stockCertificateCode">
-                    <el-input v-model="form.useCertificate" placeholder="请输入股权证编号"></el-input>
+                    <el-input v-model="form.stockCertificateCode" placeholder="请输入股权证编号"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -43,11 +43,11 @@
 
         <ai-card title="家庭持股情况">
           <template #right>
-            <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" @click="isEdit=false">+添加股权人</span>
+            <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" @click="sysInfoDialog = true">+添加股权人</span>
           </template>
           <template #content>
             <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
-                      @getList="getTableData" :col-configs="colConfigs" :dict="dict">
+                      @getList="getDetail" :col-configs="colConfigs" :dict="dict">
             </ai-table>
           </template>
         </ai-card>
@@ -59,7 +59,7 @@
     </ai-detail>
     <ai-detail class="add" v-if="params.id && !isEdit">
       <template slot="title">
-        <ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
+        <ai-title title="集体经济股权登记详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
       </template>
       <template slot="content">
         <ai-card title="合同信息">
@@ -68,21 +68,49 @@
             </template>
           <template #content>
             <ai-wrapper>
-              <ai-info-item label="使用证书" :value="data.useCertificate"></ai-info-item>
+              <ai-info-item label="集体经济组织" :value="data.organizationName"></ai-info-item>
-              <ai-info-item label="所在地区" :value="data.areaName"></ai-info-item>
+              <ai-info-item label="统一社会信用代码" :value="data.unifiedCode"></ai-info-item>
-              <ai-info-item label="使用人" :value="data.usePerson"></ai-info-item>
+              <ai-info-item label="所在地区" :value="data.areaId"></ai-info-item>
-              <ai-info-item label="家庭人口" :value="data.houseNumber"></ai-info-item>
+              <ai-info-item label="股权证编号" :value="data.stockCertificateCode"></ai-info-item>
-              <ai-info-item label="身份证号" :value="data.idNumber"></ai-info-item>
+              <ai-info-item label="权证照片" isLine>
-              <ai-info-item label="土地所有权" :value="data.landOwnership">{{ dict.getLabel('landOwnership', data.landOwnership) }}</ai-info-item>
+                <ai-uploader v-model="data.fileList" :instance="instance" :limit="9" disabled/>
-              <ai-info-item label="土地面积/㎡" :value="data.landArea"></ai-info-item>
+              </ai-info-item>
-              <ai-info-item label="土地四至" :value="data.landFourTo"></ai-info-item>
-              <ai-info-item label="使用情况" :value="data.useSituation"></ai-info-item>
-              <ai-info-item label="权证照片" :value="data.fileList"></ai-info-item>
             </ai-wrapper>
           </template>
         </ai-card>
+        <ai-card title="家庭持股情况">
+          <template #right>
+            <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" @click="sysInfoDialog = true">+添加股权人</span>
+          </template>
+          <template #content>
+            <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
+                      @getList="getDetail" :col-configs="colConfigs" :dict="dict">
+            </ai-table>
+          </template>
+        </ai-card>
       </template>
     </ai-detail>
+    <!-- 弹框 -->
+    <ai-dialog title="股权结构" :visible.sync="sysInfoDialog" width="600px" @onConfirm="onConfirm"
+               @closed="sysInfo={}">
+      <el-form size="small" label-width="140px" :rules="dialogRules" ref="dialogForm" :model="table">
+        <el-form-item label="股权人姓名" prop="name">
+          <el-input v-model="table.name" placeholder="请输入股权人姓名" clearable/>
+        </el-form-item>
+        <el-form-item label="身份证号" prop="idNumber">
+          <el-input v-model="table.idNumber" placeholder="请输入身份证号" clearable/>
+        </el-form-item>
+        <el-form-item label="与户主关系" prop="householdRelation">
+          <ai-select v-model="table.householdRelation" placeholder="请选择" :selectList="$dict.getDict('householdRelation')" />
+        </el-form-item>
+        <el-form-item label="持股数量" prop="shareholdingNumber">
+          <el-input v-model="table.shareholdingNumber" placeholder="请输入持股数量" clearable/>
+        </el-form-item>
+        <el-form-item label="持股金额(元)" prop="shareholdingAmount">
+          <el-input v-model="table.shareholdingAmount" placeholder="请输入持股金额" clearable/>
+        </el-form-item>
+      </el-form>
+    </ai-dialog>
   </section>
 </template>
 
@@ -100,43 +128,43 @@ export default {
     return { 
       id: '',
       form: {
-        useCertificate: '',
+        organizationName: '',
         areaId: '',
         areaName: '',
-        usePerson: '',
+        unifiedCode: '',
-        houseNumber: '',
+        stockCertificateCode: '',
-        idNumber: '',
+        fileList: [],
-        landOwnership: '',
-        landArea: '',
-        landFourTo: '',
-        useSituation: '',
-        fileList: '',
-
       },
+      // tableData: {},
+      table: {},
       isEdit: false,
       radioFrom: '',
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       disabledLevel: 3,
       page: {current: 1, size: 10, total: 0},
-
+      sysInfoDialog: false,
+      data: {},
     }
   }, 
   computed: {
     rules() {
       return {
-        useCertificate: [{required: true, message: '请输入使用证书', trigger: 'blur'}],
+        organizationName: [{required: true, message: '请输入集体经济组织名称', trigger: 'blur'}],
-        areaName: [{required: true, message: '请选择所在地区', trigger: 'blur'}],
+        unifiedCode: [{required: true, message: '请输入统一社会信用代码', trigger: 'blur'}],
-        usePerson: [{required: true, message: '请输入使用人', trigger: 'blur'}],
+        areaId: [{required: true, message: '请选择所在地区', trigger: 'blur'}],
-        houseNumber: [{required: true, message: '请输入家庭人口', trigger: 'blur'}],
+        stockCertificateCode: [{required: true, message: '请输入股权证编号', trigger: 'blur'}],
-        idNumber: [{required: true, message: '请输入身份证号', trigger: 'blur'}],
-        landOwnership: [{required: true, message: '请输入土地所有权', trigger: 'blur'}],
-        landArea: [{required: true, message: '请输入土地面积', trigger: 'blur'}],
-        landFourTo: [{required: true, message: '请输入土地四至', trigger: 'blur'}],
-        useSituation: [{required: true, message: '请输入使用情况', trigger: 'blur'}],
         fileList: [{required: true, message: '请上传图片', trigger: 'blur'}],
       }
     },
+    dialogRules() {
+      return {
+        name: [{required: true, message: '请输入股权人姓名', trigger: 'blur'}],
+        idNumber: [{required: true, message: '请输入股权人姓名', trigger: 'blur'}],
+        householdRelation: [{required: true, message: '请选择与户主关系', trigger: 'blur'}],
+        shareholdingNumber: [{required: true, message: '请输入持股数量', trigger: 'blur'}],
+      }
+    },
     ...mapState(['user']),
     colConfigs() {
       return [
@@ -149,12 +177,13 @@ export default {
     }
   },
   created() {
+    this.$dict.load('householdRelation')
     if (this.params && this.params.id) {
       this.id = this.params.id
       this.getDetail(this.params.id)
     }
     this.form.areaId = this.user.info.areaId
-    this.getTableData()
+    // this.getTableData()
   },
   methods: {
     cancel(isRefresh) {
@@ -163,20 +192,40 @@ export default {
         isRefresh: !!isRefresh,
       })
     },
-    getTableData() {
+    // getTableData() {
-      this.instance.post("/appcollectiveeconomyequity/list", null, {
+    //   this.instance.post("/appcollectiveeconomyequity/list", null, {
-        params: {...this.page }
+    //     params: {...this.page }
+    //   }).then(res => {
+    //     if (res?.data) {
+    //       this.data = res.data?.records 
+    //       this.tableData = res.data?.records.shareholderLists
+    //       this.page.total = res.data.total
+    //     }
+    //   })
+    // },
+    getDetail(id) {
+      this.instance.post(`/appcollectiveeconomyequity/queryDetailById`,null, {
+        params: {
+          id: id,
+          ...this.page,
+        }
       }).then(res => {
-        if (res?.data) {
+        if (res.code === 0) {
-          this.tableData = res.data?.records.shareholderList
+          this.data = res.data,
-          this.page.total = res.data.total
+          this.tableData = res.data.shareholderList
+          this.page.total = res.data.shareholderList.length
         }
       })
     },
-    getDetail(id) {
+    onConfirm() {
-      this.instance.post(`/appcollectiveeconomyequity/queryDetailById?id=${id}`).then(res => {
+      this.$refs.dialogForm.validate((valid) => {
-        if (res.code === 0) {
+        if(valid) {
-          this.data = res.data
+          let tableDataList = []
+          tableDataList.push(this.table)
+          this.tableData = tableDataList
+          setTimeout(() => {
+            this.sysInfoDialog = false
+          }, 600)
         }
       })
     },
@@ -186,6 +235,7 @@ export default {
           this.instance.post(`/appcollectiveeconomyequity/addOrUpdate`, {
             ...this.form,
             id: this.params.id || '',
+            shareholderList: this.tableData,
           }).then(res => {
             if (res.code == 0) {
               this.$message.success('提交成功')

project/xiushan/apps/AppGroupShareholders/components/List.vue

@@ -36,7 +36,6 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
 export default {
   name: "List",
   props: {
@@ -53,7 +52,6 @@ export default {
     }
   },
   computed: {
-    ...mapState(['user']),
     colConfigs() {
       return [
         { prop: "organizationName", label: '集体经济组织名称', align: "center", width: "200px", },
@@ -68,11 +66,9 @@ export default {
     }
   },
   created() {
-    this.search.areaId = this.user.info.areaId
     this.getTableData()
   },
   methods: {
-    changeArea() {},
     getTableData() {
       this.instance.post("/appcollectiveeconomyequity/list", null, {
         params: {...this.page, ...this.search,...this.select}

project/xiushan/apps/AppPublicArrearage/components/Add.vue

@@ -14,44 +14,63 @@
             <el-form ref="forms" :model="forms" :rules="formRules" size="small"  label-width="150px">
             <el-row type="flex">
               <el-col :span="20">
-                <el-form-item label="执行案号" prop="executionCode">
+                <el-form-item label="欠费金额(万元)" prop="executionCode">
                   <el-input v-model="forms.executionCode" placeholder="请输入"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="20">
-                <el-form-item label="执行法院" prop="executionCourt">
+                <el-form-item label="欠费类型名称" prop="executionCourt">
-                  <el-input v-model="forms.executionCourt" placeholder="请输入"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row type="flex">
-              <el-col :span="20">
-                <el-form-item label="执行时间" prop="executionTime">
-                  <el-date-picker v-model="forms.executionTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width:338px">
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
-              <el-col :span="20">
-                <el-form-item label="履行情况" prop="executionSituation">
                   <ai-select v-model="forms.executionSituation" placeholder="请选择文档类型" :selectList="$dict.getDict('dishonestPersonSituation')"></ai-select>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row type="flex">
               <el-col :span="20">
-                <el-form-item label="失信被执行主体" prop="enterpriseName">
+                <el-form-item label="欠费主体" prop="executionTime">
+                  <el-date-picker v-model="forms.executionTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width:338px">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="20">
+                <el-form-item label="失信严重程度" prop="executionSituation">
+                  <ai-select v-model="forms.executionSituation" placeholder="请选择文档类型" :selectList="$dict.getDict('dishonestPersonSituation')"></ai-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row type="flex">
+              <el-col :span="20">
+                <el-form-item label="统一信用代码" prop="enterpriseName">
                   <el-input v-model="forms.enterpriseName" placeholder="请输入"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="20">
-                <el-form-item label="统一信用代码" prop="unifiedCode">
+                <el-form-item label="认定日期" prop="unifiedCode">
-                  <el-input v-model="forms.unifiedCode" placeholder="请输入" maxlength="18"></el-input>
+                  <el-date-picker v-model="forms.executionTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width:338px">
+                  </el-date-picker>
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-form-item label="失信事实" prop="dishonestFact">
+            <el-row type="flex">
-              <el-input v-model="forms.dishonestFact" placeholder="请输入失信事实" type="textarea" show-word-limit maxlength="500" :rows="5"></el-input>
+              <el-col :span="20">
+                <el-form-item label="失信行为有效期" prop="enterpriseName">
+                  <el-date-picker v-model="forms.executionTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width:338px">
+                  </el-date-picker>
                 </el-form-item>
+              </el-col>
+              <el-col :span="20">
+                <el-form-item label="欠费统计截止日期" prop="unifiedCode">
+                  <el-date-picker v-model="forms.executionTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width:338px">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+           <el-row type="flex">
+              <el-col :span="12">
+                <el-form-item label="数据来源机构" prop="enterpriseName">
+                  <el-input v-model="forms.enterpriseName" placeholder="请输入"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
             </el-form>
           </template>
         </ai-card>

project/xiushan/apps/finance/AppFinanceProduct/productAdd.vue

@@ -124,8 +124,7 @@ export default {
         needMaterial: [{required: true, message: "请输入所需材料", trigger: 'blur'}],
         productFeatures: [{required: true, message: "请输入产品特色", trigger: 'blur'}],
         bankCounterpart: [{required: true, message: "请输入客户经理姓名", trigger: 'change'}],
-        consultationTelephone: [ {required: true, message: "请输入客户经理电话", trigger: 'change'},
+        consultationTelephone: [ {required: true, message: "请输入客户经理电话", trigger: 'change'}],
-          {pattern: /^1[3456789]\d{9}$/, message: "电话号码格式有误"}],
       }
     }
   },

project/xiushan/apps/financing/AppFinancingNeeds/AppFinancingNeeds.vue

@@ -2,7 +2,7 @@
   <section class="AppFinancingNeeds">
     <ai-list v-if="showList">
       <template slot="title">
-        <ai-title title="融资需求" :isShowBottomBorder="false"></ai-title>
+        <ai-title slot="title" title="融资需求" :isShowBottomBorder="false" :isShowArea="currIndex == 1 && showList" v-model="areaId" :instance="instance" @change="changeArea"/>
       </template>
       <template slot="tabs">
         <el-tabs class="tabs-page" v-model="currIndex">
@@ -15,7 +15,6 @@
     </ai-list>
     <component v-if="!showList" :is="currentPage" :instance="instance" :dict="dict"
                :permissions="permissions" :row="detail" @goBack="goBack"></component>
-    <!-- <component :is="currentComponent" :instance="instance" :dict="dict" :permissions="permissions"/> -->
   </section>
 </template>
 
@@ -45,6 +44,7 @@ export default {
       showList: true,
       currentPage: "",
       detail: {},
+      areaId: ''
     }
   },
   computed: {
@@ -65,7 +65,7 @@ export default {
     }
   },
   created() {
-    this.dict.load("productRepaymentTimeline", "financialFundPurpose","financingDemandApplyType", "enterpriseType")
+    this.dict.load("productRepaymentTimeline", "financialFundPurpose","financingDemandApplyType", "enterpriseType", "dishonestPersonSituation", "administrativeSanctionType")
   },
   methods: {
     goPage(obj) {
@@ -79,6 +79,9 @@ export default {
         this.$refs[this.currIndex][0].getTableData();
       })
     },
+    changeArea() {
+      this.$refs[this.currIndex][0].getTableData();
+    }
   }
 }
 </script>

project/xiushan/apps/financing/AppFinancingNeeds/needsStatistics.vue

@@ -1,21 +1,114 @@
 <template>
   <section class="needsStatistics">
-    <ai-list>
-      <template #content>
     <ai-search-bar>
       <template #left>
-            <!-- <el-input size="small" placeholder="搜索企业名称" v-model="search.enterpriseName" clearable
+        <ai-select v-model="search.messageType" placeholder="金融机构" clearable :selectList="$dict.getDict('dlbResourceType')" @change="getTableData()"></ai-select>          
-                      @change="page.current=1,getTableData()"/> -->
       </template>
     </ai-search-bar>
-        
+    <div class="col-row">
+      <div class="item">
+        <p>累计发布需求</p>
+        <h2>20</h2>
+      </div>
+      <div class="item">
+        <p>累计发布需求</p>
+        <h2>20</h2>
+      </div>
+      <div class="item">
+        <p>累计发布需求</p>
+        <h2>20</h2>
+      </div>
+      <div class="item">
+        <p>累计发布需求</p>
+        <h2>20</h2>
+      </div>
+      <div class="item">
+        <p>累计发布需求</p>
+        <h2>20</h2>
+      </div>
+      <div class="item">
+        <p>累计发布需求</p>
+        <h2>20</h2>
+      </div>
+      <div class="item">
+        <p>累计发布需求</p>
+        <h2>20</h2>
+      </div>
+      <div class="item">
+        <p>累计发布需求</p>
+        <h2>20</h2>
+      </div>
+    </div>
+    <div class="chart-flex">
+      <div class="circle-chart chart-content">
+        <div class="title">融资需求发布主体占比</div>
+        <div class="cir-flex">
+          <div class="total-num">
+            <h2>108</h2>
+            <p>总数</p>
+          </div>
+          <div id="circleChart"></div>
+          <div class="cir-text">
+            <div class="info">
+              <p><span class="tips-bg" style="background: #2891FF;"></span>企业融资</p>
+              <div>65</div>
+            </div>
+            <div class="info">
+              <p><span class="tips-bg" style="background: #FFB865;"></span>个人融资</p>
+              <div>65</div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="line-chart chart-content">
+        <div class="title">交易趋势</div>
+        <p class="header-title"><span class="tips-bg" style="background: #2891FF;"></span>申请笔数<span class="tips-bg" style="background: #26D52B;"></span>放款笔数</p>
+        <div id="lineChart"></div>
+      </div>
+    </div>
+    <div class="chart-column chart-content">
+      <div class="title">机构融资对接量TOP10</div>
+      <p class="header-title"><span class="tips-bg" style="background: #2891FF;"></span>申请笔数<span class="tips-bg" style="background: #26D52B;"></span>放款笔数</p>
+      <div id="columnChart"></div>
+    </div>
+    <div class="table-content chart-content">
+      <div class="title">交易记录</div>
+      <ai-search-bar style="padding:20px 20px 0 20px;">
+        <template #left>
+          <ai-select v-model="search.messageType" placeholder="金融机构" clearable :selectList="$dict.getDict('dlbResourceType')" @change="getTableData()"></ai-select>   
+         <ai-search label="申请时间">
+            <el-date-picker size="small" placeholder="请选择" type="daterange"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              style="width: 258px;"
+              value-format="yyyy-MM-dd"
+              v-model="stuTime"
+              @change="page.current=1,getList()"/>
+          </ai-search>     
         </template>
-    </ai-list>
+        <template #right>
+          <el-input size="small" placeholder="搜索企业名称" v-model="search.messageType" clearable @change="getList()"/> 
+          <ai-download :instance="instance" url="/app/appcommunityhouseresident/listExport" :params="search"
+            fileName="人口信息">
+            <el-button icon="iconfont iconExported">导出</el-button>
+          </ai-download>        
+        </template>
+      </ai-search-bar>
+      <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
+                @getList="getList" :col-configs="colConfigs" :dict="dict" style="padding:0 20px 20px 20px;">
+        <el-table-column slot="options" label="状态" fixed="right" width="100">
+          <template slot-scope="{row}">
+            <el-button type="text">详情</el-button>
+          </template>
+        </el-table-column>
+      </ai-table>
+    </div>
   </section>
 </template>
 
 <script>
 import {mapState} from "vuex";
+import * as echarts from 'echarts'
 
 export default {
   name: "needsStatistics",
@@ -29,21 +122,334 @@ export default {
   },
   data() {
     return {
-
+      search: {messageType: ''},
+      page: {current: 1, total: 10},
+      circleChart: null,
+      lineChart: null,
+      columnChart: null,
+      tableData: [],
+      colConfigs: [
+        {label: "产品名称", width: '200', prop: "enterpriseName"},
+        {label: "联系人", width: '100', prop: "areaName"},
+        {label: "联系方式", width: '140', prop: "loanAmount"},
+        {label: "身份证号", width: '180', prop: "createTime"},
+        {label: "企业主体", width: '200', prop: "name"},
+        {label: "贷款金额(万)", width: '120', prop: "phone"},
+        {label: "申请时间", width: '180', prop: "remark"},
+        {label: "贷款机构", width: '200', prop: "remark"},
+        {label: "机构类型", width: '200', prop: "remark"},
+        {slot: "options"}
+      ],
     }
   },
   methods: {
     getTableData() {
+      this.circleChartInit()
+      this.lineChartInit()
+      this.columnChartInit()
+      this.getList()
+    },
+    getList() {
+      this.instance.post("/appfinancingdemand/list", null, {
+        params: {...this.page, ...this.search, status: 0}
+      }).then(res => {
+        if (res?.data) {
+          this.tableData = res.data?.records
+          this.page.total = res.data.total
+        }
+      })
+    },
+    circleChartInit() {
+      this.circleChart = echarts.init(document.getElementById('circleChart'))
+      if (!this.circleChart) {
+        return this.circleChart.dispose();
+      }
+      var option = {
+        color: ['#2891FF', '#FFB865'],
+        series: [
+          {
+            type: 'pie',
+            radius: ['80%', '90%'],
+            avoidLabelOverlap: false,
+            itemStyle: {
+              borderRadius: 10,
+              borderColor: '#fff',
+              borderWidth: 2
+            },
+            label: {
+              show: false,
+              position: 'center'
+            },
+            emphasis: {
+              label: {
+                show: false,
+                fontSize: '12',
+              }
+            },
+            data: [
+              { value: 180},
+              { value: 20},
+            ]
+          }
+        ]
 
+      };
+
+      this.circleChart.setOption(option)
     },
+    lineChartInit() {
+      this.lineChart = echarts.init(document.getElementById('lineChart'))
+      if (!this.lineChart) {
+        return this.lineChart.dispose();
+      }
+      var option = option = {
+        tooltip: {
+          trigger: 'axis'
         },
-  created() {
+        grid: {
+          top: '3%',
+          left: '3%',
+          right: '4%',
+          bottom: '0%',
+          containLabel: true
+        },
+
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          data: ['2020-07', '2020-08', '2020-09', '2020-10', '2020-11']
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: [
+          {
+            name: '申请笔数',
+            type: 'line',
+            data: [120, 132, 101, 134, 90, 230, 210],
+            itemStyle: { 
+              normal: { 
+                lineStyle:{ 
+                  color:'#2891FF'
+                }
+              }
+            }
+          },
+          {
+            name: '放款笔数',
+            type: 'line',
+            stack: 'Total',
+            data: [220, 182, 191, 234, 290, 330, 310],
+            itemStyle: { 
+              normal: { 
+                lineStyle:{ 
+                  color:'#26D52B'
+                }
+              }
+            }
+          },
+        ]
+      };
+      this.lineChart.setOption(option)
+    },
+    columnChartInit() {
+      this.columnChart = echarts.init(document.getElementById('columnChart'))
+      if (!this.columnChart) {
+        return this.columnChart.dispose();
+      }
+      var option = {
+        color: ['#2891FF', '#26D52B'],
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'shadow'
+          }
+        },
+        grid: {
+          top: '10%',
+          left: '2%',
+          right: '2%',
+          bottom: '2%',
+          containLabel: true
+        },
+        xAxis: [{
+          type: 'category',
+          axisTick: {
+            show: false
+          },
+          data: ['重庆银行秀山支行', '哈尔滨银行秀山支行', '重庆银行五岳广场支行', '重庆秀山北银村镇银行']
+        }],
+        yAxis: [{
+          type: 'value'
+        }],
+        series: [{
+          name: '申请数量',
+          type: 'bar',
+          barGap: 0,
+          data: [100, 80, 90, 100, 60],
+          barWidth: 10,
+        },
+        {
+          name: '放款数量',
+          type: 'bar',
+          barGap: 0,
+          data: [100, 80, 90, 100, 60],
+          barWidth: 10,
+        }]
+      };
+
+      this.columnChart.setOption(option)
+    }
+  },
+  mounted() {
     this.getTableData()
   }
 }
 </script>
 
 <style lang="scss" scoped>
+  ::v-deep .ai-list .ai-list__content--right-wrapper{
+    background: none!important;
+    box-shadow: none!important;
+  }
 .needsStatistics {
+  padding: 20px;
+  box-sizing: border-box;
+  height: 100%;
+  overflow-y: scroll;
+  .col-row{
+    overflow: hidden;
+    .item{
+      display: inline-block;
+      padding: 16px 24px;
+      width: calc(25% - 15px);
+      float: left;
+      margin: 0 20px 20px 0;
+      background: #FFF;
+      box-shadow: 0px 4px 6px -2px rgba(15, 15, 21, 0.15);
+      border-radius: 4px;
+      box-sizing: border-box;
+      p{
+        font-size: 16px;
+        font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
+        font-weight: bold;
+        color: #888;
+        line-height: 24px;
+        margin-bottom: 8px;
+      }
+      h2{
+        font-size: 24px;
+        font-family: Arial-BoldMT, Arial;
+        font-weight: normal;
+        color: #26F;
+        line-height: 32px;
+      }
+    }
+    .item:nth-of-type(4n) {
+      margin-right: 0;
+    }
+  }
+  .chart-flex{
+    display: flex;
+    height: 280px;
+    margin-bottom: 20px;
+    .circle-chart{
+      width: 440px;
+      margin-right: 20px;
+      height: 100%;
+      .cir-flex{
+        height: calc(100% - 56px);
+        display: flex;
+        padding: 20px;
+        box-sizing: border-box;
+        position: relative;
+        .total-num{
+          position: absolute;
+          top: 90px;
+          left: 70px;
+          width: 100px;
+          text-align: center;
+        }
+        #circleChart{
+          width: calc(100% - 150px);
+          height: 100%;
+        }
+        .cir-text{
+          width: 150px;
+          margin: 56px 0 0 40px;
+          .info{
+            width: 100%;
+            display: flex;
+            justify-content: space-between;
+            margin-bottom: 8px;
+            p{
+              width: 100px;
+              font-size: 14px;
+              font-family: MicrosoftYaHei;
+              color: #666;
+              line-height: 22px;
+            }
+            div{
+              width: 50px;
+              text-align: right;
+            }
+          }
+        }
+      }
+    }
+    .line-chart{
+      height: 100%;
+      width: calc(100% - 460px);
+      #lineChart{
+        height: calc(100% - 100px);
+        padding-right: 20px;
+        box-sizing: border-box;
+      }
+    }
+  }
+  .chart-column{
+    margin-bottom: 20px;
+    height: 320px;
+    #columnChart{
+      width: 100%;
+      height: 220px;
+    }
+  }
+  .table-content{
+    width: 100%;
+    .title{
+      border-bottom: 1px solid #ddd;
+    }
+  }
+  .tips-bg{
+    display: inline-block;
+    width: 8px;
+    height: 8px;
+    margin-right: 4px;
+  }
+  .header-title{
+    width: 100%;
+    text-align: center;
+    height: 20px;
+    font-size: 12px;
+    font-family: MicrosoftYaHei;
+    color: #333;
+    line-height: 20px;
+    .tips-bg:nth-of-type(2n) {
+      margin-left: 24px;
+    }
+  }
+  .chart-content{
+    background: #FFF;
+    box-shadow: 0px 4px 6px -2px rgba(15, 15, 21, 0.15);
+    border-radius: 4px;
+  }
+  .title{
+    line-height: 56px;
+    font-size: 16px;
+    font-family: MicrosoftYaHeiSemibold;
+    color: #222;
+    padding-left: 16px;
+  }
 }
 </style>

project/xiushan/apps/processManagement/mattersConfig/components/attachmentMaterial.vue

@@ -37,11 +37,8 @@
       </el-table-column>
       <el-table-column align="center" prop="name" label="是否必填">
         <template slot-scope="scope">
-          <el-switch
+          <el-switch v-model="scope.row.mustFill"
-              v-model="scope.row.mustFill"
+            active-color="#5088FF" inactive-color="#D0D4DC" active-value="1" inactive-value="0">
-              active-value="1" inactive-value="0"
-              active-color="#D0D4DC"
-              inactive-color="#5088FF">
           </el-switch>
         </template>
       </el-table-column>

project/xiushan/apps/processManagement/mattersConfig/components/baseInfo.vue

@@ -38,10 +38,8 @@
         <ai-editor v-model.trim="form.needToKnow" :instance="instance"/>
       </el-form-item>
       <el-form-item label="是否启用" prop="processDefStatus">
-        <el-switch
+        <el-switch v-model="form.processDefStatus"
-            v-model="form.processDefStatus"
+          active-color="#5088FF" inactive-color="#D0D4DC" active-value="1" inactive-value="0">
-            active-color="#D0D4DC"
-            inactive-color="#5088FF" active-value="1" inactive-value="0">
         </el-switch>
       </el-form-item>
     </el-form>

project/xiushan/apps/processManagement/mattersConfig/components/configList.vue

@@ -49,9 +49,7 @@
             <template v-slot="{row}">
               <el-switch
                 v-model="row.processDefStatus"
-                @change="onChange(row)" active-value="1" inactive-value="0"
+                @change="onChange(row)" active-color="#5088FF" inactive-color="#D0D4DC" active-value="1" inactive-value="0">
-                active-color="#5088FF"
-                inactive-color="#D0D4DC">
               </el-switch>
             </template>
           </el-table-column>