fixed:统一页面筛选框样式

src/App.vue

@@ -43,6 +43,10 @@
 
 <style lang="scss">
 	@import '@/style/style.scss';
+	.headerSearch{
+		width: 120px!important;
+		margin-right: 5px;
+	}
 	.printWrap{
         width: 100%;
         overflow-x: scroll;

src/views/em/equipment.vue

@@ -2,15 +2,11 @@
   <el-container>
     <el-header>
       <div class="left-panel">
-        <el-button type="primary" icon="el-icon-plus" @click="add"></el-button>
-      </div>
-      <div class="right-panel">
-        <div class="right-panel-search">
         <el-input
             v-model="query.search"
             placeholder="名称"
             clearable
-            @keyup.enter="handleQuery"
+            style="margin-right: 5px;"
           ></el-input>
           <el-button
             type="primary"
@@ -18,6 +14,8 @@
             @click="handleQuery"
           ></el-button>
       </div>
+      <div class="right-panel">
+        <el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'equipment.create'"></el-button>
       </div>
     </el-header>
     <el-main class="nopadding">
@@ -75,12 +73,15 @@
             <el-link
               type="primary"
               @click="table_edit(scope.row)"
+              v-auth="'equipment.update'"
             >
               编辑
             </el-link>
+            <el-divider direction="vertical"></el-divider>
             <el-link
               type="danger"
               @click="table_del(scope.row)"
+              v-auth="'equipment.delete'"
             >
               删除
             </el-link>

src/views/em/mpoint.vue

@@ -6,15 +6,16 @@
             v-model="query.search"
             placeholder="名称"
             clearable
-            @keyup.enter="handleQuery"
+            style="margin-right: 5px;"
           ></el-input>
-
           <el-button
             type="primary"
             icon="el-icon-search"
             @click="handleQuery"
           ></el-button>
-        <el-button type="primary" icon="el-icon-plus" @click="table_add"></el-button>
+      </div>
+      <div class="right-panel">
+			  <el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'mpoint.create'"></el-button>
       </div>
     </el-header>
     <el-main class="nopadding">
@@ -27,11 +28,11 @@
 				<el-table-column label="创建时间" prop="create_time" min-width="150"></el-table-column>
 				<el-table-column label="操作" fixed="right" align="center" width="140">
 					<template #default="scope">
-						<el-button link size="small" @click="table_edit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button>
+						<el-button link size="small" @click="table_edit(scope.row)" v-auth="'mpoint.update'" type="primary">编辑</el-button>
 						<el-divider direction="vertical"></el-divider>
 						<el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
 							<template #reference>
-								<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button>
+								<el-button link size="small" v-auth="'mpoint.delete'" type="danger">删除</el-button>
 							</template>
 						</el-popconfirm>
 					</template>

src/views/enm_coal/handoverLog.vue

@@ -4,11 +4,20 @@
       <div class="left-panel">
         <div style="margin-right: 20px">交接班日志</div>
         <el-date-picker
-                    v-model="query.time"
+            v-model="query.start_time__gte"
             type="date"
-                    value-format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD HH:mm:ss"
             format="YYYY-MM-DD"
-                    placeholder="日志时间"
+            placeholder="开始时间"
+            style=" width: 120px"
+        />
+        <el-date-picker
+            v-model="query.end_time__lt"
+            type="date"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            format="YYYY-MM-DD"
+            placeholder="结束时间"
+            style="margin-left: 2px; width: 120px"
         />
         <el-select
             v-model="query.shift"
@@ -18,9 +27,9 @@
         >
             <el-option
                 v-for="item in optionsShift"
-                      :key="item.value"
+                :key="item.id"
-                      :label="item.label"
+                :label="item.name"
-                      :value="item.value"
+                :value="item.id"
             ></el-option>
         </el-select>
         <el-select
@@ -31,9 +40,9 @@
         >
             <el-option
                 v-for="item in options"
-                      :key="item.value"
+                :key="item.id"
-                      :label="item.label"
+                :label="item.name"
-                      :value="item.value"
+                :value="item.id"
             ></el-option>
         </el-select>
         <el-button
@@ -65,9 +74,9 @@
                   <span>{{ scope.row.end_time.slice(0,16)}}</span>
               </template>
           </el-table-column>
-                <el-table-column label="班组名称" prop="team_name" width="80"></el-table-column>
+          <el-table-column label="班组名称" prop="team_name"></el-table-column>
-                <el-table-column label="当前班次" prop="shift_name" width="80"></el-table-column>
+          <el-table-column label="当前班次" prop="shift_name"></el-table-column>
-                <el-table-column label="班长" prop="leader_name" width="80"></el-table-column>
+          <el-table-column label="班长" prop="leader_name"></el-table-column>
           
           <el-table-column label="检验时间">
               <template #default="scope">
@@ -174,6 +183,10 @@
         apiObj: this.$API.wpm.sflog.list,
         apiObj2: null,
         query: {
+          shift:'',
+          team:'',
+          end_time__lt:'',
+          start_time__gte:'',
           mgroup:'3347217512021835776',
         },
         deptId :'3347207082608115712',
@@ -197,8 +210,27 @@
         limitedExport:false,
       };
     },
