From c91d25d7bb94721bfdca94508d55d71f097968be Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 27 Jan 2022 21:51:36 +0800
Subject: [PATCH] commit

---
 .../pags/AddFileDetails.vue                   | 12 ++---
 .../pags/consultationDetails.vue              | 44 +++++++++++++------
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue
index 53f6ac132..68c336777 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue
@@ -33,9 +33,9 @@
                     <el-form-item label="修改理由" prop="reason" label-width="" class="add-form-item">
                         <el-input v-model="opinionContent.reason" autocomplete="off" placeholder="请输入修改理由"></el-input>
                     </el-form-item>
-                    <el-form-item label="原因" prop="cause" label-width="" class="add-form-item">
-                        <el-input v-model="opinionContent.cause" autocomplete="off" placeholder="请输入原因"></el-input>
-                    </el-form-item>
+<!--                    <el-form-item label="原因" prop="cause" label-width="" class="add-form-item">-->
+<!--                        <el-input v-model="opinionContent.cause" autocomplete="off" placeholder="请输入原因"></el-input>-->
+<!--                    </el-form-item>-->
                 </el-form>
             </div>
             <div class="demo-drawer-footer">
@@ -59,7 +59,7 @@
                     newText: '',
                     reason: '',
                     chapterName: '',
-                    cause: '',
+                    // cause: '',
                 },
                 opinionContentRules: {
                     partCode: [
@@ -91,7 +91,7 @@
                             reason: this.opinionContent.reason,
                             partCode: this.opinionContent.partCode,
                             chapterName: this.opinionContent.chapterName,
-                            cause: this.opinionContent.cause,
+                            // cause: this.opinionContent.cause,
                             userId: this.$route.query.userId || '',
                             userName: this.$route.query.userName || '',
                             deptName: this.$route.query.institutionName || '',
@@ -109,7 +109,7 @@
                                 this.opinionContent.reason = ''
                                 this.opinionContent.oldText = ''
                                 this.opinionContent.newText = ''
-                                this.opinionContent.cause = ''
+                                // this.opinionContent.cause = ''
                                 this.opinionContent.chapterName = ''
                             }
                         })
diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index dfe93e83d..b32569443 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -141,13 +141,6 @@
           >
           </el-table-column>
         </el-table-column>
-        <el-table-column
-                prop="cause"
-                align="center"
-                label="原因"
-                width="170"
-        >
-        </el-table-column>
         <el-table-column
                 prop="deptName"
                 align="center"
@@ -162,6 +155,21 @@
                 label="提出人"
         >
         </el-table-column>
+        <el-table-column
+                prop="state"
+                align="center"
+                label="处理意见">
+          <template slot-scope="scope">
+            <div>{{ stateText(scope.row.state) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+                prop="cause"
+                align="center"
+                label="原因"
+                width="170"
+        >
+        </el-table-column>
         <el-table-column label="操作" align="center" width="50" fixed="right" v-if="ideaKey">
           <template slot-scope="scope">
             <div @click.stop style="display: inline-block">
@@ -219,9 +227,9 @@
             <el-form-item label="修改理由" prop="reason" label-width="" class="add-form-item">
               <el-input v-model="opinionContent.reason" autocomplete="off" placeholder="请输入修改理由"></el-input>
             </el-form-item>
-            <el-form-item label="原因" prop="cause" label-width="" class="add-form-item">
-              <el-input v-model="opinionContent.cause" autocomplete="off" placeholder="请输入原因"></el-input>
-            </el-form-item>
+<!--            <el-form-item label="原因" prop="cause" label-width="" class="add-form-item">-->
+<!--              <el-input v-model="opinionContent.cause" autocomplete="off" placeholder="请输入原因"></el-input>-->
+<!--            </el-form-item>-->
           </el-form>
         </div>
         <div class="demo-drawer-footer">
@@ -272,7 +280,7 @@
           newText: '',
           reason: '',
           chapterName: '',
-          cause: '',
+          // cause: '',
         },
         opinionContentRules: {
           partCode: [
@@ -302,6 +310,15 @@
       }
     },
     methods: {
+      stateText(row) {
+        if (row === '1') {
+          return '上报'
+        } else if (row === '2') {
+          return '处理后上报'
+        } else {
+          return '不上报'
+        }
+      },
       itermsConditionsClose () {
         this.itermsConditionsFlag = false
       },
@@ -355,6 +372,7 @@
           _this: this
         }, res => {
           this.standinfoList = res.data.records
+          console.log(res.data.records);
           this.total = res.data.total
           this.spinShow = false
         }, e => {
@@ -485,7 +503,7 @@
               reason: this.opinionContent.reason,
               partCode: this.opinionContent.partCode,
               chapterName: this.opinionContent.chapterName,
-              cause: this.opinionContent.cause,
+              // cause: this.opinionContent.cause,
               userId: this.$store.getters.userInfo.userId || '',
               userName: this.$store.getters.userInfo.userName || '',
               deptName: this.$store.getters.userInfo.institutionName || '',
@@ -512,7 +530,7 @@
                   this.opinionContent.reason = ''
                   this.opinionContent.oldText = ''
                   this.opinionContent.newText = ''
-                  this.opinionContent.cause = ''
+                  // this.opinionContent.cause = ''
                 }
               }
             })