xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'123'

This commit is contained in:
xd 2024-04-18 10:52:13 +08:00
parent 9b8b9bd7dd
commit 2793e8e2b7
4 changed files with 87 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
View File

@ -289,14 +289,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</insert>
<select id="selectQuotByQuotJsqrId" parameterType="String" resultMap="QuotResult">
<include refid="selectQuotVo"/>
where quot_jsxz_confirm_id = #{quotJsqrId}
<select id="selectQuotByQuotJsqrId" parameterType="String" resultMap="QuotQuotMaterialResult">
select a.quot_id, a.quot_code, a.quot_salesman_bm, a.quot_salesman_name, a.quot_customer_name,
a.quot_salesman_dept_id, a.quot_salesman_dept_name, a.quot_address, a.quot_phone, a.quot_inquiry_date,
a.quot_project, a.quot_quotation_date, a.quot_quotation_from, a.quot_quotation_require, a.quot_feedback_explanation,
a.quot_quantity, a.quot_total_price, a.quot_check_user_name, u2.nick_name quot_check_user_nickname, a.quot_approval_status,
a.create_by, a.create_time, a.update_by, a.update_time,
a.quot_jsxz_standard,a.quot_jsxz_approval_status,a.quot_jsxz_chapter,
a.quot_jsxz_technical_requirement,a.quot_jsxz_group_values,a.quot_jsxz_confirm_id,
q.quot_jsqr_code quot_jsxz_confirm_code,
q.quot_jsqr_tl_approval_status,q.quot_jsqr_tl_remark,
q.quot_jsqr_dy_approval_status,q.quot_jsqr_dy_remark,
q.quot_jsqr_zy_approval_status,q.quot_jsqr_zy_remark,
q.quot_jsqr_qt_approval_status,q.quot_jsqr_qt_remark,
a.quot_ht_id,a.quot_hj_approval_status,
h.quot_hj_code,h.quot_hj_pricing_date,
h.quot_hj_remark,
b.mat_id as sub_mat_id, b.mat_xingh as sub_mat_xingh, b.mat_guig as sub_mat_guig,
b.mat_diany as sub_mat_diany, b.mat_danw as sub_mat_danw, b.mat_sl as sub_mat_sl,
b.quot_id as sub_quot_id
from quot a
left join quot_material b on b.quot_id = a.quot_id
<include refid="quotJoins"/>
where a.quot_jsxz_confirm_id = #{quotJsqrId}
</select>
<select id="selectQuotByQuotHjId" parameterType="String" resultMap="QuotResult">
<include refid="selectQuotVo"/>
where quot_ht_id = #{quotHjId}
<select id="selectQuotByQuotHjId" parameterType="String" resultMap="QuotQuotMaterialResult">
select a.quot_id, a.quot_code, a.quot_salesman_bm, a.quot_salesman_name, a.quot_customer_name,
a.quot_salesman_dept_id, a.quot_salesman_dept_name, a.quot_address, a.quot_phone, a.quot_inquiry_date,
a.quot_project, a.quot_quotation_date, a.quot_quotation_from, a.quot_quotation_require, a.quot_feedback_explanation,
a.quot_quantity, a.quot_total_price, a.quot_check_user_name, u2.nick_name quot_check_user_nickname, a.quot_approval_status,
a.create_by, a.create_time, a.update_by, a.update_time,
a.quot_jsxz_standard,a.quot_jsxz_approval_status,a.quot_jsxz_chapter,
a.quot_jsxz_technical_requirement,a.quot_jsxz_group_values,a.quot_jsxz_confirm_id,
q.quot_jsqr_code quot_jsxz_confirm_code,
q.quot_jsqr_tl_approval_status,q.quot_jsqr_tl_remark,
q.quot_jsqr_dy_approval_status,q.quot_jsqr_dy_remark,
q.quot_jsqr_zy_approval_status,q.quot_jsqr_zy_remark,
q.quot_jsqr_qt_approval_status,q.quot_jsqr_qt_remark,
a.quot_ht_id,a.quot_hj_approval_status,
h.quot_hj_code,h.quot_hj_pricing_date,
h.quot_hj_remark,
b.mat_id as sub_mat_id, b.mat_xingh as sub_mat_xingh, b.mat_guig as sub_mat_guig,
b.mat_diany as sub_mat_diany, b.mat_danw as sub_mat_danw, b.mat_sl as sub_mat_sl,
b.quot_id as sub_quot_id
from quot a
left join quot_material b on b.quot_id = a.quot_id
<include refid="quotJoins"/>
where a.quot_ht_id = #{quotHjId}
</select>
</mapper>

16
ruoyi-ui/src/views/priceVerification/priceVerification/index.vue
View File

