Skip to content

P
precision-effect
Commit 754e7090 authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

交易项目单位-交易中心查看

parent 65591502
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 12 deletions
precision-effect-system/src/main/java/com/zehong/system/domain/TTransactionProject.java
View file @ 754e7090
......@@ -55,6 +55,9 @@ public class TTransactionProject extends BaseEntity
@Excel(name = "部门：103泽宏云研发部，104泽宏云技术部，105泽宏云销售部，200核算部，201综合管理部，202销售服务部")
private Long deptId;
@Excel(name = "单位")
private String unit;
/**部门名称*/
private String deptName;
......@@ -156,7 +159,15 @@ public class TTransactionProject extends BaseEntity
this.isDel = isDel;
}
public String getIsDel()
public String getUnit() {
return unit;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getIsDel()
{
return isDel;
}
......@@ -182,6 +193,7 @@ public class TTransactionProject extends BaseEntity
.append("priceType", getPriceType())
.append("price", getPrice())
.append("deptId", getDeptId())
.append("unit", getUnit())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())
.append("isDel", getIsDel())
......
precision-effect-system/src/main/resources/mapper/business/TTransactionProjectMapper.xml
View file @ 754e7090
......@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="priceType" column="price_type" />
<result property="price" column="price" />
<result property="deptId" column="deptId" />
<result property="unit" column="unit" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
<result property="isDel" column="is_del" />
......@@ -23,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTTransactionProjectVo">
select transaction_project_id, transaction_project_name, duty_detail_describe, work_result_style, work_result_detail, work_result_method, duty_method, price_type, price, dept_id AS deptId, create_time, update_time, is_del, remark,(SELECT dept.dept_name FROM sys_dept dept WHERE dept.dept_id = deptId)AS dept_name from t_transaction_project
select transaction_project_id, transaction_project_name, duty_detail_describe, work_result_style, work_result_detail, work_result_method, duty_method, price_type, price, dept_id AS deptId,unit, create_time, update_time, is_del, remark,(SELECT dept.dept_name FROM sys_dept dept WHERE dept.dept_id = deptId)AS dept_name from t_transaction_project
</sql>
<select id="selectTTransactionProjectList" parameterType="TTransactionProject" resultMap="TTransactionProjectResult">
......@@ -65,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="priceType != null">price_type,</if>
<if test="price != null">price,</if>
<if test="deptId != null">dept_id,</if>
<if test="unit != null">unit,</if>
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
<if test="isDel != null">is_del,</if>
......@@ -80,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="priceType != null">#{priceType},</if>
<if test="price != null">#{price},</if>
<if test="deptId != null">#{deptId},</if>
<if test="unit != null">#{unit},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="isDel != null">#{isDel},</if>
......@@ -99,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="priceType != null">price_type = #{priceType},</if>
<if test="price != null">price = #{price},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="isDel != null">is_del = #{isDel},</if>
......
precision-effect-web/src/views/trade/components/Approval.vue
View file @ 754e7090
<template>
<div>
<div class="approval">
<CommonInfo :tradeData="tradeData"/>
<div style="margin: 11px 30px;color: #1890ff;">买方经办人审核</div>
<el-row style="margin-left:97px">
......@@ -89,6 +89,34 @@
}
</script>
<style scoped>
<style scoped lang="scss">
.approval{
height: 460px;
overflow-y: auto;
&::-webkit-scrollbar {
/* 设置滚动条宽度 */
width: 4px;
/* 设置滚动条背景色 */
//background: black;
}
//滚动条轨道
&::-webkit-scrollbar-track {
background-color:transparent;
-webkit-border-radius: 2em;
-moz-border-radius: 2em;
border-radius:2em;
}
//滚动条滑块
&::-webkit-scrollbar-thumb {
background-color: rgb(147,147,153,0.5);
-webkit-border-radius: 2em;
-moz-border-radius: 2em;
border-radius:2em;
}
}
</style>
precision-effect-web/src/views/trade/components/CommonInfo.vue
View file @ 754e7090
......@@ -5,14 +5,46 @@
<el-col :span="12">
<el-form-item label="项目名称">{{transactionProjectInfo.transactionProjectName}}</el-form-item>
</el-col>
<el-col :span="12"></el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col :span="12">
<el-form-item label="卖方部门">{{tradeData.applyDeptName}}</el-form-item>
<el-form-item label="职责项明细说明">
{{transactionProjectInfo.dutyDetailDescribe?transactionProjectInfo.dutyDetailDescribe:"-"}}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工作结果的形式">
{{transactionProjectInfo.workResultStyle?transactionProjectInfo.workResultStyle:"-"}}
</el-form-item>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col :span="12">
<el-form-item label="工作结果的时量/数量标准与交付方式/地址">
{{transactionProjectInfo.workResultDetail?transactionProjectInfo.workResultDetail:"-"}}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工作结果的质量验收标准与方式">
{{transactionProjectInfo.workResultMethod?transactionProjectInfo.workResultMethod:"-"}}
</el-form-item>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col :span="12">
<el-form-item label="职责定价与支付时间和方式">
{{transactionProjectInfo.dutyMethod?transactionProjectInfo.dutyMethod:"-"}}
</el-form-item>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col :span="12">
<el-form-item label="内容说明">{{transactionProjectInfo.context}}</el-form-item>
<el-form-item label="卖方部门">{{tradeData.applyDeptName}}</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="买方部门">{{tradeData.tradeDeptName}}</el-form-item>
......@@ -58,6 +90,12 @@
<el-col :span="18">{{tradeData.tradePrice===null?"-":tradeData.tradePrice}}</el-col>
</el-row>
</el-col>
<el-col :span="5">
<el-row>
<el-col :span="6">单位</el-col>
<el-col :span="18">{{transactionProjectInfo.unit===null?"-":transactionProjectInfo.unit}}</el-col>
</el-row>
</el-col>
<el-col :span="5">
<el-row>
<el-col :span="6">总计</el-col>
......
precision-effect-web/src/views/trade/components/Confirm.vue
View file @ 754e7090
<template>
<div>
<div class="confirm">
<CommonInfo :tradeData="tradeData"/>
<div style="margin: 11px 30px;color: #1890ff;">部门长审核</div>
<el-row style="margin-left:95px">
......@@ -73,6 +73,33 @@
}
</script>
<style scoped>
<style scoped lang="scss">
.confirm{
height: 460px;
overflow-y: auto;
&::-webkit-scrollbar {
/* 设置滚动条宽度 */
width: 4px;
/* 设置滚动条背景色 */
//background: black;
}
//滚动条轨道
&::-webkit-scrollbar-track {
background-color:transparent;
-webkit-border-radius: 2em;
-moz-border-radius: 2em;
border-radius:2em;
}
//滚动条滑块
&::-webkit-scrollbar-thumb {
background-color: rgb(147,147,153,0.5);
-webkit-border-radius: 2em;
-moz-border-radius: 2em;
border-radius:2em;
}
}
</style>
precision-effect-web/src/views/trade/components/Evaluate.vue
View file @ 754e7090
<template>
<div>
<div class="evaluate">
<CommonInfo :tradeData="tradeData"/>
<div style="margin: 11px 30px;color: #1890ff;">买方审核</div>
<el-row style="margin-left:95px">
......@@ -106,6 +106,34 @@
}
</script>
<style scoped>
<style scoped lang="scss">
.evaluate{
height: 460px;
overflow-y: auto;
&::-webkit-scrollbar {
/* 设置滚动条宽度 */
width: 4px;
/* 设置滚动条背景色 */
//background: black;
}
//滚动条轨道
&::-webkit-scrollbar-track {
background-color:transparent;
-webkit-border-radius: 2em;
-moz-border-radius: 2em;
border-radius:2em;
}
//滚动条滑块
&::-webkit-scrollbar-thumb {
background-color: rgb(147,147,153,0.5);
-webkit-border-radius: 2em;
-moz-border-radius: 2em;
border-radius:2em;
}
}
</style>
precision-effect-web/src/views/trade/index.vue
View file @ 754e7090
......@@ -263,6 +263,11 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="单位">
<el-input v-model="form.unit" placeholder="请输入单位" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="总价" prop="tradeTotal">
<el-input v-model="form.tradeTotal" placeholder="请输入交易总价" :disabled="priceType == '1'"/>
......@@ -611,6 +616,7 @@ export default {
let transactionProject = this.transactionProjects.find(
(item) => item.transactionProjectId == val
);
this.form.unit = transactionProject.unit;
if (transactionProject.priceType == "1") {
this.priceType = "1";
this.form.tradePrice = transactionProject.price;
......
precision-effect-web/src/views/transaction/index.vue
View file @ 754e7090
......@@ -159,7 +159,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="定价类型" prop="priceType">
<el-select v-model="form.priceType" placeholder="请选择定价类型" @change="changePriceType($event)">
<el-select v-model="form.priceType" placeholder="请选择定价类型" @change="changePriceType($event)" style="width: 100%">
<el-option label="定价" value="1"/>
<el-option label="议价" value="2" />
</el-select>
......@@ -171,6 +171,13 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
......@@ -311,6 +318,9 @@ export default {
total: [
{ required: true, message: "总价不能为空", trigger: "blur" }
],
unit: [
{ required: true, message: "单位不能为空", trigger: "blur" }
]
},
// 部门树选项
deptOptions: [],
......@@ -357,7 +367,8 @@ export default {
count: null,
total: null,
transactor: null,
deptId: null
deptId: null,
unit: null
};
this.resetForm("form");
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment