Browse Source

修复新增验货申请查询bug

新增运输方式和crd字段显示,新增字段用来对照,不允许修改
新加一个qc的联系电话字段
基本信息里面字体颜色加深
master
qiankanghui 9 hours ago
parent
commit
7bfbfb926e
  1. 26
      src/views/modules/inspection/com_inspectionRequestDetail.vue
  2. 2
      src/views/modules/inspection/com_inspectionRequestDetailTab.vue
  3. 2
      src/views/modules/inspection/com_inspectionRequestPoDetailTab.vue
  4. 25
      src/views/modules/inspection/com_inspectionScheduleView.vue
  5. 72
      src/views/modules/inspection/inspectionRequestList.vue
  6. 18
      src/views/modules/inspection/inspectionScheduleList.vue

26
src/views/modules/inspection/com_inspectionRequestDetail.vue

@ -51,7 +51,7 @@
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="6">
<el-col :span="4">
<el-form-item label="申请录入人"> <el-form-item label="申请录入人">
<el-input v-model="detailData.createBy" disabled /> <el-input v-model="detailData.createBy" disabled />
</el-form-item> </el-form-item>
@ -61,7 +61,7 @@
<el-input v-model="detailData.createDate" disabled /> <el-input v-model="detailData.createDate" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="建议验货日期"> <el-form-item label="建议验货日期">
<el-date-picker <el-date-picker
v-model="editData.needInspectDate" v-model="editData.needInspectDate"
@ -72,11 +72,16 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="4">
<el-form-item label="QC"> <el-form-item label="QC">
<el-input v-model="detailData.qcOperator" disabled placeholder=" " /> <el-input v-model="detailData.qcOperator" disabled placeholder=" " />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5">
<el-form-item label="QC联系方式">
<el-input v-model="detailData.qcContact" disabled placeholder=" " />
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
@ -161,7 +166,7 @@
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="6">
<el-col :span="4">
<el-form-item label="申请录入人"> <el-form-item label="申请录入人">
<el-input v-model="detailData.createBy" disabled /> <el-input v-model="detailData.createBy" disabled />
</el-form-item> </el-form-item>
@ -171,16 +176,21 @@
<el-input v-model="detailData.createDate" disabled /> <el-input v-model="detailData.createDate" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="建议验货日期"> <el-form-item label="建议验货日期">
<el-input :value="formatDate(detailData.needInspectDate)" disabled /> <el-input :value="formatDate(detailData.needInspectDate)" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="4">
<el-form-item label="QC"> <el-form-item label="QC">
<el-input v-model="detailData.qcOperator" disabled placeholder=" " /> <el-input v-model="detailData.qcOperator" disabled placeholder=" " />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5">
<el-form-item label="QC联系方式">
<el-input v-model="detailData.qcContact" disabled placeholder=" " />
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
@ -541,11 +551,11 @@ export default {
background-color: #fff; background-color: #fff;
} }
// disabled 状态样式 - 与产品页面 disabled 样式一致
// disabled 状态样式 - 文字加深便于阅读(原浅灰 #c0c4cc 太浅) - rqrq
/deep/ .el-input.is-disabled .el-input__inner { /deep/ .el-input.is-disabled .el-input__inner {
background-color: #f5f7fa; background-color: #f5f7fa;
border-color: #e4e7ed; border-color: #e4e7ed;
color: #c0c4cc;
color: #303133;
cursor: not-allowed; cursor: not-allowed;
} }

2
src/views/modules/inspection/com_inspectionRequestDetailTab.vue

@ -12,7 +12,9 @@
<el-table-column prop="item" label="Item" header-align="center" align="left" min-width="100" show-overflow-tooltip/> <el-table-column prop="item" label="Item" header-align="center" align="left" min-width="100" show-overflow-tooltip/>
<el-table-column prop="aQty" label="订单数量" header-align="center" align="right" width="90"/> <el-table-column prop="aQty" label="订单数量" header-align="center" align="right" width="90"/>
<el-table-column prop="qty" label="此次验货数量" header-align="center" align="right" width="110"/> <el-table-column prop="qty" label="此次验货数量" header-align="center" align="right" width="110"/>
<el-table-column prop="origShipMethod" label="原运输方式" header-align="center" align="center" width="100"/>
<el-table-column prop="shipMothod" label="运输方式" header-align="center" align="center" width="100"/> <el-table-column prop="shipMothod" label="运输方式" header-align="center" align="center" width="100"/>
<el-table-column prop="origCrd" label="原CRD" header-align="center" align="center" width="120"/>
<el-table-column prop="crd" label="CRD" header-align="center" align="center" width="120"/> <el-table-column prop="crd" label="CRD" header-align="center" align="center" width="120"/>
<el-table-column prop="eta" label="ETA" header-align="center" align="center" width="120"/> <el-table-column prop="eta" label="ETA" header-align="center" align="center" width="120"/>
<el-table-column prop="status" label="状态" header-align="center" align="center" width="100" show-overflow-tooltip/> <el-table-column prop="status" label="状态" header-align="center" align="center" width="100" show-overflow-tooltip/>

