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

'123'

This commit is contained in:
xd 2024-05-17 08:55:04 +08:00
parent 35ae29ca49
commit c30010c017
3 changed files with 189 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-system/src/main/resources/mapper/redBook/OARedBookMapper.xml
View File

@ -179,6 +179,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="quotCustomer != null and quotCustomer != ''"><!-- 客户检索 -->
and a.quotCustomer like '%${quotCustomer}%'
</if>
<if test="quotApprovalStatus != null and quotApprovalStatus != ''"><!-- 提交状态 -->
and a.quotApprovalStatus = #{quotApprovalStatus}
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
</where>

31
ruoyi-ui/src/views/redBook/productSelect.vue
View File

@ -14,14 +14,15 @@
</el-col>
</el-row>
<el-row :gutter="5" class="mt5">
<splitpanes class="default-theme" split="vertical">
<splitpanes class="default-theme mt5" split="vertical">
<pane :size="60">
<el-card id="scroll" class="box-card scrollable" :style="{'overflow': 'auto','max-height': scrollableHeight,'height': scrollableHeight}">
<el-form-item label="目录:" class="customer-form-item">
<el-col :span="6" v-for="(item, index) in modelList" :key="index" style="padding: 0px">
<el-link :underline="false" class="block" :type="selectedModelTag==item.name_0?'warning':'primary'" @click="selModelTag(item)">{{item.name_0}}</el-link>
<el-row>
<el-col :span="6" v-for="(item, index) in modelList" :key="index">
<el-link :underline="false" class="block" :style="selectedModelTag==item.name_0?'color:#ffba00;font-weight: bold;':'color:#1890ff;'" @click="selModelTag(item)">{{item.name_0}}</el-link>
</el-col>
</el-row>
</el-form-item>
<el-form-item label="备注:" v-if="showRemarkList">
<el-col :span="24">
@ -45,22 +46,22 @@
</el-form-item>
<el-form-item label="型号:" v-if="showXinghList" class="customer-form-item">
<el-col :span="6" v-for="(item, index) in xinghList" :key="index">
<el-link :underline="false" class="block" :type="selectedXinghTag==item.name_0?'warning':'primary'" plain @click="selXinghTag(item)">{{item.name_0}}</el-link>
<el-link :underline="false" class="block" :style="selectedXinghTag==item.name_0?'color:#ffba00;font-weight: bold;':'color:#1890ff;'" @click="selXinghTag(item)">{{item.name_0}}</el-link>
</el-col>
</el-form-item>
<el-form-item label="子类:" v-if="showZlList" class="customer-form-item">
<el-col :span="6" v-for="(item, index) in zlList" :key="index">
<el-link :underline="false" class="block" size="mini" :type="selectedZlTag==item.name_0?'warning':'primary'" plain @click="selZlTag(item)">{{item.name_0}}</el-link>
<el-link :underline="false" class="block" size="mini" :style="selectedZlTag==item.name_0?'color:#ffba00;font-weight: bold;':'color:#1890ff;'" @click="selZlTag(item)">{{item.name_0}}</el-link>
</el-col>
</el-form-item>
<el-form-item label="衍生型号:" v-if="showYsxhList" class="customer-form-item">
<el-col :span="6" v-for="(item, index) in ysxhList" :key="index">
<el-link :underline="false" class="block" :type="selectedYsxhTag==item.name_0?'warning':'primary'" plain @click="selYsxhTag(item)">{{item.name_0}}</el-link>
<el-link :underline="false" class="block" :style="selectedYsxhTag==item.name_0?'color:#ffba00;font-weight: bold;':'color:#1890ff;'" @click="selYsxhTag(item)">{{item.name_0}}</el-link>
</el-col>
</el-form-item>
<el-form-item label="截面:" v-if="showJmList" class="customer-form-item">
<el-col :span="3" v-for="(item, index) in jmList" :key="index">
<el-link :underline="false"class="block" :type="selectedJmTag==item.section?'warning':'primary'" plain @click="selJmTag(item)">{{item.section}}</el-link>
<el-link :underline="false"class="block" :style="selectedJmTag==item.section?'color:#ffba00;font-weight: bold;':'color:#1890ff;'" @click="selJmTag(item)">{{item.section}}</el-link>
</el-col>
</el-form-item>
<el-table width="100%" v-loading="searchResultLoading" ref="searchResultTable" :data="searchResultPagedData" @row-dblclick="handleRowDblclick">
@ -136,19 +137,20 @@
</el-row>
<el-table v-loading="selectedResultLoading" width="100%;" :height="tableHeight" :row-class-name="selectedResultIndex" style="margin-top:5px" ref="selectedResultTable" :data="selectedResultData">
<el-table-column fixed="left" label="" align="center" prop="index" width="50"/>
<el-table-column fixed="left" label="操作" align="center" width="60" class-name="small-padding fixed-width">
<el-table-column label="" align="center" prop="index" width="50"/>
<el-table-column label="操作" align="center" width="60" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button type="text" @click="handleDeleteClick(scope.$index)">删除</el-button>
</template>
</el-table-column>
<el-table-column label="版本uid" align="center" prop="uid_0" v-if="false"/>
<el-table-column fixed="left" label="产品型号" align="center" prop="name_0" width="180" />
<el-table-column label="产品型号" align="center" prop="name_0" width="200" />
<el-table-column label="型号" align="center" prop="name_1" v-if="false"/>
<el-table-column label="规格" align="center" prop="spec" v-if="false"/>
<el-table-column label="电压" align="center" prop="voltage"/>
<el-table-column label="红本价(元)" align="center" prop="price"/>
<el-table-column label="单位" align="center" prop="stu">
<el-table-column label="单位" align="center" prop="stu" />
<!--<el-table-column label="单位" align="center" prop="stu">
<template slot-scope="scope">
<el-select v-model="scope.row.stu" @change="selectTypeChange(scope.row)">
<el-option label="KM" value="KM"/>
@ -156,7 +158,7 @@
<el-option label="只" value="只"/>
</el-select>
</template>
</el-table-column>
</el-table-column>-->
<el-table-column label="一次折扣" align="center" prop="per">
<template slot-scope="scope">
<el-input v-model="scope.row.per" @blur="changeRowData" @keyup.enter.native="changeRowData"/>
@ -187,14 +189,13 @@
</el-card>
</pane>
</splitpanes>
</el-row>
</el-form>
</div>
</template>
<style>
/* 修改边框样式 */
.customer-form-item .el-form-item__content {
border: 1px solid #1682e645; /* 更改为蓝色边框 */
border: 1px solid #46a6ff63; /* 更改为蓝色边框 */
border-radius: 4px; /* 圆角 */
padding: 5px; /* 内边距 */
}

