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

src/views/Assembly/QualityInspectionInformationInquiry/index.vue

@@ -201,9 +201,9 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column label="质检时间" align="center" width="100px">
+        <el-table-column label="质检时间" align="center" width="140px">
           <template slot-scope="scope">
-            {{ scope.row.操作时间 ? scope.row.操作时间.split(' ')[0] : '' }}
+            {{ scope.row.操作时间 }}
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" width="140px" show-overflow-tooltip>

src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue

@@ -86,6 +86,21 @@
             {{ 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.未付款原因 }}
+          </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/PurchasingCenter/InvoiceSettlementApproveSearch/index.vue

@@ -48,7 +48,7 @@
         <!--            </el-form>-->
         <!--          </template>-->
         <!--        </el-table-column>-->
-        <el-table-column label="供应商" align="center" min-width="200" show-overflow-tooltip>
+        <el-table-column label="供应商" align="center" width="180" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -58,12 +58,12 @@
             {{ scope.row.发票号 }}
           </template>
         </el-table-column>
-        <el-table-column label="到票金额(元)" align="center" min-width="100">
+        <el-table-column label="到票金额(元)" align="center" width="110">
           <template slot-scope="scope">
             {{ scope.row.发票金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="申请人" align="center" min-width="75">
+        <el-table-column label="申请人" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
           </template>
@@ -73,7 +73,7 @@
             {{ scope.row.申请时间 ? scope.row.申请时间.split(' ')[0] : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="采购审批" align="center" min-width="70">
+        <el-table-column label="采购审批" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.审批人1姓名 }}
           </template>
@@ -83,7 +83,12 @@
             {{ scope.row.审批1时间 ? scope.row.审批1时间.split(' ')[0] : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="总经理审批" align="center" min-width="90">
+        <el-table-column label="未过原因" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.审批1未过原因 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="总经理审批" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.审批人4姓名 }}
           </template>
@@ -93,7 +98,12 @@
             {{ scope.row.审批4时间 ? scope.row.审批4时间.split(' ')[0] : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="财务审批" align="center" min-width="70">
+        <el-table-column label="未过原因" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.审批4未过原因 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="财务审批" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.审批人3姓名 }}
           </template>
@@ -103,6 +113,11 @@
             {{ scope.row.审批3时间 ? scope.row.审批3时间.split(' ')[0] : '—' }}
           </template>
         </el-table-column>
+        <el-table-column label="未过原因" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.审批2未过原因 }}
+          </template>
+        </el-table-column>
       </el-table>
       <!--      <div class="block" style="margin-top: 10px;">-->
       <!--        <el-pagination-->

src/views/WorkshopProcurement/RequestApprovalQuery2/index.vue

@@ -88,7 +88,7 @@
         </el-table-column>
         <el-table-column label="未过原因" align="center" min-width="60">
           <template slot-scope="scope">
-            {{ scope.row.未通过审批原因 }}
+            {{ scope.row.未通过审批原因 === '通过' ? '' : scope.row.未通过审批原因 }}
           </template>
         </el-table-column>
         <el-table-column label="付款人" align="center" min-width="60">
@@ -106,6 +106,11 @@
             {{ scope.row.付款情况内容 }}
           </template>
         </el-table-column>
+        <el-table-column label="未过原因" align="center" min-width="60">
+          <template slot-scope="scope">
+            {{ scope.row.未付款原因 === '通过' ? '' : 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">
@@ -218,7 +223,7 @@ export default {
       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)
+        console.log(response.data, 123)
         this.loading1 = false
         this.tableData1 = response.data.rows
         this.total1 = response.data.total