diff --git a/yxt-as-ui/src/api/purchase/procurement.js b/yxt-as-ui/src/api/purchase/procurement.js
index 140960fefd..c4dd99d164 100644
--- a/yxt-as-ui/src/api/purchase/procurement.js
+++ b/yxt-as-ui/src/api/purchase/procurement.js
@@ -25,6 +25,13 @@ export default {
headers: { 'Content-Type': 'application/json' }
})
},
+ updateManuOrderNum: function(data) {
+ return request({
+ url: '/pms/v1/pmspurchasebill/updateManuOrderNum',
+ method: 'post',
+ params: data
+ })
+ },
deleteBySids: function(data) {
return request({
url: '/pms/v1/pmspurchasebill/delBySids',
diff --git a/yxt-as-ui/src/views/purchase/procurement/procurement.vue b/yxt-as-ui/src/views/purchase/procurement/procurement.vue
index 7afe53f3a3..29f3f61dc7 100644
--- a/yxt-as-ui/src/views/purchase/procurement/procurement.vue
+++ b/yxt-as-ui/src/views/purchase/procurement/procurement.vue
@@ -95,6 +95,7 @@
+
@@ -114,6 +115,47 @@
+
+
+
+
+
+ 采购单编号
+ {{ formobj.billNo }}
+
+
+
+
+ 采购方式
+ {{ formobj.purchaseTypeValue }}
+
+
+ 采购原因
+ {{ formobj.purchaseReasonValue }}
+
+
+
+
+ 付款方式
+ {{ formobj.payTypeValue }}
+
+
+ 供应商
+ {{ formobj.supplierName }}
+
+
+
+
+ 厂家订单号
+
+
+
+
+
+
@@ -141,6 +183,19 @@ export default {
url: '',
dialogHeight: '80%',
centerDialogVisible: false,
+ dialogVisible: false,
+ formobj: {
+ sid: '',
+ manufacturersOrderNumber: '',
+ billNo: '',
+ purchaseTypeValue: '',
+ purchaseReasonValue: '',
+ payTypeValue: '',
+ supplierName: ''
+ },
+ rules: {
+ manufacturersOrderNumber: [{ required: true, message: '厂家订单号不能为空', trigger: 'blur' }]
+ },
btndisabled: false,
btnList: [
{
@@ -157,6 +212,13 @@ export default {
btnKey: 'doDel',
btnLabel: '删除'
},
+ {
+ type: 'primary',
+ size: 'small',
+ icon: '',
+ btnKey: 'toMaintain',
+ btnLabel: '维护厂家订单号'
+ },
{
type: 'info',
size: 'small',
@@ -171,6 +233,7 @@ export default {
tableKey: 0,
list: [],
sids: [], // 用于导出的时候保存已选择的SIDs
+ multipleSelection: [],
procurementType_list: [],
procurementReason_list: [],
paymentMethod_list: [],
@@ -286,6 +349,9 @@ export default {
case 'doDel':
this.doDel()
break
+ case 'toMaintain':
+ this.toMaintain()
+ break
case 'doClose':
this.doClose()
break
@@ -296,6 +362,7 @@ export default {
// 信息条数 获取点击时当前的sid
handleSelectionChange(row) {
const aa = []
+ this.multipleSelection = row
row.forEach(element => {
aa.push(element.sid)
})
@@ -397,6 +464,37 @@ export default {
}).catch(() => {
})
},
+ toMaintain() {
+ if (this.sids.length === 1) {
+ this.dialogVisible = true
+ this.$nextTick(() => {
+ this.$refs['form_obj'].clearValidate()
+ })
+ this.formobj.sid = this.multipleSelection[0].sid
+ this.formobj.manufacturersOrderNumber = this.multipleSelection[0].manufacturersOrderNumber
+ this.formobj.billNo = this.multipleSelection[0].billNo
+ this.formobj.purchaseTypeValue = this.multipleSelection[0].purchaseTypeValue
+ this.formobj.purchaseReasonValue = this.multipleSelection[0].purchaseReasonValue
+ this.formobj.payTypeValue = this.multipleSelection[0].payTypeValue
+ this.formobj.supplierName = this.multipleSelection[0].supplierName
+ } else {
+ this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
+ return
+ }
+ },
+ handleConfirm() {
+ this.$refs['form_obj'].validate((valid) => {
+ if (valid) {
+ req.updateManuOrderNum({ sid: this.formobj.sid, manufacturersOrderNumber: this.formobj.manufacturersOrderNumber }).then((resp) => {
+ if (resp.success) {
+ this.dialogVisible = false
+ this.$message({ showClose: true, type: 'success', message: '保存成功' })
+ this.getList()
+ }
+ })
+ }
+ })
+ },
// 修改、编辑、详情返回列表页面
resetState() {
this.viewState = 1
@@ -409,4 +507,17 @@ export default {
}
diff --git a/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue b/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue
index 37054a71f6..385a8ee295 100644
--- a/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue
+++ b/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue
@@ -98,6 +98,20 @@
累计欠款金额(元)：
+
+
+ 厂家订单类型
+
+
+
+
+
+
+
+ 厂家订单号
+ {{ formobj.manufacturersOrderNumber }}
+
+
备注
@@ -256,6 +270,7 @@ export default {
paymentMethod_list: [],
supplier_list: [],
warehouseType_list: [],
+ manufacturersOrderType_list: [],
account_list: [],
formobj: {
sid: '',
@@ -300,6 +315,9 @@ export default {
operateBrandValue: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
+ manufacturersOrderTypeValue: '',
+ manufacturersOrderTypeKey: '',
+ manufacturersOrderNumber: '',
purchasePay: {
sid: '',
billSid: '',
@@ -397,6 +415,11 @@ export default {
this.warehouseType_list = res.data
}
})
+ typeValues({ type: 'manufacturersOrderType' }).then((res) => {
+ if (res.success) {
+ this.manufacturersOrderType_list = res.data
+ }
+ })
typeValues({ type: 'procurementReason' }).then((res) => {
if (res.success) {
this.procurementReason_list = res.data
@@ -519,6 +542,14 @@ export default {
this.formobj.warehouseTypeKey = ''
}
},
+ manufacturersOrderTypeChange(value) {
+ const choose = this.manufacturersOrderType_list.filter((item) => item.dictKey === value)
+ if (choose !== null && choose.length > 0) {
+ this.formobj.manufacturersOrderTypeValue = choose[0].dictValue
+ } else {
+ this.formobj.manufacturersOrderTypeValue = ''
+ }
+ },
isInvoicingChange(val) {
if (val === '1') {
const choose = this.supplier_list.filter((item) => item.sid === this.formobj.supplierSid)
@@ -668,6 +699,9 @@ export default {
operateBrandValue: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
+ manufacturersOrderTypeValue: '',
+ manufacturersOrderTypeKey: '',
+ manufacturersOrderNumber: '',
purchasePay: {
sid: '',
billSid: '',
diff --git a/yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue b/yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue
index 05d21b6121..3b30509a82 100644
--- a/yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue
+++ b/yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue
@@ -65,6 +65,16 @@
累计欠款金额(元)：{{ formobj.owedAmount }}
+
+
+ 厂家订单类型
+ {{ formobj.manufacturersOrderTypeValue }}
+
+
+ 厂家订单号
+ {{ formobj.manufacturersOrderNumber }}
+
+
备注
@@ -216,6 +226,9 @@ export default {
operateBrandValue: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
+ manufacturersOrderTypeValue: '',
+ manufacturersOrderTypeKey: '',
+ manufacturersOrderNumber: '',
purchasePay: {
sid: '',
billSid: '',
@@ -336,6 +349,9 @@ export default {
operateBrandValue: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
+ manufacturersOrderTypeValue: '',
+ manufacturersOrderTypeKey: '',
+ manufacturersOrderNumber: '',
purchasePay: {
sid: '',
billSid: '',
diff --git a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue
index f7dc1096db..2751128db5 100644
--- a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue
@@ -68,6 +68,16 @@
累计欠款金额(元)：{{ formobj.owedAmount }}
+
+
+ 厂家订单类型
+ {{ formobj.manufacturersOrderTypeValue }}
+
+
+ 厂家订单号
+ {{ formobj.manufacturersOrderNumber }}
+
+
备注
@@ -258,6 +268,9 @@ export default {
operateBrandValue: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
+ manufacturersOrderTypeValue: '',
+ manufacturersOrderTypeKey: '',
+ manufacturersOrderNumber: '',
purchasePay: {
sid: '',
billSid: '',
diff --git a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue
index 7b72226814..1504e58f2a 100644
--- a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue
@@ -97,6 +97,20 @@
累计欠款金额(元)：
+
+
+ 厂家订单类型
+
+
+
+
+
+
+
+ 厂家订单号
+ {{ formobj.manufacturersOrderNumber }}
+
+
备注
@@ -255,6 +269,7 @@ export default {
paymentMethod_list: [],
supplier_list: [],
warehouseType_list: [],
+ manufacturersOrderType_list: [],
account_list: [],
formobj: {
sid: '',
@@ -299,6 +314,9 @@ export default {
operateBrandValue: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
+ manufacturersOrderTypeValue: '',
+ manufacturersOrderTypeKey: '',
+ manufacturersOrderNumber: '',
purchasePay: {
sid: '',
billSid: '',
@@ -413,6 +431,11 @@ export default {
this.warehouseType_list = res.data
}
})
+ typeValues({ type: 'manufacturersOrderType' }).then((res) => {
+ if (res.success) {
+ this.manufacturersOrderType_list = res.data
+ }
+ })
typeValues({ type: 'procurementReason' }).then((res) => {
if (res.success) {
this.procurementReason_list = res.data
@@ -510,6 +533,14 @@ export default {
this.formobj.warehouseTypeKey = ''
}
},
+ manufacturersOrderTypeChange(value) {
+ const choose = this.manufacturersOrderType_list.filter((item) => item.dictKey === value)
+ if (choose !== null && choose.length > 0) {
+ this.formobj.manufacturersOrderTypeValue = choose[0].dictValue
+ } else {
+ this.formobj.manufacturersOrderTypeValue = ''
+ }
+ },
isInvoicingChange(val) {
if (val === '1') {
const choose = this.supplier_list.filter((item) => item.sid === this.formobj.supplierSid)
diff --git a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue
index 5a3557b170..c7a2bea3bc 100644
--- a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue
@@ -65,6 +65,16 @@
累计欠款金额(元)：{{ formobj.owedAmount }}
+
+
+ 厂家订单类型
+ {{ formobj.manufacturersOrderTypeValue }}
+
+
+ 厂家订单号
+ {{ formobj.manufacturersOrderNumber }}
+
+
备注
@@ -216,6 +226,9 @@ export default {
operateBrandValue: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
+ manufacturersOrderTypeValue: '',
+ manufacturersOrderTypeKey: '',
+ manufacturersOrderNumber: '',
purchasePay: {
sid: '',
billSid: '',