From 208d06a023195a1177fd23d321626d2829aa4c7e Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Fri, 14 Jun 2019 18:08:59 +0800
Subject: [PATCH] fixed bug

---
 .../PurchasingCenter/CreatePurchaseContract.js  |  6 +++---
 .../CreateInquirySheet/index.vue                |  2 +-
 .../CreatePurchaseContract/index.vue            | 17 +++++++++++------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/api/PurchasingCenter/CreatePurchaseContract.js b/src/api/PurchasingCenter/CreatePurchaseContract.js
index d9372430..616585f9 100644
--- a/src/api/PurchasingCenter/CreatePurchaseContract.js
+++ b/src/api/PurchasingCenter/CreatePurchaseContract.js
@@ -62,17 +62,17 @@ export function searchBaseInfo(id) {
   })
 }
 // 实时保存单价
-export function savePrice(price, num1, num2) {
+export function savePrice(price, num1, num2, num3, num4, num5) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '4',
-      name: `update 采购管理_询价单明细_视图 set 单价 = ${price} where 物料流水号 = ${num1} and 询价单流水号 = ${num2}`
+      name: `update 采购管理_询价单明细_视图 set 单价 = ${price} where isnull(物料流水号,0) = isnull(${num1},0) and 询价单流水号 = ${num2} and isnull(零件名称,0) = isnull(${num3},0) and isnull(零件图号,0) = isnull(${num4},0) and isnull(规格,0) = isnull(${num5},0)`
     }
   })
 }
-// 实时保存单价
+// 实时保存合同头
 export function saveContractHeader(...params) {
   return request({
     url: '',
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index 8df97c6b..5e84b952 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -656,7 +656,7 @@
           <el-input v-model="form2.inquirySheetNum" size="small"/>
         </el-form-item>
         <el-form-item label="供应商" prop="supplierName">
-          <el-input v-model="form2.supplierName" size="small" readonly @focus="dialogVisible1=true"/>
+          <el-input v-model="form2.supplierName" size="small" readonly @focus="dialogVisible1=true;enterpriseNature = '';createDate = '';registeredCapital = '';taxNum = '';EMail = '';address = '';account = '';openingBank = '';phone = '';fax = '';goodTime = ''"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
index 11e8494d..39ff2052 100644
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -129,13 +129,13 @@
         </el-table-column>
         <el-table-column v-show="hasTax==='未税'" label="单价（未税）" align="center" width="120">
           <template slot-scope="scope">
-            <el-input-number v-show="hasTax==='未税'" :min="0" v-model="scope.row.未税单价" controls-position="right" size="mini" style="width:100%" @focus="scope.row.未税单价=''" @change="priceChange(scope.row.未税单价, scope.row.物料流水号, scope.row.询价单流水号, scope.row)"/>
+            <el-input-number v-show="hasTax==='未税'" :min="0" v-model="scope.row.未税单价" controls-position="right" size="mini" style="width:100%" @focus="scope.row.未税单价=''" @change="priceChange(scope.row.未税单价, scope.row.物料流水号, scope.row.询价单流水号, scope.row, scope.row.零件名称, scope.row.零件图号, scope.row.规格)"/>
             <b v-show="hasTax!=='未税'">—</b>
           </template>
         </el-table-column>
         <el-table-column v-show="hasTax==='含税'" label="单价（含税）" align="center" width="120">
           <template slot-scope="scope">
-            <el-input-number v-show="hasTax==='含税'" :min="0" v-model="scope.row.含税单价" controls-position="right" size="mini" style="width:100%" @focus="scope.row.含税单价=''" @change="priceChange(scope.row.含税单价, scope.row.物料流水号, scope.row.询价单流水号, scope.row)"/>
+            <el-input-number v-show="hasTax==='含税'" :min="0" v-model="scope.row.含税单价" controls-position="right" size="mini" style="width:100%" @focus="scope.row.含税单价=''" @change="priceChange(scope.row.含税单价, scope.row.物料流水号, scope.row.询价单流水号, scope.row, scope.row.零件名称, scope.row.零件图号, scope.row.规格)"/>
             <b v-show="hasTax!=='含税'">—</b>
           </template>
         </el-table-column>
@@ -269,9 +269,9 @@ export default {
       }
     },
     // 价格实时保存
-    priceChange(price, num1, num2, row) {
+    priceChange(price, num1, num2, row, num3, num4, num5) {
       this.tableData1.map(v => {
-        if (Number(v.物料流水号) === Number(row.物料流水号) && Number(v.询价单流水号) === Number(row.询价单流水号)) {
+        if (Number(v.物料流水号) === Number(row.物料流水号) && Number(v.询价单流水号) === Number(row.询价单流水号) && Number(v.零件名称) === Number(row.零件名称) && Number(v.零件图号) === Number(row.零件图号) && Number(v.规格) === Number(row.规格)) {
           v.含税单价 = row.含税单价
           v.未税单价 = row.未税单价
         }
@@ -280,7 +280,10 @@ export default {
       this.tableData1 = []
       this.tableData1 = group
       price = price || 0
-      savePrice(price, num1, num2).then(res => {
+      num3 = num3 || null
+      num4 = num4 || null
+      num5 = num5 || null
+      savePrice(price, num1, num2, num3, num4, num5).then(res => {
         if (res.data[0].result === '1') {
           console.log('单价实时保存成功')
         } else {
@@ -398,6 +401,8 @@ export default {
           this.tableData1.push({
             询价单流水号: response.data[i].询价单流水号,
             物料流水号: response.data[i].物料流水号,
+            零件名称: response.data[i].零件名称,
+            零件图号: response.data[i].零件图号,
             询价单明细流水号: response.data[i].询价单明细流水号,
             机床图号: response.data[i].机床图号 || response.data[i].基本件机床图号,
             组号: response.data[i].组号 || response.data[i].基本件组号,
@@ -468,7 +473,7 @@ export default {
         </tr>
         <tr>
             <td style="width: 15%;">地址：</td>
-            <td style="width: 35%;">盐城市开放大道666号</td>
+            <td style="width: 35%;">盐城市通榆北路666号</td>
             <td style="width: 15%;">地址：</td>
             <td id="supplierAddress" style="width: 35%;"></td>
         </tr>