Browse Source

Merge remote-tracking branch 'origin/master'

master
wangpengfei 2 years ago
parent
commit
be4ee2c2a2
  1. 2
      supervise-crm-ui/.env.development
  2. 15
      supervise-crm-ui/src/api/project/project.js
  3. 39
      supervise-crm-ui/src/views/project/index.vue
  4. 121
      supervise-crm-ui/src/views/project/projectAdd.vue
  5. 78
      supervise-crm-ui/src/views/project/projectInfo.vue
  6. 10
      supervise-enterprise-ui/src/layout/components/Sidebar/index.vue
  7. 13
      supervise-enterprise-ui/src/router/modules/codemenu.js
  8. 372
      supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue
  9. 229
      supervise-enterprise-ui/src/views/Yjsq/index.vue
  10. 3
      supervise-uniapp/App.vue
  11. 4
      supervise-uniapp/common/config.js
  12. 10
      supervise-uniapp/common/request.api.js
  13. 20
      supervise-uniapp/manifest.json
  14. 2
      supervise-uniapp/pages.json
  15. 14
      supervise-uniapp/pages/home/UserFragment.vue
  16. 6
      supervise-uniapp/pages/home/WorkFragment.vue
  17. 2
      supervise-uniapp/pages/index/DataAssembleList.vue
  18. 3
      supervise-uniapp/pages/index/MyProject.vue
  19. 67
      supervise-uniapp/pages/index/ProjectDetail.vue
  20. 41
      supervise-uniapp/pages/index/SetUp.vue
  21. 4
      supervise-uniapp/pages/index/SetUp2.vue
  22. 94
      supervise-uniapp/pages/index/WarehouseDetaile.vue
  23. 2
      supervise-uniapp/plugins/APPUpdate/index.js
  24. BIN
      supervise-uniapp/static/baseIcon/loading.gif
  25. BIN
      supervise-uniapp/static/ic_ar.png
  26. 6
      yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDto.java
  27. 3
      yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationQuery.java
  28. 3
      yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationVo.java
  29. 1
      yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryVo.java
  30. 4
      yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.java
  31. 6
      yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationService.java
  32. 1
      yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java
  33. 10
      yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java
  34. 17
      yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java
  35. 4
      yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryMapper.java
  36. 6
      yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryService.java

2
supervise-crm-ui/.env.development

@ -5,5 +5,5 @@ ENV = 'development'
VUE_APP_BASE_API = '/api'
## 配置测试和本地开发时的 接口地址
VUE_APP_URL = "http://192.168.1.193:8112"
VUE_APP_URL = "http://192.168.1.110:8112"
##VUE_APP_URL = "http://8.130.39.13:8112"

15
supervise-crm-ui/src/api/project/project.js

@ -109,5 +109,18 @@ export default {
method: 'post'
})
},
// 获取所有贷款行名称
getBankName: function() {
return request({
url: '/crm/v1/projectinformation/getBankName',
method: 'get',
});
},
// 获取所有项目类型名称
getProjectType: function() {
return request({
url: '/crm/v1/projectinformation/getProjectType',
method: 'get',
});
},
}

39
supervise-crm-ui/src/views/project/index.vue

