Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/smartSchool/officialWork/budgetFilling/index.vue

@@ -13,15 +13,15 @@
             </el-form-item>
             </el-form-item>
         </el-form>
         </el-form>
         <!-- 表格数据 -->
         <!-- 表格数据 -->
-        <el-table v-loading="loading" :row-style="{ height: '35px' }" :cell-style="{ padding: '0' }" :data="budgetList"
-            style="font-size: 14px" stripe>
+        <el-table border v-loading="loading" :row-style="{ height: '35px' }" :cell-style="{ padding: '0' }"
+            :data="budgetList" style="font-size: 14px" stripe>
             <el-table-column label="年度" prop="year" align="center" width="100px" />
             <el-table-column label="年度" prop="year" align="center" width="100px" />
             <el-table-column label="科室" prop="deptName" align="center" />
             <el-table-column label="科室" prop="deptName" align="center" />
-            <el-table-column label="填报人" prop="informant" align="center" />
-            <el-table-column label="分管领导" prop="leadershipName" align="center" />
+            <el-table-column label="填报人" prop="informant" align="center" width="150px" />
+            <el-table-column label="分管领导" prop="leadershipName" align="center" width="150px" />
             <el-table-column label="备注" prop="remark" align="center" />
             <el-table-column label="备注" prop="remark" align="center" />
-            <el-table-column label="填报时间" prop="tbTime" align="center" />
-            <el-table-column label="当前任务" prop="state" align="center">
+            <el-table-column label="填报时间" prop="tbTime" align="center" width="200px" />
+            <el-table-column label="当前任务" prop="state" align="center" width="250px">
                 <template slot-scope="{ row }">
                 <template slot-scope="{ row }">
                     {{ row.state === '0' ? "未提交" :
                     {{ row.state === '0' ? "未提交" :
                         row.state === '1' ? "分管领导审核" :
                         row.state === '1' ? "分管领导审核" :
@@ -69,16 +69,18 @@
 
 
                 <!-- 表格数据 -->
                 <!-- 表格数据 -->
                 <el-button class="el-icon-plus" size="mini" @click="addLine()">增加</el-button>
                 <el-button class="el-icon-plus" size="mini" @click="addLine()">增加</el-button>
-                <el-table border :data="postForm.xzTable" ref="xzTable" class="xzTable">
-                    <el-table-column label="序号" type="index" align="center" />
-                    <el-table-column label="*项目名称" prop="projectName">
+                <el-table border :data="postForm.xzTable" ref="xzTable" class="xzTable" :header-cell-style="{
+                    'text-align': 'center'
+                }">
+                    <el-table-column label="序号" type="index" align="center" width="80px" />
+                    <el-table-column label="*项目名称" prop="projectName" width="200px">
                         <template slot-scope="scope">
                         <template slot-scope="scope">
                             <el-form-item :prop="'xzTable.' + scope.$index + '.projectName'" :rules="rules.projectName">
                             <el-form-item :prop="'xzTable.' + scope.$index + '.projectName'" :rules="rules.projectName">
                                 <el-input v-model="scope.row.projectName" clearable></el-input>
                                 <el-input v-model="scope.row.projectName" clearable></el-input>
                             </el-form-item>
                             </el-form-item>
                         </template>
                         </template>
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label=" *申报政策依据、理由及主要内容" prop="content">
+                    <el-table-column label=" *申报政策依据、理由及主要内容" prop="content" width="300px">
                         <template slot-scope="scope">
                         <template slot-scope="scope">
                             <el-form-item :prop="'xzTable.' + scope.$index + '.content'" :rules="rules.content" class="all">
                             <el-form-item :prop="'xzTable.' + scope.$index + '.content'" :rules="rules.content" class="all">
                                 <el-input v-model="scope.row.content" clearable></el-input>
                                 <el-input v-model="scope.row.content" clearable></el-input>
@@ -107,7 +109,7 @@
                         </template>
                         </template>
                     </el-table-column>
                     </el-table-column>
 
 
-                    <el-table-column label="*申请金额" prop="applyMoney">
+                    <el-table-column label="*申请金额" prop="applyMoney" width="120px">
                         <template slot-scope="scope">
                         <template slot-scope="scope">
                             <el-form-item :prop="'xzTable.' + scope.$index + '.applyMoney'" :rules="rules.applyMoney"
                             <el-form-item :prop="'xzTable.' + scope.$index + '.applyMoney'" :rules="rules.applyMoney"
                                 class="all">
                                 class="all">