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

'123'

This commit is contained in:
xd 2024-06-12 09:21:45 +08:00
parent 31f55e0152
commit 52f2ef90c2
4 changed files with 43 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java
View File

@ -358,8 +358,8 @@ public class excelUtil {
response.setContentType("application/vnd.ms-excel"); response.setContentType("application/vnd.ms-excel");
BigDecimal totalmoney = BigDecimal.ZERO; BigDecimal totalmoney = BigDecimal.ZERO;
File jnlogo_file = new File("logon/"+IdUtils.createNo("jnlogo_",3)+".png"); File jnlogo_file = new File("logon/"+quot.getQuotCode()+".png");
File wc_file = new File("logon/"+IdUtils.createNo("wc_",3)+".png"); File wc_file = new File("logon/"+quot.getQuotCode()+".png");
try { try {
OutputStream os = response.getOutputStream(); OutputStream os = response.getOutputStream();
WritableWorkbook wwb = Workbook.createWorkbook(os); WritableWorkbook wwb = Workbook.createWorkbook(os);

2
ruoyi-admin/src/main/resources/application.yml
View File

@ -104,7 +104,7 @@ spring:
# token配置 # token配置
token: token:
# 是否允许账户多终端同时登录（true允许 false不允许） # 是否允许账户多终端同时登录（true允许 false不允许）
soloLogin: false soloLogin: true
# 令牌自定义标识 # 令牌自定义标识
header: Authorization header: Authorization
# 令牌密钥 # 令牌密钥

4
ruoyi-ui/src/layout/components/Navbar.vue
View File

@ -7,6 +7,7 @@
<div class="right-menu"> <div class="right-menu">
<template v-if="device!=='mobile'"> <template v-if="device!=='mobile'">
<search id="header-search" class="right-menu-item" /> <search id="header-search" class="right-menu-item" />
<!--<el-tooltip content="源码地址" effect="dark" placement="bottom"> <!--<el-tooltip content="源码地址" effect="dark" placement="bottom">
@ -41,6 +42,7 @@
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click"> <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
<div class="avatar-wrapper"> <div class="avatar-wrapper">
<img :src="avatar" class="user-avatar"> <img :src="avatar" class="user-avatar">
{{this.$store.state.user.nickName}}
<i class="el-icon-caret-bottom" /> <i class="el-icon-caret-bottom" />
</div> </div>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
@ -50,7 +52,7 @@
<el-dropdown-item @click.native="setting = true"> <el-dropdown-item @click.native="setting = true">
<span>布局设置</span> <span>布局设置</span>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="switchAccount" v-if="checkRole(['CHANGE_ACCOUNT'])"> <el-dropdown-item @click.native="switchAccount" v-if="checkRole(['ITZX'])">
<span>切换账号</span> <span>切换账号</span>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item divided @click.native="logout"> <el-dropdown-item divided @click.native="logout">

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

@ -313,45 +313,42 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div v-if="checkRole(['QUOT'])"> <el-row :gutter="8" v-if="this.form.quotApprovalStatus != '0' && this.form.quotApprovalStatus != null">
<el-row :gutter="8" v-if="this.form.quotApprovalStatus != '0' && this.form.quotApprovalStatus != null"> <el-col :span="6" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])">
<el-col :span="6"> <el-form-item label="总数量" prop="quotQuantity">
<el-form-item label="总数量" prop="quotQuantity"> <el-input v-model="form.quotQuantity" :disabled="form.quotApprovalStatus == '2' || form.quotApprovalStatus == '3'"/>
<el-input v-model="form.quotQuantity" :disabled="form.quotApprovalStatus == '2' || form.quotApprovalStatus == '3'"/> </el-form-item>
</el-form-item> </el-col>
</el-col> <el-col :span="6" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])">
<el-col :span="6"> <el-form-item label="总价" prop="quotTotalPrice">
<el-form-item label="总价" prop="quotTotalPrice"> <el-input v-model="form.quotTotalPrice" :disabled="form.quotApprovalStatus == '2' || form.quotApprovalStatus == '3'"/>
<el-input v-model="form.quotTotalPrice" :disabled="form.quotApprovalStatus == '2' || form.quotApprovalStatus == '3'"/> </el-form-item>
</el-form-item> </el-col>
</el-col> <el-col :span="6" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])">
<el-col :span="6"> <el-form-item label="是否打印" prop="quotPrint">
<el-form-item label="是否打印" prop="quotPrint"> <el-select v-model="form.quotPrint" :disabled="true">
<el-select v-model="form.quotPrint" :disabled="true"> <el-option
<el-option v-for="dict in dict.type.quot_print"
v-for="dict in dict.type.quot_print" :key="dict.value"
:key="dict.value" :label="dict.label"
:label="dict.label" :value="dict.value"
:value="dict.value" />
/> </el-select>
</el-select> </el-form-item>
</el-col>
</el-form-item> <el-col :span="6" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])">
</el-col> <el-form-item label="打印人" prop="quotPrintUserName">
<el-col :span="6"> <el-input v-model="form.quotPrintUserName" :disabled="true"/>
<el-form-item label="打印人" prop="quotPrintUserName"> </el-form-item>
<el-input v-model="form.quotPrintUserName" :disabled="true"/> </el-col>
</el-form-item> </el-row>
</el-col>
</el-row>
</div>
<el-row :gutter="8"> <el-row :gutter="8">
<el-col :span="6" v-if="checkRole(['QUOT'])"> <el-col :span="6" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])">
<el-form-item label="铜价" prop="quotTongPrice"> <el-form-item label="铜价" prop="quotTongPrice">
<el-input v-model="form.quotTongPrice" :disabled="true"/> <el-input v-model="form.quotTongPrice" :disabled="true"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" v-if="checkRole(['QUOT'])"> <el-col :span="6" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])">
<el-form-item label="铝价" prop="quotLvPrice"> <el-form-item label="铝价" prop="quotLvPrice">
<el-input v-model="form.quotLvPrice" :disabled="true"/> <el-input v-model="form.quotLvPrice" :disabled="true"/>
</el-form-item> </el-form-item>
@ -362,15 +359,15 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="8" v-if="this.form.quotApprovalStatus != '0' && this.form.quotApprovalStatus != null"> <el-row :gutter="8" v-if="checkRole(['QUOT','SALES_MAN'])">
<el-col :span="24"> <el-col :span="24" v-if="this.form.quotApprovalStatus != '0' && this.form.quotApprovalStatus != null">
<el-form-item label="反馈说明" prop="quotFeedbackExplanation"> <el-form-item label="反馈说明" prop="quotFeedbackExplanation">
<el-input type="textarea" autosize v-model="form.quotFeedbackExplanation" placeholder="报价组填写"/> <el-input type="textarea" autosize v-model="form.quotFeedbackExplanation" placeholder="报价组填写" :disabled="this.form.quotApprovalStatus == 2"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="8" v-if="this.form.quotOAApprovalStatus == '2' || this.form.quotOAApprovalStatus == '3'"> <el-row :gutter="8" v-if="checkRole(['QUOT'])">
<el-col :span="24"> <el-col :span="24" v-if="this.form.quotOAApprovalStatus == '2' || this.form.quotOAApprovalStatus == '3'">
<el-form-item label="OA审批说明" prop="quotOAApprovalStatusRemark"> <el-form-item label="OA审批说明" prop="quotOAApprovalStatusRemark">
<el-input type="textarea" autosize v-model="form.quotOAApprovalStatusRemark" :disabled="true"/> <el-input type="textarea" autosize v-model="form.quotOAApprovalStatusRemark" :disabled="true"/>
</el-form-item> </el-form-item>
@ -1547,7 +1544,7 @@ export default {
} }
}); });
this.form.quotQuantity = sums[6]; this.form.quotQuantity = sums[6];
this.form.quotTotalPrice = sums[12]; this.form.quotTotalPrice = checkRole(['QUOT_MAT_PRICE_DIFF'])? sums[12] : sums[11];
return sums; return sums;
}, },