正在显示
1 个修改的文件
包含
126 行增加
和
15 行删除
| @@ -379,7 +379,7 @@ | @@ -379,7 +379,7 @@ | ||
| 379 | > | 379 | > |
| 380 | <a-spin :spinning="confirmLoading" v-if="roleCode ==='pur'"> | 380 | <a-spin :spinning="confirmLoading" v-if="roleCode ==='pur'"> |
| 381 | <j-form-container> | 381 | <j-form-container> |
| 382 | - <a-form-model ref="form" :model="modelfp" :rules="validatorRules2" slot="detail"> | 382 | + <a-form-model ref="form" :model="modelfp" :rules="validatorRulesfp" slot="detail"> |
| 383 | <a-row> | 383 | <a-row> |
| 384 | <a-col :span="12"> | 384 | <a-col :span="12"> |
| 385 | <a-form-model-item label="发票号码" :labelCol="labelCol" :wrapperCol="wrapperCol" | 385 | <a-form-model-item label="发票号码" :labelCol="labelCol" :wrapperCol="wrapperCol" |
| @@ -467,7 +467,7 @@ | @@ -467,7 +467,7 @@ | ||
| 467 | 467 | ||
| 468 | <a-spin :spinning="confirmLoading" v-if="roleCode ==='pur'"> | 468 | <a-spin :spinning="confirmLoading" v-if="roleCode ==='pur'"> |
| 469 | <j-form-container> | 469 | <j-form-container> |
| 470 | - <a-form-model ref="form" :model="modelpay" :rules="validatorRules2" slot="detail"> | 470 | + <a-form-model ref="form" :model="modelpay" :rules="validatorRulesPay" slot="detail"> |
| 471 | <a-row> | 471 | <a-row> |
| 472 | <a-col :span="12"> | 472 | <a-col :span="12"> |
| 473 | <a-form-model-item label="供应商(TEL)" :labelCol="labelCol" :wrapperCol="wrapperCol" | 473 | <a-form-model-item label="供应商(TEL)" :labelCol="labelCol" :wrapperCol="wrapperCol" |
| @@ -600,7 +600,7 @@ | @@ -600,7 +600,7 @@ | ||
| 600 | > | 600 | > |
| 601 | <a-spin :spinning="confirmLoading"> | 601 | <a-spin :spinning="confirmLoading"> |
| 602 | <j-form-container> | 602 | <j-form-container> |
| 603 | - <a-form-model ref="form" :model="modelpj" :rules="validatorRules2" slot="detail"> | 603 | + <a-form-model ref="form" :model="modelpj" :rules="validatorRules3" slot="detail"> |
| 604 | <a-row> | 604 | <a-row> |
| 605 | <a-col :span="12"> | 605 | <a-col :span="12"> |
| 606 | <a-form-model-item label="供应商(TEL)" :labelCol="labelCol" :wrapperCol="wrapperCol" | 606 | <a-form-model-item label="供应商(TEL)" :labelCol="labelCol" :wrapperCol="wrapperCol" |
| @@ -727,12 +727,101 @@ export default { | @@ -727,12 +727,101 @@ export default { | ||
| 727 | validatorRules: { | 727 | validatorRules: { |
| 728 | supplier: [{ required: true, message: '请输入供应商(TEL)', trigger: 'blur' }], | 728 | supplier: [{ required: true, message: '请输入供应商(TEL)', trigger: 'blur' }], |
| 729 | procurementChannels: [{ required: true, message: '请输入采购渠道', trigger: 'blur' }], | 729 | procurementChannels: [{ required: true, message: '请输入采购渠道', trigger: 'blur' }], |
| 730 | - purchaseQuantity: [{ required: true, message: '请输入数量', trigger: 'blur' }], | ||
| 731 | - unitPrice: [{ required: true, message: '请输入单价(不含税,元)', trigger: 'blur' }], | ||
| 732 | - taxRate: [{ required: true, message: '请输入税率(%)', trigger: 'blur' }], | ||
| 733 | - amount: [{ required: true, message: '请输入金额(元)', trigger: 'blur' }] | 730 | + purchaseQuantity: [ |
| 731 | + { required: true, message: '请输入数量', trigger: 'blur' }, | ||
| 732 | + { pattern: /^\d+$/, message: '数量必须为整数', trigger: 'blur' } // 只能输入整数 | ||
| 733 | + ], | ||
| 734 | + unitPrice: [ | ||
| 735 | + { required: true, message: '请输入单价(不含税,元)', trigger: 'blur' }, | ||
| 736 | + { pattern: /^\d+(\.\d+)?$/, message: '单价必须为数字(可包含小数)', trigger: 'blur' } // 可输入整数或小数 | ||
| 737 | + ], | ||
| 738 | + taxRate: [ | ||
| 739 | + { required: true, message: '请输入税率(%)', trigger: 'blur' }, | ||
| 740 | + { pattern: /^\d+(\.\d+)?$/, message: '税率必须为数字(可包含小数)', trigger: 'blur' } // 可输入整数或小数 | ||
| 741 | + ], | ||
| 742 | + amount: [ | ||
| 743 | + { required: true, message: '请输入金额(元)', trigger: 'blur' }, | ||
| 744 | + { pattern: /^\d+(\.\d+)?$/, message: '金额必须为数字(可包含小数)', trigger: 'blur' } // 可输入整数或小数 | ||
| 745 | + ] | ||
| 746 | + } | ||
| 747 | + , | ||
| 748 | + validatorRules2: { | ||
| 749 | + supplier: [{ required: true, message: '请输入供应商(TEL)', trigger: 'blur' }], | ||
| 750 | + procurementChannels: [{ required: true, message: '请输入采购渠道', trigger: 'blur' }], | ||
| 751 | + purchaseQuantity: [ | ||
| 752 | + { required: true, message: '请输入数量', trigger: 'blur' }, | ||
| 753 | + { pattern: /^\d+$/, message: '数量必须为整数', trigger: 'blur' } // 只能输入整数 | ||
| 754 | + ], | ||
| 755 | + unitPrice: [ | ||
| 756 | + { required: true, message: '请输入单价(不含税,元)', trigger: 'blur' }, | ||
| 757 | + { pattern: /^\d+(\.\d+)?$/, message: '单价必须为数字(可包含小数)', trigger: 'blur' } // 可输入整数或小数 | ||
| 758 | + ], | ||
| 759 | + taxRate: [ | ||
| 760 | + { required: true, message: '请输入税率(%)', trigger: 'blur' }, | ||
| 761 | + { pattern: /^\d+(\.\d+)?$/, message: '税率必须为数字(可包含小数)', trigger: 'blur' } // 可输入整数或小数 | ||
| 762 | + ], | ||
| 763 | + amount: [ | ||
| 764 | + { required: true, message: '请输入金额(元)', trigger: 'blur' }, | ||
| 765 | + { pattern: /^\d+(\.\d+)?$/, message: '金额必须为数字(可包含小数)', trigger: 'blur' } // 可输入整数或小数 | ||
| 766 | + ], | ||
| 767 | + hth: [{ required: true, message: '请输入合同/订单号', trigger: 'blur' }], | ||
| 768 | + wldh: [{ required: true, message: '请输入物流单号', trigger: 'blur' }], | ||
| 769 | + yrkNum: [ | ||
| 770 | + { required: true, message: '请输入已入库数量', trigger: 'blur' }, | ||
| 771 | + { pattern: /^\d+$/, message: '数量必须为整数', trigger: 'blur' } | ||
| 772 | + ], | ||
| 773 | + wrkNum: [ | ||
| 774 | + { required: true, message: '请输入剩余订单未入库数量', trigger: 'blur' }, | ||
| 775 | + { pattern: /^\d+$/, message: '数量必须为整数', trigger: 'blur' } | ||
| 776 | + ], | ||
| 777 | + rkNum: [ | ||
| 778 | + { required: true, message: '请输入已入库数量', trigger: 'blur' }, | ||
| 779 | + { pattern: /^\d+$/, message: '数量必须为整数', trigger: 'blur' } | ||
| 780 | + ], | ||
| 781 | + estimatedTime: [{ required: true, message: '请输入预计到厂时间', trigger: 'blur' }], | ||
| 782 | + htfj: [{ required: true, message: '请上传合同附件', trigger: 'blur' }], | ||
| 783 | + | ||
| 784 | + }, | ||
| 785 | + validatorRules3: { | ||
| 786 | + supplier: [{ required: true, message: '请输入供应商(TEL)', trigger: 'blur' }], | ||
| 787 | + hth: [{ required: true, message: '请输入合同/订单号', trigger: 'blur' }], | ||
| 788 | + thhPj: [{ required: true, message: '请选择退换货评级等级', trigger: 'blur' }], | ||
| 789 | + gysPj: [{ required: true, message: '请选择供应商评级等级', trigger: 'blur' }], | ||
| 790 | + }, | ||
| 791 | + fphm: [{ required: true, message: '请输入供应商(TEL)', trigger: 'blur' }], | ||
| 792 | + | ||
| 793 | + validatorRulesfp: { | ||
| 794 | + fphm: [{ required: true, message: '请输入发票号码', trigger: 'blur' }], | ||
| 795 | + fpje: [ | ||
| 796 | + { required: true, message: '请输入发票金额', trigger: 'blur' }, | ||
| 797 | + { pattern: /^\d+(\.\d+)?$/, message: '金额必须为数字(可包含小数)', trigger: 'blur' } | ||
| 798 | + ], | ||
| 799 | + fpqe: [ | ||
| 800 | + { required: true, message: '请输入发票欠额', trigger: 'blur' }, | ||
| 801 | + { pattern: /^\d+(\.\d+)?$/, message: '金额必须为数字(可包含小数)', trigger: 'blur' } | ||
| 802 | + ], | ||
| 803 | + fj: [{ required: true, message: '请上传发票', trigger: 'blur' }], | ||
| 804 | + bz: [{ required: true, message: '请输入备注', trigger: 'blur' }], | ||
| 805 | + | ||
| 806 | + }, | ||
| 807 | + validatorRulesPay:{ | ||
| 808 | + supplier: [{ required: true, message: '请输入供应商(TEL)', trigger: 'blur' }], | ||
| 809 | + hth: [{ required: true, message: '请输入合同号/订单号', trigger: 'blur' }], | ||
| 810 | + htje: [ | ||
| 811 | + { required: true, message: '请输入合同金额(元)', trigger: 'blur' }, | ||
| 812 | + { pattern: /^\d+(\.\d+)?$/, message: '金额必须为数字(可包含小数)', trigger: 'blur' } | ||
| 813 | + ], | ||
| 814 | + wfje: [ | ||
| 815 | + { required: true, message: '请输入未付金额(元)', trigger: 'blur' }, | ||
| 816 | + { pattern: /^\d+(\.\d+)?$/, message: '金额必须为数字(可包含小数)', trigger: 'blur' } | ||
| 817 | + ], | ||
| 818 | + fkfs: [{ required: true, message: '请选择付款方式', trigger: 'blur' }], | ||
| 819 | + fsje: [ | ||
| 820 | + { required: true, message: '请输入付款金额(元)', trigger: 'blur' }, | ||
| 821 | + { pattern: /^\d+(\.\d+)?$/, message: '金额必须为数字(可包含小数)', trigger: 'blur' } | ||
| 822 | + ], | ||
| 823 | + fksj: [{ required: true, message: '请选择付款时间', trigger: 'blur' }], | ||
| 734 | }, | 824 | }, |
| 735 | - validatorRules2: {}, | ||
| 736 | dataSource2: [], | 825 | dataSource2: [], |
| 737 | dataSource3: [], | 826 | dataSource3: [], |
| 738 | dataSource4: [], | 827 | dataSource4: [], |
| @@ -1197,6 +1286,9 @@ export default { | @@ -1197,6 +1286,9 @@ export default { | ||
| 1197 | this.visiblePj = false | 1286 | this.visiblePj = false |
| 1198 | }, | 1287 | }, |
| 1199 | handleConfirmpj(){ | 1288 | handleConfirmpj(){ |
| 1289 | + this.$refs.form.validate((valid) => { | ||
| 1290 | + if (valid) { | ||
| 1291 | + this.confirmLoading = true | ||
| 1200 | postAction(this.url.cmAudit, this.modelpj).then(res => { | 1292 | postAction(this.url.cmAudit, this.modelpj).then(res => { |
| 1201 | if (res.success) { | 1293 | if (res.success) { |
| 1202 | this.$message.success('操作成功') | 1294 | this.$message.success('操作成功') |
| @@ -1206,7 +1298,7 @@ export default { | @@ -1206,7 +1298,7 @@ export default { | ||
| 1206 | this.$message.error(res.message) | 1298 | this.$message.error(res.message) |
| 1207 | } | 1299 | } |
| 1208 | }) | 1300 | }) |
| 1209 | - this.visiblePj = false | 1301 | + }}) |
| 1210 | }, | 1302 | }, |
| 1211 | payreset() { | 1303 | payreset() { |
| 1212 | this.visiblepay = false | 1304 | this.visiblepay = false |
| @@ -1222,9 +1314,15 @@ export default { | @@ -1222,9 +1314,15 @@ export default { | ||
| 1222 | addpay() { | 1314 | addpay() { |
| 1223 | var cmid = this.modelpay.cmId | 1315 | var cmid = this.modelpay.cmId |
| 1224 | this.modelpay.status = 0 | 1316 | this.modelpay.status = 0 |
| 1317 | + | ||
| 1318 | + this.$refs.form.validate((valid) => { | ||
| 1319 | + if (valid) { | ||
| 1320 | + this.confirmLoading = true | ||
| 1225 | postAction(this.url.addpay, this.modelpay).then(res => { | 1321 | postAction(this.url.addpay, this.modelpay).then(res => { |
| 1226 | if (res.success) { | 1322 | if (res.success) { |
| 1227 | - this.modelpay = {} | 1323 | + this.modelpay.wfje = '' |
| 1324 | + this.modelpay.fsje = '' | ||
| 1325 | + this.modelpay.fksj = '' | ||
| 1228 | this.modelpay.cmId = cmid | 1326 | this.modelpay.cmId = cmid |
| 1229 | this.$message.success('操作成功') | 1327 | this.$message.success('操作成功') |
| 1230 | this.paylist(this.modelpay.cmId) | 1328 | this.paylist(this.modelpay.cmId) |
| @@ -1232,6 +1330,8 @@ export default { | @@ -1232,6 +1330,8 @@ export default { | ||
| 1232 | this.$message.error(res.message) | 1330 | this.$message.error(res.message) |
| 1233 | } | 1331 | } |
| 1234 | }) | 1332 | }) |
| 1333 | + this.confirmLoading = false | ||
| 1334 | + }}) | ||
| 1235 | }, | 1335 | }, |
| 1236 | blpInfo(record){ | 1336 | blpInfo(record){ |
| 1237 | this.visibleBlp = true | 1337 | this.visibleBlp = true |
| @@ -1263,16 +1363,21 @@ export default { | @@ -1263,16 +1363,21 @@ export default { | ||
| 1263 | //新增按钮,新增发票信息 | 1363 | //新增按钮,新增发票信息 |
| 1264 | addfp() { | 1364 | addfp() { |
| 1265 | var cmid = this.modelfp.cmId | 1365 | var cmid = this.modelfp.cmId |
| 1366 | + this.$refs.form.validate((valid) => { | ||
| 1367 | + if (valid) { | ||
| 1368 | + this.confirmLoading = true | ||
| 1266 | postAction(this.url.addfp, this.modelfp).then(res => { | 1369 | postAction(this.url.addfp, this.modelfp).then(res => { |
| 1267 | if (res.success) { | 1370 | if (res.success) { |
| 1268 | this.modelfp = {} | 1371 | this.modelfp = {} |
| 1269 | this.modelfp.cmId = cmid | 1372 | this.modelfp.cmId = cmid |
| 1270 | this.$message.success('操作成功') | 1373 | this.$message.success('操作成功') |
| 1374 | + this.confirmLoading = false | ||
| 1271 | this.fplist(this.modelfp.cmId) | 1375 | this.fplist(this.modelfp.cmId) |
| 1272 | } else { | 1376 | } else { |
| 1273 | this.$message.error(res.message) | 1377 | this.$message.error(res.message) |
| 1274 | } | 1378 | } |
| 1275 | }) | 1379 | }) |
| 1380 | + }}) | ||
| 1276 | }, | 1381 | }, |
| 1277 | //打开发票管理 | 1382 | //打开发票管理 |
| 1278 | fpInfo(record) { | 1383 | fpInfo(record) { |
| @@ -1335,7 +1440,12 @@ export default { | @@ -1335,7 +1440,12 @@ export default { | ||
| 1335 | getAction(this.url.queryById,{ | 1440 | getAction(this.url.queryById,{ |
| 1336 | id: record.id | 1441 | id: record.id |
| 1337 | }).then(res => { | 1442 | }).then(res => { |
| 1443 | + | ||
| 1444 | + console.log("res.result",res.result) | ||
| 1338 | this.model2 = res.result | 1445 | this.model2 = res.result |
| 1446 | + if (!res.result.yrkNum){ | ||
| 1447 | + this.model2.yrkNum = 0 | ||
| 1448 | + } | ||
| 1339 | }) | 1449 | }) |
| 1340 | 1450 | ||
| 1341 | 1451 | ||
| @@ -1433,6 +1543,8 @@ export default { | @@ -1433,6 +1543,8 @@ export default { | ||
| 1433 | //新增采买申请 | 1543 | //新增采买申请 |
| 1434 | postAction(this.url.add, this.model).then(res => { | 1544 | postAction(this.url.add, this.model).then(res => { |
| 1435 | if (res.success) { | 1545 | if (res.success) { |
| 1546 | + this.confirmLoading = false | ||
| 1547 | + this.visible = false | ||
| 1436 | this.$message.success('操作成功!') | 1548 | this.$message.success('操作成功!') |
| 1437 | this.getCgInfo(this.model.wlbh) | 1549 | this.getCgInfo(this.model.wlbh) |
| 1438 | } else { | 1550 | } else { |
| @@ -1446,8 +1558,7 @@ export default { | @@ -1446,8 +1558,7 @@ export default { | ||
| 1446 | }) | 1558 | }) |
| 1447 | 1559 | ||
| 1448 | 1560 | ||
| 1449 | - this.confirmLoading = false | ||
| 1450 | - this.visible = false | 1561 | + |
| 1451 | }, | 1562 | }, |
| 1452 | 1563 | ||
| 1453 | handleConfirmOk(status) { | 1564 | handleConfirmOk(status) { |
| @@ -1486,9 +1597,10 @@ export default { | @@ -1486,9 +1597,10 @@ export default { | ||
| 1486 | if (this.bjflag){ | 1597 | if (this.bjflag){ |
| 1487 | url = this.url.edit | 1598 | url = this.url.edit |
| 1488 | } | 1599 | } |
| 1489 | - | ||
| 1490 | postAction(url, this.model2).then(res => { | 1600 | postAction(url, this.model2).then(res => { |
| 1491 | if (res.success) { | 1601 | if (res.success) { |
| 1602 | + this.confirmLoading = false | ||
| 1603 | + this.visibleCm = false | ||
| 1492 | this.$message.success('操作成功') | 1604 | this.$message.success('操作成功') |
| 1493 | this.getCgInfo(this.model.wlbh) | 1605 | this.getCgInfo(this.model.wlbh) |
| 1494 | } else { | 1606 | } else { |
| @@ -1502,8 +1614,7 @@ export default { | @@ -1502,8 +1614,7 @@ export default { | ||
| 1502 | }) | 1614 | }) |
| 1503 | 1615 | ||
| 1504 | 1616 | ||
| 1505 | - this.confirmLoading = false | ||
| 1506 | - this.visibleCm = false | 1617 | + |
| 1507 | }, | 1618 | }, |
| 1508 | handleCancelCm() { | 1619 | handleCancelCm() { |
| 1509 | this.visibleCm = false | 1620 | this.visibleCm = false |
-
请 注册 或 登录 后发表评论