-   
+   mounted(){
+      this.getTeam();
+      this.getShfit();
+   },
     methods: {
+      getTeam(){
+        let form ={};
+        form.page = 0;
+        form.belong_dept = this.deptId;
+        this.$API.mtm.team.list.req(form).then(res=>{
+          this.options = res;
+        })
+      },
+      getShfit(){
+        this.$API.mtm.shift.req({page:0}).then(res=>{
+          this.optionsShift = res;
+        })
+      },
+      handleQuery(){
+        this.$refs.table.queryData(this.query);
+      },
       sflog_export(){
         this.limitedExport = true;
       },

src/views/enm_coal/teamAnalysis.vue

@@ -8,7 +8,7 @@
                     value-format="YYYY"
                     format="YYYY"
                     placeholder="查询年份"
-                    style="margin-right: 6px;"
+                    class="headerSearch"
                 />
                 <el-button
                     type="primary"

src/views/enm_coal/workshopAnalysis.vue

@@ -8,7 +8,7 @@
                 value-format="YYYY"
                 format="YYYY"
                 placeholder="查询年份"
-                style="margin-right: 6px;"
+                class="headerSearch"
             />
             <el-button
                 type="primary"

src/views/enm_kiln/handoverLog.vue

@@ -4,11 +4,20 @@
           <div class="left-panel">
             <div style="margin-right: 20px">交接班日志</div>
             <el-date-picker
-                    v-model="query.time"
+              v-model="query.start_time__gte"
               type="date"
-                    value-format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD HH:mm:ss"
               format="YYYY-MM-DD"
-                    placeholder="日志时间"
+              placeholder="开始时间"
+              style=" width: 120px"
+          />
+          <el-date-picker
+              v-model="query.end_time__lt"
+              type="date"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              placeholder="结束时间"
+              style="margin-left: 2px; width: 120px"
           />
         <el-select
             v-model="query.shift"
@@ -18,9 +27,9 @@
         >
             <el-option
                 v-for="item in optionsShift"
-                      :key="item.value"
+                :key="item.id"
-                      :label="item.label"
+                :label="item.name"
-                      :value="item.value"
+                :value="item.id"
             ></el-option>
         </el-select>
         <el-select
@@ -31,9 +40,9 @@
         >
             <el-option
                 v-for="item in options"
-                      :key="item.value"
+                :key="item.id"
-                      :label="item.label"
+                :label="item.name"
-                      :value="item.value"
+                :value="item.id"
             ></el-option>
         </el-select>
         <el-button
@@ -193,6 +202,10 @@ import otherDialog from "./../enm_rm/other_form.vue";
         apiObj: this.$API.wpm.sflog.list,
         apiObj2: null,
         query: {
+          shift:'',
+          team:'',
+          end_time__lt:'',
+          start_time__gte:'',
           mgroup:'3347217246321065984',
         },
         
@@ -217,8 +230,27 @@ import otherDialog from "./../enm_rm/other_form.vue";
         limitedExport:false,
       };
     },
