diff --git a/src/api/BasicData/PersonnelManagement.js b/src/api/BasicData/PersonnelManagement.js
index 5ace5ebc..4c438ac3 100644
--- a/src/api/BasicData/PersonnelManagement.js
+++ b/src/api/BasicData/PersonnelManagement.js
@@ -195,7 +195,7 @@ export function fetchPositionStatusData() {
     }
   })
 }
-export function addPeople(id, Sex, Education, Address, Nation, Post, AccountNumber, Password, Name, IDcard, TimeOfEntry, Birthday, ContactInformation) {
+export function addPeople(id, Sex, Education, Address, Nation, Post, AccountNumber, Password, Name, IDcard, TimeOfEntry, Birthday, ContactInformation, TeamValue) {
   return request({
     url: '',
     method: 'post',
@@ -204,11 +204,11 @@ export function addPeople(id, Sex, Education, Address, Nation, Post, AccountNumb
       ModularID: router.currentRoute.path,
       type: 2,
       name: '人事档案管理_人员名单_增加数据_MESWORK',
-      param: '考核部门编号=' + id + '=int&性别编号=' + Sex + '=int&学历编号=' + Education + '=int&家庭住址=' + Address + '&民族=' + Nation + '&岗位编号=' + Post + '=int&考勤编号=' + AccountNumber + '=string&密码=' + Password + '=string&姓名=' + Name + '=string&身份证号=' + IDcard + '=string&入公司时间=' + TimeOfEntry + '=string&出生日期=' + Birthday + '=string&联系电话=' + ContactInformation + '=string'
+      param: '考核部门编号=' + id + '=int&性别编号=' + Sex + '=int&学历编号=' + Education + '=int&家庭住址=' + Address + '&民族=' + Nation + '&岗位编号=' + Post + '=int&考勤编号=' + AccountNumber + '=string&密码=' + Password + '=string&姓名=' + Name + '=string&身份证号=' + IDcard + '=string&入公司时间=' + TimeOfEntry + '=string&出生日期=' + Birthday + '=string&联系电话=' + ContactInformation + '=string&班组=' + TeamValue
     }
   })
 }
-export function editPeople(id, Sex, Education, Address, Nation, Post, AccountNumber, Password, Name, IDcard, TimeOfEntry, Birthday, ContactInformation) {
+export function editPeople(id, Sex, Education, Address, Nation, Post, AccountNumber, Password, Name, IDcard, TimeOfEntry, Birthday, ContactInformation, TeamValue) {
   return request({
     url: '',
     method: 'post',
@@ -217,7 +217,7 @@ export function editPeople(id, Sex, Education, Address, Nation, Post, AccountNum
       ModularID: router.currentRoute.path,
       type: 2,
       name: '人事档案管理_人员名单_修改数据_MESWORK',
-      param: '人员编号=' + id + '=int&性别编号=' + Sex + '=int&学历编号=' + Education + '=int&家庭住址=' + Address + '&民族=' + Nation + '&岗位编号=' + Post + '=int&考勤编号=' + AccountNumber + '=string&密码=' + Password + '=string&姓名=' + Name + '=string&身份证号=' + IDcard + '=string&入公司时间=' + TimeOfEntry + '=string&出生日期=' + Birthday + '=string&联系电话=' + ContactInformation + '=string'
+      param: '人员编号=' + id + '=int&性别编号=' + Sex + '=int&学历编号=' + Education + '=int&家庭住址=' + Address + '&民族=' + Nation + '&岗位编号=' + Post + '=int&考勤编号=' + AccountNumber + '=string&密码=' + Password + '=string&姓名=' + Name + '=string&身份证号=' + IDcard + '=string&入公司时间=' + TimeOfEntry + '=string&出生日期=' + Birthday + '=string&联系电话=' + ContactInformation + '=string&班组=' + TeamValue
     }
   })
 }
@@ -416,3 +416,15 @@ export function searchLeavingList(pageCurrent, pageSize) {
     }
   })
 }
