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

fix(npcIqc): 更新IQc检验详情页面字段标签和数据绑定 

- 将检验类型字段替换为IQC检验单号字段
- 将日期接收字段替换为采购订单号字段
- 将PO编号字段替换为收货日期字段
- 将IQC编号字段替换为物料编码字段
- 调整第三行字段顺序将数量、抽样数量移到物料信息后
- 将英文字段标签全部替换为中文标签如尺寸A-E、检验结果总计等
- 添加formatCaRequest方法处理纠正措施请求的布尔值显示
- 调整页面样式参数包括padding、margin、字体大小等
- 更新列表页面搜索条件中的字段名称和日期字段绑定
- 在表格中添加纠正措施请求的条件渲染模板
- 修改初始搜索数据对象中的日期字段名称
master
qiankanghui 1 week ago
parent
b0ff1acff2
commit
f4083dedb2
2 changed files with 92 additions and 88 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. 108
      src/views/modules/npcIqc/com_npcIqcDetail.vue
  2. 72
      src/views/modules/npcIqc/npcIqcList.vue

108
src/views/modules/npcIqc/com_npcIqcDetail.vue
View File

@ -7,23 +7,23 @@
<!-- 第一行 --> <!-- 第一行 -->
<div class="detail-row"> <div class="detail-row">
<div class="detail-item"> <div class="detail-item">
<span class="label">Inspection Type：</span>
<span class="value">{{ detailData.inspectionType }}</span>
<span class="label">IQC检验单号：</span>
<span class="value">{{ detailData.iqcNo }}</span>
</div> </div>
<div class="detail-item"> <div class="detail-item">
<span class="label">Date Received：</span>
<span class="value">{{ formatDate(detailData.dateReceived) }}</span>
<span class="label">采购订单号：</span>
<span class="value">{{ detailData.purOrder }}</span>
</div> </div>
<div class="detail-item"> <div class="detail-item">
<span class="label">PO No：</span>
<span class="value">{{ detailData.purOrder }}</span>
<span class="label">收货日期：</span>
<span class="value">{{ formatDate(detailData.dateReceived) }}</span>
</div> </div>
<div class="detail-item"> <div class="detail-item">
<span class="label">IQC No：</span>
<span class="value">{{ detailData.iqcNo }}</span>
<span class="label">物料编码：</span>
<span class="value">{{ detailData.itemCode }}</span>
</div> </div>
</div> </div>
@ -43,50 +43,45 @@
<!-- 第三行 --> <!-- 第三行 -->
<div class="detail-row"> <div class="detail-row">
<div class="detail-item"> <div class="detail-item">
<span class="label">Quantity：</span>
<span class="value">{{ detailData.quantity }}</span>
</div>
<div class="detail-item">
<span class="label">Sample Size：</span>
<span class="value">{{ detailData.sampleSize }}</span>
<span class="label">物料名称：</span>
<span class="value">{{ detailData.itemName }}</span>
</div> </div>
<div class="detail-item"> <div class="detail-item">
<span class="label">Item Code：</span>
<span class="value">{{ detailData.itemCode }}</span>
<span class="label">数量：</span>
<span class="value">{{ detailData.quantity }}</span>
</div> </div>
<div class="detail-item"> <div class="detail-item">
<span class="label">Item Name：</span>
<span class="value">{{ detailData.itemName }}</span>
<span class="label">抽样数量：</span>
<span class="value">{{ detailData.sampleSize }}</span>
</div> </div>
</div> </div>
<!-- 第四行 - 尺寸信息 --> <!-- 第四行 - 尺寸信息 -->
<div class="detail-row"> <div class="detail-row">
<div class="detail-item"> <div class="detail-item">
<span class="label">Dim A：</span>
<span class="label">尺寸A：</span>
<span class="value">{{ detailData.dimA }}</span> <span class="value">{{ detailData.dimA }}</span>
</div> </div>
<div class="detail-item"> <div class="detail-item">
<span class="label">Dim B：</span>
<span class="label">尺寸B：</span>
<span class="value">{{ detailData.dimB }}</span> <span class="value">{{ detailData.dimB }}</span>
</div> </div>
<div class="detail-item"> <div class="detail-item">
<span class="label">Dim C：</span>
<span class="label">尺寸C：</span>
<span class="value">{{ detailData.dimC }}</span> <span class="value">{{ detailData.dimC }}</span>
</div> </div>
<div class="detail-item"> <div class="detail-item">
<span class="label">Dim D：</span>
<span class="label">尺寸D：</span>
<span class="value">{{ detailData.dimD }}</span> <span class="value">{{ detailData.dimD }}</span>
</div> </div>
<div class="detail-item"> <div class="detail-item">
<span class="label">Dim E：</span>
<span class="label">尺寸E：</span>
<span class="value">{{ detailData.dimE }}</span> <span class="value">{{ detailData.dimE }}</span>
</div> </div>
</div> </div>
@ -94,22 +89,17 @@
<!-- 第五行 --> <!-- 第五行 -->
<div class="detail-row"> <div class="detail-row">
<div class="detail-item"> <div class="detail-item">
<span class="label">Inspection Total：</span>
<span class="label">检验结果总计：</span>
<span class="value">{{ detailData.inspectionTotal }}</span> <span class="value">{{ detailData.inspectionTotal }}</span>
</div> </div>
<div class="detail-item"> <div class="detail-item">
<span class="label">Status：</span>
<span class="value">{{ getStatusText(detailData.inspectionStatus) }}</span>
</div>
<div class="detail-item">
<span class="label">Inspector：</span>
<span class="label">检验员姓名：</span>
<span class="value">{{ detailData.inspectorName }}</span> <span class="value">{{ detailData.inspectorName }}</span>
</div> </div>
<div class="detail-item"> <div class="detail-item">
<span class="label">Entry Date：</span>
<span class="label">录入日期：</span>
<span class="value">{{ formatDate(detailData.entryDate) }}</span> <span class="value">{{ formatDate(detailData.entryDate) }}</span>
</div> </div>
</div> </div>
@ -117,52 +107,52 @@
<!-- 第六行 --> <!-- 第六行 -->
<div class="detail-row"> <div class="detail-row">
<div class="detail-item"> <div class="detail-item">
<span class="label">Supplier Email：</span>
<span class="label">供应商邮箱：</span>
<span class="value">{{ detailData.supplierEmail }}</span> <span class="value">{{ detailData.supplierEmail }}</span>
</div> </div>
<div class="detail-item"> <div class="detail-item">
<span class="label">CA Request：</span>
<span class="value">{{ detailData.caRequest ? '是' : '否' }}</span>
<span class="label">纠正措施请求：</span>
<span class="value">{{ formatCaRequest(detailData.caRequest) }}</span>
</div> </div>
<div class="detail-item"> <div class="detail-item">
<span class="label">Collection Batch：</span>
<span class="label">收集/批次号：</span>
<span class="value">{{ detailData.collectionBatch }}</span> <span class="value">{{ detailData.collectionBatch }}</span>
</div> </div>
</div> </div>
<!-- 第七行 - 问题描述 --> <!-- 第七行 - 问题描述 -->
<div class="detail-row full-width"> <div class="detail-row full-width">
<span class="label">Problem：</span>
<span class="label">问题描述：</span>
<div class="value textarea">{{ detailData.problem }}</div> <div class="value textarea">{{ detailData.problem }}</div>
</div> </div>
<!-- 第八行 - 备注 --> <!-- 第八行 - 备注 -->
<div class="detail-row full-width"> <div class="detail-row full-width">
<span class="label">Comments：</span>
<span class="label">备注：</span>
<div class="value textarea">{{ detailData.comments }}</div> <div class="value textarea">{{ detailData.comments }}</div>
</div> </div>
<!-- 第九行 - 返工信息 --> <!-- 第九行 - 返工信息 -->
<div class="detail-row"> <div class="detail-row">
<div class="detail-item"> <div class="detail-item">
<span class="label">Rework Hours：</span>
<span class="label">返工工时：</span>
<span class="value">{{ detailData.reworkHours }}</span> <span class="value">{{ detailData.reworkHours }}</span>
</div> </div>
<div class="detail-item"> <div class="detail-item">
<span class="label">Rework Rate：</span>
<span class="label">返工费率：</span>
<span class="value">{{ detailData.reworkRate }}</span> <span class="value">{{ detailData.reworkRate }}</span>
</div> </div>
<div class="detail-item"> <div class="detail-item">
<span class="label">Rework Total：</span>
<span class="label">返工总成本：</span>
<span class="value">{{ detailData.reworkTotal }}</span> <span class="value">{{ detailData.reworkTotal }}</span>
</div> </div>
<div class="detail-item"> <div class="detail-item">
<span class="label">Material Cost：</span>
<span class="label">物料成本：</span>
<span class="value">{{ detailData.materialCost }}</span> <span class="value">{{ detailData.materialCost }}</span>
</div> </div>
</div> </div>
@ -213,6 +203,12 @@ export default {
'Cancelled': '已取消' 'Cancelled': '已取消'
} }
return statusMap[status] || status return statusMap[status] || status
},
formatCaRequest (caRequest) {
if (caRequest === true || caRequest === 'true' || caRequest === 1 || caRequest === '1') {
return '是'
}
return '否'
} }
} }
} }
@ -220,7 +216,7 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
.detail-container { .detail-container {
padding: 15px;
padding: 10px;
border: 1px solid #e4e7ed; border: 1px solid #e4e7ed;
background: #fff; background: #fff;
min-height: 300px; min-height: 300px;
@ -238,7 +234,7 @@ export default {
.detail-row { .detail-row {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 12px;
margin-bottom: 8px;
flex-wrap: wrap; flex-wrap: wrap;
} }
@ -247,39 +243,39 @@ export default {
align-items: flex-start; align-items: flex-start;
.label { .label {
margin-bottom: 5px;
margin-bottom: 3px;
} }
} }
.detail-item { .detail-item {
display: flex; display: flex;
align-items: center; align-items: center;
min-width: 280px;
margin-right: 20px;
margin-bottom: 5px;
min-width: 260px;
margin-right: 15px;
margin-bottom: 3px;
} }
.detail-item.long { .detail-item.long {
min-width: 400px;
min-width: 380px;
flex: 1; flex: 1;
} }
.label { .label {
color: #606266; color: #606266;
font-size: 13px;
font-size: 12px;
font-weight: 500; font-weight: 500;
white-space: nowrap; white-space: nowrap;
} }
.value { .value {
flex: 1; flex: 1;
min-height: 26px;
line-height: 26px;
padding: 0 8px;
min-height: 24px;
line-height: 24px;
padding: 0 6px;
border: 1px solid #dcdfe6; border: 1px solid #dcdfe6;
background: #fff; background: #fff;
color: #303133; color: #303133;
font-size: 13px;
font-size: 12px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
@ -287,9 +283,9 @@ export default {
.value.textarea { .value.textarea {
width: 100%; width: 100%;
min-height: 50px;
min-height: 40px;
line-height: 1.5; line-height: 1.5;
padding: 8px;
padding: 6px;
white-space: pre-wrap; white-space: pre-wrap;
word-break: break-all; word-break: break-all;
} }

72
src/views/modules/npcIqc/npcIqcList.vue
View File

@ -9,10 +9,10 @@
<el-form-item label="供应商名称" class="search-item"> <el-form-item label="供应商名称" class="search-item">
<el-input v-model="searchData.supplierName" style="width: 180px" @keyup.enter.native="getMainData"/> <el-input v-model="searchData.supplierName" style="width: 180px" @keyup.enter.native="getMainData"/>
</el-form-item> </el-form-item>
<el-form-item label="问题日期" class="search-item">
<el-form-item label="收货日期" class="search-item">
<div class="date-range"> <div class="date-range">
<el-date-picker <el-date-picker
v-model="searchData.issueDateStart"
v-model="searchData.dateReceivedStart"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="开始日期" placeholder="开始日期"
@ -21,7 +21,7 @@
</el-date-picker> </el-date-picker>
<span class="split">~</span> <span class="split">~</span>
<el-date-picker <el-date-picker
v-model="searchData.issueDateEnd"
v-model="searchData.dateReceivedEnd"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="结束日期" placeholder="结束日期"
@ -41,8 +41,8 @@
</el-form-item> </el-form-item>
</div> </div>
<div class="search-row"> <div class="search-row">
<el-form-item label="反馈单号" class="search-item">
<el-input v-model="searchData.issueNo" style="width: 120px" @keyup.enter.native="getMainData"/>
<el-form-item label="IQC检验单号" class="search-item">
<el-input v-model="searchData.iqcNo" style="width: 150px" @keyup.enter.native="getMainData"/>
</el-form-item> </el-form-item>
<el-form-item label="PO" class="search-item"> <el-form-item label="PO" class="search-item">
<el-input v-model="searchData.purOrder" style="width: 120px" @keyup.enter.native="getMainData"/> <el-input v-model="searchData.purOrder" style="width: 120px" @keyup.enter.native="getMainData"/>
@ -69,30 +69,34 @@
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%;" style="width: 100%;"
size="mini"> size="mini">
<el-table-column prop="iqcNo" label="Insp STAND" width="80" align="center" header-align="center" />
<el-table-column prop="purOrder" label="PUR C6" width="80" align="center" header-align="center" />
<el-table-column prop="supplierName" label="Supplier" min-width="150" align="left" header-align="center" show-overflow-tooltip />
<el-table-column prop="dateReceived" label="Date R" width="90" align="center" header-align="center" />
<el-table-column prop="itemCode" label="Item" width="100" align="left" header-align="center" />
<el-table-column prop="quantity" label="Quan" width="60" align="right" header-align="center" />
<el-table-column prop="sampleSize" label="Samp" width="60" align="right" header-align="center" />
<el-table-column prop="dimA" label="Di A" width="60" align="right" header-align="center" />
<el-table-column prop="dimB" label="Di B" width="60" align="right" header-align="center" />
<el-table-column prop="dimC" label="Di C" width="60" align="right" header-align="center" />
<el-table-column prop="dimD" label="Di D" width="60" align="right" header-align="center" />
<el-table-column prop="dimE" label="Di E" width="60" align="right" header-align="center" />
<el-table-column prop="inspectionTotal" label="Total Re" width="80" align="right" header-align="center" />
<el-table-column prop="problem" label="PROBLEM" min-width="150" align="left" header-align="center" show-overflow-tooltip />
<el-table-column prop="comments" label="Comment" min-width="120" align="left" header-align="center" show-overflow-tooltip />
<el-table-column prop="inspectorName" label="INSPEC" width="90" align="left" header-align="center" />
<el-table-column prop="supplierEmail" label="SUPPLIER E" width="120" align="left" header-align="center" show-overflow-tooltip />
<el-table-column prop="caRequest" label="CA R" width="60" align="center" header-align="center" />
<el-table-column prop="reworkHours" label="Rework" width="70" align="right" header-align="center" />
<el-table-column prop="reworkRate" label="Rewo" width="70" align="right" header-align="center" />
<el-table-column prop="reworkTotal" label="Rewo" width="70" align="right" header-align="center" />
<el-table-column prop="materialCost" label="Mater" width="70" align="right" header-align="center" />
<el-table-column prop="collectionBatch" label="Collec" width="80" align="left" header-align="center" />
<el-table-column prop="entryDate" label="Entry" width="90" align="center" header-align="center" />
<el-table-column prop="iqcNo" label="IQC检验单号" width="120" align="center" header-align="center" />
<el-table-column prop="purOrder" label="采购订单号" width="120" align="center" header-align="center" />
<el-table-column prop="supplierName" label="供应商名称" min-width="150" align="left" header-align="center" show-overflow-tooltip />
<el-table-column prop="dateReceived" label="收货日期" width="90" align="center" header-align="center" />
<el-table-column prop="itemCode" label="物料编码" width="100" align="left" header-align="center" />
<el-table-column prop="quantity" label="数量" width="60" align="right" header-align="center" />
<el-table-column prop="sampleSize" label="抽样数量" width="60" align="right" header-align="center" />
<el-table-column prop="dimA" label="尺寸A" width="60" align="right" header-align="center" />
<el-table-column prop="dimB" label="尺寸B" width="60" align="right" header-align="center" />
<el-table-column prop="dimC" label="尺寸C" width="60" align="right" header-align="center" />
<el-table-column prop="dimD" label="尺寸D" width="60" align="right" header-align="center" />
<el-table-column prop="dimE" label="尺寸E" width="60" align="right" header-align="center" />
<el-table-column prop="inspectionTotal" label="检验结果总计" width="80" align="right" header-align="center" />
<el-table-column prop="problem" label="问题描述" min-width="150" align="left" header-align="center" show-overflow-tooltip />
<el-table-column prop="comments" label="备注" min-width="120" align="left" header-align="center" show-overflow-tooltip />
<el-table-column prop="inspectorName" label="检验员姓名" width="90" align="left" header-align="center" />
<el-table-column prop="supplierEmail" label="供应商邮箱" width="120" align="left" header-align="center" show-overflow-tooltip />
<el-table-column prop="caRequest" label="纠正措施请求" width="80" align="center" header-align="center">
<template slot-scope="scope">
<span>{{ scope.row.caRequest === true || scope.row.caRequest === 'true' || scope.row.caRequest === 1 || scope.row.caRequest === '1' ? '是' : '否' }}</span>
</template>
</el-table-column>
<el-table-column prop="reworkHours" label="返工工时" width="70" align="right" header-align="center" />
<el-table-column prop="reworkRate" label="返工费率" width="70" align="right" header-align="center" />
<el-table-column prop="reworkTotal" label="返工总成本" width="70" align="right" header-align="center" />
<el-table-column prop="materialCost" label="物料成本" width="70" align="right" header-align="center" />
<el-table-column prop="collectionBatch" label="收集/批次号" width="80" align="left" header-align="center" />
<el-table-column prop="entryDate" label="录入日期" width="90" align="center" header-align="center" />
</el-table> </el-table>
<!-- 分页插件 --> <!-- 分页插件 -->
@ -157,7 +161,11 @@
<el-table-column prop="comments" label="Comments" align="left" min-width="150" show-overflow-tooltip></el-table-column> <el-table-column prop="comments" label="Comments" align="left" min-width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="inspectorName" label="INSPECTOR NAME" align="left" width="120"></el-table-column> <el-table-column prop="inspectorName" label="INSPECTOR NAME" align="left" width="120"></el-table-column>
<el-table-column prop="supplierEmail" label="SUPPLIER EMAIL" align="left" width="150" show-overflow-tooltip></el-table-column> <el-table-column prop="supplierEmail" label="SUPPLIER EMAIL" align="left" width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="caRequest" label="CA Request" align="center" width="90"></el-table-column>
<el-table-column prop="caRequest" label="CA Request" align="center" width="90">
<template slot-scope="scope">
<span>{{ scope.row.caRequest === true || scope.row.caRequest === 'true' || scope.row.caRequest === 1 || scope.row.caRequest === '1' ? '是' : '否' }}</span>
</template>
</el-table-column>
<el-table-column prop="reworkHours" label="Rework Hours" align="right" width="100"></el-table-column> <el-table-column prop="reworkHours" label="Rework Hours" align="right" width="100"></el-table-column>
<el-table-column prop="reworkRate" label="Rework Rate" align="right" width="90"></el-table-column> <el-table-column prop="reworkRate" label="Rework Rate" align="right" width="90"></el-table-column>
<el-table-column prop="reworkTotal" label="Rework Total" align="right" width="100"></el-table-column> <el-table-column prop="reworkTotal" label="Rework Total" align="right" width="100"></el-table-column>
@ -199,8 +207,8 @@ export default {
itemCode: '', itemCode: '',
purOrder: '', purOrder: '',
inspectionStatus: '', inspectionStatus: '',
issueDateStart: '',
issueDateEnd: '',
dateReceivedStart: '',
dateReceivedEnd: '',
page: 1, page: 1,
limit: 50 limit: 50
}, },

Write Preview
Loading…
Cancel
Save