更新

src/api/WorkshopProcurement/RequestApprovalQuery2.js

@@ -0,0 +1,59 @@
+import request from '@/utils/request'
+import state from '@/store'
+import router from '@/router'
+
+// 初始化采购员
+export function initBuyer() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '人事档案管理_人员与角色_查询数据_采购员'
+    }
+  })
+}
+// 采购合同查询
+export function searchTable1(radio, check1, supplier, check2, start, end, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '车间采购管理_采购合同_请款审批_查询数据',
+      param: '查询全部=' + radio + '&供应商流水号_check=' + check1 + '&供应商流水号=' + supplier + '&时间段_check=' + check2 + '&开始时间=' + start + '&结束时间=' + end,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 查询离线合同请款信息明细
+export function searchTable2(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '采购管理_采购合同_请款明细_查询数据',
+      param: `采购合同请款流水号=${num}`
+    }
+  })
+}
+// 查询供应商
+export function searchSupplier() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '采购管理_供应商_查询数据_根据条件'
+    }
+  })
+}

src/views/Inventory/MaterialOut/index.vue

@@ -224,7 +224,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible3=false">取消</el-button>
-        <el-button :disabled="dialogFormVisible3" type="primary" @click="pickConfirm1()">确 定</el-button>
+        <el-button :disabled="buttonDisable" type="primary" @click="pickConfirm1()">确 定</el-button>
       </div>
     </el-dialog>
 

src/views/ManufacturingCenter/ContractApprovalQuery/index.vue

@@ -74,6 +74,11 @@
             {{ scope.row.审核情况内容 }}
           </template>
         </el-table-column>
+        <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" width="90px" fixed="right">
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" effect="dark" content="查看详情" placement="top">

src/views/ManufacturingCenter/ContractApprovalQuery1/index.vue

@@ -74,6 +74,11 @@
             {{ scope.row.审批情况内容 }}
           </template>
         </el-table-column>
+        <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" width="90px" fixed="right">
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" effect="dark" content="查看详情" placement="top">
@@ -170,7 +175,7 @@ export default {
       }
       param[6] = ['人员编号_check', check3]
       param[7] = ['人员编号', this.personValue]
-      var Data = this.CreateData('2001', '报表_采购管理_合同审核查询_查询数据', param)
+      var Data = this.CreateData('2001', '报表_采购管理_合同审批查询_查询数据', param)
       this.exportExcel_NPOI(Data)
     },
     searchTable2(row) {

src/views/ManufacturingCenter/RequestApprovalQuery/index.vue

@@ -71,6 +71,11 @@
             {{ scope.row.审核情况内容 }}
           </template>
         </el-table-column>
+        <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" width="90px" fixed="right">
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" effect="dark" content="查看详情" placement="top">

src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue

@@ -51,6 +51,21 @@
             {{ scope.row.请款金额 }}
           </template>
         </el-table-column>
+        <el-table-column label="审核时间" align="center" min-width="60">
+          <template slot-scope="scope">
+            {{ scope.row.审核时间 ? scope.row.审核时间.split(' ')[0] : '' }}
+          </template>
+        </el-table-column>
+        <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="60">
+          <template slot-scope="scope">
+            {{ scope.row.审核情况内容 }}
+          </template>
+        </el-table-column>
         <el-table-column label="审批时间" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '' }}
@@ -66,6 +81,11 @@
             {{ scope.row.审批情况内容 }}
           </template>
         </el-table-column>
+        <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" width="90px" fixed="right">
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" effect="dark" content="查看详情" placement="top">
@@ -117,7 +137,7 @@
 </template>
 
 <script>
-import { initBuyer, searchTable1, searchTable2, searchSupplier } from '@/api/ManufacturingCenter/RequestApprovalQuery'
+import { initBuyer, searchTable1, searchTable2, searchSupplier } from '@/api/ManufacturingCenter/RequestApprovalQuery1'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -207,7 +227,7 @@ export default {
       }
       param[6] = ['人员编号_check', check3]
       param[7] = ['人员编号', this.personValue]
