Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-operate-ui/src/api/detail/party-a/cooperate.js

@@ -8,3 +8,29 @@ export function getList(data) {
     params:data
   })
 }
+
+// 客户详情
+export function customerInfo(data) {
+  return request({
+    url: '/customer/'+data,
+    method: 'get'
+  })
+}
+
+// 编辑客户
+export function customerUpdate(data) {
+  return request({
+    url: '/customer/',
+    method: 'put',
+    data: data
+  })
+}
+
+// 模糊查询项目名称
+export function queryProject(data) {
+  return request({
+    url: '/business/info/query/project',
+    method: 'post',
+    data
+  })
+}

dsk-operate-ui/src/api/riskInformation/punish.js → dsk-operate-ui/src/api/detail/party-a/riskInformation.js

@@ -8,7 +8,6 @@ export function penalizePage(data) {
     data:data
   })
 }
-
 // 行政处罚类型
 export function penalizeReasonType(data) {
   return request({
@@ -17,3 +16,22 @@ export function penalizeReasonType(data) {
     data:data
   })
 }
+
+// 经营异常列表
+export function abnormalPage(data) {
+  return request({
+    url: '/enterpriseCredit/abnormalPage',
+    method: 'post',
+    data:data
+  })
+}
+// 经营异常年份
+export function abnormalYears(data) {
+  return request({
+    url: '/enterpriseCredit/abnormalYears',
+    method: 'post',
+    data:data
+  })
+}
+
+

dsk-operate-ui/src/api/detail/party-a/urbanLnvestment.js

+import request from '@/utils/request'
+
+// 土地交易用途
+export function landUse(data) {
+  return request({
+    url: '/enterpriseProject/landUse',
+    method: 'post',
+    data
+  })
+}
+// 土地交易列表
+export function landTransactionPage(data) {
+  return request({
+    url: '/enterpriseProject/landTransactionPage',
+    method: 'post',
+    data
+  })
+}
+// 区域经济
+export function regionalEconomy(data) {
+  return request({
+    url: '/economic/regional/list',
+    method: 'post',
+    data
+  })
+}
+// 同地区城投
+export function urbanInvestmentPage(data) {
+  return request({
+    url: '/urbanInvestment/page',
+    method: 'post',
+    data
+  })
+}

dsk-operate-ui/src/views/detail/party-a/component/Tables.vue

@@ -21,7 +21,6 @@
         </el-table-column>
         <template v-for="item in forData">
           <el-table-column
-            v-if="item.slot"
             :label="item.label"
             :prop="item.prop"
             :width="item.width"
@@ -33,22 +32,12 @@
                 <slot :name="item.slotName"></slot>
               </template>
               <template slot-scope="scope">
-                <slot :name="item.prop" :row="scope.row" :index="scope.$index" :data="item"></slot>
+                <slot v-if="item.slot" :name="item.prop" :row="scope.row" :index="scope.$index" :data="item"></slot>
+                <span v-else>
+                  {{ scope.row[item.prop] }}
+                </span>
               </template>
           </el-table-column>
-          <el-table-column
-            v-else
-            :label="item.label"
-            :prop="item.prop"
-            :width="item.width"
-            align="left"
-            :fixed="item.fixed"
-            :sortable="item.sortable"
-            :resizable="false">
-            <template v-if="item.slotHeader" slot="header">
-              <slot :name="item.slotName"></slot>
-            </template>
-          </el-table-column>
 
         </template>
       </el-table>

dsk-operate-ui/src/views/detail/party-a/decisionMaking/index.vue

@@ -35,6 +35,7 @@
     <el-dialog
       class="popups1"
       :visible.sync="dialogVisible"
+      :before-close="cancel"
       width="464px">
       <div class="poptitle">
         <img src="@/assets/images/economies/icon.png">
@@ -60,8 +61,8 @@
           <el-input v-model="addRorm.remark" placeholder="请输入"></el-input>
         </el-form-item>
         <div class="popbot">
-          <div class="btn btn_cancel h32" @click="cancel('addRorm')">返回</div>
-          <div class="btn btn_primary h32" @click="add('addRorm')">保存</div>
+          <div class="btn btn_cancel h32" @click="cancel">返回</div>
+          <div class="btn btn_primary h32" @click="add">保存</div>
         </div>
       </el-form>
     </el-dialog>
@@ -82,23 +83,23 @@ export default {
   },
   data() {
     return {
-      ifEmpty:true,
+      ifEmpty:false,
       queryParams:{
-        customerId:6034,
+        customerId:'f25219e73249eea0d9fddc5c7f04f97f',
         pageNum:1,
         pageSize:10,
       },
       forData: [
-        {label: '姓名', prop: 'punishReason', width: '124'},
-        {label: '角色', prop: 'punishBegin', width: '110'},
-        {label: '公司/机关', prop: 'punishResult', width: '268'},
-        {label: '职位', prop: 'fileNum', width: '110'},
-        {label: '联系方式', prop: 'cgrdm', width: '105'},
-        {label: '内部维护人', prop: 'office', width: '88'},
-        {label: '备注', prop: 'dataId'},
+        {label: '姓名', prop: 'name', width: '124'},
+        {label: '角色', prop: 'role', width: '110'},
+        {label: '公司/机关', prop: 'position', width: '268'},
+        {label: '职位', prop: 'workUnit', width: '110'},
+        {label: '联系方式', prop: 'contactInformation', width: '105'},
+        {label: '内部维护人', prop: 'updateBy', width: '88'},
+        {label: '备注', prop: 'remark'},
       ],
       addRorm: {
-        customerId:'',
+        customerId:'f25219e73249eea0d9fddc5c7f04f97f',
         name:'',
         role:'',
         workUnit:'',
@@ -116,9 +117,7 @@ export default {
       //列表
       tableLoading:false,
       tableData:[],
-      pageIndex:1,
-      pageSize:10,
-      tableDataTotal:50,
+      tableDataTotal:0,
       //弹窗
       dialogVisible: false,
     }
@@ -131,26 +130,46 @@ export default {
   },
   methods: {
     list(){
+      this.tableLoading = true
       getList(this.queryParams).then((res) => {
-        console.log(res)
+        if(res.code == 200){
+          if(res.rows.length >0){
+            this.tableData = res.rows
+            this.tableDataTotal = res.total
+            this.ifEmpty = true
+          }
+          this.tableLoading = false
+        }
       })
     },
     //分页
     handleCurrentChange(e){
-      console.log(e)
+      this.queryParams.pageNum = e
+      this.list()
     },
-    add(formName){
-      this.$refs[formName].validate((valid) => {
+    add(){
+      this.$refs.addRorm.validate((valid) => {
         if (valid) {
-          this.addRorm.customerId = 11
           addChain(this.addRorm).then((res) => {
-            console.log(res)
+            if(res.data){
+              this.$message({
+                message: '新增成功',
+                type: 'success'
+              });
+              this.cancel()
+              this.list()
+            }else{
+              this.$message({
+                message: res.msg,
+                type: 'error'
+              });
+            }
           })
         }
       });
     },
-    cancel(formName){
-      this.$refs[formName].resetFields();
+    cancel(){
+      this.$refs.addRorm.resetFields();
       this.dialogVisible = false
     },
     //打开新建窗口

dsk-operate-ui/src/views/detail/party-a/preference/index.vue

@@ -10,7 +10,7 @@
         <div class="params-item">
           <div class="flex-box item-flex">
             <el-input
-              v-model="queryParams.key"
+              v-model="queryParams.businessCharacteristic"
               @focus="nowedit = 1"
               placeholder="请输入商务条件特点"
               class="textarea"
@@ -21,7 +21,7 @@
             </el-input>
             <div class="flex btns" v-if="nowedit === 1">
               <div class="flex">
-                <div class="btnsmall btn_primary">确定</div>
+                <div class="btnsmall btn_primary" @click="update('businessCharacteristic')">确定</div>
                 <div class="cancels " @click="nowedit = 0" style="">取消</div>
               </div>
             </div>
@@ -39,7 +39,7 @@
         <div class="params-item">
           <div class="flex-box item-flex">
             <el-input
-              v-model="queryParams.key"
+              v-model="queryParams.decisionChain"
               @focus="nowedit = 2"
               placeholder="请输入决策链条"
               class="textarea"
@@ -50,7 +50,7 @@
             </el-input>
             <div class="flex btns" v-if="nowedit === 2">
               <div class="flex">
-                <div class="btnsmall btn_primary">确定</div>
+                <div class="btnsmall btn_primary" @click="update('decisionChain')">确定</div>
                 <div class="cancels " @click="nowedit = 0" style="">取消</div>
               </div>
             </div>
@@ -68,7 +68,7 @@
         <div class="params-item">
           <div class="flex-box item-flex">
             <el-input
-              v-model="queryParams.key"
+              v-model="queryParams.bidCharacteristic"
               @focus="nowedit = 3"
               placeholder="请输入招投标流程特点"
               class="textarea"
@@ -79,7 +79,7 @@
             </el-input>
             <div class="flex btns" v-if="nowedit === 3">
               <div class="flex">
-                <div class="btnsmall btn_primary">确定</div>
+                <div class="btnsmall btn_primary" @click="update('bidCharacteristic')">确定</div>
                 <div class="cancels " @click="nowedit = 0" style="">取消</div>
               </div>
             </div>
@@ -97,7 +97,7 @@
         <div class="params-item">
           <div class="flex-box item-flex">
             <el-input
-              v-model="queryParams.key"
+              v-model="queryParams.performanceCharacteristic"
               @focus="nowedit = 4"
               placeholder="请输入履约阶段特点"
               class="textarea"
@@ -108,7 +108,36 @@
             </el-input>
             <div class="flex btns" v-if="nowedit === 4">
               <div class="flex">
-                <div class="btnsmall btn_primary">确定</div>
+                <div class="btnsmall btn_primary" @click="update('performanceCharacteristic')">确定</div>
+                <div class="cancels " @click="nowedit = 0" style="">取消</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="preference-item">
+      <div class="flex-box query-box">
+        <div class="flex-box query-params">
+          <span class="common-title">其它管理体系特点</span>
+        </div>
+      </div>
+      <div class="query-params">
+        <div class="params-item">
+          <div class="flex-box item-flex">
+            <el-input
+              v-model="queryParams.otherMsCharacteistic"
+              @focus="nowedit = 5"
+              placeholder="请输入履约阶段特点"
+              class="textarea"
+              type="textarea"
+              :autosize="autosize"
+              maxlength="500"
+              :show-word-limit="true">
+            </el-input>
+            <div class="flex btns" v-if="nowedit === 5">
+              <div class="flex">
+                <div class="btnsmall btn_primary" @click="update('otherMsCharacteistic')">确定</div>
                 <div class="cancels " @click="nowedit = 0" style="">取消</div>
               </div>
             </div>
@@ -122,6 +151,10 @@
 </template>
 
 <script>
+import {
+  customerInfo,
+  customerUpdate
+} from '@/api/detail/party-a/cooperate'
 export default {
   name: 'Preference',
   components: {
@@ -133,21 +166,47 @@ export default {
         minRows: 8,
         maxRows: 8
       },
+      customerId: 'f25219e73249eea0d9fddc5c7f04f97f',
       queryParams:{
-
+        customerId: '',
+        businessCharacteristic: '',
+        decisionChain: '',
+        bidCharacteristic: '',
+        performanceCharacteristic: '',
+        otherMsCharacteistic: '',
       },
       key:'',
       nowedit: 0
     }
   },
   created() {
-
+    this.customerInfos()
   },
   computed: {
 
   },
   methods: {
-
+    // 客户详情
+    customerInfos(){
+      customerInfo(this.customerId).then(res=>{
+        this.queryParams = res.data
+      })
+    },
+    // 编辑客户
+    update(name){
+      let data = {
+        customerId: this.customerId,
+        [name]: this.queryParams[name],
+      }
+      customerUpdate(data).then(res=>{
+        if(res.data){
+          this.$message.success(res.msg)
+          this.nowedit = 0
+        }else{
+          this.$message.error(res.msg)
+        }
+      })
+    }
   }
 }
 </script>

dsk-operate-ui/src/views/detail/party-a/riskInformation/businessAnomaly.vue

@@ -22,6 +22,10 @@
 </template>
 
 <script>
+import {
+  abnormalPage,
+  abnormalYears
+} from '@/api/detail/party-a/riskInformation'
 import mixin from '../mixins/mixin'
 export default {
   name: 'BusinessAnomaly',
@@ -45,14 +49,7 @@ export default {
         {label: '做出决定机关（移除）', prop: 'outDepartment', width: '264'}
       ],
       formData: [
-        { type: 1, fieldName: 'years', value: '', placeholder: '列入时间',
-          options: [
-            { name: '处罚类别1', value: '1' },
-            { name: '处罚类别2', value: '2' },
-            { name: '处罚类别3', value: '3' },
-            { name: '处罚类别4', value: '4' }
-          ]
-        }
+        { type: 1, fieldName: 'years', value: '', placeholder: '列入时间', options: []}
       ],
       //列表
       tableLoading:false,
@@ -63,26 +60,18 @@ export default {
     }
   },
   created() {
-    this.dataRegion()
+    this.handleQuery()
   },
   computed: {
 
   },
   methods: {
-    async dataRegion() {
-      // await axios.post("https://files.jiansheku.com/file/json/common/dataRegion.json", {}, {
-      //   headers: {
-      //     'Content-Type': 'application/json'
-      //   }
-      // }).then(res => {
-      //   if (res.data.code == 200) {
-      //     console.log(res.data.data)
-      //   }
-      // })
-    },
     handleQuery(params) {
-      console.log(params)
-    }
+      let data = params ? params : this.queryParams
+      abnormalPage(data).then(res => {
+
+      })
+    },
   }
 }
 </script>

dsk-operate-ui/src/views/detail/party-a/riskInformation/punish.vue

@@ -19,9 +19,9 @@
       @handle-current-change="handleCurrentChange"
     >
       <template slot="punishReason" slot-scope="scope">
-        <span :class="[isOverHiddenFlag(scope.row.width, showList, scope.index, 0, scope.data)?'cell-span':'']" :style="{'-webkit-line-clamp': 5}">
-          {{ scope.data }}
-          <span v-if="isOverHiddenFlag(scope.row.width, showList, scope.index, 0, scope.data)" @click="changeShowAll(scope.index, 0)">...<span style="color: #0081FF;">更多</span></span>
+        <span :class="[isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.punishReason)?'cell-span':'']" :style="{'-webkit-line-clamp': 5}">
+          {{ scope.row.punishReason }}
+          <span v-if="isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.punishReason)" @click="changeShowAll(scope.index, 0)">...<span style="color: #0081FF;">更多</span></span>
         </span>
       </template>
     </tables>
@@ -34,7 +34,7 @@ import mixin from '../mixins/mixin'
 import {
   penalizePage,
   penalizeReasonType
-} from '@/api/riskInformation/punish'
+} from '@/api/detail/party-a/riskInformation'
 export default {
   name: 'Punish',
   mixins: [mixin],
@@ -44,7 +44,7 @@ export default {
   data() {
     return {
       queryParams: {
-        cid: 6034,
+        cid: 382724726,
         pageNum: 1,
         pageSize: 10
       },
@@ -58,14 +58,7 @@ export default {
         {label: '处罚结束日期', prop: 'dataId', width: '100'},
       ],
       formData: [
-        { type: 1, fieldName: 'penalizeReasonType', value: '', placeholder: '处罚类别',
-          options: [
-            { name: '处罚类别1', value: '1' },
-            { name: '处罚类别2', value: '2' },
-            { name: '处罚类别3', value: '3' },
-            { name: '处罚类别4', value: '4' }
-          ]
-        },
+        { type: 1, fieldName: 'penalizeReasonType', value: '', placeholder: '处罚类别', options: []},
         { type: 3, fieldName: 'keys', value: '', placeholder: '请输入关键词', options: []},
       ],
       //列表
@@ -86,20 +79,20 @@ export default {
     }
   },
   created() {
-    this.dataRegion()
+    this.getList()
     this.penalizeReasonTypeData()
   },
   computed: {
 
   },
   methods: {
-    async dataRegion() {
+    getList() {
       penalizePage(this.queryParams).then((res) => {
-        console.log(res)
+        console.log(res.data.rows)
       })
     },
     penalizeReasonTypeData(){
-      penalizeReasonType({cid:6034}).then((res) => {
+      penalizeReasonType({cid:this.queryParams.cid}).then((res) => {
         console.log(res)
       })
     },
@@ -136,9 +129,7 @@ export default {
   ::v-deep .el-form-item{
     margin-right: 8px !important;
   }
-  ::v-deep .el-table__body tr.current-row > td.el-table__cell{
-    background-color: #ffffff;
-  }
+
   .query-box{
     margin: 10px 0 20px;
   }

dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/landAcquisition.vue

@@ -22,6 +22,10 @@
 </template>
 
 <script>
+import {
+  landTransactionPage,
+  landUse
+} from '@/api/detail/party-a/urbanLnvestment'
 import mixin from '../mixins/mixin'
 export default {
   name: 'landAcquisition',
@@ -32,7 +36,8 @@ export default {
   data() {
     return {
       queryParams: {
-        cid: 6034,
+        cid: 3068,
+        sort: 3,
         pageNum: 1,
         pageSize: 10
       },
@@ -48,54 +53,40 @@ export default {
         {label: '签订日期', prop: 'dataId', width: '120'}
       ],
       formData: [
-        { type: 4, fieldName: 'penalizeReasonType', value: [], placeholder: '土地用途',
-          options: [
-            { name: '处罚类别1', value: '1' },
-            { name: '处罚类别2', value: '2' },
-            { name: '处罚类别3', value: '3' },
-            { name: '处罚类别4', value: '4' }
-          ]
-        },
+        { type: 4, fieldName: 'landUse', value: [], placeholder: '土地用途', options: []},
         { type: 3, fieldName: 'keys', value: '', placeholder: '请输入关键词', options: []},
       ],
       //列表
       tableLoading:false,
       tableData:[],
-      pageIndex:1,
-      pageSize:10,
       tableDataTotal:0,
     }
   },
   created() {
-    this.dataRegion()
+    this.getList()
+    this.getlandUse()
   },
   computed: {
 
   },
   methods: {
-    async dataRegion() {
-      // await axios.post("https://files.jiansheku.com/file/json/common/dataRegion.json", {}, {
-      //   headers: {
-      //     'Content-Type': 'application/json'
-      //   }
-      // }).then(res => {
-      //   if (res.data.code == 200) {
-      //     console.log(res.data.data)
-      //   }
-      // })
+    getList() {
+      this.tableLoading = true
+      landTransactionPage(this.queryParams).then(res=>{
+        this.tableData = res.data
+        this.tableDataTotal = res.data.total
+        this.tableLoading = false
+      })
     },
-    handleQuery() {
-
-    },
-    resetQuery() {
-
+    handleQuery(params) {
+      console.log(params)
     },
-    //分页
-    handleCurrentChange(e){
-
-    },
-    handleSizeChange(e){
-
+    //土地用途
+    getlandUse(){
+      landUse({cid: this.queryParams.cid}).then(res=>{
+        console.log(res)
+        // this.formData[0].options = res.data
+      })
     }
   }
 }

dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/regionalEconomies.vue

@@ -24,6 +24,9 @@
 </template>
 
 <script>
+import {
+  regionalEconomy
+} from '@/api/detail/party-a/urbanLnvestment'
 export default {
   name: 'regionalEconomies',
   components: {
@@ -31,47 +34,14 @@ export default {
   },
   data() {
     return {
-      tableData: [
-        {
-          zb:"2023年",
-          gdp:'129,118.58',
-          gdpzs:'124,369.67',
-          rjgdp:'134,369.67',
-        },
-        {
-          zb:"2022年",
-          gdp:'129,118.58',
-          gdpzs:'124,369.67',
-          rjgdp:'134,369.67',
-        },
-        {
-          zb:"2021年",
-          gdp:'129,118.58',
-          gdpzs:'124,369.67',
-          rjgdp:'134,369.67',
-        },
-        {
-          zb:"2020年",
-          gdp:'129,118.58',
-          gdpzs:'124,369.67',
-          rjgdp:'134,369.67',
-        },
-        {
-          zb:"2019年",
-          gdp:'129,118.58',
-          gdpzs:'124,369.67',
-          rjgdp:'134,369.67',
-        },
-        {
-          zb:"2018年",
-          gdp:'129,118.58',
-          gdpzs:'124,369.67',
-          rjgdp:'134,369.67',
-        },
-      ],
+      params: {
+        provinceId: 500000,
+          cityId: 500100
+      },
+      tableData: [],
       headers: [
         {
-          prop: 'zb',
+          prop: 'year',
           label: '指标',
         },
         {
@@ -83,51 +53,51 @@ export default {
           label: 'GDP（亿元）',
         },
         {
-          prop: 'gdpzs',
+          prop: 'gdpGrowth',
           label: 'GDP增速',
         },
         {
-          prop: 'rjgdp',
+          prop: 'gdpPerCapita',
           label: '人均GDP（元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'piAddValue',
           label: '第一产业增加值（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'siAddValue',
           label: '第二产业增加值（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'tiAddValue',
           label: '第三产业增加值（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'population',
           label: '人口（万人）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'industryAddValue',
           label: '工业增加值（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'industryTotalValue',
           label: '工业总产值（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'realEstateInvestment',
           label: '房地产开发投资（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'eximTotalValue',
           label: '进出口总额（亿美元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'trscg',
           label: '社会消费品零售总额（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'urbanPcdi',
           label: '城镇居民人均可支配收入（元）',
         },
         {
@@ -135,47 +105,47 @@ export default {
           label: '财政',
         },
         {
-          prop: 'rjgdp',
+          prop: 'gbr',
           label: '一般公共预算收入（亿元）',
         },
         {
-          prop: 'rjgdp',
-          label: '般公共预算收入增速',
+          prop: 'gbrGrowth',
+          label: '一般公共预算收入增速',
         },
         {
-          prop: 'rjgdp',
+          prop: 'taxIncome',
           label: '税收收入（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'transferIncome',
           label: '转移性收入（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'superiorSubsidyIncome',
           label: '上级补助收入（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'gbe',
           label: '一般公共预算支出（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'govFundIncome',
           label: '政府性基金收入（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'landTransferIncome',
           label: '土地出让收入（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'govFundExpenditure',
           label: '政府性基金支出（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'soecoi',
           label: '国有资本经营收入（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'soecoe',
           label: '国有资本经营支出（亿元）',
         },
         {
@@ -183,49 +153,50 @@ export default {
           label: '债务',
         },
         {
-          prop: 'rjgdp',
+          prop: 'govDebtBalance',
           label: '地方政府债务余额（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'generalDebtBalance',
           label: '一般债余额（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'specialDebtBalance',
           label: '专项债余额（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'govDebtLimit',
           label: '地方政府债务限额（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'uipInterestBearingDebt',
           label: '城投平台有息债务（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'fiscalSelfSufficiencyRate',
           label: '财政自给率',
         },
         {
-          prop: 'rjgdp',
+          prop: 'govDebtToGdpRate',
           label: '负债率',
         },
         {
-          prop: 'rjgdp',
+          prop: 'govDebtToGdpRateWild',
           label: '负债率-宽口径',
         },
         {
-          prop: 'rjgdp',
+          prop: 'govDebtRate',
           label: '债务率',
         },
         {
-          prop: 'rjgdp',
+          prop: 'govDebtRateWild',
           label: '债务率-宽口径',
         },
       ],
     }
   },
   created() {
+    console.log(11)
     this.dataRegion()
   },
   computed: {
@@ -240,16 +211,10 @@ export default {
   },
   methods: {
     //地区
-    async dataRegion() {
-      // await axios.post("https://files.jiansheku.com/file/json/common/dataRegion.json", {}, {
-      //   headers: {
-      //     'Content-Type': 'application/json'
-      //   }
-      // }).then(res => {
-      //   if (res.data.code == 200) {
-      //     console.log(res.data.data)
-      //   }
-      // })
+    dataRegion() {
+      regionalEconomy(this.params).then(res => {
+        this.tableData = res.data
+      })
     },
   }
 }

dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/sameRegion.vue

@@ -17,7 +17,11 @@
       :queryParams="queryParams"
       @handle-current-change="handleCurrentChange"
       @sort-change="sortChange"
-    />
+    >
+      <template slot="companyName" slot-scope="data">
+        <router-link :to="''+ data.row.companyId" style="color: #0081FF">{{ data.row.companyName }}</router-link>
+      </template>
+    </tables>
 
   </div>
 </template>
@@ -25,6 +29,9 @@
 <script>
 import mixin from '../mixins/mixin'
 import dataRegion from '@/assets/json/dataRegion'
+import {
+  urbanInvestmentPage
+} from '@/api/detail/party-a/urbanLnvestment'
 export default {
   name: 'SameRegion',
   mixins: [mixin],
@@ -34,21 +41,36 @@ export default {
   data() {
     return {
       queryParams: {
-        cid: 6034,
+        provinceId: 500000,
+        cityId: 500100,
         pageNum: 1,
-        pageSize: 10
+        pageSize: 15
       },
       forData: [
-        {label: '企业名称', prop: 'punishReason'},
-        {label: '成员层级', prop: 'punishBegin', width: '120'},
-        {label: '法定代表人', prop: 'punishResult', width: '120'},
-        {label: '注册资本', prop: 'fileNum', width: '120', sortable:true},
-        {label: '成立日期', prop: 'cgrdm', width: '120', sortable:true},
-        {label: '实控人控股', prop: 'office', width: '130', sortable:true},
-        {label: '行业类型', prop: 'dataId', width: '120'},
-        {label: '所属省', prop: 'dataId', width: '120'},
-        {label: '所属市', prop: 'dataId', width: '120'},
-        {label: '所属区/县', prop: 'dataId', width: '120'}
+        {label: '企业名称', prop: 'companyName', width: '369', slot: true},
+        {label: '区域', prop: 'area', width: '100'},
+        {label: '主体评级', prop: 'bratingSubjectLevel', width: '110'},
+        {label: '债劵余额（亿元）', prop: 'bondBalance', width: '130'},
+        {label: '行政级别', prop: 'uipExecutiveLevel', width: '120'},
+        {label: '股东背景', prop: 'shareholderBg', width: '120'},
+        {label: '股权关系', prop: 'equityRelationship', width: '120'},
+        {label: '平台重要性', prop: 'platformImportance', width: '120'},
+        {label: '城投业务类型', prop: 'uipBusinessType', width: '120'},
+        {label: '实控人', prop: 'actualController', width: '280'},
+        {label: '最新报告期', prop: 'latestReportPeriod', width: '120'},
+        {label: '总资产（亿元）', prop: 'totalAssets', width: '120'},
+        {label: '归母净资产（亿元）', prop: 'belongNetAssets', width: '140'},
+        {label: '货币资金（亿元）', prop: 'monetaryFunds', width: '130'},
+        {label: '土地资产（亿元）', prop: 'landAssets', width: '130'},
+        {label: '受限资产（亿元）', prop: 'restrictedAssets', width: '130'},
+        {label: '应收账款（亿元）', prop: 'accountsReceivable', width: '130'},
+        {label: '其他应收款（亿元）', prop: 'otherReceivable', width: '140'},
+        {label: '公益性&准公益性主营占比（%）', prop: 'econData001', width: '200'},
+        {label: '应收类款项来自政府占比（%）', prop: 'receivableFromGovRatio', width: '200'},
+        {label: '政府补助（亿元）', prop: 'govSubsidy', width: '130'},
+        {label: '专项应付款（亿元）', prop: 'specialPayable', width: '140'},
+        {label: '营业收入（亿元）', prop: 'operatingIncome', width: '130'},
+        {label: '所属开发区', prop: 'developmentZone', width: '120'}
       ],
       formData: [
         { type: 1, fieldName: 'penalizeReasonType', value: '', placeholder: '筛选',
@@ -68,13 +90,13 @@ export default {
     }
   },
   created() {
-    this.dataRegion()
+    this.handleQuery()
   },
   computed: {
 
   },
   methods: {
-    async dataRegion() {
+    dataRegion() {
       // await axios.post("https://files.jiansheku.com/file/json/common/dataRegion.json", {}, {
       //   headers: {
       //     'Content-Type': 'application/json'
@@ -126,18 +148,14 @@ export default {
       }
       this.addressList = str;
     },
-    handleQuery() {
-
-    },
-    resetQuery() {
-
-    },
-    //分页
-    handleCurrentChange(e){
-
-    },
-    handleSizeChange(e){
-
+    handleQuery(params){
+      this.tableLoading = true
+      let data = params ? params : this.queryParams
+      urbanInvestmentPage(data).then(res => {
+          this.tableData = res.data.list
+          this.tableDataTotal = res.data.totalCount
+        this.tableLoading = false
+      })
     }
   }
 }

dsk-system/src/main/java/com/dsk/system/domain/customer/vo/CustomerStatusListVo.java

+package com.dsk.system.domain.customer.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 客户状态列表
+ *
+ * @author lcl
+ * @create 2023/5/22
+ */
+@Data
+public class CustomerStatusListVo implements Serializable {
+    /**
+     * 客户id
+     */
+    private String customerId;
+    /**
+     * 城投id
+     */
+    private String uipId;
+
+}

dsk-system/src/main/java/com/dsk/system/mapper/CustomerMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dsk.system.domain.customer.Customer;
 import com.dsk.system.domain.customer.dto.CustomerSearchDto;
 import com.dsk.system.domain.customer.vo.CustomerListVo;
+import com.dsk.system.domain.customer.vo.CustomerStatusListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -23,7 +24,9 @@ public interface CustomerMapper extends BaseMapper<Customer> {
 
     List<Customer> selectUserList(Long userId);
 
-    Customer selectByCompanyNameAndUserId(@Param("companyName")String companyName,@Param("userId")Long userId);
+    Customer selectByCompanyNameAndUserId(@Param("companyName") String companyName, @Param("userId") Long userId);
+
+    List<CustomerStatusListVo> selectStatusList(@Param("uipIds") List<String> uipIds, @Param("userId") Long userId);
 
 }
 

dsk-system/src/main/java/com/dsk/system/service/ICustomerService.java

@@ -5,6 +5,7 @@ import com.dsk.system.domain.customer.dto.CustomerBusinessSearchDto;
 import com.dsk.system.domain.customer.dto.CustomerSearchDto;
 import com.dsk.system.domain.customer.vo.CustomerBusinessListVo;
 import com.dsk.system.domain.customer.vo.CustomerListVo;
+import com.dsk.system.domain.customer.vo.CustomerStatusListVo;
 import com.dsk.system.domain.customer.vo.CustomerVo;
 
 import java.util.List;
@@ -29,4 +30,6 @@ public interface ICustomerService {
 
     List<CustomerBusinessListVo> selectBusinessList(CustomerBusinessSearchDto dto);
 
+    List<CustomerStatusListVo> selectStatusList(List<String> uipIds);
+
 }

dsk-system/src/main/java/com/dsk/system/service/impl/CustomerServiceImpl.java

@@ -13,6 +13,7 @@ import com.dsk.system.domain.customer.dto.CustomerBusinessSearchDto;
 import com.dsk.system.domain.customer.dto.CustomerSearchDto;
 import com.dsk.system.domain.customer.vo.CustomerBusinessListVo;
 import com.dsk.system.domain.customer.vo.CustomerListVo;
+import com.dsk.system.domain.customer.vo.CustomerStatusListVo;
 import com.dsk.system.domain.customer.vo.CustomerVo;
 import com.dsk.system.dskService.EnterpriseService;
 import com.dsk.system.mapper.CustomerMapper;
@@ -123,4 +124,9 @@ public class CustomerServiceImpl implements ICustomerService {
         return businessInfoService.selectCustomerBusinessList(dto);
     }
 
+    @Override
+    public List<CustomerStatusListVo> selectStatusList(List<String> uipIds) {
+        return baseMapper.selectStatusList(uipIds, SecurityUtils.getUserId());
+    }
+
 }

dsk-system/src/main/resources/mapper/system/customer/CustomerMapper.xml

@@ -37,5 +37,16 @@
         where ct.company_name = #{companyName} and ctu.user_id = #{userId}
     </select>
 
+    <select id="selectStatusList" resultType="com.dsk.system.domain.customer.vo.CustomerStatusListVo">
+        select
+            ct.customer_id, ct.uip_id
+        from customer ct
+        join customer_user ctu on ct.customer_id = ctu.customer_id
+        where ctu.user_id = #{userId} and ct.uip_id in
+        <foreach collection="uipIds" item="uipId" open="(" separator="," close=",">
+            #{uipId}
+        </foreach>
+    </select>
+
 </mapper>