202025V2llj恢复程序V2

src/views/ManufacturingCenter/CreatePreparationBill/index.vue

@@ -51,8 +51,7 @@
             <el-tag v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='0'" type="warning" size="mini">未分配</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" prop="零件名称" align="center" width="280" sortable="custom" show-overflow-tooltip>
-          <el-table-column label="零件名称" prop="零件名称" align="center" width="250" show-overflow-tooltip>
+        <el-table-column label="零件名称" prop="零件名称" align="center" width="250" sortable="custom" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
@@ -83,7 +82,7 @@
             {{ scope.row.工艺要求 }}
           </template>
         </el-table-column>
-      </el-table-column></el-table>
+      </el-table>
       <div class="block">
         <el-pagination
           v-if="!loading"
@@ -160,13 +159,12 @@ export default {
   methods: {
     sortChange(column, prop, order) {
       console.log(column + '-' + column.prop + '-' + column.order, 11111)
-      this.ordername = column.prop
-      if (column.ordername === '零件名称') {
+      if (column.prop === '零件名称') {
         this.ordername = 1
-      } else if (column.ordername === '零件图号') { this.ordername = 2 } else {
+      } else if (column.prop === '零件图号') { this.ordername = 2 } else {
         this.ordername = ''
       }
-
+      console.log(this.ordername, 9990999)
       if (column.order === 'ascending') {
         this.order = 1
       } else if (column.order === 'descending') { this.order = 2 } else {
@@ -199,8 +197,6 @@ export default {
         this.partNamecheck = false
       }
       searchtable(this.partNamecheck, this.partName, !this.all, 0, this.pageCurrent, this.pageSize, this.ordername, this.order).then(response => {
-        searchtable(this.partNamecheck, this.partName, !this.all, 0, this.pageCurrent, this.pageSize).then(response => {
-          console.log(response)
         if (response.data.total === 0) {
           this.loading = false
         } else {
@@ -228,7 +224,6 @@ export default {
           this.loading = false
         }
       })
-      })
     },
     handleSelectionChange(val) {
       this.tableData2 = []

src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card style="margin-left: 0px;width: 68%;float: left">
+    <el-card>
       <el-col>
         <span>请款时间段:</span>
         <el-date-picker
@@ -29,19 +29,8 @@
           <el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
         </el-tooltip>
       </el-col>
-      <el-table
-        v-loading=""
-        :data="tableData1"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        border
-        stripe
-        style="margin-top: 3px;"
-        height="600px"
-        size="mini"
-        show-summary
-        highlight-current-row
-        @row-click="searchTable02">
+    </el-card>
+    <el-card style="margin-left: 0px;width: 68%;float: left">
       <!--@expand-change="searchTable02"-->
       <!--<el-table-column type="expand" label="详情">-->
       <!--<template slot-scope="scope">-->
@@ -65,6 +54,19 @@
       <!--</el-table>-->
       <!--</template>-->
       <!--</el-table-column>-->
+      <el-table
+        v-loading=""
+        :data="tableData1"
+        :row-key="getRowKeys"
+        :expand-row-keys="expands"
+        border
+        stripe
+        style="margin-top: 3px;"
+        height="600px"
+        size="mini"
+        show-summary
+        highlight-current-row
+        @row-click="searchTable02">
         <el-table-column label="供应商" prop="供应商名称" align="center" min-width="180" width="350" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
@@ -78,9 +80,6 @@
         <el-table-column label="请款人" align="center" min-width="80" width="100">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
-            <el-table-column label="请款时间" align="center" min-width="150" prop="date">
-              <template slot-scope="scope">
-                {{ scope.row.请款时间 | formatTime }}
           </template>
         </el-table-column>
         <el-table-column label="请款金额" align="center" min-width="90" width="90" prop="请款金额">
@@ -93,7 +92,6 @@
             <el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="mini">未审批</el-tag>
             <el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="mini">已通过</el-tag>
             <el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">不通过</el-tag>
-                {{ parseFloat(scope.row.请款金额).toFixed(2) }}
           </template>
         </el-table-column>
         <el-table-column label="未通过审批原因" width="110" align="center">
@@ -122,7 +120,7 @@
             </el-tooltip>
           </template>
         </el-table-column>
-      </template></el-table-column></el-table>
+      </el-table>
       <div class="block" style="margin-top: 10px;">
         <el-pagination
           :current-page="pageCurrent1"
@@ -135,7 +133,7 @@
           @current-change="handleCurrentChange1"/>
       </div>
     </el-card>
-    <el-card style="margin-left: 0px;width: 31%;float: left">
+    <el-card style="margin-left: 0px;width: 32%;float: left">
       <el-table-column type="expand" label="详情">
         <el-table :data="gridData" class="subTableHeader" stripe size="mini" show-summary style="width: 100%">
           <el-table-column width="50" align="center" type="index" label="序号"/>