办事大厅bug修改

client/src/components/comTable/tableList.vue

@@ -5,7 +5,7 @@
     </div>
     <div class="table-list-bd">
       <el-table :data="data" v-bind="$attrs" v-if="data.length">
-        <el-table-column v-for="(column, index) in columns" :label="column.label" :key="index">
+        <el-table-column show-overflow-tooltip v-for="(column, index) in columns" :label="column.label" :key="index">
           <template slot-scope="scope">
             <template
               v-if="column.isShow ? column.isShow(get(scope.row, column.prop), scope.row) : true "
@@ -31,7 +31,7 @@
               </template>
               <template v-else>
                 <!-- 默认数据 -->
-                <div>{{ get(scope.row, column.prop) }}</div>
+                <template>{{ get(scope.row, column.prop) }}</template>
               </template>
             </template>
           </template>

client/src/pages/affairsHall/againAdd.vue

@@ -38,6 +38,12 @@
                 <img width="100%" :src="dialogImageUrl" alt="">
               </el-dialog>
             </el-form-item>
+            <el-form-item v-if="this.isFormProhibit" label="审核时间" prop="sharing_theme">
+              <el-input v-model="approve_time" placeholder="" type="text" />
+            </el-form-item>
+            <el-form-item v-if="this.isFormProhibit" label="备注" prop="content">
+              <el-input v-model="remark" maxlength="50" placeholder="" type="textarea" :autosize="{ minRows: 5 }" />
+            </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="onApplyFrom" v-if="!isFormProhibit">保存并提交</el-button>
             </el-form-item>
@@ -65,6 +71,8 @@ export default {
         semester_name: '',
         course_name: ''
       },
+      remark: '',
+      approve_time: '',
       applyRules: {
         personal_name: [
           { required: true, message: '请输入您的姓名', trigger: 'blur' }
@@ -107,6 +115,8 @@ export default {
           this.setApply.semester_name = data.form.semester_name
           this.setApply.course_name = data.form.course_name
           this.dialogImageUrl = data.form.payment_instrument
+          this.remark = data.remark1
+          this.approve_time = data.approve_time1
         }
       }).catch(e => { this.$message.error(e.message) }).finally(() => { loading.close() })
     }

client/src/pages/affairsHall/learningAdd.vue

@@ -27,6 +27,9 @@
             <el-form-item label="学术活动内容" prop="content">
               <el-input v-model="setApply.content" maxlength="50" placeholder="请输入活动内容" type="textarea" :autosize="{ minRows: 5 }" />
             </el-form-item>
+            <el-form-item v-if="this.isFormProhibit" label="审核时间" prop="sharing_theme">
+              <el-input v-model="approve_time" placeholder="" type="text" />
+            </el-form-item>
             <!-- <el-form-item label="附 件" prop="file">
               <el-upload
                 ref="upFile"
@@ -80,6 +83,7 @@ export default {
         content: '',
         affair_id: ''
       },
+      approve_time: '',
       applyRules: {
         personal_name: [
           { required: true, message: '请输入您的姓名', trigger: 'blur' }
@@ -129,6 +133,7 @@ export default {
           this.setApply.author = data.form.symposium_lecturer
           this.setApply.address = data.form.symposium_address
           this.setApply.content = data.form.symposium_contents
+          this.approve_time = data.approve_time1
         }
       }).catch(e => { this.$message.error(e.message) }).finally(() => { loading.close() })
     }

client/src/pages/affairsHall/shareAdd.vue

@@ -24,6 +24,12 @@
             <el-form-item label="分享主题" prop="sharing_theme">
               <el-input v-model="setApply.sharing_theme" placeholder="请输入分享主题" type="text" />
             </el-form-item>
+            <el-form-item v-if="this.isFormProhibit" label="审核时间" prop="sharing_theme">
+              <el-input v-model="approve_time" placeholder="" type="text" />
+            </el-form-item>
+            <el-form-item v-if="this.isFormProhibit" label="备注" prop="content">
+              <el-input v-model="remark" maxlength="50" placeholder="" type="textarea" :autosize="{ minRows: 5 }" />
+            </el-form-item>
             <!-- <el-form-item label="附 件" prop="file">
               <el-upload
                 ref="upFile"
@@ -76,6 +82,8 @@ export default {
         sharing_theme: '',
         affair_id: ''
       },
+      remark: '',
+      approve_time: '',
       applyRules: {
         personal_name: [
           { required: true, message: '请输入您的姓名', trigger: 'blur' }
@@ -123,6 +131,8 @@ export default {
           this.setApply.class_name = data.form.class_name
           this.setApply.telephone = data.form.telephone
           this.setApply.sharing_theme = data.form.sharing_theme
+          this.remark = data.remark1
+          this.approve_time = data.approve_time1
         }
       }).catch(e => { this.$message.error(e.message) }).finally(() => { loading.close() })
     }