Skip to content

高东东-金蝶建发 / jf-yzj-supplier

Go to a project
Commit f36749cf by 钟乾明
Options

u: 对该供方综合评估审批意见不能为空，请选择

parent 080dd313
Expand all
Inline Side-by-side
Showing with 332 additions and 100 deletions
package.json
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
"start": "node build/dev-server.js", "start": "node build/dev-server.js",
"build:test": "cross-env PACK_ENV=test node build/vt-build.js", "build:test": "cross-env PACK_ENV=test node build/vt-build.js",
"build:prod": "cross-env PACK_ENV=prod node build/vt-build.js", "build:prod": "cross-env PACK_ENV=prod node build/vt-build.js",
"build:test:cordova": "cross-env PACK_ENV=test PACK_PLATFORM=cordova node build/build.js", "build:test:cordova": "cross-env PACK_ENV=test PACK_PLATFORM=cordova node build/vt-build.js",
"build:test:qing": "cross-env PACK_ENV=test PACK_PLATFORM=qing node build/build.js", "build:test:qing": "cross-env PACK_ENV=test PACK_PLATFORM=qing node build/vt-build.js",
"build:prod:cordova": "cross-env PACK_ENV=prod PACK_PLATFORM=cordova node build/build.js", "build:prod:cordova": "cross-env PACK_ENV=prod PACK_PLATFORM=cordova node build/vt-build.js",
"build:prod:qing": "cross-env PACK_ENV=prod PACK_PLATFORM=qing node build/build.js" "build:prod:qing": "cross-env PACK_ENV=prod PACK_PLATFORM=qing node build/vt-build.js"
}, },
"dependencies": { "dependencies": {
"axios": "^0.19.0", "axios": "^0.19.0",
......
src/api/index.js
...@@ -2,18 +2,27 @@ import { showError } from './errorhandler' ...@@ -2,18 +2,27 @@ import { showError } from './errorhandler'
import { MAS_CODES } from './masConfig' import { MAS_CODES } from './masConfig'
import { MAS } from '@/plugins/mas' import { MAS } from '@/plugins/mas'
const masConfig = process.env.PACK_ENV === 'prod' let platformMap = {
? { qing: {
baseUrl: 'https://jffcvp.cndrealty.com:4433', // 正式环境 test: 'https://staging.jffctest.com',
tokenKey: 'accessToken', prod: 'https://portal.cndrealty.com'
code: 'cndvp-api' },
cordova: {
test: 'https://mxytest.cndrealty.com:4433',
prod: 'https://jffcvp.cndrealty.com:4433'
}
} }
: { let baseUrl = process.env.NODE_ENV === 'development' ? 'https://mxytest.cndrealty.com:4433'
baseUrl: 'https://mxytest.cndrealty.com:4433', : process.env.PACK_ENV === 'prod' && process.env.PACK_PLATFORM
? platformMap[ process.env.PACK_PLATFORM ].prod
: platformMap[ process.env.PACK_PLATFORM ].test
const masConfig = {
baseUrl,
tokenKey: 'accessToken', tokenKey: 'accessToken',
code: 'cndvp-api' code: 'cndvp-api'
} }
const mas = MAS.getInstance().config(masConfig) const mas = MAS.getInstance().config(masConfig)
// 测试token,从美信云平台的登录记录获取 // 测试token,从美信云平台的登录记录获取
...@@ -23,29 +32,30 @@ const testToken = 'yzj_1a344f9d0e4eb1395ea59209b69a555c' ...@@ -23,29 +32,30 @@ const testToken = 'yzj_1a344f9d0e4eb1395ea59209b69a555c'
// 测试流程单据id // 测试流程单据id
const testFid = 'x9oAADIpYxfirKan' // x9oAAArMGB/irKan 营销类 x9oAAArNAtPirKan 商业类 x9oAAArNClDirKan const testFid = 'x9oAADIpYxfirKan' // x9oAAArMGB/irKan 营销类 x9oAAArNAtPirKan 商业类 x9oAAArNClDirKan
/* 1.供方更名:（会签）x9oAAArQslp2xf1N 、x9oAAArTSgN2xf1N - dingzhy@cndrealty.com 、x9oAAArQqcV2xf1N \\ (审批）x9oAAArTSdR2xf1N - liub@cndrealty.com /* 1.供方更名:（会签）x9oAAArQslp2xf1N 、x9oAAArTSgN2xf1N - dingzhy@cndrealty.com 、x9oAAArQqcV2xf1N \\ (审批）x9oAAArTSdR2xf1N - liub@cndrealty.com
* 2.调整联系方式:（会签）x9oAAArTSgN2xf1N - dingzhy@cndrealty.com 、x9oAAArMYD12xf1N - caimm \ \\ （审批）x9oAAArTSdR2xf1N - liub@cndrealty.com * 2.调整联系方式:（会签）x9oAAArTSgN2xf1N - dingzhy@cndrealty.com 、x9oAAArMYD12xf1N - caimm \ \\ （审批）x9oAAArTSdR2xf1N - liub@cndrealty.com
* 3.调整品牌方式:（会签）x9oAAArTShV2xf1N - xiewei * 3.调整品牌方式:（会签）x9oAAArTShV2xf1N - xiewei
*/ */
/* 供方履约 /* 供方履约
* 账号： xiewei - x9oAAArUjsjuMsBg x9oAAArUj0vuMsBg x9oAAArXRMHuMsBg （新） x9oAAArXdSjuMsBg * 账号： xiewei - x9oAAArUjsjuMsBg x9oAAArUj0vuMsBg x9oAAArXRMHuMsBg （新） x9oAAArXdSjuMsBg
* caimm - x9oAAArUj0zuMsBg 、 x9oAAArUjsnuMsBg 、 x9oAAArSS2zuMsBg x9oAAArVE6TuMsBg (单) * caimm - x9oAAArUj0zuMsBg 、 x9oAAArUjsnuMsBg 、 x9oAAArSS2zuMsBg x9oAAArVE6TuMsBg (单)
* cyy@cndrealty.com - x9oAAArUj03uMsBg 、 x9oAAArUjsruMsBg * cyy@cndrealty.com - x9oAAArUj03uMsBg 、 x9oAAArUjsruMsBg
*/ */
/* /*
1、评分（CT_SUP_ReviewDistribute.FID）： 1、评分（CT_SUP_ReviewDistribute.FID）：
x9oAAArL/2WwAXHf x9oAAArL/2WwAXHf
2、组长审核（CT_SUP_ReviewGrp.FID）： 2、组长审核（CT_SUP_ReviewGrp.FID）：
1）x9oAAArL/0virKan 、cyy@cndrealty.com 1）x9oAAArL/0virKan 、cyy@cndrealty.com
2）x9oAAArMFsDirKan 、cyy@cndrealty.com 2）x9oAAArMFsDirKan 、cyy@cndrealty.com
3）x9oAAArMFdLirKan 、cyy@cndrealty.com 3）x9oAAArMFdLirKan 、cyy@cndrealty.com
3、会签（CT_SUP_ReviewGrp.FID）： 3、会签（CT_SUP_ReviewGrp.FID）：
1）x9oAAArL//PirKan 、yhwang@cndrealty.com 1）x9oAAArL//PirKan 、yhwang@cndrealty.com
2）x9oAAArMDePirKan、zhangky@cndrealty.com 2）x9oAAArMDePirKan、zhangky@cndrealty.com
4、审批（CT_SUP_ReviewGrp.FID）： 4、审批（CT_SUP_ReviewGrp.FID）：
1）x9oAAArMEJnirKan、zhangky@cndrealty.com 1）x9oAAArMEJnirKan、zhangky@cndrealty.com
*/ */
// 设置token,接口传参验证用 // 设置token,接口传参验证用
function setToken (val) { function setToken (val) {
mas.token = val || testToken mas.token = val || testToken
......
src/pages/inspect/approval/index.vue
<template> <template>
<base-layout :title="title"> <base-layout :title="title">
<div class="approval flex-v full"> <div class="approval flex-v full">
<group-info class="margin-top" :projectsInfo="inspectProjectInfo" :personsInfo="inspectPersionInfo" :remark="remark" :attachmentCount="attachmentCount" /> <group-info class="margin-top"
:projectsInfo="inspectProjectInfo"
:personsInfo="inspectPersionInfo"
:remark="remark"
:attachmentCount="attachmentCount"/>
<card-panel title="基本信息" class="margin-top"> <card-panel title="基本信息"
class="margin-top">
<div class="project-info flex-v"> <div class="project-info flex-v">
<span class="name">{{currentSupplierInfo.supplierName}}</span> <span class="name">{{ currentSupplierInfo.supplierName }}</span>
<span class="label">{{currentSupplierInfo.supplierTypeName}}</span> <span class="label">{{ currentSupplierInfo.supplierTypeName }}</span>
</div> </div>
<div class="project-info margin-top flex flex-space-between"> <div class="project-info margin-top flex flex-space-between">
<span class="name">考察成员结论</span> <span class="name">考察成员结论</span> <span @click="gotoMemberGrade"><span class="red_link">查看详情</span> <font-icon type="forward_arrow_black_small"></font-icon></span>
<span @click="gotoMemberGrade"><span class="red_link">查看详情</span> <font-icon type="forward_arrow_black_small"></font-icon></span>
</div> </div>
<div class="project-info margin-top flex flex-space-between"> <div class="project-info margin-top flex flex-space-between">
<span class="name">考察组综合结论</span> <span class="name">考察组综合结论</span> <span @click="gotoConclusion"><span class="red_link">查看详情</span> <font-icon type="forward_arrow_black_small"></font-icon></span>
<span @click="gotoConclusion"><span class="red_link">查看详情</span> <font-icon type="forward_arrow_black_small"></font-icon></span>
</div> </div>
</card-panel> </card-panel>
<card-panel v-if="showSign" title="考察组会审" class="margin-top"> <card-panel v-if="showSign"
<sign-item v-for="(item, index) in supplierSignList" :key="index" :dataSource="item" /> title="考察组会审"
class="margin-top">
<sign-item v-for="(item, index) in supplierSignList"
:key="index"
:dataSource="item"/>
</card-panel> </card-panel>
<card-panel title="考察审批" class="margin-top"> <card-panel title="考察审批"
class="margin-top">
<div class="leaderCheck"> <div class="leaderCheck">
<review-cell-radio title="1.对该供方综合评估为" v-model="supplyRank" :editable="isTodo" /> <review-cell-radio title="1.对该供方综合评估为"
<review-text-area v-model="supplyRank"
title="2.使用条件" :editable="isTodo"/>
v-if="showCondition" <review-text-area title="2.使用条件"
:editable="isTodo" v-if="showCondition"
v-model="conditionOption" :editable="isTodo"
placeholder="请输入使用条件说明" /> v-model="conditionOption"
<review-add-item placeholder="请输入使用条件说明"/>
:title="`${appRegionIndex}.适用区域`" <review-add-item :title="`${appRegionIndex}.适用区域`"
v-if="showAppRegion" v-if="showAppRegion"
:editable="false" :editable="false"
btnTitle="添加适用区域" btnTitle="添加适用区域"
:itemList="supplierAppRegionList.map(v=>v.text)" :itemList="supplierAppRegionList.map(v=>v.text)"
@handleAdd="handleChooseArea" @handleAdd="handleChooseArea"></review-add-item>
></review-add-item> <review-add-item v-if="showProject"
<review-add-item :editable="false"
v-if="showProject" :title="`${projectIndex}.适用特定项目`"
:editable="false" :itemList="cacheProjectList.map(v=>v.projectName)"
:title="`${projectIndex}.适用特定项目`" btnTitle="添加适用项目"
:itemList="cacheProjectList.map(v=>v.projectName)" @handleAdd="handleChooseProject"/>
btnTitle="添加适用项目"
@handleAdd="handleChooseProject"
/>
<!-- <review-add-item <!-- <review-add-item
v-if="showProjectType" v-if="showProjectType"
:editable="isTodo" :editable="isTodo"
...@@ -60,7 +65,11 @@ ...@@ -60,7 +65,11 @@
:defaultValue="productGradeId" :defaultValue="productGradeId"
v-model="productGradeId" v-model="productGradeId"
/> --> /> -->
<van-button @click="handleSubmit" v-if="isTodo" type="danger" size="large">确认</van-button> <van-button @click="handleSubmit"
v-if="isTodo"
type="danger"
size="large">确认
</van-button>
</div> </div>
</card-panel> </card-panel>
</div> </div>
...@@ -96,13 +105,13 @@ export default { ...@@ -96,13 +105,13 @@ export default {
ReviewAddItem, ReviewAddItem,
PopupPicker, PopupPicker,
ProductGradePicker, ProductGradePicker,
[Button.name]: Button, [ Button.name ]: Button,
GroupInfo GroupInfo
}, },
mixins: [reviewSummaryMixin], mixins: [reviewSummaryMixin],
mounted () { mounted () {
this.$store.commit('showLoading', true) this.$store.commit('showLoading', true)
this.fetchReviewSummaryInfo({billId: Coder.encode(this.currentSupplierInfo.id)}) this.fetchReviewSummaryInfo({billId: process.env.PLATFORM === '' ? Coder.encode(this.currentSupplierInfo.id) : Coder.replace(this.currentSupplierInfo.id)})
.then(() => { .then(() => {
this.conditionOption = this.reviewSummaryInfo.useCondition this.conditionOption = this.reviewSummaryInfo.useCondition
this.productGradeId = this.reviewSummaryInfo.productGrade this.productGradeId = this.reviewSummaryInfo.productGrade
...@@ -145,8 +154,13 @@ export default { ...@@ -145,8 +154,13 @@ export default {
...mapGetters('inspect', [ ...mapGetters('inspect', [
'currentFid' 'currentFid'
]), ]),
...mapState(['PageTypes', 'flowId', 'isReady', 'todoId']), ...mapState([
// 考察组基本信息-备注 'PageTypes',
'flowId',
'isReady',
'todoId'
]),
// 考察组基本信息-备注
remark () { remark () {
return this.inspectInfo.description return this.inspectInfo.description
}, },
...@@ -243,23 +257,28 @@ export default { ...@@ -243,23 +257,28 @@ export default {
type: 'audit', type: 'audit',
isSave: true, isSave: true,
id: encodeURIComponent(this.reviewSummaryInfo.reviewGrp), id: encodeURIComponent(this.reviewSummaryInfo.reviewGrp),
infos: [{ infos: [
id: encodeURIComponent(this.reviewSummaryInfo.id), {
auditSupplyRank: this.supplyRank.supplyRank, id: encodeURIComponent(this.reviewSummaryInfo.id),
auditOpinion: encodeURIComponent(Coder.replaceQuots(Coder.replaceCRLF(this.supplyRank.opinion || ''))), auditSupplyRank: this.supplyRank.supplyRank,
// 使用条件 auditOpinion: encodeURIComponent(Coder.replaceQuots(Coder.replaceCRLF(this.supplyRank.opinion || ''))),
useCondition: encodeURIComponent(Coder.replaceQuots(Coder.replaceCRLF(this.conditionOption || ''))), // 使用条件
AppRegionEntry: this.supplierAppRegionList.map(v => ({'appRegion': encodeURIComponent(v.id)})), useCondition: encodeURIComponent(Coder.replaceQuots(Coder.replaceCRLF(this.conditionOption || ''))),
// 特定项目 AppRegionEntry: this.supplierAppRegionList.map(v => ({'appRegion': encodeURIComponent(v.id)})),
ProjectEntry: this.cacheProjectList.map(v => { return {'curProject': encodeURIComponent(v.projectId)} }) || [], // 特定项目
// 项目类别 ProjectEntry: this.cacheProjectList.map(v => { return {'curProject': encodeURIComponent(v.projectId)} }) || [],
PrjTypeEntry: this.cacheProjectTypeList.map(v => { return {'projectType': encodeURIComponent(v.id)} }) || [], // 项目类别
// 项目档次 PrjTypeEntry: this.cacheProjectTypeList.map(v => { return {'projectType': encodeURIComponent(v.id)} }) || [],
productGrade: encodeURIComponent(this.productGradeId || '') // 项目档次
}] productGrade: encodeURIComponent(this.productGradeId || '')
}
]
} }
console.log(params, 'params', this.cacheProjectList, this.supplierAppRegionList) console.log(params, 'params', this.cacheProjectList, this.supplierAppRegionList)
this.fetchAuditReviewSummarys({params, callback: this.submitCallback}) this.fetchAuditReviewSummarys({
params,
callback: this.submitCallback
})
} }
}, },
submitCallback (success, msg) { submitCallback (success, msg) {
...@@ -284,7 +303,7 @@ export default { ...@@ -284,7 +303,7 @@ export default {
ProjectEntry: v.ProjectEntry.map(v => ({'curProject': encodeURIComponent(v.curProject)})) ProjectEntry: v.ProjectEntry.map(v => ({'curProject': encodeURIComponent(v.curProject)}))
} }
// 适用区域 // 适用区域
let arr = findItemByIndexPath(this.inspectAllAppRegions[i], this.regionSelectIndexPath) let arr = findItemByIndexPath(this.inspectAllAppRegions[ i ], this.regionSelectIndexPath)
switch (this.currentPageType) { switch (this.currentPageType) {
case this.PageTypes.Leader_Todo: case this.PageTypes.Leader_Todo:
info.leaderSupplyRank = v.leaderSupplyRank info.leaderSupplyRank = v.leaderSupplyRank
...@@ -324,7 +343,10 @@ export default { ...@@ -324,7 +343,10 @@ export default {
assignmentId: this.todoId assignmentId: this.todoId
} }
console.log('inspect') console.log('inspect')
this.fetchAuditReviewSummarys({params, callback: this.submitFinallyCallback}) this.fetchAuditReviewSummarys({
params,
callback: this.submitFinallyCallback
})
}, },
submitFinallyCallback (success, msg) { submitFinallyCallback (success, msg) {
this.$dialog this.$dialog
...@@ -349,7 +371,8 @@ export default { ...@@ -349,7 +371,8 @@ export default {
} }
</script> </script>
<style lang="less" scoped> <style lang="less"
scoped>
.approval { .approval {
background-color: #EFEFF4; background-color: #EFEFF4;
......
src/vuex/modules/inspect.js
...@@ -194,7 +194,7 @@ export default { ...@@ -194,7 +194,7 @@ export default {
} else { } else {
let arr = [] let arr = []
response.data.rows.forEach(v => { response.data.rows.forEach(v => {
arr.push(getReviewSummaryInfo({billId: process.env.PACK_PLATFORM ? (Coder.encode(v.id)) : Coder.replace(v.id)})) arr.push(getReviewSummaryInfo({billId: process.env.PACK_PLATFORM === 'qing' ? (Coder.encode(v.id)) : Coder.replace(v.id)}))
}) })
Promise.all(arr) Promise.all(arr)
.then(resultArr => { .then(resultArr => {
...@@ -294,6 +294,7 @@ export default { ...@@ -294,6 +294,7 @@ export default {
// }, // },
// 获取供方考察评审汇总表 // 获取供方考察评审汇总表
async fetchReviewSummaryInfo ({ commit, rootState }, payload) { async fetchReviewSummaryInfo ({ commit, rootState }, payload) {
console.log('fetchReviewSummaryInfo>>', payload)
const response = await getReviewSummaryInfo(payload) const response = await getReviewSummaryInfo(payload)
if (response.code === 200) { if (response.code === 200) {
console.log('response.data', response.data) console.log('response.data', response.data)
......
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 sign in to comment