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

src/api/ManufacturingCenter/GroupMatching.js

@@ -27,7 +27,7 @@ export function searchgroup(num) {
     }
   })
 }
-export function searchTable(check1, machine, check2, groupNum, pageCurrent, pageSize) {
+export function searchTable(check1, machine, check2, groupNum, check3, num, order, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
@@ -36,7 +36,7 @@ export function searchTable(check1, machine, check2, groupNum, pageCurrent, page
       ModularID: router.currentRoute.path,
       type: '1',
       name: '车间生产管理工艺_基本件成组配套_查询数据_新',
-      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
+      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '&名称规格型号_check=' + check3 + '&名称规格型号=' + num + '&排序=' + order + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
     }
   })
 }
@@ -66,7 +66,7 @@ export function searchTable22(check1, machine, check2, groupNum, check3, year, c
     }
   })
 }
-export function searchTable1(check1, machine, check2, groupNum, pageCurrent, pageSize) {
+export function searchTable1(check1, machine, check2, groupNum, check3, num, order, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
@@ -75,7 +75,7 @@ export function searchTable1(check1, machine, check2, groupNum, pageCurrent, pag
       ModularID: router.currentRoute.path,
       type: '1',
       name: '库存管理_车间采购出库_零件查询_新',
-      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int',
+      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '&名称规格型号_check=' + check3 + '&名称规格型号=' + num + '&排序=' + order,
       pagination: pageCurrent + '&' + pageSize
     }
   })

src/views/ManufacturingCenter/GroupMatching/index.vue

@@ -21,13 +21,30 @@
           <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
         </el-option>
       </el-select>
+      <el-input v-model="materialName" placeholder="图号名称规格" size="small" style="width:140px" clearable/>
       <el-button type="primary" plain icon="el-icon-search" size="small" style="margin-left: 20px" @click="total=0;pageSize=50;pageCurrent=1;searchData();searchTable()">查询</el-button>
       <el-button type="text" plain style="float: right;margin-right: 20px;margin-top: 5px" @click="turnTo()">组件状态查询</el-button>
     </el-card>
     <el-card>
       <el-tabs v-model="PartType2" type="border-card" style="margin-top: 10px">
         <el-tab-pane label="车间生产" name="车间生产">