-   
+    mounted(){
+      this.getTeam();
+      this.getShfit();
+   },
     methods: {
+      getTeam(){
+        let form ={};
+        form.page = 0;
+        form.belong_dept = this.deptId;
+        this.$API.mtm.team.list.req(form).then(res=>{
+          this.options = res;
+        })
+      },
+      getShfit(){
+        this.$API.mtm.shift.req({page:0}).then(res=>{
+          this.optionsShift = res;
+        })
+      },
+      handleQuery(){
+        this.$refs.table.queryData(this.query);
+      },
       sflog_export(){
         this.limitedExport = true;
       },

src/views/enm_kiln/teamAnalysis.vue

@@ -8,7 +8,7 @@
                     value-format="YYYY"
                     format="YYYY"
                     placeholder="查询年份"
-                    style="margin-right: 6px;"
+                    class="headerSearch"
                 />
                 <el-button
                     type="primary"

src/views/enm_kiln/workshopAnalysis.vue

@@ -8,7 +8,7 @@
                 value-format="YYYY"
                 format="YYYY"
                 placeholder="查询年份"
-                style="margin-right: 6px;"
+                class="headerSearch"
             />
             <el-button
                 type="primary"

src/views/enm_mill/handoverLog.vue

@@ -4,11 +4,20 @@
             <div class="left-panel">
               <div style="margin-right: 20px">交接班日志</div>
               <el-date-picker
-                    v-model="query.time"
+              v-model="query.start_time__gte"
               type="date"
-                    value-format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD HH:mm:ss"
               format="YYYY-MM-DD"
-                    placeholder="日志时间"
+              placeholder="开始时间"
+              style=" width: 120px"
+          />
+          <el-date-picker
+              v-model="query.end_time__lt"
+              type="date"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              placeholder="结束时间"
+              style="margin-left: 2px; width: 120px"
           />
         <el-select
             v-model="query.shift"
@@ -18,9 +27,9 @@
         >
             <el-option
                 v-for="item in optionsShift"
-                      :key="item.value"
+                :key="item.id"
-                      :label="item.label"
+                :label="item.name"
-                      :value="item.value"
+                :value="item.id"
             ></el-option>
         </el-select>
         <el-select
@@ -31,9 +40,9 @@
         >
             <el-option
                 v-for="item in options"
-                      :key="item.value"
+                :key="item.id"
-                      :label="item.label"
+                :label="item.name"
-                      :value="item.value"
+                :value="item.id"
             ></el-option>
         </el-select>
               <el-button
@@ -174,6 +183,10 @@
         apiObj: this.$API.wpm.sflog.list,
         apiObj2: null,
         query: {
+          shift:'',
+          team:'',
+          end_time__lt:'',
+          start_time__gte:'',
           mgroup:'3347217651339837440',
         },
         deptId:'3347207316583170048',
@@ -197,8 +210,27 @@
         limitedExport:false,
       };
     },
-   
+    mounted(){
+      this.getTeam();
+      this.getShfit();
+   },
     methods: {
+      getTeam(){
+        let form ={};
+        form.page = 0;
+        form.belong_dept = this.deptId;
+        this.$API.mtm.team.list.req(form).then(res=>{
+          this.options = res;
+        })
+      },
+      getShfit(){
+        this.$API.mtm.shift.req({page:0}).then(res=>{
+          this.optionsShift = res;
+        })
+      },
+      handleQuery(){
+        this.$refs.table.queryData(this.query);
+      },
       sflog_export(){
         this.limitedExport = true;
       },

src/views/enm_mill/teamAnalysis.vue

@@ -8,7 +8,7 @@
                     value-format="YYYY"
                     format="YYYY"
                     placeholder="查询年份"
-                    style="margin-right: 6px;"
+                    class="headerSearch"
                 />
                 <el-button
                     type="primary"

src/views/enm_mill/workshopAnalysis.vue

@@ -8,7 +8,7 @@
                     value-format="YYYY"
                     format="YYYY"
                     placeholder="查询年份"
-                    style="margin-right: 6px;"
+                    class="headerSearch"
                 />
                 <el-select
                     v-model="query.type"

src/views/enm_pack/handoverLog.vue

@@ -4,11 +4,20 @@
         <div class="left-panel">
           <div style="margin-right: 20px">交接班日志</div>
           <el-date-picker
-                    v-model="query.time"
+          v-model="query.start_time__gte"
           type="date"
-                    value-format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD HH:mm:ss"
           format="YYYY-MM-DD"
-                    placeholder="日志时间"
+          placeholder="开始时间"
+          style=" width: 120px"
+      />
+      <el-date-picker
+          v-model="query.end_time__lt"
+          type="date"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          format="YYYY-MM-DD"
+          placeholder="结束时间"
+          style="margin-left: 2px; width: 120px"
       />
     <el-select
         v-model="query.shift"
@@ -18,9 +27,9 @@
     >
         <el-option
             v-for="item in optionsShift"
-                      :key="item.value"
+            :key="item.id"
-                      :label="item.label"
+            :label="item.name"
-                      :value="item.value"
+            :value="item.id"
         ></el-option>
     </el-select>
     <el-select
@@ -31,9 +40,9 @@
     >
         <el-option
             v-for="item in options"
-                      :key="item.value"
+            :key="item.id"
-                      :label="item.label"
+            :label="item.name"
-                      :value="item.value"
+            :value="item.id"
         ></el-option>
     </el-select>
           <el-button
@@ -171,8 +180,27 @@ import saveDialog from "./../enm_rm/handover_form.vue";
         limitedExport:false,
       };
     },
