常熟吴彦祖 2 months ago
parent
commit
d4d67b17aa
  1. 1
      src/views/modules/inspection/com_inspectionRequestDetailTab.vue
  2. 1
      src/views/modules/inspection/com_inspectionRequestPoDetailTab.vue
  3. 1
      src/views/modules/inspection/com_inspectionResultTab.vue
  4. 1
      src/views/modules/inspection/myInspectionList.vue
  5. 10
      src/views/modules/order/com_inspectionDetailList.vue
  6. 68
      src/views/modules/order/poOrder.vue
  7. 124
      src/views/modules/qc/IQCResultEntry.vue
  8. 19
      src/views/modules/qc/qcItem.vue
  9. 60
      src/views/modules/qc/qcPartAttribute.vue

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

@ -11,6 +11,7 @@
<el-table-column prop="partNo" label="产品编码" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="partDesc" 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"/>

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

@ -12,6 +12,7 @@
<el-table-column prop="partNo" label="产品编码" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="partDesc" 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>

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

@ -13,6 +13,7 @@
<el-table-column prop="partNo" label="产品编码" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="partDesc" 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>
</div>

1
src/views/modules/inspection/myInspectionList.vue

@ -19,6 +19,7 @@
<el-table-column prop="partNo" label="产品编码" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="partDesc" 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">
<template slot-scope="scope">
{{ getStatusText(scope.row.statusDb) }}

10
src/views/modules/order/com_inspectionDetailList.vue