21
ruoyi-ui/src/views/redBook/quots.vue
View File

@ -65,7 +65,7 @@
<!-- 报价详情对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1050px" append-to-body>
<el-form ref="form" :model="form" label-width="100px">
<el-form ref="form" :model="form":rules="rules" label-width="100px">
<el-row :gutter="8">
<el-col :span="12">
<el-form-item label="询价单位" prop="quotCustomer">
@ -192,6 +192,21 @@
//表单
form: {quotApprovalStatus:''},
// 表单校验
rules: {
quotCustomer: [
{required: true, message: "询价单位不能为空", trigger: "blur"}
],
quotProject: [
{required: true, message: "项目名称不能为空", trigger: "blur"}
],
quotLxr: [
{required: true, message: "联系人不能为空", trigger: "blur"}
],
quotLxrdh: [
{required: true, message: "联系电话不能为空", trigger: "blur"}
],
},
// 弹出层标题
title: "",
// 是否显示弹出层
@ -351,6 +366,8 @@
// 报价单提交报价组
handleCommitClick() {
this.$refs["form"].validate(valid => {
if (valid) {
const allPrice = this.selectedResultData.reduce((sum, row) => sum + parseFloat(row.allPrice), 0);
this.form.totalPrice = allPrice.toFixed(2);
this.form.selectedResultData = this.selectedResultData;
@ -359,6 +376,8 @@
this.open = false;
this.getList();
})
}
})
},
// 报价单生成