修改bug

src/views/PurchasingCenter/PurchaseContractApproval/index.vue

@@ -40,47 +40,57 @@
         height="300px"
         highlight-current-row
         @row-click="searchTable2">
-        <el-table-column label="采购合同号" align="center" min-width="150">
+        <el-table-column label="采购合同号" align="center" min-width="130">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购合同名称" align="center" min-width="150">
+        <el-table-column label="采购合同名称" align="center" min-width="130">
           <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="100">
-          <template slot-scope="scope">
-            {{ scope.row.规定到货时间 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="300">
+        <el-table-column label="供应商" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购员" align="center" min-width="70">
+        <el-table-column label="采购员" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="总金额" align="center" min-width="80">
+        <el-table-column label="总金额" align="center" min-width="60">
           <template slot-scope="scope">
-            {{ 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="100">
           <template slot-scope="scope">
-            {{ 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.支付日期 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="支付方式" align="center" min-width="150">
+          <template slot-scope="scope">
+            {{ scope.row.支付方式 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="开票信息" align="center" min-width="150">
+          <template slot-scope="scope">
+            {{ scope.row.开票信息 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="其他说明" align="center" min-width="150">
+          <template slot-scope="scope">
+            {{ scope.row.其他说明 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" min-width="100" fixed="right">
           <template slot-scope="scope">
             <el-button type="primary" size="mini" icon="el-icon-edit-outline" @click="Open(scope.row)">审批</el-button>
           </template>
@@ -99,53 +109,7 @@
       </div>
     </el-card>
 
-    <div style="width:900px;margin: 0 auto">
-      <el-card>
-        <table id="1" cellspacing="0px" align="center" border width="100%" style="">
-          <tr style="height: 40px">
-            <td colspan="1" align="center" style="font-weight: bold">GAOJING</td>
-            <td colspan="3" align="center" style="font-weight: bold">产品销售合同</td>
-          </tr>
-          <tr style="height: 40px">
-            <td colspan="1" align="center">需方</td>
-            <td colspan="1" align="center">江苏高精机电装备有限公司</td>
-            <td colspan="1" align="center">合同编号</td>
-            <td colspan="1" align="center">{{ contract }}</td>
-          </tr>
-          <tr style="height: 40px">
-            <td colspan="1" align="center">供方</td>
-            <td colspan="1" align="center">{{ supplier }}</td>
-            <td colspan="1" align="center">签订地点</td>
-            <td colspan="1" align="center">江苏盐城</td>
-          </tr>
-        </table>
-        <div>一、 产品名称、型号、数量、单价、品牌：</div>
-        <table id="2" cellspacing="0px" align="center" border width="100%" style="">
-          <tbody id="4">
-            <tr id="tableHead" style="height: 40px">
-              <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>
-            </tr>
-          </tbody>
-          <tfoot>
-            <tr style="height: 40px">
-              <td colspan="6">运费：</td>
-              <td colspan="1" align="center">{{ freight }}</td>
-            </tr>
-            <tr style="height: 40px">
-              <td colspan="6">总价:  (人民币){{ RMB }}(含0.17增值税) </td>
-              <td colspan="1" align="center">{{ TotalAmount }}</td>
-            </tr>
-          </tfoot>
-        </table>
-        <div id="23"/>
-      </el-card>
-    </div>
+    <div style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="returns"/>
 
     <el-dialog :visible.sync="dialogVisible3" title="审批" center style="min-height: 300px;" width="370px">
       <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" class="demo-ruleForm">
@@ -198,7 +162,7 @@ export default {
       tableData1: [],
       loading1: false,
       dialogVisible3: false,
-      returns: [],
+      returns: '',
       tableData01: [],
       submitDisable: true,
       approval: [
@@ -258,14 +222,6 @@ export default {
       this.supplierName ? this.check4 = 1 : this.check4 = 0
       searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.startEndDate[0], this.startEndDate[1], this.check2, this.contractNumValue, this.check3, this.personValue, this.check4, this.supplierName).then(response => {
         this.loading1 = false
-        for (let j = 0; j < response.data.rows.length; j++) {
-          if (response.data.rows[j].预到货时间 !== null) {
-            response.data.rows[j].预到货时间 = response.data.rows[j].预到货时间.substring(0, response.data.rows[j].预到货时间.indexOf(' '))
-          }
-          if (response.data.rows[j].规定到货时间 !== null) {
-            response.data.rows[j].规定到货时间 = response.data.rows[j].规定到货时间.substring(0, response.data.rows[j].规定到货时间.indexOf(' '))
-          }
-        }
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
       })
@@ -300,40 +256,9 @@ export default {
       this.searchTable1()
     },
     searchTable2(row) {
-      this.textarea = row.合同文本
-      this.supplier = row.供应商名称
-      this.contract = row.采购合同编号
-      this.freight = parseInt(row.总金额) - parseInt(row.总金额_小计)
-      this.RMB = row.总金额_文本
-      this.TotalAmount = row.总金额
-      document.getElementById('23').innerText = this.textarea
       this.contractValue = parseInt(row.采购合同流水号)
       searchTable2(this.contractValue).then(response => {
-        this.returns = response.data
-        const children = document.getElementsByClassName('tableData')
-        const parent = document.getElementById('4')
-        if (children.length !== 0) {
-          for (let i = children.length - 1; i >= 0; i--) {
-            parent.removeChild(children[i])
-          }
-        }
-        const tr = []
-        for (let i = 0; i < this.returns.length; i++) {
-          tr[i] = document.createElement('tr')
-          tr[i].setAttribute('class', 'tableData')
-          tr[i].innerHTML = '<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[6].innerHTML = response.data[j].金额
-        }
+        this.returns = response.data[0].合同内容
       })
     }
   }