@ -102,6 +102,16 @@ export default {
columnSortable: false,
fixed: false
},
{
columnProp: 'approveQty',
headerAlign: 'center',
align: 'center',
columnLabel: '检验通过数量',
columnWidth: '120',
columnHidden: false,
columnSortable: false,
fixed: false
},
{
columnProp: 'status',
headerAlign: 'center',

68
src/views/modules/order/poOrder.vue

@ -305,9 +305,9 @@
</el-row>
<el-row :gutter="12">
<el-col :span="6"><el-form-item label="SKU"><el-input v-model="addForm.sku" disabled /></el-form-item></el-col>
<el-col :span="6"><el-form-item label="Unit Price"><el-input v-model="addForm.price" type="number" /></el-form-item></el-col>
<el-col :span="6"><el-form-item label="PO Qty"><el-input v-model="addForm.qty" type="number" /></el-form-item></el-col>
<el-col :span="6"><el-form-item label="PO Value"><el-input v-model="addForm.value" /></el-form-item></el-col>
<el-col :span="6"><el-form-item label="Unit Price" required><el-input v-model="addForm.price" type="number" @input="recalcAddFormValue" /></el-form-item></el-col>
<el-col :span="6"><el-form-item label="PO Qty" required><el-input v-model="addForm.qty" type="number" @input="recalcAddFormValue" /></el-form-item></el-col>
<el-col :span="6"><el-form-item label="PO Value"><el-input v-model="addForm.value" disabled /></el-form-item></el-col>
</el-row>
<el-row :gutter="12">
<el-col :span="6"><el-form-item label="A-Qty"><el-input v-model="addForm.shipQty" /></el-form-item></el-col>
@ -754,7 +754,7 @@ export default {
fixed: '',
columnWidth: 80,
showOverflowTooltip: true,
editAble: false,
editAble: true,
editType: 'num',
selectOptionsKey: '',
selectOptions: null
@ -777,8 +777,8 @@ export default {
fixed: '',
columnWidth: 90,
showOverflowTooltip: true,
editAble: true,
editType: 'text',
editAble: false,
editType: 'num',
selectOptionsKey: '',
selectOptions: null
},
@ -1586,9 +1586,41 @@ export default {
this.getDataList()
},
onCellChange (row) {
if (row.price !== undefined || row.qty !== undefined) {
this.$set(row, 'value', this.calcPoValue(row.price, row.qty))
}
this.$set(row, 'changeFlag', 1)
},
calcPoValue (price, qty) {
if (price === '' || price == null || qty === '' || qty == null) {
return ''
}
const p = Number(price)
const q = Number(qty)
if (isNaN(p) || isNaN(q)) {
return ''
}
const total = p * q
return Number.isInteger(total) ? String(total) : String(Number(total.toFixed(4)))
},
recalcAddFormValue () {
this.addForm.value = this.calcPoValue(this.addForm.price, this.addForm.qty)
},
validatePriceAndQty (price, qty, label) {
if (price === '' || price == null) {
this.$message.warning((label ? label + ':' : '') + '请填写 Unit Price')
return false
}
if (qty === '' || qty == null) {
this.$message.warning((label ? label + ':' : '') + '请填写 PO Qty')
return false
}
return true
},
handleSupplierChange(row, supplierNo) {
console.log('供应商变更:', supplierNo, '行ID:', row.id)
@ -1744,6 +1776,7 @@ export default {
},
//
buildBatchUpdateRow (row) {
const value = this.calcPoValue(row.price, row.qty)
return {
orderNo: row.orderNo,
site: row.site,
@ -1761,9 +1794,9 @@ export default {
confirmed: row.confirmed,
partNo: row.partNo,
status: row.status,
qty: row.qty,
price: row.price,
value: row.value,
qty: row.qty === '' ? null : Number(row.qty),
price: row.price === '' ? null : Number(row.price),
value: value === '' ? null : Number(value),
shipQty: row.shipQty,
sumPrice: row.sumPrice,
wantReceiveDate: row.wantReceiveDate,
@ -1784,6 +1817,13 @@ export default {
},
batchUpdatePoOrder(changed) {
for (const row of changed) {
const label = row.orderNo ? `订单 ${row.orderNo}` : '订单'
if (!this.validatePriceAndQty(row.price, row.qty, label)) {
return
}
this.$set(row, 'value', this.calcPoValue(row.price, row.qty))
}
const updateData = changed.map(row => this.buildBatchUpdateRow(row))
//
@ -2057,12 +2097,18 @@ export default {
this.$message.warning('请填写 PO No、Vendor Name、Item')
return
}
if (!this.validatePriceAndQty(this.addForm.price, this.addForm.qty)) {
return
}
this.recalcAddFormValue()
this.addFormSaving = true
const calculatedValue = this.calcPoValue(this.addForm.price, this.addForm.qty)
const payload = {
...this.addForm,
site: this.$store.state.user.site,
price: this.addForm.price === '' ? null : Number(this.addForm.price),
qty: this.addForm.qty === '' ? null : Number(this.addForm.qty),
price: Number(this.addForm.price),
qty: Number(this.addForm.qty),
value: calculatedValue === '' ? null : Number(calculatedValue),
shipQty: this.addForm.shipQty === '' ? null : Number(this.addForm.shipQty),
sumPrice: this.addForm.sumPrice === '' ? null : Number(this.addForm.sumPrice)
}

124
src/views/modules/qc/IQCResultEntry.vue

@ -30,12 +30,12 @@
<el-form-item :label="'SKU'">
<el-input v-model="searchData.sku" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'PN'">
<el-input v-model="searchData.cinvSourceCode" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'物料类别'">
<el-input v-model="searchData.invdefinetype" clearable style="width: 120px"></el-input>
</el-form-item>
<!-- <el-form-item :label="'PN'">-->
<!-- <el-input v-model="searchData.cinvSourceCode" clearable style="width: 120px"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="'物料类别'">-->
<!-- <el-input v-model="searchData.invdefinetype" clearable style="width: 120px"></el-input>-->
<!-- </el-form-item>-->
</el-form>
<el-form :inline="true" label-position="top" :model="searchData">
<el-form-item :label="'供应商'">
@ -199,12 +199,12 @@
<el-form-item :label="'物料编码'">
<el-input v-model="detailData.partNo" disabled style="width: 100px"></el-input>
</el-form-item>
<el-form-item :label="'物料类别'">
<el-input v-model="detailData.invdefinetype" readonly style="width: 100px"></el-input>
</el-form-item>
<el-form-item :label="'PN'">
<el-input v-model="detailData.cinvSourceCode" readonly style="width: 100px"></el-input>
</el-form-item>
<!-- <el-form-item :label="'物料类别'">-->
<!-- <el-input v-model="detailData.invdefinetype" readonly style="width: 100px"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="'PN'">-->
<!-- <el-input v-model="detailData.cinvSourceCode" readonly style="width: 100px"></el-input>-->
<!-- </el-form-item>-->
<el-form-item :label="'SKU'">
<el-input v-model="detailData.sku" readonly style="width: 100px"></el-input>
</el-form-item>
@ -379,17 +379,17 @@
<el-button v-else type="primary" @click="subDetailModal(scope.row) ">点击输入</el-button>
</template>
</el-table-column> -->
<el-table-column
prop=""
header-align="center"
align="right"
min-width="80"
label="抽样数量">
<template slot-scope="scope">
<el-input-number :controls="false" :step="0" v-if="detailData.submitFlag === 'Y'" v-model="scope.row.samplingQty" disabled style="height: 11px; width: 98%"></el-input-number>
<el-input-number :controls="false" :step="0" v-else :ref="`samplingQty${scope.$index}`" v-model="scope.row.samplingQty" @keyup.enter.native="focusNextInput(scope.$index, 'samplingQty')" style="height: 11px; width: 98%"></el-input-number>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop=""-->
<!-- header-align="center"-->
<!-- align="right"-->
<!-- min-width="80"-->
<!-- label="抽样数量">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input-number :controls="false" :step="0" v-if="detailData.submitFlag === 'Y'" v-model="scope.row.samplingQty" disabled style="height: 11px; width: 98%"></el-input-number>-->
<!-- <el-input-number :controls="false" :step="0" v-else :ref="`samplingQty${scope.$index}`" v-model="scope.row.samplingQty" @keyup.enter.native="focusNextInput(scope.$index, 'samplingQty')" style="height: 11px; width: 98%"></el-input-number>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column
prop=""
header-align="center"
@ -1124,42 +1124,42 @@
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1CinvSourceCode',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'cinvSourceCode',
headerAlign: "center",
align: "center",
columnLabel: 'PN',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1Invdefinetype',
tableId: "301006Table1",
tableName: "IPQC检验记录表",
columnProp: 'invdefinetype',
headerAlign: "center",
align: "left",
columnLabel: '物料类别',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
// {
// userId: this.$store.state.user.name,
// functionId: 301006,
// serialNumber: '301006Table1CinvSourceCode',
// tableId: "301006Table1",
// tableName: "IQC",
// columnProp: 'cinvSourceCode',
// headerAlign: "center",
// align: "center",
// columnLabel: 'PN',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 120,
// },
// {
// userId: this.$store.state.user.name,
// functionId: 301006,
// serialNumber: '301006Table1Invdefinetype',
// tableId: "301006Table1",
// tableName: "IPQC",
// columnProp: 'invdefinetype',
// headerAlign: "center",
// align: "left",
// columnLabel: '',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 120,
// },
{
userId: this.$store.state.user.name,
functionId: 301006,
@ -2821,7 +2821,6 @@
this.detailData.responsiblePersonName = row.responsiblePersonName
this.detailData.invdefinetype = row.invdefinetype
this.detailData.state = row.state
// if (row.state === '') {
// this.detailData.passQty = row.samplingQty
// } else {
@ -2833,6 +2832,11 @@
this.detailData.notPassQty = row.notPassQty
this.detailData.noBatchQualifiedQty = this.detailData.samplingQty - this.detailData.passQty
this.detailData.batchQualifiedQty = row.batchQualifiedQty
if (row.state === '待检验'&&this.detailData.inspectionResult==='待检验') {
this.detailData.inspectionResult='合格'
this.detailData.batchQualifiedQty =this.detailData.rollQty
this.detailData.rollCount=this.detailData.rollQty
}
this.getInspectionFormData()
this.inspectorSearch()
// this.acquisitionList = []

19
src/views/modules/qc/qcItem.vue

@ -181,17 +181,14 @@
<el-input v-if="modalData.valueTypeDb === 'N'" v-model="modalData.minValue" type="number" style="width: 143px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="抽样数量">
<el-input v-model="modalData.itemSamplingQuantity" type="number" style="width: 143px"></el-input>
</el-form-item>
<el-form-item label="抽样比例%">
<el-input v-model="modalData.defaultSamplingProportion" type="number" style="width: 143px"></el-input>
</el-form-item>
<!-- <el-form-item label=" " style="margin-left: 30px">
<el-checkbox v-model="modalData.collectionFlag" true-label="Y">采集标记</el-checkbox>
</el-form-item> -->
</el-form>
<!-- <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">-->
<!-- <el-form-item label="抽样数量">-->
<!-- <el-input v-model="modalData.itemSamplingQuantity" type="number" style="width: 143px"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="抽样比例%">-->
<!-- <el-input v-model="modalData.defaultSamplingProportion" type="number" style="width: 143px"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="采集数据来源">
<el-select multiple collapse-tags v-model="modalData.collectionSourceList" style="width: 220px">

60
src/views/modules/qc/qcPartAttribute.vue

@ -119,9 +119,9 @@
</el-option>
</el-select>
</el-form-item> -->
<el-form-item style="margin-top: 23px;margin-left: 2px">
<el-checkbox v-model="modalData.exemptInspection" true-label="Y">是否免检</el-checkbox><br>
</el-form-item>
<!-- <el-form-item style="margin-top: 23px;margin-left: 2px">-->
<!-- <el-checkbox v-model="modalData.exemptInspection" true-label="Y">是否免检</el-checkbox><br>-->
<!-- </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="partNo" :rules="rules.partNoType">
@ -650,9 +650,9 @@
<el-form-item label="SKU">
<el-input v-model="partDetailData.sku" clearable style="width: 100px"></el-input>
</el-form-item>
<el-form-item label="PN">
<el-input v-model="partDetailData.cinvSourceCode" clearable style="width: 100px"></el-input>
</el-form-item>
<!-- <el-form-item label="PN">-->
<!-- <el-input v-model="partDetailData.cinvSourceCode" clearable style="width: 100px"></el-input>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" @click="searchPartInfo()" style="margin-top: 24px">查询</el-button>
</el-form-item>
@ -682,12 +682,12 @@
align="center"
label="SKU">
</el-table-column>
<el-table-column
prop="cinvSourceCode"
header-align="center"
align="center"
label="PN">
</el-table-column>
<!-- <el-table-column-->
<!-- prop="cinvSourceCode"-->
<!-- header-align="center"-->
<!-- align="center"-->
<!-- label="PN">-->
<!-- </el-table-column>-->
</el-table>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="partDisableFlag = false">关闭</el-button>
@ -878,24 +878,24 @@
fixed: '',
columnWidth: 300,
},
{
userId: this.$store.state.user.name,
functionId: 301003,
serialNumber: '301003Table1CinvSourceCode',
tableId: "301003Table1",
tableName: "物料属性设置表",
columnProp: 'cinvSourceCode',
headerAlign: "center",
align: "center",
columnLabel: 'PN',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
// {
// userId: this.$store.state.user.name,
// functionId: 301003,
// serialNumber: '301003Table1CinvSourceCode',
// tableId: "301003Table1",
// tableName: "",
// columnProp: 'cinvSourceCode',
// headerAlign: "center",
// align: "center",
// columnLabel: 'PN',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 120,
// },
{
userId: this.$store.state.user.name,
functionId: 301003,

Loading…
Cancel
Save