From b4fffb6670099841c59bc22e8703e96badcf5614 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 22 十二月 2023 15:13:01 +0800
Subject: [PATCH] 报价单，销售明细单页面必填参数修改
---
src/components/makepager/CommonFormTableView.vue | 102 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 85 insertions(+), 17 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index b8e1f51..1b9765c 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -41,9 +41,10 @@
v-model.trim="scope.row[item.prop]"
maxlength="50"
size="mini"
+ :disabled="!isOperate"
@change="
(val) => {
- commonInputChange(val, item.prop, scope.row)
+ commonInputChange(val, item.prop, scope.row,scope)
}
"
></el-input>
@@ -58,6 +59,7 @@
v-model="scope.row[item.prop]"
:fetch-suggestions="querySearchAsync"
value-key="name"
+ :disabled="!isOperate"
size="mini"
@select="
(val) => {
@@ -65,11 +67,11 @@
}
"
></el-autocomplete>
- <div class="common-select-btn" @click="selClientClick(scope.row, item.prop)">
+ <div class="common-select-btn" v-if="isOperate" @click="selClientClick(scope.row, item.prop)">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
<div
- v-if="scope.row[item.prop] && scope.row[item.prop].length > 0"
+ v-if="scope.row[item.prop] && scope.row[item.prop].length > 0&&isOperate"
class="common-select-btn"
@click="clearupClient(scope.row)"
>
@@ -84,7 +86,7 @@
:rules="[{ required: item.isRequird ? true : false, message: '杈撳叆涓嶈兘涓虹┖' }]"
>
<!-- <el-input v-model.trim="scope.row[item.prop]" maxlength="50" size="mini"></el-input> -->
- <el-date-picker v-model="scope.row[item.prop]" type="date" size="mini" style="width: 110px">
+ <el-date-picker :disabled="!isOperate" v-model="scope.row[item.prop]" type="date" size="mini" style="width: 110px">
</el-date-picker>
</el-form-item>
<el-form-item
@@ -98,11 +100,12 @@
placeholder=""
:min="0"
:controls="false"
+ :disabled="!isOperate"
size="mini"
style="width: 100%; margin-right: 5px"
@change="
(val) => {
- commonInputChange(val, item.prop, scope.row)
+ commonInputChange(val, item.prop, scope.row,scope)
}
"
></el-input-number>
@@ -118,17 +121,22 @@
placeholder=""
:min="0"
:precision="2"
+ :disabled="!isOperate"
:controls="false"
size="mini"
style="width: 100%; margin-right: 5px"
@change="
(val) => {
- commonInputChange(val, item.prop, scope.row)
+ commonInputChange(val, item.prop, scope.row,scope)
}
"
></el-input-number>
</el-form-item>
- <span v-else>{{ scope.row[item.prop] }}</span>
+ <span v-else>
+ <template>
+ {{ scope.row[item.prop] }}
+ </template>
+ </span>
</template>
<el-form-item
v-else-if="item.inputNumber && selectBox"
@@ -141,11 +149,12 @@
placeholder=""
:min="0"
:controls="false"
+ :disabled="!isOperate"
size="mini"
style="width: 100%; margin-right: 5px"
@change="
(val) => {
- commonInputChange(val, item.prop, scope.row)
+ commonInputChange(val, item.prop, scope.row,scope)
}
"
></el-input-number>
@@ -153,14 +162,24 @@
<span v-else style="text-align: right">{{ scope.row[item.prop] }}</span>
</template>
</el-table-column>
+ <el-table-column label="鎿嶄綔" width="40" v-if="!detailEnter" align="center">
+ <template slot-scope="scope">
+ <el-button
+ type="text"
+ size="small"
+ :disabled="!isOperate"
+ @click="deleteClick(scope)"
+ >鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
<slot name="tableButton" />
</el-table>
</el-form>
<div v-if="!detailEnter" style="margin: 10px">
- <el-button size="small" type="primary" @click="add">鏂板</el-button>
+ <el-button size="small" type="primary" :disabled="!isOperate" @click="add">鏂板</el-button>
<!-- <el-button size="small" type="primary" disabled>瀵煎叆鏄庣粏</el-button> -->
- <el-button size="small" type="primary" @click="empty">娓呯┖</el-button>
- <el-button size="small" type="primary" @click="recalculate" :disabled="isRecalculate ? false : true"
+ <el-button size="small" type="primary" :disabled="!isOperate" @click="empty">娓呯┖</el-button>
+ <el-button size="small" type="primary" @click="recalculate" :disabled="(isRecalculate&&!isOperate) ? false : true"
>閲嶇畻</el-button
>
</div>
@@ -180,6 +199,7 @@
<SelectCommonDialog
v-if="editSelCommonConfig.editVisible"
:edit-common-config="editSelCommonConfig"
+ :quotationNumber="quotationNumber"
@selClient="selClient"
/>
</div>
@@ -199,6 +219,21 @@
selectBox: {
type: Boolean,
default: false
+ },
+ // 閭ｄ釜椤甸潰 鐢ㄦ潵鍒ゆ柇璁＄畻鏂瑰紡
+ pageName:{
+ type:String,
+ default:''
+ },
+ // 鏍规嵁鎶ヤ环鍗曟煡璇骇鍝�
+ quotationNumber:{
+ type:[String,Number],
+ default:''
+ },
+ // 鏄惁鍙互鎿嶄綔 娣诲姞绛�
+ isOperate:{
+ type:Boolean,
+ default:true,
},
productTableList: {
type: Object,
@@ -259,7 +294,7 @@
productName: "",
productNumber: "",
page: 1,
- pageSize: 5
+ pageSize: 100
}).then((res) => {
console.log(res, "浜у搧鍚嶇О")
if (res.code === 200) {
@@ -302,9 +337,13 @@
sums[index] = "灏忚:"
return
}
- const title = ["#", "浜у搧鍚嶇О"]
+ const title = ["#", "浜у搧鍚嶇О",'浜у搧缂栧彿','鍗曚綅','閿�鍞崟浠�','鎴愭湰鍗曚环']
// 鍘婚櫎鏌愪簺涓嶉渶瑕佽绠楃殑鏁版嵁
if (title.includes(column.label)) {
+ sums[index] = ""
+ return
+ }
+ if(this.pageName=='quotation'&&column.label=='姣涘埄'){
sums[index] = ""
return
}
@@ -362,9 +401,7 @@
add() {
this.$emit("addProductClick")
},
- commonInputChange(val, prop, row) {
- console.log(val, prop)
- console.log(row)
+ commonInputChange(val, prop, row,scope) {
if (prop === "amount") {
this.tableList.tableData.map((ite) => {
if (ite.name === row.name) {
@@ -372,12 +409,39 @@
}
})
}
- this.$emit("inputContent", val, prop, row)
+ if(this.pageName=='quotation'&&prop=='cost'&&scope.row.cost){
+ let value=scope.row.cost
+ let reg2 =
+ /(^[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()
+ }
+ 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() {
this.isRecalculate = false
this.$emit("emptyProductClick")
+ },
+ // 鍒犻櫎
+ deleteClick(scope){
+ this.tableList.tableData.splice(scope.$index,1)
+ this.$forceUpdate();
+ this.$message.success('鍒犻櫎鎴愬姛锛�')
+ this.$emit("deleteClick",scope)
},
// 閲嶇畻
recalculate() {
@@ -415,6 +479,7 @@
ite.number = item.number
ite.price = item.price
ite.total = item.amount ? item.amount * item.price : 1 * item.price
+ ite.unit = item.unit
}
})
},
@@ -436,6 +501,7 @@
ite.number = item.number
ite.price = item.price
ite.total = item.amount ? item.amount * item.price : 1 * item.price
+ ite.unit = item.unit
}
})
},
@@ -449,6 +515,7 @@
ite.number = ""
ite.price = 0
ite.total = 0
+ ite.unit = ""
}
})
this.$emit("clearupProduct", this.tableList.tableData)
@@ -471,6 +538,7 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.page-view {
+
.el-form-item {
margin-bottom: 0;
.custom-name {
--
Gitblit v1.8.0