@ -11,6 +11,26 @@
<el-input v-model="listQuery.params.entryName" maxlength="20" placeholder="请输入项目名称" class="addinputw"
clearable />
</el-form-item>
<el-form-item label="项目类型">
<el-select v-model="listQuery.params.projectType" placeholder="请选择" >
<el-option
v-for="(item,i) in ProjectTypeList"
:key="i"
:label="item.projectType"
:value="item.projectType">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="贷款行">
<el-select v-model="listQuery.params.bankName" placeholder="请选择" >
<el-option
v-for="(item,i) in storehouseList"
:key="i"
:label="item.bankName"
:value="item.bankName">
</el-option>
</el-select>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleReset">查询</el-button>
@ -103,10 +123,14 @@
size: 10,
params: {
entryName: '',
projectType: '',
bankName: '',
},
total: 0
},
viewState: 1
viewState: 1,
storehouseList:[],
ProjectTypeList:[],
}
},
mounted() {
@ -142,6 +166,7 @@
//
init() {
this.getList()
this.getBankName()
},
//
indexMethod(index) {
@ -149,6 +174,14 @@
var pageindex = index + 1 + pagestart
return pageindex
},
getBankName(){
req.getBankName().then((res)=>{
this.storehouseList=res.data
})
req.getProjectType().then((res)=>{
this.ProjectTypeList=res.data
})
},
//
getList() {
this.listLoading = true
@ -175,7 +208,9 @@
size: 10,
total: 0,
params: {
entryName: ""
entryName: '',
projectType: '',
bankName: '',
}
}
this.getList()

121
supervise-crm-ui/src/views/project/projectAdd.vue

@ -56,17 +56,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">授信额度</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-input v-model="formobj.creditLimit" placeholder="请输入授信额度" style="width:100%" class="addinputw"
clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
@ -83,12 +73,12 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-col :span="4" class="trightbs">
<el-form-item class="trightb_item">
<span slot="label">客户经理</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="8" class="trightb_items">
<el-form-item class="trightb_item">
<el-select v-model="formobj.bmanagerName" class="addinputw" placeholder="请选择客户经理" style="width:100%"
@change="getBManager">
@ -98,10 +88,50 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">项目单位</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-select v-model="formobj.enterpriseName" class="addinputw" placeholder="请选择项目单位" style="width:100%"
@change="getEnterpriseName">
<el-option v-for="item in enterpriseList" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">项目联系人</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-input v-model="formobj.econtacts" placeholder="请输入项目联系人" :readonly="true" style="width:100%"
class="addinputw" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">接洽日期</span>
<span slot="label">授信额度</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-input v-model="formobj.creditLimit" placeholder="请输入授信额度" style="width:100%" class="addinputw"
clearable />
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">授信日期</span>
</el-form-item>
</el-col>
<el-col :span="8">
@ -111,44 +141,57 @@
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">签约日期</span>
<span slot="label">用信总额</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-date-picker v-model="formobj.signingDate" type="date" style="width:100%" value-format="yyyy-MM-dd"
<el-input v-model="formobj.useLimit" placeholder="请输入授信额度" style="width:100%" class="addinputw"
clearable />
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">用信日期</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-date-picker v-model="formobj.useDate" type="date" style="width:100%" value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">项目单位</span>
<span slot="label">签约日期</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-select v-model="formobj.enterpriseName" class="addinputw" placeholder="请选择项目单位" style="width:100%"
@change="getEnterpriseName">
<el-option v-for="item in enterpriseList" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey" />
</el-select>
<el-date-picker v-model="formobj.signingDate" type="date" style="width:100%" value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">项目联系人</span>
<span slot="label">放款日期</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-input v-model="formobj.econtacts" placeholder="请输入项目联系人" :readonly="true" style="width:100%"
class="addinputw" clearable />
<el-date-picker v-model="formobj.loanDate" type="date" style="width:100%" value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
@ -307,7 +350,10 @@
bankSid: "",
bmanagerName: '', //
managerSid: "",
engaDate: "", //
engaDate: "", //
useLimit: "", //
loanDate: "", //
useDate: "", //
signingDate: "", //
enterpriseName: "", //
enterpriseSid: "",
@ -583,7 +629,10 @@
bankSid: "",
bmanagerName: '', //
managerSid: "",
engaDate: "", //
engaDate: "",
useLimit: "",
loanDate: "",
useDate: "",
signingDate: "", //
enterpriseName: "", //
enterpriseSid: "",
@ -626,6 +675,9 @@
this.formobj.bmanagerName=resp.data.bmanagerName
this.formobj.managerSid=resp.data.managerSid
this.formobj.engaDate=resp.data.engaDate
this.formobj.useLimit=resp.data.useLimit
this.formobj.loanDate=resp.data.loanDate
this.formobj.useDate=resp.data.useDate
this.formobj.signingDate=resp.data.signingDate
this.formobj.enterpriseName=resp.data.enterpriseName
this.formobj.enterpriseSid=resp.data.enterpriseSid
@ -672,7 +724,6 @@
this.ImgSid=[...new Set(this.ValSid )]
this.formobj.storeHouseProjectDto.shSids=oldArr
}
console.log(this.ImgSid)
this.drawer=false
this.$refs.multipleTable.clearSelection();
},
@ -691,6 +742,12 @@
.trightb_item {
padding-top: 5px;
}
.trightbs {
display: flex;
align-items: center;
text-align: ;
justify-content: center;
}
.span {
margin-left: 50px;
@ -711,6 +768,12 @@
/deep/ .el-collapse-item__content {
padding-bottom: 0;
}
/deep/ .formadd .el-row .trightbs{
border-top: 1px solid #e0e3eb;
}
/deep/ .formadd .el-row .trightb_items{
border-top: 1px solid #e0e3eb;
}
.Images{
width: 150px;
height: 100px;

78
supervise-crm-ui/src/views/project/projectInfo.vue

@ -46,43 +46,66 @@
<span>{{temp.typeName}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">授信额度</span>
<span slot="label">贷款行</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{temp.creditLimit}}</span>
<span>{{temp.bankName}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">贷款行</span>
<span slot="label">客户经理</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{temp.bankName}}</span>
<span>{{temp.bmanagerName}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">客户经理</span>
<span slot="label">项目单位</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{temp.enterpriseName}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">项目联系人</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{temp.bmanagerName}}</span>
<span>{{temp.econtacts}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">接洽日期</span>
<span slot="label">授信额度</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{temp.creditLimit}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">授信日期</span>
</el-form-item>
</el-col>
<el-col :span="8" >
@ -90,9 +113,11 @@
<span>{{temp.engaDate}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">签约日期</span>
<span slot="label">用信总额</span>
</el-form-item>
</el-col>
<el-col :span="8" >
@ -100,30 +125,41 @@
<span>{{temp.signingDate}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">用信日期</span>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item class="trightb_item">
<span>{{temp.engaDate}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">项目单位</span>
<span slot="label">签约日期</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{temp.enterpriseName}}</span>
</el-form-item>
<el-col :span="8" >
<el-form-item class="trightb_item">
<span>{{temp.signingDate}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">项目联系人</span>
</el-form-item>
<el-form-item class="trightb_item">
<span slot="label">放款日期</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="8" >
<el-form-item class="trightb_item">
<span>{{temp.econtacts}}</span>
<span>{{temp.engaDate}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">

10
supervise-enterprise-ui/src/layout/components/Sidebar/index.vue

@ -93,6 +93,16 @@
},
name: "/khzxgysgl/index",
path: "/khzxgysgl/index"
},
{
alwaysShow: true,
component: "Yjsq",
meta: {
icon: "el-icon-menu",
title: "印鉴使用申请",
},
name: "/Yjsq/index",
path: "/Yjsq/index"
},
{
alwaysShow: true,

13
supervise-enterprise-ui/src/router/modules/codemenu.js

@ -14,6 +14,19 @@ const codemenu = [{
}
}]
}, {
path: '/Yjsq',
component: Layout,
redirect: '/Yjsq/index',
children: [{
path: '/Yjsq/index',
component: () => import('@/views/Yjsq/index.vue'),
name: 'Yjsq',
meta: {
title: '印鉴使用申请',
noCache: true
}
}]
},{
path: '/kucuncgsq',
component: Layout,
redirect: '/khzxcgsq/index',

372
supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue

@ -0,0 +1,372 @@
<template>
<div class="app-container">
<div>
<div class="tab-header webtop">
<div>{{title}}</div>
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
<el-button type="info" size="small" icon="el-icon-close" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd" style="padding-bottom: 50px;">
<el-form ref="dataForm" :model="formobj" label-position="top" label-width="190px" class="formadd">
<div class="titwu">印鉴信息表</div>
<div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
<div>主体信息</div>
</div>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">项目名称</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-select v-model="formobj.industryName" class="addinputw" placeholder="请选择项目名称" style="width:100%"
@change="getHangYe">
<el-option v-for="(item,i) in industryList" :key="i" :label="item.dictValue"
:value="item.dictKey" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">审批编号</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-input v-model="formobj.entryName" placeholder="请输入审批编号" style="width:100%" class="addinputw"
clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">申请人</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-input v-model="formobj.entryName" placeholder="请输入申请人姓名" style="width:100%" class="addinputw"
clearable />
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">用印人</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-input v-model="formobj.entryName" placeholder="请输入用印人姓名" style="width:100%" class="addinputw"
clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">申请日期</span>
</el-form-item>
</el-col>
<el-col :span="8" class="trightb_item">
<el-form-item class="trightb_item">
<el-date-picker v-model="formobj.engaDate" type="date" style="width:100%" value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">用印事由</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-input v-model="formobj.entryName" placeholder="请输入用印事由" style="width:100%" class="addinputw"
clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">用印文件名称</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-input v-model="formobj.econtacts" placeholder="请输入用印文件名称" style="width:100%"
class="addinputw" clearable />
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">用印文件(附件)</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-input v-model="formobj.econtacts" placeholder="请输入用印文件名称" :readonly="true" style="width:100%"
class="addinputw" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">加盖何种公章</span>
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item class="trightb_item">
<div class="info-sex">
<el-radio-group v-model="formobj.fillInDate">
<el-radio :label="0">公章</el-radio>
<el-radio :label="1">法人章</el-radio>
<el-radio :label="2">财务章</el-radio>
<el-radio :label="3">发票章</el-radio>
<el-radio :label="4">营业执照</el-radio>
<el-radio :label="5">开发许可证</el-radio>
</el-radio-group>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">备注</span>
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item class="trightb_item">
<el-input v-model="formobj.remarks" placeholder="请输入项目说明" style="width:100%;margin-bottom: 5px;"
type="textarea" :rows="7" class="addinputw" clearable />
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
</div>
</template>
<script>
// import req from '@/api/project/project'
export default {
data() {
return {
title: "【新增】印鉴信息",
submitdisabled: false,
drawer: false,
formobj: {
sid: "",
entryName: "", //
industryName: "", //
industrySid: "",
typeName: "", //
typeSid: "",
creditLimit: "", //
bankName: "", //
bankSid: "",
bmanagerName: '', //
managerSid: "",
engaDate: "", //
useLimit: "", //
loanDate: "", //
useDate: "", //
signingDate: "", //
enterpriseName: "", //
enterpriseSid: "",
econtacts: "", //
remarks: "", //
regulatoryLeader: "", //
generalManager: "", //
endDate: "", //
fillInDate: "", //
},
industryAllList: [],
industryList: [],
}
},
created() {
},
methods: {
addImg(){
console.log(6);
},
saveOrUpdate() {
console.log(">>>>>>>>>saveOrUpdate", this.formobj)
if (this.formobj.sid) {
// req.updateData(this.formobj)
// .then(resp => {
// if (resp.success) {
// this.$message({
// showClose: true,
// type: 'success',
// message: resp.msg
// })
// this.handleReturn("true")
// this.$refs.multipleTable.clearSelection();
// } else {
// // resp.code
// }
// })
// .catch(() => {})
} else {
// req.addInfo(this.formobj)
// .then(resp => {
// if (resp.success) {
// this.$message({
// showClose: true,
// type: 'success',
// message: resp.msg
// })
// this.handleReturn("true")
// this.$refs.multipleTable.clearSelection();
// } else {
// // resp.code
// }
// })
// .catch(() => {})
}
},
delSid(){
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
sid: "",
entryName: "", //
industryName: "", //
industrySid: "",
typeName: "", //
typeSid: "",
creditLimit: "", //
bankName: "", //
bankSid: "",
bmanagerName: '', //
managerSid: "",
engaDate: "",
useLimit: "",
loanDate: "",
useDate: "",
signingDate: "", //
enterpriseName: "", //
enterpriseSid: "",
econtacts: "", //
remarks: "", //
regulatoryLeader: "", //
generalManager: "", //
endDate: "", //
fillInDate: "", //
}
},
showAdd(){
this.title= "【新增】印鉴信息"
},
showEdit(row) {
this.title= "【修改】印鉴信息"
// req.fetchBySid(row.sid)
// .then(resp => {
// if (resp.success) {
// }
// })
// .catch(e => {
// this.formobj = row
// })
},
getHangYe(value) {
const choose = this.industryList.filter((item) => item.dictKey === value)
this.formobj.industryName = choose[0].dictValue
this.formobj.industrySid = choose[0].dictKey
},
}
}
</script>
<style scoped>
.trightb {
display: flex;
align-items: center;
justify-content: center;
}
.trightb_item {
padding-top: 5px;
}
.trightbs {
display: flex;
align-items: center;
justify-content: center;
}
.span {
margin-left: 50px;
font-size: 15px;
font-weight: 400;
}
/deep/ .el-collapse-item__header {
height: 40px;
padding: 10px;
font-weight: bold;
font-size: 20px;
text-align: left;
color: #ffffff;
background-color: #0294d7;
}
/deep/ .el-collapse-item__content {
padding-bottom: 0;
}
/deep/ .el-radio__inner {
border-radius: 10%;
}
.info-sex ::v-deep.el-radio__input.is-checked .el-radio__inner {
border-color: #0294d7;
background-color: #fff;
}
.info-sex ::v-deep.el-radio__input.is-checked + .el-radio__label {
color: #424346;
}
.info-sex ::v-deep.el-radio__input.is-checked .el-radio__inner:after {
transform: rotate(45deg) scaleY(1);
}
.info-sex ::v-deep.el-radio__label {
color: #80838a;
}
.info-sex ::v-deep.el-radio__inner::after {
box-sizing: content-box;
content: "";
border: 1px solid #0294d7;
border-left: 0;
border-top: 0;
height: 7px;
left: 4px;
position: absolute;
top: 1px;
transform: rotate(45deg) scaleY(0);
width: 3px;
transition: transform 0.15s ease-in 0.05s;
transform-origin: center;
border-radius: unset;
background-color: transparent;
}
</style>

229
supervise-enterprise-ui/src/views/Yjsq/index.vue

@ -0,0 +1,229 @@
<template>
<div class="app-container">
<div v-show="viewState ==1">
<button-bar view-title="印鉴使用管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="80px" class="tab-header">
<el-form-item label="油罐编号">
<el-input v-model="listQuery.params.number" maxlength="20" placeholder="请输入油罐编号" class="addinputw"
clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleReset">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="handleFilter">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">印鉴使用列表</div>
</div>
<div class="">
<el-table v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column fixed width="50" type="selection" align="center"/>
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column fixed width="80" label="操作" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="审批编号" prop="number" align="center" />
<el-table-column label="申请日期" prop="crudeName" align="center" />
<el-table-column label="用印文件名称" prop="existingInventory" align="center" />
</el-table>
</div>
<div class="pages">
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div>
</div>
</div>
<AddYjsq v-show="viewState ==2 || viewState ==3" ref="divAdd" @doback="resetState" @reloadlist="getList" />
<!-- <oilTypeInfo v-show="viewState ==4" ref="divInfo" @doback="resetState" @reloadlist="getList" /> -->
</div>
</template>
<script>
// import req from '@/api/oilTank/oilTank'
import Pagination from '@/components/pagination'
import ButtonBar from '@/components/ButtonBar'
import AddYjsq from './AddYjsq.vue'
// import oilTypeInfo from './oilTypeInfo.vue'
export default {
name: 'CustomerManagement',
components: {
Pagination,
ButtonBar,
AddYjsq,
// oilTypeInfo,
},
data() {
return {
listLoading: false,
btndisabled: false,
form: {},
btnList: [{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'primary',
size: 'small',
icon: 'submit',
btnKey: 'toBan',
btnLabel: '办理'
},
{
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
list: [],
listQuery: {
current: 1,
size: 10,
params: {
entryName: '',
},
total: 0
},
viewState: 1
}
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
this.init()
//
},
methods: {
btnHandle(btnKey) {
switch (btnKey) {
case 'toAdd':
this.toAdd()
break
case 'doDel':
this.doDel()
break
case 'toBan':
this.toEdit()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
//
init() {
this.getList()
},
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
// this.listLoading = true
// req.listPage(this.listQuery).then((res) => {
// this.listLoading = false
// })
},
//
handleReset() {
this.listQuery.current = 1
this.getList()
},
//
handleFilter() {
this.listQuery = {
current: 1,
size: 10,
total: 0,
params: {
entryName: ""
}
}
this.getList()
},
//
toAdd() {
this.viewState = 2
},
toInfo() {
this.viewState = 4
},
//
toEdit() {
this.viewState = 3
this.$refs['divAdd'].showEdit(row)
},
handleSelectionChange(row) {
const aa = []
row.forEach((element) => {
aa.push(element.sid)
})
this.sids = aa
},
// ID
doDel() {
const tip = '请确认是否删除所选记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
// req.delBySids(row.sid).then((response) => {
// })
})
},
resetState() {
this.viewState = 1
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

3
supervise-uniapp/App.vue

@ -3,7 +3,8 @@
export default {
globalData: {
// wxSilentLoginURL: "https://supervise.yxtsoft.com/portal/v1/wxuser/wxSilentLogin",
wxSilentLoginURL: "http://192.168.1.110:8112/portal/v1/wxuser/wxSilentLogin",
wxSilentLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/wxSilentLogin",
// wxSilentLoginURL: "http://192.168.1.110:8112/portal/v1/wxuser/wxSilentLogin",
wxAuthLoginURL: "https://supervise.yxtsoft.com/api/portal//v1/wxuser/wxAuthLogin",
SilentLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/SilentLogin",//
token: "",

4
supervise-uniapp/common/config.js

@ -7,9 +7,9 @@
*/
module.exports = {
// baseUrl: 'https://jianguan.yyundong.com/api',
// baseUrl: 'https://supervise.yxtsoft.com',
baseUrl: 'https://supervise.yxtsoft.com',
// baseUrl: 'http://192.168.1.193:8112',
baseUrl: 'http://192.168.1.110:8112',
// baseUrl: 'http://192.168.1.110:8112',
tokenName: "Authorization", // 请求头中token的名字,与服务器端对应
loginTimeoutCode: "5001", // 登录超时或失效的情况下,服务器端返回的错误码
loginTimeoutPage: "/pages/login/index", // 登录超时或失效的情况下,跳转到的登录页面

10
supervise-uniapp/common/request.api.js

@ -72,7 +72,7 @@ export default {
// 获取首页面数据
getWorkData: (params = {}) => request.get("/report/messagepushlog/numberOfJobs/" + params, params),
getWorkData: (params = {}) => request.get("/reportwxmpapi/messagepushlog/numberOfJobs/" + params, params),
// 获取云仓列表
storeHouseListPage: (params = {}) => request.post("/api/portal/v1/flow/storeHouseListPage", params),
@ -87,8 +87,8 @@ export default {
getProjectBySid: (params = {}) => request.get("/api/crm/v1/projectinformation/getProjectBySid/" + params,
params),
// 获取我的项目-仓库详情
getStorehouseBySid: (params = {}) => request.get("/api/crm/v1/projectinformation/getStorehouseBySid/" + params,
// 获取我的项目-仓库详情
getStorehouseBySid: (params = {}) => request.post("/api/crm/v1/storehouseproject/selectStoreBySid/" + params,
params),
// 获取库存信息列表
@ -105,9 +105,9 @@ export default {
// 修改密码
updatePassword: (params = {}) => request.post("/portal/v1/sysuser/updatePassword", params),
updatePassword: (params = {}) => request.post("/api/portal/v1/sysuser/updatePassword", params),
// 修改头像
uploadHandImage: (params = {}) => request.post("/portal/v1/sysuser/uploadImage", params),
uploadHandImage: (params = {}) => request.post("/api/portal/v1/sysuser/uploadImage", params),
}

20
supervise-uniapp/manifest.json

@ -29,7 +29,8 @@
"Barcode" : {},
"Contacts" : {},
"Push" : {},
"OAuth" : {}
"OAuth" : {},
"Geolocation" : {}
},
"distribute" : {
"android" : {
@ -38,15 +39,20 @@
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.CONTROL_LOCATION_UPDATES\"/>",
"<uses-permission android:name=\"android.permission.DIAGNOSTIC\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.INSTALL_LOCATION_PROVIDER\"/>",
"<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
"<uses-permission android:name=\"android.permission.LOCATION_HARDWARE\"/>",
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
@ -68,10 +74,8 @@
"sdkConfigs" : {
"ad" : {},
"geolocation" : {
"amap" : {
"__platform__" : [ "android" ],
"appkey_ios" : "",
"appkey_android" : ""
"system" : {
"__platform__" : [ "ios", "android" ]
}
},
"push" : {},
@ -123,10 +127,10 @@
"mp-weixin" : {
"appid" : "wx05604ce2a8bede05",
"setting" : {
"urlCheck" : false,
"urlCheck" : true,
"es6" : false,
"minified" : false,
"postcss" : false
"minified" : true,
"postcss" : true
},
"optimization" : {
"subPackages" : true

2
supervise-uniapp/pages.json

@ -326,7 +326,7 @@
"selectedColor": "#41adf8",
"backgroundColor": "#FFFFFF",
"borderStyle": "black",
"iconWidth": "25px", //
"iconWidth": "13px", //
"list": [{
"pagePath": "pages/home/WorkFragment",
"iconPath": "static/bottom-icon/gongzuotai1.png",

14
supervise-uniapp/pages/home/UserFragment.vue

@ -3,7 +3,7 @@
<view class="top">
<image class="img" :src="baseUrl" mode="aspectFit" @click="chooseImage" ></image>
<image class="img" :src="baseUrl" @click="chooseImage" ></image>
<view class="top_right">
@ -28,15 +28,15 @@
</UserItem>
</view>
<!-- #ifdef APP-PLUS -->
<view class="user-item-bg">
<!-- <view class="user-item-bg"> -->
<!-- <UserItem src='https://supervise.yxtsoft.com/img/user/zzjg.png' text="组织结构" @click="click" clickId="3"></UserItem>
<UserItem src='https://supervise.yxtsoft.com/img/user/xmgl.png' text="项目管理" @click="click" clickId="4"></UserItem>
<UserItem src='https://supervise.yxtsoft.com/img/user/ycgl.png' text="云仓管理" @click="click" clickId="5"></UserItem>
<UserItem src='https://supervise.yxtsoft.com/img/user/xtgl.png' text="系统管理" @click="click" clickId="6"></UserItem> -->
<UserItem src='https://supervise.yxtsoft.com/img/user/xtgl.png' text="检查更新" :notes="version" @click="click"
<!-- <UserItem src='https://supervise.yxtsoft.com/img/user/xtgl.png' text="检查更新" :notes="version" @click="click"
clickId="7">
</UserItem>
</view>
</UserItem> -->
<!-- </view> -->
<!-- #endif -->
</view>
</template>
@ -98,8 +98,8 @@
console.log(">>>>>", username)
console.log(">>>>>", orgNamePath)
this.name = username
this.orgName = orgNamePath==""?"暂无数据":orgNamePath
this.name = username==""?"用户名称":username
this.orgName = orgNamePath==""?"暂无部门信息":orgNamePath
this.baseUrl = headImage==""?"https://supervise.yxtsoft.com/img/user/userImage.png":headImage

6
supervise-uniapp/pages/home/WorkFragment.vue

@ -1,7 +1,7 @@
<template>
<view style="width: 100%;height: 100%;">
<view v-show="!isShow" style="width: 100%;height: 100%;">
<image src="../../static/baseIcon/loading.gif" mode="aspectFill" style="width: 100%;height: 100%;"></image>
<image src="https://supervise.yxtsoft.com/img/base/loading.gif" mode="aspectFill" style="width: 100%;height: 100%;"></image>
</view>
<view class="content" v-show="isShow">
@ -588,7 +588,7 @@
.top_item_text {
margin-top: 5px;
color: #101010;
font-size: 15px;
font-size: 13px;
}
}
@ -674,7 +674,7 @@
}
.centre_text {
font-size: 15px;
font-size: 12px;
color: #000;
margin-top: 5px;
}

2
supervise-uniapp/pages/index/DataAssembleList.vue

@ -43,7 +43,7 @@
<uni-drawer ref="drawer" width="320" mode="right">
<view class="drawerView">
<text style="color: #101010;font-size: 16px;font-weight: 600;font-family: sans-serif;">申请日期</text>
<text style="color: #101010;font-size: 16px;font-weight: 600;font-family: sans-serif;">数据日期</text>
<view class="drawerView-date">
<input class="drawerView-date-text" v-model="listQuery.params.dataDateStart" placeholder="开始日期"
:disabled="true" @click="openDate(1)">

3
supervise-uniapp/pages/index/MyProject.vue

@ -142,8 +142,7 @@
<style lang="scss">
.page {
width: 100%;
height: 100%;
padding-bottom: 20px;
.newslist {
margin-top: 15px;

67
supervise-uniapp/pages/index/ProjectDetail.vue

@ -40,27 +40,30 @@
</view>
<view class="layout" style="margin-top: 10px;">
<view v-show="isShow">
<text style="margin-top: 15px;margin-left: 13px;">项目仓库</text>
<view class="layout" style="margin-top: 10px;">
<view class="list">
<text style="margin-top: 15px;margin-left: 13px;">项目仓库</text>
<view class="list-item" v-for="item in imageArr">
<view class="list">
<view class="list-item-lay">
<image class="item-img" :src="item.src" mode="aspectFill" @tap="previewImage(item.src)"></image>
<text class="item-text">{{item.title}}</text>
</view>
<view class="list-item" v-for="item in imageArr" >
<view class="list-item-lay" @click="imgClick(item)">
<image class="item-img" :src="item.src" mode="aspectFill">
</image>
<text class="item-text">{{item.title}}</text>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
<view class="layout" style="margin-top: 10px;">
@ -110,10 +113,9 @@
</view>
<view class="layout" style="margin-top: 10px;padding: 20px; padding-bottom: 50px;">
<view class="layout" style="margin-top: 10px;padding: 20px;">
<text
style="font-size: 14px;color: #919191;line-height: 25px;">项目说明{{info.remarks}}</text>
<text style="font-size: 14px;color: #919191;line-height: 25px;">项目说明{{info.remarks}}</text>
</view>
@ -121,11 +123,13 @@
</template>
<script>
export default {
data() {
return {
info: {},
isShow: false,
imageArr: [
// {
// src: "https://fuss10.elemecdn.com/a/3f/3302e58f9a181d2509f3dc0fa68b0jpeg.jpeg",
@ -170,20 +174,30 @@
// if (resp.success) {
console.log('222', resp)
// this.dataList = resp
this.imageArr =[]
this.imageArr = []
for (var i = 0; i < resp.length; i++) {
let item = resp[i]
this.imageArr.push(
{
src:item.picUrl,
title:item.simpleName
})
this.isShow = true
let item = resp[i]
console.log('item', item.name)
this.imageArr.push({
src: item.picUrl,
sid:item.shSid,
title: item.name
})
}
}).catch(e => {
console.log('eeeee', e)
})
},
imgClick(item){
console.log('item', item)
uni.navigateTo({
url: 'WarehouseDetaile?sid='+item.sid
});
}
}
@ -193,9 +207,9 @@
<style lang="scss">
.pages {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
padding-bottom: 20px;
.layout {
@ -236,12 +250,13 @@
width: 100%;
.list-item-lay {
.item-img {
width: 100%;
height: 105px;
border: 1px solid #4D72FF;
}
.item-text {
z-index: 1000;
position: relative;
@ -249,13 +264,13 @@
padding: 3px 15px 3px 15px;
color: #fff;
background: #4D72FF;
opacity:0.7;
font-size: 13px;
opacity: 0.7;
font-size: 13px;
border-top-right-radius: 15px;
}
}
}

41
supervise-uniapp/pages/index/SetUp.vue

@ -6,6 +6,36 @@
<image src="../../static/baseIcon/zy.png" style="width: 15px;height: 15px;"></image>
</view>
<!-- <view class="item" @click="itemClick('1')" style="margin-top: 10px;">
<text class="text">清除缓存</text>
<image src="../../static/baseIcon/zy.png" style="width: 15px;height: 15px;"></image>
</view> -->
<!-- #ifdef APP-PLUS -->
<!-- <view class="item" @click="itemClick('2')" style="border-bottom: none;">
<text class="text">检查新版本</text>
<image src="../../static/baseIcon/zy.png" style="width: 15px;height: 15px;"></image>
</view> -->
<!-- #endif -->
<view class="item" @click="itemClick('3')" style="margin-top: 10px;">
<text class="text">关于我们</text>
<image src="../../static/baseIcon/zy.png" style="width: 15px;height: 15px;"></image>
</view>
<view class="item" @click="itemClick('4')" style="border-bottom: none;">
<text class="text">帮助与反馈</text>
<image src="../../static/baseIcon/zy.png" style="width: 15px;height: 15px;"></image>
</view>
</view>
</template>
@ -19,11 +49,17 @@
methods: {
itemClick(index) {
switch (index) {
case "1":
case "0":
uni.navigateTo({
url: '../index/ChangePassword'
});
break;
case "2":
break;
case "3":
break;
case "4":
break;
default:
break;
}
@ -42,10 +78,11 @@
.item {
background: #fff;
padding: 20px 15px;
padding: 16px 15px;
display: flex;
flex-direction: row;
justify-content: space-between;
border-bottom: 1px solid #eee;
.text {
color: #101010;

4
supervise-uniapp/pages/index/SetUp2.vue

@ -14,8 +14,8 @@
export default {
data() {
return {
uploadAction: config.baseUrl + "/portal/v1/sysuser/uploadfile",
headImage: getApp().globalData.headImage
uploadAction: config.baseUrl + "/api/portal/v1/sysuser/uploadfile",
headImage: getApp().globalData.headImage==""?"https://supervise.yxtsoft.com/img/user/userImage.png":getApp().globalData.headImage
// headImage: "https://supervise.yxtsoft.com/img/user/userImage.png"
}
},

94
supervise-uniapp/pages/index/WarehouseDetaile.vue

@ -20,12 +20,13 @@
</view>
<view class="view"></view>
<image class="top-img" src="https://supervise.yxtsoft.com/img/newApp/phone.png" mode="aspectFit"></image>
<image class="top-img" src="https://supervise.yxtsoft.com/img/newApp/phone.png" mode="aspectFit" @click="makeCall"></image>
</view>
<view class="top" style="margin-top: 10px;">
<image style="width: 20px;height: 40px;" src="https://supervise.yxtsoft.com/img/newApp/location.png" mode="aspectFit"></image>
<view class="top" style="margin-top: 10px;" @click="getLat">
<image style="width: 20px;height: 40px;" src="https://supervise.yxtsoft.com/img/newApp/location.png"
mode="aspectFit"></image>
<view style="display: flex;
flex-direction: column;margin-left: 10px;">
<text class="top-name-text3">{{info.address}}</text>
@ -41,20 +42,20 @@
<view class="bottom-title-view"></view>
<text class="bottom-title-text">基础信息</text>
</view>
<view class="bottom-item">
<view class="bottom-item-lay">
<view class="bottom-item-lay">
<text class="bottom-item-text1">仓库简称</text>
<text class="bottom-item-text2">{{info.simpleName}}</text>
</view>
<view class="bottom-item-lay">
<view class="bottom-item-lay">
<text class="bottom-item-text1">房源</text>
<text class="bottom-item-text2">{{info.housingResource}}</text>
</view>
<view class="bottom-item-lay" style="border-bottom: none;">
<view class="bottom-item-lay" style="border-bottom: none;">
<text class="bottom-item-text1">高度</text>
<text class="bottom-item-text2">{{info.storeyHeight}}</text>
</view>
@ -71,25 +72,25 @@
</view> -->
</view>
<view class="bottom" style="margin-top: 10px;padding-bottom: 50px;">
<view class="bottom-title">
<view class="bottom-title-view"></view>
<text class="bottom-title-text">详情信息</text>
</view>
<view class="bottom-item">
<view class="bottom-item-lay">
<view class="bottom-item-lay">
<text class="bottom-item-text1">库房面积</text>
<text class="bottom-item-text2">{{info.acreage}}</text>
</view>
<view class="bottom-item-lay" style="border-bottom: none;">
<view class="bottom-item-lay" style="border-bottom: none;">
<text class="bottom-item-text1">月租金</text>
<text class="bottom-item-text2">{{info.monthlyPrice}}</text>
</view>
</view>
</view>
@ -139,25 +140,60 @@
// if (resp.success) {
console.log('1111', resp)
this.info = resp
this.info.swipers =[]
if(resp.pics.length==0){
this.info.swipers = []
if (resp.pics.length == 0) {
this.info.swipers.push(
resp.picUrl)
}else{
for (var i = 0; i <resp.pics.length; i++) {
resp.picUrl)
} else {
for (var i = 0; i < resp.pics.length; i++) {
var url = resp.pics[i].fileUrl
this.info.swipers.push(url)
}
}
}).catch(e => {
console.log('eeeee', e)
})
},
getLat() {
console.log('lon', this.info.lon)
console.log('lat', this.info.lat)
if (this.info.lon == '' || this.info.lon == null || this.info.lat == '' || this.info.lat == null) {
uni.showToast({
icon: "none",
title: '当前仓库位置错误,请核实后在进行导航操作。',
duration: 5000,
});
return
}
var longitude = parseFloat(this.info.lon)
var latitude = parseFloat(this.info.lat)
var name = this.info.name
var address = this.info.address
wx.openLocation({
latitude: latitude,
longitude: longitude,
scale: 15,
name: name,
address: address
})
},
makeCall(){
wx.makePhoneCall({
//
phoneNumber: this.info.linkerPhone
})
}
}
}
</script>
@ -278,30 +314,30 @@
padding-left: 30px;
padding-right: 30px;
flex-direction: column;
.bottom-item-lay{
.bottom-item-lay {
margin-top: 10px;
display: flex;
flex-direction: row;
padding: 8px 12px;
border-bottom: 1px solid #eee;
.bottom-item-text1 {
flex: 1;
font-size: 14px;
color: #191919;
}
.bottom-item-text2 {
flex: 1;
font-size: 14px;
color: #717171;
}
}
}
}
}

2
supervise-uniapp/plugins/APPUpdate/index.js

@ -5,7 +5,7 @@ const platform = uni.getSystemInfoSync().platform;
// 主颜色
const $mainColor = "FF5B78";
// 弹窗图标url
const $iconUrl = "/static/ic_ar.png";
const $iconUrl = "https://supervise.yxtsoft.com/img/base/ic_ar.png";
// 获取当前应用的版本号
export const getCurrentNo = function(callback) {
// 获取本地应用资源版本号

BIN
supervise-uniapp/static/baseIcon/loading.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

BIN
supervise-uniapp/static/ic_ar.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

6
yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDto.java

@ -53,4 +53,10 @@ public class ProjectInformationDto implements Dto {
private UserProjectDto bankUserProjectDto;
//员工
private UserProjectDto userProjectDto;
//用信总额
private String useLimit;
//放款日期
private String loanDate;
//用信日期
private String useDate;
}

3
yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationQuery.java

@ -27,5 +27,6 @@ public class ProjectInformationQuery implements Query {
private String industrySid;
private String typeSid;
private String remarks;
private String projectType;
private String bankName;
}

3
yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationVo.java

@ -50,4 +50,7 @@ public class ProjectInformationVo implements Vo {
private String engaDate;
private String url;
private List<EnterpriseProjectVo> enterpriseProjectVoList;
private String useLimit;
private String loanDate;
private String useDate;
}

1
yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryVo.java

@ -15,4 +15,5 @@ public class ProjectTypeDictionaryVo implements Vo {
private String id;
private String sid;
private String remarks;
private String projectType;
}

4
yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.java

@ -12,6 +12,7 @@ import com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformation;
import com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformationVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@ -28,5 +29,6 @@ public interface LoanBankInformationMapper extends BaseMapper<LoanBankInformatio
List<BankManagerVo> getBankManager(@Param("sid") String sid);
//根据sid下级
List<LoanBankInformationVo> bankList(@Param("sid") String sid);
@Select("select DISTINCT bankName from loan_bank_information")
List<LoanBankInformationVo> selectBankName();
}

6
yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationService.java

@ -86,4 +86,10 @@ public class LoanBankInformationService extends MybatisBaseService<LoanBankInfor
baseMapper.delete(new QueryWrapper<LoanBankInformation>().eq("sid",sid));
return rb.success().setMsg("删除贷款银行信息成功");
}
public ResultBean selectBankNameList(){
ResultBean rb = ResultBean.fireFail();
List<LoanBankInformationVo> strings = baseMapper.selectBankName();
return rb.success().setData(strings);
}
}

1
yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java

@ -30,4 +30,5 @@ public interface ProjectInformationMapper extends BaseMapper<ProjectInformation>
@Select("select p.*,i.enterpriseName as enterpriseName from project_information p left join enterprise_project e on e.projectSid=p.sid left join enterprise_information i on i.sid=e.enterpriseSid")
List<ProjectInformationVo> getProjectByUser( @Param("sid") String sid);
void insertFiles(List<Map<String, String>> maps);
}

10
yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java

@ -117,4 +117,14 @@ public class ProjectInformationRest implements ProjectInformationFeign {
public ResultBean getUserByType (@PathVariable String type){
return ProjectInformationService.getUserByType(type);
}
@GetMapping("/getBankName")
public ResultBean getBankName(){
return ProjectInformationService.getBankName();
}
@GetMapping("/getProjectType")
public ResultBean getProjectType(){
return ProjectInformationService.getProjectType();
}
}

17
yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java

@ -16,6 +16,7 @@ import com.yxt.supervise.crm.biz.bankmanager.BankManagerService;
import com.yxt.supervise.crm.biz.enterpriseproject.EnterpriseProjectService;
import com.yxt.supervise.crm.biz.loanbankinformation.LoanBankInformationService;
import com.yxt.supervise.crm.api.userproject.UserProject;
import com.yxt.supervise.crm.biz.projecttypedictionary.ProjectTypeDictionaryService;
import com.yxt.supervise.crm.biz.storehouseproject.StoreHouseProjectService;
import com.yxt.supervise.crm.biz.userproject.UserProjectService;
import com.yxt.supervise.crm.feign.wh.StoreHouseProjectFeign;
@ -46,12 +47,20 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
UserProjectService userProjectService;
@Autowired
StoreHouseProjectService storeHouseProjectService;
@Autowired
ProjectTypeDictionaryService projectTypeDictionaryService;
public PagerVo<ProjectInformationVo> listPageVo(PagerQuery<ProjectInformationQuery> pq) {
ProjectInformationQuery query = pq.getParams();
QueryWrapper<ProjectInformation> qw = new QueryWrapper<>();
if(StringUtils.isNotBlank(query.getEntryName())){
qw.like("info.entryName",query.getEntryName());
}
if(StringUtils.isNotBlank(query.getProjectType())){
qw.like("td.projectType",query.getProjectType());
}
if(StringUtils.isNotBlank(query.getBankName())){
qw.like("bank.bankName",query.getBankName());
}
IPage<ProjectInformation> page = PagerUtil.queryToPage(pq);
IPage<ProjectInformationVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ProjectInformationVo> p = PagerUtil.pageToVo(pagging, null);
@ -168,4 +177,12 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
}
return sysUserFeign.getUserByType(userType);
}
public ResultBean getBankName(){
return bankInformationService.selectBankNameList();
}
public ResultBean getProjectType(){
return projectTypeDictionaryService.getProjectTypeList();
}
}

4
yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryMapper.java

@ -8,6 +8,7 @@ import com.yxt.supervise.crm.api.projecttypedictionary.ProjectTypeDictionary;
import com.yxt.supervise.crm.api.projecttypedictionary.ProjectTypeDictionaryVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@ -20,5 +21,6 @@ public interface ProjectTypeDictionaryMapper extends BaseMapper<ProjectTypeDicti
IPage<ProjectTypeDictionaryVo> selectPageVo(IPage<ProjectTypeDictionary> page, @Param(Constants.WRAPPER) Wrapper<ProjectTypeDictionary> qw);
List<ProjectTypeDictionaryVo> typeList();
ProjectTypeDictionaryVo getProjectTypeBySid( @Param("sid") String sid);
@Select("select DISTINCT projectType from project_type_dictionary")
List<ProjectTypeDictionaryVo> selectProjectType();
}

6
yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryService.java

@ -64,4 +64,10 @@ public class ProjectTypeDictionaryService extends MybatisBaseService<ProjectType
baseMapper.delete(new QueryWrapper<ProjectTypeDictionary>().eq("sid",sid));
return rb.success().setMsg("删除项目类型成功");
}
public ResultBean getProjectTypeList(){
ResultBean rb=new ResultBean();
List<ProjectTypeDictionaryVo> strings = baseMapper.selectProjectType();
return rb.success().setData(strings);
}
}

Loading…
Cancel
Save