web/crm-web.git

			@@ -166,7 +166,7 @@
			</el-col>
			<el-col :span="12">
			<el-form-item label="销售机会" prop="sale_chance_name"
			:rules="[{ required: autoCodeHeadersObj.xsjh=='yes'?true:false, validator: this.checkChance, trigger: 'change' }]">
			:rules="[{ required: autoCodeHeadersObj.Xsjh=='yes'?true:false, validator: this.checkChance, trigger: 'change' }]">
			<div class="custom-name">
			<el-autocomplete
			v-model="editConfig.infomation.sale_chance_name"
			@@ -250,9 +250,11 @@
			<CommonFormTableView
			:show-summary="showSummary"
			pageName="quotation"
			:addTypeIdMultiple="true"
			:product-table-list="productTableList"
			@inputContent="inputContent"
			@addProductClick="addProductClick"
			@getSelectArray="getSelectArray"
			@emptyProductClick="emptyProductClick"
			@recalculateProductClick="recalculateProductClick"
			@clearupProduct="clearupProduct"
			@@ -418,6 +420,7 @@
			this.setTableForm()
			this.getCommonData()
			this.formInfo()
			this.getUseSystemSet({modeType:'bjd'})
			},
			watch: {
			"editConfig.visible"(val) {
			@@ -663,21 +666,32 @@
			},
			// 产品新增
			addProductClick() {
			this.productId++
			this.tableData.push({
			productId: this.productId,
			id: 0,
			amount: 0,
			desc: "",
			name: "",
			number: "",
			price: 0,
			cost:'',
			profit:'',
			margin:'',
			total: 0,
			unit: ""
			})
			// this.productId++
			// this.tableData.push({
			// productId: this.productId,
			// id: 0,
			// amount: 0,
			// desc: "",
			// name: "",
			// number: "",
			// price: 0,
			// cost:'',
			// profit:'',
			// margin:'',
			// total: 0,
			// unit: ""
			// })
			// this.showSummary.show = true
			},
			// 新增方式修改
			getSelectArray(val){
			if(val.length>0){
			val.map((item, index) => {
			item.productId = this.tableData.length + index+1
			})
			}
			this.tableData=this.tableData.concat(val);
			this.productTableList.tableData=this.tableData
			this.showSummary.show = true
			},
			// 产品清空
			@@ -712,7 +726,7 @@
			if (this.editConfig.infomation.sale_chance_name && this.editConfig.infomation.sale_chance_name.length > 0) {
			callback()
			} else {
			if(this.autoCodeHeadersObj.xsjh=='yes'){
			if(this.autoCodeHeadersObj.Xsjh=='yes'){
			callback(new Error("请选择销售机会"))
			}else{
			callback()