-      var Data = this.CreateData('2001', '报表_采购管理_情况审核查询_查询数据', param)
+      var Data = this.CreateData('2001', '报表_采购管理_情况审批查询_查询数据', param)
       this.exportExcel_NPOI(Data)
     },
     searchTable2(row) {

src/views/WorkshopProcurement/ContractApprovalQuery2/index.vue

@@ -21,7 +21,7 @@
       <el-button type="success" size="small" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;margin-right: 20px;float: right" plain @click="exportTable('')">导出</el-button>
     </el-card>
     <el-card style="margin-top: 5px">
-      <el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row @row-click="searchTable2">
+      <el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row>
         <el-table-column label="采购合同编号" align="center" min-width="130">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
@@ -57,6 +57,11 @@
             {{ scope.row.审批情况内容 }}
           </template>
         </el-table-column>
+        <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" width="90px" fixed="right">
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" effect="dark" content="查看详情" placement="top">
@@ -81,13 +86,232 @@
     </el-card>
 
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="合同审批通知" center style="min-height: 300px;" width="900px">
-      <div style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="returns"/>
+      <el-card>
+        <div style="width:100%">
+          <el-card v-show="type==='1' || type==='2'">
+            <table id="1" cellspacing="0px" align="center" border width="100%" style="margin-top: 10px">
+              <tr style="height: 40px">
+                <td colspan="2" align="center" style="font-weight: bold">GAOJING</td>
+                <td colspan="5" align="center" style="font-weight: bold">产品销售合同</td>
+                <td colspan="1" rowspan="3" style="width: 119px"><img id="img" alt=""></td>
+              </tr>
+              <tr style="height: 40px">
+                <td colspan="1" align="center">需方</td>
+                <td colspan="3" align="center">江苏高精机电装备有限公司</td>
+                <td colspan="1" align="center">合同编号</td>
+                <td colspan="2" align="center">{{ contract }}</td>
+              </tr>
+              <tr style="height: 40px">
+                <td colspan="1" align="center">供方</td>
+                <td colspan="3" align="center">{{ supplier }}</td>
+                <td colspan="1" align="center">签订地点</td>
+                <td colspan="2" align="center">江苏盐城</td>
+              </tr>
+            </table>
+            <div style="margin-top: 20px;line-height: 30px">根据《中华人民共和国合同法》的有关规定，经供需双方友好协商，在平等自愿的基础上定立本合同，以便供需双方共同遵守。</div>
+            <div style="line-height: 30px">一、 产品名称、规格型号、材质、数量、单价和交货期：</div>
+            <table id="50" 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>
+                  <td colspan="1" align="center">总价</td>
+                </tr>
+              <!--</tbody>-->
+              <!--&lt;!&ndash;<tbody id="4">&ndash;&gt;-->
+              <!--&lt;!&ndash;<tr id="tableHead" style="height: 40px">&ndash;&gt;-->
+              <!--&lt;!&ndash;<td colspan="1" align="center">物料名称</td>&ndash;&gt;-->
+              <!--&lt;!&ndash;<td colspan="1" align="center">物料规格</td>&ndash;&gt;-->
+              <!--&lt;!&ndash;<td colspan="1" align="center">物料型号</td>&ndash;&gt;-->
+              <!--&lt;!&ndash;<td colspan="1" align="center">交货期</td>&ndash;&gt;-->
+              <!--&lt;!&ndash;<td colspan="1" align="center">备注</td>&ndash;&gt;-->
+              <!--&lt;!&ndash;<td colspan="1" align="center">数量</td>&ndash;&gt;-->
+              <!--&lt;!&ndash;<td colspan="1" align="center">单价</td>&ndash;&gt;-->
+              <!--&lt;!&ndash;<td colspan="1" align="center">总价</td>&ndash;&gt;-->
+              <!--&lt;!&ndash;</tr>&ndash;&gt;-->
+              </tbody>
+              <tfoot>
+                <tr style="height: 40px">
+                  <td colspan="7">总价:  (人民币){{ RMB }}(未税) </td>
+                  <td colspan="1" align="center">{{ TotalAmount }}</td>
+                </tr>
+                <tr style="height: 40px">
+                  <td colspan="7">总价:  (人民币){{ RMB1 }}(含{{ taxRate }}增值税) </td>
+                  <td colspan="1" align="center">{{ TotalAmount1 }}</td>
+                </tr>
+              </tfoot>
+            </table>
+            <div style="line-height: 30px">以上价格为含税增值税价格，供方开具真实有效的{{ taxRate }}增值税发票</div>
+            <div id="23" style="line-height: 30px"/>
+            <table id="66" cellspacing="0px" align="center" border width="100%" style="margin-top: 30px">
+              <tbody id="67">
+                <tr style="height: 35px">
+                  <td colspan="4" align="center">供    方</td>
+                  <td colspan="4" align="center">需    方</td>
+                </tr>
+                <tr style="height: 35px">
+                  <th style="width: 15%">单位名称（章）</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                  <th style="width: 15%">单位名称（章）</th>
+                  <td style="width: 35%" colspan="3" align="center">江苏高精</td>
+                </tr>
+                <tr style="height: 35px">
+                  <th style="width: 15%">法定代表人</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                  <th style="width: 15%">法定代表人</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                </tr>
+                <tr style="height: 35px">
+                  <th style="width: 15%">委托代理人</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                  <th style="width: 15%">委托代理人</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                </tr>
+                <tr style="height: 35px">
+                  <th style="width: 15%">电话</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                  <th style="width: 15%">电话</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                </tr>
+                <tr v-if="type==='1'" style="height: 35px">
+                  <th style="width: 15%">传真</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                  <th style="width: 15%">传真</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                </tr>
+                <tr v-if="type==='1'" style="height: 35px">
+                  <th style="width: 15%">开户银行</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                  <th style="width: 15%">开户银行</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                </tr>
+                <tr v-if="type==='1'" style="height: 35px">
+                  <th style="width: 15%">账号</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                  <th style="width: 15%">账号</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                </tr>
+                <tr v-if="type==='1'" style="height: 35px">
+                  <th style="width: 15%">税号</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                  <th style="width: 15%">税号</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                </tr>
+                <tr v-if="type==='1'" style="height: 35px">
+                  <th style="width: 15%">邮政编码</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                  <th style="width: 15%">邮政编码</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                </tr>
+              </tbody>
+            </table>
+            <div style="line-height: 25px;margin-top: 10px">签订时间：____年__月__日</div>
+            <div style="line-height: 25px;margin-bottom: 10px">有效期限：____年__月__日至____年__月__日</div>
+          </el-card>
+          <el-card v-show="type==='3'">
+            <table cellspacing="0px" align="center" border="1 solid black" width="100%" style="margin-top: 10px">
+              <tr style="height: 60px">
+                <th colspan="14"><h3>江苏高精机电装备有限公司</h3></th>
+              </tr>
+              <tr style="height: 40px">
+                <th colspan="14"><h4>{{ 采购合同名称 }}</h4></th>
+              </tr>
+              <tr style="height: 40px">
+                <td colspan="2" style="text-align: center;width: 15%">下单单位</td>
+                <td colspan="5" style="text-align: center;width: 35%">{{ supplier }}</td>
+                <td colspan="2" style="text-align: center;width: 15%">单号</td>
+                <td colspan="5" style="text-align: center;width: 35%">{{ contract }}</td>
+              </tr>
+              <tr style="height: 40px">
+                <td colspan="2" style="text-align: center;width: 15%">下单日期</td>
+                <td colspan="5" style="text-align: center;width: 35%">{{ 操作日期 }}</td>
+                <td colspan="2" style="text-align: center;width: 15%">计划完成日期</td>
+                <td colspan="5" style="text-align: center;width: 35%">{{ 规定到货时间 }}</td>
+              </tr>
+            </table>
+            <table cellspacing="0px" align="center" border="1 solid black" width="100%" style="margin-top: 0px">
+              <tr id="tablehead10" style="height: 35px">
+                <td style="text-align: center;width: 7%">序号</td>
+                <td colspan="2" style="text-align: center;width: 20%">物料编码</td>
+                <td colspan="2" style="text-align: center;width: 10%">名称</td>
+                <td colspan="2" style="text-align: center;width: 10%">材料</td>
+                <td colspan="2" style="text-align: center;width: 8%">单位</td>
+                <td colspan="2" style="text-align: center;width: 8%">数量</td>
+                <td colspan="2" style="text-align: center;width: 17%">备注</td>
+              </tr>
+              <tr v-for="(list, index) in returns" :key="index" style="height: 35px">
+                <td style="text-align: center;width: 7%">{{ index + 1 }}</td>
+                <td colspan="2" style="text-align: center;width: 20%">{{ list.图号 }}</td>
+                <td colspan="2" style="text-align: center;width: 10%">{{ list.物料名称 }}</td>
+                <td colspan="2" style="text-align: center;width: 10%">{{ list.规格 }}</td>
+                <td colspan="2" style="text-align: center;width: 8%">{{ list.单位 }}</td>
+                <td colspan="2" style="text-align: center;width: 8%">{{ list.数量 }}</td>
+                <td colspan="2" style="text-align: center;width: 17%">{{ list.备注 }}</td>
+              </tr>
+            </table>
+            <div style="margin-top: 20px;margin-bottom: 10px">联系人:___________ 联系电话:___________ </div>
+          </el-card>
+          <el-card v-show="type === '4'">
+            <div id="CZCG" style="width: 880px;margin: 0 auto">
+              <table cellspacing="0px" align="center" border="1 solid black" width="100%" style="margin-top: 10px">
+                <tr style="height: 60px">
+                  <th colspan="14"><h3>江苏高精机电装备有限公司</h3></th>
+                </tr>
+                <tr style="height: 40px">
+                  <th colspan="14"><h4>{{ 采购合同名称 }}</h4></th>
+                </tr>
+                <tr style="height: 40px">
+                  <td colspan="2" style="text-align: center;width: 15%">下单单位</td>
+                  <td colspan="5" style="text-align: center;width: 35%">{{ supplier }}</td>
+                  <td colspan="2" style="text-align: center;width: 15%">单号</td>
+                  <td colspan="5" style="text-align: center;width: 35%">{{ contract }}</td>
+                </tr>
+                <tr style="height: 40px">
+                  <td colspan="2" style="text-align: center;width: 15%">下单日期</td>
+                  <td colspan="5" style="text-align: center;width: 35%">{{ 操作日期 }}</td>
+                  <td colspan="2" style="text-align: center;width: 15%">计划完成日期</td>
+                  <td colspan="5" style="text-align: center;width: 35%">{{ 规定到货时间 }}</td>
+                </tr>
+              </table>
+              <table cellspacing="0px" align="center" border="1 solid black" width="100%" style="margin-top: 0px">
+                <tr id="tablehead100" style="height: 35px">
+                  <td style="text-align: center;width: 7%">序号</td>
+                  <td colspan="2" style="text-align: center;width: 10%">组号</td>
+                  <td colspan="2" style="text-align: center;width: 20%">组件名称</td>
+                  <td colspan="2" style="text-align: center;width: 10%">单价</td>
+                  <td colspan="2" style="text-align: center;width: 8%">金额</td>
+                  <td colspan="2" style="text-align: center;width: 8%">数量</td>
+                  <td colspan="2" style="text-align: center;width: 17%">备注</td>
+                </tr>
+                <tr v-for="(list, index) in returns2" :key="index" style="height: 35px">
+                  <td style="text-align: center;width: 7%">{{ index + 1 }}</td>
+                  <td colspan="2" style="text-align: center;width: 10%">{{ list.组号 }}</td>
+                  <td colspan="2" style="text-align: center;width: 20%">{{ list.组件名称 }}</td>
+                  <td colspan="2" style="text-align: center;width: 10%">{{ list.单价 }}</td>
+                  <td colspan="2" style="text-align: center;width: 8%">{{ list.金额 }}</td>
+                  <td colspan="2" style="text-align: center;width: 8%">{{ list.数量 }}</td>
+                  <td colspan="2" style="text-align: center;width: 17%">{{ list.备注 }}</td>
+                </tr>
+              </table>
+              <div style="margin-top: 20px;margin-bottom: 10px">联系人:___________ 联系电话:___________ </div>
+            </div>
+          </el-card>
+        </div>
+      </el-card>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { searchTable1, searchTable2 } from '@/api/WorkshopProcurement/ContractApprovalQuery2'
+import { searchTable1 } from '@/api/WorkshopProcurement/ContractApprovalQuery2'
+import { searchTable2, searchTable3 } from '@/api/WorkshopProcurement/ProcurementContractApproval'
+import $ from 'jquery'
+import QRCode from 'qrcode'
 
 export default {
   data() {
@@ -103,7 +327,22 @@ export default {
       tableData1: [],
       loading1: false,
       dialogFormVisible: false,
-      returns: ''
+      采购合同名称: '',
+      规定到货时间: '',
+      操作日期: '',
+      contract: '',
+      contractValue: '',
+      taxRate: '',
+      supplier: '',
+      TotalAmount: '',
+      TotalAmount1: '',
+      textarea: '',
+      RMB: '',
+      RMB1: '',
+      QGNUM: '',
+      type: '',
+      returns: '',
+      returns2: ''
     }
   },
   created() {
@@ -111,6 +350,7 @@ export default {
   },
   methods: {
     searchTable1() {
+      this.textarea = ``
       this.loading1 = true
       var check1, check2
       this.billNames ? check1 = 1 : check1 = 0
@@ -122,10 +362,9 @@ export default {
       })
     },
     exportTable() {
-      var check1, check2, check3
+      var check1, check2
       this.billNames ? check1 = 1 : check1 = 0
       this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
-      this.personValue ? check3 = 1 : check3 = 0
       var param = []
       param[0] = ['查询全部', this.radio]
       param[1] = ['供应商名称_check', check1]
@@ -138,17 +377,83 @@ export default {
         param[4] = ['开始时间', this.dateRange[0]]
         param[5] = ['结束时间', this.dateRange[1]]
       }
-      param[6] = ['人员编号_check', check3]
+      var Data = this.CreateData('2001', '报表_车间采购管理_合同审批查询_查询数据', param)
-      param[7] = ['人员编号', this.personValue]
-      var Data = this.CreateData('2001', '报表_采购管理_合同审核查询_查询数据', param)
       this.exportExcel_NPOI(Data)
     },
     searchTable2(row) {
-      this.contractValue = parseInt(row.采购合同流水号)
+      this.dialogFormVisible = true
-      searchTable2(this.contractValue).then(response => {
+      this.type = row.模板类型
-        this.returns = response.data[0].合同内容
+      console.log(this.type)
-        this.dialogFormVisible = true
+      this.规定到货时间 = row.规定到货时间
-      })
+      this.操作日期 = row.操作日期
+      this.采购合同名称 = row.采购合同名称
+      this.textarea = row.合同文本
+      this.supplier = row.供应商名称
+      this.contract = row.采购合同编号
+      this.taxRate = row.税率
+      this.RMB = row.总金额_文本
+      if (row.总金额 === '0') {
+        this.TotalAmount = ''
+        this.TotalAmount1 = ''
+      } else {
+        this.TotalAmount = row.总金额
+        this.TotalAmount1 = parseInt((row.含税总金额) * 100) / 100
+      }
+      this.RMB1 = row.含税总金额_文本
+      if (this.type === '1' || this.type === '2') {
+        document.getElementById('23').innerText = this.textarea
+        this.contractValue = parseInt(row.采购合同流水号)
+        const opts = {
+          errorCorrectionLevel: 'H',
+          type: 'image/jpeg',
+          rendererOpts: {
+            quality: 0.3
+          }
+        }
+        QRCode.toDataURL(row.采购合同流水号, opts, function(err, url) {
+          if (err) throw err
+          const img = document.getElementById('img')
+          img.src = url
+        })
+        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>' + '<td colspan="1" align="center"></td>'
+            $('#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].物料计划到货时间.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].金额
+          }
+        })
+      } else if (this.type === '3') {
+        this.contractValue = parseInt(row.采购合同流水号)
+        searchTable2(this.contractValue).then(response => {
+          this.returns = response.data
+        })
+      } else {
+        this.contractValue = parseInt(row.采购合同流水号)
+        searchTable3(this.contractValue).then(response => {
+          this.returns2 = response.data
+        })
+      }
     },
     handleSizeChange1(val) {
       this.pageCurrent1 = 1

src/views/WorkshopProcurement/ProcurementContractApproval/index.vue

@@ -539,6 +539,7 @@ export default {
       this.RMB1 = row.含税总金额_文本
       if (this.type === '1' || this.type === '2') {
         document.getElementById('23').innerText = this.textarea
+        console.log(document.getElementById('23').innerText, 1232)
         this.contractValue = parseInt(row.采购合同流水号)
         const opts = {
           errorCorrectionLevel: 'H',

src/views/WorkshopProcurement/RequestApprovalQuery2/index.vue

@@ -0,0 +1,264 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <!--      <el-input v-model="billNames" clearable filterable size="small" placeholder="供应商或合同编号" style="width: 200px;margin: 5px"/>-->
+      <el-select v-model="supplierValue" placeholder="供应商" filterable size="small" style="margin-left: 5px" clearable @change="totalSum=0;totalPay=0;totalDebt=0;">
+        <el-option
+          v-for="item in supplier"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 120px" clearable>
+        <el-option
+          v-for="item in person"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <span style="margin-left: 0">审批时间:</span>
+      <el-date-picker
+        v-model="dateRange"
+        size="small"
+        type="daterange"
+        align="center"
+        style="width: 300px"
+        value-format="yyyy-MM-dd"
+        format="yyyy-MM-dd"
+        range-separator="～"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"/>
+      <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=50;searchTable1()">查询</el-button>
+      <el-radio v-model="radio" label="1" style="margin: 0 0 0 10px">全部</el-radio>
+      <el-radio v-model="radio" label="2" style="margin: 0 0 0 10px">通过</el-radio>
+      <el-radio v-model="radio" label="3" style="margin: 0 0 0 10px">未过</el-radio>
+      <el-button type="success" size="small" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;margin-right: 20px;float: right" plain @click="exportTable('')">导出</el-button>
+    </el-card>
+    <el-card style="margin-top: 5px">
+      <el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row @row-click="searchTable2">
+        <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="60">
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
+        <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="60">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.审核时间 ? scope.row.审核时间.split(' ')[0] : '' }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <!--<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="60">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.审核情况内容 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <el-table-column label="审批时间" align="center" min-width="60">
+          <template slot-scope="scope">
+            {{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '' }}
+          </template>
+        </el-table-column>
+        <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="60">
+          <template slot-scope="scope">
+            {{ scope.row.审批情况内容 }}
+          </template>
+        </el-table-column>
+        <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" width="90px" fixed="right">
+          <template slot-scope="scope">
+            <el-tooltip :open-delay="1000" effect="dark" content="查看详情" placement="top">
+              <div style="display: inline-block">
+                <el-button type="text" size="mini" @click="searchTable2(scope.row)">详情</el-button>
+              </div>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page="pageCurrent1"
+          :page-sizes="[50, 100, 150, 200]"
+          :page-size="pageSize1"
+          :total="total1"
+          style="display:inline-block;width:50%"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange1"
+          @current-change="handleCurrentChange1"/>
+      </div>
+    </el-card>
+
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="请款信息明细" center width="800px">
+      <el-table :data="gridData" highlight-current-row size="mini" show-summary>
+        <el-table-column width="50" align="center" type="index" label="序号"/>
+        <el-table-column min-width="120" align="center" label="采购合同编号">
+          <template slot-scope="scope">
+            {{ scope.row.采购合同编号 }}
+          </template>
+        </el-table-column>
+        <el-table-column min-width="120" align="center" label="已付金额(元)" prop="已付金额">
+          <template slot-scope="scope">
+            {{ scope.row.已付金额.toFixed(2) }}
+          </template>
+        </el-table-column>
+        <el-table-column min-width="120" align="center" label="请款金额(元)" prop="请款金额">
+          <template slot-scope="scope">
+            {{ scope.row.请款金额.toFixed(2) }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { initBuyer, searchTable1, searchSupplier } from '@/api/WorkshopProcurement/RequestApprovalQuery2'
+import { searchRequsetFundDetail } from '@/api/WorkshopProcurement/PurchaseContractRequestFund1'
+import { mapGetters } from 'vuex'
+
+export default {
+  data() {
+    return {
+      radio: '1',
+      billNames: '',
+      supplier: [],
+      supplierValue: '',
+      person: [],
+      personValue: '',
+      dateRange: '',
+      total1: 0,
+      pageCurrent1: 1,
+      pageSize1: 50,
+      tableData1: [],
+      loading1: false,
+      dialogFormVisible: false,
+      gridData: []
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'name',
+      'id' // 人员编号
+    ])
+  },
+  created() {
+    this.fetchData()
+    this.searchTable1()
+    this.searchSupplier()
+  },
+  methods: {
+    searchSupplier() {
+      this.supplier = []
+      searchSupplier().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.supplier.push({
+            label: response.data[i].供应商名称,
+            value: response.data[i].供应商流水号
+          })
+        }
+      })
+    },
+    fetchData() {
+      this.person = []
+      initBuyer().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.person.push({
+            label: response.data[i].姓名,
+            value: response.data[i].人员编号
+          })
+        }
+      })
+    },
+    searchTable1() {
+      this.loading1 = true
+      var check1, check2
+      this.supplierValue ? check1 = 1 : check1 = 0
+      this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
+      searchTable1(this.radio, check1, this.supplierValue, check2, this.dateRange[0], this.dateRange[1], this.pageCurrent1, this.pageSize1).then(response => {
+        console.log(response.data)
+        this.loading1 = false
+        this.tableData1 = response.data.rows
+        this.total1 = response.data.total
+      })
+    },
+    searchTable2(row) { // 查看详情（请款信息包含的合同）
+      this.gridData = []
+      searchRequsetFundDetail(row.采购合同请款流水号).then(response => {
+        this.gridData = response.data
+      })
+    },
+    exportTable() {
+      var check1, check2
+      this.supplierValue ? check1 = 1 : check1 = 0
+      this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
+      var param = []
+      param[0] = ['查询全部', this.radio]
+      param[1] = ['供应商名称_check', check1]
+      param[2] = ['供应商名称', this.supplierValue]
+      param[3] = ['时间段_check', check2]
+      if (check2 === 0) {
+        param[4] = ['开始时间', '']
+        param[5] = ['结束时间', '']
+      } else {
+        param[4] = ['开始时间', this.dateRange[0]]
+        param[5] = ['结束时间', this.dateRange[1]]
+      }
+      var Data = this.CreateData('2001', '报表_车间采购管理_采购合同_请款审批_查询数据', param)
+      this.exportExcel_NPOI(Data)
+    },
+    handleSizeChange1(val) {
+      this.pageCurrent1 = 1
+      this.pageSize1 = val
+      this.searchTable1()
+    },
+    handleCurrentChange1(val) {
+      this.pageCurrent1 = val
+      this.searchTable1()
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .el-card{
+    margin-bottom: 0px;
+  }
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  span{
+    margin: 10px 0 10px 10px;
+  }
+  .searchForm .el-form-item{
+    margin-bottom: 5px;
+  }
+  .el-tag{
+    margin: 0
+  }
+</style>