From 366012efdec429abf73a6b8595eb7fd2b6b849ba Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Thu, 2 Apr 2020 17:42:27 +0800
Subject: [PATCH] a

---
 .../InvoiceSettlementApplication/index.vue           |  2 +-
 .../PurchasingCenter/MaterialMProcure/index.vue      | 12 +++---------
 .../ProcurementContractApproval/index.vue            |  8 +++++---
 .../ProcurementContractEnquiry/index.vue             |  7 ++++---
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
index b24b3e77..825f1d35 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
@@ -204,7 +204,7 @@
     </el-card>
 
     <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="700px">
-      <el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px">
+      <el-form ref="form1" :model="form1" :rules="rules1" label-position="right" label-width="110px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="到票号" prop="invoiceNum">
diff --git a/src/views/PurchasingCenter/MaterialMProcure/index.vue b/src/views/PurchasingCenter/MaterialMProcure/index.vue
index 306f9195..5b67e868 100644
--- a/src/views/PurchasingCenter/MaterialMProcure/index.vue
+++ b/src/views/PurchasingCenter/MaterialMProcure/index.vue
@@ -196,18 +196,12 @@
       </div>
     </el-card>
 
-    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="800px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
+    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="650px">
+      <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="80px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12">
             <el-form-item label="物料类别" prop="物料类别流水号">
-              <el-select
-                v-model="form.物料类别流水号"
-                style="width:200px"
-                placeholder="请选择"
-                size="small"
-                clearable
-                @change="searchMaterialVariety1">
+              <el-select v-model="form.物料类别流水号" style="width:200px" placeholder="请选择" size="small" clearable @change="searchMaterialVariety1">
                 <el-option
                   v-for="item in MaterialCategory1"
                   :key="item.value"
diff --git a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
index 5382e7e5..cd23e2e9 100644
--- a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
@@ -26,7 +26,7 @@
     </el-card>
 
     <el-card>
-      <el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%;max-height: 300px;" height="150px" highlight-current-row @row-click="searchTable2">
+      <el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%;max-height: 300px;" height="230px" highlight-current-row @row-click="searchTable2">
         <el-table-column label="采购合同号" align="center">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
@@ -330,7 +330,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible3" title="采购合同审批" center style="min-height: 300px;" width="30%">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible3" title="采购合同审批" center style="min-height: 300px;" width="380px">
       <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-form-item label="审批是否通过" prop="审批是否通过" center>
           <el-select v-model="form2.审批是否通过" size="small" @change="selectChange">
@@ -479,7 +479,9 @@ export default {
       })
     },
     Open(row) {
-      console.log(row)
+      this.form2.审批是否通过 = 1
+      this.form2.未通过原因 = ''
+      this.disabled = true
       this.dialogVisible3 = true
       this.ProcurementContractNum = row.采购合同流水号
       this.QGNUM = row.请购单流水号
diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
index c7f34ece..0bf8345d 100644
--- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
@@ -522,9 +522,10 @@ export default {
       })
     },
     tableRowClassName({ row, rowIndex }) {
-      if (row.审批情况流水号 === '1') {
-        return 'adopt'
-      } else if (row.审批情况流水号 === '2') {
+      // if (row.审批情况流水号 === '1') {
+      //   return 'adopt'
+      // } else
+      if (row.审批情况流水号 === '2') {
         return 'NotThrough'
       }
     },