Browse Source

Merge remote-tracking branch 'origin/master'

master
wangpengfei 2 years ago
parent
commit
51938925eb
  1. 32
      supervise-crm-ui/src/api/projectStaff/index.js
  2. 164
      supervise-crm-ui/src/views/projectStaff/index.vue
  3. 185
      supervise-enterprise-ui/src/views/NewList/needMoney.vue
  4. 2
      supervise-enterprise-ui/src/views/NewList/outbound.vue
  5. 2
      supervise-enterprise-ui/src/views/NewList/warehouse.vue

32
supervise-crm-ui/src/api/projectStaff/index.js

@ -0,0 +1,32 @@
import request from '@/utils/request'
export default {
// 选择可用的项目
projectinformation: function() {
return request({
url: '/crm/v1/projectinformation/listAll ',
method: 'get',
});
},
getUserByType: function(id) {
return request({
url: '/crm/userproject/getUserByType/'+ id,
method: 'get'
})
},
getUserProjectBySid: function(sid) {
return request({
url: '/crm/userproject/getUserProjectBySid/'+ sid,
method: 'get'
})
},
userprojectSave: function(data) {
return request({
url: '/crm/userproject/save',
method: 'post',
data: data
});
},
}

164
supervise-crm-ui/src/views/projectStaff/index.vue

