diff --git a/src/views/Clue/Order/Comp/DialogDelivery.vue b/src/views/Clue/Order/Comp/DialogDelivery.vue
index 40822e2..544eb9a 100644
--- a/src/views/Clue/Order/Comp/DialogDelivery.vue
+++ b/src/views/Clue/Order/Comp/DialogDelivery.vue
@@ -77,6 +77,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -98,7 +124,7 @@
-
+
@@ -116,15 +142,20 @@ import { getSimpleWarehouseList, getRemainInventoryList } from '@/api/mall/wareh
import { createDelivery } from '@/api/clue/delivery'
import { getConfigList } from '@/api/system/set'
import { getDictOptions } from '@/utils/dict'
+import { getExtraFeeSimpleList } from '@/api/clue/extraFee'
const message = useMessage() // 消息弹窗
const warehouseOptions = ref([])
+const extraPayOptions = ref([])
const supplierOptions = getDictOptions('erp_supplier')
function getOptions() {
getSimpleWarehouseList().then((data) => {
warehouseOptions.value = data
})
+ getExtraFeeSimpleList().then((data) => {
+ extraPayOptions.value = data
+ })
}
function getRemainInventory(signProductId) {
@@ -144,6 +175,7 @@ defineExpose({
})
const form = ref({})
+const extraPay = ref({})
const rules = ref({
supplier: { required: true, message: '供应商不可为空', trigger: 'change' },
warehouseId: { required: true, message: '仓库不可为空', trigger: 'change' },
@@ -164,6 +196,11 @@ function resetForm(row) {
unitPrice: undefined,
remark: undefined
}
+ extraPay.value = {
+ extraPayType: undefined,
+ extraPayMoney: undefined,
+ remark: undefined
+ }
}
const emit = defineEmits(['success'])
@@ -209,6 +246,9 @@ async function onSubmit() {
unitPrice: form.value.unitPrice,
warehouseId: form.value.warehouseId
}
+ if (extraPay.value.extraPayMoney) {
+ params.purchaseOrder.extraPay = [extraPay.value]
+ }
} else {
params.detailList = deliveryArr.value
}
diff --git a/src/views/Clue/Order/Comp/Reback.vue b/src/views/Clue/Order/Comp/Reback.vue
index 33ce76e..9cd273a 100644
--- a/src/views/Clue/Order/Comp/Reback.vue
+++ b/src/views/Clue/Order/Comp/Reback.vue
@@ -186,7 +186,15 @@
-
+
+
+
+
+
+
+ {{ row.isPayoff }}
+
+
{
message.success('修改成功')
+ getList()
})
.finally(() => {
row.edit = false
})
} else {
row.edit = true
+ row.isPayoffValue = row.isPayoff == '结清'
}
}