yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

客户和供应商服务商

Browse Source
jg-waiwang-pro
胡川虎 9 months ago
parent c6282a8fea
commit b657f55f89
67 changed files with 266 additions and 248 deletions
Show Stats Download Patch File Download Diff File

10
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/SubjectbasicController.java
Unescape View File

@ -696,7 +696,15 @@ public class SubjectbasicController {
subjectbasicMap.put("tableField173",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(subjectcontactsList))); subjectbasicMap.put("tableField173",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(subjectcontactsList)));
List<SubjectproductblacklistEntity> subjectproductblacklistList = subjectbasicService.getSubjectproductblacklistList(entity.getId()); List<SubjectproductblacklistEntity> subjectproductblacklistList = subjectbasicService.getSubjectproductblacklistList(entity.getId());
subjectbasicMap.put("tableField212",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(subjectproductblacklistList))); subjectbasicMap.put("tableField212",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(subjectproductblacklistList)));
subjectbasicMap = generaterSwapUtil.swapDataDetail(subjectbasicMap,SubjectbasicConstant.getFormData(),"517679750756434949",false); if("1".equals(entity.getSubjectBasicType())){
subjectbasicMap = generaterSwapUtil.swapDataDetail(subjectbasicMap,SubjectbasicConstant.getFormData(),"517679750756434949",false);
}else if("2".equals(entity.getSubjectBasicType())){
subjectbasicMap = generaterSwapUtil.swapDataDetail(subjectbasicMap,SubjectbasicConstant.getFormData(),"1754041598685376513",false);
}else if("3".equals(entity.getSubjectBasicType())){
subjectbasicMap = generaterSwapUtil.swapDataDetail(subjectbasicMap,SubjectbasicConstant.getFormData(),"1754054458341748737",false);
}
return ActionResult.success(subjectbasicMap); return ActionResult.success(subjectbasicMap);
} }
/** /**

10
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/SubjectfollowmanagementController.java
Unescape View File

@ -9,6 +9,7 @@ import jnpf.base.UserInfo;
import jnpf.base.entity.DictionaryDataEntity; import jnpf.base.entity.DictionaryDataEntity;
import jnpf.base.service.DictionaryDataService; import jnpf.base.service.DictionaryDataService;
import jnpf.exception.DataException; import jnpf.exception.DataException;
import jnpf.model.subjectbasic.SubjectbasicConstant;
import jnpf.permission.entity.UserEntity; import jnpf.permission.entity.UserEntity;
import jnpf.service.*; import jnpf.service.*;
import jnpf.entity.*; import jnpf.entity.*;
@ -413,7 +414,14 @@ public class SubjectfollowmanagementController {
subjectfollowmanagementMap.put("id", subjectfollowmanagementMap.get("id")); subjectfollowmanagementMap.put("id", subjectfollowmanagementMap.get("id"));
//副表数据 //副表数据
//子表数据 //子表数据
subjectfollowmanagementMap = generaterSwapUtil.swapDataDetail(subjectfollowmanagementMap,SubjectfollowmanagementConstant.getFormData(),"520958674882008389",false); if("1".equals(entity.getBusinessType())){
subjectfollowmanagementMap = generaterSwapUtil.swapDataDetail(subjectfollowmanagementMap,SubjectfollowmanagementConstant.getFormData(),"520958674882008389",false);
}else if("2".equals(entity.getBusinessType())){
subjectfollowmanagementMap = generaterSwapUtil.swapDataDetail(subjectfollowmanagementMap,SubjectfollowmanagementConstant.getFormData(),"1754059458707091458",false);
}else if("3".equals(entity.getBusinessType())){
subjectfollowmanagementMap = generaterSwapUtil.swapDataDetail(subjectfollowmanagementMap,SubjectfollowmanagementConstant.getFormData(),"1754059667226914818",false);
}
return ActionResult.success(subjectfollowmanagementMap); return ActionResult.success(subjectfollowmanagementMap);
} }
/** /**

6
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/contacts/ContactsConstant.java
View File

File diff suppressed because one or more lines are too long

6
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/subjectblacklist/SubjectBlacklistConstant.java
View File

File diff suppressed because one or more lines are too long

6
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/subjectfollowmanagement/SubjectfollowmanagementConstant.java
View File

File diff suppressed because one or more lines are too long

1
jnpf-java-boot/jnpf-web/src/views/extend/customer/riskConfig/index.vue
Unescape View File

@ -300,7 +300,6 @@ export default {
this.defaultSettlementRules = res.data this.defaultSettlementRules = res.data
}) })
queryDefaultAccountPeriodRules('1').then(res => { queryDefaultAccountPeriodRules('1').then(res => {
debugger
this.defaultAccountPeriodRules = res.data.tableField102 this.defaultAccountPeriodRules = res.data.tableField102
}) })
/* CustomerList().then(res => { /* CustomerList().then(res => {

2
jnpf-java-boot/jnpf-web/src/views/extend/service/contacts/Detail.vue
Unescape View File

@ -22,7 +22,7 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item label="关联客户" <jnpf-form-tip-item label="关联服务商"
prop="subjectBasicId" > prop="subjectBasicId" >
<p>{{dataForm.subjectBasicId}}</p> <p>{{dataForm.subjectBasicId}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>

2
jnpf-java-boot/jnpf-web/src/views/extend/service/contacts/columnList.js
View File

File diff suppressed because one or more lines are too long

8
jnpf-java-boot/jnpf-web/src/views/extend/service/contacts/form.vue
Unescape View File

@ -28,9 +28,9 @@
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item <jnpf-form-tip-item
label="关联客户" prop="subjectBasicId" > label="关联服务商" prop="subjectBasicId" >
<JnpfPopupSelect v-model="dataForm.subjectBasicId" @change="changeData('subjectBasicId',-1)" <JnpfPopupSelect v-model="dataForm.subjectBasicId" @change="changeData('subjectBasicId',-1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectBasicId" placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name' field='subjectBasicId' interfaceId="520962013808039429" :pageSize="20" :columnOptions="subjectBasicIdcolumnOptions" clearable :style='{"width":"100%"}'> :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectBasicId" placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name' field='subjectBasicId' interfaceId="522417889869834885" :pageSize="20" :columnOptions="subjectBasicIdcolumnOptions" clearable :style='{"width":"100%"}'>
</JnpfPopupSelect> </JnpfPopupSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
@ -173,7 +173,7 @@
logo : [], logo : [],
contactsType : "2", contactsType : "2",
subjectBasicId : undefined, subjectBasicId : undefined,
businessType:'1', businessType:'3',
name : undefined, name : undefined,
position : undefined, position : undefined,
companyName : undefined, companyName : undefined,
@ -261,7 +261,7 @@
}, },
contactsTypeOptions:[{"fullName":"默认","id":"1"},{"fullName":"联系人","id":"2"}], contactsTypeOptions:[{"fullName":"默认","id":"1"},{"fullName":"联系人","id":"2"}],
contactsTypeProps:{"label":"fullName","value":"id" }, contactsTypeProps:{"label":"fullName","value":"id" },
subjectBasicIdcolumnOptions:[ {"label":"客户名称","value":"name"}, {"label":"客户编码","value":"code"},], subjectBasicIdcolumnOptions:[ {"label":"服务商名称","value":"name"}, {"label":"服务商编码","value":"code"},],
childIndex:-1, childIndex:-1,
isEdit:false, isEdit:false,
interfaceRes: { interfaceRes: {

4
jnpf-java-boot/jnpf-web/src/views/extend/service/contacts/index.vue
Unescape View File

@ -53,7 +53,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="name" label="姓名" align="left"> <el-table-column prop="name" label="姓名" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="subjectBasicId" label="所属客户" align="left"> <el-table-column prop="subjectBasicId" label="所属服务商" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="position" label="职务" align="left"> <el-table-column prop="position" label="职务" align="left">
</el-table-column> </el-table-column>
@ -155,7 +155,7 @@
detailVisible: false, detailVisible: false,
query: { query: {
contactsType: undefined, contactsType: undefined,
businessType: 1, businessType: 3,
name: undefined, name: undefined,
}, },
treeProps: { treeProps: {

2
jnpf-java-boot/jnpf-web/src/views/extend/service/contacts/superQueryJson.js
View File

File diff suppressed because one or more lines are too long

4
jnpf-java-boot/jnpf-web/src/views/extend/service/creditrulesConfig/index.vue
Unescape View File

@ -173,10 +173,10 @@ export default {
this.subjectcreditratingcreditRatingOptions = res.data.list this.subjectcreditratingcreditRatingOptions = res.data.list
}) })
//查询生效的信用等级规则和信用规则配置 //查询生效的信用等级规则和信用规则配置
queryDefaultCreditrating('1').then(res => { queryDefaultCreditrating('3').then(res => {
this.defaultCreditrating = res.data.subjectcreditratingList this.defaultCreditrating = res.data.subjectcreditratingList
}) })
queryDefaultCreditrules('1').then(res => { queryDefaultCreditrules('3').then(res => {
this.defaultCreditrules = res.data this.defaultCreditrules = res.data
}) })
/* CustomerList().then(res => { /* CustomerList().then(res => {

5
jnpf-java-boot/jnpf-web/src/views/extend/service/riskConfig/index.vue
Unescape View File

@ -296,11 +296,10 @@ export default {
methods: { methods: {
init() { init() {
//查询生效的结算规则和账期规则 //查询生效的结算规则和账期规则
queryDefaultSettlementRules('1').then(res => { queryDefaultSettlementRules('3').then(res => {
this.defaultSettlementRules = res.data this.defaultSettlementRules = res.data
}) })
queryDefaultAccountPeriodRules('1').then(res => { queryDefaultAccountPeriodRules('3').then(res => {
debugger
this.defaultAccountPeriodRules = res.data.tableField102 this.defaultAccountPeriodRules = res.data.tableField102
}) })
/* CustomerList().then(res => { /* CustomerList().then(res => {

4
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectaccountperiodrulesno/form.vue
Unescape View File

@ -319,7 +319,7 @@
currVmodel: "", currVmodel: "",
dataForm: { dataForm: {
businessNo: undefined, businessNo: undefined,
businessType:'1', businessType:'3',
subjectaccountperiodrulesList: [], subjectaccountperiodrulesList: [],
version: 0, version: 0,
}, },
@ -455,7 +455,7 @@
this.dataAll() this.dataAll()
}, },
getFormById() { getFormById() {
getFormById("522376064903685637").then(res => { getFormById("1754071693722546177").then(res => {
this.dataForm.flowId = res.data && res.data.flowId this.dataForm.flowId = res.data && res.data.flowId
// this.encode = res.data&&res.data.encode // this.encode = res.data&&res.data.encode
}) })

6
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectaccountperiodrulesno/index.vue
Unescape View File

@ -159,7 +159,7 @@
detailVisible: false, detailVisible: false,
query: { query: {
businessNo: undefined, businessNo: undefined,
businessType:'1', businessType:'3',
}, },
treeProps: { treeProps: {
children: 'children', children: 'children',
@ -236,7 +236,7 @@
} }
}, },
created() { created() {
getFormById("522376064903685637").then(res1 => { getFormById("1754071693722546177").then(res1 => {
let flowId = res1.data && res1.data.id let flowId = res1.data && res1.data.id
getFlowList(flowId, '1').then(res2 => { getFlowList(flowId, '1').then(res2 => {
this.flowList = res2.data this.flowList = res2.data
@ -431,7 +431,7 @@
keyword: this.keyword, keyword: this.keyword,
dataType: 0, dataType: 0,
menuId: this.menuId, menuId: this.menuId,
moduleId: '522376064903685637', moduleId: '1754071693722546177',
type: 1, type: 1,
}; };
request({ request({

2
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectbasic/columnList.js
View File

File diff suppressed because one or more lines are too long

4
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectbasic/configForm.vue
Unescape View File

@ -866,10 +866,10 @@
"value": "id" "value": "id"
}, },
reservedFields2Options: [{ reservedFields2Options: [{
"fullName": "国内客户", "fullName": "国内服务商",
"id": "1" "id": "1"
}, { }, {
"fullName": "国外客户", "fullName": "国外服务商",
"id": "2" "id": "2"
}], }],
reservedFields2Props: { reservedFields2Props: {

33
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectbasic/form.vue
Unescape View File

@ -7,12 +7,12 @@
<!-- 具体表单 --> <!-- 具体表单 -->
<el-col :span="24"> <el-col :span="24">
<jnpf-form-tip-item> <jnpf-form-tip-item>
<JnpfGroupTitle content="客户分类" contentPosition="left"> <JnpfGroupTitle content="服务商分类" contentPosition="left">
</JnpfGroupTitle> </JnpfGroupTitle>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" v-if="judgeShow('calssify')"> <el-col :span="8" v-if="judgeShow('calssify')">
<jnpf-form-tip-item label="客户分类" v-if="judgeShow('calssify')" prop="calssify"> <jnpf-form-tip-item label="服务商分类" v-if="judgeShow('calssify')" prop="calssify">
<JnpfRadio v-model="dataForm.calssify" @change="changeData('calssify',-1)" <JnpfRadio v-model="dataForm.calssify" @change="changeData('calssify',-1)"
:disabled="judgeWrite('calssify')" optionType="button" direction="horizontal" :style='{"width":"100%"}' :disabled="judgeWrite('calssify')" optionType="button" direction="horizontal" :style='{"width":"100%"}'
size="large" :options="calssifyOptions" :props="calssifyProps"> size="large" :options="calssifyOptions" :props="calssifyProps">
@ -33,7 +33,7 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" v-if="judgeShow('name')"> <el-col :span="8" v-if="judgeShow('name')">
<jnpf-form-tip-item label="客户名称" v-if="judgeShow('name')" prop="name"> <jnpf-form-tip-item label="服务商名称" v-if="judgeShow('name')" prop="name">
<JnpfInput v-model="dataForm.name" @change="changeData('name',-1)" placeholder="请输入" <JnpfInput v-model="dataForm.name" @change="changeData('name',-1)" placeholder="请输入"
:disabled="judgeWrite('name')" clearable :style='{"width":"100%"}'> :disabled="judgeWrite('name')" clearable :style='{"width":"100%"}'>
</JnpfInput> </JnpfInput>
@ -64,7 +64,7 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" v-if="judgeShow('customerStarRating')"> <el-col :span="8" v-if="judgeShow('customerStarRating')">
<jnpf-form-tip-item label="客户星级" v-if="judgeShow('customerStarRating')" prop="customerStarRating"> <jnpf-form-tip-item label="服务商星级" v-if="judgeShow('customerStarRating')" prop="customerStarRating">
<JnpfSelect v-model="dataForm.customerStarRating" @change="changeData('customerStarRating',-1)" <JnpfSelect v-model="dataForm.customerStarRating" @change="changeData('customerStarRating',-1)"
placeholder="请选择" :disabled="judgeWrite('customerStarRating')" clearable :style='{"width":"100%"}' placeholder="请选择" :disabled="judgeWrite('customerStarRating')" clearable :style='{"width":"100%"}'
:options="customerStarRatingOptions" :props="customerStarRatingProps"> :options="customerStarRatingOptions" :props="customerStarRatingProps">
@ -892,7 +892,7 @@
</JnpfGroupTitle> </JnpfGroupTitle>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" v-if="judgeShow('reservedFields1')"> <!-- <el-col :span="8" v-if="judgeShow('reservedFields1')">
<jnpf-form-tip-item label="账户类型" v-if="judgeShow('reservedFields1')" prop="reservedFields1"> <jnpf-form-tip-item label="账户类型" v-if="judgeShow('reservedFields1')" prop="reservedFields1">
<JnpfSelect v-model="dataForm.reservedFields1" @change="changeData('reservedFields1',-1)" <JnpfSelect v-model="dataForm.reservedFields1" @change="changeData('reservedFields1',-1)"
placeholder="请选择" :disabled="judgeWrite('reservedFields1')" clearable :style='{"width":"100%"}' placeholder="请选择" :disabled="judgeWrite('reservedFields1')" clearable :style='{"width":"100%"}'
@ -901,7 +901,7 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" v-if="judgeShow('reservedFields2')"> <el-col :span="8" v-if="judgeShow('reservedFields2')">
<jnpf-form-tip-item label="客户类型" v-if="judgeShow('reservedFields2')" prop="reservedFields2"> <jnpf-form-tip-item label="服务商类型" v-if="judgeShow('reservedFields2')" prop="reservedFields2">
<JnpfSelect v-model="dataForm.reservedFields2" @change="changeData('reservedFields2',-1)" <JnpfSelect v-model="dataForm.reservedFields2" @change="changeData('reservedFields2',-1)"
placeholder="请选择" :disabled="judgeWrite('reservedFields2')" clearable :style='{"width":"100%"}' placeholder="请选择" :disabled="judgeWrite('reservedFields2')" clearable :style='{"width":"100%"}'
:options="reservedFields2Options" :props="reservedFields2Props"> :options="reservedFields2Options" :props="reservedFields2Props">
@ -915,7 +915,7 @@
:options="reservedFields3Options" :props="reservedFields3Props"> :options="reservedFields3Options" :props="reservedFields3Props">
</JnpfSelect> </JnpfSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col> -->
<!-- <el-col :span="24" v-if="judgeShow('autoCreditRating')"> <!-- <el-col :span="24" v-if="judgeShow('autoCreditRating')">
<jnpf-form-tip-item label="信用级别" v-if="judgeShow('autoCreditRating')" prop="autoCreditRating"> <jnpf-form-tip-item label="信用级别" v-if="judgeShow('autoCreditRating')" prop="autoCreditRating">
<JnpfRadio v-model="dataForm.autoCreditRating" @change="changeData('autoCreditRating',-1)" <JnpfRadio v-model="dataForm.autoCreditRating" @change="changeData('autoCreditRating',-1)"
@ -1709,11 +1709,14 @@
}, ], }, ],
}, },
calssifyOptions: [{ calssifyOptions: [{
"fullName": "一级", "fullName": "物流服务商",
"id": "1" "id": "1"
}, { }, {
"fullName": "二级", "fullName": "加工服务商",
"id": "2" "id": "2"
}, {
"fullName": "其他服务商",
"id": "3"
}], }],
calssifyProps: { calssifyProps: {
"label": "fullName", "label": "fullName",
@ -1849,10 +1852,10 @@
"value": "id" "value": "id"
}, },
reservedFields2Options: [{ reservedFields2Options: [{
"fullName": "国内客户", "fullName": "国内服务商",
"id": "1" "id": "1"
}, { }, {
"fullName": "国外客户", "fullName": "国外服务商",
"id": "2" "id": "2"
}], }],
reservedFields2Props: { reservedFields2Props: {
@ -2097,7 +2100,7 @@
this.dataAll() this.dataAll()
}, },
getFormById() { getFormById() {
getFormById("517679750756434949").then(res => { getFormById("1754054458341748737").then(res => {
this.dataForm.flowId = res.data && res.data.flowId this.dataForm.flowId = res.data && res.data.flowId
// this.encode = res.data&&res.data.encode // this.encode = res.data&&res.data.encode
}) })
@ -2384,12 +2387,12 @@
return isOk; return isOk;
}, },
getDefaultSettlementRules() { getDefaultSettlementRules() {
queryDefaultSettlementRules('1').then(res => { queryDefaultSettlementRules('3').then(res => {
this.defaultSettlementRules = res.data this.defaultSettlementRules = res.data
}) })
}, },
getDefaultAccountPeriodRules() { getDefaultAccountPeriodRules() {
queryDefaultAccountPeriodRules('1').then(res => { queryDefaultAccountPeriodRules('3').then(res => {
this.defaultAccountPeriodRules = res.data.tableField102 this.defaultAccountPeriodRules = res.data.tableField102
var customerStarRating = this.dataForm.customerStarRating var customerStarRating = this.dataForm.customerStarRating
if(this.dataForm.customerStarRating == '517682428312028165'){ if(this.dataForm.customerStarRating == '517682428312028165'){
@ -2503,7 +2506,7 @@
companyName: undefined, companyName: undefined,
emaile: undefined, emaile: undefined,
address: undefined, address: undefined,
businessType:'1', businessType:'3',
annex: [], annex: [],
} }
this.getsubjectcontactsList(item) this.getsubjectcontactsList(item)

20
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectbasic/index.vue
Unescape View File

@ -4,19 +4,19 @@
<el-row class="JNPF-common-search-box" :gutter="16"> <el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent> <el-form @submit.native.prevent>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="客户分类"> <el-form-item label="服务商分类">
<JnpfSelect v-model="query.calssify" placeholder="请选择" clearable :options="calssifyOptions" <JnpfSelect v-model="query.calssify" placeholder="请选择" clearable :options="calssifyOptions"
:props="calssifyProps"> :props="calssifyProps">
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="客户名称"> <el-form-item label="服务商名称">
<el-input v-model="query.name" placeholder="请输入" clearable> </el-input> <el-input v-model="query.name" placeholder="请输入" clearable> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="客户星级"> <el-form-item label="服务商星级">
<JnpfSelect v-model="query.customerStarRating" placeholder="请选择" clearable <JnpfSelect v-model="query.customerStarRating" placeholder="请选择" clearable
:options="customerStarRatingOptions" :props="customerStarRatingProps" multiple> :options="customerStarRatingOptions" :props="customerStarRatingProps" multiple>
</JnpfSelect> </JnpfSelect>
@ -53,9 +53,9 @@
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod"> @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="name" label="客户名称" align="left"> <el-table-column prop="name" label="服务商名称" align="left">
</el-table-column> </el-table-column>
<el-table-column label="客户分类" prop="calssify" algin="left"> <el-table-column label="服务商分类" prop="calssify" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.calssify}} {{ scope.row.calssify}}
</template> </template>
@ -64,7 +64,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="industryClassify" label="行业分类" align="left"> <el-table-column prop="industryClassify" label="行业分类" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="customerStarRating" label="客户星级" align="left"> <el-table-column prop="customerStarRating" label="服务商星级" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="belongPeople" label="归属人员" align="left"> <el-table-column prop="belongPeople" label="归属人员" align="left">
</el-table-column> </el-table-column>
@ -333,10 +333,10 @@
"value": "id" "value": "id"
}, },
reservedFields2Options: [{ reservedFields2Options: [{
"fullName": "国内客户", "fullName": "国内服务商",
"id": "1" "id": "1"
}, { }, {
"fullName": "国外客户", "fullName": "国外服务商",
"id": "2" "id": "2"
}], }],
reservedFields2Props: { reservedFields2Props: {
@ -409,7 +409,7 @@
} }
}, },
created() { created() {
getFormById("517679750756434949").then(res1 => { getFormById("1754054458341748737").then(res1 => {
let flowId = res1.data && res1.data.id let flowId = res1.data && res1.data.id
getFlowList(flowId, '1').then(res2 => { getFlowList(flowId, '1').then(res2 => {
this.flowList = res2.data this.flowList = res2.data
@ -610,7 +610,7 @@
keyword: this.keyword, keyword: this.keyword,
dataType: 0, dataType: 0,
menuId: this.menuId, menuId: this.menuId,
moduleId: '517679750756434949', moduleId: '1754054458341748737',
type: 1, type: 1,
}; };
request({ request({

2
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectbasic/superQueryJson.js
View File

File diff suppressed because one or more lines are too long

2
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectblacklist/columnList.js
Unescape View File

@ -1,2 +1,2 @@
const columnList = [{"popupType":"dialog","hasPage":false,"pageSize":20,"columnOptions":[],"align":"left","templateJson":[],"__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"popupSelect","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"关联客户","trigger":"change","showLabel":true,"required":true,"tableName":"jg_subject_blacklist","renderKey":1706684394815,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-popup","tag":"JnpfPopupSelect","regList":[],"span":24},"prop":"subjectBasicId","__vModel__":"subjectBasicId","disabled":false,"id":"subjectBasicId","placeholder":"请选择","interfaceName":"查询全部客户","popupWidth":"800px","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"clearable":true,"jnpfKey":"popupSelect","fullName":"关联客户","label":"关联客户","sortable":false,"relationField":"name","popupTitle":"选择数据","width":0,"fixed":"none","style":{"width":"100%"},"interfaceHasPage":false,"interfaceId":"520962013808039429","propsValue":"id"},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"黑名单类型","label":"黑名单类型","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"1","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"黑名单类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_subject_blacklist","renderKey":1706684456400,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":24},"prop":"blacklistType","width":0,"options":[{"fullName":"违规","id":"1"},{"fullName":"违法","id":"2"}],"__vModel__":"blacklistType","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"blacklistType","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"jnpfKey":"datePicker","format":"yyyy-MM-dd","fullName":"生效开始时间","label":"生效开始时间","sortable":false,"align":"left","type":"date","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"showLabel":true,"required":true,"tableName":"jg_subject_blacklist","renderKey":1706684482292,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":103,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"生效开始时间","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":24},"readonly":false,"prop":"startTime","width":0,"__vModel__":"startTime","fixed":"none","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"startTime","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"jnpfKey":"datePicker","format":"yyyy-MM-dd","fullName":"生效结束时间","label":"生效结束时间","sortable":false,"align":"left","type":"date","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"showLabel":true,"required":true,"tableName":"jg_subject_blacklist","renderKey":1706684482754,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":104,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"生效结束时间","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":24},"readonly":false,"prop":"endTime","width":0,"__vModel__":"endTime","fixed":"none","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"endTime","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}] const columnList = [{"popupType":"dialog","hasPage":false,"pageSize":20,"columnOptions":[],"align":"left","templateJson":[],"__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"popupSelect","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"关联服务商","trigger":"change","showLabel":true,"required":true,"tableName":"jg_subject_blacklist","renderKey":1706684394815,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-popup","tag":"JnpfPopupSelect","regList":[],"span":24},"prop":"subjectBasicId","__vModel__":"subjectBasicId","disabled":false,"id":"subjectBasicId","placeholder":"请选择","interfaceName":"查询全部服务商","popupWidth":"800px","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"clearable":true,"jnpfKey":"popupSelect","fullName":"关联服务商","label":"关联服务商","sortable":false,"relationField":"name","popupTitle":"选择数据","width":0,"fixed":"none","style":{"width":"100%"},"interfaceHasPage":false,"interfaceId":"522417889869834885","propsValue":"id"},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"黑名单类型","label":"黑名单类型","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"1","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"黑名单类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_subject_blacklist","renderKey":1706684456400,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":24},"prop":"blacklistType","width":0,"options":[{"fullName":"违规","id":"1"},{"fullName":"违法","id":"2"}],"__vModel__":"blacklistType","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"blacklistType","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"jnpfKey":"datePicker","format":"yyyy-MM-dd","fullName":"生效开始时间","label":"生效开始时间","sortable":false,"align":"left","type":"date","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"showLabel":true,"required":true,"tableName":"jg_subject_blacklist","renderKey":1706684482292,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":103,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"生效开始时间","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":24},"readonly":false,"prop":"startTime","width":0,"__vModel__":"startTime","fixed":"none","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"startTime","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"jnpfKey":"datePicker","format":"yyyy-MM-dd","fullName":"生效结束时间","label":"生效结束时间","sortable":false,"align":"left","type":"date","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"showLabel":true,"required":true,"tableName":"jg_subject_blacklist","renderKey":1706684482754,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":104,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"生效结束时间","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":24},"readonly":false,"prop":"endTime","width":0,"__vModel__":"endTime","fixed":"none","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"endTime","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}]
export default columnList export default columnList

10
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectblacklist/form.vue
Unescape View File

@ -6,11 +6,11 @@
<template v-if="!loading && formOperates"> <template v-if="!loading && formOperates">
<!-- 具体表单 --> <!-- 具体表单 -->
<el-col :span="24" v-if="judgeShow('subjectBasicId')"> <el-col :span="24" v-if="judgeShow('subjectBasicId')">
<jnpf-form-tip-item label="关联客户" v-if="judgeShow('subjectBasicId')" prop="subjectBasicId"> <jnpf-form-tip-item label="关联服务商" v-if="judgeShow('subjectBasicId')" prop="subjectBasicId">
<JnpfPopupSelect v-model="dataForm.subjectBasicId" @change="changeData('subjectBasicId',-1)" <JnpfPopupSelect v-model="dataForm.subjectBasicId" @change="changeData('subjectBasicId',-1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectBasicId" placeholder="请选择" :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectBasicId" placeholder="请选择"
:disabled="judgeWrite('subjectBasicId')" propsValue="id" popupWidth="800px" popupTitle="选择数据" :disabled="judgeWrite('subjectBasicId')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' field='subjectBasicId' interfaceId="520962013808039429" popupType="dialog" relationField='name' field='subjectBasicId' interfaceId="522417889869834885"
:pageSize="20" :columnOptions="subjectBasicIdcolumnOptions" clearable :style='{"width":"100%"}'> :pageSize="20" :columnOptions="subjectBasicIdcolumnOptions" clearable :style='{"width":"100%"}'>
</JnpfPopupSelect> </JnpfPopupSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
@ -128,7 +128,7 @@
currVmodel: "", currVmodel: "",
dataForm: { dataForm: {
subjectBasicId: undefined, subjectBasicId: undefined,
businessType:'1', businessType:'3',
blacklistType: "1", blacklistType: "1",
startTime: undefined, startTime: undefined,
endTime: undefined, endTime: undefined,
@ -159,7 +159,7 @@
trigger: 'change' trigger: 'change'
}, ], }, ],
}, },
subjectBasicIdcolumnOptions:[ {"label":"客户名称","value":"name"}, {"label":"客户编码","value":"code"},], subjectBasicIdcolumnOptions:[ {"label":"服务商名称","value":"name"}, {"label":"服务商编码","value":"code"},],
blacklistTypeOptions: [{ blacklistTypeOptions: [{
"fullName": "违规", "fullName": "违规",
"id": "1" "id": "1"
@ -250,7 +250,7 @@
this.dataAll() this.dataAll()
}, },
getFormById() { getFormById() {
getFormById("522393063729932101").then(res => { getFormById("1754074470813167617").then(res => {
this.dataForm.flowId = res.data && res.data.flowId this.dataForm.flowId = res.data && res.data.flowId
// this.encode = res.data&&res.data.encode // this.encode = res.data&&res.data.encode
}) })

8
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectblacklist/index.vue
Unescape View File

@ -55,7 +55,7 @@
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod"> @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="subjectBasicId" label="关联客户" align="left"> <el-table-column prop="subjectBasicId" label="关联服务商" align="left">
</el-table-column> </el-table-column>
<el-table-column label="黑名单类型" prop="blacklistType" algin="left"> <el-table-column label="黑名单类型" prop="blacklistType" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
@ -178,7 +178,7 @@
blacklistType: undefined, blacklistType: undefined,
startTime: undefined, startTime: undefined,
endTime: undefined, endTime: undefined,
businessType:'1', businessType:'3',
}, },
treeProps: { treeProps: {
children: 'children', children: 'children',
@ -226,7 +226,7 @@
} }
}, },
created() { created() {
getFormById("522393063729932101").then(res1 => { getFormById("1754074470813167617").then(res1 => {
let flowId = res1.data && res1.data.id let flowId = res1.data && res1.data.id
getFlowList(flowId, '1').then(res2 => { getFlowList(flowId, '1').then(res2 => {
this.flowList = res2.data this.flowList = res2.data
@ -421,7 +421,7 @@
keyword: this.keyword, keyword: this.keyword,
dataType: 0, dataType: 0,
menuId: this.menuId, menuId: this.menuId,
moduleId: '522393063729932101', moduleId: '1754074470813167617',
type: 1, type: 1,
}; };
request({ request({

2
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectblacklist/superQueryJson.js
View File

File diff suppressed because one or more lines are too long

4
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectcreditratingno/form.vue
Unescape View File

@ -235,7 +235,7 @@
currVmodel: "", currVmodel: "",
dataForm: { dataForm: {
businessNo: undefined, businessNo: undefined,
businessType: "1", businessType: "3",
subjectcreditratingList: [], subjectcreditratingList: [],
version: 0, version: 0,
}, },
@ -329,7 +329,7 @@
this.dataAll() this.dataAll()
}, },
getFormById() { getFormById() {
getFormById("522005775749488005").then(res => { getFormById("1754077210465431554").then(res => {
this.dataForm.flowId = res.data && res.data.flowId this.dataForm.flowId = res.data && res.data.flowId
// this.encode = res.data&&res.data.encode // this.encode = res.data&&res.data.encode
}) })

6
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectcreditratingno/index.vue
Unescape View File

@ -164,7 +164,7 @@
detailVisible: false, detailVisible: false,
query: { query: {
businessNo: undefined, businessNo: undefined,
businessType: 1, businessType: 3,
}, },
treeProps: { treeProps: {
children: 'children', children: 'children',
@ -204,7 +204,7 @@
} }
}, },
created() { created() {
getFormById("522005775749488005").then(res1 => { getFormById("1754077210465431554").then(res1 => {
let flowId = res1.data && res1.data.id let flowId = res1.data && res1.data.id
getFlowList(flowId, '1').then(res2 => { getFlowList(flowId, '1').then(res2 => {
this.flowList = res2.data this.flowList = res2.data
@ -399,7 +399,7 @@
keyword: this.keyword, keyword: this.keyword,
dataType: 0, dataType: 0,
menuId: this.menuId, menuId: this.menuId,
moduleId: '522005775749488005', moduleId: '1754077210465431554',
type: 1, type: 1,
}; };
request({ request({

4
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectcreditrules/form.vue
Unescape View File

@ -202,7 +202,7 @@
currVmodel: "", currVmodel: "",
dataForm: { dataForm: {
businessNo: undefined, businessNo: undefined,
businessType: "1", businessType: "3",
categoryName: undefined, categoryName: undefined,
projectName: undefined, projectName: undefined,
ruleDescription: undefined, ruleDescription: undefined,
@ -317,7 +317,7 @@
this.dataAll() this.dataAll()
}, },
getFormById() { getFormById() {
getFormById("522736258103914309").then(res => { getFormById("1754078975176896514").then(res => {
this.dataForm.flowId = res.data && res.data.flowId this.dataForm.flowId = res.data && res.data.flowId
// this.encode = res.data&&res.data.encode // this.encode = res.data&&res.data.encode
}) })

6
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectcreditrules/index.vue
Unescape View File

@ -185,7 +185,7 @@
uploadBoxVisible: false, uploadBoxVisible: false,
detailVisible: false, detailVisible: false,
query: { query: {
businessType: 1, businessType: 3,
businessNo: undefined, businessNo: undefined,
categoryName: undefined, categoryName: undefined,
projectName: undefined, projectName: undefined,
@ -233,7 +233,7 @@
} }
}, },
created() { created() {
getFormById("522736258103914309").then(res1 => { getFormById("1754078975176896514").then(res1 => {
let flowId = res1.data && res1.data.id let flowId = res1.data && res1.data.id
getFlowList(flowId, '1').then(res2 => { getFlowList(flowId, '1').then(res2 => {
this.flowList = res2.data this.flowList = res2.data
@ -440,7 +440,7 @@
keyword: this.keyword, keyword: this.keyword,
dataType: 0, dataType: 0,
menuId: this.menuId, menuId: this.menuId,
moduleId: '522736258103914309', moduleId: '1754078975176896514',
type: 1, type: 1,
}; };
request({ request({

2
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectfollowmanagement/Detail.vue
Unescape View File

@ -25,7 +25,7 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item label="关联客户" <jnpf-form-tip-item label="关联服务商"
prop="subjectBasicId" > prop="subjectBasicId" >
<p>{{dataForm.subjectBasicId}}</p> <p>{{dataForm.subjectBasicId}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>

2
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectfollowmanagement/columnList.js
View File

File diff suppressed because one or more lines are too long

10
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectfollowmanagement/form.vue
Unescape View File

@ -31,11 +31,11 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" v-if="judgeShow('subjectBasicId')"> <el-col :span="24" v-if="judgeShow('subjectBasicId')">
<jnpf-form-tip-item label="关联客户" v-if="judgeShow('subjectBasicId')" prop="subjectBasicId"> <jnpf-form-tip-item label="关联服务商" v-if="judgeShow('subjectBasicId')" prop="subjectBasicId">
<JnpfPopupSelect v-model="dataForm.subjectBasicId" @change="changeData('subjectBasicId',-1)" <JnpfPopupSelect v-model="dataForm.subjectBasicId" @change="changeData('subjectBasicId',-1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectBasicId" placeholder="请选择" :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectBasicId" placeholder="请选择"
:disabled="judgeWrite('subjectBasicId')" propsValue="id" popupWidth="800px" popupTitle="选择数据" :disabled="judgeWrite('subjectBasicId')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' field='subjectBasicId' interfaceId="520962013808039429" popupType="dialog" relationField='name' field='subjectBasicId' interfaceId="522417889869834885"
:pageSize="20" :columnOptions="subjectBasicIdcolumnOptions" clearable :style='{"width":"100%"}'> :pageSize="20" :columnOptions="subjectBasicIdcolumnOptions" clearable :style='{"width":"100%"}'>
</JnpfPopupSelect> </JnpfPopupSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
@ -210,7 +210,7 @@
responsible: undefined, responsible: undefined,
partake: [], partake: [],
urgency: "4", urgency: "4",
businessType:'1', businessType:'3',
description: undefined, description: undefined,
annex: [], annex: [],
reportType: "1", reportType: "1",
@ -264,7 +264,7 @@
}, ], }, ],
}, },
subjectBasicIdcolumnOptions: [{ subjectBasicIdcolumnOptions: [{
"label": "客户名称", "label": "服务商名称",
"value": "name" "value": "name"
}, ], }, ],
urgencyOptions: [{ urgencyOptions: [{
@ -382,7 +382,7 @@
this.dataAll() this.dataAll()
}, },
getFormById() { getFormById() {
getFormById("520958674882008389").then(res => { getFormById("1754059667226914818").then(res => {
this.dataForm.flowId = res.data && res.data.flowId this.dataForm.flowId = res.data && res.data.flowId
// this.encode = res.data&&res.data.encode // this.encode = res.data&&res.data.encode
}) })

12
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectfollowmanagement/index.vue
Unescape View File

@ -48,13 +48,13 @@
@selection-change="handleSelectionChange" :span-method="arraySpanMethod"> @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="title" label="任务标题" align="left"> <el-table-column prop="title" label="任务标题" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="subjectBasicId" label="客户名称" align="left"> <el-table-column prop="subjectBasicId" label="服务商名称" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="responsible" label="负责人员" align="left"> <el-table-column prop="responsible" label="负责人员" align="left">
</el-table-column> </el-table-column>
<!-- <el-table-column prop="calssify" label="客户分类" align="left"> <!-- <el-table-column prop="calssify" label="服务商分类" align="left">
</el-table-column> --> </el-table-column> -->
<el-table-column prop="calssify" label="客户分类" align="left"> <el-table-column prop="calssify" label="服务商分类" align="left">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.calssify==1">一级</el-tag> <el-tag v-if="scope.row.calssify==1">一级</el-tag>
<el-tag v-if="scope.row.calssify==2">二级</el-tag> <el-tag v-if="scope.row.calssify==2">二级</el-tag>
@ -190,7 +190,7 @@
query: { query: {
title: undefined, title: undefined,
urgency: undefined, urgency: undefined,
businessType:'1', businessType:'3',
}, },
treeProps: { treeProps: {
children: 'children', children: 'children',
@ -256,7 +256,7 @@
} }
}, },
created() { created() {
getFormById("520958674882008389").then(res1 => { getFormById("1754059667226914818").then(res1 => {
let flowId = res1.data && res1.data.id let flowId = res1.data && res1.data.id
getFlowList(flowId, '1').then(res2 => { getFlowList(flowId, '1').then(res2 => {
this.flowList = res2.data this.flowList = res2.data
@ -451,7 +451,7 @@
keyword: this.keyword, keyword: this.keyword,
dataType: 0, dataType: 0,
menuId: this.menuId, menuId: this.menuId,
moduleId: '520958674882008389', moduleId: '1754059667226914818',
type: 1, type: 1,
}; };
request({ request({

8
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectfollowmanagement/report.vue
Unescape View File

@ -31,11 +31,11 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" v-if="judgeShow('subjectBasicId')"> <el-col :span="24" v-if="judgeShow('subjectBasicId')">
<jnpf-form-tip-item label="关联客户" v-if="judgeShow('subjectBasicId')" prop="subjectBasicId"> <jnpf-form-tip-item label="关联服务商" v-if="judgeShow('subjectBasicId')" prop="subjectBasicId">
<JnpfPopupSelect v-model="dataForm.subjectBasicId" @change="changeData('subjectBasicId',-1)" <JnpfPopupSelect v-model="dataForm.subjectBasicId" @change="changeData('subjectBasicId',-1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectBasicId" placeholder="请选择" :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectBasicId" placeholder="请选择"
:disabled="judgeWrite('subjectBasicId')" propsValue="id" popupWidth="800px" popupTitle="选择数据" :disabled="judgeWrite('subjectBasicId')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' field='subjectBasicId' interfaceId="520962013808039429" popupType="dialog" relationField='name' field='subjectBasicId' interfaceId="522417889869834885"
:pageSize="20" :columnOptions="subjectBasicIdcolumnOptions" clearable :style='{"width":"100%"}'> :pageSize="20" :columnOptions="subjectBasicIdcolumnOptions" clearable :style='{"width":"100%"}'>
</JnpfPopupSelect> </JnpfPopupSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
@ -267,7 +267,7 @@
}, ], }, ],
}, },
subjectBasicIdcolumnOptions: [{ subjectBasicIdcolumnOptions: [{
"label": "客户名称", "label": "服务商名称",
"value": "name" "value": "name"
}, ], }, ],
urgencyOptions: [{ urgencyOptions: [{
@ -385,7 +385,7 @@
this.dataAll() this.dataAll()
}, },
getFormById() { getFormById() {
getFormById("520958674882008389").then(res => { getFormById("1754059667226914818").then(res => {
this.dataForm.flowId = res.data && res.data.flowId this.dataForm.flowId = res.data && res.data.flowId
// this.encode = res.data&&res.data.encode // this.encode = res.data&&res.data.encode
}) })

2
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectfollowmanagement/superQueryJson.js
View File

File diff suppressed because one or more lines are too long

4
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectsettlementrules/form.vue
Unescape View File

@ -159,7 +159,7 @@
currVmodel: "", currVmodel: "",
dataForm: { dataForm: {
businessNo: undefined, businessNo: undefined,
businessType:'1', businessType:'3',
underpaymentAmountDown: undefined, underpaymentAmountDown: undefined,
underpaymentAmountUpper: undefined, underpaymentAmountUpper: undefined,
underpaymentRateDown: undefined, underpaymentRateDown: undefined,
@ -394,7 +394,7 @@
this.dataAll() this.dataAll()
}, },
getFormById() { getFormById() {
getFormById("522336591994168645").then(res => { getFormById("1754069327145234433").then(res => {
this.dataForm.flowId = res.data && res.data.flowId this.dataForm.flowId = res.data && res.data.flowId
// this.encode = res.data&&res.data.encode // this.encode = res.data&&res.data.encode
}) })

6
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectsettlementrules/index.vue
Unescape View File

@ -155,7 +155,7 @@
detailVisible: false, detailVisible: false,
query: { query: {
businessNo: undefined, businessNo: undefined,
businessType:'1', businessType:'3',
}, },
treeProps: { treeProps: {
children: 'children', children: 'children',
@ -189,7 +189,7 @@
} }
}, },
created() { created() {
getFormById("522336591994168645").then(res1 => { getFormById("1754069327145234433").then(res1 => {
let flowId = res1.data && res1.data.id let flowId = res1.data && res1.data.id
getFlowList(flowId, '1').then(res2 => { getFlowList(flowId, '1').then(res2 => {
this.flowList = res2.data this.flowList = res2.data
@ -384,7 +384,7 @@
keyword: this.keyword, keyword: this.keyword,
dataType: 0, dataType: 0,
menuId: this.menuId, menuId: this.menuId,
moduleId: '522336591994168645', moduleId: '1754069327145234433',
type: 1, type: 1,
}; };
request({ request({

2
jnpf-java-boot/jnpf-web/src/views/extend/supplier/contacts/Detail.vue
Unescape View File

@ -22,7 +22,7 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item label="关联客户" <jnpf-form-tip-item label="关联供应商"
prop="subjectBasicId" > prop="subjectBasicId" >
<p>{{dataForm.subjectBasicId}}</p> <p>{{dataForm.subjectBasicId}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>

2
jnpf-java-boot/jnpf-web/src/views/extend/supplier/contacts/columnList.js
View File

File diff suppressed because one or more lines are too long

8
jnpf-java-boot/jnpf-web/src/views/extend/supplier/contacts/form.vue
Unescape View File

@ -28,9 +28,9 @@
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item <jnpf-form-tip-item
label="关联客户" prop="subjectBasicId" > label="关联供应商" prop="subjectBasicId" >
<JnpfPopupSelect v-model="dataForm.subjectBasicId" @change="changeData('subjectBasicId',-1)" <JnpfPopupSelect v-model="dataForm.subjectBasicId" @change="changeData('subjectBasicId',-1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectBasicId" placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name' field='subjectBasicId' interfaceId="520962013808039429" :pageSize="20" :columnOptions="subjectBasicIdcolumnOptions" clearable :style='{"width":"100%"}'> :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectBasicId" placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name' field='subjectBasicId' interfaceId="522417703080700549" :pageSize="20" :columnOptions="subjectBasicIdcolumnOptions" clearable :style='{"width":"100%"}'>
</JnpfPopupSelect> </JnpfPopupSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
@ -173,7 +173,7 @@
logo : [], logo : [],
contactsType : "2", contactsType : "2",
subjectBasicId : undefined, subjectBasicId : undefined,
businessType:'1', businessType:'2',
name : undefined, name : undefined,
position : undefined, position : undefined,
companyName : undefined, companyName : undefined,
@ -261,7 +261,7 @@
}, },
contactsTypeOptions:[{"fullName":"默认","id":"1"},{"fullName":"联系人","id":"2"}], contactsTypeOptions:[{"fullName":"默认","id":"1"},{"fullName":"联系人","id":"2"}],
contactsTypeProps:{"label":"fullName","value":"id" }, contactsTypeProps:{"label":"fullName","value":"id" },
subjectBasicIdcolumnOptions:[ {"label":"客户名称","value":"name"}, {"label":"客户编码","value":"code"},], subjectBasicIdcolumnOptions:[ {"label":"供应商名称","value":"name"}, {"label":"供应商编码","value":"code"},],
childIndex:-1, childIndex:-1,
isEdit:false, isEdit:false,
interfaceRes: { interfaceRes: {

4
jnpf-java-boot/jnpf-web/src/views/extend/supplier/contacts/index.vue
Unescape View File

@ -53,7 +53,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="name" label="姓名" align="left"> <el-table-column prop="name" label="姓名" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="subjectBasicId" label="所属客户" align="left"> <el-table-column prop="subjectBasicId" label="所属供应商" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="position" label="职务" align="left"> <el-table-column prop="position" label="职务" align="left">
</el-table-column> </el-table-column>
@ -155,7 +155,7 @@
detailVisible: false, detailVisible: false,
query: { query: {
contactsType: undefined, contactsType: undefined,
businessType: 1, businessType: 2,
name: undefined, name: undefined,
}, },
treeProps: { treeProps: {

2
jnpf-java-boot/jnpf-web/src/views/extend/supplier/contacts/superQueryJson.js
View File

File diff suppressed because one or more lines are too long

4
jnpf-java-boot/jnpf-web/src/views/extend/supplier/creditrulesConfig/index.vue
Unescape View File

@ -173,10 +173,10 @@ export default {
this.subjectcreditratingcreditRatingOptions = res.data.list this.subjectcreditratingcreditRatingOptions = res.data.list
}) })
//查询生效的信用等级规则和信用规则配置 //查询生效的信用等级规则和信用规则配置
queryDefaultCreditrating('1').then(res => { queryDefaultCreditrating('2').then(res => {
this.defaultCreditrating = res.data.subjectcreditratingList this.defaultCreditrating = res.data.subjectcreditratingList
}) })
queryDefaultCreditrules('1').then(res => { queryDefaultCreditrules('2').then(res => {
this.defaultCreditrules = res.data this.defaultCreditrules = res.data
}) })
/* CustomerList().then(res => { /* CustomerList().then(res => {

5
jnpf-java-boot/jnpf-web/src/views/extend/supplier/riskConfig/index.vue
Unescape View File

@ -296,11 +296,10 @@ export default {
methods: { methods: {
init() { init() {
//查询生效的结算规则和账期规则 //查询生效的结算规则和账期规则
queryDefaultSettlementRules('1').then(res => { queryDefaultSettlementRules('2').then(res => {
this.defaultSettlementRules = res.data this.defaultSettlementRules = res.data
}) })
queryDefaultAccountPeriodRules('1').then(res => { queryDefaultAccountPeriodRules('2').then(res => {
debugger
this.defaultAccountPeriodRules = res.data.tableField102 this.defaultAccountPeriodRules = res.data.tableField102
}) })
/* CustomerList().then(res => { /* CustomerList().then(res => {

4
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectaccountperiodrulesno/form.vue
Unescape View File

@ -319,7 +319,7 @@
currVmodel: "", currVmodel: "",
dataForm: { dataForm: {
businessNo: undefined, businessNo: undefined,
businessType:'1', businessType:'2',
subjectaccountperiodrulesList: [], subjectaccountperiodrulesList: [],
version: 0, version: 0,
}, },
@ -455,7 +455,7 @@
this.dataAll() this.dataAll()
}, },
getFormById() { getFormById() {
getFormById("522376064903685637").then(res => { getFormById("1754071485458575362").then(res => {
this.dataForm.flowId = res.data && res.data.flowId this.dataForm.flowId = res.data && res.data.flowId
// this.encode = res.data&&res.data.encode // this.encode = res.data&&res.data.encode
}) })

6
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectaccountperiodrulesno/index.vue
Unescape View File

@ -159,7 +159,7 @@
detailVisible: false, detailVisible: false,
query: { query: {
businessNo: undefined, businessNo: undefined,
businessType:'1', businessType:'2',
}, },
treeProps: { treeProps: {
children: 'children', children: 'children',
@ -236,7 +236,7 @@
} }
}, },
created() { created() {
getFormById("522376064903685637").then(res1 => { getFormById("1754071485458575362").then(res1 => {
let flowId = res1.data && res1.data.id let flowId = res1.data && res1.data.id
getFlowList(flowId, '1').then(res2 => { getFlowList(flowId, '1').then(res2 => {
this.flowList = res2.data this.flowList = res2.data
@ -431,7 +431,7 @@
keyword: this.keyword, keyword: this.keyword,
dataType: 0, dataType: 0,
menuId: this.menuId, menuId: this.menuId,
moduleId: '522376064903685637', moduleId: '1754071485458575362',
type: 1, type: 1,
}; };
request({ request({

2
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/columnList.js
View File

File diff suppressed because one or more lines are too long

6
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/configForm.vue
Unescape View File

@ -866,10 +866,10 @@
"value": "id" "value": "id"
}, },
reservedFields2Options: [{ reservedFields2Options: [{
"fullName": "国内客户", "fullName": "国内供应商",
"id": "1" "id": "1"
}, { }, {
"fullName": "国外客户", "fullName": "国外供应商",
"id": "2" "id": "2"
}], }],
reservedFields2Props: { reservedFields2Props: {
@ -1118,7 +1118,7 @@
this.dataAll() this.dataAll()
}, },
getFormById() { getFormById() {
getFormById("517679750756434949").then(res => { getFormById("1754041598685376513").then(res => {
this.dataForm.flowId = res.data && res.data.flowId this.dataForm.flowId = res.data && res.data.flowId
// this.encode = res.data&&res.data.encode // this.encode = res.data&&res.data.encode
}) })

25
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/form.vue
Unescape View File

@ -7,12 +7,12 @@
<!-- 具体表单 --> <!-- 具体表单 -->
<el-col :span="24"> <el-col :span="24">
<jnpf-form-tip-item> <jnpf-form-tip-item>
<JnpfGroupTitle content="客户分类" contentPosition="left"> <JnpfGroupTitle content="供应商分类" contentPosition="left">
</JnpfGroupTitle> </JnpfGroupTitle>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" v-if="judgeShow('calssify')"> <el-col :span="8" v-if="judgeShow('calssify')">
<jnpf-form-tip-item label="客户分类" v-if="judgeShow('calssify')" prop="calssify"> <jnpf-form-tip-item label="供应商分类" v-if="judgeShow('calssify')" prop="calssify">
<JnpfRadio v-model="dataForm.calssify" @change="changeData('calssify',-1)" <JnpfRadio v-model="dataForm.calssify" @change="changeData('calssify',-1)"
:disabled="judgeWrite('calssify')" optionType="button" direction="horizontal" :style='{"width":"100%"}' :disabled="judgeWrite('calssify')" optionType="button" direction="horizontal" :style='{"width":"100%"}'
size="large" :options="calssifyOptions" :props="calssifyProps"> size="large" :options="calssifyOptions" :props="calssifyProps">
@ -33,7 +33,7 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" v-if="judgeShow('name')"> <el-col :span="8" v-if="judgeShow('name')">
<jnpf-form-tip-item label="客户名称" v-if="judgeShow('name')" prop="name"> <jnpf-form-tip-item label="供应商名称" v-if="judgeShow('name')" prop="name">
<JnpfInput v-model="dataForm.name" @change="changeData('name',-1)" placeholder="请输入" <JnpfInput v-model="dataForm.name" @change="changeData('name',-1)" placeholder="请输入"
:disabled="judgeWrite('name')" clearable :style='{"width":"100%"}'> :disabled="judgeWrite('name')" clearable :style='{"width":"100%"}'>
</JnpfInput> </JnpfInput>
@ -64,7 +64,7 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" v-if="judgeShow('customerStarRating')"> <el-col :span="8" v-if="judgeShow('customerStarRating')">
<jnpf-form-tip-item label="客户星级" v-if="judgeShow('customerStarRating')" prop="customerStarRating"> <jnpf-form-tip-item label="供应商星级" v-if="judgeShow('customerStarRating')" prop="customerStarRating">
<JnpfSelect v-model="dataForm.customerStarRating" @change="changeData('customerStarRating',-1)" <JnpfSelect v-model="dataForm.customerStarRating" @change="changeData('customerStarRating',-1)"
placeholder="请选择" :disabled="judgeWrite('customerStarRating')" clearable :style='{"width":"100%"}' placeholder="请选择" :disabled="judgeWrite('customerStarRating')" clearable :style='{"width":"100%"}'
:options="customerStarRatingOptions" :props="customerStarRatingProps"> :options="customerStarRatingOptions" :props="customerStarRatingProps">
@ -901,7 +901,7 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" v-if="judgeShow('reservedFields2')"> <el-col :span="8" v-if="judgeShow('reservedFields2')">
<jnpf-form-tip-item label="客户类型" v-if="judgeShow('reservedFields2')" prop="reservedFields2"> <jnpf-form-tip-item label="供应商类型" v-if="judgeShow('reservedFields2')" prop="reservedFields2">
<JnpfSelect v-model="dataForm.reservedFields2" @change="changeData('reservedFields2',-1)" <JnpfSelect v-model="dataForm.reservedFields2" @change="changeData('reservedFields2',-1)"
placeholder="请选择" :disabled="judgeWrite('reservedFields2')" clearable :style='{"width":"100%"}' placeholder="请选择" :disabled="judgeWrite('reservedFields2')" clearable :style='{"width":"100%"}'
:options="reservedFields2Options" :props="reservedFields2Props"> :options="reservedFields2Options" :props="reservedFields2Props">
@ -1714,6 +1714,9 @@
}, { }, {
"fullName": "二级", "fullName": "二级",
"id": "2" "id": "2"
}, {
"fullName": "三级",
"id": "3"
}], }],
calssifyProps: { calssifyProps: {
"label": "fullName", "label": "fullName",
@ -1849,10 +1852,10 @@
"value": "id" "value": "id"
}, },
reservedFields2Options: [{ reservedFields2Options: [{
"fullName": "国内客户", "fullName": "国内供应商",
"id": "1" "id": "1"
}, { }, {
"fullName": "国外客户", "fullName": "国外供应商",
"id": "2" "id": "2"
}], }],
reservedFields2Props: { reservedFields2Props: {
@ -2097,7 +2100,7 @@
this.dataAll() this.dataAll()
}, },
getFormById() { getFormById() {
getFormById("517679750756434949").then(res => { getFormById("1754041598685376513").then(res => {
this.dataForm.flowId = res.data && res.data.flowId this.dataForm.flowId = res.data && res.data.flowId
// this.encode = res.data&&res.data.encode // this.encode = res.data&&res.data.encode
}) })
@ -2384,12 +2387,12 @@
return isOk; return isOk;
}, },
getDefaultSettlementRules() { getDefaultSettlementRules() {
queryDefaultSettlementRules('1').then(res => { queryDefaultSettlementRules('2').then(res => {
this.defaultSettlementRules = res.data this.defaultSettlementRules = res.data
}) })
}, },
getDefaultAccountPeriodRules() { getDefaultAccountPeriodRules() {
queryDefaultAccountPeriodRules('1').then(res => { queryDefaultAccountPeriodRules('2').then(res => {
this.defaultAccountPeriodRules = res.data.tableField102 this.defaultAccountPeriodRules = res.data.tableField102
var customerStarRating = this.dataForm.customerStarRating var customerStarRating = this.dataForm.customerStarRating
if(this.dataForm.customerStarRating == '517682428312028165'){ if(this.dataForm.customerStarRating == '517682428312028165'){
@ -2503,7 +2506,7 @@
companyName: undefined, companyName: undefined,
emaile: undefined, emaile: undefined,
address: undefined, address: undefined,
businessType:'1', businessType:'2',
annex: [], annex: [],
} }
this.getsubjectcontactsList(item) this.getsubjectcontactsList(item)

20
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/index.vue
Unescape View File

@ -4,19 +4,19 @@
<el-row class="JNPF-common-search-box" :gutter="16"> <el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent> <el-form @submit.native.prevent>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="客户分类"> <el-form-item label="供应商分类">
<JnpfSelect v-model="query.calssify" placeholder="请选择" clearable :options="calssifyOptions" <JnpfSelect v-model="query.calssify" placeholder="请选择" clearable :options="calssifyOptions"
:props="calssifyProps"> :props="calssifyProps">
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="客户名称"> <el-form-item label="供应商名称">
<el-input v-model="query.name" placeholder="请输入" clearable> </el-input> <el-input v-model="query.name" placeholder="请输入" clearable> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="客户星级"> <el-form-item label="供应商星级">
<JnpfSelect v-model="query.customerStarRating" placeholder="请选择" clearable <JnpfSelect v-model="query.customerStarRating" placeholder="请选择" clearable
:options="customerStarRatingOptions" :props="customerStarRatingProps" multiple> :options="customerStarRatingOptions" :props="customerStarRatingProps" multiple>
</JnpfSelect> </JnpfSelect>
@ -53,9 +53,9 @@
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod"> @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="name" label="客户名称" align="left"> <el-table-column prop="name" label="供应商名称" align="left">
</el-table-column> </el-table-column>
<el-table-column label="客户分类" prop="calssify" algin="left"> <el-table-column label="供应商分类" prop="calssify" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.calssify}} {{ scope.row.calssify}}
</template> </template>
@ -64,7 +64,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="industryClassify" label="行业分类" align="left"> <el-table-column prop="industryClassify" label="行业分类" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="customerStarRating" label="客户星级" align="left"> <el-table-column prop="customerStarRating" label="供应商星级" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="belongPeople" label="归属人员" align="left"> <el-table-column prop="belongPeople" label="归属人员" align="left">
</el-table-column> </el-table-column>
@ -333,10 +333,10 @@
"value": "id" "value": "id"
}, },
reservedFields2Options: [{ reservedFields2Options: [{
"fullName": "国内客户", "fullName": "国内供应商",
"id": "1" "id": "1"
}, { }, {
"fullName": "国外客户", "fullName": "国外供应商",
"id": "2" "id": "2"
}], }],
reservedFields2Props: { reservedFields2Props: {
@ -409,7 +409,7 @@
} }
}, },
created() { created() {
getFormById("517679750756434949").then(res1 => { getFormById("1754041598685376513").then(res1 => {
let flowId = res1.data && res1.data.id let flowId = res1.data && res1.data.id
getFlowList(flowId, '1').then(res2 => { getFlowList(flowId, '1').then(res2 => {
this.flowList = res2.data this.flowList = res2.data
@ -610,7 +610,7 @@
keyword: this.keyword, keyword: this.keyword,
dataType: 0, dataType: 0,
menuId: this.menuId, menuId: this.menuId,
moduleId: '517679750756434949', moduleId: '1754041598685376513',
type: 1, type: 1,
}; };
request({ request({

2
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/superQueryJson.js
View File

File diff suppressed because one or more lines are too long

2
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectblacklist/columnList.js
Unescape View File

@ -1,2 +1,2 @@
const columnList = [{"popupType":"dialog","hasPage":false,"pageSize":20,"columnOptions":[],"align":"left","templateJson":[],"__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"popupSelect","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"关联客户","trigger":"change","showLabel":true,"required":true,"tableName":"jg_subject_blacklist","renderKey":1706684394815,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-popup","tag":"JnpfPopupSelect","regList":[],"span":24},"prop":"subjectBasicId","__vModel__":"subjectBasicId","disabled":false,"id":"subjectBasicId","placeholder":"请选择","interfaceName":"查询全部客户","popupWidth":"800px","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"clearable":true,"jnpfKey":"popupSelect","fullName":"关联客户","label":"关联客户","sortable":false,"relationField":"name","popupTitle":"选择数据","width":0,"fixed":"none","style":{"width":"100%"},"interfaceHasPage":false,"interfaceId":"520962013808039429","propsValue":"id"},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"黑名单类型","label":"黑名单类型","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"1","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"黑名单类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_subject_blacklist","renderKey":1706684456400,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":24},"prop":"blacklistType","width":0,"options":[{"fullName":"违规","id":"1"},{"fullName":"违法","id":"2"}],"__vModel__":"blacklistType","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"blacklistType","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"jnpfKey":"datePicker","format":"yyyy-MM-dd","fullName":"生效开始时间","label":"生效开始时间","sortable":false,"align":"left","type":"date","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"showLabel":true,"required":true,"tableName":"jg_subject_blacklist","renderKey":1706684482292,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":103,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"生效开始时间","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":24},"readonly":false,"prop":"startTime","width":0,"__vModel__":"startTime","fixed":"none","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"startTime","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"jnpfKey":"datePicker","format":"yyyy-MM-dd","fullName":"生效结束时间","label":"生效结束时间","sortable":false,"align":"left","type":"date","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"showLabel":true,"required":true,"tableName":"jg_subject_blacklist","renderKey":1706684482754,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":104,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"生效结束时间","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":24},"readonly":false,"prop":"endTime","width":0,"__vModel__":"endTime","fixed":"none","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"endTime","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}] const columnList = [{"popupType":"dialog","hasPage":false,"pageSize":20,"columnOptions":[],"align":"left","templateJson":[],"__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"popupSelect","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"关联供应商","trigger":"change","showLabel":true,"required":true,"tableName":"jg_subject_blacklist","renderKey":1706684394815,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-popup","tag":"JnpfPopupSelect","regList":[],"span":24},"prop":"subjectBasicId","__vModel__":"subjectBasicId","disabled":false,"id":"subjectBasicId","placeholder":"请选择","interfaceName":"查询全部供应商","popupWidth":"800px","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"clearable":true,"jnpfKey":"popupSelect","fullName":"关联供应商","label":"关联供应商","sortable":false,"relationField":"name","popupTitle":"选择数据","width":0,"fixed":"none","style":{"width":"100%"},"interfaceHasPage":false,"interfaceId":"522417703080700549","propsValue":"id"},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"黑名单类型","label":"黑名单类型","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"1","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"黑名单类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_subject_blacklist","renderKey":1706684456400,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":24},"prop":"blacklistType","width":0,"options":[{"fullName":"违规","id":"1"},{"fullName":"违法","id":"2"}],"__vModel__":"blacklistType","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"blacklistType","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"jnpfKey":"datePicker","format":"yyyy-MM-dd","fullName":"生效开始时间","label":"生效开始时间","sortable":false,"align":"left","type":"date","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"showLabel":true,"required":true,"tableName":"jg_subject_blacklist","renderKey":1706684482292,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":103,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"生效开始时间","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":24},"readonly":false,"prop":"startTime","width":0,"__vModel__":"startTime","fixed":"none","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"startTime","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"jnpfKey":"datePicker","format":"yyyy-MM-dd","fullName":"生效结束时间","label":"生效结束时间","sortable":false,"align":"left","type":"date","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"showLabel":true,"required":true,"tableName":"jg_subject_blacklist","renderKey":1706684482754,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":104,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"生效结束时间","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":24},"readonly":false,"prop":"endTime","width":0,"__vModel__":"endTime","fixed":"none","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"endTime","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}]
export default columnList export default columnList

10
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectblacklist/form.vue
Unescape View File

@ -6,11 +6,11 @@
<template v-if="!loading && formOperates"> <template v-if="!loading && formOperates">
<!-- 具体表单 --> <!-- 具体表单 -->
<el-col :span="24" v-if="judgeShow('subjectBasicId')"> <el-col :span="24" v-if="judgeShow('subjectBasicId')">
<jnpf-form-tip-item label="关联客户" v-if="judgeShow('subjectBasicId')" prop="subjectBasicId"> <jnpf-form-tip-item label="关联供应商" v-if="judgeShow('subjectBasicId')" prop="subjectBasicId">
<JnpfPopupSelect v-model="dataForm.subjectBasicId" @change="changeData('subjectBasicId',-1)" <JnpfPopupSelect v-model="dataForm.subjectBasicId" @change="changeData('subjectBasicId',-1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectBasicId" placeholder="请选择" :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectBasicId" placeholder="请选择"
:disabled="judgeWrite('subjectBasicId')" propsValue="id" popupWidth="800px" popupTitle="选择数据" :disabled="judgeWrite('subjectBasicId')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' field='subjectBasicId' interfaceId="520962013808039429" popupType="dialog" relationField='name' field='subjectBasicId' interfaceId="522417703080700549"
:pageSize="20" :columnOptions="subjectBasicIdcolumnOptions" clearable :style='{"width":"100%"}'> :pageSize="20" :columnOptions="subjectBasicIdcolumnOptions" clearable :style='{"width":"100%"}'>
</JnpfPopupSelect> </JnpfPopupSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
@ -128,7 +128,7 @@
currVmodel: "", currVmodel: "",
dataForm: { dataForm: {
subjectBasicId: undefined, subjectBasicId: undefined,
businessType:'1', businessType:'2',
blacklistType: "1", blacklistType: "1",
startTime: undefined, startTime: undefined,
endTime: undefined, endTime: undefined,
@ -159,7 +159,7 @@
trigger: 'change' trigger: 'change'
}, ], }, ],
}, },
subjectBasicIdcolumnOptions:[ {"label":"客户名称","value":"name"}, {"label":"客户编码","value":"code"},], subjectBasicIdcolumnOptions:[ {"label":"供应商名称","value":"name"}, {"label":"供应商编码","value":"code"},],
blacklistTypeOptions: [{ blacklistTypeOptions: [{
"fullName": "违规", "fullName": "违规",
"id": "1" "id": "1"
@ -250,7 +250,7 @@
this.dataAll() this.dataAll()
}, },
getFormById() { getFormById() {
getFormById("522393063729932101").then(res => { getFormById("1754074250054365185").then(res => {
this.dataForm.flowId = res.data && res.data.flowId this.dataForm.flowId = res.data && res.data.flowId
// this.encode = res.data&&res.data.encode // this.encode = res.data&&res.data.encode
}) })

8
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectblacklist/index.vue
Unescape View File

@ -55,7 +55,7 @@
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod"> @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="subjectBasicId" label="关联客户" align="left"> <el-table-column prop="subjectBasicId" label="关联供应商" align="left">
</el-table-column> </el-table-column>
<el-table-column label="黑名单类型" prop="blacklistType" algin="left"> <el-table-column label="黑名单类型" prop="blacklistType" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
@ -178,7 +178,7 @@
blacklistType: undefined, blacklistType: undefined,
startTime: undefined, startTime: undefined,
endTime: undefined, endTime: undefined,
businessType:'1', businessType:'2',
}, },
treeProps: { treeProps: {
children: 'children', children: 'children',
@ -226,7 +226,7 @@
} }
}, },
created() { created() {
getFormById("522393063729932101").then(res1 => { getFormById("1754074250054365185").then(res1 => {
let flowId = res1.data && res1.data.id let flowId = res1.data && res1.data.id
getFlowList(flowId, '1').then(res2 => { getFlowList(flowId, '1').then(res2 => {
this.flowList = res2.data this.flowList = res2.data
@ -421,7 +421,7 @@
keyword: this.keyword, keyword: this.keyword,
dataType: 0, dataType: 0,
menuId: this.menuId, menuId: this.menuId,
moduleId: '522393063729932101', moduleId: '1754074250054365185',
type: 1, type: 1,
}; };
request({ request({

2
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectblacklist/superQueryJson.js
View File

File diff suppressed because one or more lines are too long

4
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectcreditratingno/form.vue
Unescape View File

@ -235,7 +235,7 @@
currVmodel: "", currVmodel: "",
dataForm: { dataForm: {
businessNo: undefined, businessNo: undefined,
businessType: "1", businessType: "2",
subjectcreditratingList: [], subjectcreditratingList: [],
version: 0, version: 0,
}, },
@ -329,7 +329,7 @@
this.dataAll() this.dataAll()
}, },
getFormById() { getFormById() {
getFormById("522005775749488005").then(res => { getFormById("1754077037643329537").then(res => {
this.dataForm.flowId = res.data && res.data.flowId this.dataForm.flowId = res.data && res.data.flowId
// this.encode = res.data&&res.data.encode // this.encode = res.data&&res.data.encode
}) })

6
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectcreditratingno/index.vue
Unescape View File

@ -164,7 +164,7 @@
detailVisible: false, detailVisible: false,
query: { query: {
businessNo: undefined, businessNo: undefined,
businessType: 1, businessType: 2,
}, },
treeProps: { treeProps: {
children: 'children', children: 'children',
@ -204,7 +204,7 @@
} }
}, },
created() { created() {
getFormById("522005775749488005").then(res1 => { getFormById("1754077037643329537").then(res1 => {
let flowId = res1.data && res1.data.id let flowId = res1.data && res1.data.id
getFlowList(flowId, '1').then(res2 => { getFlowList(flowId, '1').then(res2 => {
this.flowList = res2.data this.flowList = res2.data
@ -399,7 +399,7 @@
keyword: this.keyword, keyword: this.keyword,
dataType: 0, dataType: 0,
menuId: this.menuId, menuId: this.menuId,
moduleId: '522005775749488005', moduleId: '1754077037643329537',
type: 1, type: 1,
}; };
request({ request({

4
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectcreditrules/form.vue
Unescape View File

@ -202,7 +202,7 @@
currVmodel: "", currVmodel: "",
dataForm: { dataForm: {
businessNo: undefined, businessNo: undefined,
businessType: "1", businessType: "2",
categoryName: undefined, categoryName: undefined,
projectName: undefined, projectName: undefined,
ruleDescription: undefined, ruleDescription: undefined,
@ -317,7 +317,7 @@
this.dataAll() this.dataAll()
}, },
getFormById() { getFormById() {
getFormById("522736258103914309").then(res => { getFormById("1754078807736086530").then(res => {
this.dataForm.flowId = res.data && res.data.flowId this.dataForm.flowId = res.data && res.data.flowId
// this.encode = res.data&&res.data.encode // this.encode = res.data&&res.data.encode
}) })

6
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectcreditrules/index.vue
Unescape View File

@ -185,7 +185,7 @@
uploadBoxVisible: false, uploadBoxVisible: false,
detailVisible: false, detailVisible: false,
query: { query: {
businessType: 1, businessType: 2,
businessNo: undefined, businessNo: undefined,
categoryName: undefined, categoryName: undefined,
projectName: undefined, projectName: undefined,
@ -233,7 +233,7 @@
} }
}, },
created() { created() {
getFormById("522736258103914309").then(res1 => { getFormById("1754078807736086530").then(res1 => {
let flowId = res1.data && res1.data.id let flowId = res1.data && res1.data.id
getFlowList(flowId, '1').then(res2 => { getFlowList(flowId, '1').then(res2 => {
this.flowList = res2.data this.flowList = res2.data
@ -440,7 +440,7 @@
keyword: this.keyword, keyword: this.keyword,
dataType: 0, dataType: 0,
menuId: this.menuId, menuId: this.menuId,
moduleId: '522736258103914309', moduleId: '1754078807736086530',
type: 1, type: 1,
}; };
request({ request({

2
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectfollowmanagement/Detail.vue
Unescape View File

@ -25,7 +25,7 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item label="关联客户" <jnpf-form-tip-item label="关联供应商"
prop="subjectBasicId" > prop="subjectBasicId" >
<p>{{dataForm.subjectBasicId}}</p> <p>{{dataForm.subjectBasicId}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>

2
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectfollowmanagement/columnList.js
View File

File diff suppressed because one or more lines are too long

10
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectfollowmanagement/form.vue
Unescape View File

@ -31,11 +31,11 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" v-if="judgeShow('subjectBasicId')"> <el-col :span="24" v-if="judgeShow('subjectBasicId')">
<jnpf-form-tip-item label="关联客户" v-if="judgeShow('subjectBasicId')" prop="subjectBasicId"> <jnpf-form-tip-item label="关联供应商" v-if="judgeShow('subjectBasicId')" prop="subjectBasicId">
<JnpfPopupSelect v-model="dataForm.subjectBasicId" @change="changeData('subjectBasicId',-1)" <JnpfPopupSelect v-model="dataForm.subjectBasicId" @change="changeData('subjectBasicId',-1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectBasicId" placeholder="请选择" :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectBasicId" placeholder="请选择"
:disabled="judgeWrite('subjectBasicId')" propsValue="id" popupWidth="800px" popupTitle="选择数据" :disabled="judgeWrite('subjectBasicId')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' field='subjectBasicId' interfaceId="520962013808039429" popupType="dialog" relationField='name' field='subjectBasicId' interfaceId="522417703080700549"
:pageSize="20" :columnOptions="subjectBasicIdcolumnOptions" clearable :style='{"width":"100%"}'> :pageSize="20" :columnOptions="subjectBasicIdcolumnOptions" clearable :style='{"width":"100%"}'>
</JnpfPopupSelect> </JnpfPopupSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
@ -210,7 +210,7 @@
responsible: undefined, responsible: undefined,
partake: [], partake: [],
urgency: "4", urgency: "4",
businessType:'1', businessType:'2',
description: undefined, description: undefined,
annex: [], annex: [],
reportType: "1", reportType: "1",
@ -264,7 +264,7 @@
}, ], }, ],
}, },
subjectBasicIdcolumnOptions: [{ subjectBasicIdcolumnOptions: [{
"label": "客户名称", "label": "供应商名称",
"value": "name" "value": "name"
}, ], }, ],
urgencyOptions: [{ urgencyOptions: [{
@ -382,7 +382,7 @@
this.dataAll() this.dataAll()
}, },
getFormById() { getFormById() {
getFormById("520958674882008389").then(res => { getFormById("1754059458707091458").then(res => {
this.dataForm.flowId = res.data && res.data.flowId this.dataForm.flowId = res.data && res.data.flowId
// this.encode = res.data&&res.data.encode // this.encode = res.data&&res.data.encode
}) })

12
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectfollowmanagement/index.vue
Unescape View File

@ -48,13 +48,13 @@
@selection-change="handleSelectionChange" :span-method="arraySpanMethod"> @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="title" label="任务标题" align="left"> <el-table-column prop="title" label="任务标题" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="subjectBasicId" label="客户名称" align="left"> <el-table-column prop="subjectBasicId" label="供应商名称" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="responsible" label="负责人员" align="left"> <el-table-column prop="responsible" label="负责人员" align="left">
</el-table-column> </el-table-column>
<!-- <el-table-column prop="calssify" label="客户分类" align="left"> <!-- <el-table-column prop="calssify" label="供应商分类" align="left">
</el-table-column> --> </el-table-column> -->
<el-table-column prop="calssify" label="客户分类" align="left"> <el-table-column prop="calssify" label="供应商分类" align="left">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.calssify==1">一级</el-tag> <el-tag v-if="scope.row.calssify==1">一级</el-tag>
<el-tag v-if="scope.row.calssify==2">二级</el-tag> <el-tag v-if="scope.row.calssify==2">二级</el-tag>
@ -190,7 +190,7 @@
query: { query: {
title: undefined, title: undefined,
urgency: undefined, urgency: undefined,
businessType:'1', businessType:'2',
}, },
treeProps: { treeProps: {
children: 'children', children: 'children',
@ -256,7 +256,7 @@
} }
}, },
created() { created() {
getFormById("520958674882008389").then(res1 => { getFormById("1754059458707091458").then(res1 => {
let flowId = res1.data && res1.data.id let flowId = res1.data && res1.data.id
getFlowList(flowId, '1').then(res2 => { getFlowList(flowId, '1').then(res2 => {
this.flowList = res2.data this.flowList = res2.data
@ -451,7 +451,7 @@
keyword: this.keyword, keyword: this.keyword,
dataType: 0, dataType: 0,
menuId: this.menuId, menuId: this.menuId,
moduleId: '520958674882008389', moduleId: '1754059458707091458',
type: 1, type: 1,
}; };
request({ request({

8
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectfollowmanagement/report.vue
Unescape View File

@ -31,11 +31,11 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" v-if="judgeShow('subjectBasicId')"> <el-col :span="24" v-if="judgeShow('subjectBasicId')">
<jnpf-form-tip-item label="关联客户" v-if="judgeShow('subjectBasicId')" prop="subjectBasicId"> <jnpf-form-tip-item label="关联供应商" v-if="judgeShow('subjectBasicId')" prop="subjectBasicId">
<JnpfPopupSelect v-model="dataForm.subjectBasicId" @change="changeData('subjectBasicId',-1)" <JnpfPopupSelect v-model="dataForm.subjectBasicId" @change="changeData('subjectBasicId',-1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectBasicId" placeholder="请选择" :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectBasicId" placeholder="请选择"
:disabled="judgeWrite('subjectBasicId')" propsValue="id" popupWidth="800px" popupTitle="选择数据" :disabled="judgeWrite('subjectBasicId')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' field='subjectBasicId' interfaceId="520962013808039429" popupType="dialog" relationField='name' field='subjectBasicId' interfaceId="522417703080700549"
:pageSize="20" :columnOptions="subjectBasicIdcolumnOptions" clearable :style='{"width":"100%"}'> :pageSize="20" :columnOptions="subjectBasicIdcolumnOptions" clearable :style='{"width":"100%"}'>
</JnpfPopupSelect> </JnpfPopupSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
@ -267,7 +267,7 @@
}, ], }, ],
}, },
subjectBasicIdcolumnOptions: [{ subjectBasicIdcolumnOptions: [{
"label": "客户名称", "label": "供应商名称",
"value": "name" "value": "name"
}, ], }, ],
urgencyOptions: [{ urgencyOptions: [{
@ -385,7 +385,7 @@
this.dataAll() this.dataAll()
}, },
getFormById() { getFormById() {
getFormById("520958674882008389").then(res => { getFormById("1754059458707091458").then(res => {
this.dataForm.flowId = res.data && res.data.flowId this.dataForm.flowId = res.data && res.data.flowId
// this.encode = res.data&&res.data.encode // this.encode = res.data&&res.data.encode
}) })

2
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectfollowmanagement/superQueryJson.js
View File

File diff suppressed because one or more lines are too long

4
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectsettlementrules/form.vue
Unescape View File

@ -159,7 +159,7 @@
currVmodel: "", currVmodel: "",
dataForm: { dataForm: {
businessNo: undefined, businessNo: undefined,
businessType:'1', businessType:'2',
underpaymentAmountDown: undefined, underpaymentAmountDown: undefined,
underpaymentAmountUpper: undefined, underpaymentAmountUpper: undefined,
underpaymentRateDown: undefined, underpaymentRateDown: undefined,
@ -394,7 +394,7 @@
this.dataAll() this.dataAll()
}, },
getFormById() { getFormById() {
getFormById("522336591994168645").then(res => { getFormById("1754069056075755522").then(res => {
this.dataForm.flowId = res.data && res.data.flowId this.dataForm.flowId = res.data && res.data.flowId
// this.encode = res.data&&res.data.encode // this.encode = res.data&&res.data.encode
}) })

6
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectsettlementrules/index.vue
Unescape View File

@ -155,7 +155,7 @@
detailVisible: false, detailVisible: false,
query: { query: {
businessNo: undefined, businessNo: undefined,
businessType:'1', businessType:'2',
}, },
treeProps: { treeProps: {
children: 'children', children: 'children',
@ -189,7 +189,7 @@
} }
}, },
created() { created() {
getFormById("522336591994168645").then(res1 => { getFormById("1754069056075755522").then(res1 => {
let flowId = res1.data && res1.data.id let flowId = res1.data && res1.data.id
getFlowList(flowId, '1').then(res2 => { getFlowList(flowId, '1').then(res2 => {
this.flowList = res2.data this.flowList = res2.data
@ -384,7 +384,7 @@
keyword: this.keyword, keyword: this.keyword,
dataType: 0, dataType: 0,
menuId: this.menuId, menuId: this.menuId,
moduleId: '522336591994168645', moduleId: '1754069056075755522',
type: 1, type: 1,
}; };
request({ request({

1
jnpf-java-boot/jnpf-web/src/views/workFlow/components/FlowBox.vue
Unescape View File

@ -504,7 +504,6 @@ export default {
}, },
getBeforeInfo(data) { getBeforeInfo(data) {
FlowBeforeInfo(data.id || 0, { taskNodeId: data.taskNodeId, taskOperatorId: data.taskId, flowId: data.flowId }).then(res => { FlowBeforeInfo(data.id || 0, { taskNodeId: data.taskNodeId, taskOperatorId: data.taskId, flowId: data.flowId }).then(res => {
debugger
if(res.data.flowFormInfo.urlAddress == 'extend/customer/subjectfollowmanagement/form.vue'){ if(res.data.flowFormInfo.urlAddress == 'extend/customer/subjectfollowmanagement/form.vue'){
res.data.flowFormInfo.urlAddress = 'extend/customer/subjectfollowmanagement/report.vue' res.data.flowFormInfo.urlAddress = 'extend/customer/subjectfollowmanagement/report.vue'
}else if(res.data.flowFormInfo.urlAddress == 'extend/supplier/subjectfollowmanagement/form.vue'){ }else if(res.data.flowFormInfo.urlAddress == 'extend/supplier/subjectfollowmanagement/form.vue'){

Write Preview
Loading…
Cancel
Save