This commit is contained in:
liushuai
2020-05-06 08:44:51 +08:00
parent 1df919eab0
commit b7bb7d031e
15 changed files with 357 additions and 220 deletions

View File

@@ -147,10 +147,10 @@
<el-radio-button label="模板1"/>
<el-radio-button label="模板2" disabled/>
</el-radio-group>
<el-button v-positive="'loading'" :disabled="false" type="primary" plain size="small" style="margin-left:10px;" @click="editContract()">预览合同</el-button>
<el-button type="primary" plain size="small" style="margin-left:10px;" @click="editContract()">预览合同</el-button>
<span>递交审核</span>
<el-tooltip :open-delay="1000" effect="dark" content="生成合同并提交审核" placement="top">
<el-button v-positive="'loading'" :disabled="openDeal" type="primary" plain size="small" @click="generateContract()">递交</el-button>
<el-button :disabled="openDeal" type="primary" plain size="small" @click="generateContract()">递交</el-button>
</el-tooltip>
<hr>
<!--html代码-->
@@ -397,7 +397,8 @@ export default {
},
// 价格实时保存
priceChange(price, num1, num2, row, num3, num4, num5) {
if (!this.quickChangePrice) {
console.log(123132123)
if (this.quickChangePrice) {
this.tableData1.map(v => {
v.物料流水号 = v.物料流水号 || ''
v.零件名称 = v.零件名称 || ''
@@ -879,7 +880,7 @@ export default {
this.hasTax === '含税' ? this.单价是否含税 = 1 : this.单价是否含税 = 0
const inquiryDetailNum_old = [] // 需要转移到新询价单的物料的询价单明细流水号
this.tableData1.map(v => {
if ((this.hasTax === '含税' && Number(v.含税单价)) || (this.hasTax === '未税' && Number(v.未税单价))) { // 筛掉未询到价格的物料
if ((this.hasTax === '含税' && v.含税单价 !== '') || (this.hasTax === '未税' && v.未税单价 !== '')) { // 筛掉未询到价格的物料
this.组件零件流水号组.push(v.组件零件流水号)
this.组件零件基本件流水号组.push(v.组件零件基本件流水号)
this.数量组.push(v.数量)