From 91d30cd45cb0fc4c06492db8a6736d280badb44b Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 06 九月 2023 17:59:28 +0800
Subject: [PATCH] bug修复
---
src/views/other/payment/saleInvoice/addSaleInvoice.vue | 52 ++++++++++++++++----------
public/index.html | 15 ++++---
src/components/makepager/CommonFormTableView.vue | 4 +-
3 files changed, 43 insertions(+), 28 deletions(-)
diff --git a/public/index.html b/public/index.html
index 3e5a139..29afaf0 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,15 +1,18 @@
<!DOCTYPE html>
<html lang="">
<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width,initial-scale=1.0">
- <link rel="icon" href="<%= BASE_URL %>favicon.ico">
- <title><%= htmlWebpackPlugin.options.title %></title>
+ <meta charset="utf-8" />
+ <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+ <meta name="viewport" content="width=device-width,initial-scale=1.0" />
+ <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
+ <title>瀹㈡埛鍏崇郴绠＄悊绯荤粺</title>
</head>
<body>
<noscript>
- <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+ <strong
+ >We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please
+ enable it to continue.</strong
+ >
</noscript>
<div id="app"></div>
<!-- built files will be auto injected -->
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 1b3ed29..79b103f 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -125,7 +125,7 @@
</el-form-item>
<span v-else>{{ scope.row[item.prop] }}</span>
</template>
- <span v-else>{{ scope.row[item.prop] }}</span>
+ <span v-else style="text-align: right">{{ scope.row[item.prop] }}</span>
</template>
</el-table-column>
</el-table>
@@ -445,7 +445,7 @@
}
.el-table__footer-wrapper tbody td.el-table__cell {
background-color: #fff;
- text-align: right;
+ // text-align: right;
font-weight: bold;
}
.el-input--suffix .el-input__inner {
diff --git a/src/views/other/payment/saleInvoice/addSaleInvoice.vue b/src/views/other/payment/saleInvoice/addSaleInvoice.vue
index 9d9c16a..70c635f 100644
--- a/src/views/other/payment/saleInvoice/addSaleInvoice.vue
+++ b/src/views/other/payment/saleInvoice/addSaleInvoice.vue
@@ -403,7 +403,7 @@
show: true,
total: true,
sumProp: ["Amount", "Unit", "total"],
- mergeNumber: 3
+ mergeNumber: 2
},
editSelectClientConfig: {
editVisible: false,
@@ -481,26 +481,38 @@
this.$refs[formName].validate((valid) => {
if (valid) {
console.log(this.editConfig.infomation)
- const params = this.saveParams()
- console.log(params)
- if (this.editConfig.title === "鏂板缓") {
- addInvoice(params).then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message.success("娣诲姞鎴愬姛")
- this.$parent.getData()
- }
- })
+ for (let i = 0; i < this.tableData.length; i++) {
+ if (this.tableData[i].name.length === 0) {
+ this.isNoProduct = true
+ break
+ } else {
+ this.isNoProduct = false
+ }
+ }
+ if (this.isNoProduct) {
+ this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
} else {
- // getUpdateServiceContract(params).then((res) => {
- // console.log(res)
- // this.editConfig.visible = false
- // if (res.code === 200) {
- // this.$message.success("缂栬緫鎴愬姛")
- // this.$parent.getData()
- // }
- // })
+ const params = this.saveParams()
+ console.log(params)
+ if (this.editConfig.title === "鏂板缓") {
+ addInvoice(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("娣诲姞鎴愬姛")
+ this.$parent.getData()
+ }
+ })
+ } else {
+ // getUpdateServiceContract(params).then((res) => {
+ // console.log(res)
+ // this.editConfig.visible = false
+ // if (res.code === 200) {
+ // this.$message.success("缂栬緫鎴愬姛")
+ // this.$parent.getData()
+ // }
+ // })
+ }
}
} else {
console.log("error submit")
--
Gitblit v1.8.0