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

fix：项目风险信息项调整

dev_1.0.2
jiangpeng 2026-07-16 18:43:04 +08:00
parent 818454311f
commit e3d77525dd
7 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
oms_web/oms_vue/src/views/approve/order/index.vue
View File

@ -181,6 +181,7 @@ export default {
customerName: null,
dutyName: null,
approveNode: null,
orderStatus: '1',
orderByColumn: 't2.id',
isAsc: 'desc',
},

17
oms_web/oms_vue/src/views/project/order/OrderDetail.vue
View File

@ -1,5 +1,5 @@
<template>
<div>
<div v-loading.fullscreen.lock="submitLoading" element-loading-text="正在提交审批，请稍候...">
<!-- 添加或修改订单管理对话框 -->
<el-dialog :close-on-click-modal="false" :title="dialogTitle" :visible.sync="internalVisible" width="1400px" append-to-body @close="handleClose">
<el-form ref="form" :model="form" :rules="rules" label-width="120px" :disabled="isOrderApprovedOrInReview">
@ -224,6 +224,7 @@ export default {
selectUserVisible: false,
selectPartnerVisible: false,
selectCommitTypeVisible: false,
submitLoading: false,
// 当前激活的Tab
activeTab: 'basic',
// 表单校验
@ -445,19 +446,23 @@ export default {
this.isProjectSelected = false;
this.resetForm("form");
},
_performSubmit() {
_performSubmit(closeAfterSuccess = false) {
const action = this.isEdit ? updateOrder : addOrder;
if (closeAfterSuccess) {
this.submitLoading = true;
}
action(this.form).then(response => {
this.$modal.msgSuccess(this.isEdit ? "保存成功" : "提交成功");
if (this.isEdit) {
if (this.isEdit && !closeAfterSuccess) {
this.form.id = response.data.id;
this.isEdit = true;
this.activeTab = 'contract';
this.$emit('success');
} else {
this.handleClose();
this.$emit('success');
}
this.$emit('success');
}).finally(() => {
this.submitLoading = false;
});
},
saveDraft() {
@ -495,7 +500,7 @@ export default {
this.form.processTemplate = data.processTemplate;
this.form.processType = data.processType;
this.form.orderStatus = '1';
this._performSubmit();
this._performSubmit(true);
},
handleSelectProject() {
this.selectProjectVisible = true;

15
oms_web/oms_vue/src/views/project/order/components/OrderInfo.vue
View File

@ -1,5 +1,5 @@
<template>
<el-row>
<el-row class="order-info">
<el-col :span="16">
<el-form-item label="项目名称" prop="projectName">
<el-input v-model="localOrderData.projectName" placeholder="选择项目后带入" readonly :disabled="isReadonly">
@ -212,6 +212,11 @@
<el-input v-model="localOrderData.remark" placeholder="请输入其他特别说明" :disabled="isReadonly"/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="项目风险及技术问题" prop="keyProblem">
<el-input v-model="localOrderData.keyProblem" type="textarea" placeholder="请输入关键技术问题" maxlength="500" readonly :disabled="isReadonly" />
</el-form-item>
</el-col>
</el-row>
</template>
@ -361,6 +366,14 @@ export default {
</script>
<style scoped>
.order-info ::v-deep .el-form-item__label {
width: 150px !important;
}
.order-info ::v-deep .el-form-item__content {
margin-left: 150px !important;
}
.el-select, .el-date-picker, .el-input-number {
width: 100%;
}

6
oms_web/oms_vue/src/views/project/order/components/OrderInfoDisplay.vue
View File

@ -114,6 +114,10 @@
<td class="label-cell">其他特别说明</td>
<td class="value-cell" colspan="5">{{ displayValue(localOrderData.remark) }}</td>
</tr>
<tr>
<td class="label-cell">项目风险及技术问题</td>
<td class="value-cell" colspan="5">{{ displayValue(localOrderData.keyProblem) }}</td>
</tr>
</tbody>
</table>
</div>
@ -228,7 +232,7 @@ export default {
background-color: #f5f7fa;
font-weight: bold;
color: #606266;
width: 12%;
width: 13%;
text-align: left;
}

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

@ -41,6 +41,7 @@ public class ProjectOrderInfo extends BaseEntity {
private String projectCode;
@Excel(name="项目名称")
private String projectName;
private String keyProblem;
private String versionCode;
private String industryType;

3
ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml
View File

@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="ProjectOrderInfo" id="ProjectOrderInfoResult">
<result property="id" column="id" />
<result property="projectId" column="project_id" />
<result property="keyProblem" column="key_problem" />
<result property="city" column="city" />
<result property="businessPerson" column="business_person" />
<result property="businessEmail" column="business_email" />
@ -57,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
t1.remark, t1.order_status, t1.create_by, t1.create_time, t1.update_by, t1.update_time,t1.partner_user_name,t1.partner_email
,t1.partner_phone,t1.version_code,t1.process_type,t1.process_template,t1.discount_fold,t1.notifier_address,t1.finance_status,
t1.delivery_status,t1.sign_status,t1.outer_status,t1.approve_time,t1.payment_method,t1.payment_ratio,t1.payment_description,t1.operation_version,t1.order_stocking_status
,t2.project_code,t2.project_name,t2.province,t2.customer_name,t2.customer_code,t2.industry_type,t2.bg_property,t2.agent_code,t2.estimated_order_time
,t2.project_code,t2.project_name,t2.key_problem,t2.province,t2.customer_name,t2.customer_code,t2.industry_type,t2.bg_property,t2.agent_code,t2.estimated_order_time
,t2.customer_phone,t2.customer_user_name,t2.agent_code,t2.customer_code,t2.partner_name project_partner_name
,t3.partner_name,t3.level,t3.system_user_id,t3.address partner_address
,t4.agent_name

16
ruoyi-sip/src/main/resources/mapper/sip/ProjectProductInfoMapper.xml
View File

@ -60,20 +60,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectProjectProductInfoListByProjectId" resultType="com.ruoyi.sip.domain.ProjectProductInfo">
<include refid="selectProjectProductRelationInfoVo"/>
where project_id in
<foreach collection="list" item="item" close=")" open="(" separator=",">
#{item}
</foreach>
#{item}
</foreach>
</select>
<select id="selectProjectProductInfoListByOrderCode" resultType="com.ruoyi.sip.domain.ProjectProductInfo">
<include refid="selectProjectProductRelationInfoVo"/>
where project_id in (select project_id from project_order_info where order_code in <foreach collection="list"
item="item"
close=")" open="("
separator=",">
#{item}
</foreach>)
where project_id in (select project_id from project_order_info where order_code in
<foreach collection="list" item="item" close=")" open="(" separator=",">
#{item}
</foreach>)
</select>
<select id="countBakData" resultType="java.lang.Integer">
select count(1)