From 49ae434744dde348be0327833afe2ea7e09502dd Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Wed, 6 Mar 2019 11:01:21 +0800
Subject: [PATCH] fix &bug

---
 .../CreatePurchaseContract.js                 |  2 +-
 .../CreateInquirySheet/index.vue              | 48 +++++++++++++----
 .../CreatePurchaseContract/index.vue          | 51 +++++++++----------
 .../InvoiceSettlementApplication/index.vue    |  2 +-
 4 files changed, 66 insertions(+), 37 deletions(-)

diff --git a/src/api/PurchasingCenter/CreatePurchaseContract.js b/src/api/PurchasingCenter/CreatePurchaseContract.js
index 68a160f5..5ffac52f 100644
--- a/src/api/PurchasingCenter/CreatePurchaseContract.js
+++ b/src/api/PurchasingCenter/CreatePurchaseContract.js
@@ -32,7 +32,7 @@ export function doneContract(...params) {
     data: {
       type: '2',
       name: '采购管理_采购合同_增加数据',
-      param: `采购合同编号=${params[0]}&采购合同名称=${params[1]}&交货日期=${params[2]}&支付日期=${params[3]}&支付方式=${params[4]}&开票信息=${params[5]}&其他说明=${params[6]}&合同总额=${params[7]}&采购员流水号=${params[8]}&供应商流水号=${params[9]}&单价是否含税=${params[10]}&组件零件流水号组=${params[11]}&组件零件基本件流水号组=${params[12]}&数量组=${params[13]}&单价组=${params[14]}&交货期组=${params[15]}&合同内容\\=${params[16]}`
+      param: `采购合同编号=${params[0]}\\&采购合同名称=${params[1]}\\&交货日期=${params[2]}\\&支付日期=${params[3]}\\&支付方式=${params[4]}\\&开票信息=${params[5]}\\&其他说明=${params[6]}\\&合同总额=${params[7]}\\&采购员流水号=${params[8]}\\&供应商流水号=${params[9]}\\&单价是否含税=${params[10]}\\&组件零件流水号组=${params[11]}\\&组件零件基本件流水号组=${params[12]}\\&数量组=${params[13]}\\&单价组=${params[14]}\\&交货期组=${params[15]}\\&合同内容\\=${params[16]}`
     }
   })
 }
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index 9b00f791..5ffdedab 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -48,11 +48,21 @@
                 {{ scope.row.物料计划到货时间.split(' ')[0] }}
               </template>
             </el-table-column>
-            <el-table-column label="项目名称" align="center" min-width="150">
+            <el-table-column label="项目名称" align="center" min-width="100">
               <template slot-scope="scope">
                 {{ scope.row.项目名称 }}
               </template>
             </el-table-column>
