diff --git a/src/views/energy/powerUse/HistoryElectricity/index.vue b/src/views/energy/powerUse/HistoryElectricity/index.vue
index 1020a65..af57d3b 100644
--- a/src/views/energy/powerUse/HistoryElectricity/index.vue
+++ b/src/views/energy/powerUse/HistoryElectricity/index.vue
@@ -244,8 +244,8 @@ export default {
       //采集方式
       dict:[
         {label:'手动',value:'0'},
-        {label:'自动',value:'1'},
-        {label:'抄表',value:'2'},
+        {label:'自动',value:'2'},
+        {label:'抄表',value:'1'},
       ],
     };
   },
diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue
index 25bace1..3473587 100644
--- a/src/views/mes/prepare/index.vue
+++ b/src/views/mes/prepare/index.vue
@@ -156,6 +156,7 @@
 					<span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
+      <el-table-column label="生产组线" align="center" prop="workorderNameEqu" />
 			<el-table-column label="单据状态" align="center" prop="status">
 			    <template slot-scope="scope">
 				{{ scope.row.status == "L0" ? "待领用" : "已领用" }}
@@ -275,7 +276,7 @@
 
 				<el-table-column prop="routeCode" width="75" label="实发"></el-table-column>
 				<el-table-column prop="routeCode" width="75" label="数量2"></el-table-column>
-		      
+
           </el-table>
 		  <!-- 底部 -->
           <el-row class="my-print-foot0">
@@ -511,7 +512,7 @@ export default {
 	// 遍历this.printData.workTable
      for (let i = 0; i < this.printData.workTable.length; i += (i==0?this.fenyeNumber:this.fenyeNumberTwo)) {
 
-		
+
 		// 使用slice方法从当前索引i开始切割，切割长度为10（如果剩余元素少于10，则切割剩余所有元素）
 		let chunk = this.printData.workTable.slice(i, i + (i==0?this.fenyeNumber:this.fenyeNumberTwo));
 		// 将切割后的数组添加到chunkedArray中
@@ -667,16 +668,16 @@ export default {
 </script>
 <style>
 .my-print-table .el-table {
-  border-collapse: collapse; 
-  border-spacing: 0; 
+  border-collapse: collapse;
+  border-spacing: 0;
 }
 
 
 .my-print-table .el-table__header-wrapper th {
-  border: 1px solid black !important; 
+  border: 1px solid black !important;
 }
 .my-print-table .el-table__body-wrapper td {
-  border: 1px solid black !important; 
+  border: 1px solid black !important;
 }
 
 .my-print-head {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 0123539..955e623 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -72,6 +72,15 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="员工卡片号" prop="peSnr" label-width="90px">
+            <el-input
+              v-model="queryParams.peSnr"
+              placeholder="请输入员工卡片号"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
           <el-form-item label="创建时间">
             <el-date-picker
               v-model="dateRange"
@@ -163,6 +172,7 @@
             </template>
           </el-table-column>
           <el-table-column label="微信号" align="center" key="wxId" prop="wxId" v-if="columns[7].visible" width="150"/>
+          <el-table-column label="员工卡片号" align="center" key="peSnr" prop="peSnr" v-if="columns[7].visible" width="150"/>
           <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -329,6 +339,13 @@
               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
             </el-form-item>
           </el-col>
+
+          <el-col :span="20">
+            <el-form-item label="员工卡片号"label-width="120px">
+              <el-input v-model="form.peSnr"  placeholder="请输入员工卡片号"></el-input>
+            </el-form-item>
+          </el-col>
+
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -440,7 +457,8 @@ export default {
         nickName: undefined,
         phonenumber: undefined,
         status: undefined,
-        deptId: undefined
+        deptId: undefined,
+        peSnr:undefined,
       },
       // 列信息
       columns: [
@@ -553,6 +571,7 @@ export default {
         wxId: undefined,
         status: "0",
         remark: undefined,
+        peSnr:undefined,
         postIds: [],
         roleIds: []
       };