Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

src/views/PurchasingCenter/CreateInquirySheet/index.vue

@@ -322,6 +322,7 @@
           layout="total, sizes, prev, pager, next, jumper"
           @size-change="handleSizeChange2"
           @current-change="handleCurrentChange2"/>
+        <el-button :disabled="tableData3.length===0" type="warning" size="mini" style="margin-left:10px;float: right" @click="printInquirySheet()">打印</el-button>
         <el-button :disabled="tableData3.length===0" type="warning" size="mini" style="margin-left:10px;float: right" @click="exportInquirySheet()">导出</el-button>
         <el-button :disabled="tableData3.length===0" type="success" size="mini" style="float: right" @click="saveOrder()">保存</el-button>
       </div><hr>
@@ -411,7 +412,7 @@
       </table>
     </div>
 
-    <el-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px">
+    <el-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px" width="700px">
       <el-form ref="form1" :model="form1" label-position="left" label-width="90px" class="searchForm">
         <el-row>
           <el-col :span="12">
@@ -604,6 +605,7 @@ import { searchMaterial, searchPart, searchSupplier, searchCreateInquirySheet, s
   submitUseInventory } from '@/api/PurchasingCenter/CreateInquirySheet'
 import { mapGetters } from 'vuex'
 import { exportExcelMethod } from './exportExcel'
+import $ from 'jquery'
 
 export default {
   name: '', // 创建询价单
@@ -950,6 +952,61 @@ export default {
         }
       })
     },
