Merge remote-tracking branch 'origin/master'

src/views/improveInfo.vue

@@ -19,9 +19,10 @@
       ref="inputQuery"
       label-width="150px"
     >
+
       <el-card class="el-card">
         <div slot="header" class="clearfix">
-          <span>本企业信息:</span>
+          <span>审核信息:</span>
           <div>
             <div style="float: right;margin-top: -20px ">
               <el-button
@@ -44,27 +45,6 @@
             </div>
           </div>
         </div>
-<!--        <el-row-->
-<!--          :gutter="20"-->
-<!--          class="el-row"-->
-<!--          type="flex"-->
-<!--        >-->
-<!--          <el-col :span="15" class="el-col">-->
-
-<!--            <el-form-item-->
-<!--              label="本企业信息审核状态:"-->
-<!--              prop="reason"-->
-<!--            >-->
-<!--               <span>-->
-<!--           <el-tag :type="inputQuery.ucstatus | statusFilterType">-->
-<!--             {{ checkSupFlag[inputQuery.ucstatus] }}-->
-<!--              </el-tag>-->
-<!--          </span>-->
-<!--            </el-form-item>-->
-
-
-<!--          </el-col>-->
-<!--        </el-row>-->
         <el-row
           :gutter="20"
           class="el-row"
@@ -86,26 +66,54 @@
 
           </el-col>
         </el-row>
+        <el-row
+          :gutter="20"
+          class="el-row"
+          type="flex"
+        >
+          <el-col :span="15" class="el-col">
+            <el-form-item
+              label="审核说明:"
+              prop="reason"
+            >
+              <el-input
+                size="small"
+                disabled
+                v-model="inputQuery.reason"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+
+        </el-row>
+      </el-card>
+      <el-card class="el-card">
+        <div slot="header" class="clearfix">
+          <span>本企业信息:</span>
+
+        </div>
 <!--        <el-row-->
 <!--          :gutter="20"-->
 <!--          class="el-row"-->
 <!--          type="flex"-->
 <!--        >-->
 <!--          <el-col :span="15" class="el-col">-->
+
 <!--            <el-form-item-->
-<!--              label="审核说明:"-->
+<!--              label="本企业信息审核状态:"-->
 <!--              prop="reason"-->
 <!--            >-->
-<!--              <el-input-->
+<!--               <span>-->
-<!--                size="small"-->
+<!--           <el-tag :type="inputQuery.ucstatus | statusFilterType">-->
-<!--                disabled-->
+<!--             {{ checkSupFlag[inputQuery.ucstatus] }}-->
-<!--                v-model="inputQuery.reason"-->
+<!--              </el-tag>-->
-<!--              ></el-input>-->
+<!--          </span>-->
 <!--            </el-form-item>-->
-<!--          </el-col>-->
 
 
+<!--          </el-col>-->
 <!--        </el-row>-->
+
         <el-row
           :gutter="20"
           class="el-row"
@@ -322,7 +330,7 @@
 
         <div slot="header" class="clearfix">
           <span>
-            系统负责人信息
+            系统负责人信息:
           </span>
         </div>
 
@@ -440,7 +448,7 @@
       <el-card>
         <div slot="header" class="clearfix">
           <span>
-            资质证书信息
+            资质证书信息:
           </span>
 
         <div style="float: right; text-align: right; margin-bottom: 8px">
@@ -472,30 +480,30 @@
           <el-table-column label="证书编号" prop="code" ></el-table-column>
           <el-table-column label="生效日期" prop="validDate"></el-table-column>
           <el-table-column label="失效日期" prop="expireDate"></el-table-column>
-          <el-table-column label="确认状态" prop="checkStatus" width="120">
+          <el-table-column label="确认状态" prop="checkStatus" width="80">
             <template slot-scope="scope">
               <el-tag :type="scope.row.checkStatus | statusFilterType">
                 {{ checkFlag[scope.row.checkStatus] }}
               </el-tag>
             </template>
           </el-table-column>
-<!--          <el-table-column-->
+          <el-table-column
-<!--            label="确认说明"-->
+            label="确认说明"
-<!--            prop="checkComment"-->
+            prop="checkComment"
-<!--            show-overflow-tooltip-->
+            show-overflow-tooltip
-<!--          ></el-table-column>-->
+          ></el-table-column>
-          <el-table-column label="状态说明" prop="status" width="120">
+<!--          <el-table-column label="状态说明" prop="status" width="120">-->
-            <template slot-scope="scope">
+<!--            <template slot-scope="scope">-->
-              <el-tag :type="scope.row.status | statusFilterType">
+<!--              <el-tag :type="scope.row.status | statusFilterType">-->
-                {{ statusFlag[scope.row.status] }}
+<!--                {{ statusFlag[scope.row.status] }}-->
-              </el-tag>
+<!--              </el-tag>-->
 
-            </template>
+<!--            </template>-->
-          </el-table-column>
+<!--          </el-table-column>-->
 
           <el-table-column label="备注" prop="remark"></el-table-column>
 
-          <el-table-column label="操作" width="180">
+          <el-table-column label="操作" width="140">
             <template slot-scope="scope">
               <el-button
                 type="text"
@@ -1019,4 +1027,8 @@ export default {
   margin: auto;
 
 }
+.el-form-item{
+  margin-top: 5px;
+  margin-bottom: 4px;
+}
 </style>