2
src/views/modules/inspection/com_inspectionRequestPoDetailTab.vue

@ -12,9 +12,11 @@
<el-table-column prop="item" label="Item" header-align="center" align="left" min-width="100" show-overflow-tooltip/> <el-table-column prop="item" label="Item" header-align="center" align="left" min-width="100" show-overflow-tooltip/>
<el-table-column prop="aQty" label="订单数量" header-align="center" align="right" width="90"/> <el-table-column prop="aQty" label="订单数量" header-align="center" align="right" width="90"/>
<el-table-column prop="qty" label="此次验货数量" header-align="center" align="right" width="110"/> <el-table-column prop="qty" label="此次验货数量" header-align="center" align="right" width="110"/>
<el-table-column prop="origShipMethod" label="原运输方式" header-align="center" align="center" width="100"/>
<el-table-column prop="shipMothod" label="运输方式" header-align="center" align="center" width="100"/> <el-table-column prop="shipMothod" label="运输方式" header-align="center" align="center" width="100"/>
<el-table-column prop="eta" label="ETA" header-align="center" align="center" width="110"/> <el-table-column prop="eta" label="ETA" header-align="center" align="center" width="110"/>
<el-table-column prop="issueDate" label="D_Issue" header-align="center" align="center" width="110"/> <el-table-column prop="issueDate" label="D_Issue" header-align="center" align="center" width="110"/>
<el-table-column prop="origCrd" label="原CRD" header-align="center" align="center" width="120"/>
<el-table-column prop="crd" label="CRD" header-align="center" align="center" width="120"/> <el-table-column prop="crd" label="CRD" header-align="center" align="center" width="120"/>
<el-table-column prop="realCrd" label="A_CRD" header-align="center" align="center" width="120"/> <el-table-column prop="realCrd" label="A_CRD" header-align="center" align="center" width="120"/>
<el-table-column prop="standardTt" label="Standard_TT" header-align="center" align="center" width="110"/> <el-table-column prop="standardTt" label="Standard_TT" header-align="center" align="center" width="110"/>

25
src/views/modules/inspection/com_inspectionScheduleView.vue