@ -87,7 +87,15 @@
<el-row :gutter="8">
<el-col :span="8">
<el-form-item label="核价日期" prop="quotHjPricingDate">
<el-input v-model="form.quotHjPricingDate" placeholder="系统自动生成" :disabled="true"/>
<div class="el-p" style="width:100%">
<el-date-picker
style="width:100%"
v-model="form.quotHjPricingDate"
type="datetime"
placeholder="系统自动生成"
:disabled="true">
</el-date-picker>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
@ -188,6 +196,10 @@
height: 550px;
max-height: 580px; /* 设置最大高度，根据需要调整 */
}
<!-- 日期空间宽度设置 -->
:deep(.el-p .el-input__wrapper){
width: 100% !important;
}
</style>
<script>
import { listPriceVerification, getPriceVerification, commitHj, rejectHj } from "@/api/priceVerification/priceVerification";
@ -298,8 +310,6 @@ export default {
const quotHjId = row.quotHjId || this.ids
getPriceVerification(quotHjId).then(response => {
this.form = response.data;
//this.form.quotHjPricingDate = parseTime(this.form.quotHjPricingDate);
this.open = true;
this.title = "核价单信息";

29
ruoyi-ui/src/views/quot/quot/index.vue
View File

@ -323,7 +323,7 @@
<el-form-item label="技术协助状态" prop="quotJsxzApprovalStatus">
<el-select v-model="form.quotJsxzApprovalStatus" :disabled="true">
<el-option
v-for="dict in dict.type.quot_approval_status"
v-for="dict in dict.type.quot_jsxz_approval_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@ -538,7 +538,14 @@
</el-col>
<el-col :span="8">
<el-form-item label="核价日期" prop="quotHjPricingDate">
<el-input v-model="form.quotHjPricingDate" :disabled="true" />
<div class="el-p" style="width:100%">
<el-date-picker
style="width:100%"
v-model="form.quotHjPricingDate"
type="datetime"
:disabled="true">
</el-date-picker>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
@ -659,8 +666,8 @@
<span v-hasPermi="['quot:quot:assist']"><el-button type="primary" plain @click="commitJsForm" v-if="this.form.quotApprovalStatus == '1'&&this.form.quotJsxzApprovalStatus == '0'">提交技术协助</el-button></span>
<span style="margin-left: 10px" v-hasPermi="['quot:quot:assistHj']"><el-button type="primary" plain @click="commitHjForm" v-if="this.form.quotApprovalStatus == '1'&&this.form.quotHjApprovalStatus == '0'">提交核价审核</el-button></span>
<span style="margin-left: 10px" v-hasPermi="['quot:quot:feedback']"><el-button type="primary" plain @click="feedbackQuotForm" v-if="this.form.quotApprovalStatus == '1'&&this.form.quotJsxzApprovalStatus != '1'">提交反馈</el-button></span>
<span style="margin-left: 10px" v-hasPermi="['quot:quot:reject']"><el-button type="danger" plain @click="rejectQuotForm" v-if="this.form.quotApprovalStatus == '1'&&this.form.quotJsxzApprovalStatus != '1'">驳回</el-button></span>
<span style="margin-left: 10px" v-hasPermi="['quot:quot:feedback']"><el-button type="primary" plain @click="feedbackQuotForm" v-if="this.form.quotApprovalStatus == '1'&&this.form.quotJsxzApprovalStatus != '1'&&this.form.quotHjApprovalStatus != '1'">提交反馈</el-button></span>
<span style="margin-left: 10px" v-hasPermi="['quot:quot:reject']"><el-button type="danger" plain @click="rejectQuotForm" v-if="this.form.quotApprovalStatus == '1'&&this.form.quotJsxzApprovalStatus != '1'&&this.form.quotHjApprovalStatus != '1'">驳回</el-button></span>
</div>
</el-dialog>
</div>
@ -894,9 +901,6 @@ export default {
const quotId = row.quotId || this.ids
getQuot(quotId).then(response => {
this.form = response.data;
//this.form.quotInquiryDate = parseTime(this.form.quotInquiryDate);
//this.form.quotQuotationDate = parseTime(this.form.quotQuotationDate);
this.$set(this.form, "quotJsxzGroup", (this.form.quotJsxzGroupValues==''||this.form.quotJsxzGroupValues==null)?[]:this.form.quotJsxzGroupValues.split(','));
this.quotMaterialList = response.data.quotMaterialList;
this.open = true;
@ -924,6 +928,7 @@ export default {
}
this.getQuotXjFileList();
this.getQuotJsgfFileList();
this.getQuotHjFileList();
this.getQuotFkFileList();
});
},
@ -1094,7 +1099,13 @@ export default {
}
});
},
//获取报价单-核价附件列表
getQuotHjFileList(){
const param = {relationId:this.form.quotHjId,fileType:'quotHjFile'}
quotFileList(param).then(response => {
this.quotHjFileList = response.rows;
});
},
//特缆、低压、中压、其他 反馈附件上传窗口
handleAddFile(group){
this.addFileOpen = true;
@ -1130,6 +1141,8 @@ export default {
this.getQuotXjFileList();
}else if(activeName=='quotJsInfo'){
this.getQuotJsgfFileList();
}else if(activeName=='quotHjInfo'){
this.getQuotHjFileList();
}else if(activeName=='quotFkFile'){
this.getQuotFkFileList();
}

2
ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue
View File

@ -584,7 +584,7 @@
</div>
<div v-if="showQt">
<el-divider content-position="center">其他协助</el-divider>
<el-divider content-position="center">其他协助(防火、轨道、架空)</el-divider>
<div style="margin-bottom: 10px;text-align:right">
<div v-if="this.form.quotJsqrQtOperateState == 0 && this.form.quotJsqrQtCheckState != 2 && this.form.quotJsqrQtLeaderState != 2">
<el-button size="mini" type="success" plain @click="doOperate('QT','operater','2')">操作人通过</el-button>