@ -23,36 +23,36 @@
<div class="listtop" style="width: 500px">
<div class="tit" >项目列表</div>
</div>
<el-table :data="dataList" border max-height="380px" style="width: 500px" highlight-current-row
<el-table :data="formobj" border ref="multipleTab" max-height="380px" style="width: 500px" highlight-current-row
@row-click="singleElection">
<el-table-column align="center" width="55" label="选择">
<template slot-scope="scope">
<!-- 可以手动的修改label的值从而控制选择哪一项 -->
<el-radio class="radio" v-model="templateSelection" :label="scope.row.id" style="margin-left:10px"
<el-radio class="radio" v-model="uploadData.projectSid" :label="scope.row.sid" style="margin-left:10px"
>{{''}}</el-radio
>
</template>
</el-table-column>
<el-table-column prop="typeName" label="项目名称" align="center" />
<el-table-column prop="remarks" label="贷款银行" align="center" />
<el-table-column prop="entryName" label="项目名称" align="center" />
<el-table-column prop="bankName" label="贷款银行" align="center" />
</el-table>
</div>
<div class="rigth">
<div class="listtop" style="width: 700px">
<div class="tit" > 项目名称{{projectList.remarks }} {{"\xa0\xa0\xa0"}}{{"\xa0\xa0\xa0"}}{{"\xa0\xa0\xa0"}}{{"\xa0\xa0\xa0"}} 贷款银行{{projectList.id }}</div>
<div class="tit" > 项目名称{{projectList.entryName }} {{"\xa0\xa0\xa0"}}{{"\xa0\xa0\xa0"}}{{"\xa0\xa0\xa0"}}{{"\xa0\xa0\xa0"}} 贷款银行{{projectList.bankName }}</div>
</div>
<div style="float: left;">
<el-table v-loading="tableLoading" :data="dataList" border max-height="380px" style="width: 350px"
@selection-change="handleSelectionChange">
<el-table ref="multipleTable" :data="dataListOne" border max-height="380px" style="width: 350px"
@selection-change="handlChange" tooltip-effect="dark" >
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="typeName" label="监管人员" align="center" />
<el-table-column prop="name" label="监管人员" align="center" />
</el-table>
</div>
<div style="float: left;">
<el-table v-loading="tableLoading" :data="dataList" border max-height="380px" style="width: 350px"
@selection-change="handleSelectionChange">
<el-table ref="multipleTables" :data="dataListTwo" border max-height="380px" style="width: 350px"
@selection-change="handleSelectionChange" tooltip-effect="dark">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="remarks" label="银行人员" align="center" />
<el-table-column prop="name" label="银行人员" align="center" />
</el-table>
</div>
</div>
@ -62,7 +62,7 @@
</template>
<script>
import req from '@/api/dataDict/datadict'
import req from '@/api/projectStaff/index'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
@ -80,11 +80,9 @@
isSearchShow: false,
searchxianshitit: '显示查询条件',
tableLoading: false,
dataList: [
{remarks:'fff',id:15},
{remarks:'kfdjakdfjdkajfkafjka',id:52},
{remarks:'fff',id:11}
],
formobj:[],
dataListOne: [],
dataListTwo: [],
btnList: [
{
type: 'info',
@ -107,14 +105,25 @@
//
checkList: [],
projectList:{
remarks:'',
id:'',
}
entryName:'',
bankName:'',
},
uploadData:{
projectSid:'',
bankUsers:[],
users:[],
},
one:1,
two:3,
ValSid:[],
ValSids:[],
DataLists:[],
usersList:[],
}
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
this.loadList()
},
@ -138,15 +147,54 @@
}
},
loadList() {
req.projectinformation().then(res=>{
if (res.success) {
this.formobj = res.data
this.uploadData.projectSid = res.data[0].sid
this.projectList.entryName=res.data[0].entryName
this.projectList.bankName=res.data[0].bankName
req.getUserProjectBySid(res.data[0].sid).then(res=>{
this.DataLists=res.data.bankUsers
this.usersList=res.data.users
this.estimate()
})
}
})
req.getUserByType(this.one).then(res=>{
if (res.success) {
this.dataListOne = res.data
}
})
req.getUserByType(this.two).then(res=>{
if (res.success) {
this.dataListTwo = res.data
}
})
},
clearList(){
this.ValSid=[]
this.ValSids=[]
this.DataLists=[]
this.usersList=[]
this.uploadData={
projectSid:'',
bankUsers:[],
users:[],
}
},
singleElection(row) {
this.templateSelection = row.id
this.checkList = this.dataList.filter((item) => item.id === row.id)
this.uploadData.projectSid = row.sid
this.checkList = this.formobj.filter((item) => item.sid === row.sid)
console.log(`该行的编号为${row.id}`)
console.log(this.checkList[0].id)
this.projectList.remarks=this.checkList[0].remarks
this.projectList.id=this.checkList[0].id
console.log(this.checkList[0].entryName)
this.projectList.entryName=this.checkList[0].entryName
this.projectList.bankName=this.checkList[0].bankName
req.getUserProjectBySid(row.sid).then(res=>{
this.DataLists=res.data.bankUsers
this.usersList=res.data.users
this.estimate()
})
},
//
indexMethod(index) {
@ -173,11 +221,65 @@
this.viewState = 1
},
getPurchaseList(){
let val=this.ValSid
},
handleSelectionChange(){
for(let i=0;i<val.length;i++){
this.uploadData.bankUsers.push(val[i].sid)
}
}
let vals=this.ValSids
for(let i=0;i<vals.length;i++){
this.uploadData.users.push(vals[i].sid)
}
console.log(this.uploadData);
req.userprojectSave(this.uploadData).then(res=>{
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: res.msg
})
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTables.clearSelection();
this.clearList()
}
})
},
handlChange(val){
this.ValSid=val
},
handleSelectionChange(val){
this.ValSids=val
},
estimate(){
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTables.clearSelection();
const { dataListOne,dataListTwo, DataLists,usersList } = this
DataLists.forEach(key => {
dataListOne.forEach(row => {
if (row.sid == key.sid) {
if(row.sid){
this.$refs.multipleTable.toggleRowSelection(row, true);
}
}
})
})
usersList.forEach(key => {
dataListTwo.forEach(row => {
if (row.sid == key.sid) {
if(row.sid){
this.$refs.multipleTables.toggleRowSelection(row, true);
}else{
this.$refs.multipleTables.clearSelection();
}
}
})
})
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>

185
supervise-enterprise-ui/src/views/NewList/needMoney.vue

@ -1,62 +1,143 @@
<template>
<div>
<button-bar ref="btnbar" view-title="用款申请提交" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="listconadd">
<div>
<button-bar ref="btnbar" view-title="用款申请提交" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="listconadd">
<div class="topHouse">
<h2>生产经营用款申请</h2>
<div class="warehouse">
<div class="top">
<span>所在项目{{"\xa0\xa0\xa0"}} XXX</span>
<span>申请日期XXXXX</span>
</div>
<div style="margin-top: 25px;">
用款企业{{"\xa0\xa0\xa0"}} <el-select v-model="storehouseId" placeholder="请选择" size="small" style="width: 60%;" >
<el-option
v-for="(storehouse,i) in storehouseList"
:key="i"
:label="storehouse.title"
:value="storehouse.mun">
</el-option>
</el-select>
</div>
<div style="margin-top: 50px;">
<div style="margin-top: 20px;float: left;">用途申请{{"\xa0\xa0\xa0"}}</div>
<el-radio-group v-model="radio" @input="getWay">
<div>
<el-radio :label="1">备选项</el-radio>
<a target="_blank" style="font-size: 14px;color: #018ad2;border-bottom: 1px solid #018ad2;" href="http://jianguan.yyundong.com/warehouse/#/outStorehouseManagement/outList">XXXXXX</a>
<a target="_blank" style="margin-left: 35px;font-size: 14px;color: #018ad2;border-bottom: 1px solid #018ad2;" href="http://jianguan.yyundong.com/warehouse/#/outStorehouseManagement/outList"><i class="el-icon-plus"></i>添加出库单</a>
</div>
<div class="production">
<el-radio :label="2">备选项</el-radio>
<el-input v-model="estimateCalculatedValue" placeholder="请填写用途,如支付员工工资,水电费等" size="small" clearable></el-input>
</div>
</el-radio-group>
</div>
<div style="margin-top: 45px;margin-left: -10px;font-size: 14px;">
:客户发起发起申请首先监管审核再银行审核通过后客户在审核结果表里打印纸质申请表盖章并提交给监管银行各一份
</div>
<el-button type="primary" style="width: 13%;margin-left: 60%;margin-top: 50px;" size="small" @click="getPurchaseList">提交审核</el-button>
</div>
</div>
</div>
</template>
<script>
import ButtonBar from '@/components/ButtonBar'
export default {
components: {
ButtonBar
},
data() {
return {
btndisabled: false,
queryInfos: {
total: 0,
current: 1,
size: 100,
params: {
purchaseNo:''
}
},
btnList: [
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
};
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
btnHandle(btnKey) {
switch (btnKey) {
case 'doClose': //
</div>
</template>
<script>
import ButtonBar from '@/components/ButtonBar'
export default {
components: {
ButtonBar
},
data() {
return {
btndisabled: false,
storehouseId:'',
radio: 1,
estimateCalculatedValue:'',
storehouseList:[{mun:'1',title:'喜相随仓库'},{mun:'2',title:'大四喜仓库'}],
queryInfos: {
total: 0,
current: 1,
size: 100,
params: {
purchaseNo:''
}
},
btnList: [
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
};
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
btnHandle(btnKey) {
switch (btnKey) {
case 'doClose': //
this.doClose()
break
default:
break
}
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
},
getPurchaseList(){
if(this.radio==2){
console.log(this.estimateCalculatedValue);
}
},
getWay(){
if(this.radio==1){
this.estimateCalculatedValue=''
}else if(this.radio==2){
}
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
};
</script>
<style lang="scss" scoped>
},
};
</script>
</style>
<style scoped>
/deep/ .el-input{
margin-top: -10px;
}
/deep/ .el-input__suffix{
margin-top: -8px;
}
.topHouse h2{
text-align: center;
font-weight: 520;
font-size: 26px;
}
.topHouse .warehouse{
margin: 0 auto;
width: 65%;
height: 400px;
font-size: 18px;
}
.topHouse .warehouse .top{
width: 100%;
height: 40px;
border-bottom: 1px solid #717171;
display: flex;
justify-content: space-between;
}
.topHouse .warehouse .production{
margin-top: 30px;
width: 500px;
height: 40px;
display: flex;
justify-content: space-between;
}
</style>

2
supervise-enterprise-ui/src/views/NewList/outbound.vue

@ -20,7 +20,7 @@
</el-select>
</div>
<div style="margin-top: 25px;">
货物价值{{"\xa0\xa0\xa0"}} <el-input v-model="estimateCalculatedValue" :readonly="true" placeholder="单行输入" size="small" style="width: 60%;" clearable></el-input>
货物价值{{"\xa0\xa0\xa0"}} <el-input v-model="estimateCalculatedValue" placeholder="单行输入" size="small" style="width: 60%;" clearable></el-input>
<a target="_blank" style="margin-left: 20px;font-size: 14px;color: #018ad2;border-bottom: 1px solid #018ad2;" href="http://jianguan.yyundong.com/warehouse/#/outStorehouseManagement/outList"><i class="el-icon-plus"></i>添加出库单</a>
</div>
<div style="margin-top: 45px;margin-left: -10px;font-size: 14px;">

2
supervise-enterprise-ui/src/views/NewList/warehouse.vue

@ -20,7 +20,7 @@
</el-select>
</div>
<div style="margin-top: 25px;">
货物价值{{"\xa0\xa0\xa0"}} <el-input v-model="estimateCalculatedValue" :readonly="true" placeholder="单行输入" size="small" style="width: 60%;" clearable></el-input>
货物价值{{"\xa0\xa0\xa0"}} <el-input v-model="estimateCalculatedValue" placeholder="单行输入" size="small" style="width: 60%;" clearable></el-input>
<a target="_blank" style="margin-left: 20px;font-size: 14px;color: #018ad2;border-bottom: 1px solid #018ad2;" href="http://jianguan.yyundong.com/warehouse/#/instorehouse/purchase"><i class="el-icon-plus"></i>添加入库单</a>
</div>
<div style="margin-top: 45px;margin-left: -10px;font-size: 14px;">

Loading…
Cancel
Save