diff --git a/hb_client/src/api/hrm.js b/hb_client/src/api/hrm.js
index 6a2a20c..3aef7e2 100644
--- a/hb_client/src/api/hrm.js
+++ b/hb_client/src/api/hrm.js
@@ -29,3 +29,22 @@ export function getEmployee(data) {
     data
   })
 }
+
+
+//个人离岗说明
+
+export function getNotWorkList(query) {
+  return request({
+    url: '/hrm/not_work_remark/',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getClockrecordList(query) {
+  return request({
+    url: '/hrm/clock_record/',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/hb_client/src/views/mtm/materialDetail.vue b/hb_client/src/views/mtm/materialDetail.vue
index 65a4bb0..1bedbef 100644
--- a/hb_client/src/views/mtm/materialDetail.vue
+++ b/hb_client/src/views/mtm/materialDetail.vue
@@ -228,7 +228,7 @@
             height="460"
           >
             <el-table-column type="index" width="50" />
-
+            
             <el-table-column label="名称">
               <template slot-scope="scope">{{ scope.row.name }}</template>
             </el-table-column>
@@ -277,11 +277,27 @@
               label-position="right"
                :rules="rule1"
             >
+             <el-form-item label="物料"
+                prop="material"
+              >
+                <el-select v-model="packitem.material" @change="selectmaterial"  >
+                  <el-option
+                    v-for="item in materialoptions"
+                    :key="item.id"
+                    :value="item.id"
+                    :label="item.name"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
               <el-form-item label="名称" prop="name">
                 <el-input v-model="packitem.name" placeholder="名称" />
               </el-form-item>
               <el-form-item label="单位" prop="unit">
                 <el-input v-model="packitem.unit" placeholder="单位" />
+              </el-form-item>
+               <el-form-item label="型号" prop="specification">
+                <el-input v-model="packitem.specification" placeholder="型号" />
               </el-form-item>
               <el-form-item label="数量" prop="count">
                 <el-input-number
@@ -321,7 +337,7 @@ import { upUrl, upHeaders } from "@/api/file";
 import { getProductionplanList } from "@/api/pm";
 import { getmaterialbatchList } from "@/api/inm";
 import { getOrderList } from "@/api/sam";
-import { getMaterial,getpackitemList,createpackitem,updatepackitem,deletepackitem } from "@/api/mtm";
+import { getMaterial,getpackitemList,createpackitem,updatepackitem,deletepackitem,getMaterialList } from "@/api/mtm";
 import { getwproductList } from "@/api/wpm";
 
 import { upFile } from "@/api/file";
@@ -330,7 +346,9 @@ import Pagination from "@/components/Pagination"; // secondary package based on
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 const defaultpackitem = {
-    
+    name:"",
+    unit:"",
+    specification:"",
   };
 export default {
   components: { Pagination, vueJsonEditor, Treeselect },
@@ -346,6 +364,7 @@ export default {
       dialogVisible: false,
       dialogType: "new",
       pickList:[],
+      materialoptions:[],
       actstate_: {
         6: "待复检",
         10: "操作进行中",
@@ -370,6 +389,7 @@ export default {
   created() {
     this.material = this.$route.params.id;
     this.type = this.$route.params.type;
+       this.getMaterialist()
     this.getMaterial();
   this.getpickList();
     this.getOrderList();
@@ -379,7 +399,31 @@ export default {
   },
   methods: {
     //新增装箱单
-    
+    getMaterialist()
+    {
+       getMaterialList({ pageoff: true,type:3 }).then((response) => {
+        if (response.data) {
+          this.materialoptions = response.data;
+        }
+       
+      });
+    },
+
+selectmaterial(selval){
+    getMaterial(selval).then((response) => {
+        if (response.data) {
+          this.packitem.name = response.data.name;
+            this.packitem.unit = response.data.unit;
+              this.packitem.specification = response.data.specification;
+         
+           
+          
+        }
+       
+      });
+},
+
+   
 handleCreate() {
         this.packitem = Object.assign({}, defaultpackitem);
         this.dialogType = "new";
@@ -424,7 +468,7 @@ handleCreate() {
                 }
               });
             } else {
-              this.packitem.material=this.material;
+              this.packitem.product=this.material;
               createpackitem(this.packitem).then((res) => {
                 if (res.code >= 200) {
                   this.getpickList();
@@ -441,7 +485,7 @@ handleCreate() {
 
 getpickList()
 {
-   getpackitemList({ material: this.material, page: 0 }).then((response) => {
+   getpackitemList({ product: this.material, page: 0 }).then((response) => {
         if (response.data) {
           this.pickList = response.data; //zhuangxiang信息
         }
diff --git a/hb_client/src/views/personnel/attendance.vue b/hb_client/src/views/personnel/attendance.vue
index 9a57c18..e9c60bd 100644
--- a/hb_client/src/views/personnel/attendance.vue
+++ b/hb_client/src/views/personnel/attendance.vue
@@ -2,156 +2,149 @@
   <div class="app-container">
     <el-card>
       <el-tabs type="border-card">
-  <el-tab-pane label="今日到岗">
-     <el-table
-      
-        :data="userList.results"
-        style="width: 100%; margin-top: 6px"
-        highlight-current-row
-        row-key="id"
-        height="100"
-        stripe
-        border
-        v-el-height-adaptive-table="{ bottomOffset: 41 }"
-      >
-        <el-table-column type="index" width="50" label="序号" />
-        <el-table-column align="center" label="工号">
-          <template slot-scope="scope">{{ scope.row.number }}</template>
-        </el-table-column>
-        <el-table-column align="center" label="姓名">
-          <template slot-scope="scope">{{ scope.row.name }}</template>
-        </el-table-column>
-        <el-table-column align="center" label="到岗情况">
-          <template slot-scope="scope">
-            <el-tag type="success" v-if="scope.row.is_atwork">在岗</el-tag>
+        <el-tab-pane label="今日到岗">
+          <el-table
+            :data="userList.results"
+            style="width: 100%; margin-top: 6px"
+            highlight-current-row
+            row-key="id"
+            height="100"
+            stripe
+            border
+            v-el-height-adaptive-table="{ bottomOffset: 41 }"
+          >
+            <el-table-column type="index" width="50" label="序号" />
+            <el-table-column align="center" label="工号">
+              <template slot-scope="scope">{{ scope.row.number }}</template>
+            </el-table-column>
+            <el-table-column align="center" label="姓名">
+              <template slot-scope="scope">{{ scope.row.name }}</template>
+            </el-table-column>
+            <el-table-column align="center" label="到岗情况">
+              <template slot-scope="scope">
+                <el-tag type="success" v-if="scope.row.is_atwork">在岗</el-tag>
 
-            <el-tag type="danger" v-else>离岗</el-tag>
-          </template>
-        </el-table-column>
+                <el-tag type="danger" v-else>离岗</el-tag>
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="离岗备注">
-          <template slot-scope="scope">{{ scope.row.not_work_remark }}</template>
-        </el-table-column>
+              <template slot-scope="scope">{{
+                scope.row.not_work_remark
+              }}</template>
+            </el-table-column>
 
-        <el-table-column align="header-center" label="部门">
-          <template v-if="scope.row.dept_" slot-scope="scope">{{
-            scope.row.dept_.name
-          }}</template>
-        </el-table-column>
-           <el-table-column
-          align="center"
-          label="操作"
-          fixed="right"
-         
-        >
-          <template slot-scope="scope">
-            <el-link
-              type="primary"
-              v-if="scope.row.is_atwork==false"
-              @click="handlestopwork(scope)"
-              >离岗说明
-            </el-link>
-          </template>
-        </el-table-column>
-      </el-table>
-   
-      <pagination
-        v-show="userList.count > 0"
-        :total="userList.count"
-        :page.sync="listQuery.page"
-        :limit.sync="listQuery.page_size"
-        @pagination="getList"
-      />
-      
-       <el-dialog
-      :visible.sync="dialogVisible"
-       :close-on-click-modal="false"
-       title="离岗备注" 
-    >
-      <el-form
-        ref="Form"
-        :model="stopwork"
-        label-width="100px"
-        label-position="right"
-       
-      >
-         
-         <el-form-item label="备注" prop="remark">
-          <el-input type="textarea" v-model="stopwork.not_work_remark" placeholder="备注" />
-        </el-form-item>
-        
-      </el-form>
-      <div style="text-align: right">
-        <el-button type="danger" @click="dialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="smtconfirm()">确认</el-button>
-      </div>
-    </el-dialog>
-      
-      </el-tab-pane>
-  <el-tab-pane label="到岗统计">
-    
- <el-row>
-   <el-col :span="12">
-     <div class="container">
+            <el-table-column align="header-center" label="部门">
+              <template v-if="scope.row.dept_" slot-scope="scope">{{
+                scope.row.dept_.name
+              }}</template>
+            </el-table-column>
+            <el-table-column align="center" label="操作" fixed="right">
+              <template slot-scope="scope">
+                <el-link
+                  type="primary"
+                  v-if="scope.row.is_atwork == false"
+                  @click="handlestopwork(scope)"
+                  >离岗说明
+                </el-link>
+              </template>
+            </el-table-column>
+          </el-table>
 
-  
-    <span class="demonstration">年、月</span>
-    <el-date-picker
-      v-model="value2"
-      type="month"
-      placeholder="选择年月">
-    </el-date-picker>
-     <el-button type="primary" @click="submit">查询</el-button>
-   </div>
-     <el-table
-      
-        :data="atworkList"
-        style="width: 100%; margin-top: 6px"
-        highlight-current-row
-        row-key="id"
-        height="680"
-        stripe
-        border
-        @current-change="handleCurrentChange"
-        v-el-height-adaptive-table="{ bottomOffset: 41 }"
-      >
-        <el-table-column type="index" width="50" label="序号" />
-        <el-table-column align="center" label="工号">
-          <template slot-scope="scope">{{ scope.row.number }}</template>
-        </el-table-column>
-        <el-table-column align="center" label="姓名">
-          <template slot-scope="scope">{{ scope.row.name }}</template>
-        </el-table-column>
-   
-        <el-table-column align="header-center" label="部门">
-          <template slot-scope="scope">{{  scope.row.dept_name }}</template>
-        </el-table-column>
-          <el-table-column align="center" label="出勤天数">
-          <template slot-scope="scope">{{ scope.row.count }}</template>
-        </el-table-column>
-         <el-table-column align="center" label="应到天数">
-          <template slot-scope="scope">{{ scope.row.count_workday }}</template>
-        </el-table-column>
-        
-   
-      </el-table>
-   </el-col>
-   <el-col :span="12">
-   <el-calendar v-model="value">
-			 
-			  <template
-			    slot="dateCell"
-			    slot-scope="{date, data}">
-			    <p> 
-			      {{ data.day.split('-').slice(1).join('-') }}<br /> {{dealMyDate(data.day)}}
-			    </p>
-			  </template>
-			</el-calendar>
-   </el-col>
- </el-row> 
-  </el-tab-pane>
- 
-</el-tabs>
-     
+          <pagination
+            v-show="userList.count > 0"
+            :total="userList.count"
+            :page.sync="listQuery.page"
+            :limit.sync="listQuery.page_size"
+            @pagination="getList"
+          />
+
+          <el-dialog
+            :visible.sync="dialogVisible"
+            :close-on-click-modal="false"
+            title="离岗备注"
+          >
+            <el-form
+              ref="Form"
+              :model="stopwork"
+              label-width="100px"
+              label-position="right"
+            >
+              <el-form-item label="备注" prop="remark">
+                <el-input
+                  type="textarea"
+                  v-model="stopwork.not_work_remark"
+                  placeholder="备注"
+                />
+              </el-form-item>
+            </el-form>
+            <div style="text-align: right">
+              <el-button type="danger" @click="dialogVisible = false"
+                >取消</el-button
+              >
+              <el-button type="primary" @click="smtconfirm()">确认</el-button>
+            </div>
+          </el-dialog>
+        </el-tab-pane>
+        <el-tab-pane label="到岗统计">
+          <el-row>
+            <el-col :span="12">
+              <div class="container">
+                <span class="demonstration">年、月</span>
+                <el-date-picker
+                  v-model="value2"
+                  type="month"
+                  placeholder="选择年月"
+                >
+                </el-date-picker>
+                <el-button type="primary" @click="submit">查询</el-button>
+              </div>
+              <el-table
+                :data="atworkList"
+                style="width: 100%; margin-top: 6px"
+                highlight-current-row
+                row-key="id"
+                height="680"
+                stripe
+                border
+                @current-change="handleCurrentChange"
+                v-el-height-adaptive-table="{ bottomOffset: 41 }"
+              >
+                <el-table-column type="index" width="50" label="序号" />
+                <el-table-column align="center" label="工号">
+                  <template slot-scope="scope">{{ scope.row.number }}</template>
+                </el-table-column>
+                <el-table-column align="center" label="姓名">
+                  <template slot-scope="scope">{{ scope.row.name }}</template>
+                </el-table-column>
+
+                <el-table-column align="header-center" label="部门">
+                  <template slot-scope="scope">{{
+                    scope.row.dept_name
+                  }}</template>
+                </el-table-column>
+                <el-table-column align="center" label="出勤天数">
+                  <template slot-scope="scope">{{ scope.row.count }}</template>
+                </el-table-column>
+                <el-table-column align="center" label="应到天数">
+                  <template slot-scope="scope">{{
+                    scope.row.count_workday
+                  }}</template>
+                </el-table-column>
+              </el-table>
+            </el-col>
+            <el-col :span="12">
+              <el-calendar v-model="value">
+                <template slot="dateCell" slot-scope="{ date, data }">
+                  <p>
+                    {{ data.day.split("-").slice(1).join("-") }}<br />
+                    {{ dealMyDate(data.day) }}
+                  </p>
+                </template>
+              </el-calendar>
+            </el-col>
+          </el-row>
+        </el-tab-pane>
+      </el-tabs>
     </el-card>
   </div>
 </template>
@@ -183,9 +176,9 @@
 <script>
 import { getEmployeeList } from "@/api/employee";
 import checkPermission from "@/utils/permission";
-import { notWork } from "@/api/hrm";
+import { notWork, getNotWorkList ,getClockrecordList} from "@/api/hrm";
 
-import {getatwork } from "@/api/srm";
+import { getatwork } from "@/api/srm";
 import { upUrl, upHeaders } from "@/api/file";
 import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 import Treeselect from "@riophae/vue-treeselect";
@@ -197,98 +190,114 @@ export default {
     return {
       userList: { count: 0 },
       atworkList: [],
-      stopwork:{not_work_remark:""},
-value3:null,
-value2:null,
+      stopwork: { not_work_remark: "" },
+      value3: null,
+      value2: null,
       listLoading: true,
-      dialogVisible:false,
-      stopworkID:null,
+      dialogVisible: false,
+      stopworkID: null,
+      notworkList: "",
       listQuery: {
         page: 1,
         page_size: 20,
       },
-       resDate: [
-                {"date":"2022-02-20","content":"放假"},
-                {"date":"2022-02-26","content":"去交电费"},
-                {"date":"2022-02-25","content":"去学习vue"}
-            ],
-      atworkDate:{year:null,month:null},
-      value:new Date(),
+      resDate: [
+        { date: "2022-02-20", content: "放假" },
+        { date: "2022-02-26", content: "去交电费" },
+        { date: "2022-02-25", content: "去学习vue" },
+      ],
+      atworkDate: { year: null, month: null },
+      value: new Date(),
     };
   },
   computed: {},
   watch: {},
   created() {
     this.getList();
-    
   },
   methods: {
     checkPermission,
-//今日到岗
+    //今日到岗
     getList() {
-    this.listQuery.fields='number,name,is_atwork,dept_,id,not_work_remark';
+      this.listQuery.fields = "number,name,is_atwork,dept_,id,not_work_remark";
       getEmployeeList(this.listQuery).then((response) => {
         if (response.data) {
           this.userList = response.data;
         }
-        
       });
     },
-    handlestopwork(scope)
-    {
-       this.dialogVisible=true;
-       this.stopworkID=scope.row.id;
+    handlestopwork(scope) {
+      this.dialogVisible = true;
+      this.stopworkID = scope.row.id;
     },
-    handleCurrentChange(){
-       this.resDate= [
-                {"date":"2022-01-20","content":"放假"},
-                {"date":"2022-01-26","content":"去交电费"},
-                {"date":"2022-01-25","content":"去学习vue"}
-            ];
+    handleCurrentChange(row) {
+        this.resDate=[],
+      getNotWorkList({page:0,user:row.user_id}).then((response) => {
+        if (response.data) {
+       response.data.forEach((item) => {
+        this.resDate.push({
+          data: item.not_work_date,
+          content: item.remark,
+        });
+      });
+         
+
+        }
+      });
+      getClockrecordList({page:0,create_by:row.user_id}).then((response) => {
+        if (response.data) {
+        
+          response.data.forEach((item) => {
+          
+              
+                var curTime=(item.update_time).substring(0,10)
+              console.log(curTime);
+        this.resDate.push({
+          data: curTime,
+          content: "在岗",
+        });
+      });
+        }
+      });
     },
     //离职备注提交
-    smtconfirm()
-    {
-      console.log(this.stopwork);
-       notWork(this.stopworkID, this.stopwork).then((res) => {
-            if (res.code >= 200) {
-              this.$message.success("离职备注提交成功！");
-                 this.dialogVisible=false;
-              this.getList();
-            }
-          })
-
+    smtconfirm() {
+     
+      notWork(this.stopworkID, this.stopwork).then((res) => {
+        if (res.code >= 200) {
+          this.$message.success("离职备注提交成功！");
+          this.dialogVisible = false;
+          this.getList();
+        }
+      });
     },
     //到岗统计
-    
-    submit()
-    {
-      
-       this.atworkDate.year=this.value2.getFullYear();
-         this.atworkDate.month=this.value2.getMonth()+1;
-        this.value=this.value2;
-        this.resDate=[],
+
+    submit() {
+      this.atworkDate.year = this.value2.getFullYear();
+      this.atworkDate.month = this.value2.getMonth() + 1;
+      this.value = this.value2;
+      (this.resDate = []),
         getatwork(this.atworkDate).then((response) => {
-        if (response.data) {
-          this.atworkList = response.data;
-        }
-        
-      });
-      
+          if (response.data) {
+            this.atworkList = response.data;
+          }
+        });
     },
+
     //考勤日历
     dealMyDate(v) {
-            console.log(v)
-            let len = this.resDate.length
-            let res = ""
-            for(let i=0; i<len; i++){
-                if(this.resDate[i].date == v) {
-                    res = this.resDate[i].content
-                    break
-                }
-            }
-            return res
+    
+      let len = this.resDate.length;
+      let res = "";
+      for (let i = 0; i < len; i++) {
+        if (this.resDate[i].data == v) {
+          res = this.resDate[i].content;
+          break;
         }
+      }
+      return res;
+    },
   },
 };
 </script>
diff --git a/hb_client/src/views/pm/resources.vue b/hb_client/src/views/pm/resources.vue
index f82a527..c29f641 100644
--- a/hb_client/src/views/pm/resources.vue
+++ b/hb_client/src/views/pm/resources.vue
@@ -192,33 +192,29 @@
                 </el-table-column>
                 <el-table-column label="设备状态">
                   <template slot-scope="scope">
-                    <div v-if="scope.row.equip_.type === 2">
-                      <el-tag
-                        v-if="scope.row.equip_.state === 40"
-                        type="danger"
-                      >
-                        禁用
-                      </el-tag>
-                      <el-tag v-else type="success"> 合格 </el-tag>
-                    </div>
-                    <div v-else>
-                      <el-tag v-if="scope.row.state === 10" type="success">
-                        {{ state_[scope.row.state] }}
-                      </el-tag>
-                      <el-tag v-else-if="scope.row.state === 20">
-                        {{ state_[scope.row.state] }}
-                      </el-tag>
-                      <el-tag v-else-if="scope.row.state === 30" type="warning">
-                        {{ state_[scope.row.state] }}
-                      </el-tag>
-                      <el-tag v-else type="danger">
-                        {{ state_[scope.row.state] }}
-                      </el-tag>
-                    </div>
-                  </template>
-                  <template slot-scope="scope">
-                    {{ state_[scope.row.state] }}</template
-                  >
+                  <div v-if="scope.row.type===2">
+                    <el-tag v-if="scope.row.state===40" type="danger">
+                      禁用
+                    </el-tag>
+                    <el-tag v-else type="success">
+                      合格
+                    </el-tag>
+                  </div>
+                  <div v-else>
+                    <el-tag v-if="scope.row.state===10" type="success">
+                      {{ state_[scope.row.state] }}
+                    </el-tag>
+                    <el-tag v-else-if="scope.row.state===20">
+                      {{ state_[scope.row.state] }}
+                    </el-tag>
+                    <el-tag v-else-if="scope.row.state===30" type="warning">
+                      {{ state_[scope.row.state] }}
+                    </el-tag>
+                    <el-tag v-else type="danger">
+                      {{ state_[scope.row.state] }}
+                    </el-tag>
+                  </div>
+                </template>
                 </el-table-column>
                 <el-table-column label="设备编号">
                   <template slot-scope="scope">