+            <el-table-column label="机床图号" align="center" min-width="100">
+              <template slot-scope="scope">
+                {{ scope.row.机床图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="组号" align="center" min-width="80">
+              <template slot-scope="scope">
+                {{ scope.row.组号 }}
+              </template>
+            </el-table-column>
             <el-table-column label="物料类别" align="center" min-width="100">
               <template slot-scope="scope">
                 {{ scope.row.物料类别 }}
@@ -152,11 +162,21 @@
                 {{ scope.row.物料计划到货时间.split(' ')[0] }}
               </template>
             </el-table-column>
-            <el-table-column label="项目名称" align="center" min-width="150">
+            <el-table-column label="项目名称" align="center" min-width="100">
               <template slot-scope="scope">
                 {{ scope.row.项目名称 }}
               </template>
             </el-table-column>
+            <el-table-column label="机床图号" align="center" min-width="100">
+              <template slot-scope="scope">
+                {{ scope.row.机床图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="组号" align="center" min-width="80">
+              <template slot-scope="scope">
+                {{ scope.row.组号 }}
+              </template>
+            </el-table-column>
             <el-table-column label="图号" align="center" min-width="100">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
@@ -281,29 +301,29 @@
         <el-button type="success" size="mini" style="float: right" @click="saveOrder()">保存</el-button>
       </div>
       <el-table v-loading="" :data="tableData3" border style="max-height: 500px;" height="500px" size="mini">
-        <el-table-column label="图号" align="center" min-width="200">
+        <el-table-column label="图号" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.组件零件流水号 ? scope.row.物料型号 : scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="名称" align="center" min-width="150">
+        <el-table-column label="名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.组件零件流水号 ? scope.row.物料名称 : scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="规格" align="center" min-width="100">
+        <el-table-column label="规格" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.组件零件流水号 ? scope.row.物料规格 : scope.row.规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="技术下达数量" align="center" min-width="90">
+        <el-table-column label="技术下达数量" align="center" width="110">
           <template slot-scope="scope">
             {{ scope.row.技术下达数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="实际采购数量" align="center" min-width="90">
+        <el-table-column label="实际采购数量" align="center" width="110">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.数量" size="mini" style="width:60px"/>
+            <el-input v-model="scope.row.数量" size="mini" style="width:100%"/>
           </template>
         </el-table-column>
         <el-table-column label="询价备注" align="center" min-width="120">
@@ -311,11 +331,21 @@
             <el-input v-model="scope.row.备注" size="mini" style="width:100%"/>
           </template>
         </el-table-column>
-        <el-table-column label="询价单编号" align="center" min-width="150">
+        <el-table-column label="询价单编号" align="center" min-width="120">
           <template slot-scope="scope">
             {{ scope.row.询价单编号 }}
           </template>
         </el-table-column>
+        <el-table-column label="机床图号" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="组号" align="center" min-width="70">
+          <template slot-scope="scope">
+            {{ scope.row.组号 }}
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope">
             <el-button type="danger" size="mini" icon="el-icon-delete" @click="outInquirySheet(scope.row)">移出</el-button>
diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
index 17ba8ce0..8b56d314 100644
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -75,7 +75,7 @@
       </el-form>
       <el-table :data="tableData1" border style="margin: 10px 0;max-height: 300px;" height="300px" size="mini" show-summary>
         <el-table-column label="序号" align="center" width="50" type="index"/>
-        <el-table-column label="交货期" align="center" min-width="130">
+        <el-table-column label="交货期" align="center" width="150">
           <template slot-scope="scope">
             <el-date-picker
               v-model="scope.row.交货期"
@@ -83,7 +83,7 @@
               type="date"
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
-              style="width: 130px"/>
+              style="width:100%"/>
           </template>
         </el-table-column>
         <el-table-column label="图号" align="center" min-width="150">
@@ -91,7 +91,7 @@
             {{ scope.row.图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="名称" align="center" min-width="150">
+        <el-table-column label="名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.名称 }}
           </template>
@@ -101,20 +101,20 @@
             {{ scope.row.规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="数量" align="center" min-width="80">
+        <el-table-column label="数量" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.数量 }}
           </template>
         </el-table-column>
-        <el-table-column v-show="hasTax==='未税'" label="单价（未税）" align="center" min-width="100">
+        <el-table-column v-show="hasTax==='未税'" label="单价（未税）" align="center" width="120">
           <template slot-scope="scope">
-            <el-input v-show="hasTax==='未税'" v-model="scope.row.未税单价" size="mini" style="width:70px"/>
+            <el-input v-show="hasTax==='未税'" v-model="scope.row.未税单价" size="mini" style="width:100%"/>
             <span v-show="hasTax!=='未税'">—</span>
           </template>
         </el-table-column>
-        <el-table-column v-show="hasTax==='含税'" label="单价（含税）" align="center" min-width="100">
+        <el-table-column v-show="hasTax==='含税'" label="单价（含税）" align="center" width="120">
           <template slot-scope="scope">
-            <el-input v-show="hasTax==='含税'" v-model="scope.row.含税单价" size="mini" style="width:70px"/>
+            <el-input v-show="hasTax==='含税'" v-model="scope.row.含税单价" size="mini" style="width:100%"/>
             <span v-show="hasTax!=='含税'">—</span>
           </template>
         </el-table-column>
@@ -136,11 +136,11 @@
         <el-radio-button label="模板3"/>
         <el-radio-button label="自定义"/>
       </el-radio-group>
-      <el-button 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-input v-model="actualTotal" size="small" style="width: 100px"/>
+      <el-button type="primary" size="small" @click="submitTotal()">确定总额</el-button>
       <div style="float: right">
-        <span>合同总额：</span>
-        <el-input v-model="actualTotal" size="small" style="width: 100px"/>
-        <el-button type="primary" size="small" @click="submitTotal()">确定总额</el-button>
         <el-button type="success" size="small" @click="generateContract()">递交审批</el-button>
       </div>
       <hr>
@@ -252,7 +252,6 @@ export default {
     searchContractDetail() { // 查询合同明细
       this.tableData1 = []
       searchSheetContract(this.contractNumValue).then(response => {
-        console.log(response.data, 111)
         for (let i = 0; i < response.data.length; i++) {
           this.tableData1.push({
             组件零件流水号: response.data[i].组件零件流水号,
@@ -265,11 +264,11 @@ export default {
             未税单价: 0,
             未税总额: 0,
             含税单价: 0,
-            含税总额: 0
+            含税总额: 0,
+            备注: response.data[i].备注
           })
         }
       })
-      console.log(this.tableData1, 222)
     },
     demoChange() { // 模板change
       switch (this.demoRadio) {
@@ -432,15 +431,15 @@ export default {
 <table style="border-collapse: collapse; width: 100%;" border="1">
     <tbody id="tbody">
         <tr id="tableHead">
-            <td style="width: 5%;">序号</td>
-            <td style="width: 10%;">图号</td>
-            <td style="width: 10%;">名称</td>
-            <td style="width: 10%;">规格型号</td>
-            <td style="width: 5%;">数量</td>
-            <td style="width: 10%;">单价金额</td>
-            <td style="width: 10%;">合计金额</td>
-            <td style="width: 12%;">交货时间</td>
-            <td style="width: 10%;">备注</td>
+            <td>序号</td>
+            <td>图号</td>
+            <td>名称</td>
+            <td>规格型号</td>
+            <td>数量</td>
+            <td >单价金额</td>
+            <td>合计金额</td>
+            <td>交货时间</td>
+            <td>备注</td>
         </tr>
     </tbody>
 </table>
@@ -481,7 +480,7 @@ export default {
         for (let i = 0; i < this.tableData1.length; i++) {
           tr[i] = document.createElement('tr')
           tr[i].setAttribute('class', 'tableData')
-          tr[i].innerHTML = '<td style="width: 5%;"></td><td style="width: 10%;"></td><td style="width: 10%;"></td><td style="width: 10%;"></td><td style="width: 5%;"></td><td style="width: 10%;"></td><td style="width: 10%;"></td><td style="width: 12%;"></td><td style="width: 10%;"></td>'
+          tr[i].innerHTML = '<td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>'
           document.getElementById('tableHead') ? document.getElementById('tableHead').after(tr[i]) : ''
         }
         this.actualTotal = 0
@@ -500,7 +499,7 @@ export default {
             this.hasTax === '含税' ? document.getElementsByClassName('tableData')[j].children[5].innerHTML = this.tableData1[j].含税单价 : document.getElementsByClassName('tableData')[j].children[5].innerHTML = this.tableData1[j].未税单价
             document.getElementsByClassName('tableData')[j].children[6].innerHTML = (Number(document.getElementsByClassName('tableData')[j].children[5].innerHTML) * Number(this.tableData1[j].数量)).toFixed(2)
             this.tableData1[j].交货期 ? document.getElementsByClassName('tableData')[j].children[7].innerHTML = this.tableData1[j].交货期.split(' ')[0] : document.getElementsByClassName('tableData')[j].children[7].innerHTML = ''
-            document.getElementsByClassName('tableData')[j].children[8].innerHTML = `备注` + j
+            document.getElementsByClassName('tableData')[j].children[8].innerHTML = this.tableData1[j].备注
           }
         }
         this.actualTotal = this.actualTotal.toFixed(2)
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
index a1ef01ed..9fd5019d 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
@@ -298,7 +298,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisible1 = false">取消</el-button>
-        <el-button v-if="title1 === '创建发票结算申请单'" size="small" type="primary" @click="submitAdd()">确定</el-button>
+        <el-button v-if="title1 === '创建发票结算申请单'" size="small" type="primary" @click="submitAdd1()">确定</el-button>
         <el-button v-else size="small" type="primary" @click="submitEdit()">确定</el-button>
       </div>
     </el-dialog>