-   
+    mounted(){
+      this.getTeam();
+      this.getShfit();
+   },
     methods: {
+      getTeam(){
+        let form ={};
+        form.page = 0;
+        form.belong_dept = this.deptId;
+        this.$API.mtm.team.list.req(form).then(res=>{
+          this.options = res;
+        })
+      },
+      getShfit(){
+        this.$API.mtm.shift.req({page:0}).then(res=>{
+          this.optionsShift = res;
+        })
+      },
+      handleQuery(){
+        this.$refs.table.queryData(this.query);
+      },
       sflog_export(){
         this.limitedExport = true;
       },

src/views/enm_pack/teamAnalysis.vue

@@ -8,7 +8,7 @@
                     value-format="YYYY"
                     format="YYYY"
                     placeholder="查询年份"
-                    style="margin-right: 6px;"
+                    class="headerSearch"
                 />
                 <el-button
                     type="primary"

src/views/enm_pack/workshopAnalysis.vue

@@ -8,7 +8,7 @@
                 value-format="YYYY"
                 format="YYYY"
                 placeholder="查询年份"
-                style="margin-right: 6px;"
+                class="headerSearch"
             />
             <el-button
               type="primary"

src/views/enm_rm/handoverLog.vue

@@ -4,11 +4,20 @@
             <div class="left-panel">
               <div style="margin-right: 20px">交接班日志</div>
               <el-date-picker
-                    v-model="query.time"
+                  v-model="query.start_time__gte"
                   type="date"
-                    value-format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD HH:mm:ss"
                   format="YYYY-MM-DD"
-                    placeholder="日志时间"
+                  placeholder="开始时间"
+                  style=" width: 120px"
+              />
+              <el-date-picker
+                  v-model="query.end_time__lt"
+                  type="date"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  format="YYYY-MM-DD"
+                  placeholder="结束时间"
+                  style="margin-left: 2px; width: 120px"
               />
               <el-select
                   v-model="query.shift"
@@ -18,9 +27,9 @@
               >
                   <el-option
                       v-for="item in optionsShift"
-                      :key="item.value"
+                      :key="item.id"
-                      :label="item.label"
+                      :label="item.name"
-                      :value="item.value"
+                      :value="item.id"
                   ></el-option>
               </el-select>
               <el-select
@@ -31,9 +40,9 @@
               >
                   <el-option
                       v-for="item in options"
-                      :key="item.value"
+                      :key="item.id"
-                      :label="item.label"
+                      :label="item.name"
-                      :value="item.value"
+                      :value="item.id"
                   ></el-option>
               </el-select>
               <el-button
@@ -218,8 +227,25 @@ import otherDialog from "./other_form.vue";
     },
    mounted(){
       this.getTeam();
+      this.getShfit();
    },
     methods: {
+      getTeam(){
+        let form ={};
+        form.page = 0;
+        form.belong_dept = this.deptId;
+        this.$API.mtm.team.list.req(form).then(res=>{
+          this.options = res;
+        })
+      },
+      getShfit(){
+        this.$API.mtm.shift.req({page:0}).then(res=>{
+          this.optionsShift = res;
+        })
+      },
+      handleQuery(){
+        this.$refs.table.queryData(this.query);
+      },
       sflog_export(){
         this.limitedExport = true;
       },
@@ -244,14 +270,7 @@ import otherDialog from "./other_form.vue";
             this.$refs.saveDialog.open("edit").setData(row);
         });
       },
-      getTeam(){
+      
-        let form ={};
-        form.page = 0;
-        form.belong_dept = this.deptId;
-        this.$API.mtm.team.list.req(form).then(res=>{
-          this.teamOptions = res;
-        })
-      },
       //质量检验
       sflog_check(row){
         this.dialog.check = true;

src/views/enm_rm/teamAnalysis.vue

@@ -8,7 +8,7 @@
                     value-format="YYYY"
                     format="YYYY"
                     placeholder="查询年份"
-                    style="margin-right: 6px;"
+                    class="headerSearch"
                 />
                 <el-button
                     type="primary"

src/views/enm_rm/workshopAnalysis.vue

@@ -8,7 +8,7 @@
                 value-format="YYYY"
                 format="YYYY"
                 placeholder="查询年份"
-                    style="margin-right: 6px;"
+                class="headerSearch"
             />
             <el-button
               type="primary"

src/views/enm_slag/handoverLog.vue

@@ -4,11 +4,20 @@
         <div class="left-panel">
           <div style="margin-right: 20px">交接班日志</div>
           <el-date-picker
-                    v-model="query.time"
+              v-model="query.start_time__gte"
               type="date"
-                    value-format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD HH:mm:ss"
               format="YYYY-MM-DD"
-                    placeholder="日志时间"
+              placeholder="开始时间"
+              style=" width: 120px"
+          />
+          <el-date-picker
+              v-model="query.end_time__lt"
+              type="date"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              placeholder="结束时间"
+              style="margin-left: 2px; width: 120px"
           />
           <el-select
               v-model="query.shift"
@@ -18,9 +27,9 @@
           >
               <el-option
                   v-for="item in optionsShift"
-                      :key="item.value"
+                  :key="item.id"
-                      :label="item.label"
+                  :label="item.name"
-                      :value="item.value"
+                  :value="item.id"
               ></el-option>
           </el-select>
           <el-select
@@ -31,9 +40,9 @@
           >
               <el-option
                   v-for="item in options"
-                      :key="item.value"
+                  :key="item.id"
-                      :label="item.label"
+                  :label="item.name"
-                      :value="item.value"
+                  :value="item.id"
               ></el-option>
           </el-select>
           <el-button
@@ -173,8 +182,27 @@
         limitedExport:false,
       };
     },
