Merge remote-tracking branch 'origin/dev' into dev

src/views/salaryManagement/logisticsDepartment/detailsPage.vue

@@ -35,7 +35,7 @@
       </div>
       <!--抽屉自定义列-->
       <el-drawer
-          title="自定义列设置"
+          title="自定义列设置(加项录入正数、减项录入负数)"
           :visible.sync="drawer"
           append-to-body
           withHeader
@@ -45,7 +45,7 @@
             :data="optionList.column"
             border
             ref="table"
-            size="small"
+            size="mini"
             :height="tableHeight"
             style="width: 100%;">
 <!--          <el-table-column-->
@@ -60,7 +60,7 @@
               label="列名"
               width="200">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.label" placeholder="请输入内容"></el-input>
+              <el-input v-model="scope.row.label" size="mini" placeholder="请输入内容"></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -85,7 +85,7 @@
               prop="width"
               align="center"
               label="宽度"
-              width="300">
+              width="400">
             <template slot-scope="scope">
               <el-slider :min="1" :max="500" show-input v-model="scope.row.width"></el-slider>
             </template>
@@ -96,7 +96,7 @@
               label="备注"
               width="200">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.remarks" placeholder="请输入内容"></el-input>
+              <el-input v-model="scope.row.remarks" size="mini" placeholder="请输入内容"></el-input>
             </template>
           </el-table-column>
         </el-table>

src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -24,19 +24,27 @@
     </basic-container>
     <containerTitle title="基础资料"></containerTitle>
     <basic-container>
+      <el-form :inline="true" :model="formInline" class="demo-form-inline">
       <div style="display: flex;justify-content: space-between;margin-bottom: 10px">
         <div>
           <el-button type="primary" @click="dataList.push({})" size="small">新增</el-button>
           <el-button type="primary" @click="exportAll" size="small">导出全部</el-button>
           <el-button type="primary" @click="exportSalary" size="small">导出工资条</el-button>
+          <el-form-item label="姓名" style="margin-left: 20px;margin-top: -5px">
+            <el-input placeholder="姓名" size="small"></el-input>
+          </el-form-item>
+          <el-form-item style="margin-top: -6px">
+            <el-button type="primary" size="small">查询</el-button>
+          </el-form-item>
         </div>
         <div>
           <el-button icon="el-icon-s-operation" size="small" circle @click="drawer=true"></el-button>
         </div>
       </div>
+      </el-form>
       <!--抽屉自定义列-->
       <el-drawer
-          title="自定义列设置"
+          title="自定义列设置(加项录入正数、减项录入负数)"
           :visible.sync="drawer"
           append-to-body
           withHeader
@@ -46,7 +54,7 @@
             :data="optionList.column"
             border
             ref="table"
-            size="small"
+            size="mini"
             :height="tableHeight"
             style="width: 100%;">
 <!--          <el-table-column-->
@@ -61,7 +69,7 @@
               label="列名"
               width="200">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.label" placeholder="请输入内容"></el-input>
+              <el-input v-model="scope.row.label" size="mini" placeholder="请输入内容"></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -86,7 +94,7 @@
               prop="width"
               align="center"
               label="宽度"
-              width="500">
+              width="400">
             <template slot-scope="scope">
               <el-slider :min="1" :max="500" show-input v-model="scope.row.width"></el-slider>
             </template>
@@ -95,9 +103,9 @@
               prop="remarks"
               align="center"
               label="备注"
-              width="400">
+              width="200">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.remarks" placeholder="请输入内容"></el-input>
+              <el-input v-model="scope.row.remarks" size="mini" placeholder="请输入内容"></el-input>
             </template>
           </el-table-column>
         </el-table>

src/views/salaryManagement/primarySchoolAudit/detailsPage.vue

@@ -33,7 +33,7 @@
       </div>
       <!--抽屉自定义列-->
       <el-drawer
-          title="自定义列设置"
+          title="自定义列设置(加项录入正数、减项录入负数)"
           :visible.sync="drawer"
           append-to-body
           withHeader
@@ -58,7 +58,7 @@
               label="列名"
               width="200">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.label" placeholder="请输入内容"></el-input>
+              <el-input v-model="scope.row.label" size="mini" placeholder="请输入内容"></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -83,7 +83,7 @@
               prop="width"
               align="center"
               label="宽度"
-              width="500">
+              width="400">
             <template slot-scope="scope">
               <el-slider :min="1" :max="500" show-input v-model="scope.row.width"></el-slider>
             </template>
@@ -92,9 +92,9 @@
               prop="remarks"
               align="center"
               label="备注"
-              width="400">
+              width="200">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.remarks" placeholder="请输入内容"></el-input>
+              <el-input v-model="scope.row.remarks" size="mini" placeholder="请输入内容"></el-input>
             </template>
           </el-table-column>
         </el-table>
@@ -118,6 +118,8 @@
             v-if="item.hide != true"
             :fixed="item.fixed"
             :label="item.label"
+            :filters="filters"
+            :filter-method="item.prop === 'name5'?filterMethod:false"
             :width="item.width>2?item.width:100">
           <template slot-scope="scope">
             <el-input v-model="scope.row[item.prop]" :placeholder="'请输入'+item.label"></el-input>
@@ -136,6 +138,7 @@ export default {
   data(){
     return{
       disabled:false,
+      filters:[],
       form:{},
       dataList:[],
       drawer:false,
@@ -674,6 +677,12 @@ export default {
     this.tableHeight = windowHeight - 140;
   },
   methods:{
+    //筛选
+    filterMethod(value, row, column){
+      console.log(value, row, column)
+      const property = column['property'];
+      return row[property] === value;
+    },
     //修改提交触发
     editCustomer() {
       console.log(this.form)