Browse Source

修改页签显示

master
qiankanghui 2 weeks ago
parent
commit
46558e534a
  1. 49
      src/views/modules/inspection/com_inspectionRequestDetailTab.vue
  2. 26
      src/views/modules/inspection/com_inspectionRequestPoDetailTab.vue
  3. 27
      src/views/modules/inspection/com_inspectionResultTab.vue
  4. 2
      src/views/modules/inspection/inspectionRequestList.vue
  5. 22
      src/views/modules/npcIqc/logisticsManagement.vue

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

@ -7,24 +7,21 @@
{{ scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column prop="orderRef1" label="PO号" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="partNo" label="产品编码" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="item" label="Item" header-align="center" align="left" min-width="120" show-overflow-tooltip/>
<el-table-column prop="partDesc" label="物料名称" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="sku" label="SKU" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="categoryLevel2" label="一级物料分类" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="categoryLevel3" label="二级物料分类" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="qty" label="验货数量" header-align="center" align="right" width="120"/>
<el-table-column prop="approveQty" label="检验通过数量" header-align="center" align="right" width="120"/>
<el-table-column prop="status" label="状态" header-align="center" align="center" width="100"/>
<el-table-column prop="inspectNo" label="验货单号" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="inspectResult" label="验货结果" header-align="center" align="center" width="120"/>
<el-table-column prop="orderRef2" label="PO行号" header-align="center" align="center" width="80"/>
<el-table-column prop="orderRef1" label="PO号" header-align="center" align="center" width="120" 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="qty" label="此次验货数量" header-align="center" align="right" width="110"/>
<el-table-column prop="shipMothod" label="运输方式" header-align="center" align="center" width="100"/>
<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="planner" label="Planner" header-align="center" align="left" min-width="120" show-overflow-tooltip/>
</el-table>
</div>
</template>
<script>
import { getInspectionRequestDetailList } from '@/api/inspection/inspectionRequestHeader.js'
import { getInspectionRequestDetailSubList } from '@/api/inspection/inspectionRequestHeader.js'
export default {
name: 'InspectionRequestDetailTab',
@ -63,7 +60,7 @@ export default {
},
methods: {
// 加载明细列表
// 加载明细列表(与新增弹窗「PO明细」同源,按 PO 行级展示)
loadDetailList () {
if (!this.detailData.requestNo || !this.detailData.site) {
this.detailList = []
@ -71,37 +68,17 @@ export default {
}
this.loading = true
getInspectionRequestDetailList({
getInspectionRequestDetailSubList({
requestNo: this.detailData.requestNo,
site: this.detailData.site
}).then(({ data }) => {
if (data.code === 0) {
const list = (data.page && data.page.list) || []
// 转换状态显示
this.detailList = list.map(item => {
return {
...item,
status: item.status || this.getStatusText(item.statusDb)
}
})
this.detailList = (data.page && data.page.list) || []
}
this.loading = false
}).catch(() => {
this.loading = false
})
},
// 状态转换
getStatusText (statusDb) {
const statusMap = {
'DRAFT': '草稿',
'PENDING': '待检验',
'INSPECTING': '检验中',
'INSPECTED': '已检验',
'COMPLETED': '已完成',
'CANCELLED': '已取消'
}
return statusMap[statusDb] || statusDb || '-'
}
}
}

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

@ -7,18 +7,20 @@
{{ scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column prop="orderRef1" label="PO号" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="orderRef2" label="PO行号" header-align="center" align="center" width="100"/>
<el-table-column prop="partNo" label="产品编码" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="item" label="Item" header-align="center" align="left" min-width="120" show-overflow-tooltip/>
<el-table-column prop="partDesc" label="物料名称" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="sku" label="SKU" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="categoryLevel2" label="一级物料分类" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="categoryLevel3" label="二级物料分类" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="qty" label="验货数量" header-align="center" align="right" width="120"/>
<el-table-column prop="approveQty" label="检验通过数量" header-align="center" align="right" width="120"/>
<el-table-column prop="shipMothod" label="运输方式" 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="orderRef2" label="PO行号" header-align="center" align="center" width="80"/>
<el-table-column prop="orderRef1" label="PO号" header-align="center" align="center" min-width="120" 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="qty" label="此次验货数量" header-align="center" align="right" width="110"/>
<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="issueDate" label="D_Issue" header-align="center" align="center" width="110"/>
<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="standardTt" label="Standard_TT" header-align="center" align="center" width="110"/>
<el-table-column prop="departure" label="P_Departure" header-align="center" align="center" width="120" show-overflow-tooltip/>
<el-table-column prop="destination" label="P_Destination" header-align="center" align="center" width="130" show-overflow-tooltip/>
<el-table-column prop="planner" label="Planner" header-align="center" align="left" min-width="120" show-overflow-tooltip/>
</el-table>
</div>
</template>

27
src/views/modules/inspection/com_inspectionResultTab.vue

@ -7,18 +7,21 @@
{{ scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column prop="requestNo" label="任务单号" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="poNo" label="PO号" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="poItemNo" label="PO行号" header-align="center" align="center" width="100"/>
<el-table-column prop="partNo" label="产品编码" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="item" label="Item" header-align="center" align="left" min-width="120" show-overflow-tooltip/>
<el-table-column prop="partDesc" label="物料名称" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="sku" label="SKU" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="categoryLevel2" label="一级物料分类" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="categoryLevel3" label="二级物料分类" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="qty" label="验货数量" header-align="center" align="right" width="120"/>
<el-table-column prop="approveQty" label="检验通过数量" header-align="center" align="right" width="120"/>
<el-table-column prop="inspectResult" label="验货结果" header-align="center" align="center" width="120"/>
<el-table-column prop="orderRef2" label="PO行号" header-align="center" align="center" width="80"/>
<el-table-column prop="poNo" label="PO号" header-align="center" align="center" min-width="120" 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="qty" label="此次验货数量" header-align="center" align="right" width="110"/>
<el-table-column prop="shipMethod" label="运输方式" header-align="center" align="center" width="100"/>
<el-table-column prop="crd" label="CRD" header-align="center" align="center" width="120"/>
<el-table-column prop="qcOperator" label="QC" header-align="center" align="center" width="100" show-overflow-tooltip/>
<el-table-column prop="eta" label="ETA" header-align="center" align="center" width="110"/>
<el-table-column prop="planner" label="Planner" header-align="center" align="left" min-width="110" show-overflow-tooltip/>
<el-table-column prop="approveQty" label="实际验货数量" header-align="center" align="right" width="110"/>
<el-table-column prop="samplingQty" label="抽样数" header-align="center" align="right" width="90"/>
<el-table-column prop="passQty" label="抽样合格数" header-align="center" align="right" width="100"/>
<el-table-column prop="inspectionResultQc" label="检验结果" header-align="center" align="center" width="110" show-overflow-tooltip/>
<el-table-column prop="inspectionRemark" label="验货结果备注" header-align="center" align="left" min-width="160" show-overflow-tooltip/>
</el-table>
</div>
</template>

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

@ -3132,7 +3132,7 @@ export default {
// 加载订单来源供应商分页列表(专用后端方法)
loadOrderSupplierList () {
const params = {
currentPlannerOnly: !this.isSupplierPageMode, // rqrq - 本人负责的订单
// currentPlannerOnly: !this.isSupplierPageMode, // rqrq - 本人负责的订单
site: this.$store.state.user.site,
page: this.orderSupplierPageIndex,
limit: this.orderSupplierPageSize,

22
src/views/modules/npcIqc/logisticsManagement.vue

@ -3,6 +3,13 @@
<!-- 查询条件 -->
<el-form :inline="true" label-position="top" class="search-form-inline">
<div class="search-row">
<!-- Customer 查询条件:与 poOrder 一致,使用权限驱动的 Customer 选择器,默认选中权限内首个 Customer -->
<com-po-order-customer-picker
class="search-item"
embedded
:site="searchData.site"
v-model="searchData.customer"
@change="onCustomerSearchChange" />
<el-form-item label="LOGISTICS ID" class="search-item">
<el-input v-model="searchData.flexId" style="width: 150px" @keyup.enter.native="getMainData"/>
</el-form-item>
@ -14,8 +21,8 @@
<el-input v-model="searchData.supplierName" style="width: 200px" @keyup.enter.native="getMainData"/>
</el-form-item>
<el-form-item label=" " class="search-item search-btn-item">
<el-button type="primary" @click="getMainData">查询</el-button>
<el-button type="primary" @click="exportExcel" style="margin-left: 2px">导出</el-button>
<el-button type="primary" @click="getMainData" :disabled="!searchData.customer">查询</el-button>
<el-button type="primary" @click="exportExcel" style="margin-left: 2px" :disabled="!searchData.customer">导出</el-button>
<el-button type="primary" @click="openAddDialog" style="margin-left: 2px">新增</el-button>
</el-form-item>
</div>
@ -295,6 +302,7 @@ export default {
flexId: '',
supplierNo: '',
supplierName: '',
customer: '',
site: this.$store.state.user.site,
page: 1,
limit: 50
@ -363,7 +371,8 @@ export default {
const calculatedHeight = (window.innerHeight - 220) / 2
this.height = calculatedHeight
this.detailHeight = calculatedHeight
this.getMainData()
// 与 poOrder 一致:首次查询由 Customer 选择器加载完权限后的 change 事件驱动,
// 避免在未选 Customer 时查出无权限范围的全量数据
})
},
methods: {
@ -373,6 +382,13 @@ export default {
this.detailHeight = height * 0.5
},
// Customer 查询条件变更:重置到第一页并按当前 Customer 过滤(与 poOrder 一致,由权限内的 Customer 驱动查询)
onCustomerSearchChange (customer) {
this.searchData.customer = customer || ''
this.pageIndex = 1
this.getMainData()
},
// 查询数据
getMainData () {
this.searchData.limit = this.pageSize

Loading…
Cancel
Save