-   
+    mounted(){
+      this.getTeam();
+      this.getShfit();
+   },
     methods: {
+      getTeam(){
+        let form ={};
+        form.page = 0;
+        form.belong_dept = this.deptId;
+        this.$API.mtm.team.list.req(form).then(res=>{
+          this.options = res;
+        })
+      },
+      getShfit(){
+        this.$API.mtm.shift.req({page:0}).then(res=>{
+          this.optionsShift = res;
+        })
+      },
+      handleQuery(){
+        this.$refs.table.queryData(this.query);
+      },
       sflog_export(){
         this.limitedExport = true;
       },

src/views/enm_slag/teamAnalysis.vue

@@ -8,7 +8,7 @@
                     value-format="YYYY"
                     format="YYYY"
                     placeholder="查询年份"
-                    style="margin-right: 6px;"
+                    class="headerSearch"
                 />
                 <el-button
                     type="primary"

src/views/enm_slag/workshopAnalysis.vue

@@ -8,7 +8,7 @@
                 value-format="YYYY"
                 format="YYYY"
                 placeholder="查询年份"
-                    style="margin-right: 6px;"
+                class="headerSearch"
             />
             <el-button
               type="primary"

src/views/ungrouped/costing.vue

@@ -8,7 +8,7 @@
                   placeholder="工段"
                   clearable
                   @change="mgroupChange"
-                  style="margin-left: 2px; width: 200px"
+                  class="headerSearch"
                 >
                   <el-option
                   v-for="item in mgroupOptions"
@@ -21,6 +21,7 @@
                     v-model="query.type"
                     placeholder="查询类型"
                     clearable
+                    class="headerSearch"
                     @change="typeCange"
                   >
                     <el-option
@@ -36,6 +37,7 @@
                     value-format="YYYY-MM-DD"
                     format="YYYY-MM-DD"
                     placeholder="日"
+                    class="headerSearch"
                     v-if="query.type==0"
                 />
                 <!-- 选择班次 -->
@@ -44,7 +46,7 @@
                     v-model="query.shift"
                     placeholder="班次"
                     clearable
-                    style="margin-left: 2px; width: 120px"
+                    class="headerSearch"
                 >
                 <el-option
                     v-for="item in optionsShift"
@@ -59,6 +61,7 @@
                     value-format="YYYY-MM"
                     format="YYYY-MM"
                     placeholder="月份"
+                    class="headerSearch"
                     v-if="query.type==1"
                 />
                 <el-date-picker
@@ -67,6 +70,7 @@
                     value-format="YYYY"
                     format="YYYY"
                     placeholder="年份"
+                    class="headerSearch"
                     v-if="query.type==2"
                 />
                 <el-button

src/views/ungrouped/energy.vue

@@ -7,7 +7,7 @@
                   placeholder="车间"
                   clearable
                   @change="deptChange"
-                  style="margin-left: 2px; width: 200px"
+                  class="headerSearch"
                 >
                   <el-option
                   v-for="item in deptOptions"
@@ -20,6 +20,7 @@
                     v-model="query.type"
                     placeholder="查询类型"
                     clearable
+                    class="headerSearch"
                     @change="typeCange"
                 >
                     <el-option
@@ -36,6 +37,7 @@
                     format="YYYY-MM"
                     placeholder="查询月份"
                     v-if="query.type==0"
+                    class="headerSearch"
                 />
                 <el-date-picker
                     v-model="query.year"
@@ -44,6 +46,7 @@
                     format="YYYY"
                     placeholder="查询年份"
                     v-if="query.type==1"
+                    class="headerSearch"
                 />
                 <el-date-picker
                     v-model="query.yearStart"
@@ -52,8 +55,8 @@
                     format="YYYY"
                     placeholder="起始年份"
                     v-if="query.type==2"
+                    class="headerSearch"
                 />
-                
                 <el-button
                 type="primary"
                 icon="el-icon-search"

src/views/ungrouped/feeset.vue

@@ -2,27 +2,27 @@
 	<el-container>
 		<el-header>
 			<div class="left-panel">
-				<el-date-picker
+				<!-- <el-date-picker
                     v-model="query.year"
                     type="year"
                     value-format="YYYY"
                     format="YYYY"
                     placeholder="年"
 					style="width: 120px;margin-right: 5px;"
-                />
+                /> -->
 				<el-date-picker
-                    v-model="query.month"
+                    v-model="query.date"
                     type="month"
                     value-format="YYYY-MM"
                     format="YYYY-MM"
                     placeholder="月"
-					style="width: 120px;margin-right: 5px;"
+					class="headerSearch"
                 />
 				<el-select
 					v-model="query.fee"
 					placeholder="费用类型"
 					clearable
-					style="width: 120px;margin-right: 5px;"
+					class="headerSearch"
 				>
 					<el-option
 						v-for="item in feeOptions"
@@ -35,7 +35,7 @@
 					v-model="query.mgroup"
 					placeholder="工段"
 					clearable
-					style="width: 120px;margin-right: 5px;"
+					class="headerSearch"
 				>
 					<el-option
 						v-for="item in options"
@@ -47,9 +47,8 @@
 				<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
 			</div>
 			<div class="right-panel">
-				<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'role.create'"></el-button>
+				<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'feeset.create'"></el-button>
 			</div>
-			
 		</el-header>
 		<el-main class="nopadding">
 			<scTable ref="table" :apiObj="apiObj" row-key="id">
@@ -65,11 +64,11 @@
 				</el-table-column>
 				<el-table-column label="操作" fixed="right" align="center" width="140">
 					<template #default="scope">
-						<el-button link size="small" @click="table_edit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button>
+						<el-button link size="small" @click="table_edit(scope.row)" v-auth="'feeset.update'" type="primary">编辑</el-button>
 						<el-divider direction="vertical"></el-divider>
 						<el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
 							<template #reference>
-								<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button>
+								<el-button link size="small" v-auth="'feeset.delete'" type="danger">删除</el-button>
 							</template>
 						</el-popconfirm>
 					</template>
@@ -95,8 +94,7 @@
 			return {
 				apiObj: this.$API.fim.feeset.list,
 				query: {
-					year:'',
+					date:'',
-					month:'',
 					fee:'',
 					mgroup:'',
 				},
@@ -156,7 +154,14 @@
 			},
 			//搜索
 			handleQuery(){
-				this.$refs.table.queryData(this.query)
+				let year = this.query.date.split('-')[0];
+				let month = this.query.date.split('-')[1];
+				let query = {};
+				query.year = Number(year);
+				query.month = Number(month);
+				query.fee =this.query.fee;
+				query.mgroup =this.query.mgroup;
+				this.$refs.table.queryData(query)
 			},
 			//本地更新数据
 			//新增岗位后更新数据

src/views/ungrouped/goalSetting.vue

@@ -2,21 +2,19 @@
 	<el-container>
 		<el-header>
 			<div class="left-panel">
-				<el-button type="primary" icon="el-icon-plus" @click="roleAdd" v-auth="'role.create'"></el-button>
-			</div>
-			<div class="right-panel">
-				<div class="right-panel-search">
 				<el-date-picker
 					v-model="query.year"
 					type="year"
 					format="YYYY"
 					value-format="YYYY"
 					placeholder="年份"
+					class="headerSearch"
 				/>
 				<el-select
 					v-model="query.mgroup"
 					placeholder="关联工段"
 					clearable
+					class="headerSearch"
 				>
 					<el-option
 					v-for="item in mgroupOptions"
@@ -29,6 +27,7 @@
 					v-model="query.goal_cate"
 					placeholder="目标种类"
 					clearable
+					class="headerSearch"
 				>
 					<el-option
 					v-for="item in goalOptions"
@@ -39,13 +38,15 @@
 				</el-select>
 				<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
 			</div>
+			<div class="right-panel">
+				<el-button type="primary" icon="el-icon-plus" @click="roleAdd" v-auth="'goal.create'"></el-button>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
-			<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" hidePagination>
+			<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange">
 				<el-table-column label="#" type="index" width="50"></el-table-column>
-				<el-table-column label="工段" prop="mgroup_name" min-width="100"></el-table-column>
+				<el-table-column label="工段" prop="mgroup_name" width="80"></el-table-column>
-				<el-table-column label="目标（项目）" prop="goal_cate_name" min-width="100"></el-table-column>
+				<el-table-column label="目标（项目）" prop="goal_cate_name" min-width="120"></el-table-column>
 				<el-table-column label="1月" prop="goal_val_1"></el-table-column>
 				<el-table-column label="2月" prop="goal_val_2"></el-table-column>
 				<el-table-column label="3月" prop="goal_val_3"></el-table-column>
@@ -61,11 +62,11 @@
 				<el-table-column label="年目标值" prop="goal_val"></el-table-column>
 				<el-table-column label="操作" fixed="right" align="center" width="100">
 					<template #default="scope">
-						<el-button link size="small" @click="roleEdit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button>
+						<el-button link size="small" @click="roleEdit(scope.row)" v-auth="'goal.update'" type="primary">编辑</el-button>
 						<el-divider direction="vertical"></el-divider>
 						<el-popconfirm title="确定删除吗？" @confirm="handleDel(scope.row)">
 							<template #reference>
-								<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button>
+								<el-button link size="small" v-auth="'goal.delete'" type="danger">删除</el-button>
 							</template>
 						</el-popconfirm>
 					</template>

src/views/ungrouped/material.vue

@@ -2,17 +2,16 @@
 	<el-container>
 		<el-header>
 			<div class="left-panel">
-				<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'role.create'"></el-button>
+				<el-input style="margin-right: 5px;" v-model="query.search" placeholder="产品名称" clearable></el-input>
-			</div>
-			<div class="right-panel">
-				<div class="right-panel-search">
-					<el-input v-model="query.search" placeholder="产品名称" clearable @keyup.enter="handleQuery"></el-input>
 				<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
 			</div>
+			<div class="right-panel">
+				<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'material.create'"></el-button>
 			</div>
+			
 		</el-header>
 		<el-main class="nopadding">
-			<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" hidePagination>
+			<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange">
 				<el-table-column label="#" type="index" width="50"></el-table-column>
 				<el-table-column label="名称" prop="name" min-width="100"></el-table-column>
 				<el-table-column label="标识" prop="code" min-width="100"></el-table-column>
@@ -29,11 +28,11 @@
 				</el-table-column> -->
 				<el-table-column label="操作" fixed="right" align="center" width="140">
 					<template #default="scope">
-						<el-button link size="small" @click="table_edit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button>
+						<el-button link size="small" @click="table_edit(scope.row)" v-auth="'material.update'" type="primary">编辑</el-button>
 						<el-divider direction="vertical"></el-divider>
 						<el-popconfirm title="确定删除吗？" @confirm="roleDel(scope.row, scope.$index)">
 							<template #reference>
-								<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button>
+								<el-button link size="small" v-auth="'material.delete'" type="danger">删除</el-button>
 							</template>
 						</el-popconfirm>
 					</template>

src/views/ungrouped/mgroup.vue

@@ -2,13 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="left-panel">
-				<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'role.create'"></el-button>
+				<el-input style="margin-right: 5px;" v-model="query.search" placeholder="名称" clearable></el-input>
-			</div>
-			<div class="right-panel">
-				<div class="right-panel-search">
-					<el-input v-model="query.search" placeholder="测点集名称" clearable @keyup.enter="handleQuery"></el-input>
 				<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
 			</div>
+			<div class="right-panel">
+				<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'mgroup.create'"></el-button>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
@@ -20,16 +18,15 @@
 						<span>{{ cates_[scope.row.cate] }}</span>
 					</template>
 				</el-table-column>
-				<!-- <el-table-column label="主要产品" prop="product" min-width="150"></el-table-column> -->
 				<el-table-column label="所属部门" prop="belong_dept_name" min-width="150"></el-table-column>
 				<el-table-column label="创建时间" prop="create_time" min-width="150"></el-table-column>
 				<el-table-column label="操作" fixed="right" align="center" width="140">
 					<template #default="scope">
-						<el-button link size="small" @click="table_edit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button>
+						<el-button link size="small" @click="table_edit(scope.row)" v-auth="'mgroup.update'" type="primary">编辑</el-button>
 						<el-divider direction="vertical"></el-divider>
 						<el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
 							<template #reference>
-								<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button>
+								<el-button link size="small" v-auth="'mgroup.delete'" type="danger">删除</el-button>
 							</template>
 						</el-popconfirm>
 					</template>

src/views/ungrouped/priceset.vue

@@ -3,18 +3,18 @@
 		<el-header>
 			<div class="left-panel">
 				<el-date-picker
-                    v-model="query.month"
+                    v-model="query.monthData"
                     type="month"
                     value-format="YYYY-MM"
                     format="YYYY-MM"
                     placeholder="月"
-					style="width: 120px;margin-right: 5px;"
+					class="headerSearch"
                 />
 				<el-select
-					v-model="query.fee"
+					v-model="query.material"
 					placeholder="物料"
 					clearable
-					style="width: 120px;margin-right: 5px;"
+					class="headerSearch"
 				>
 					<el-option
 						v-for="item in options"
@@ -26,7 +26,7 @@
 				<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
 			</div>
 			<div class="right-panel">
-				<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'role.create'"></el-button>
+				<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'priceset.create'"></el-button>
 			</div>
 			
 		</el-header>
@@ -39,11 +39,11 @@
 				<el-table-column label="单价" prop="price_unit" min-width="150"></el-table-column>
 				<el-table-column label="操作" fixed="right" align="center" width="140">
 					<template #default="scope">
-						<el-button link size="small" @click="table_edit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button>
+						<el-button link size="small" @click="table_edit(scope.row)" v-auth="'priceset.update'" type="primary">编辑</el-button>
 						<el-divider direction="vertical"></el-divider>
 						<el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
 							<template #reference>
-								<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button>
+								<el-button link size="small" v-auth="'priceset.delete'" type="danger">删除</el-button>
 							</template>
 						</el-popconfirm>
 					</template>
@@ -69,8 +69,7 @@
 			return {
 				apiObj: this.$API.fim.priceset.list,
 				query: {
-					year:'',
+					monthData:'',
-					month:'',
 					material:'',
 				},
                 dialog: {
@@ -121,7 +120,13 @@
 			},
 			//搜索
 			handleQuery(){
-				this.$refs.table.queryData(this.query)
+				let year = this.query.monthData.split('-')[0];
+				let month = this.query.monthData.split('-')[1];
+				let query = {};
+				query.year = Number(year);
+				query.month = Number(month);
+				query.material =this.query.material;
+				this.$refs.table.queryData(query)
 			},
 			//本地更新数据
 			//新增岗位后更新数据

src/views/ungrouped/quality.vue

@@ -7,7 +7,7 @@
                   placeholder="车间"
                   clearable
                   @change="deptChange"
-                  style="margin-left: 2px; width: 200px"
+                  class="headerSearch"
                 >
                   <el-option
                   v-for="item in deptOptions"
@@ -20,6 +20,7 @@
                     v-model="query.type"
                     placeholder="查询类型"
                     clearable
+                    class="headerSearch"
                     @change="typeCange"
                   >
                     <el-option
@@ -36,6 +37,7 @@
                     value-format="YYYY"
                     format="YYYY"
                     placeholder="年份"
+                    class="headerSearch"
                     v-if="query.type==1"
                 />
                 <el-date-picker
@@ -44,17 +46,9 @@
                     value-format="YYYY-MM"
                     format="YYYY-MM"
                     placeholder="月份"
+                    class="headerSearch"
                     v-if="query.type==0"
                 />
-
-                <!-- <el-date-picker
-                    v-model="query.day"
-                    type="date"
-                    value-format="YYYY-MM-DD"
-                    format="YYYY-MM-DD"
-                    placeholder="日"
-                    v-if="query.type==0"
-                /> -->
                 <el-button
                 type="primary"
                 icon="el-icon-search"

src/views/ungrouped/report.vue

@@ -7,6 +7,7 @@
                     v-model="type"
                     placeholder="查询类型"
                     clearable
+                    class="headerSearch"
                     @change="typeCange"
                   >
                     <el-option
@@ -157,7 +158,7 @@
                 });
             },
             
