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

2024-1-18 测试管理，打样管理新增项目查询增加客户条件

master
zelian_wu 2 years ago
parent
4e47904751
commit
b8ce17a1fd
4 changed files with 182 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/views/modules/project/projectInfo/projectInfo.vue
  2. 101
      src/views/modules/proofing/requestForProofing.vue
  3. 17
      src/views/modules/quotation/requestForQuote.vue
  4. 104
      src/views/modules/test/requestForTest.vue

1
src/views/modules/project/projectInfo/projectInfo.vue
View File

@ -1541,6 +1541,7 @@
activated() { activated() {
if (this.$route.params.projectId){ if (this.$route.params.projectId){
this.searchData.projectId = this.$route.params.projectId this.searchData.projectId = this.$route.params.projectId
this.search();
} }
this.getTableUserColumn(this.$route.meta.menuId+'table1',1) this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
}, },

101
src/views/modules/proofing/requestForProofing.vue
View File

@ -50,12 +50,7 @@
<el-input v-model="searchData.engineerName" clearable style="width: 120px"></el-input> <el-input v-model="searchData.engineerName" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'优先等级'"> <el-form-item :label="'优先等级'">
<el-select v-model="searchData.priorityLevel" style="width: 120px">
<el-option label="全部" value=""></el-option>
<el-option label="一般" value="一般"></el-option>
<el-option label="紧急" value="紧急"></el-option>
<el-option label="重要" value="重要"></el-option>
</el-select>
<dict-data-select v-model="searchData.priorityLevel" clearable style="width: 120px" :use-default-value="false" dict-type="priority_Level"></dict-data-select>
</el-form-item> </el-form-item>
<el-form-item :label="'状态'"> <el-form-item :label="'状态'">
<el-select v-model="searchData.proofingStatus" style="width: 120px"> <el-select v-model="searchData.proofingStatus" style="width: 120px">
@ -171,11 +166,7 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="优先等级" prop="priorityLevel"> <el-form-item label="优先等级" prop="priorityLevel">
<el-select v-model="modalData.priorityLevel" style="width: 100%">
<el-option label="一般" value="一般"></el-option>
<el-option label="紧急" value="紧急"></el-option>
<el-option label="重要" value="重要"></el-option>
</el-select>
<dict-data-select v-if="modalFlag" v-model="modalData.priorityLevel" dict-type="priority_Level"></dict-data-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
@ -195,7 +186,7 @@
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="10"> <el-col :span="10">
<el-form-item prop="projectId" label="项目编码"> <el-form-item prop="projectId" label="项目编码">
<span slot="label" v-if="modalData.customerNo && modalData.flag === '1'" @click="getBaseList(104,1)"><a herf="#">项目编码</a></span>
<span slot="label" v-if="modalData.customerNo && modalData.flag === '1'" @click="chooseProjectListFlag = true"><a herf="#">项目编码</a></span>
<el-input :disabled="!modalData.customerNo || modalData.flag !== '1'" :readonly="true" v-model="modalData.projectId"></el-input> <el-input :disabled="!modalData.customerNo || modalData.flag !== '1'" :readonly="true" v-model="modalData.projectId"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -409,6 +400,36 @@
</el-footer> </el-footer>
</el-dialog> </el-dialog>
<!--选择项目模态框-->
<el-dialog title="选择-项目" @close="closeProjectInfoDialog" @open="searchProjectInfoList" :visible.sync="chooseProjectListFlag" width="35%">
<el-form label-position="top" :model="searchProjectData" ref="closeProjectInfoForm">
<el-row :gutter="10">
<el-col :span="6">
<el-form-item label="项目编码">
<el-input v-model="searchProjectData.projectId"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="项目名称">
<el-input v-model="searchProjectData.projectName"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label=" ">
<el-button type="primary" @click="searchProjectInfoList">查询</el-button>
</el-form-item>
</el-col>
</el-row>
<el-table :height="223"
:data="projectList"
border
@row-click="projectClickRow">
<el-table-column label="项目编码" prop="projectId"/>
<el-table-column label="项目名称" prop="projectName"/>
</el-table>
</el-form>
</el-dialog>
<!-- 页签 --> <!-- 页签 -->
<el-tabs v-model="activeTable" style="margin-top: 0px; width: 100%; min-height: 500px;" type="border-card" @tab-click="tabClick" class="customer-tab"> <el-tabs v-model="activeTable" style="margin-top: 0px; width: 100%; min-height: 500px;" type="border-card" @tab-click="tabClick" class="customer-tab">
<!-- 打样详细信息页签 --> <!-- 打样详细信息页签 -->
@ -832,15 +853,18 @@
saveCustomerResponse, // 保存客户回复 saveCustomerResponse, // 保存客户回复
getProjectPartList, // 获取产品列表 getProjectPartList, // 获取产品列表
getProjectInformation, // 获取项目信息 getProjectInformation, // 获取项目信息
getCustomerInformation // 获取客户信息
getCustomerInformation, // 获取客户信息
} from '@/api/proofing/proofingInformation.js' } from '@/api/proofing/proofingInformation.js'
import { import {
downLoadQuotationFile // 文件下载
downLoadQuotationFile, // 文件下载
searchProjectInfoList,
} from '@/api/quotation/quotationInformation.js' } from '@/api/quotation/quotationInformation.js'
import Chooselist from '@/views/modules/common/Chooselist' import Chooselist from '@/views/modules/common/Chooselist'
import proofingUploadFile from "./proofing_upload_file" import proofingUploadFile from "./proofing_upload_file"
import DictDataSelect from "../sys/dict-data-select.vue";
export default { export default {
components: { components: {
DictDataSelect,
Chooselist, Chooselist,
proofingUploadFile proofingUploadFile
}, },
@ -1671,7 +1695,17 @@
enterResultModalFlag: false, enterResultModalFlag: false,
submitResultModalFlag: false, submitResultModalFlag: false,
customerResponseModalFlag: false, customerResponseModalFlag: false,
projectPartModelFlag: false
// 选择项目弹框开关
chooseProjectListFlag: false,
//项目搜索条件
searchProjectData:{
site:this.$store.state.user.site,
projectId:undefined,
projectName:undefined,
customerId:undefined,
},
// 项目集合
projectList:[],
} }
}, },
mounted () { mounted () {
@ -1710,8 +1744,10 @@
* @param row * @param row
*/ */
projectPartClickRow (row) { projectPartClickRow (row) {
if(this.modalData.flag === '1'){
this.$refs.projectPartTable.toggleRowSelection(row); this.$refs.projectPartTable.toggleRowSelection(row);
this.confirmProjectPart(); this.confirmProjectPart();
}
}, },
/** /**
* 多选 * 多选
@ -2614,8 +2650,14 @@
getBaseData (val) { getBaseData (val) {
if (this.tagNo === 102) { if (this.tagNo === 102) {
if(this.tagNo1 === 1) { if(this.tagNo1 === 1) {
if (val.Customer_no === this.modalData.customerNo) {
return
}
this.modalData.customerNo = val.Customer_no this.modalData.customerNo = val.Customer_no
this.modalData.customerDesc = val.Customer_desc this.modalData.customerDesc = val.Customer_desc
this.modalData.projectId = undefined
this.modalData.projectName = undefined
this.projectPartList = []
} }
} }
if (this.tagNo === 103) { if (this.tagNo === 103) {
@ -2715,6 +2757,35 @@
return false return false
} }
}, },
projectClickRow(row){
this.modalData.projectId = row.projectId
this.modalData.projectName = row.projectName
this.getProjectPartList()
this.chooseProjectListFlag = false
},
// 查询searchProjectInfoList
searchProjectInfoList(){
this.projectList = [];
this.searchProjectData.customerId = this.modalData.customerNo
searchProjectInfoList(this.searchProjectData).then(({data})=>{
if (data && data.code === 0) {
this.projectList = data.rows
} else {
this.projectList = []
}
}).catch((error)=>{
this.$message.error('查询项目信息失败')
})
},
closeProjectInfoDialog(){
this.$refs.closeProjectInfoForm.resetFields();
this.searchProjectData={
site:this.$store.state.user.site,
projectId:undefined,
projectName:undefined,
customerId:undefined,
}
},
} }
} }
</script> </script>

17
src/views/modules/quotation/requestForQuote.vue
View File

@ -52,16 +52,11 @@
<el-form-item :label="'项目名称'"> <el-form-item :label="'项目名称'">
<el-input v-model="searchData.projectName" clearable style="width: 120px"></el-input> <el-input v-model="searchData.projectName" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'报价专员'">
<el-form-item :label="'工程师'">
<el-input v-model="searchData.quoterName" clearable style="width: 120px"></el-input> <el-input v-model="searchData.quoterName" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'优先等级'"> <el-form-item :label="'优先等级'">
<el-select v-model="searchData.priorityLevel" style="width: 120px">
<el-option label="全部" value=""></el-option>
<el-option label="一般" value="一般"></el-option>
<el-option label="紧急" value="紧急"></el-option>
<el-option label="重要" value="重要"></el-option>
</el-select>
<dict-data-select v-model="searchData.priorityLevel" clearable style="width: 120px" :use-default-value="false" dict-type="priority_Level"/>
</el-form-item> </el-form-item>
<el-form-item :label="'状态'"> <el-form-item :label="'状态'">
<el-select v-model="searchData.quotationStatus" style="width: 120px"> <el-select v-model="searchData.quotationStatus" style="width: 120px">
@ -199,11 +194,7 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="优先等级" prop="priorityLevel"> <el-form-item label="优先等级" prop="priorityLevel">
<el-select v-model="modalData.priorityLevel">
<el-option label="一般" value="一般"></el-option>
<el-option label="紧急" value="紧急"></el-option>
<el-option label="重要" value="重要"></el-option>
</el-select>
<dict-data-select v-if="modalFlag" v-model="modalData.priorityLevel" dict-type="priority_Level"></dict-data-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
@ -851,8 +842,10 @@
} from '@/api/quotation/quotationInformation.js' } from '@/api/quotation/quotationInformation.js'
import Chooselist from '@/views/modules/common/Chooselist' import Chooselist from '@/views/modules/common/Chooselist'
import quotationUploadFile from "./quotation_upload_file" import quotationUploadFile from "./quotation_upload_file"
import DictDataSelect from "../sys/dict-data-select.vue";
export default { export default {
components: { components: {
DictDataSelect,
Chooselist, Chooselist,
quotationUploadFile quotationUploadFile
}, },

104
src/views/modules/test/requestForTest.vue
View File

@ -50,12 +50,7 @@
<el-input v-model="searchData.engineerName" clearable style="width: 120px"></el-input> <el-input v-model="searchData.engineerName" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'优先等级'"> <el-form-item :label="'优先等级'">
<el-select v-model="searchData.priorityLevel" style="width: 120px">
<el-option label="全部" value=""></el-option>
<el-option label="一般" value="一般"></el-option>
<el-option label="紧急" value="紧急"></el-option>
<el-option label="重要" value="重要"></el-option>
</el-select>
<dict-data-select v-model="searchData.priorityLevel" clearable style="width: 120px" :use-default-value="false" dict-type="priority_Level"/>
</el-form-item> </el-form-item>
<el-form-item :label="'状态'"> <el-form-item :label="'状态'">
<el-select v-model="searchData.testStatus" style="width: 120px"> <el-select v-model="searchData.testStatus" style="width: 120px">
@ -171,11 +166,7 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="优先等级" prop="priorityLevel"> <el-form-item label="优先等级" prop="priorityLevel">
<el-select v-model="modalData.priorityLevel" style="width: 100%">
<el-option label="一般" value="一般"></el-option>
<el-option label="紧急" value="紧急"></el-option>
<el-option label="重要" value="重要"></el-option>
</el-select>
<dict-data-select v-if="modalFlag" v-model="modalData.priorityLevel" dict-type="priority_Level"></dict-data-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
@ -195,7 +186,7 @@
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="10"> <el-col :span="10">
<el-form-item prop="projectId" label="项目编码"> <el-form-item prop="projectId" label="项目编码">
<span slot="label" v-if="modalData.customerNo && modalData.flag === '1'" @click="getBaseList(104,1)"><a herf="#">项目编码</a></span>
<span slot="label" v-if="modalData.customerNo && modalData.flag === '1'" @click="chooseProjectListFlag = true"><a herf="#">项目编码</a></span>
<el-input :disabled="!modalData.customerNo || modalData.flag !== '1'" :readonly="true" v-model="modalData.projectId"></el-input> <el-input :disabled="!modalData.customerNo || modalData.flag !== '1'" :readonly="true" v-model="modalData.projectId"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -409,6 +400,36 @@
</el-footer> </el-footer>
</el-dialog> </el-dialog>
<!--选择项目模态框-->
<el-dialog title="选择-项目" @close="closeProjectInfoDialog" @open="searchProjectInfoList" :visible.sync="chooseProjectListFlag" width="35%">
<el-form label-position="top" :model="searchProjectData" ref="closeProjectInfoForm">
<el-row :gutter="10">
<el-col :span="6">
<el-form-item label="项目编码">
<el-input v-model="searchProjectData.projectId"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="项目名称">
<el-input v-model="searchProjectData.projectName"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label=" ">
<el-button type="primary" @click="searchProjectInfoList">查询</el-button>
</el-form-item>
</el-col>
</el-row>
<el-table :height="223"
:data="projectList"
border
@row-click="projectClickRow">
<el-table-column label="项目编码" prop="projectId"/>
<el-table-column label="项目名称" prop="projectName"/>
</el-table>
</el-form>
</el-dialog>
<!-- 页签 --> <!-- 页签 -->
<el-tabs v-model="activeTable" style="margin-top: 0px; width: 100%; min-height: 500px;" type="border-card" @tab-click="tabClick" class="customer-tab"> <el-tabs v-model="activeTable" style="margin-top: 0px; width: 100%; min-height: 500px;" type="border-card" @tab-click="tabClick" class="customer-tab">
<!-- 测试详细信息页签 --> <!-- 测试详细信息页签 -->
@ -833,12 +854,15 @@
getCustomerInformation // 获取客户信息 getCustomerInformation // 获取客户信息
} from '@/api/test/testInformation.js' } from '@/api/test/testInformation.js'
import { import {
downLoadQuotationFile // 文件下载
downLoadQuotationFile, // 文件下载
searchProjectInfoList
} from '@/api/quotation/quotationInformation.js' } from '@/api/quotation/quotationInformation.js'
import Chooselist from '@/views/modules/common/Chooselist' import Chooselist from '@/views/modules/common/Chooselist'
import testUploadFile from "./test_upload_file" import testUploadFile from "./test_upload_file"
import DictDataSelect from "../sys/dict-data-select.vue";
export default { export default {
components: { components: {
DictDataSelect,
Chooselist, Chooselist,
testUploadFile testUploadFile
}, },
@ -1669,7 +1693,18 @@
enterResultModalFlag: false, enterResultModalFlag: false,
submitResultModalFlag: false, submitResultModalFlag: false,
customerResponseModalFlag: false, customerResponseModalFlag: false,
projectPartModelFlag: false
projectPartModelFlag: false,
// 选择项目弹框开关
chooseProjectListFlag: false,
//项目搜索条件
searchProjectData:{
site:this.$store.state.user.site,
projectId:undefined,
projectName:undefined,
customerId:undefined,
},
// 项目集合
projectList:[],
} }
}, },
mounted () { mounted () {
@ -1708,8 +1743,10 @@
* @param row * @param row
*/ */
projectPartClickRow (row) { projectPartClickRow (row) {
if (this.modalData.flag === '1'){
this.$refs.projectPartTable.toggleRowSelection(row); this.$refs.projectPartTable.toggleRowSelection(row);
this.confirmProjectPart(); this.confirmProjectPart();
}
}, },
/** /**
* 多选 * 多选
@ -1948,10 +1985,6 @@
* 确认多选项目物料 * 确认多选项目物料
*/ */
confirmProjectPart () { confirmProjectPart () {
if(this.projectPartListSelections.length === 0){
this.$message.warning('请勾选项目物料！')
return
}
this.modalData.testPartNo = '' this.modalData.testPartNo = ''
this.modalData.partName = '' this.modalData.partName = ''
for (let i = 0; i < this.projectPartListSelections.length; i++) { for (let i = 0; i < this.projectPartListSelections.length; i++) {
@ -2419,8 +2452,14 @@
getBaseData (val) { getBaseData (val) {
if (this.tagNo === 102) { if (this.tagNo === 102) {
if(this.tagNo1 === 1) { if(this.tagNo1 === 1) {
if (val.Customer_no === this.modalData.customerNo) {
return
}
this.modalData.customerNo = val.Customer_no this.modalData.customerNo = val.Customer_no
this.modalData.customerDesc = val.Customer_desc this.modalData.customerDesc = val.Customer_desc
this.modalData.projectId = ''
this.modalData.projectName = ''
this.projectPartList = [];
} }
} }
if (this.tagNo === 103) { if (this.tagNo === 103) {
@ -2523,6 +2562,35 @@
return false return false
} }
}, },
projectClickRow(row){
this.modalData.projectId = row.projectId
this.modalData.projectName = row.projectName
this.getProjectPartList()
this.chooseProjectListFlag = false
},
// 查询searchProjectInfoList
searchProjectInfoList(){
this.projectList = [];
this.searchProjectData.customerId = this.modalData.customerNo
searchProjectInfoList(this.searchProjectData).then(({data})=>{
if (data && data.code === 0) {
this.projectList = data.rows
} else {
this.projectList = []
}
}).catch((error)=>{
this.$message.error('查询项目信息失败')
})
},
closeProjectInfoDialog(){
this.$refs.closeProjectInfoForm.resetFields();
this.searchProjectData={
site:this.$store.state.user.site,
projectId:undefined,
projectName:undefined,
customerId:undefined,
}
},
} }
} }
</script> </script>

Write Preview
Loading…
Cancel
Save