a

src/views/PurchasingCenter/CreateInquirySheet/index.vue

@@ -34,7 +34,7 @@
         <el-divider content-position="right"/>
       </div>
     </el-card>
-    <el-row>
+    <el-row id="PurchasingCenter/CreateInquirySheet">
       <el-col :span="24">
         <el-tabs v-model="tabName" type="border-card" @tab-click="tabClick">
           <el-tab-pane label="外购件" name="外购件">
@@ -72,23 +72,44 @@
               <span>物料变更:</span>
               <el-switch v-model="switchValue" active-color="#13ce66" inactive-color="#ff4949"/>
             </el-row>
-            <el-row style="margin-bottom: 10px">
+            <el-row style="margin-bottom: 15px">
               <span>物料规格:</span>
               <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
               <span>物料型号:</span>
               <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
-              <el-button
-                type="success"
+            </el-row>
+            <el-row style="margin-bottom: 10px">
+              <span class="demonstration">开始时间: </span>
+              <el-date-picker
+                v-model="startTime"
+                value-format="yyyy-MM-dd"
                 size="small"
-                icon="el-icon-search"
-                style="margin-left: 10px"
-                @click="pageCurrent11=1;pageSize11=100;total11=0;searchTable11()">查询</el-button>
-              <el-button
-                type="warning"
+                style="width: 200px"
+                type="date"
+                placeholder="选择日期"/>
+              <span class="demonstration">结束时间:</span>
+              <el-date-picker
+                v-model="endTime"
+                value-format="yyyy-MM-dd"
                 size="small"
-                icon="el-icon-download"
-                style="margin-left: 10px"
-                @click="exportUninquirySheet">导出未询价物料清单</el-button>
+                style="width: 200px"
+                type="date"
+                placeholder="选择日期"/>
+              <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent11=1;pageSize11=100;total11=0;searchTable11()">查询</el-button>
+              <el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价物料清单</el-button>
+              <el-popover v-model="visible" title="调整采购任务" placement="top" width="180">
+                <div style="text-align: right; margin: 0">
+                  <el-select v-model="PersonValue" style="width:150px" placeholder="人员" size="small" filterable clearable>
+                    <el-option
+                      v-for="item in Person"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"/>
+                  </el-select>
+                  <el-button type="primary" size="mini" @click="visible = false;tiaozheng1()">确定</el-button>
+                </div>
+                <el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>
+              </el-popover>
             </el-row>
             <el-row style="margin-bottom: 10px">
               <el-table
@@ -275,18 +296,21 @@
               <el-input v-model="partName" placeholder="零件名称" size="small" clearable/>
               <span>零件规格:</span>
               <el-input v-model="partSpec" placeholder="零件规格" size="small" clearable/>
-              <el-button
-                type="success"
-                size="small"
-                icon="el-icon-search"
-                style="margin-left: 10px"
-                @click="pageCurrent12=1;pageSize12=100;total12=0;searchTable12()">查询</el-button>
-              <el-button
-                type="warning"
-                size="small"
-                icon="el-icon-download"
-                style="margin-left: 10px"
-                @click="exportUninquirySheet">导出未询价物料清单</el-button>
+              <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent12=1;pageSize12=100;total12=0;searchTable12()">查询</el-button>
+              <el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价物料清单</el-button>
+              <el-popover v-model="visible2" title="调整采购任务" placement="top" width="180">
+                <div style="text-align: right; margin: 0">
+                  <el-select v-model="PersonValue" style="width:150px" placeholder="人员" size="small" filterable clearable>
+                    <el-option
+                      v-for="item in Person"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"/>
+                  </el-select>
+                  <el-button type="primary" size="mini" @click="visible2 = false;tiaozheng2()">确定</el-button>
+                </div>
+                <el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>
+              </el-popover>
             </el-row>
             <el-row style="margin-bottom: 10px">
               <el-table
@@ -298,7 +322,7 @@
                 height="500px"
                 size="mini"
                 @selection-change="handleSelectionChange2">