+export function fetchteamviwer() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: 1,
+      name: '班组管理_班组查询'
+    }
+  })
+}
diff --git a/src/views/BasicData/PersonnelManagement/index.vue b/src/views/BasicData/PersonnelManagement/index.vue
index d07e51e4..9c113ffc 100644
--- a/src/views/BasicData/PersonnelManagement/index.vue
+++ b/src/views/BasicData/PersonnelManagement/index.vue
@@ -160,6 +160,11 @@
                 {{ scope.row.联系电话 }}
               </template>
             </el-table-column>
+            <el-table-column align="center" label="班组" width="110">
+              <template slot-scope="scope">
+                {{ scope.row.班组名称 }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="岗位工种" width="100">
               <template slot-scope="scope">
                 {{ scope.row.岗位名称 }}
@@ -318,6 +323,19 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="班组" prop="Post">
+              <el-select v-model="people_form.TeamValue" clearable placeholder="请选择班组" style="width: 200px" size="small">
+                <el-option
+                  v-for="item in Team"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="btnLoading" @click="cancel">取消</el-button>
@@ -437,7 +455,7 @@
 </template>
 
 <script>
-import { moveGroups, getTree, tree, getTablePeople, getTablePeopleForName, addDepartmentName, delList, editList, delPeopleList, fetchEducationData, fetchPostData, addPeople, editPeople, quit, searchLeavingList } from '@/api/BasicData/PersonnelManagement'
+import { fetchteamviwer, moveGroups, getTree, tree, getTablePeople, getTablePeopleForName, addDepartmentName, delList, editList, delPeopleList, fetchEducationData, fetchPostData, addPeople, editPeople, quit, searchLeavingList } from '@/api/BasicData/PersonnelManagement'
 import { uploadPerson } from '@/utils/request'
 import { readFile } from '@/utils/request'
 import request from '@/utils/request'
@@ -445,6 +463,7 @@ import request from '@/utils/request'
 export default {
   data() {
     return {
+      Team: [],
       handleAdd_disable: false,
       addPeople_disable: false,
       limit: 999,
@@ -496,7 +515,9 @@ export default {
         PositionStatus: null,
         Education: null,
         Post: null,
-        PeopleID: null
+        PeopleID: null,
+        TeamValue: ''
+
       },
       rules: {
         Name: [{ required: true, message: '请输入', trigger: 'blur' }],
@@ -535,8 +556,20 @@ export default {
     this.getTreeData()
     this.fetchEducationData()
     this.fetchPostData()
+    this.fetchTeamViwer()
   },
   methods: {
+    // 获取班组信息
+    fetchTeamViwer() {
+      fetchteamviwer().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.Team.push({
+            label: response.data[i].班组名称,
+            value: response.data[i].班组流水号
+          })
+        }
+      })
+    },
     // 删除人员照片
     deletePhoto(row) {
       this.$confirm('此操作将永久删除该图片, 是否继续?', '提示', {
@@ -771,7 +804,7 @@ export default {
     submitAddPeople() {
       this.addPeople_disable = true
       this.btnLoading = true
-      addPeople(this.id, this.people_form.Sex, this.people_form.Education, this.people_form.Address, this.people_form.Nation, this.people_form.Post, this.people_form.AccountNumber, this.people_form.Password, this.people_form.Name, this.people_form.IDcard, this.people_form.TimeOfEntry, this.people_form.Birthday, this.people_form.ContactInformation).then(response => {
+      addPeople(this.id, this.people_form.Sex, this.people_form.Education, this.people_form.Address, this.people_form.Nation, this.people_form.Post, this.people_form.AccountNumber, this.people_form.Password, this.people_form.Name, this.people_form.IDcard, this.people_form.TimeOfEntry, this.people_form.Birthday, this.people_form.ContactInformation, this.people_form.TeamValue).then(response => {
         this.btnLoading = false
         if (response.data[0].result === '1') {
           this.people_DFV = false
@@ -800,11 +833,12 @@ export default {
       this.people_form.TimeOfEntry = row.入公司时间
       this.people_form.Birthday = row.出生日期
       this.people_form.ContactInformation = row.联系电话
+      this.people_form.TeamValue = parseInt(row.班组流水号)
     },
     submitEditPeople() {
       this.addPeople_disable = true
       this.btnLoading = true
-      editPeople(this.people_form.PeopleID, this.people_form.Sex, this.people_form.Education, this.people_form.Address, this.people_form.Nation, this.people_form.Post, this.people_form.AccountNumber, this.people_form.Password, this.people_form.Name, this.people_form.IDcard, this.people_form.TimeOfEntry, this.people_form.Birthday, this.people_form.ContactInformation).then(response => {
+      editPeople(this.people_form.PeopleID, this.people_form.Sex, this.people_form.Education, this.people_form.Address, this.people_form.Nation, this.people_form.Post, this.people_form.AccountNumber, this.people_form.Password, this.people_form.Name, this.people_form.IDcard, this.people_form.TimeOfEntry, this.people_form.Birthday, this.people_form.ContactInformation, this.people_form.TeamValue).then(response => {
         this.btnLoading = false
         if (response.data[0].result === '1') {
           if (this.id !== '' && this.Name === '') {
diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue
index 93c27dd9..ed557b17 100644
--- a/src/views/Inventory/CreatePickingList/index.vue
+++ b/src/views/Inventory/CreatePickingList/index.vue
@@ -1023,14 +1023,17 @@ export default {
         })
         if (materialGroup.length === 0) {
           this.$message.warning('请勾选零件')
+          this.selectInto_disable = false
           return
         }
         if (!this.pickingListNum || !this.pickingListNumberShow) {
           this.$message.warning('请选择领料单')
+          this.selectInto_disable = false
           return
         }
         if (!this.machineNumberValue) {
           this.$message.warning('请选择机床')
+          this.selectInto_disable = false
           return
         }
         IntoMateerial(materialGroup, groupPartGroup, numGroup, this.pickingListNum, this.machineNumberValue).then(response => {
@@ -1054,10 +1057,12 @@ export default {
         })
         if (basePartGroup.length === 0 && purchasePartGroup.length === 0) {
           this.$message.warning('请勾选零件')
+          this.selectInto_disable = false
           return
         }
         if (!this.pickingListNum || !this.pickingListNumberShow) {
           this.$message.warning('请选择领料单')
+          this.selectInto_disable = false
           return
         }
         if (basePartGroup.length) { // 基本件
@@ -1120,7 +1125,7 @@ export default {
         //
         // this.listDetailsSpecifications = row.规格 ? row.规格 : '--'
         // this.listMachinenum = row.机床图号
-        this.$confirm(`确定删除</br> <p style="color: red;display: inline-block"> 领料单:${this.listDetailsName} ${' '}图号或型号:${this.listDetailsPicnum}</p><p style="color: red;display: inline-block">规格:${this.listDetailsSpecifications}${'  '}机床图号:${this.listMachinenum} </p> 的明细吗？`, '提示', {
+        this.$confirm(`确定删除</br> <p style="color: red;display: inline-block"> ${this.listDetailsName}${'  '}${this.listDetailsPicnum}${'  '}${this.listDetailsSpecifications} </p> 的明细吗？`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning',
diff --git a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
index f80f02ef..96841ed7 100644
--- a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
+++ b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
@@ -32,6 +32,11 @@
             {{ scope.row.完成日期 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="班组" width="80px">
+          <template slot-scope="scope">
+            {{ scope.row.班组名称 }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="姓名" width="80px" sortable="custom" prop="姓名">
           <template slot-scope="scope">
             {{ scope.row.操作工 }}
diff --git a/src/views/ManufacturingCenter/MonthEndHourAccountingMetalworking/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccountingMetalworking/index.vue
index 064aad78..74eac29a 100644
--- a/src/views/ManufacturingCenter/MonthEndHourAccountingMetalworking/index.vue
+++ b/src/views/ManufacturingCenter/MonthEndHourAccountingMetalworking/index.vue
@@ -37,6 +37,11 @@
             {{ scope.row.操作工 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="班组" width="80px">
+          <template slot-scope="scope">
+            {{ scope.row.班组名称 }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="图号" width="150px">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index ebe7b40d..bef655e0 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -33,54 +33,54 @@
     </el-card>
     <el-tabs type="border-card" @tab-click="selectPart">
       <el-tab-pane label="基本件">
-        <el-table :data="tableData1" :row-class-name="tableRowClassName1" stripe border size="mini" style="width: 1160px" height="300px" @selection-change="handleSelectionChange">
+        <el-table :data="tableData1" :row-class-name="tableRowClassName1" stripe border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
           <el-table-column align="center" width="50" type="selection"/>
-          <el-table-column label="零件名称" align="center" width="140px" show-overflow-tooltip>
+          <el-table-column label="零件名称" align="center" min-width="140px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.零件名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="零件图号" align="center" width="120px" show-overflow-tooltip>
+          <el-table-column label="零件图号" align="center" min-width="120px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.零件图号 }}
             </template>
           </el-table-column>
-          <el-table-column label="前零件图号" align="center" width="120px" show-overflow-tooltip>
+          <el-table-column label="前零件图号" align="center" min-width="120px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.前零件图号 }}
             </template>
           </el-table-column>
-          <el-table-column label="材料" align="center" width="120px">
+          <el-table-column label="材料" align="center" min-width="120px">
             <template slot-scope="scope">
               {{ scope.row.材料 }}
             </template>
           </el-table-column>
-          <el-table-column label="零件数量" align="center" width="90px">
+          <el-table-column label="零件数量" align="center" min-width="90px">
             <template slot-scope="scope">
               {{ scope.row.零件数量 }}
             </template>
           </el-table-column>
-          <el-table-column label="机床数量" align="center" width="90px">
+          <el-table-column label="机床数量" align="center" min-width="90px">
             <template slot-scope="scope">
               {{ scope.row.机床数量 }}
             </template>
           </el-table-column>
-          <el-table-column label="零件总数量" align="center" width="110px">
+          <el-table-column label="零件总数量" align="center" min-width="110px">
             <template slot-scope="scope">
               {{ scope.row.总数量 }}
             </template>
           </el-table-column>
-          <el-table-column label="投产总数量" align="center" width="120px">
+          <el-table-column label="投产总数量" align="center" min-width="120px">
             <template slot-scope="scope">
               <el-input-number v-model="scope.row.投产总数量" :min="0" size="mini" style="width: 95px"/>
             </template>
           </el-table-column>
-          <el-table-column label="备注" align="center" width="90px">
+          <el-table-column label="备注" align="center" min-width="90px">
             <template slot-scope="scope">
               {{ scope.row.零件备注 }}
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="100px">
+          <el-table-column label="操作" align="center" min-width="100px">
             <template slot-scope="scope">
               <el-button v-if="checked" type="text" size="mini" icon="el-icon-right" plain @click="inParts(scope.row)">解除禁用</el-button>
               <el-button v-else type="text" size="mini" icon="el-icon-right" plain @click="OutParts(scope.row)">禁用</el-button>
@@ -91,47 +91,47 @@
       <el-tab-pane label="外购件">
         <el-table :data="tableData2" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
           <el-table-column align="center" width="50" type="selection"/>
-          <el-table-column label="物料代码" align="center" width="120">
+          <el-table-column label="物料代码" align="center" min-width="180">
             <template slot-scope="scope">
               {{ scope.row.物料代码 }}
             </template>
           </el-table-column>
-          <el-table-column label="物料名称" align="center" width="120">
+          <el-table-column label="物料名称" align="center" min-width="120">
             <template slot-scope="scope">
               {{ scope.row.物料名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="物料规格" align="center" width="120">
+          <el-table-column label="物料规格" align="center" min-width="120">
             <template slot-scope="scope">
               {{ scope.row.物料规格 }}
             </template>
           </el-table-column>
-          <el-table-column label="物料型号" align="center" width="120">
+          <el-table-column label="物料型号" align="center" min-width="120">
             <template slot-scope="scope">
               {{ scope.row.物料型号 }}
             </template>
           </el-table-column>
-          <el-table-column label="零件数量" align="center" width="90">
+          <el-table-column label="零件数量" align="center" min-width="90">
             <template slot-scope="scope">
               {{ scope.row.零件数量 }}
             </template>
           </el-table-column>
-          <el-table-column label="机床数量" align="center" width="90">
+          <el-table-column label="机床数量" align="center" min-width="90">
             <template slot-scope="scope">
               {{ scope.row.机床数量 }}
             </template>
           </el-table-column>
-          <el-table-column label="零件总数量" align="center" width="110px">
+          <el-table-column label="零件总数量" align="center" min-width="110px">
             <template slot-scope="scope">
               {{ scope.row.总数量 }}
             </template>
           </el-table-column>
-          <el-table-column label="采购总数量" align="center" width="135px">
+          <el-table-column label="采购总数量" align="center" min-width="135px">
             <template slot-scope="scope">
               <el-input-number v-model="scope.row.采购总数量" :min="0" size="mini" style="width: 100%"/>
             </template>
           </el-table-column>
-          <el-table-column label="备注" align="center" width="120">
+          <el-table-column label="备注" align="center" min-width="120">
             <template slot-scope="scope">
               {{ scope.row.备注 }}
             </template>
@@ -141,47 +141,47 @@
       <el-tab-pane label="标准件">
         <el-table :data="tableData3" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
           <el-table-column align="center" width="50" type="selection"/>
-          <el-table-column label="物料代码" align="center" width="120">
+          <el-table-column label="物料代码" align="center" min-width="180">
             <template slot-scope="scope">
               {{ scope.row.物料代码 }}
             </template>
           </el-table-column>
-          <el-table-column label="物料名称" align="center" width="120">
+          <el-table-column label="物料名称" align="center" min-width="120">
             <template slot-scope="scope">
               {{ scope.row.物料名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="物料规格" align="center" width="120">
+          <el-table-column label="物料规格" align="center" min-width="120">
             <template slot-scope="scope">
               {{ scope.row.物料规格 }}
             </template>
           </el-table-column>
-          <el-table-column label="物料型号" align="center" width="120">
+          <el-table-column label="物料型号" align="center" min-width="120">
             <template slot-scope="scope">
               {{ scope.row.物料型号 }}
             </template>
           </el-table-column>
-          <el-table-column label="零件数量" align="center" width="90">
+          <el-table-column label="零件数量" align="center" min-width="90">
             <template slot-scope="scope">
               {{ scope.row.零件数量 }}
             </template>
           </el-table-column>
-          <el-table-column label="机床数量" align="center" width="90">
+          <el-table-column label="机床数量" align="center" min-width="90">
             <template slot-scope="scope">
               {{ scope.row.机床数量 }}
             </template>
           </el-table-column>
-          <el-table-column label="零件总数量" align="center" width="110px">
+          <el-table-column label="零件总数量" align="center" min-width="110px">
             <template slot-scope="scope">
               {{ scope.row.总数量 }}
             </template>
           </el-table-column>
-          <el-table-column label="采购总数量" align="center" width="115px">
+          <el-table-column label="采购总数量" align="center" min-width="115px">
             <template slot-scope="scope">
               <el-input-number v-model="scope.row.采购总数量" :min="0" size="mini" style="width: 90px"/>
             </template>
           </el-table-column>
-          <el-table-column label="备注" align="center" width="120">
+          <el-table-column label="备注" align="center" min-width="120">
             <template slot-scope="scope">
               {{ scope.row.备注 }}
             </template>
diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
index cbd6eea6..7731f1bf 100644
--- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -103,7 +103,7 @@
           </el-table-column>
           <el-table-column align="center" label="采购数" width="70px">
             <template slot-scope="scope">
-              {{ scope.row.采购数量 }}
+              {{ scope.row.数量 }}
             </template>
           </el-table-column>
           <el-table-column align="center" label="到货数" width="70px">
@@ -217,7 +217,7 @@
           </el-table-column>
           <el-table-column align="center" label="采购数" width="70px">
             <template slot-scope="scope">
-              {{ scope.row.采购数量 }}
+              {{ scope.row.数量 }}
             </template>
           </el-table-column>
           <el-table-column align="center" label="到货数" width="70px">
@@ -337,7 +337,7 @@
           </el-table-column>
           <el-table-column align="center" label="采购数" width="70px">
             <template slot-scope="scope">
-              {{ scope.row.采购数量 }}
+              {{ scope.row.数量 }}
               <!--{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || '—' }}-->
             </template>
           </el-table-column>