From f86d07ccc55c800eaefc6b1cff0f242d71f6841b Mon Sep 17 00:00:00 2001 From: haoxuan <haoxuan> Date: 星期五, 22 十二月 2023 15:14:49 +0800 Subject: [PATCH] 调用地方修改 --- src/components/makepager/CommonFormTableView.vue | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue index d8ecea7..1b9765c 100644 --- a/src/components/makepager/CommonFormTableView.vue +++ b/src/components/makepager/CommonFormTableView.vue @@ -133,13 +133,7 @@ ></el-input-number> </el-form-item> <span v-else> - <template v-if="pageName=='quotation'&&item.prop=='profit'"> - {{ (scope.row.price&&scope.row.cost)?Number(scope.row.price)-Number(scope.row.cost):'' }} - </template> - <template v-if="pageName=='quotation'&&item.prop=='margin'"> - {{ (scope.row.price&&scope.row.cost)?((Number(scope.row.price)-Number(scope.row.cost))*100/Number(scope.row.cost)).toFixed(2):'' }} - </template> - <template v-else> + <template> {{ scope.row[item.prop] }} </template> </span> @@ -168,7 +162,7 @@ <span v-else style="text-align: right">{{ scope.row[item.prop] }}</span> </template> </el-table-column> - <el-table-column label="鎿嶄綔" width="40" align="center"> + <el-table-column label="鎿嶄綔" width="40" v-if="!detailEnter" align="center"> <template slot-scope="scope"> <el-button type="text" @@ -421,10 +415,21 @@ /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/; if (!reg2.test(value)||value==0) { this.$message.error("鎴愭湰鍗曚环闇�瑕佸~鍐欏ぇ浜�0鐨�2浣嶅皬鏁帮紒") + return true; } this.$forceUpdate() } - this.$emit("inputContent", val, prop, row) + if(this.pageName=='quotation'){ + if(prop=='price'||prop=='cost'){ + if(scope.row.price&&scope.row.cost){ + let profit=Number(scope.row.price)-Number(scope.row.cost) + scope.row.profit=profit+''; + let margin=((Number(scope.row.price)-Number(scope.row.cost))*100/Number(scope.row.cost)).toFixed(2) + scope.row.margin=margin+''; + } + } + } + this.$emit("inputContent", val, prop, row,scope) }, // 娓呯┖ empty() { @@ -435,7 +440,7 @@ deleteClick(scope){ this.tableList.tableData.splice(scope.$index,1) this.$forceUpdate(); - this.$message.success('鍒犻櫎闄ゆ垚鍔燂紒') + this.$message.success('鍒犻櫎鎴愬姛锛�') this.$emit("deleteClick",scope) }, // 閲嶇畻 -- Gitblit v1.8.0