-                <el-table-column :selectable="selectable" align="center" width="35" type="selection"/>
+                <el-table-column :selectable="selectable" align="center" width="50" type="selection"/>
                 <!--<el-table-column label="操作" align="center" width="100" fixed="left">-->
                 <!--<template slot-scope="scope">-->
                 <!--<el-button :disabled="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1" type="primary" size="mini" @click="partChange(scope.row)">零件变更</el-button>-->
@@ -877,7 +901,7 @@
 </template>
 
 <script>
-import { getBillNum, searchMaterial, searchPart, searchSupplier, searchCreateInquirySheet, searchCreateInquirySheet2, searchSheetDetail, editInquirySheet,
+import { tiaozheng2, tiaozheng1, getPerson, getBillNum, searchMaterial, searchPart, searchSupplier, searchCreateInquirySheet, searchCreateInquirySheet2, searchSheetDetail, editInquirySheet,
   createInquirySheet, deleteInquirySheet, addInquirySheet1, addInquirySheet2, outInquirySheet, searchAllMaterial, materialChange, saveOrder,
   submitUseInventory, initProject, searchMachine, searchGroup, searchBaseInfo, editBaseInfo, getExport1, getExport2, searchMerge } from '@/api/PurchasingCenter/CreateInquirySheet'
 import { mapGetters } from 'vuex'
@@ -889,6 +913,14 @@ export default {
   name: '', // 创建询价单
   data() {
     return {
+      startTime: '',
+      endTime: '',
+      标准件和外购件流水号: [],
+      基本件流水号: [],
+      visible: false,
+      visible2: false,
+      Person: [],
+      PersonValue: '',
       supplierNames: [], // 供应商下拉框
       switchValue: false, // 物料变更列显示开关
       source: [
@@ -1052,10 +1084,25 @@ export default {
   computed: {
     ...mapGetters([
       'name',
+      'token',
       'id' // 人员编号
     ])
   },
+  watch: {
+    // 如果路由有变化，会再次执行该方法
+    '$route': {
+      handler(route) {
+        const _this = this
+        if (route.name === 'CreateInquirySheet') {
+          setTimeout(() => {
+            _this.Jump()
+          }, 1200)
+        }
+      }
+    }
+  },
   created() {
+    this.getPerson()
     this.fetchData()
     this.searchTable11() // 查表1
     this.searchTable2() // 查表2
@@ -1063,11 +1110,64 @@ export default {
     this.searchUnBuyPartNumber()
     this.initDirection()
   },
+  mounted() {
+    setTimeout(() => {
+      this.Jump()
+    }, 500)
+  },
   methods: {
+    Jump() {
+      window.location.hash = '#PurchasingCenter/CreateInquirySheet'
+    },
+    tiaozheng1() {
+      if (this.标准件和外购件流水号.length !== 0) {
+        if (this.PersonValue) {
+          tiaozheng1(this.PersonValue, this.标准件和外购件流水号).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('调整成功')
+              this.searchTable11()
+            } else {
+              this.$message.warning('调整失败')
+            }
+          })
+        } else {
+          this.$message.warning('请选择人员')
+        }
+      } else {
+        this.$message.warning('请选择物料')
+      }
+    },
+    tiaozheng2() {
+      if (this.基本件流水号.length !== 0) {
+        if (this.PersonValue) {
+          tiaozheng2(this.PersonValue, this.基本件流水号).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('调整成功')
+              this.searchTable12()
+            } else {
+              this.$message.warning('调整失败')
+            }
+          })
+        } else {
+          this.$message.warning('请选择人员')
+        }
+      } else {
+        this.$message.warning('请选择物料')
+      }
+    },
+    getPerson() {
+      getPerson().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.Person.push({
+            value: response.data[i].人员编号,
+            label: response.data[i].姓名
+          })
+        }
+      })
+    },
     initDirection() {
       const direction = this.$getDirection()
       direction.on('keyup', function(e, val) {
-        console.log(val)
         if (e.keyCode === 39) {
           direction.next()
         }
@@ -1083,8 +1183,9 @@ export default {
       })
     },
     clickCard1(project, machine) {
-      var hight = this.$refs.height1.offsetHeight
-      document.documentElement.scrollTop = hight + 140
+      window.location.hash = '#PurchasingCenter/CreateInquirySheet'
+      // var hight = this.$refs.height1.offsetHeight
+      // document.documentElement.scrollTop = hight + 140
       this.projectValue = project
       this.machine = []
       this.machineValue = ''
@@ -1105,8 +1206,9 @@ export default {
       })
     },
     clickCard2(project, machine) {
-      var hight = this.$refs.height1.offsetHeight
-      document.documentElement.scrollTop = hight + 140
+      window.location.hash = '#PurchasingCenter/CreateInquirySheet'
+      // var hight = this.$refs.height1.offsetHeight
+      // document.documentElement.scrollTop = hight + 140
       this.projectValue = project
       this.machine = []
       this.machineValue = ''
@@ -1162,7 +1264,6 @@ export default {
         }
       }).then(res => {
         this.machines1 = res.data
-        console.log(this.machines1)
       })
     },
     async searchUnBuyPartNumber() {
@@ -1364,7 +1465,6 @@ export default {
       this.dialogVisible4 = true
     },
     // cancelUseInventory(row) { // 取消使用滞货
-    //   console.log(row)
     //   this.backlogMaterialNum = row.物料流水号
     //   this.backlogGroupPartNum = row.组件零件流水号
     //   this.cancelNum = row.使用滞货数量
@@ -1373,7 +1473,6 @@ export default {
     //     cancelButtonText: '取消',
     //     type: 'warning'
     //   }).then(() => {
-    //     console.log(this.backlogMaterialNum, this.cancelNum, this.backlogGroupPartNum)
     //     cancelUseInventory(this.backlogMaterialNum, this.cancelNum, this.backlogGroupPartNum).then(response => {
     //       if (response.data[0].result === '1') {
     //         this.searchTable11()
@@ -1409,14 +1508,15 @@ export default {
       return row['供货商'].trim() === value
     },
     searchTable11() { // 查询外购件列表
-      let check1, check2, check3, check4, check5, check6
+      let check1, check2, check3, check4, check5, check6, check7
       this.materialName ? check1 = 1 : check1 = 0
       this.materialSpec ? check2 = 1 : check2 = 0
       this.materialModel ? check3 = 1 : check3 = 0
       this.projectValue ? check4 = 1 : check4 = 0
       this.machineValue ? check5 = 1 : check5 = 0
       this.groupValue ? check6 = 1 : check6 = 0
-      searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, 2).then(response => {
+      this.startTime && this.endTime ? check7 = 1 : check7 = 0
+      searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, 2, check7, this.startTime, this.endTime).then(response => {
         this.tableData11 = response.data.rows
         this.total11 = response.data.total
         const remark = []
@@ -1675,7 +1775,6 @@ export default {
           printNode.remove()
         })
       }).catch(res => {
-        console.log(res)
         this.$message({
           type: 'info',
           message: '已取消操作'
@@ -1724,7 +1823,6 @@ export default {
           }
         })
       }).catch(res => {
-        console.log(res)
         this.$message({
           type: 'info',
           message: '已取消操作'
@@ -1734,17 +1832,21 @@ export default {
     handleSelectionChange1(val) { // 标准件和外购件多选
       this.groupPartNum = []
       this.allNum = []
+      this.标准件和外购件流水号 = []
       for (let i = 0; i < val.length; i++) {
         this.groupPartNum[i] = val[i].组件零件流水号
         this.allNum[i] = val[i].待询价数量
+        this.标准件和外购件流水号[i] = val[i].标准件和外购件流水号
       }
     },
     handleSelectionChange2(val) { // 基本件多选
       this.groupPartBasicNum = []
       this.allNum = []
+      this.基本件流水号 = []
       for (let i = 0; i < val.length; i++) {
         this.groupPartBasicNum[i] = val[i].组件零件基本件流水号
         this.allNum[i] = val[i].零件数量
+        this.基本件流水号[i] = val[i].基本件流水号
       }
     },
     addInquirySheet() { // 追加物料
@@ -1894,7 +1996,6 @@ export default {
     },
     partChange(row) { // 零件变更 基本件
       this.$message('没有基本件的标准库')
-      console.log(row)
     },
     searchMaterial() {
       if (this.materialName0 || this.materialSpec0 || this.materialModel0) {

src/views/PurchasingCenter/CreatePurchaseContract/index.vue

@@ -3,6 +3,17 @@
     <el-card>
       <el-form label-width="90px" label-position="right">
         <el-row>
+          <el-col :span="6">
+            <el-form-item label="供应商:">
+              <el-select v-model="supplierValue11" clearable filterable size="small" placeholder="供应商" style="width:100%" @focus="fetchData11()" @change="selectHetong()">
+                <el-option
+                  v-for="item in supplier11"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="合同编号:">
               <el-select v-model="contractNumValue" filterable size="small" placeholder="合同编号" style="width:100%" @change="contractChange">
@@ -14,6 +25,8 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="6">
             <el-form-item label="供应商:">
               <!--<el-select v-model="supplierValue" clearable filterable size="small" placeholder="供应商" style="width:100%" @focus="fetchData" @change="supplierChange">-->
@@ -163,11 +176,11 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-tooltip :open-delay="1000" content="一键删除交货期" placement="right">
+      <el-tooltip v-show="false" :open-delay="1000" content="一键删除交货期" placement="right">
         <el-button type="danger" icon="el-icon-date" size="small" @click="deleteAllDate()"/>
       </el-tooltip>
       <span>①选择合同模板：</span>
-      <el-radio-group v-model="demoRadio" size="small" @change="demoChange">
+      <el-radio-group v-show="false" v-model="demoRadio" size="small" @change="demoChange">
         <el-radio-button label="模板1"/>
         <el-radio-button label="模板2" disabled/>
         <!--<el-radio-button label="自定义" disabled/>-->
@@ -195,7 +208,7 @@
 
 <script>
 import Tinymce from '@/components/Tinymce'
-import { initSupplier, searchInquirySheet, searchSheetContract, doneContract, searchBaseInfo, savePrice, saveContractHeader, searchContractHeader, saveRemark } from '@/api/PurchasingCenter/CreatePurchaseContract'
+import { initSupplier11, initSupplier, searchInquirySheet, searchSheetContract, doneContract, searchBaseInfo, savePrice, saveContractHeader, searchContractHeader, saveRemark } from '@/api/PurchasingCenter/CreatePurchaseContract'
 import { convertCurrency } from '@/vendor/int2Chinese'
 import { mapGetters } from 'vuex'
 import { sleep, groupBy } from '@/utils/tool'
@@ -206,6 +219,8 @@ export default {
   inject: ['reload'],
   data() {
     return {
+      supplierValue11: '', // 供应商查询条件
+      supplier11: [],
       quickChangePrice: true,
       supplier: [],
       year: '',
@@ -227,7 +242,7 @@ export default {
       hasTax: '含税',
       taxRate: 0.13,
       preview: false, // 预览
-      demoRadio: '', // 模板radio
+      demoRadio: '模板1', // 模板radio
       content: ``, // 合同格式模板
       contentNew: ``, // tinymce的
       contractName: '采购合同', // 合同名称
@@ -267,14 +282,51 @@ export default {
     ])
   },
   created() {
+    this.fetchData11()
     this.fetchData()
     this.initDirection()
+    this.demo1()
   },
   methods: {
+    fetchData11() {
+      initSupplier11(this.id).then(res => {
+        this.supplier11 = []
+        for (let i = 0; i < res.data.length; i++) {
+          this.supplier11.push({
+            value: res.data[i].供应商流水号,
+            label: res.data[i].供应商名称
+          })
+        }
+      })
+    },
+    selectHetong() {
+      this.contractNumValue = ''
+      this.tableData1 = []
+      if (this.supplierValue11) { this.asdasd = 1 } else { this.asdasd = 0 }
+      searchInquirySheet(0, 0, 0, 0, 1, this.id, this.asdasd, this.supplierValue11).then(response => { // 初始化询价单号
+        this.contractNums = []
+        for (let i = 0; i < response.data.length; i++) {
+          this.contractNums.push({
+            value: response.data[i].询价单流水号,
+            label: response.data[i].询价单编号,
+            supplierName: response.data[i].供应商名称,
+            supplierValue: response.data[i].供应商流水号,
+            supplierAddress: response.data[i].地址,
+            legalPerson: response.data[i].企业性质, // 法人
+            trustee: response.data[i].注册资本 || '', // 受托人
+            bank1: response.data[i].开户行 || '', // 开户行
+            account1: response.data[i].帐号 || '', // 帐号
+            taxCode1: response.data[i].税号 || '', // 税号
+            phone1: response.data[i].电话号码 || '', // 电话
+            fax1: response.data[i].传真 || '', // 传真
+            postCode1: response.data[i].货期 || '' // 邮编
+          })
+        }
+      })
+    },
     initDirection() {
       const direction = this.$getDirection()
       direction.on('keyup', function(e, val) {
-        console.log(val)
         if (e.keyCode === 39) {
           direction.next()
         }
@@ -518,152 +570,152 @@ export default {
         case '模板2':
           this.demo2()
           break
-          // case '自定义':
-          //   this.customization()
-          //   break
+        // case '自定义':
+        //   this.customization()
+        //   break
       }
     },
     demo1() { // 选择合同模板1
       this.content = `
 <h2 style="text-align: center;">
-    <strong>采购合同</strong>
+  <strong>采购合同</strong>
 </h2>
 <table style="border-collapse: collapse; width: 100%;" border="1">
-    <tbody>
-        <tr>
-            <td style="width: 25%; text-align: center;" rowspan="2">
-                <h1>
-                    <strong>GAOJING</strong>
-                </h1>
-            </td>
-            <td style="width: 25%;">
-                <h4 style="text-align: center;">合同名称：</h4>
-            </td>
-            <td id="contractName" style="width: 25%;text-align: center;"></td>
-            <td style="width: 25%;text-align: center;" rowspan="2"></td>
-        </tr>
-        <tr>
-            <td style="width: 25%;">
-                <h4 style="text-align: center;">合同编号：</h4>
-            </td>
-            <td id="contractNum" style="width: 25%;text-align: center;"></td>
-        </tr>
-    </tbody>
+  <tbody>
+      <tr>
+          <td style="width: 25%; text-align: center;" rowspan="2">
+              <h1>
+                  <strong>GAOJING</strong>
+              </h1>
+          </td>
+          <td style="width: 25%;">
+              <h4 style="text-align: center;">合同名称：</h4>
+          </td>
+          <td id="contractName" style="width: 25%;text-align: center;"></td>
+          <td style="width: 25%;text-align: center;" rowspan="2"></td>
+      </tr>
+      <tr>
+          <td style="width: 25%;">
+              <h4 style="text-align: center;">合同编号：</h4>
+          </td>
+          <td id="contractNum" style="width: 25%;text-align: center;"></td>
+      </tr>
+  </tbody>
 </table>
 <table style="border-collapse: collapse; width: 100%;" border="1">
-    <tbody>
-        <tr>
-            <td style="width: 15%;">买方：</td>
-            <td style="width: 35%;">江苏高精机电装配有限公司</td>
-            <td style="width: 15%;">卖方：</td>
-            <td id="supplierName" style="width: 35%;"></td>
-        </tr>
-        <tr>
-            <td style="width: 15%;">地址：</td>
-            <td style="width: 35%;">${this.companyAddress}</td>
-            <td style="width: 15%;">地址：</td>
-            <td id="supplierAddress" style="width: 35%;"></td>
-        </tr>
-        <tr>
-            <td style="width: 15%;">法定代表人：</td>
-            <td style="width: 35%;">徐秀兵</td>
-            <td style="width: 15%;">法定代表人：</td>
-            <td id="legalPerson" style="width: 35%;"></td>
-        </tr>
-    </tbody>
+  <tbody>
+      <tr>
+          <td style="width: 15%;">买方：</td>
+          <td style="width: 35%;">江苏高精机电装配有限公司</td>
+          <td style="width: 15%;">卖方：</td>
+          <td id="supplierName" style="width: 35%;"></td>
+      </tr>
+      <tr>
+          <td style="width: 15%;">地址：</td>
+          <td style="width: 35%;">${this.companyAddress}</td>
+          <td style="width: 15%;">地址：</td>
+          <td id="supplierAddress" style="width: 35%;"></td>
+      </tr>
+      <tr>
+          <td style="width: 15%;">法定代表人：</td>
+          <td style="width: 35%;">徐秀兵</td>
+          <td style="width: 15%;">法定代表人：</td>
+          <td id="legalPerson" style="width: 35%;"></td>
+      </tr>
+  </tbody>
 </table>
 <p>根据中华人民共和国合同法及相关法律法规，经买卖双方平等协商，就卖方向买方出售合同项下产品事宜达成一致，签订本合同（明细表及合同通用条款）如下：</p>
 <table style="border-collapse: collapse; width: 100%;" border="1">
-    <tbody>
-        <tr>
-            <td style="width: 20%;">合同总额（RMB）：</td>
-            <td class="actualTotal" style="width: 20%;"></td>
-            <td style="width: 20%;">大写：</td>
-            <td id="actualTotal_zh" style="width: 40%;"></td>
-        </tr>
-        <tr>
-            <td style="width: 20%;" rowspan="3">交货地点：</td>
-            <td style="width: 20%;">地址：</td>
-            <td style="width: 30%;" colspan="2">${this.sendAddress}</td>
-        </tr>
-        <tr>
-            <td style="width: 20%;">联系人：</td>
-            <td style="width: 30%;" colspan="2">${this.name}</td>
-        </tr>
-        <tr>
-            <td style="width: 20%;">联系电话：</td>
-            <td style="width: 30%;" colspan="2">${this.phone2}</td>
-        </tr>
-        <tr>
-            <td style="width: 20%;">交货日期：</td>
-            <td id="deliveryDate" style="width: 30%;" colspan="3"></td>
-        </tr>
-        <tr>
-            <td style="width: 20%;">开票信息：</td>
-            <td id="invoiceInfo" style="width: 30%;" colspan="3"></td>
-        </tr>
-        <tr>
-            <td style="width: 20%;">支付日期：</td>
-            <td id="payDate" style="width: 30%;" colspan="3"></td>
-        </tr>
-        <tr>
-            <td style="width: 20%;">支付方式：</td>
-            <td id="payMethod" style="width: 30%;" colspan="3"></td>
-        </tr>
-        <tr>
-            <td style="width: 20%;">其他说明：</td>
-            <td id="otherInfo" style="width: 30%;" colspan="3"></td>
-        </tr>
-    </tbody>
+  <tbody>
+      <tr>
+          <td style="width: 20%;">合同总额（RMB）：</td>
+          <td class="actualTotal" style="width: 20%;"></td>
+          <td style="width: 20%;">大写：</td>
+          <td id="actualTotal_zh" style="width: 40%;"></td>
+      </tr>
+      <tr>
+          <td style="width: 20%;" rowspan="3">交货地点：</td>
+          <td style="width: 20%;">地址：</td>
+          <td style="width: 30%;" colspan="2">${this.sendAddress}</td>
+      </tr>
+      <tr>
+          <td style="width: 20%;">联系人：</td>
+          <td style="width: 30%;" colspan="2">${this.name}</td>
+      </tr>
+      <tr>
+          <td style="width: 20%;">联系电话：</td>
+          <td style="width: 30%;" colspan="2">${this.phone2}</td>
+      </tr>
+      <tr>
+          <td style="width: 20%;">交货日期：</td>
+          <td id="deliveryDate" style="width: 30%;" colspan="3"></td>
+      </tr>
+      <tr>
+          <td style="width: 20%;">开票信息：</td>
+          <td id="invoiceInfo" style="width: 30%;" colspan="3"></td>
+      </tr>
+      <tr>
+          <td style="width: 20%;">支付日期：</td>
+          <td id="payDate" style="width: 30%;" colspan="3"></td>
+      </tr>
+      <tr>
+          <td style="width: 20%;">支付方式：</td>
+          <td id="payMethod" style="width: 30%;" colspan="3"></td>
+      </tr>
+      <tr>
+          <td style="width: 20%;">其他说明：</td>
+          <td id="otherInfo" style="width: 30%;" colspan="3"></td>
+      </tr>
+  </tbody>
 </table>
 <table style="border-collapse: collapse; width: 100%;" border="1">
-    <tbody>
-        <tr>
-            <td style="width: 50%;">
-                <span>卖方：${this.supplierName}（盖章）</span><br>
-                <span>受托人：${this.trustee}</span><br>
-                <span>开户行：${this.bank1}</span><br>
-                <span>账号：${this.account1}</span><br>
-                <span>税号：${this.taxCode1}</span><br>
-                <span>电话：${this.phone1}</span><br>
-                <span>传真：${this.fax1}</span><br>
-                <span>邮编：${this.postCode1}</span>
-            </td>
-            <td style="width: 50%;">
-                <span>买方：江苏高精机电装配有限公司（盖章）</span><br>
-                <span>受托人：${this.name}</span><br>
-                <span>开户行：${this.bank2}</span><br>
-                <span>账号：${this.account2}</span><br>
-                <span>税号：${this.taxCode2}</span><br>
-                <span>电话：${this.phone2}</span><br>
-                <span>传真：${this.fax2}</span><br>
-                <span>邮编：${this.postCode2}</span>
-            </td>
-        </tr>
-    </tbody>
+  <tbody>
+      <tr>
+          <td style="width: 50%;">
+              <span>卖方：${this.supplierName}（盖章）</span><br>
+              <span>受托人：${this.trustee}</span><br>
+              <span>开户行：${this.bank1}</span><br>
+              <span>账号：${this.account1}</span><br>
+              <span>税号：${this.taxCode1}</span><br>
+              <span>电话：${this.phone1}</span><br>
+              <span>传真：${this.fax1}</span><br>
+              <span>邮编：${this.postCode1}</span>
+          </td>
+          <td style="width: 50%;">
+              <span>买方：江苏高精机电装配有限公司（盖章）</span><br>
+              <span>受托人：${this.name}</span><br>
+              <span>开户行：${this.bank2}</span><br>
+              <span>账号：${this.account2}</span><br>
+              <span>税号：${this.taxCode2}</span><br>
+              <span>电话：${this.phone2}</span><br>
+              <span>传真：${this.fax2}</span><br>
+              <span>邮编：${this.postCode2}</span>
+          </td>
+      </tr>
+  </tbody>
 </table>
 <p style="text-align: right;">日期：_${this.year}_年_${this.month}_月_${this.day}_日</p>
 <hr />
 <p style="text-align: center;">
-    <strong>明细表</strong>
-    (<strong id="hasTax"></strong>)
+  <strong>明细表</strong>
+  (<strong id="hasTax"></strong>)
 </p>
 <table style="border-collapse: collapse; width: 100%;" border="1">
-    <tbody id="tbody">
-        <tr id="tableHead">
-            <td>序号</td>
-            <td>机床号-组号</td>
-            <td>名称</td>
-            <td>图号或型号</td>
-            <td>规格</td>
-            <td>数量</td>
-            <td>单位</td>
-            <td>单价</td>
-            <td>合计</td>
-            <td>交货时间</td>
-            <td>备注</td>
-        </tr>
-    </tbody>
+  <tbody id="tbody">
+      <tr id="tableHead">
+          <td>序号</td>
+          <td>机床号-组号</td>
+          <td>名称</td>
+          <td>图号或型号</td>
+          <td>规格</td>
+          <td>数量</td>
+          <td>单位</td>
+          <td>单价</td>
+          <td>合计</td>
+          <td>交货时间</td>
+          <td>备注</td>
+      </tr>
+  </tbody>
 </table>
 <span>未税合计：</span><span id="untaxTotal"></span><span>元</span><br>
 <span>税额：</span><span id="tax"></span><br>