wilson
/
xujiecloud-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2024.12.24 UI优化

java8
yuejiayang 1 year ago
parent
20840a8f18
commit
7afa2a8137
4 changed files with 80 additions and 61 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      src/views/main-navbar.vue
  2. 110
      src/views/modules/eam/eamProjectInfo.vue
  3. 12
      src/views/modules/eam/eamProjectPartInfo.vue
  4. 2
      src/views/modules/inquiry/inquiryApplication.vue

9
src/views/main-navbar.vue
View File

@ -60,7 +60,7 @@
</el-submenu>
<el-menu-item class="site-navbar__avatar" index="4">
<el-dropdown :show-timeout="0" placement="bottom">
<span class="el-dropdown-link">
<span class="el-dropdown-link custom-avatar">
<img src="~@/assets/img/ckp.png" :alt="userName">{{ userName }}
<!-- <img src="~@/assets/img/avatar.png" :alt="userName">{{ userName }}-->
</span>
@ -488,7 +488,7 @@ export default {
}
</script>
<style lang="scss">
<style scoped lang="scss">
.icon-svg {
width: 2em;
}
@ -512,5 +512,10 @@ export default {
.aaa {
margin-bottom: 15px;
}
.custom-avatar img {
width: 105px;
height: 35px;
}
</style>

110
src/views/modules/eam/eamProjectInfo.vue
View File

@ -174,7 +174,7 @@
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
<el-dialog title="项目" :close-on-click-modal="false" @close="closeClear" v-drag :visible.sync="modalFlag" width="600px">
<el-dialog title="项目" :close-on-click-modal="false" @close="closeClear" v-drag :visible.sync="modalFlag" width="609px">
<!-- <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">-->
<!-- <el-form-item label="是否在用" prop="active" :rules="rules.activeType">-->
<!-- <el-select filterable v-model="modalData.active" style="width: 140px">-->
@ -185,7 +185,7 @@
<!-- </el-form>-->
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="BU" prop="bu" :rules="rules.bu">
<el-select v-model="modalData.bu" placeholder="请选择" :disabled="modalDisableFlag" style="width: 110px">
<el-select v-model="modalData.bu" placeholder="请选择" :disabled="modalDisableFlag" style="width: 130px">
<el-option
v-for = "i in userBuList"
:key = "i.buNo"
@ -197,17 +197,17 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="项目编码" prop="projectNo" :rules="rules.projectNo">
<el-input v-model="modalData.projectNo" :disabled="modalPartDisableFlag" style="width: 110px"></el-input>
<el-form-item label="项目编码" prop="projectNo" :rules="rules.projectNo" style="margin-left: 15px">
<el-input v-model="modalData.projectNo" :disabled="modalPartDisableFlag" style="width: 130px"></el-input>
</el-form-item>
<el-form-item label="项目名称" prop="projectDesc" v-if="!modalPartDisableFlag" :rules="rules.projectDesc">
<el-form-item label="项目名称" prop="projectDesc" v-if="!modalPartDisableFlag" :rules="rules.projectDesc" style="margin-left: 15px">
<el-input v-model="modalData.projectDesc" :disabled="modalPartDisableFlag" style="width: 170px"></el-input>
</el-form-item>
<el-form-item label="项目名称" prop="projectDesc" v-if="modalPartDisableFlag" :rules="rules.projectDesc">
<el-form-item label="项目名称" prop="projectDesc" v-if="modalPartDisableFlag" :rules="rules.projectDesc" style="margin-left: 15px">
<el-input v-model="modalData.projectDesc" :disabled="modalPartDisableFlag" style="width: 294px"></el-input>
</el-form-item>
<el-form-item label="区域" prop="cProjectRegion" v-if="!modalPartDisableFlag" :rules="rules.cProjectRegion">
<el-select v-model="modalData.cProjectRegion" placeholder="请选择" :disabled="modalPartDisableFlag" clearable style="width: 110px">
<el-form-item label="区域" prop="cProjectRegion" v-if="!modalPartDisableFlag" :rules="rules.cProjectRegion" style="margin-left: 15px">
<el-select v-model="modalData.cProjectRegion" placeholder="请选择" :disabled="modalPartDisableFlag" clearable style="width: 130px">
<el-option
v-for = "i in cProjectRegionList"
:key = "i.cProjectRegion"
@ -217,19 +217,19 @@
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 5px;">
<el-form-item prop="customerNo">
<span slot="label" style="">
<a herf="#" @click="getBaseList(509)">客户编码</a>
<a herf="#" @click="newCustomer">（新客户）</a>
</span>
<el-input v-model="modalData.customerNo" @blur="customerNoBlur" style="width: 110px"></el-input>
<el-input v-model="modalData.customerNo" @blur="customerNoBlur" style="width: 130px"></el-input>
</el-form-item>
<el-form-item label="客户名称" prop="customerDesc">
<el-input v-model="modalData.customerDesc" disabled style="width: 293px"></el-input>
<el-form-item label="客户名称" prop="customerDesc" style="margin-left: 15px">
<el-input v-model="modalData.customerDesc" disabled style="width: 329px"></el-input>
</el-form-item>
<el-form-item label="优先级" prop="priority" :rules="rules.priority">
<el-select v-model="modalData.priority" placeholder="请选择" clearable style="width: 110px">
<el-form-item label="优先级" prop="priority" :rules="rules.priority" style="margin-left: 15px">
<el-select v-model="modalData.priority" placeholder="请选择" clearable style="width: 130px">
<el-option
v-for = "i in priorityList"
:key = "i.priority"
@ -239,15 +239,15 @@
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" v-if="this.modalData.flag !== '1' && this.modalData.flag !== '2'" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form :inline="true" v-if="this.modalData.flag !== '1' && this.modalData.flag !== '2'" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 5px;">
<el-form-item label="项目料号" prop="testPartNo" :rules="rules.testPartNo" >
<el-input v-model="modalData.testPartNo" style="width: 110px"></el-input>
<el-input v-model="modalData.testPartNo" style="width: 130px"></el-input>
</el-form-item>
<el-form-item label="料号描述" prop="partDesc" :rules="rules.partDesc" >
<el-input v-model="modalData.partDesc" style="width: 293px"></el-input>
<el-form-item label="料号描述" prop="partDesc" :rules="rules.partDesc" style="margin-left: 15px">
<el-input v-model="modalData.partDesc" style="width: 329px"></el-input>
</el-form-item>
<el-form-item label="料号状态" prop="partType" :rules="rules.partType">
<el-select v-model="modalData.partType" clearable style="width: 110px">
<el-form-item label="料号状态" prop="partType" :rules="rules.partType" style="margin-left: 15px">
<el-select v-model="modalData.partType" clearable style="width: 130px">
<el-option label = "Active" value = "Active"></el-option>
<el-option label = "On hold" value = "On hold"></el-option>
<el-option label = "Cancel" value = "Cancel"></el-option>
@ -255,23 +255,23 @@
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 5px;">
<el-form-item prop="cQualityEngineer6Name" :rules="rules.cQualityEngineer6Name">
<span slot="label" style="">
<a herf="#" @click="getBaseList(2008)">IQC</a>
</span>
<el-input v-model="modalData.cQualityEngineer6Name" disabled style="width: 110px"></el-input>
<el-input v-model="modalData.cQualityEngineer6Name" disabled style="width: 130px"></el-input>
</el-form-item>
<el-form-item :label="'立项日期：'">
<el-form-item :label="'立项日期：'" style="margin-left: 15px">
<el-date-picker
style="width: 110px"
style="width: 130px"
v-model="modalData.projectCreationDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="项目分类" prop="projectCategory" :rules="rules.projectCategory">
<el-form-item label="项目分类" prop="projectCategory" :rules="rules.projectCategory" style="margin-left: 15px">
<el-select v-model="modalData.projectCategory" placeholder="请选择" clearable style="width: 170px">
<el-option
v-for = "i in projectCategoryList"
@ -281,9 +281,9 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'预计完成日期：'" :rules="rules.needDate">
<el-form-item :label="'预计完成日期：'" :rules="rules.needDate" style="margin-left: 15px">
<el-date-picker
style="width: 110px"
style="width: 130px"
v-model="modalData.needDate"
type="date"
value-format="yyyy-MM-dd"
@ -294,57 +294,61 @@
<!-- <el-input v-model="modalData.documentTypeId" style="width: 230px"></el-input>-->
<!-- </el-form-item>-->
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 5px;">
<!-- <el-form-item prop="projectManager" :rules="rules.projectManager">-->
<!-- <el-input v-model="modalData.projectManager" disabled style="width: 110px"></el-input>-->
<!-- <el-input v-model="modalData.projectManager" disabled style="width: 130px"></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="PM/Sales" prop="projectManagerName" :rules="rules.projectManagerName">
<span slot="label" style="" @click="projectManagerFlag = true "><a herf="#">PM/Sales</a></span>
<el-input v-model="modalData.projectManagerName" disabled style="width: 110px"></el-input>
<el-input v-model="modalData.projectManagerName" disabled style="width: 130px"></el-input>
</el-form-item>
<el-form-item label="PjM" prop="projectOwner" :rules="rules.projectOwner">
<el-form-item label="PjM" prop="projectOwner" :rules="rules.projectOwner" style="margin-left: 15px">
<span slot="label" style="" @click="projectOwnerFlag = true"><a herf="#">PjM</a></span>
<el-input v-model="modalData.projectOwnerName" disabled style="width: 110px"></el-input>
<el-input v-model="modalData.projectOwnerName" disabled style="width: 130px"></el-input>
</el-form-item>
<el-form-item label="IPQC-Lam/Pri/Etch/Slit" prop="cQualityEngineer1Name" :rules="rules.cQualityEngineer1Name" style="margin-left: 15px">
<span slot="label" style="" @click="engineerFlag = true"><a herf="#">IPQC-Lam/Pri/Etch/Slit</a></span>
<el-input v-model="modalData.cQualityEngineer1Name" disabled style="width: 170px"></el-input>
</el-form-item>
<el-form-item label="IPQC-Converting" prop="cQualityEngineer2Name" :rules="rules.cQualityEngineer2Name" style="margin-left: 15px">
<span slot="label" style="" @click="IPQCFlag = true"><a herf="#">IPQC-Converting</a></span>
<el-input v-model="modalData.cQualityEngineer2Name" disabled style="width: 130px"></el-input>
</el-form-item>
<!-- <el-form-item prop="cQualityEngineer2" :rules="rules.cQualityEngineer2">-->
<!-- <el-input v-model="modalData.cQualityEngineer2" disabled style="width: 130px"></el-input>-->
<!-- </el-form-item>-->
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 5px;">
<el-form-item label="FQC1" prop="cQualityEngineer3Name" :rules="rules.cQualityEngineer3Name">
<span slot="label" style="" @click="FQC1Flag = true"><a herf="#">FQC1</a></span>
<el-input v-model="modalData.cQualityEngineer3Name" disabled style="width: 78px"></el-input>
<el-input v-model="modalData.cQualityEngineer3Name" disabled style="width: 130px"></el-input>
</el-form-item>
<el-form-item prop="cQualityEngineer5Name" :rules="rules.cQualityEngineer5Name">
<el-form-item prop="cQualityEngineer5Name" :rules="rules.cQualityEngineer5Name" style="margin-left: 15px">
<span slot="label" style="">
<a herf="#" @click="getBaseList(2007)">FQC2</a>
</span>
<el-input v-model="modalData.cQualityEngineer5Name" disabled style="width: 78px"></el-input>
<el-input v-model="modalData.cQualityEngineer5Name" disabled style="width: 130px"></el-input>
</el-form-item>
<!-- <el-form-item prop="cQualityEngineer2" :rules="rules.cQualityEngineer2">-->
<!-- <el-input v-model="modalData.cQualityEngineer2" disabled style="width: 110px"></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="IPQC-Lam/Pri/Etch/Slit" prop="cQualityEngineer1Name" :rules="rules.cQualityEngineer1Name">
<span slot="label" style="" @click="engineerFlag = true"><a herf="#">IPQC-Lam/Pri/Etch/Slit</a></span>
<el-input v-model="modalData.cQualityEngineer1Name" disabled style="width: 110px"></el-input>
</el-form-item>
<el-form-item label="IPQC-Converting" prop="cQualityEngineer2Name" :rules="rules.cQualityEngineer2Name">
<span slot="label" style="" @click="IPQCFlag = true"><a herf="#">IPQC-Converting</a></span>
<el-input v-model="modalData.cQualityEngineer2Name" disabled style="width: 110px"></el-input>
</el-form-item>
<el-form-item label="Engineer" prop="engineerName" :rules="rules.engineerName">
<el-form-item label="Engineer" prop="engineerName" :rules="rules.engineerName" style="margin-left: 15px">
<span slot="label" style="" @click="engineer6Flag = true"><a herf="#">Engineer</a></span>
<el-input v-model="modalData.engineerName" disabled style="width: 110px"></el-input>
<el-input v-model="modalData.engineerName" disabled style="width: 170px"></el-input>
</el-form-item>
<el-form-item label="MFG" prop="cManufactureEngineerName" :rules="rules.cManufactureEngineerName">
<el-form-item label="MFG" prop="cManufactureEngineerName" :rules="rules.cManufactureEngineerName" style="margin-left: 15px">
<span slot="label" style="" @click="MFGlag = true"><a herf="#">MFG</a></span>
<el-input v-model="modalData.cManufactureEngineerName" disabled style="width: 79px"></el-input>
<el-input v-model="modalData.cManufactureEngineerName" disabled style="width: 130px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 5px;">
<el-form-item prop="cQualityEngineer4Name" :rules="rules.cQualityEngineer4Name">
<span slot="label" style="">
<a herf="#" @click="getBaseList(2006)">SQE</a>
</span>
<el-input v-model="modalData.cQualityEngineer4Name" disabled style="width: 79px"></el-input>
<el-input v-model="modalData.cQualityEngineer4Name" disabled style="width: 130px"></el-input>
</el-form-item>
<el-form-item label="文档工程师" prop="docEngineerName" :rules="rules.docEngineerName">
<el-form-item label="文档工程师" prop="docEngineerName" :rules="rules.docEngineerName" style="margin-left: 15px">
<span slot="label" style="" @click="docEngineerFlag = true"><a herf="#">文档工程师</a></span>
<el-input v-model="modalData.docEngineerName" disabled style="width: 110px"></el-input>
<el-input v-model="modalData.docEngineerName" disabled style="width: 130px"></el-input>
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">

12
src/views/modules/eam/eamProjectPartInfo.vue
View File

@ -173,6 +173,7 @@
@row-click="proofingClickRow"
@current-change="changeCurrentRow"
:row-class-name="tableRowClassName"
:cell-style="getCellStyle"
border
style="width: 100%;">
<el-table-column
@ -187,7 +188,7 @@
:label="item.columnLabel">
<template slot-scope="scope">
<div v-if="item.columnProp === 'partType'">
<span :style="{ color: scope.row.partType === 'Active' ? 'green' : 'Gray' , fontSize: '14px'}">
<span style="color: black">
{{ scope.row[item.columnProp] }}
</span>
</div>
@ -5278,6 +5279,15 @@ import {arrayToTreeByLevelCode} from "../../../utils/arrayToTreeByLevelCode";
}
return ''
},
getCellStyle({ row, column, rowIndex, columnIndex }) {
// 检查当前列是否是 "partType"
if (column.property === 'partType') {
return {
backgroundColor: row.partType === 'Active' ? 'rgb(141, 255, 115)' : 'rgb(188, 204, 194)',
};
}
return {};
},
}
}

2
src/views/modules/inquiry/inquiryApplication.vue
View File

@ -2083,7 +2083,7 @@ export default {
}
searchInquiryDetailInfo(tempData).then(({data}) => {
if (data.code === 0) {
this.inquiryPartDataList = data.page.list
this.inquiryPartDataList = data.page
//判断是否全部存在数据
if (this.inquiryPartDataList != null && this.inquiryPartDataList.length > 0) {
//设置选中行

Write Preview
Loading…
Cancel
Save