diff --git a/oms_web/oms_vue/src/views/project/order/components/OrderInfo.vue b/oms_web/oms_vue/src/views/project/order/components/OrderInfo.vue index ae38a85a..dd5f0b96 100644 --- a/oms_web/oms_vue/src/views/project/order/components/OrderInfo.vue +++ b/oms_web/oms_vue/src/views/project/order/components/OrderInfo.vue @@ -212,9 +212,59 @@ + + +

技术方案会审

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + diff --git a/oms_web/oms_vue/src/views/project/order/components/OrderInfoDisplay.vue b/oms_web/oms_vue/src/views/project/order/components/OrderInfoDisplay.vue index c6d670c9..961d7193 100644 --- a/oms_web/oms_vue/src/views/project/order/components/OrderInfoDisplay.vue +++ b/oms_web/oms_vue/src/views/project/order/components/OrderInfoDisplay.vue @@ -114,10 +114,45 @@ 其他特别说明 {{ displayValue(localOrderData.remark) }} + + 技术方案会审 + + + 项目简述 + {{ displayValue(localOrderData.projectDesc) }} + + + 授权 + {{ displayValue(localOrderData.softwareInfo) }} + + + 终端 + {{ displayValue(localOrderData.hardwareInfo) }} + + + 其他终端、外设 + {{ displayValue(localOrderData.terminalPeripheral) }} + + + 服务器 + {{ displayValue(localOrderData.serverConfiguration) }} + + + 管理端版本 + {{ displayValue(localOrderData.managementVersion) }} + 桌面虚拟机OS版本 + {{ displayValue(localOrderData.desktopVmOsVersion) }} + 虚拟机规格、数量 + {{ displayValue(localOrderData.vmSpecQuantity) }} + 项目风险及技术问题 {{ displayValue(localOrderData.keyProblem) }} + + 会审结论 + {{ displayValue(localOrderData.jointTrialResult) }} + diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java index ddc395b5..e19d4de0 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java @@ -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; diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml index 30ae8af2..0ad6f53f 100644 --- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml @@ -7,7 +7,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + @@ -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