零件导入，零件分配，车间采购系统

src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue

@@ -73,9 +73,9 @@
             {{ scope.row.总金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="付款方式" align="center" width="200">
+        <el-table-column label="预付款" align="center" width="200">
           <template slot-scope="scope">
-            {{ scope.row.付款方式内容 }}
+            {{ scope.row.预付款 }}
           </template>
         </el-table-column>
         <el-table-column label="审批情况" align="center" width="100">
@@ -135,6 +135,8 @@
                 <td colspan="2" align="center">零件名称</td>
                 <td colspan="1" align="center">零件图号</td>
                 <td colspan="1" align="center">材料</td>
+                <td colspan="1" align="center">交货期</td>
+                <td colspan="1" align="center">备注</td>
                 <td colspan="1" align="center">数量</td>
                 <td colspan="1" align="center">单价</td>
                 <td colspan="1" align="center">总价</td>
@@ -148,6 +150,8 @@
                 <td colspan="2" align="center">物料名称</td>
                 <td colspan="1" align="center">物料规格</td>
                 <td colspan="1" align="center">物料型号</td>
+                <td colspan="1" align="center">交货期</td>
+                <td colspan="1" align="center">备注</td>
                 <td colspan="1" align="center">数量</td>
                 <td colspan="1" align="center">单价</td>
                 <td colspan="1" align="center">总价</td>
@@ -155,13 +159,17 @@
             </tbody>
             <tfoot>
               <tr style="height: 40px">
-                <td colspan="6">运费：</td>
+                <td colspan="8">运费：</td>
                 <td colspan="1" align="center">{{ freight }}</td>
               </tr>
               <tr style="height: 40px">
-                <td colspan="6">总价:  (人民币){{ RMB }}(含0.17增值税) </td>
+                <td colspan="8">总价:  (人民币){{ RMB }}(未税) </td>
                 <td colspan="1" align="center">{{ TotalAmount }}</td>
               </tr>
+              <tr style="height: 40px">
+                <td colspan="8">总价:  (人民币){{ RMB1 }}(含{{ taxRate }}增值税) </td>
+                <td colspan="1" align="center">{{ TotalAmount1 }}</td>
+              </tr>
             </tfoot>
           </table>
           <div id="23"/>
@@ -242,6 +250,9 @@ export default {
       startEndDate: '',
       contract: '',
       freight: '',
+      taxRate: '',
+      TotalAmount1: '',
+      RMB1: '',
       contractNumValue: '',
       contractNum: [],
       ProcurementContractNum: '',
@@ -365,9 +376,12 @@ export default {
       this.textarea = row.合同文本
       this.supplier = row.供应商名称
       this.contract = row.采购合同编号
+      this.taxRate = row.税率
       this.freight = parseInt(row.总金额) - parseInt(row.总金额_小计)
       this.RMB = row.总金额_文本
       this.TotalAmount = row.总金额
+      this.TotalAmount1 = parseInt((row.含税总金额) * 100) / 100
+      this.RMB1 = row.含税总金额_文本
       document.getElementById('23').innerText = this.textarea
       this.contractValue = parseInt(row.采购合同流水号)
       searchTable2(this.contractValue).then(response => {
@@ -384,16 +398,18 @@ export default {
           tr[i] = document.createElement('tr')
           tr[i].setAttribute('class', 'tableData')
           tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
-              '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
+              '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
           document.getElementById('tableHead').after(tr[i])
         }
         for (let j = 0; j < this.returns.length; j++) {
           document.getElementsByClassName('tableData')[j].children[0].innerHTML = response.data[j].物料名称
           document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].物料规格
           document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].物料型号
-          document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].数量
-          document.getElementsByClassName('tableData')[j].children[4].innerHTML = response.data[j].单价
-          document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].金额
+          document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].物料计划到货时间.split(' ')[0]
+          document.getElementsByClassName('tableData')[j].children[4].innerHTML = response.data[j].备注
+          document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].数量
+          document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].单价
+          document.getElementsByClassName('tableData')[j].children[7].innerHTML = response.data[j].金额
         }
       })
       searchTable3(this.contractValue).then(response => {
@@ -410,16 +426,18 @@ export default {
           tr[i] = document.createElement('tr')
           tr[i].setAttribute('class', 'tableData1')
           tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
-            '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
+            '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
           document.getElementById('tableHead1').after(tr[i])
         }
         for (let j = 0; j < this.returns1.length; j++) {
           document.getElementsByClassName('tableData1')[j].children[0].innerHTML = response.data[j].物料名称
           document.getElementsByClassName('tableData1')[j].children[1].innerHTML = response.data[j].零件图号
           document.getElementsByClassName('tableData1')[j].children[2].innerHTML = response.data[j].材料
-          document.getElementsByClassName('tableData1')[j].children[3].innerHTML = response.data[j].数量
-          document.getElementsByClassName('tableData1')[j].children[4].innerHTML = response.data[j].单价
-          document.getElementsByClassName('tableData1')[j].children[5].innerHTML = response.data[j].金额
+          document.getElementsByClassName('tableData1')[j].children[3].innerHTML = response.data[j].物料计划到货时间.split(' ')[0]
+          document.getElementsByClassName('tableData1')[j].children[4].innerHTML = response.data[j].备注
+          document.getElementsByClassName('tableData1')[j].children[5].innerHTML = response.data[j].数量
+          document.getElementsByClassName('tableData1')[j].children[6].innerHTML = response.data[j].单价
+          document.getElementsByClassName('tableData1')[j].children[7].innerHTML = response.data[j].金额
         }
       })
     }