-            
+            getTableData(){},
             handlePrint() {
                 this.$PRINT('#myReport');
             },

src/views/ungrouped/team.vue

@@ -2,7 +2,7 @@
 	<el-container>
 		<el-header>
 			<div class="left-panel">
-				<el-button type="primary" icon="el-icon-plus" @click="roleAdd" v-auth="'role.create'"></el-button>
+				<el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-auth="'team.create'"></el-button>
 			</div>
 			<div class="right-panel">
 				<div class="right-panel-search">
@@ -20,11 +20,11 @@
 				<el-table-column label="创建时间" prop="create_time" min-width="150"></el-table-column>
 				<el-table-column label="操作" fixed="right" align="center" width="140">
 					<template #default="scope">
-						<el-button link size="small" @click="roleEdit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button>
+						<el-button link size="small" @click="handleEdit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button>
 						<el-divider direction="vertical"></el-divider>
-						<el-popconfirm title="确定删除吗？" @confirm="roleDel(scope.row, scope.$index)">
+						<el-popconfirm title="确定删除吗？" @confirm="handleDel(scope.row, scope.$index)">
 							<template #reference>
-								<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button>
+								<el-button link size="small" v-auth="'team.delete'" type="danger">删除</el-button>
 							</template>
 						</el-popconfirm>
 					</template>
@@ -106,7 +106,6 @@
 			}
 		},
 		mounted() {
-			this.getList();
 			this.getGroup();
 		},
 		methods: {
@@ -120,13 +119,8 @@
 					this.group = res.results;
 				});
 			},
-			//获取班组列表
-			getList(){
-				var res = this.$API.system.role.list.req();
-				this.tableData = res.results;
-			},
 			//添加班组
-			roleAdd(){
+			handleAdd(){
 				this.limitedVisible = true;
 				this.type = "add";
 				this.form = Object.assign({}, defaultForm);
@@ -158,14 +152,13 @@
 			},
 
 			//编辑班组
-			roleEdit(row){
+			handleEdit(row){
 				this.type='edit';
 				this.form=row;
 				this.limitedVisible = true;
 			},
-
 			//删除班组
-			async roleDel(row){
+			async handleDel(row){
 				var id = row.id;
 				var res = await this.$API.mtm.team.delete.req(id);
 				if(res.err_msg){