mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix：付款单附件规则修改、修改订单流程调整

dev_1.0.2
jiangpeng 2026-04-22 18:55:30 +08:00
parent 773f400add
commit 515abca80f
4 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oms_web/oms_vue/src/views/finance/payment/components/AddForm.vue
View File

@ -56,8 +56,8 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="附件" prop="fileId"> <el-form-item label="附件" prop="fileId">
<file-upload :value="fileList" @file-list-changed="handleFileListChanged" :limit="5" <file-upload :value="fileList" @file-list-changed="handleFileListChanged" :limit="5" :file-size="10"
:file-type="['png', 'jpg', 'jpeg', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'pdf']"/> :file-type="['png', 'jpg', 'jpeg', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'pdf','zip','rar']"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

6
oms_web/oms_vue/src/views/finance/payment/components/DetailDrawer.vue
View File

@ -101,12 +101,12 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" v-if="detail.fileList == null || detail.fileList.length < 5"> <el-row :gutter="20" v-if="detail.fileList == null || detail.fileList.length < 10">
<el-col :span="24"> <el-col :span="24">
<div class="detail-item"> <div class="detail-item">
<span style="margin-right: 10px">附件补充:</span> <span style="margin-right: 10px">附件补充:</span>
<file-upload :value="fileList" @file-list-changed="handleFileListChanged" :limit="detail.fileList == null ? 5 : 5 - detail.fileList.length" <file-upload :value="fileList" @file-list-changed="handleFileListChanged" :limit="detail.fileList == null ? 10 : 10 - detail.fileList.length"
:file-type="['png', 'jpg', 'jpeg', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'pdf']"/> :file-size="10" :file-type="['png', 'jpg', 'jpeg', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'pdf', 'zip', 'rar']"/>
<el-button type="primary" size="small" style="margin-left: 10px" @click="handleSaveAttachment">保存</el-button> <el-button type="primary" size="small" style="margin-left: 10px" @click="handleSaveAttachment">保存</el-button>
</div> </div>
</el-col> </el-col>

18
ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java
View File

@ -417,4 +417,22 @@ public class ProjectOrderInfo extends BaseEntity {
} }
} }
@Getter
public enum LevelEnum {
COUNTRY_AGENT("01", "国代"),
PROVINCE_AGENT("02", "省代"),
GOLD_MEDAL("03", "金牌"),
NON_CERTIFIED("04", "非认证渠道"),
;
private final String code;
private final String value;
LevelEnum(String code, String value) {
this.code = code;
this.value = value;
}
}
} }

7
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
View File

@ -436,8 +436,10 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
if (ProjectOrderInfo.OrderStatus.WAIT_APPROVE.getCode().equals(projectOrderInfo.getOrderStatus())) { if (ProjectOrderInfo.OrderStatus.WAIT_APPROVE.getCode().equals(projectOrderInfo.getOrderStatus())) {
List<String> codeList = getPartnerCodeByProcessTemplate(projectOrderInfo); List<String> codeList = getPartnerCodeByProcessTemplate(projectOrderInfo);
List<PartnerInfo> partnerInfos = partnerInfoService.selectPartnerInfoByCode(codeList); List<PartnerInfo> partnerInfos = partnerInfoService.selectPartnerInfoByCode(codeList);
//线下合同不走省代审批 //线下合同不走省代审批，非认证渠道跳过
if (ProjectOrderInfo.ProcessTypeEnum.ONLINE.getCode().equals(projectOrderInfo.getProcessType()) && (CollUtil.isEmpty(partnerInfos) || StringUtils.isEmpty(partnerInfos.get(0).getSystemUserId()))) { if (ProjectOrderInfo.ProcessTypeEnum.ONLINE.getCode().equals(projectOrderInfo.getProcessType())
&& (CollUtil.isEmpty(partnerInfos) || StringUtils.isEmpty(partnerInfos.get(0).getSystemUserId()))
&& !ProjectOrderInfo.LevelEnum.NON_CERTIFIED.getCode().equals(projectOrderInfo.getLevel())) {
throw new ServiceException(StrUtil.format("代理商配置[{}]未指定系统用户,无法提交审批", existProjectOrderInfo.getPartnerName())); throw new ServiceException(StrUtil.format("代理商配置[{}]未指定系统用户,无法提交审批", existProjectOrderInfo.getPartnerName()));
} }
List<ProcessInstance> processInstanceList = todoService.listProcessInstance(existProjectOrderInfo.getOrderCode()); List<ProcessInstance> processInstanceList = todoService.listProcessInstance(existProjectOrderInfo.getOrderCode());
@ -463,6 +465,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
put("skipLeader",projectOrderInfo.getShipmentAmount().compareTo(amountConfigNumber)<0); put("skipLeader",projectOrderInfo.getShipmentAmount().compareTo(amountConfigNumber)<0);
put("partnerUser",partnerInfos.get(0).getSystemUserId()); put("partnerUser",partnerInfos.get(0).getSystemUserId());
put("extendField1", projectOrderInfo.getVersionCode()); put("extendField1", projectOrderInfo.getVersionCode());
put("level", projectOrderInfo.getLevel());
}}, orderFlowKey); }}, orderFlowKey);
complete(null, null, getFlowBusinessKey(existProjectOrderInfo.getOrderCode(), projectOrderInfo.getProcessType())); complete(null, null, getFlowBusinessKey(existProjectOrderInfo.getOrderCode(), projectOrderInfo.getProcessType()));
projectOrderInfo.setOrderStatus(ProjectOrderInfo.OrderStatus.WAIT_APPROVE.getCode()); projectOrderInfo.setOrderStatus(ProjectOrderInfo.OrderStatus.WAIT_APPROVE.getCode());