-          <el-table v-loading="loading" :data="tableData" :summary-method="getSummaries" style="width: 100%;margin-top: 6px" highlight-current-row height="600" size="mini" show-summary border stripe>
+          <el-table
+            v-loading="loading"
+            :data="tableData"
+            :summary-method="getSummaries"
+            style="width: 100%;margin-top: 6px"
+            highlight-current-row
+            height="600"
+            size="mini"
+            show-summary
+            border
+            stripe
+            @sort-change="sortChange">
+            <el-table-column align="center" label="进程" width="100" sortable="custom">
+              <template slot-scope="scope">
+                {{ scope.row.进程 }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="零件图号">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
@@ -88,13 +105,9 @@
         <el-tab-pane label="采购部采购" name="采购部采购">
           <el-tabs v-model="PartType" type="border-card" style="margin-top: 10px" @tab-click="searchTable()">
             <el-tab-pane label="标准件" name="标准件">
-              <el-table :data="tableData00" size="mini" height="530px" border stripe>
-                <el-table-column align="center" prop="询价状态编号" label="采购状态" width="110px" sortable="custom" fixed="left">
+              <el-table :data="tableData00" size="mini" height="530px" border stripe @sort-change="sortChange3">
+                <el-table-column align="center" prop="询价状态编号" label="进程" width="110px" sortable="custom" fixed="left">
                   <template slot-scope="scope">
-                    <!--<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>-->
-                    <!--<el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>-->
-                    <!--<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>-->
-                    <!--<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>-->
                     <span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
                     <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
                     <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===1" type="success" size="small">已询价</span>
@@ -165,13 +178,9 @@
               </div>
             </el-tab-pane>
             <el-tab-pane label="外购件" name="外购件">
-              <el-table :data="tableData01" size="mini" height="530px" border stripe>
-                <el-table-column align="center" prop="询价状态编号" label="采购状态" width="110px" sortable="custom" fixed="left">
+              <el-table :data="tableData01" size="mini" height="530px" border stripe @sort-change="sortChange4">
+                <el-table-column align="center" prop="询价状态编号" label="进程" width="110px" sortable="custom" fixed="left">
                   <template slot-scope="scope">
-                    <!--<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>-->
-                    <!--<el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>-->
-                    <!--<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>-->
-                    <!--<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>-->
                     <span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
                     <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
                     <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===1" type="success" size="small">已询价</span>
@@ -247,13 +256,9 @@
               </div>
             </el-tab-pane>
             <el-tab-pane label="基本件" name="基本件">
-              <el-table :data="tableData02" size="mini" height="530px" border stripe>
-                <el-table-column align="center" prop="询价状态编号" label="采购状态" width="110px" sortable="custom" fixed="left">
+              <el-table :data="tableData02" size="mini" height="530px" border stripe @sort-change="sortChange5">
+                <el-table-column align="center" prop="询价状态编号" label="进程" width="110px" sortable="custom" fixed="left">
                   <template slot-scope="scope">
-                    <!--<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>-->
-                    <!--<el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>-->
-                    <!--<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>-->
-                    <!--<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>-->
                     <span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
                     <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
                     <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===1" type="success" size="small">已询价</span>
@@ -326,8 +331,8 @@
           </el-tabs>
         </el-tab-pane>
         <el-tab-pane label="制造部采购" name="制造部采购">
-          <el-table :data="tableData1" border style="width: 100%;margin-top: 6px;" height="600">
-            <el-table-column label="进程" align="center" min-width="80">
+          <el-table :data="tableData1" border style="width: 100%;margin-top: 6px;" height="600" @sort-change="sortChange2">
+            <el-table-column label="进程" align="center" min-width="80" sortable="custom">
               <template slot-scope="scope">
                 {{ scope.row.采购状态 }}
               </template>
@@ -433,6 +438,12 @@ import { searchTable, searchmachine, searchgroup, searchTable1, processingStatus
 export default {
   data() {
     return {
+      order: 0,
+      order2: 0,
+      order3: 0,
+      order4: 0,
+      order5: 0,
+      materialName: '',
       titleaa: '',
       零件图号: '',
       Machines: [],
@@ -544,20 +555,21 @@ export default {
     this.SearchMachine()
   },
   methods: {
-    turnTo() {
-      this.$router.push({
-        path: '/ManufacturingCenter/CompletionOfWorkshopComponents',
-        query: {
-          机床流水号: this.Machine
-        }
-      })
-    },
-    searchData() {
+    sortChange(column, prop, order) {
+      if (column.order === 'ascending') {
+        this.order = 1
+      } else if (column.order === 'descending') {
+        this.order = 2
+      } else {
+        this.order = 0
+      }
       this.totalNum = 0
       this.loading = true
+      var check
       this.Machine ? this.check1 = 1 : this.check1 = 0
       this.Group ? this.check2 = 1 : this.check2 = 0
-      searchTable(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
+      this.materialName ? check = 1 : check = 0
+      searchTable(this.check1, this.Machine, this.check2, this.Group, check, this.materialName, this.order, this.pageCurrent, this.pageSize).then(response => {
         for (let i = 0; i < response.data.result.length; i++) {
           if (response.data.result[i].入库时间) {
             response.data.result[i].入库时间 = response.data.result[i].入库时间.split(' ', 2)[0]
@@ -574,7 +586,85 @@ export default {
         this.total = parseInt(response.data.output[0].ItemCount)
         this.loading = false
       })
-      searchTable1(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
+    },
+    sortChange2(column, prop, order) {
+      if (column.order === 'ascending') {
+        this.order2 = 1
+      } else if (column.order === 'descending') {
+        this.order2 = 2
+      } else {
+        this.order2 = 0
+      }
+      this.totalNum = 0
+      var check
+      this.Machine ? this.check1 = 1 : this.check1 = 0
+      this.Group ? this.check2 = 1 : this.check2 = 0
+      this.materialName ? check = 1 : check = 0
+      searchTable1(this.check1, this.Machine, this.check2, this.Group, check, this.materialName, this.order2, this.pageCurrent, this.pageSize).then(response => {
+        this.tableData1 = response.data.rows
+        this.total5 = parseInt(response.data.total)
+      })
+    },
+    sortChange3(column, prop, order) {
+      if (column.order === 'ascending') {
+        this.order3 = 1
+      } else if (column.order === 'descending') {
+        this.order3 = 2
+      } else {
+        this.order3 = 0
+      }
+    },
+    sortChange4(column, prop, order) {
+      if (column.order === 'ascending') {
+        this.order4 = 1
+      } else if (column.order === 'descending') {
+        this.order4 = 2
+      } else {
+        this.order4 = 0
+      }
+    },
+    sortChange5(column, prop, order) {
+      if (column.order === 'ascending') {
+        this.order5 = 1
+      } else if (column.order === 'descending') {
+        this.order5 = 2
+      } else {
+        this.order5 = 0
+      }
+    },
+    turnTo() {
+      this.$router.push({
+        path: '/ManufacturingCenter/CompletionOfWorkshopComponents',
+        query: {
+          机床流水号: this.Machine
+        }
+      })
+    },
+    searchData() {
+      this.totalNum = 0
+      this.loading = true
+      var check
+      this.Machine ? this.check1 = 1 : this.check1 = 0
+      this.Group ? this.check2 = 1 : this.check2 = 0
+      this.materialName ? check = 1 : check = 0
+      searchTable(this.check1, this.Machine, this.check2, this.Group, check, this.materialName, this.order, this.pageCurrent, this.pageSize).then(response => {
+        for (let i = 0; i < response.data.result.length; i++) {
+          if (response.data.result[i].入库时间) {
+            response.data.result[i].入库时间 = response.data.result[i].入库时间.split(' ', 2)[0]
+            this.totalNum += 1
+          }
+          if (response.data.result[i].计划完成时间) {
+            response.data.result[i].计划完成时间 = response.data.result[i].计划完成时间.split(' ', 2)[0]
+          }
+          if (response.data.result[i].机加工实际完成时间) {
+            response.data.result[i].机加工实际完成时间 = response.data.result[i].机加工实际完成时间.split(' ', 2)[0]
+          }
+        }
+        this.tableData = response.data.result
+        this.total = parseInt(response.data.output[0].ItemCount)
+        this.loading = false
+      })
+      searchTable1(this.check1, this.Machine, this.check2, this.Group, check, this.materialName, this.order, this.pageCurrent, this.pageSize).then(response => {
         this.tableData1 = response.data.rows
         this.total5 = parseInt(response.data.total)
       })
@@ -594,7 +684,8 @@ export default {
         this.tableData5 = response.data
       })
     },
-    SearchMachine() { // 查询机床
+    // 查询机床
+    SearchMachine() {
       searchmachine().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.Machines.push({
@@ -605,7 +696,8 @@ export default {
         }
       })
     },
-    searchGroupList() { // 查询组号
+    // 查询组号
+    searchGroupList() {
       this.Group = ''
       this.Groups = []
       searchgroup(this.Machine).then(response => {
@@ -627,7 +719,8 @@ export default {
         this.searchTable2()
       }
     },
-    searchTable0() { // 查询标准件
+    // 查询标准件
+    searchTable0() {
       let check1, check2
       this.Machine ? check1 = 1 : check1 = 0
       this.Group ? check2 = 1 : check2 = 0
@@ -636,7 +729,8 @@ export default {
         this.total00 = response.data.total
       })
     },
-    searchTable1() { // 查询外购件
+    // 查询外购件
+    searchTable1() {
       let check1, check2
       this.Machine ? check1 = 1 : check1 = 0
       this.Group ? check2 = 1 : check2 = 0
@@ -645,7 +739,8 @@ export default {
         this.total01 = response.data.total
       })
     },
-    searchTable2() { // 查询基本件
+    // 查询基本件
+    searchTable2() {
       let check1, check2
       this.Machine ? check1 = 1 : check1 = 0
       this.Group ? check2 = 1 : check2 = 0

src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue

@@ -116,6 +116,11 @@
                 {{ scope.row.修改时间 ? scope.row.修改时间.split(' ')[0] : '-' }}
               </template>
             </el-table-column>
+            <el-table-column label="备注" align="center" width="90px">
+              <template slot-scope="scope">
+                {{ scope.row.备注 }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="操作" fixed="right" width="90px">
               <template slot-scope="scope">
                 <el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
@@ -138,30 +143,28 @@
 
     <el-dialog v-el-drag-dialog :visible.sync="dialogVisible1" :close-on-click-modal="false" class="dialog3" title="编辑" center width="500px">
       <el-form ref="form1" :model="form1" label-position="right" label-width="160px">
-        <el-form-item label="零件图号：">
-          <span style="font-size: 20px">{{ partNumber }}</span>
-        </el-form-item>
-        <el-form-item label="零件名称：">
-          <span style="font-size: 20px">{{ partName }}</span>
-        </el-form-item>
-        <el-form-item label="工艺名称：">
-          <span style="font-size: 20px">{{ procedure }}</span>
-        </el-form-item>
+        <el-row style="margin: 5px 0 0 80px">
+          <span style="font-size: 20px">零件图号： {{ partNumber }}</span>
+        </el-row>
+        <el-row style="margin: 5px 0 0 80px">
+          <span style="font-size: 20px">零件名称： {{ partName }}</span>
+        </el-row>
+        <el-row style="margin: 5px 0 20px 80px">
+          <span style="font-size: 20px">工艺名称： {{ procedure }}</span>
+        </el-row>
         <el-form-item label="完成数量：" prop="完成数量">
           <el-input-number :min="0" :max="剩余数量" v-model="form1.完成数量" style="width: 200px" @change="timeChange()"/>
         </el-form-item>
         <el-form-item label="单件工时(分)：" prop="录入工时">
           <el-input-number :min="0" v-model="form1.录入工时" style="width: 200px" @change="timeChange()"/>
-          <!--<el-input class="editWorkTime" v-positive="'float'" v-model="form1.录入工时" placeholder="录入工时" style="width:200px;" type="number"/>-->
         </el-form-item>
         <el-form-item label="录入准结(分)：" prop="录入准结">
           <el-input-number :min="0" v-model="form1.录入准结" style="width: 200px" @change="timeChange()"/>
-          <!--<el-input class="editWorkTime" v-positive="'float'" v-model="form1.录入准结" placeholder="录入准结" style="width:200px;" type="number"/>-->
         </el-form-item>
         <el-form-item label="加工工时(分)：" prop="加工时间">
           <span style="font-size: 20px">{{ 加工时间 }}</span>
         </el-form-item>
-        <el-form-item v-show="false" label="备注：" prop="备注">
+        <el-form-item label="备注：" prop="备注">
           <el-input v-model="form1.备注" :rows="4" type="textarea" placeholder="备注" clearable size="small" style="width:200px;"/>
         </el-form-item>
       </el-form>

src/views/PurchasingCenter/FundApproval1/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="app-container">
     <el-card>
-      <!--<h3 style="margin-top: 0">采购合同</h3>-->
       <el-table v-loading="" :data="tableData1" border style="width: 100%;max-height: 300px;" height="200px" size="mini" highlight-current-row @row-click="searchTable01">
         <el-table-column label="供应商" align="center" min-width="170">
           <template slot-scope="scope">
@@ -26,23 +25,11 @@
         <el-table-column label="审核" align="center" width="200">
           <template slot-scope="scope">
             <el-button type="text" size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button>
-            <el-button type="text" size="mini" icon="el-icon-close" @click="noApproval(scope.row)">不通过</el-button>
+            <el-button type="text" style="color:black" size="mini" icon="el-icon-close" @click="noApproval(scope.row)">不通过</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <!--      <div class="block" style="margin-top: 10px;">-->
-      <!--        <el-pagination-->
-      <!--          :current-page="pageCurrent1"-->
-      <!--          :page-sizes="[10, 20, 30, 40, 10000]"-->
-      <!--          :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>
-    <!--<h3 style="">合同明细</h3>-->
     <el-row>
       <el-col :span="10">
         <el-card>

src/views/WorkshopProcurement/FundApproval2/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="app-container">
     <el-card>
-      <!--<h3>采购合同</h3>-->
       <el-table v-loading="" :data="tableData" border stripe style="width: 100%;" height="600px" size="mini">
         <el-table-column label="类别" align="center" width="70">
           <template slot-scope="scope">
@@ -30,6 +29,8 @@
         </el-table-column>
         <el-table-column label="审核" align="center" width="320">
           <template slot-scope="scope">
+            <el-button type="text" size="mini" icon="el-icon-check" style="padding:10px" plain @click="yesApproval(scope.row)">通过</el-button>
+            <el-button type="text" size="mini" icon="el-icon-close" style="margin-right: 10px;padding: 10px;color:black" plain @click="noApproval(scope.row)">不通过</el-button>
             <el-popover placement="right" width="400" trigger="click">
               <el-table v-show="scope.row.类别==='采购'" :data="gridData2" :summary-method="getSummaries" stripe size="mini" show-summary>
                 <el-table-column width="50" align="center" type="index" label="序号"/>
@@ -64,8 +65,6 @@
               </el-table>
               <el-button slot="reference" type="text" size="mini" icon="el-icon-search" style="margin-right: 10px;padding: 10px" plain @click="searchTable01(scope.row)">查看详情</el-button>
             </el-popover>
-            <el-button type="text" size="mini" icon="el-icon-check" style="margin-right: 10px;padding:10px" plain @click="yesApproval(scope.row)">通过</el-button>
-            <el-button type="text" size="mini" icon="el-icon-close" style="margin-right: 10px;padding: 10px;color:black" plain @click="noApproval(scope.row)">不通过</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -81,127 +80,6 @@
           @current-change="handleCurrentChange"/>
       </div>
     </el-card>
-    <!--<el-card>-->
-    <!--&lt;!&ndash;<h3>备料合同</h3>&ndash;&gt;-->
-    <!--<el-table v-loading="" :data="tableData3" 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="500" trigger="click">-->
-    <!--<el-table :data="gridData1" stripe size="mini" show-summary>-->
-    <!--<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="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" plain @click="searchTable03(scope.row)">查看详情</el-button>-->
-    <!--</el-popover>-->
-    <!--<el-button type="primary" size="mini" icon="el-icon-check" plain @click="yesMaterials(scope.row)">通过</el-button>-->
-    <!--<el-button type="danger" size="mini" icon="el-icon-close" plain @click="noMaterials(scope.row)">不通过</el-button>-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--</el-table>-->
-    <!--<div class="block" style="margin-top: 10px;">-->
-    <!--<el-pagination-->
-    <!--:current-page="pageCurrent3"-->
-    <!--:page-sizes="[10, 20, 30, 40]"-->
-    <!--:page-size="pageSize3"-->
-    <!--:total="total3"-->
-    <!--style="display:inline-block;width:50%"-->
-    <!--layout="total, sizes, prev, pager, next, jumper"-->
-    <!--@size-change="handleSizeChange3"-->
-    <!--@current-change="handleCurrentChange3"/>-->
-    <!--</div>-->
-    <!--</el-card>-->
-    <!--<el-card>-->
-    <!--<h3>离线合同</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="gridData" stripe size="mini" show-summary>-->
-    <!--<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" plain @click="searchTable02(scope.row)">查看详情</el-button>-->
-    <!--</el-popover>-->
-    <!--<el-button type="primary" size="mini" icon="el-icon-check" plain @click="yesApprovalOffline(scope.row)">通过</el-button>-->
-    <!--<el-button type="danger" size="mini" icon="el-icon-close" plain @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>-->
   </div>
 </template>