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 19:48:42 +08:00
parent e3d77525dd
commit 34e9047763
4 changed files with 107 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,9 +212,59 @@
<el-input v-model="localOrderData.remark" placeholder="请输入其他特别说明" :disabled="isReadonly"/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-divider content-position="left" style="margin-top: 40px">
<h3 style="font-weight: bold">技术方案会审</h3>
</el-divider>
</el-col>
<el-col :span="24">
<el-form-item label="项目简述" prop="projectDesc">
<el-input v-model="localOrderData.projectDesc" type="textarea" maxlength="500" readonly :disabled="isReadonly" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="授权" prop="softwareInfo">
<el-input v-model="localOrderData.softwareInfo" type="textarea" maxlength="500" readonly :disabled="isReadonly" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="终端" prop="hardwareInfo">
<el-input v-model="localOrderData.hardwareInfo" type="textarea" maxlength="500" readonly :disabled="isReadonly" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="其他终端、外设" prop="terminalPeripheral">
<el-input v-model="localOrderData.terminalPeripheral" type="textarea" maxlength="500" readonly :disabled="isReadonly" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="服务器" prop="serverConfiguration">
<el-input v-model="localOrderData.serverConfiguration" type="textarea" maxlength="500" readonly :disabled="isReadonly" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="管理端版本" prop="managementVersion">
<el-input v-model="localOrderData.managementVersion" readonly :disabled="isReadonly" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="桌面虚拟机OS版本" prop="desktopVmOsVersion">
<el-input v-model="localOrderData.desktopVmOsVersion" readonly :disabled="isReadonly" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="虚拟机规格、数量" prop="vmSpecQuantity">
<el-input v-model="localOrderData.vmSpecQuantity" readonly :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-input v-model="localOrderData.keyProblem" type="textarea" maxlength="500" readonly :disabled="isReadonly" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="会审结论" prop="jointTrialResult">
<el-input v-model="localOrderData.jointTrialResult" type="textarea" maxlength="500" readonly :disabled="isReadonly" />
</el-form-item>
</el-col>
</el-row>

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

@ -114,10 +114,45 @@
<td class="label-cell">其他特别说明</td>
<td class="value-cell" colspan="5">{{ displayValue(localOrderData.remark) }}</td>
</tr>
<tr>
<td class="label-cell" colspan="6">技术方案会审</td>
</tr>
<tr>
<td class="label-cell">项目简述</td>
<td class="value-cell" colspan="5">{{ displayValue(localOrderData.projectDesc) }}</td>
</tr>
<tr>
<td class="label-cell">授权</td>
<td class="value-cell" colspan="5">{{ displayValue(localOrderData.softwareInfo) }}</td>
</tr>
<tr>
<td class="label-cell">终端</td>
<td class="value-cell" colspan="5">{{ displayValue(localOrderData.hardwareInfo) }}</td>
</tr>
<tr>
<td class="label-cell">其他终端、外设</td>
<td class="value-cell" colspan="5">{{ displayValue(localOrderData.terminalPeripheral) }}</td>
</tr>
<tr>
<td class="label-cell">服务器</td>
<td class="value-cell" colspan="5">{{ displayValue(localOrderData.serverConfiguration) }}</td>
</tr>
<tr>
<td class="label-cell">管理端版本</td>
<td class="value-cell">{{ displayValue(localOrderData.managementVersion) }}</td>
<td class="label-cell">桌面虚拟机OS版本</td>
<td class="value-cell">{{ displayValue(localOrderData.desktopVmOsVersion) }}</td>
<td class="label-cell">虚拟机规格、数量</td>
<td class="value-cell">{{ displayValue(localOrderData.vmSpecQuantity) }}</td>
</tr>
<tr>
<td class="label-cell">项目风险及技术问题</td>
<td class="value-cell" colspan="5">{{ displayValue(localOrderData.keyProblem) }}</td>
</tr>
<tr>
<td class="label-cell">会审结论</td>
<td class="value-cell" colspan="5">{{ displayValue(localOrderData.jointTrialResult) }}</td>
</tr>
</tbody>
</table>
</div>

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

@ -41,7 +41,16 @@ public class ProjectOrderInfo extends BaseEntity {
private String projectCode;
@Excel(name="项目名称")
private String projectName;
private String projectDesc;
private String softwareInfo;
private String hardwareInfo;
private String terminalPeripheral;
private String serverConfiguration;
private String managementVersion;
private String desktopVmOsVersion;
private String vmSpecQuantity;
private String keyProblem;
private String jointTrialResult;
private String versionCode;
private String industryType;

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

@ -7,7 +7,16 @@ 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="projectDesc" column="project_desc" />
<result property="softwareInfo" column="software_info" />
<result property="hardwareInfo" column="hardware_info" />
<result property="terminalPeripheral" column="terminal_peripheral" />
<result property="serverConfiguration" column="server_configuration" />
<result property="managementVersion" column="management_version" />
<result property="desktopVmOsVersion" column="desktop_vm_os_version" />
<result property="vmSpecQuantity" column="vm_spec_quantity" />
<result property="keyProblem" column="key_problem" />
<result property="jointTrialResult" column="joint_trial_result" />
<result property="city" column="city" />
<result property="businessPerson" column="business_person" />
<result property="businessEmail" column="business_email" />
@ -58,7 +67,9 @@ 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.key_problem,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.project_desc,t2.software_info,t2.hardware_info,t2.terminal_peripheral,t2.server_configuration
,t2.management_version,t2.desktop_vm_os_version,t2.vm_spec_quantity,t2.key_problem,t2.joint_trial_result
,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