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

Merge remote-tracking branch 'origin/master'

java8
qiezi 1 year ago
parent
72aea1127b 9919fcdbfe
commit
70a3ce1790
11 changed files with 1862 additions and 69 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. 1
      src/api/eam/eam.js
  2. 2
      src/api/oss/oss.js
  3. 18
      src/router/index.js
  4. 17
      src/views/common/login.vue
  5. 14
      src/views/modules/auth/authInquiry.vue
  6. 14
      src/views/modules/auth/authQuote.vue
  7. 101
      src/views/modules/eam/eamProjectInfo.vue
  8. 2
      src/views/modules/eam/eamProjectInfoForUploads.vue
  9. 1717
      src/views/modules/eam/eamWorkOrderForApprove.vue
  10. 19
      src/views/modules/inquiry/inquiryApplication.vue
  11. 2
      src/views/modules/oss/ossComponents.vue

1
src/api/eam/eam.js
View File

@ -139,6 +139,7 @@ export const saveOrderReportForDefect= data => createAPI(`/pms/eam/saveOrderRepo
export const checkWorkOrder= data => createAPI(`/pms/eam/checkWorkOrder`,'post',data)
export const selectNameByMes= data => createAPI(`/pms/eam/selectNameByMes`,'post',data)
export const submitDefect= data => createAPI(`/pms/eam/submitDefect`,'post',data)
export const submitDefects= data => createAPI(`/pms/eam/submitDefects`,'post',data)
export const eamWorkPlanOverviewSearch= data => createAPI(`/pms/eam/eamWorkPlanOverviewSearch`,'post',data)
export const getPlanDetailList= data => createAPI(`/pms/eam/getPlanDetailList`,'post',data)
export const delPlanDetail= data => createAPI(`/pms/eam/delPlanDetail`,'post',data)

2
src/api/oss/oss.js
View File

@ -18,3 +18,5 @@ export const queryOss = (data) => createAPI(`/oss`,'post',data)
export const removeOss = (data) => createAPI(`/oss/remove`,'post',data)
export const previewOssFileById = (data) => createAPI(`/oss/${data.id}`,'post',777)
export const previewOssFileById2 = (data) => createAPI(`/oss/2/${data.id}`,'post',777)

18
src/router/index.js
View File

@ -61,15 +61,6 @@ const router = new Router({
router.beforeEach((to, from, next) => {console.log(Vue.prototype.$store)
// const token = localStorage.getItem('token');
// const isLogin = to.name === 'login'; // 判断是否是登录页
//
// // 保存原始路径（仅在未登录状态下保存）
// if (!token && !isLogin) {
// console.log('保存重定向路径：', to.fullPath);
// localStorage.setItem('redirectPath', to.fullPath);
// }
// 添加动态(菜单)路由
// 1. 已经添加 or 全局路由, 直接访问
// 2. 获取菜单列表, 添加并保存本地存储
@ -102,6 +93,15 @@ router.beforeEach((to, from, next) => {console.log(Vue.prototype.$store)
router.push({ name: 'login' })
})
}
const token = localStorage.getItem('token');
const isLogin = to.name === 'login'; // 判断是否是登录页
// 保存原始路径（仅在未登录状态下保存）
if (!token && !isLogin) {
console.log('保存重定向路径：', to.fullPath);
localStorage.setItem('redirectPath', to.fullPath);
}
})
/**

17
src/views/common/login.vue
View File

@ -105,13 +105,20 @@ import { getUUID } from '@/utils'
})
}).then(({data}) => {
if (data && data.code === 0) {
// console.log('跳转前路径:', localStorage.getItem('redirectPath')); // 检查路径是否正确
console.log('跳转前路径:', localStorage.getItem('redirectPath')); // 检查路径是否正确
this.$cookie.set('token', data.token)
// 动态跳转逻辑
// const redirectPath = localStorage.getItem('redirectPath') || '/home';
// console.log('Redirecting to:', redirectPath); // 调试输出
// this.$router.replace(redirectPath); // 根据保存的路径跳转
this.$router.replace({name: 'home'})
const redirectPath = localStorage.getItem('redirectPath') || '';
// 设置需要判断的路径
const pathsToRedirect = ['/auth-authQuote', '/auth-authInquiry'];
if (pathsToRedirect.some(path => redirectPath.indexOf(path) !== -1)) {
this.$router.replace(redirectPath);
} else {
this.$router.replace({ name: 'home' });
}
console.log('Redirecting to:', redirectPath); // 调试输出
this.$i18n.locale=data.language
localStorage.setItem('locale', data.language)
localStorage.setItem('refresh', "0")

14
src/views/modules/auth/authInquiry.vue
View File

@ -315,13 +315,13 @@ import OssComponents from "../oss/ossComponents.vue";
import {getTableDefaultListLanguage, getTableUserListLanguage, updateColumnSize} from "../../../api/table";
export default {
// beforeRouteEnter(to, from, next) {
// next((vm) => {
// // 跳转后清除 redirectPath
// localStorage.removeItem('redirectPath');
// console.log('redirectPath 已清除');
// });
// },
beforeRouteEnter(to, from, next) {
next((vm) => {
// 跳转后清除 redirectPath
localStorage.removeItem('redirectPath');
console.log('redirectPath 已清除');
});
},
computed: {
statusDisplay() {
return this.inquiryInfoData.status === 'C' ? '草稿' : (this.inquiryInfoData.status === 'B' ? '已下达' : '已报价')

14
src/views/modules/auth/authQuote.vue
View File

@ -218,13 +218,13 @@ import QuoteDetail from "../quote/detail/quoteDetail.vue";
import {getTableDefaultListLanguage, getTableUserListLanguage, updateColumnSize} from "../../../api/table";
export default {
// beforeRouteEnter(to, from, next) {
// next((vm) => {
// // 跳转后清除 redirectPath
// localStorage.removeItem('redirectPath');
// console.log('redirectPath 已清除');
// });
// },
beforeRouteEnter(to, from, next) {
next((vm) => {
// 跳转后清除 redirectPath
localStorage.removeItem('redirectPath');
console.log('redirectPath 已清除');
});
},
computed: {
// quotationInformationFlag () {
// return (value) => {

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

@ -175,7 +175,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="609px">
<el-dialog title="项目" :close-on-click-modal="false" @close="closeClear" v-drag :visible.sync="modalFlag" width="699px">
<!-- <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,10 @@
<!-- </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="BU" prop="bu" :rules="rules.bu">
<el-form-item prop="bu" :rules="rules.bu">
<template #label>
<span class="big-label">BU</span>
</template>
<el-select v-model="modalData.bu" placeholder="请选择" :disabled="modalDisableFlag" style="width: 130px">
<el-option
v-for = "i in userBuList"
@ -198,16 +201,28 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="项目编码" prop="projectNo" :rules="rules.projectNo" style="margin-left: 15px">
<el-form-item prop="projectNo" :rules="rules.projectNo" style="margin-left: 15px">
<template #label>
<span class="big-label">项目编码</span>
</template>
<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" style="margin-left: 15px">
<el-form-item prop="projectDesc" v-if="!modalPartDisableFlag" :rules="rules.projectDesc" style="margin-left: 15px">
<template #label>
<span class="big-label">项目名称</span>
</template>
<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" style="margin-left: 15px">
<el-form-item prop="projectDesc" v-if="modalPartDisableFlag" :rules="rules.projectDesc" style="margin-left: 15px">
<template #label>
<span class="big-label">项目名称</span>
</template>
<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" style="margin-left: 15px">
<el-form-item prop="cProjectRegion" v-if="!modalPartDisableFlag" :rules="rules.cProjectRegion" style="margin-left: 15px">
<template #label>
<span class="big-label">区域</span>
</template>
<el-select v-model="modalData.cProjectRegion" placeholder="请选择" :disabled="modalPartDisableFlag" clearable style="width: 130px">
<el-option
v-for = "i in cProjectRegionList"
@ -220,16 +235,24 @@
</el-form>
<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>
<template #label>
<span slot="label" style="" class="big-label">
<a href="#" @click="getBaseList(509)">客户编码</a>
<a herf="#" @click="newCustomer">（新客户）</a>
</span>
</template>
<el-input v-model="modalData.customerNo" @blur="customerNoBlur" style="width: 130px"></el-input>
</el-form-item>
<el-form-item label="客户名称" prop="customerDesc" style="margin-left: 15px">
<el-form-item prop="customerDesc" style="margin-left: -3px">
<template #label>
<span class="big-label">客户名称</span>
</template>
<el-input v-model="modalData.customerDesc" disabled style="width: 329px"></el-input>
</el-form-item>
<el-form-item label="优先级" prop="priority" :rules="rules.priority" style="margin-left: 15px">
<el-form-item prop="priority" :rules="rules.priority" style="margin-left: 15px">
<template #label>
<span class="big-label">优先级</span>
</template>
<el-select v-model="modalData.priority" placeholder="请选择" clearable style="width: 130px">
<el-option
v-for = "i in priorityList"
@ -241,13 +264,22 @@
</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-item label="项目料号" prop="testPartNo" :rules="rules.testPartNo" >
<el-form-item prop="testPartNo" :rules="rules.testPartNo" >
<template #label>
<span class="big-label">项目料号</span>
</template>
<el-input v-model="modalData.testPartNo" style="width: 130px"></el-input>
</el-form-item>
<el-form-item label="料号描述" prop="partDesc" :rules="rules.partDesc" style="margin-left: 15px">
<el-form-item prop="partDesc" :rules="rules.partDesc" style="margin-left: 15px">
<template #label>
<span class="big-label">料号描述</span>
</template>
<el-input v-model="modalData.partDesc" style="width: 329px"></el-input>
</el-form-item>
<el-form-item label="料号状态" prop="partType" :rules="rules.partType" style="margin-left: 15px">
<el-form-item prop="partType" :rules="rules.partType" style="margin-left: 15px">
<template #label>
<span class="big-label">料号状态</span>
</template>
<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>
@ -258,12 +290,17 @@
</el-form>
<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="">
<template>
<span slot="label" style="" class="big-label">
<a herf="#" @click="getBaseList(2008)">IQC</a>
</span>
</template>
<el-input v-model="modalData.cQualityEngineer6Name" disabled style="width: 130px"></el-input>
</el-form-item>
<el-form-item :label="'立项日期：'" style="margin-left: 15px">
<el-form-item style="margin-left: 15px">
<template #label>
<span class="big-label">立项日期</span>
</template>
<el-date-picker
style="width: 130px"
v-model="modalData.projectCreationDate"
@ -272,7 +309,10 @@
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="项目分类" prop="projectCategory" :rules="rules.projectCategory" style="margin-left: 15px">
<el-form-item prop="projectCategory" :rules="rules.projectCategory" style="margin-left: 15px">
<template #label>
<span class="big-label">项目分类</span>
</template>
<el-select v-model="modalData.projectCategory" placeholder="请选择" clearable style="width: 170px">
<el-option
v-for = "i in projectCategoryList"
@ -282,7 +322,10 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'预计完成日期：'" :rules="rules.needDate" style="margin-left: 15px">
<el-form-item style="margin-left: 15px" :rules="rules.needDate">
<template #label>
<span class="big-label">预计完成日期</span>
</template>
<el-date-picker
style="width: 130px"
v-model="modalData.needDate"
@ -301,19 +344,19 @@
<!-- </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>
<span slot="label" style="" @click="projectManagerFlag = true " class="big-label"><a herf="#">PM/Sales</a></span>
<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" style="margin-left: 15px">
<span slot="label" style="" @click="projectOwnerFlag = true"><a herf="#">PjM</a></span>
<span slot="label" style="" @click="projectOwnerFlag = true" class="big-label"><a herf="#">PjM</a></span>
<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>
<span slot="label" style="" @click="engineerFlag = true" class="big-label"><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>
<span slot="label" style="" @click="IPQCFlag = true" class="big-label"><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">-->
@ -322,33 +365,33 @@
</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>
<span slot="label" style="" @click="FQC1Flag = true" class="big-label"><a herf="#">FQC1</a></span>
<el-input v-model="modalData.cQualityEngineer3Name" disabled style="width: 130px"></el-input>
</el-form-item>
<el-form-item prop="cQualityEngineer5Name" :rules="rules.cQualityEngineer5Name" style="margin-left: 15px">
<span slot="label" style="">
<span slot="label" style="" class="big-label">
<a herf="#" @click="getBaseList(2007)">FQC2</a>
</span>
<el-input v-model="modalData.cQualityEngineer5Name" disabled style="width: 130px"></el-input>
</el-form-item>
<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>
<span slot="label" style="" @click="engineer6Flag = true" class="big-label"><a herf="#">Engineer</a></span>
<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" style="margin-left: 15px">
<span slot="label" style="" @click="MFGlag = true"><a herf="#">MFG</a></span>
<span slot="label" style="" @click="MFGlag = true" class="big-label"><a herf="#">MFG</a></span>
<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="">
<span slot="label" style="" class="big-label">
<a herf="#" @click="getBaseList(2006)">SQE</a>
</span>
<el-input v-model="modalData.cQualityEngineer4Name" disabled style="width: 130px"></el-input>
</el-form-item>
<el-form-item label="文档工程师" prop="docEngineerName" :rules="rules.docEngineerName" style="margin-left: 15px">
<span slot="label" style="" @click="docEngineerFlag = true"><a herf="#">文档工程师</a></span>
<span slot="label" style="" @click="docEngineerFlag = true" class="big-label"><a herf="#">文档工程师</a></span>
<el-input v-model="modalData.docEngineerName" disabled style="width: 130px"></el-input>
</el-form-item>
</el-form>
@ -4051,4 +4094,8 @@ import {updateColumnSize} from "../../../api/table";
padding: 10px;
margin-bottom: 10px;
}
.big-label {
font-size: medium; /* 调整字号 */
}
</style>

2
src/views/modules/eam/eamProjectInfoForUploads.vue
View File

@ -153,7 +153,7 @@
v-if="this.$route.query.flag !== '2' && this.$route.query.flag !== '1'"
:fields="fields()"
:data="exportData"
type="xlsx"
type="xls"
:name="exportName"
:header="exportHeader"
:footer="exportFooter"

1717
src/views/modules/eam/eamWorkOrderForApprove.vue
File diff suppressed because it is too large
View File

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

@ -475,6 +475,7 @@ import {partInformationSearch} from "../../../api/part/partInformation";
import quotationUpload from "../quote/quotation_upload.vue";
import OssComponents from "../oss/ossComponents.vue";
import {getTableDefaultListLanguage, getTableUserListLanguage, updateColumnSize} from "../../../api/table";
import {downLoadQuotationFile} from "../../../api/quote/quotationInformation";
export default {
computed: {
@ -953,6 +954,24 @@ export default {
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 5022,
serialNumber: '5022Table1BomStatus',
tableId: '5022Table1',
tableName: '询价信息表',
columnProp: 'bomStatus',
headerAlign: 'center',
align: 'center',
columnLabel: 'BOM状态',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 5022,

2
src/views/modules/oss/ossComponents.vue
View File

@ -184,7 +184,7 @@ export default {
id:row.id,
fileType:type
}
previewOssFileById(params).then(({data}) => {
previewOssFileById2(params).then(({data}) => {
if (type === 'excel' || type === 'word'){
type = 'application/pdf;charset=UTF-8'
}

Write Preview
Loading…
Cancel
Save