Skip to content

P
portalhtml
Commit 46e31165 authored by jiangqihao's avatar jiangqihao
Browse files
Options

Merge branch 'dev' of http://120.25.63.219:6088/rex/portalhtml into dev

parents 957bc5fe fa3c5a4b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 309 additions and 182 deletions
src/api/customers.js
View file @ 46e31165
......@@ -135,7 +135,7 @@ export function processHistory(data){
data
})
}
//审批流程历史记录
//获取附件列表
export function getModels(data){
return request({
url: '/search',
......@@ -143,6 +143,14 @@ export function getModels(data){
data
})
}
//单条信息附件
export function getOneModel(data){
return request({
url: '/getOne',
method: 'post',
data
})
}
// // 客户发布记录
// export const releaseRecord = {
// createUrl: '/releaserecord/create',
......
src/views/customers/citypotenial-list/index.vue
View file @ 46e31165
......@@ -14,9 +14,9 @@
<el-select v-if="formData.ExtProcessNode_SDK==2" v-model="formData.ExtLockRsp_SDK" :disabled="!formData.ExtProcessNode_SDK==2" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据" @change="handleSelectRSP">
<el-option
v-for="item in province"
:key="item.ExtProcessStatus_SDK"
:key="item.ExtAgentID_SDK"
:label="item.Name"
:value="item.ExtProcessStatus_SDK"
:value="item.ExtAgentID_SDK"
/>
</el-select>
<el-input v-else v-model="formData.ExtLockRspName_SDK" disabled>
......@@ -45,10 +45,34 @@
:value="item.keyword"
/>
</el-select>
<el-input v-else v-model="formData.ExtChannelType_SDK" disabled>
<el-input v-else v-model="formData.ExtChannelType_SDKText" disabled>
</el-input>
</template>
</ele-form-section>
<div class="table-contain">
<div class="form-container">附件信息</div>
<el-table :data="tableData2"
border
style="width: 100%">
<el-table-column prop="FileName"
label="附件名称">
</el-table-column>
<el-table-column prop="CreateOn_SDK"
label="上传日期">
</el-table-column>
<el-table-column prop="CreateName_SDK"
label="操作者">
</el-table-column>
<el-table-column label="操作">
<el-link slot-scope="{ row }" type="primary" @click="btnLink(row)">下载</el-link>
</el-table-column>
</el-table>
<pagination v-show="TotalRecords>0"
:total="TotalRecords"
:page.sync="page.currentPage"
:limit.sync="page.pageSize"
@pagination="getList" />
</div>
<div class="table-contain">
<div class="form-container">审批意见</div>
<div class="btn">
......@@ -95,7 +119,7 @@
<script>
import Title from '@/components/Title'
import { getCustomer,typeSearch,lockRsp,ProcessApproval,processHistory } from '@/api/customers';
import { getCustomer,typeSearch,lockRsp,ProcessApproval,processHistory,getOneModel } from '@/api/customers';
import Pagination from '@/components/Pagination'
import { Country } from '@/api/qcc'
export default {
......@@ -113,6 +137,7 @@ export default {
id:'',
status:0,
loading:false,
tableData2:[],
formData: {},
province: [],
sections: [
......@@ -237,24 +262,24 @@ export default {
label: 'Unis业务负责人邮箱',
layout: 12
},
ExtBusiness_SDK: {
type: 'input',
layout: 12,
disabled:true,
label: '商务负责人姓名'
},
ExtBusinessPhone_SDK: {
type: 'input',
layout: 12,
disabled:true,
label: '商务负责人联系方式'
},
ExtBusinessEmail_SDK: {
type: 'input',
disabled:true,
label: '商务负责人邮箱',
layout: 12
},
// ExtBusiness_SDK: {
// type: 'input',
// layout: 12,
// disabled:true,
// label: '商务负责人姓名'
// },
// ExtBusinessPhone_SDK: {
// type: 'input',
// layout: 12,
// disabled:true,
// label: '商务负责人联系方式'
// },
// ExtBusinessEmail_SDK: {
// type: 'input',
// disabled:true,
// label: '商务负责人邮箱',
// layout: 12
// },
}
},
{
......@@ -297,12 +322,24 @@ export default {
},
created(){
this.id=this.$route.query.id
this.getList()
this.getHistoryList()
this.getChannelType()
this.getFile()
},
methods: {
getFile(){
const page={
currentPage:1,
pageSize:10,
objectID:this.id
}
getOneModel(page).then(resp=>{
this.tableData2=resp.results
})
},
getList(){
getCustomer({objectID:this.id}).then((resp)=>{
this.formData=resp.results[0]
......@@ -324,15 +361,19 @@ export default {
processHistory({businessObjectID:this.id}).then((resp)=>{
this.tableData=resp.results
})
},
btnLink(row){
window.location.href = row.FileURL
},
handleSelectRSP(value){
console.log('val',value)
let cont=[]
let val=[]
this.province.forEach((el)=>{
value.forEach((item)=>{
if(el.ExtProcessStatus_SDK==item){
if(el.ExtAgentID_SDK==item){
cont.push(el.Name)
val.push(el.ExtProcessStatus_SDK)
val.push(el.ExtAgentID_SDK)
}
})
})
......
src/views/customers/potential-list/index.vue
View file @ 46e31165
......@@ -19,10 +19,34 @@
:value="item.Code"
/>
</el-select>
<el-input v-else v-model="formData.ExtLockRspName_SDK" disabled>
<el-input v-else v-model="formData.ExtLockCityName_SDK" disabled>
</el-input>
</template>
</ele-form-section>
<div class="table-contain">
<div class="form-container">附件信息</div>
<el-table :data="tableData2"
border
style="width: 100%">
<el-table-column prop="FileName"
label="附件名称">
</el-table-column>
<el-table-column prop="CreateOn_SDK"
label="上传日期">
</el-table-column>
<el-table-column prop="CreateName_SDK"
label="操作者">
</el-table-column>
<el-table-column label="操作">
<el-link slot-scope="{ row }" type="primary" @click="btnLink(row)">下载</el-link>
</el-table-column>
</el-table>
<pagination v-show="TotalRecords>0"
:total="TotalRecords"
:page.sync="page.currentPage"
:limit.sync="page.pageSize"
@pagination="getList" />
</div>
<div class="table-contain">
<div class="form-container">审批意见</div>
<div class="btn">
......@@ -69,7 +93,7 @@
<script>
import Title from '@/components/Title'
import { getCustomer,typeSearch,lockRsp,ProcessApproval,processHistory, province } from '@/api/customers';
import { getCustomer,typeSearch,lockRsp,ProcessApproval,processHistory, province,getOneModel } from '@/api/customers';
import { Country } from '@/api/qcc'
import Pagination from '@/components/Pagination'
export default {
......@@ -89,6 +113,7 @@ export default {
loading:false,
formData: {},
province: [],
tableData2:[],
sections: [
{
title: '基本信息',
......@@ -282,8 +307,22 @@ export default {
this.id=this.$route.query.id
this.getList()
this.getHistoryList()
this.getFile()
},
methods: {
getFile(){
const page={
currentPage:1,
pageSize:10,
objectID:this.id
}
getOneModel(page).then(resp=>{
this.tableData2=resp.results
})
},
btnLink(row){
window.location.href = row.FileURL
},
getList(){
getCustomer({objectID:this.id}).then((resp)=>{
this.formData=resp.results[0]
......
src/views/login/city-progress/index.vue
View file @ 46e31165
......@@ -7,9 +7,9 @@
<div style="height:50px;display: flex;align-items: center;float: right;
margin-right: 90px;">
<div class="parallelogram2"></div>
<div style="margin-right:15px">已审批</div>
<div class="parallelogram3"></div>
<div style="margin-right:15px">未审批</div>
<div style="margin-right:15px">当前节点</div>
<!-- <div class="parallelogram3"></div>
<div style="margin-right:15px">未审批</div> -->
</div>
<div style="height:150px;display: flex;margin: 20px 290px;">
<div class="div_list">
......
src/views/login/city-register/index.vue
View file @ 46e31165
This diff is collapsed.
src/views/login/prov-progress/index.vue
View file @ 46e31165
......@@ -6,9 +6,9 @@
<div style="height:50px;display: flex;align-items: center;float: right;
margin-right: 90px;">
<div class="parallelogram2"></div>
<div style="margin-right:15px">已审批</div>
<div class="parallelogram3"></div>
<div style="margin-right:15px">未审批</div>
<div style="margin-right:15px">当前节点</div>
<!-- <div class="parallelogram3"></div>
<div style="margin-right:15px">未审批</div> -->
</div>
<div style="height:150px;display: flex;margin: 20px 290px;">
<div class="div_list">
......
src/views/login/prov-register/index.vue
View file @ 46e31165
......@@ -7,6 +7,7 @@
<el-form id="registerForm"
:model="formData"
status-icon
v-loading="btnloading"
ref="formData"
:rules="supplierBaseRules"
label-position="right">
......@@ -320,7 +321,7 @@
:offset="1"
class="padding-bottom">
<el-form-item label="营业执照:"
prop="filelss"
prop="filelll"
label-width="100px"
class="filter-icon-none"
>
......@@ -328,7 +329,9 @@
ref="uploadExcel"
action="https://jsonplaceholder.typicode.com/posts/"
:limit='1'
:auto-upload="false"
accept=".doc,.txt,.pdf,.xls,.docx,.xlsx,.jpg,.png"
:on-success="handleAvatarSuccess"
:on-remove="handleRemoveFile"
:on-change="fileChange"
>
<el-button size="small" type="primary">点击上传</el-button>
......@@ -438,6 +441,7 @@ export default {
extChannelType_SDK: [{ required: true, message: '请选择签约渠道类型', trigger: 'blur' }],
extProductGroup_KUT: [{ required: true, message: '请选择签约产品组', trigger: 'blur' }],
extTotalAgent_KUT: [{ required: true, message: '请选择签约总代', trigger: 'blur' }],
filelll: [{ required: true, message: '请上传附件', trigger: 'blur' }],
},
dialogTableVisible: false,
TotalRecords:0,
......@@ -461,6 +465,8 @@ export default {
this.getCommon()
},
methods: {
getList() {
this.page.searchKey=this.formInline.Name
this.$request(Qcc.searchUrl, this.page).then((resp) => {
......@@ -590,6 +596,12 @@ export default {
this.$message.success('提交成功！')
this.$router.back()
}).catch((err) => {
this.btnloading=false
// this.$message({
// type: 'warning',
// message: err
// })
})
} else {
this.btnloading=false
......@@ -635,6 +647,14 @@ export default {
fileChange(res,file){
this.formData.file=(res.raw)
},
handleAvatarSuccess(res,file){
console.log('res',res,"file",file)
this.supplierBaseRules.filelll=[]
},
handleRemoveFile(res, file) {
console.log('restest', res, "file", file)
this.supplierBaseRules.filelll = [{ required: true, message: '请上传附件', trigger: 'blur' }]
},
onSubmit() {},
handlePreview() { },
handleRemove() { },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment