diff --git a/src/views/modules/inspection/com_inspectionRequestDetailTab.vue b/src/views/modules/inspection/com_inspectionRequestDetailTab.vue
index eae286c..3283c9a 100644
--- a/src/views/modules/inspection/com_inspectionRequestDetailTab.vue
+++ b/src/views/modules/inspection/com_inspectionRequestDetailTab.vue
@@ -11,6 +11,7 @@
+
diff --git a/src/views/modules/inspection/com_inspectionRequestPoDetailTab.vue b/src/views/modules/inspection/com_inspectionRequestPoDetailTab.vue
index d1e8abf..1c67232 100644
--- a/src/views/modules/inspection/com_inspectionRequestPoDetailTab.vue
+++ b/src/views/modules/inspection/com_inspectionRequestPoDetailTab.vue
@@ -12,6 +12,7 @@
+
diff --git a/src/views/modules/inspection/com_inspectionResultTab.vue b/src/views/modules/inspection/com_inspectionResultTab.vue
index 5c43d67..5dc88fb 100644
--- a/src/views/modules/inspection/com_inspectionResultTab.vue
+++ b/src/views/modules/inspection/com_inspectionResultTab.vue
@@ -13,6 +13,7 @@
+
diff --git a/src/views/modules/inspection/myInspectionList.vue b/src/views/modules/inspection/myInspectionList.vue
index 0dcd19b..24ae59c 100644
--- a/src/views/modules/inspection/myInspectionList.vue
+++ b/src/views/modules/inspection/myInspectionList.vue
@@ -19,6 +19,7 @@
+
{{ getStatusText(scope.row.statusDb) }}
diff --git a/src/views/modules/order/com_inspectionDetailList.vue b/src/views/modules/order/com_inspectionDetailList.vue
index 3daa902..5549c0e 100644
--- a/src/views/modules/order/com_inspectionDetailList.vue
+++ b/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',
diff --git a/src/views/modules/order/poOrder.vue b/src/views/modules/order/poOrder.vue
index 2ab120f..44cca07 100644
--- a/src/views/modules/order/poOrder.vue
+++ b/src/views/modules/order/poOrder.vue
@@ -305,9 +305,9 @@
-
-
-
+
+
+
@@ -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)
}
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index cdc2da4..1dbeff3 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -30,12 +30,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -199,12 +199,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -379,17 +379,17 @@
点击输入
-->
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
- 是否免检
-
+
+
+
@@ -650,9 +650,9 @@
-
-
-
+
+
+
查询
@@ -682,12 +682,12 @@
align="center"
label="SKU">
-
-
+
+
+
+
+
+
关闭
@@ -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,