+    printInquirySheet() { // 打印询价单
+      this.$confirm('确定打印该询价单?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        if (this.tableData3.length === 0 && !this.supplierExport) {
+          this.$message.error('请选择正确的询价单导出')
+        } else {
+          const children = document.getElementsByClassName('tableData')
+          const parent = document.getElementsByClassName('inquirySheet')[0]
+          if (children.length !== 0) {
+            for (let i = children.length - 1; i >= 0; i--) {
+              parent.removeChild(children[i])
+            }
+          }
+          const tr = []
+          let length = 0
+          this.tableData3.length < 15 ? length = 15 : length = this.tableData3.length
+          for (let i = 0; i < length; i++) {
+            tr[i] = document.createElement('tr')
+            tr[i].setAttribute('class', 'tableData')
+            tr[i].innerHTML = `<td width="8.3%" height="30px"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" colspan="3"/>`
+            $('#tablehead').after(tr[i])
+          }
+          for (let j = 0; j < this.tableData3.length; j++) {
+            document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
+            document.getElementsByClassName('tableData')[j].children[1].innerHTML = this.tableData3[j].物料型号 || this.tableData3[j].零件图号
+            document.getElementsByClassName('tableData')[j].children[2].innerHTML = this.tableData3[j].物料名称 || this.tableData3[j].零件名称
+            document.getElementsByClassName('tableData')[j].children[3].innerHTML = this.tableData3[j].物料规格 || this.tableData3[j].规格
+            document.getElementsByClassName('tableData')[j].children[4].innerHTML = this.tableData3[j].数量
+            document.getElementsByClassName('tableData')[j].children[6].innerHTML = this.tableData3[j].备注
+          }
+          document.getElementById('inquirySheetNum').innerHTML = this.orderExport
+          document.getElementById('supplier').innerHTML = this.supplierExport
+        }
+      }).then(() => {
+        const htmlNode = $('#inquirySheet').html()
+        const body = $('body').attr('style', 'padding: 20px;margin: 0 auto;display: block;width: 800px;background: #fff;')
+        body.children().hide()
+        const printNode = $(htmlNode)
+        body.append(printNode)
+        window.print()
+        body.removeAttr('style')
+        body.children().not('script').show()
+        body.children().not('#app').hide()
+        printNode.remove()
+      }).catch(res => {
+        console.log(res)
+        this.$message({
+          type: 'info',
+          message: '已取消操作'
+        })
+      })
+    },
     exportInquirySheet() { // 导出询价单
       this.$confirm('确认导出询价单?', '提示', {
         confirmButtonText: '确定',
@@ -973,7 +1030,7 @@ export default {
             tr[i] = document.createElement('tr')
             tr[i].setAttribute('class', 'tableData')
             tr[i].innerHTML = `<td width="8.3%" height="30px"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" colspan="3"/>`
-            document.getElementById('tablehead').after(tr[i])
+            $('#tablehead').after(tr[i])
           }
           for (let j = 0; j < this.tableData3.length; j++) {
             document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1

src/views/PurchasingCenter/CreatePurchaseContract/index.vue

@@ -169,7 +169,7 @@ export default {
       hasTax: '未税',
       taxRate: 0.16,
       preview: false, // 预览
-      demoRadio: '模板1', // 模板radio
+      demoRadio: '', // 模板radio
       content: ``, // 合同格式模板
       contentNew: ``, // tinymce的
       contractName: '采购合同', // 合同名称
@@ -433,10 +433,8 @@ export default {
 `
     },
     async editContract() { // 选择一个询价单，整成合同明细
-      this.demoChange()
-      await sleep(0) // 处理渲染延迟
-      console.log(document.getElementById('tbody'))
       if (this.contractNumValue) {
+        if (this.demoRadio) {
           this.$refs.tinymce.destroyTinymce()
           document.getElementById('contractName') ? document.getElementById('contractName').innerHTML = this.contractName : ''
           document.getElementById('contractNum') ? document.getElementById('contractNum').innerHTML = this.contractNum : ''
@@ -455,7 +453,6 @@ export default {
           // 移出旧数据
           const children = document.getElementsByClassName('tableData')
           const parent = document.getElementById('tbody')
-        console.log(children, parent)
           if (children.length !== 0) {
             for (let i = children.length - 1; i >= 0; i--) {
               parent.removeChild(children[i])
@@ -501,6 +498,9 @@ export default {
           document.getElementById('actualTotal_zh') ? document.getElementById('actualTotal_zh').innerHTML = this.actualTotal_zh : ''
           this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML
           this.$refs.tinymce.initTinymce()
+        } else {
+          this.$message.warning('请先选择合同模板，再预览')
+        }
       } else {
         this.$message.warning('请先选择合同，再预览')
       }
@@ -534,7 +534,7 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          console.log(this.contractNum, this.contractName, this.deliveryDate, this.payDate, this.payMethod, this.invoiceInfo, this.otherInfo, this.actualTotal, this.id, this.supplierValue, this.单价是否含税, this.组件零件流水号组, this.组件零件基本件流水号组, this.数量组, this.单价组, this.交货期组, this.content)
+          // console.log(this.contractNum, this.contractName, this.deliveryDate, this.payDate, this.payMethod, this.invoiceInfo, this.otherInfo, this.actualTotal, this.id, this.supplierValue, this.单价是否含税, this.组件零件流水号组, this.组件零件基本件流水号组, this.数量组, this.单价组, this.交货期组, this.content)
           doneContract(this.contractNum, this.contractName, this.deliveryDate, this.payDate, this.payMethod, this.invoiceInfo, this.otherInfo, this.actualTotal, this.id, this.supplierValue, this.单价是否含税, this.组件零件流水号组, this.组件零件基本件流水号组, this.数量组, this.单价组, this.交货期组, this.content).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('合同生成成功')

src/views/PurchasingCenter/OfflineContract/index.vue

@@ -387,7 +387,7 @@
       </el-table>
     </el-card>
 
-    <el-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px">
+    <el-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px" width="700px">
       <el-form ref="form1" :model="form1" label-position="left" label-width="90px" class="searchForm">
         <el-row>
           <el-col :span="12">
@@ -1207,7 +1207,7 @@ export default {
           tr[i] = document.createElement('tr')
           tr[i].setAttribute('class', 'tableData')
           tr[i].innerHTML = `<td style="height: 40px"/><td colspan="2" style="height: 40px"/><td style="height: 40px"/><td colspan="2" style="height: 40px"/><td style="height: 40px"/><td colspan="2" style="height: 40px"/><td colspan="2" style="height: 40px"/><td style="height: 40px"/><td colspan="2" style="height: 40px"/>`
-          document.getElementById('tablehead').after(tr[i])
+          $('#tablehead').after(tr[i])
         }
         let total = 0
         for (let j = 0; j < this.tableData3.length; j++) {

src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue

@@ -75,6 +75,14 @@
           style="margin-left: 10px"
           @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
         <el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
+        <div style="margin-top: 10px">
+          <span v-show="supplierValue">累计合同总额：</span>
+          <el-input v-show="supplierValue" v-model="totalSum" size="mini" style="width: 100px;" readonly/>
+          <span v-show="supplierValue">累计付款：</span>
+          <el-input v-show="supplierValue" v-model="totalPay" size="mini" style="width: 100px;" readonly/>
+          <span v-show="supplierValue">累计欠款：</span>
+          <el-input v-show="supplierValue" v-model="totalDebt" size="mini" style="width: 100px;" readonly/>
+        </div>
       </div>
       <h3 style="margin-top: 0">请款表</h3>
       <el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini">
@@ -157,20 +165,14 @@
           :page-sizes="[10, 20, 30, 40]"
           :page-size="pageSize1"
           :total="total1"
-          style="display:inline-block;width:50%"
+          style="display:inline-block;width:700px"
           layout="total, sizes, prev, pager, next, jumper"
           @size-change="handleSizeChange1"
           @current-change="handleCurrentChange1"/>
-        <span v-show="supplierValue">累计合同总额：</span>
-        <el-input v-show="supplierValue" v-model="totalSum" size="mini" style="width: 100px;" readonly/>
-        <span v-show="supplierValue">累计付款：</span>
-        <el-input v-show="supplierValue" v-model="totalPay" size="mini" style="width: 100px;" readonly/>
-        <span v-show="supplierValue">累计欠款：</span>
-        <el-input v-show="supplierValue" v-model="totalDebt" size="mini" style="width: 100px;" readonly/>
       </div>
     </el-card>
 
-    <el-dialog :visible.sync="dialogVisible2" title="采购合同请款" center style="min-height: 300px" width="1200px">
+    <el-dialog :visible.sync="dialogVisible2" title="采购合同请款" center style="min-height: 300px" width="1000px">
       <span>供应商：</span>
       <el-select v-model="supplierValue" placeholder="供应商" filterable clearable size="small">
         <el-option