采购请款审核

src/api/PurchasingCenter/FundApproval.js

@@ -75,14 +75,14 @@ export function execApprovalOffline(num1, num2, reason, person, state) {
   })
 }
 // 采购合同内容查询
-export function searchContactDetail(num) {
+export function searchContactDetail(check, num1, num2) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_采购合同内容_查询数据',
+      name: '采购管理_采购合同内容_查询数据_合并后',
-      param: '采购合同流水号=' + num
+      param: `check=${check}&采购合同流水号=${num1}&离线合同流水号=${num2}`
     }
   })
 }

src/views/PurchasingCenter/FundApproval1/index.vue

@@ -30,7 +30,7 @@
                 <el-table-column width="50" align="center" type="index" label="序号"/>
                 <el-table-column min-width="150" align="center" label="采购合同编号">
                   <template slot-scope="scope">
-                    {{ scope.row.采购合同编号 }}
+                    {{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
                   </template>
                 </el-table-column>
                 <el-table-column min-width="100" align="center" label="合同总额" prop="请款金额">
@@ -58,72 +58,11 @@
           @current-change="handleCurrentChange1"/>
       </div>
     </el-card>
-
+    <h3 style="">合同明细</h3>
-    <el-card>
-      <h3 style="margin-top: 0">离线合同</h3>
-      <el-table v-loading="" :data="tableData2" border style="width: 100%;max-height: 300px;" height="300px" size="mini">
-        <el-table-column label="供应商" align="center" min-width="170">
-          <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">
-          <template slot-scope="scope">
-            {{ scope.row.姓名 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="请款金额" align="center" min-width="100" prop="请款金额">
-          <template slot-scope="scope">
-            {{ scope.row.请款金额 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="审核" align="center" width="320">
-          <template slot-scope="scope">
-            <el-popover placement="right" width="400" trigger="click">
-              <el-table :data="gridData2" stripe size="mini" show-summary highlight-current-row @row-click="searchOfflineContactDetail">
-                <el-table-column width="50" align="center" type="index" label="序号"/>
-                <el-table-column min-width="150" align="center" label="离线合同编号">
-                  <template slot-scope="scope">
-                    {{ scope.row.离线合同编号 }}
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="100" align="center" label="合同总额" prop="请款金额">
-                  <template slot-scope="scope">
-                    {{ scope.row.请款金额 }}
-                  </template>
-                </el-table-column>
-              </el-table>
-              <el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" @click="searchTable02(scope.row)">查看详情</el-button>
-            </el-popover>
-            <el-button type="primary" size="mini" icon="el-icon-check" @click="yesApprovalOffline(scope.row)">通过</el-button>
-            <el-button type="danger" size="mini" icon="el-icon-close" @click="noApprovalOffline(scope.row)">不通过</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent2"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize2"
-          :total="total2"
-          style="display:inline-block;width:50%"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange2"
-          @current-change="handleCurrentChange2"/>
-      </div>
-    </el-card>
-    <h3 style="margin-top: 0">采购合同</h3>
-    <div id="print" class="print" style="background-color:white;min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="contractDetail1"/>
-    <h3 style="">离线合同</h3>
     <el-table v-loading="" :data="contractDetail2" :summary-method="getSummaries" border style="margin-top:10px;max-height: 500px;" height="500px" size="mini" show-summary>
-      <el-table-column label="离线合同编号" align="center" min-width="150">
+      <el-table-column label="合同编号" align="center" min-width="150">
         <template slot-scope="scope">
-          {{ scope.row.离线合同编号 }}
+          {{ scope.row.合同类型 === 1 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
         </template>
       </el-table-column>
       <el-table-column label="物料名称" align="center" min-width="150">
@@ -131,7 +70,7 @@
           {{ scope.row.物料名称 }}
         </template>
       </el-table-column>
-      <el-table-column label="物料规格" align="center" min-width="100">
+      <el-table-column label="物料规格" align="center" min-width="200">
         <template slot-scope="scope">
           {{ scope.row.物料规格 }}
         </template>
@@ -158,7 +97,7 @@
       </el-table-column>
       <el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
         <template slot-scope="scope">
-          {{ scope.row.交货期要求 }}
+          {{ scope.row.合同类型 === 1 ? scope.row.交货期.split(' ')[0] : scope.row.交货期要求 }}
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" min-width="80" prop="备注">
@@ -205,8 +144,11 @@ export default {
   },
   methods: {
     searchContactDetail(row) {
-      searchContactDetail(row.采购合同流水号).then(response => {
+      var check
-        this.contractDetail1 = response.data[0].合同内容
+      row.采购合同流水号 ? check = 1 : check = 2
+      searchContactDetail(check, row.采购合同流水号, row.离线合同流水号).then(response => {
+        this.contractDetail2 = response.data
+        // this.contractDetail1 = response.data[0].合同内容
       })
     },
     searchOfflineContactDetail(row) { // 查询离线合同明细
@@ -241,7 +183,7 @@ export default {
     },
     fetchData() {
       this.searchTable1()
-      this.searchTable2()
+      // this.searchTable2()
     },
     searchTable1() {
       initApproval(this.pageCurrent1, this.pageSize1, 0).then(response => {
@@ -310,6 +252,7 @@ export default {
         execApproval(row.采购合同请款流水号, 2, value, this.id, 0).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('执行成功')
+            this.tableData2 = []
             this.searchTable1()
           } else { this.$message.error('执行失败') }
         })

src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue

@@ -418,7 +418,6 @@ export default {
             v.请款金额 = v.合同总额 - v.已付金额 - v.申请中金额
             return v
           })
-          console.log(this.tableData01)
         })
       }
     },