@ -91,9 +91,18 @@
:close-on-click-modal="false" :close-on-click-modal="false"
append-to-body> append-to-body>
<el-form :model="scheduleForm" :rules="scheduleRules" ref="scheduleForm" size="small" label-position="top"> <el-form :model="scheduleForm" :rules="scheduleRules" ref="scheduleForm" size="small" label-position="top">
<el-form-item label="QC人员:">
<el-input v-model="scheduleForm.qcOperator" disabled style="width: 100px;"></el-input>
</el-form-item>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="QC人员:">
<el-input v-model="scheduleForm.qcOperator" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="QC联系方式:">
<el-input v-model="scheduleForm.qcContact" clearable placeholder="按所选QC自动带出,可修改"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="计划验货日期:" prop="planStartDate"> <el-form-item label="计划验货日期:" prop="planStartDate">
<div style="display: flex; align-items: center; width: 100%;"> <div style="display: flex; align-items: center; width: 100%;">
<el-date-picker v-model="scheduleForm.planStartDate" type="date" placeholder="选择开始日期" value-format="yyyy-MM-dd" style="flex: 1;"></el-date-picker> <el-date-picker v-model="scheduleForm.planStartDate" type="date" placeholder="选择开始日期" value-format="yyyy-MM-dd" style="flex: 1;"></el-date-picker>
@ -200,6 +209,7 @@ export default {
scheduleForm: { scheduleForm: {
qcOperator: '', qcOperator: '',
qcUserName: '', qcUserName: '',
qcContact: '',
planStartDate: '', planStartDate: '',
planEndDate: '', planEndDate: '',
remark: '' remark: ''
@ -278,6 +288,7 @@ export default {
id: item.id || item.userId, id: item.id || item.userId,
qcName: item.userDisplay || item.userName, qcName: item.userDisplay || item.userName,
userName: item.userName, userName: item.userName,
qcContact: item.userMobile || '',
region: '' region: ''
})) }))
console.log('[排程视图] QC列表加载成功:', this.qcList) console.log('[排程视图] QC列表加载成功:', this.qcList)
@ -329,6 +340,7 @@ export default {
this.scheduleForm = { this.scheduleForm = {
qcOperator: qcRow ? qcRow.userName : '', qcOperator: qcRow ? qcRow.userName : '',
qcUserName: qcRow ? qcRow.qcName : '', qcUserName: qcRow ? qcRow.qcName : '',
qcContact: qcRow ? (qcRow.qcContact || '') : '',
planStartDate: '', planStartDate: '',
planEndDate: '', planEndDate: '',
remark: '' remark: ''
@ -339,6 +351,12 @@ export default {
this.scheduleForm.planStartDate = this.currentRow.planStartDate || '' this.scheduleForm.planStartDate = this.currentRow.planStartDate || ''
this.scheduleForm.planEndDate = this.currentRow.planEndDate || this.currentRow.planStartDate || '' this.scheduleForm.planEndDate = this.currentRow.planEndDate || this.currentRow.planStartDate || ''
this.scheduleForm.remark = this.currentRow.scheduleRemark || '' this.scheduleForm.remark = this.currentRow.scheduleRemark || ''
// 仅当修改的是同一 QC 时才回显已保存的联系方式;换选其它 QC 则用其手机号自动带出的值,避免残留原 QC 联系方式 - rqrq
const savedQc = this.currentRow.qcOperator
const selectedQc = qcRow ? qcRow.userName : ''
if (savedQc && selectedQc && savedQc === selectedQc) {
this.scheduleForm.qcContact = this.currentRow.qcContact || this.scheduleForm.qcContact
}
} }
this.scheduleDialogVisible = true this.scheduleDialogVisible = true
@ -361,6 +379,7 @@ export default {
requestNos: this.requestNos, requestNos: this.requestNos,
site: this.$store.state.user.site, site: this.$store.state.user.site,
qcOperator: this.scheduleForm.qcOperator, qcOperator: this.scheduleForm.qcOperator,
qcContact: this.scheduleForm.qcContact,
planStartDate: this.scheduleForm.planStartDate, planStartDate: this.scheduleForm.planStartDate,
planEndDate: this.scheduleForm.planEndDate || this.scheduleForm.planStartDate, planEndDate: this.scheduleForm.planEndDate || this.scheduleForm.planStartDate,
remark: this.scheduleForm.remark remark: this.scheduleForm.remark

72
src/views/modules/inspection/inspectionRequestList.vue

@ -892,6 +892,11 @@
</el-input-number> </el-input-number>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="原运输方式" header-align="center" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.origShipMethod }}</span>
</template>
</el-table-column>
<el-table-column label="运输方式" header-align="center" align="center" width="100"> <el-table-column label="运输方式" header-align="center" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.shipMethod" placeholder="请选择" size="mini" style="width: 100%;"> <el-select v-model="scope.row.shipMethod" placeholder="请选择" size="mini" style="width: 100%;">
@ -904,6 +909,11 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="原CRD" header-align="center" align="center" width="110">
<template slot-scope="scope">
<span>{{ scope.row.origCrd }}</span>
</template>
</el-table-column>
<el-table-column label="CRD" header-align="center" align="center" width="160"> <el-table-column label="CRD" header-align="center" align="center" width="160">
<template slot-scope="scope"> <template slot-scope="scope">
<el-date-picker <el-date-picker
@ -1555,6 +1565,24 @@ export default {
status: true, status: true,
fixed: false fixed: false
}, },
{
userId: this.$store.state.user.name,
functionId: this.functionId,
serialNumber: 'InspectionTable1QcContact',
tableId: 'InspectionTable1',
tableName: '检验申请单',
columnProp: 'qcContact',
headerAlign: 'center',
align: 'left',
columnLabel: 'QC联系方式',
columnWidth: '120',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: this.functionId, functionId: this.functionId,
@ -2405,6 +2433,11 @@ export default {
partNo: this.addPoSearch.partNo || '', partNo: this.addPoSearch.partNo || '',
sku: this.addPoSearch.sku || '', sku: this.addPoSearch.sku || '',
partDesc: this.addPoSearch.partDesc || '', partDesc: this.addPoSearch.partDesc || '',
// 选择PO明细弹窗筛选条件:交由后端做全量分页查询,避免只过滤当前页 - rqrq
orderNo: this.addPoSelectFilter.orderNo || '',
item: this.addPoSelectFilter.item || '',
crdStart: this.addPoSelectFilter.crdStart || '',
crdEnd: this.addPoSelectFilter.crdEnd || '',
page: this.addPoSelectPageIndex, page: this.addPoSelectPageIndex,
limit: this.addPoSelectPageSize limit: this.addPoSelectPageSize
} }
@ -2440,58 +2473,37 @@ export default {
...row, ...row,
inspectQty: row.waitInspectQty || row.qty || 0, // 此次验货数量默认为未验货数量 inspectQty: row.waitInspectQty || row.qty || 0, // 此次验货数量默认为未验货数量
shipMethod: row.shipMethod || row.shipMothod || '', // 运输方式默认为PO中的运输方式(兼容拼写错误) shipMethod: row.shipMethod || row.shipMothod || '', // 运输方式默认为PO中的运输方式(兼容拼写错误)
crd: row.crd || '' // CRD日期默认为PO中的CRD日期
crd: row.crd || '', // CRD日期默认为PO中的CRD日期
origShipMethod: row.shipMethod || row.shipMothod || '', // 原运输方式(订单值,只读对照) - rqrq
origCrd: row.crd || '' // 原CRD(订单值,只读对照) - rqrq
})) }))
this.addPoSelectList = list this.addPoSelectList = list
this.filteredAddPoSelectList = list
this.addPoSelectTotal = pageData.totalCount || 0 this.addPoSelectTotal = pageData.totalCount || 0
this.addPoSelectPageIndex = pageData.currPage || this.addPoSelectPageIndex this.addPoSelectPageIndex = pageData.currPage || this.addPoSelectPageIndex
this.addPoSelectPageSize = pageData.pageSize || this.addPoSelectPageSize this.addPoSelectPageSize = pageData.pageSize || this.addPoSelectPageSize
} else { } else {
this.addPoSelectList = [] this.addPoSelectList = []
this.filteredAddPoSelectList = []
this.addPoSelectTotal = 0 this.addPoSelectTotal = 0
this.$message.warning(data.msg || '加载PO列表失败') this.$message.warning(data.msg || '加载PO列表失败')
} }
}).catch(error => { }).catch(error => {
console.error('加载PO列表失败:', error) console.error('加载PO列表失败:', error)
this.addPoSelectList = [] this.addPoSelectList = []
this.filteredAddPoSelectList = []
this.addPoSelectTotal = 0 this.addPoSelectTotal = 0
this.$message.error('加载PO列表失败') this.$message.error('加载PO列表失败')
}).finally(() => { }).finally(() => {
this.filterAddPoSelectList()
this.addPoSelectLoading = false this.addPoSelectLoading = false
}) })
}, },
// 选择PO明细弹窗-前端筛选(与新增一致:PO、Item、D_CRD)
// 选择PO明细弹窗-查询:按筛选条件重新向后端发起分页查询(从第一页开始)- rqrq
filterAddPoSelectList () { filterAddPoSelectList () {
let result = [...this.addPoSelectList]
const filter = this.addPoSelectFilter || {}
const orderNoKeyword = String(filter.orderNo || '').toLowerCase().trim()
const itemKeyword = String(filter.item || '').toLowerCase().trim()
const crdStart = String(filter.crdStart || '').trim()
const crdEnd = String(filter.crdEnd || '').trim()
if (orderNoKeyword) {
result = result.filter(item => {
const orderRef1 = String(item.orderRef1 || '').toLowerCase()
const orderNo = String(item.orderNo || item.order_no || '').toLowerCase()
return orderRef1.includes(orderNoKeyword) || orderNo.includes(orderNoKeyword)
})
}
if (itemKeyword) {
result = result.filter(item => String(item.item || '').toLowerCase().includes(itemKeyword))
}
if (crdStart || crdEnd) {
result = result.filter(item => {
const crd = String(item.crd || '').slice(0, 10)
if (!crd) return false
if (crdStart && crd < crdStart) return false
if (crdEnd && crd > crdEnd) return false
return true
})
}
this.filteredAddPoSelectList = result
this.addPoSelectPageIndex = 1
this.loadAddPoSelectList()
}, },
// 搜索新增PO列表 // 搜索新增PO列表

18
src/views/modules/inspection/inspectionScheduleList.vue

@ -635,6 +635,24 @@ export default {
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: false fixed: false
},
{
userId: this.$store.state.user.name,
functionId: this.functionId,
serialNumber: 'ScheduleTable1QcContact',
tableId: 'ScheduleTable1',
tableName: '验货排程',
columnProp: 'qcContact',
headerAlign: 'center',
align: 'left',
columnLabel: 'QC联系方式',
columnWidth: '120',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
} }
] ]
} }

Loading…
Cancel
Save