diff --git a/src/api/base/teamMembers.js b/src/api/base/teamMembers.js
index 15162e3..b9d88df 100644
--- a/src/api/base/teamMembers.js
+++ b/src/api/base/teamMembers.js
@@ -9,6 +9,24 @@ export function listTeamMembers(query) {
   })
 }
 
+// 查询班组用户信息列表
+export function teamUserList(query) {
+  return request({
+    url: '/base/teamMembers/teamUserList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询班组下拉框列表
+export function getTeamMemberList(query) {
+  return request({
+    url: '/base/teamMembers/getTeamMemberList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询班组信息详细
 export function getTeamMembers(objId) {
   return request({
diff --git a/src/api/production/baseBomInfo.js b/src/api/production/baseBomInfo.js
index 6369d1f..b192410 100644
--- a/src/api/production/baseBomInfo.js
+++ b/src/api/production/baseBomInfo.js
@@ -9,6 +9,15 @@ export function listBaseBomInfo(query) {
   })
 }
 
+// 自动同步生产BOM
+export function addAutomaticSynchronizationBOM(query) {
+  return request({
+    url: '/production/baseBomInfo/addAutomaticSynchronizationBOM',
+    method: 'get',
+    params: query,
+    timeout: 60000
+  })
+}
 // 查询生产BOM列表
 export function listTreeBaseBomInfo(query) {
   return request({
diff --git a/src/views/base/materialInfo/index.vue b/src/views/base/materialInfo/index.vue
index cba5b77..ca5bb2e 100644
--- a/src/views/base/materialInfo/index.vue
+++ b/src/views/base/materialInfo/index.vue
@@ -29,8 +29,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="物料类型" prop="materialType">
-        <el-select v-model="queryParams.materialType" placeholder="请选择物料类型" clearable>
+      <el-form-item label="SAP物料类型" prop="materialType">
+        <el-select v-model="queryParams.materialType" placeholder="请选择SAP物料类型" clearable>
           <el-option
             v-for="dict in dict.type.material_type"
             :key="dict.value"
@@ -71,7 +71,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['base:materialInfo:add']"
-        >新增</el-button>
+        >手动新增物料</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -123,7 +123,7 @@
           <dict-tag :options="dict.type.material_subclass" :value="scope.row.materialSubclass"/>
         </template>
       </el-table-column>
-      <el-table-column label="物料类型" align="center" prop="materialType" v-if="columns[5].visible">
+      <el-table-column label="SAP物料类型" align="center" prop="materialType" v-if="columns[5].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.material_type" :value="scope.row.materialType"/>
         </template>
@@ -164,13 +164,13 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['base:materialInfo:edit']"
           >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['base:materialInfo:remove']"
-          >删除</el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['base:materialInfo:remove']"-->
+<!--          >删除</el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -212,8 +212,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="物料类型" prop="materialType">
-          <el-select v-model="form.materialType" placeholder="请选择物料类型">
+        <el-form-item label="SAP物料类型" prop="materialType">
+          <el-select v-model="form.materialType" placeholder="请选择SAP物料类型">
             <el-option
               v-for="dict in dict.type.material_type"
               :key="dict.value"
@@ -337,10 +337,10 @@ export default {
         { key: 2, label: `物料名称`, visible: true },
         { key: 3, label: `物料大类`, visible: true },
         { key: 4, label: `物料小类`, visible: true },
-        { key: 5, label: `物料类型`, visible: true },
+        { key: 5, label: `SAP物料类型`, visible: true },
         { key: 6, label: `计量单位`, visible: true },
         { key: 7, label: `MATKL`, visible: true },
-        { key: 8, label: `物料规格`, visible: true },
+        { key: 8, label: `物料规格`, visible: false },
         { key: 9, label: `所属工厂`, visible: true },
         { key: 10, label: `产线工位`, visible: false },
         { key: 11, label: `启用标识`, visible: false },
diff --git a/src/views/base/orderBomInfo/addBom.vue b/src/views/base/orderBomInfo/addBom.vue
index ccb179d..003edab 100644
--- a/src/views/base/orderBomInfo/addBom.vue
+++ b/src/views/base/orderBomInfo/addBom.vue
@@ -99,6 +99,7 @@ import {
   addOrderBomInfo,
   updateOrderBomInfo
 } from '@/api/base/orderBomInfo'
+import { listMaterialInfo } from '@//api/base/materialInfo'
 
 export default {
   name: 'OrderBomInfo',
@@ -176,7 +177,7 @@ export default {
     /** 查询订单BOM列表 */
     getList() {
       this.loading = true
-      listOrderBomInfo(this.queryParams).then(response => {
+      listMaterialInfo(this.queryParams).then(response => {
         this.orderBomInfoList = response.rows
         this.total = response.total
         this.loading = false
diff --git a/src/views/base/orderBomInfo/index.vue b/src/views/base/orderBomInfo/index.vue
index 9fa4a81..befa40f 100644
--- a/src/views/base/orderBomInfo/index.vue
+++ b/src/views/base/orderBomInfo/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
       <!--      <el-form-item label="BOM编号" prop="bomCode">-->
       <!--        <el-input-->
       <!--          v-model="queryParams.bomCode"-->
@@ -9,31 +9,39 @@
       <!--          @keyup.enter.native="handleQuery"-->
       <!--        />-->
       <!--      </el-form-item>-->
-      <el-form-item label="物料编码" prop="materialCode">
+      <el-form-item label="子物料编号" prop="materialCode">
         <el-input
           v-model="queryParams.materialCode"
-          placeholder="请输入物料编码"
+          placeholder="请输入子物料编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="物料名称" prop="materialName">
+      <el-form-item label="子物料名称" prop="materialName">
         <el-input
           v-model="queryParams.materialName"
-          placeholder="请输入物料名称"
+          placeholder="请输入子物料名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="物料类别" prop="materialType">
-        <el-select v-model="queryParams.materialType" placeholder="请选择物料类别" clearable>
+      <el-form-item label="子物料小类" prop="materialType">
+        <el-select v-model="queryParams.materialType" placeholder="请选择子物料小类" clearable>
           <el-option
-            v-for="dict in dict.type.material_type"
+            v-for="dict in dict.type.material_subclass"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
           />
         </el-select>
+        <el-form-item label="父物料编号" prop="parentId">
+          <el-input
+            v-model="queryParams.parentId"
+            placeholder="请输入父物料编号"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -50,7 +58,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['base:orderBomInfo:add']"
-        >新增
+        >手动新增BOM
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -95,21 +103,27 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
       <el-table-column label="BOM编号" align="center" prop="bomCode" v-if="columns[1].visible"/>
-      <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[2].visible">
+      <el-table-column label="子物料编号" align="center" prop="materialCode" v-if="columns[2].visible">
         <template slot-scope="scope">
           <router-link :to="'/base/bom-info/index/' + scope.row.materialCode" class="link-type">
             <span>{{ scope.row.materialCode }}</span>
           </router-link>
         </template>
       </el-table-column>
-      <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[3].visible"/>
-      <el-table-column label="物料类别" align="center" prop="materialType" v-if="columns[4].visible">
+      <el-table-column label="子物料名称" align="center" prop="materialName" v-if="columns[3].visible"/>
+      <el-table-column label="子物料小类" align="center" prop="materialType" v-if="columns[4].visible">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.material_type" :value="scope.row.materialType"/>
+          <dict-tag :options="dict.type.material_subclass" :value="scope.row.materialType"/>
         </template>
       </el-table-column>
       <el-table-column label="标准数量" align="center" prop="standardAmount" v-if="columns[5].visible"/>
-      <el-table-column label="父级编号" align="center" prop="parentId" v-if="columns[6].visible"/>
+      <el-table-column label="父级物料编号" align="center" prop="parentId" v-if="columns[6].visible"/>
+      <el-table-column label="父级物料名称" align="center" prop="parentName" v-if="columns[16].visible"/>
+      <el-table-column label="父级物料小类" align="center" prop="parentMaterialType" v-if="columns[17].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.material_subclass" :value="scope.row.parentMaterialType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[7].visible"/>
       <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[8].visible"/>
       <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[9].visible">
@@ -137,14 +151,14 @@
             v-hasPermi="['base:orderBomInfo:edit']"
           >修改
           </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['base:orderBomInfo:remove']"
-          >删除
-          </el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['base:orderBomInfo:remove']"-->
+<!--          >删除-->
+<!--          </el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -159,31 +173,31 @@
 
     <!-- 添加或修改订单BOM对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="BOM编号" prop="bomCode">
-          <el-input v-model="form.bomCode" placeholder="请输入BOM编号"/>
-        </el-form-item>
-        <el-form-item label="物料编码" prop="materialCode">
-          <el-input v-model="form.materialCode" placeholder="请输入物料编码"/>
-        </el-form-item>
-        <el-form-item label="物料名称" prop="materialName">
-          <el-input v-model="form.materialName" placeholder="请输入物料名称"/>
-        </el-form-item>
-        <el-form-item label="物料类别" prop="materialType">
-          <el-select v-model="form.materialType" placeholder="请选择物料类别">
-            <el-option
-              v-for="dict in dict.type.material_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+<!--        <el-form-item label="BOM编号" prop="bomCode">-->
+<!--          <el-input v-model="form.bomCode" placeholder="请输入BOM编号"/>-->
+<!--        </el-form-item>-->
+        <el-form-item label="子物料编号" prop="materialCode">
+          <el-input v-model="form.materialCode" placeholder="请输入子物料编号"/>
         </el-form-item>
+<!--        <el-form-item label="子物料名称" prop="materialName">-->
+<!--          <el-input v-model="form.materialName" placeholder="请输入子物料名称"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="子物料小类" prop="materialType">-->
+<!--          <el-select v-model="form.materialType" placeholder="请选择子物料小类">-->
+<!--            <el-option-->
+<!--              v-for="dict in dict.type.material_type"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="dict.value"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="标准数量" prop="standardAmount">
           <el-input v-model="form.standardAmount" placeholder="请输入标准数量"/>
         </el-form-item>
-        <el-form-item label="父级编号" prop="parentId">
-          <el-input v-model="form.parentId" placeholder="请输入父级编号"/>
+        <el-form-item label="父级物料编号" prop="parentId">
+          <el-input v-model="form.parentId" placeholder="请输入父级物料编号"/>
         </el-form-item>
 <!--        <el-form-item label="是否标识" prop="isFlag">-->
 <!--          <el-input v-model="form.isFlag" placeholder="请输入是否标识"/>-->
@@ -220,7 +234,7 @@ import {
 
 export default {
   name: 'OrderBomInfo',
-  dicts: ['material_type'],
+  dicts: ['material_type','material_subclass'],
   data() {
     return {
       // 遮罩层
@@ -248,7 +262,7 @@ export default {
         bomCode: null,
         materialCode: null,
         materialName: null,
-        materialType: 'FERT',
+        materialType: null,
         standardAmount: null,
         parentId: null,
         isFlag: null,
@@ -267,12 +281,12 @@ export default {
       rules: {},
       columns: [
         { key: 0, label: `主键标识`, visible: false },
-        { key: 1, label: `BOM编号`, visible: true },
-        { key: 2, label: `物料编码`, visible: true },
-        { key: 3, label: `物料名称`, visible: true },
-        { key: 4, label: `物料类别`, visible: true },
+        { key: 1, label: `BOM编号`, visible: false },
+        { key: 2, label: `子物料编号`, visible: true },
+        { key: 3, label: `子物料名称`, visible: true },
+        { key: 4, label: `子物料小类`, visible: true },
         { key: 5, label: `标准数量`, visible: true },
-        { key: 6, label: `父级编号`, visible: true },
+        { key: 6, label: `父级物料编号`, visible: true },
         { key: 7, label: `是否标识`, visible: false },
         { key: 8, label: `创建人`, visible: false },
         { key: 9, label: `创建时间`, visible: false },
@@ -281,7 +295,9 @@ export default {
         { key: 12, label: `工厂编号`, visible: true },
         { key: 13, label: `排序`, visible: true },
         { key: 14, label: `销售凭证`, visible: false },
-        { key: 15, label: `销售单据项目`, visible: false }
+        { key: 15, label: `销售单据项目`, visible: false },
+        { key: 16, label: `父级物料名称`, visible: true },
+        { key: 17, label: `父级物料小类`, visible: true }
       ]
     }
   },
diff --git a/src/views/base/orderInfo/index.vue b/src/views/base/orderInfo/index.vue
index a6e6c11..6b34a79 100644
--- a/src/views/base/orderInfo/index.vue
+++ b/src/views/base/orderInfo/index.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="工单编号" prop="orderCode">
+      <el-form-item label="SAP计划编号" prop="orderCode">
         <el-input
           v-model="queryParams.orderCode"
-          placeholder="请输入工单编号"
+          placeholder="请输入SAP计划编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -84,7 +84,7 @@
     <el-table v-loading="loading" :data="orderInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
-      <el-table-column label="工单编号" align="center" prop="orderCode" v-if="columns[1].visible"/>
+      <el-table-column label="SAP计划编号" align="center" prop="orderCode" v-if="columns[1].visible"/>
       <el-table-column label="销售订单编号" align="center" prop="saleOrderCode" v-if="columns[2].visible"/>
       <el-table-column label="销售订单行号" align="center" prop="saleOrderLineNumber" v-if="columns[3].visible"/>
       <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[4].visible"/>
@@ -102,17 +102,17 @@
           <dict-tag :options="dict.type.order_status" :value="scope.row.orderStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="是否已下达计划" align="center" prop="isRelease" v-if="columns[20].visible">
+      <el-table-column label="是否已下达生产计划" align="center" prop="isRelease" v-if="columns[20].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.is_release" :value="scope.row.isRelease"/>
         </template>
       </el-table-column>
-      <el-table-column label="开始日期" align="center" prop="beginDate" width="180" v-if="columns[11].visible">
+      <el-table-column label="计划开始日期" align="center" prop="beginDate" width="180" v-if="columns[11].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.beginDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束日期" align="center" prop="endDate" width="180" v-if="columns[12].visible">
+      <el-table-column label="计划结束日期" align="center" prop="endDate" width="180" v-if="columns[12].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -177,8 +177,8 @@
     <!-- 添加或修改工单信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="工单编号" prop="orderCode">
-          <el-input v-model="form.orderCode" placeholder="请输入工单编号" />
+        <el-form-item label="SAP计划编号" prop="orderCode">
+          <el-input v-model="form.orderCode" placeholder="请输入SAP计划编号" />
         </el-form-item>
         <el-form-item label="销售订单编号" prop="saleOrderCode">
           <el-input v-model="form.saleOrderCode" placeholder="请输入销售订单编号" />
@@ -221,20 +221,20 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="开始日期" prop="beginDate">
+        <el-form-item label="计划开始日期" prop="beginDate">
           <el-date-picker clearable
             v-model="form.beginDate"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="请选择开始日期">
+            placeholder="请选择计划开始日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="结束日期" prop="endDate">
+        <el-form-item label="计划结束日期" prop="endDate">
           <el-date-picker clearable
             v-model="form.endDate"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="请选择结束日期">
+            placeholder="请选择计划结束日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="工厂编码" prop="factoryCode">
@@ -331,7 +331,7 @@ export default {
       },
       columns: [
             { key: 0, label: `主键标识`, visible: false },
-            { key: 1, label: `工单编号`, visible: true },
+            { key: 1, label: `SAP计划编号`, visible: true },
             { key: 2, label: `销售订单编号`, visible: true },
             { key: 3, label: `销售订单行号`, visible: true },
             { key: 4, label: `物料编码`, visible: true },
@@ -341,8 +341,8 @@ export default {
             { key: 8, label: `完成数量`, visible: true },
             { key: 9, label: `工单类型`, visible: true },
             { key: 10, label: `工单状态`, visible: true },
-            { key: 11, label: `开始日期`, visible: true },
-            { key: 12, label: `结束日期`, visible: true },
+            { key: 11, label: `计划开始日期`, visible: true },
+            { key: 12, label: `计划结束日期`, visible: true },
             { key: 13, label: `工厂编码`, visible: true },
             { key: 14, label: `启用标识`, visible: false },
             { key: 15, label: `创建人`, visible: false },
@@ -350,7 +350,7 @@ export default {
             { key: 17, label: `更新人`, visible: false },
             { key: 18, label: `更新时间`, visible: false },
             { key: 19, label: `完成日期`, visible: true },
-            { key: 20, label: `是否已下达计划`, visible: true },
+            { key: 20, label: `是否已下达生产计划`, visible: true },
         ]
     };
   },
@@ -437,7 +437,7 @@ export default {
         this.$modal.msgWarning("该工单已下达计划！");
         return;
       }
-      this.$modal.confirm('是否下达工单编号为："' + row.orderCode + '"的工单计划？').then(function() {
+      this.$modal.confirm('是否下达SAP计划编号为："' + row.orderCode + '"的计划？').then(function() {
         return releaseOrderPlan(row);
       }).then(() => {
         this.getList();
diff --git a/src/views/base/productLine/index.vue b/src/views/base/productLine/index.vue
index 1b78ec1..ddeb43a 100644
--- a/src/views/base/productLine/index.vue
+++ b/src/views/base/productLine/index.vue
@@ -72,6 +72,8 @@
 <!--        </template>-->
 <!--      </el-table-column>-->
       <el-table-column label="所属工厂" align="center" prop="plantName" v-if="columns[4].visible"/>
+      <el-table-column label="工作中心编号" align="center" prop="workCenterCode" v-if="columns[4].visible"/>
+      <el-table-column label="工作中心描述" align="center" prop="workCenterName" v-if="columns[4].visible"/>
       <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[5].visible" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
@@ -131,7 +133,7 @@
 
     <!-- 添加或修改产线信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="产线编号" prop="productLineCode">
           <el-input v-model="form.productLineCode" placeholder="请输入产线编号" />
         </el-form-item>
@@ -158,6 +160,12 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="工作中心编号" prop="workCenterCode">
+          <el-input v-model="form.workCenterCode" placeholder="请输入工作中心编号" />
+        </el-form-item>
+        <el-form-item label="工作中心描述" prop="workCenterName">
+          <el-input v-model="form.workCenterName" placeholder="请输入工作中心描述" />
+        </el-form-item>
         <el-form-item label="启用标识" prop="isFlag">
           <el-radio-group v-model="form.isFlag">
             <el-radio
@@ -215,7 +223,9 @@ export default {
         createdBy: null,
         createdTime: null,
         updatedBy: null,
-        updatedTime: null
+        updatedTime: null,
+        workCenterCode: null,
+        workCenterName: null
       },
       // 表单参数
       form: {},
@@ -271,7 +281,9 @@ export default {
         createdBy: null,
         createdTime: null,
         updatedBy: null,
-        updatedTime: null
+        updatedTime: null,
+        workCenterName: null,
+        workCenterCode: null
       };
       this.resetForm("form");
     },
diff --git a/src/views/base/qualityInspectionItem/defectIndex.vue b/src/views/base/qualityInspectionItem/defectIndex.vue
index 93cf963..e739c1f 100644
--- a/src/views/base/qualityInspectionItem/defectIndex.vue
+++ b/src/views/base/qualityInspectionItem/defectIndex.vue
@@ -98,6 +98,24 @@
           v-hasPermi="['base:qualityInspectionItem:export']"
         >导出</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleCategories"
+        >缺陷大类维护</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleSubCategories"
+        >缺陷小类维护</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
@@ -329,6 +347,14 @@ export default {
       };
       this.resetForm("form");
     },
+    handleCategories() {
+      const obj = { path: "/system/dict-data/index/144" };
+      this.$tab.closeOpenPage(obj);
+    },
+    handleSubCategories() {
+      const obj = { path: "/system/dict-data/index/145" };
+      this.$tab.closeOpenPage(obj);
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
diff --git a/src/views/base/teamMembers/index.vue b/src/views/base/teamMembers/index.vue
index daf667f..0acd615 100644
--- a/src/views/base/teamMembers/index.vue
+++ b/src/views/base/teamMembers/index.vue
@@ -1,14 +1,24 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-<!--      <el-form-item label="班组编号" prop="teamCode">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.teamCode"-->
-<!--          placeholder="请输入班组编号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item label="班组编号" prop="teamCode">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.teamCode"-->
+      <!--          placeholder="请输入班组编号"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <el-form-item label="班次" prop="classes">
+        <el-select v-model="queryParams.classes" placeholder="请选择班次">
+          <el-option
+            v-for="dict in dict.type.classes"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="班组名称" prop="teamName">
         <el-input
           v-model="queryParams.teamName"
@@ -17,15 +27,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="所属产线" prop="productLineCode">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.productLineCode"-->
-<!--          placeholder="请输入所属产线"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-
+      <!--      <el-form-item label="所属产线" prop="productLineCode">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.productLineCode"-->
+      <!--          placeholder="请输入所属产线"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -41,50 +50,71 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['base:teamMembers:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['base:teamMembers:edit']"-->
+<!--        >修改-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['base:teamMembers:remove']"-->
+<!--        >删除-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['base:teamMembers:export']"-->
+<!--        >导出-->
+<!--        </el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="success"
           plain
-          icon="el-icon-edit"
+          icon="el-icon-search"
           size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['base:teamMembers:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['base:teamMembers:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['base:teamMembers:export']"
-        >导出</el-button>
+          @click="handleTeamUser"
+        >查看班组用户</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="teamMembersList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
       <el-table-column label="班组编号" align="center" prop="teamCode" v-if="columns[1].visible"/>
       <el-table-column label="班组名称" align="center" prop="teamName" v-if="columns[2].visible"/>
+      <el-table-column label="班次" align="center" prop="classes" v-if="columns[13].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.classes" :value="scope.row.classes"/>
+        </template>
+      </el-table-column>
       <el-table-column label="班组负责人" align="center" prop="teamHead" v-if="columns[3].visible"/>
       <el-table-column label="所属产线/工位" align="center" prop="productLineName" v-if="columns[4].visible"/>
+      <el-table-column label="开始时间" align="center" prop="startTime" v-if="columns[10].visible"/>
+      <el-table-column label="结束时间" align="center" prop="endTime" v-if="columns[11].visible"/>
+      <el-table-column label="休息时间" align="center" prop="dineTime" v-if="columns[12].visible"/>
       <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[5].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
@@ -110,14 +140,16 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['base:teamMembers:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['base:teamMembers:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -134,13 +166,13 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="班组编号" prop="teamCode">
-          <el-input v-model="form.teamCode" placeholder="请输入班组编号" />
+          <el-input v-model="form.teamCode" placeholder="请输入班组编号"/>
         </el-form-item>
         <el-form-item label="班组名称" prop="teamName">
-          <el-input v-model="form.teamName" placeholder="请输入班组名称" />
+          <el-input v-model="form.teamName" placeholder="请输入班组名称"/>
         </el-form-item>
         <el-form-item label="班组负责人" prop="teamHead">
-          <el-input v-model="form.teamHead" placeholder="请输入班组负责人" />
+          <el-input v-model="form.teamHead" placeholder="请输入班组负责人"/>
         </el-form-item>
         <el-form-item label="所属产线/工位">
           <el-select v-model="form.productLineCode" placeholder="请选择所属产线/工位">
@@ -152,13 +184,40 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="班次" prop="classes">
+          <el-radio-group v-model="form.classes">
+            <el-radio
+              v-for="dict in dict.type.classes"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-time-select
+            v-model="form.startTime"
+            :picker-options="{ start: '00:00', step: '00:10', end: '23:50'}"
+            placeholder="请选择开始时间"
+          >
+          </el-time-select>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <el-time-select
+            v-model="form.endTime"
+            :picker-options="{ start: '00:00', step: '00:10', end: '23:50'}"
+            placeholder="请选择结束时间"
+          >
+          </el-time-select>
+        </el-form-item>
         <el-form-item label="启用标识" prop="isFlag">
           <el-radio-group v-model="form.isFlag">
             <el-radio
               v-for="dict in dict.type.is_flag"
               :key="dict.value"
               :label="parseInt(dict.value)"
-            >{{dict.label}}</el-radio>
+            >{{ dict.label }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -171,12 +230,19 @@
 </template>
 
 <script>
-import { listTeamMembers, getTeamMembers, delTeamMembers, addTeamMembers, updateTeamMembers } from "@/api/base/teamMembers";
-import {findProductLineList} from "@//api/base/productLine";
+import {
+  listTeamMembers,
+  getTeamMembers,
+  delTeamMembers,
+  addTeamMembers,
+  updateTeamMembers
+} from '@/api/base/teamMembers'
+import { findProductLineList } from '@//api/base/productLine'
+
 
 export default {
-  name: "TeamMembers",
-  dicts: ['is_flag'],
+  name: 'TeamMembers',
+  dicts: ['is_flag','classes'],
   data() {
     return {
       // 遮罩层
@@ -194,7 +260,7 @@ export default {
       // 班组信息表格数据
       teamMembersList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -209,49 +275,57 @@ export default {
         createdBy: null,
         createdTime: null,
         updatedBy: null,
-        updatedTime: null
+        updatedTime: null,
+        startTime: null,
+        endTime: null,
+        dineTime: null,
+        classes: null
       },
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      },
+      rules: {},
       columns: [
-            { key: 0, label: `主键标识`, visible: false },
-            { key: 1, label: `班组编号`, visible: true },
-            { key: 2, label: `班组名称`, visible: true },
-            { key: 3, label: `班组负责人`, visible: true },
-            { key: 4, label: `所属产线/工位`, visible: true },
-            { key: 5, label: `启用标识`, visible: true },
-            { key: 6, label: `创建人`, visible: false },
-            { key: 7, label: `创建时间`, visible: false },
-            { key: 8, label: `更新人`, visible: false },
-            { key: 9, label: `更新时间`, visible: false },
-        ],
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `班组编号`, visible: true },
+        { key: 2, label: `班组名称`, visible: true },
+        { key: 3, label: `班组负责人`, visible: true },
+        { key: 4, label: `所属产线/工位`, visible: true },
+        { key: 5, label: `启用标识`, visible: true },
+        { key: 6, label: `创建人`, visible: false },
+        { key: 7, label: `创建时间`, visible: false },
+        { key: 8, label: `更新人`, visible: false },
+        { key: 9, label: `更新时间`, visible: false },
+        { key: 10, label: `开始时间`, visible: true },
+        { key: 11, label: `结束时间`, visible: true },
+        { key: 12, label: `休息时间`, visible: false },
+        { key: 13, label: `班次`, visible: true }
+      ],
       // 产线选项
-      productLineList: [],
-    };
+      productLineList: []
+    }
   },
   created() {
-    this.getList();
+    this.getList()
     findProductLineList().then(response => {
-      this.productLineList = response.data;
-    });
+      this.productLineList = response.data
+    })
+
   },
   methods: {
     /** 查询班组信息列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
       listTeamMembers(this.queryParams).then(response => {
-        this.teamMembersList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+        this.teamMembersList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
     },
     // 取消按钮
     cancel() {
-      this.open = false;
-      this.reset();
+      this.open = false
+      this.reset()
     },
     // 表单重置
     reset() {
@@ -265,71 +339,80 @@ export default {
         createdBy: null,
         createdTime: null,
         updatedBy: null,
-        updatedTime: null
-      };
-      this.resetForm("form");
+        updatedTime: null,
+        startTime: null,
+        endTime: null,
+        dineTime: null,
+        classes: 1
+      }
+      this.resetForm('form')
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+      this.queryParams.pageNum = 1
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    handleTeamUser() {
+      // const obj = { path: "/base/teamMembers/teamUser" };
+      this.$tab.openPage("班组用户信息","/base/teamMembers/teamUser" ,null);
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.objId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加班组信息";
+      this.reset()
+      this.open = true
+      this.title = '添加班组信息'
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
+      this.reset()
       const objId = row.objId || this.ids
       getTeamMembers(objId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改班组信息";
-      });
+        this.form = response.data
+        this.open = true
+        this.title = '修改班组信息'
+      })
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.objId != null) {
             updateTeamMembers(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
           } else {
             addTeamMembers(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
           }
         }
-      });
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const objIds = row.objId || this.ids;
+      const objIds = row.objId || this.ids
       this.$modal.confirm('是否确认删除班组信息编号为"' + objIds + '"的数据项？').then(function() {
-        return delTeamMembers(objIds);
+        return delTeamMembers(objIds)
       }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -338,5 +421,5 @@ export default {
       }, `teamMembers_${new Date().getTime()}.xlsx`)
     }
   }
-};
+}
 </script>
diff --git a/src/views/base/teamMembers/teamUser.vue b/src/views/base/teamMembers/teamUser.vue
new file mode 100644
index 0000000..550c9ef
--- /dev/null
+++ b/src/views/base/teamMembers/teamUser.vue
@@ -0,0 +1,412 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <!--      <el-form-item label="班组编号" prop="teamCode">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.teamCode"-->
+      <!--          placeholder="请输入班组编号"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <el-form-item label="班次" prop="classes">
+        <el-select v-model="queryParams.classes" placeholder="请选择班次">
+          <el-option
+            v-for="dict in dict.type.classes"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="班组名称" prop="teamName">
+        <el-input
+          v-model="queryParams.teamName"
+          placeholder="请输入班组名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!--      <el-form-item label="所属产线" prop="productLineCode">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.productLineCode"-->
+      <!--          placeholder="请输入所属产线"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['base:teamMembers:add']"-->
+<!--        >新增-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['base:teamMembers:edit']"-->
+<!--        >修改-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['base:teamMembers:remove']"-->
+<!--        >删除-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['base:teamMembers:export']"-->
+<!--        >导出-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="teamMembersList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
+      <el-table-column label="班组编号" align="center" prop="teamCode" v-if="columns[1].visible"/>
+      <el-table-column label="班组名称" align="center" prop="teamName" v-if="columns[2].visible"/>
+      <el-table-column label="班次" align="center" prop="classes" v-if="columns[13].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.classes" :value="scope.row.classes"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="班组负责人" align="center" prop="teamHead" v-if="columns[3].visible"/>
+      <el-table-column label="用户名称" align="center" prop="nickName" v-if="columns[2].visible"/>
+      <el-table-column label="所属产线/工位" align="center" prop="productLineName" v-if="columns[4].visible"/>
+      <el-table-column label="开始时间" align="center" prop="startTime" v-if="columns[10].visible"/>
+      <el-table-column label="结束时间" align="center" prop="endTime" v-if="columns[11].visible"/>
+      <el-table-column label="休息时间" align="center" prop="dineTime" v-if="columns[12].visible"/>
+      <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[5].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[6].visible"/>
+      <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[7].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updatedBy" v-if="columns[8].visible"/>
+      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180" v-if="columns[9].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['base:teamMembers:edit']"-->
+<!--          >修改-->
+<!--          </el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['base:teamMembers:remove']"-->
+<!--          >删除-->
+<!--          </el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改班组信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="班组编号" prop="teamCode">
+          <el-input v-model="form.teamCode" placeholder="请输入班组编号"/>
+        </el-form-item>
+        <el-form-item label="班组名称" prop="teamName">
+          <el-input v-model="form.teamName" placeholder="请输入班组名称"/>
+        </el-form-item>
+        <el-form-item label="班组负责人" prop="teamHead">
+          <el-input v-model="form.teamHead" placeholder="请输入班组负责人"/>
+        </el-form-item>
+        <el-form-item label="所属产线/工位">
+          <el-select v-model="form.productLineCode" placeholder="请选择所属产线/工位">
+            <el-option
+              v-for="item in productLineList"
+              :key="item.productLineCode"
+              :label="item.productLineName"
+              :value="item.productLineCode"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="班次" prop="classes">
+          <el-radio-group v-model="form.classes">
+            <el-radio
+              v-for="dict in dict.type.classes"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-time-select
+            v-model="form.startTime"
+            :picker-options="{ start: '00:00', step: '00:10', end: '23:50'}"
+            placeholder="请选择开始时间"
+          >
+          </el-time-select>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <el-time-select
+            v-model="form.endTime"
+            :picker-options="{ start: '00:00', step: '00:10', end: '23:50'}"
+            placeholder="请选择结束时间"
+          >
+          </el-time-select>
+        </el-form-item>
+        <el-form-item label="启用标识" prop="isFlag">
+          <el-radio-group v-model="form.isFlag">
+            <el-radio
+              v-for="dict in dict.type.is_flag"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  teamUserList,
+  getTeamMembers,
+  delTeamMembers,
+  addTeamMembers,
+  updateTeamMembers
+} from '@/api/base/teamMembers'
+import { findProductLineList } from '@//api/base/productLine'
+
+export default {
+  name: 'TeamMembers',
+  dicts: ['is_flag','classes'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 班组信息表格数据
+      teamMembersList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        teamCode: null,
+        teamName: null,
+        teamHead: null,
+        productLineCode: null,
+        isFlag: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null,
+        startTime: null,
+        endTime: null,
+        dineTime: null,
+        classes: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      columns: [
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `班组编号`, visible: true },
+        { key: 2, label: `班组名称`, visible: true },
+        { key: 3, label: `班组负责人`, visible: false },
+        { key: 4, label: `所属产线/工位`, visible: true },
+        { key: 5, label: `启用标识`, visible: false },
+        { key: 6, label: `创建人`, visible: false },
+        { key: 7, label: `创建时间`, visible: false },
+        { key: 8, label: `更新人`, visible: false },
+        { key: 9, label: `更新时间`, visible: false },
+        { key: 10, label: `开始时间`, visible: false },
+        { key: 11, label: `结束时间`, visible: false },
+        { key: 12, label: `休息时间`, visible: false },
+        { key: 13, label: `班次`, visible: true }
+      ],
+      // 产线选项
+      productLineList: []
+    }
+  },
+  created() {
+    this.getList()
+    findProductLineList().then(response => {
+      this.productLineList = response.data
+    })
+
+  },
+  methods: {
+    /** 查询班组信息列表 */
+    getList() {
+      this.loading = true
+      teamUserList(this.queryParams).then(response => {
+        this.teamMembersList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        teamCode: null,
+        teamName: null,
+        teamHead: null,
+        productLineCode: null,
+        isFlag: 0,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null,
+        startTime: null,
+        endTime: null,
+        dineTime: null,
+        classes: 1
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加班组信息'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const objId = row.objId || this.ids
+      getTeamMembers(objId).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改班组信息'
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            updateTeamMembers(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addTeamMembers(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const objIds = row.objId || this.ids
+      this.$modal.confirm('是否确认删除班组信息编号为"' + objIds + '"的数据项？').then(function() {
+        return delTeamMembers(objIds)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('base/teamMembers/export', {
+        ...this.queryParams
+      }, `teamMembers_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>
diff --git a/src/views/production/baseBomInfo/childBom.vue b/src/views/production/baseBomInfo/childBom.vue
index 81b1973..5f2891a 100644
--- a/src/views/production/baseBomInfo/childBom.vue
+++ b/src/views/production/baseBomInfo/childBom.vue
@@ -60,13 +60,13 @@
       <el-table-column label="物料名称" align="center" prop="materialName" />
       <el-table-column label="物料类型" align="center" prop="materialType">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.material_type" :value="scope.row.materialType"/>
+          <dict-tag :options="dict.type.material_subclass" :value="scope.row.materialType"/>
         </template>
       </el-table-column>
       <el-table-column label="标准数量" align="center" prop="standardAmount" />
 <!--      <el-table-column label="父物料编号" align="center" prop="parentId" />-->
       <el-table-column label="工厂名称" align="center" prop="plantName" />
-      <el-table-column label="产线/工位" align="center" prop="productLineName" />
+<!--      <el-table-column label="产线/工位" align="center" prop="productLineName" />-->
 <!--      <el-table-column label="是否标识" align="center" prop="isFlag">-->
 <!--        <template slot-scope="scope">-->
 <!--          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>-->
@@ -135,7 +135,7 @@
         <el-form-item label="物料类型" prop="materialType">
           <el-select v-model="form.materialType" placeholder="请选择物料类型">
             <el-option
-              v-for="dict in dict.type.material_type"
+              v-for="dict in dict.type.material_subclass"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
@@ -143,7 +143,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="所属工厂">
-          <el-select v-model="form.plantCode" placeholder="请选择所属工厂" :disabled="true">
+          <el-select v-model="form.plantCode" placeholder="请选择所属工厂" >
             <el-option
               v-for="item in factoryList"
               :key="item.factoryCode"
@@ -152,16 +152,16 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="产线工位">
-          <el-select v-model="form.productLineCode" placeholder="请选择产线工位">
-            <el-option
-              v-for="item in productLineList"
-              :key="item.productLineCode"
-              :label="item.productLineName"
-              :value="item.productLineCode"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="产线工位">-->
+<!--          <el-select v-model="form.productLineCode" placeholder="请选择产线工位">-->
+<!--            <el-option-->
+<!--              v-for="item in productLineList"-->
+<!--              :key="item.productLineCode"-->
+<!--              :label="item.productLineName"-->
+<!--              :value="item.productLineCode"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
 <!--        <el-form-item label="启用标识" prop="isFlag">-->
 <!--          <el-radio-group v-model="form.isFlag">-->
 <!--            <el-radio-->
@@ -205,7 +205,7 @@ import addBom from '@//views/base/orderBomInfo/addBom.vue';
 
 export default {
   name: "BaseBomInfo",
-  dicts: ['material_type', 'is_flag'],
+  dicts: ['material_type', 'is_flag','material_subclass'],
   components: {
     Treeselect,
     'add-bom': addBom
diff --git a/src/views/production/baseBomInfo/index.vue b/src/views/production/baseBomInfo/index.vue
index c8eeb6e..3db7bcf 100644
--- a/src/views/production/baseBomInfo/index.vue
+++ b/src/views/production/baseBomInfo/index.vue
@@ -66,6 +66,15 @@
           v-hasPermi="['production:baseBomInfo:export']"
         >导出</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="AutomaticSynchronizationBOM"
+        >自动同步生产BOM</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
@@ -157,7 +166,6 @@
               :key="item.factoryCode"
               :label="item.factoryName"
               :value="item.factoryCode"
-              :disabled="true"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -208,9 +216,17 @@
 </template>
 
 <script>
-import { listBaseBomInfo, getBaseBomInfo, delBaseBomInfo, addBaseBomInfo, updateBaseBomInfo } from "@/api/production/baseBomInfo";
+import {
+  listBaseBomInfo,
+  getBaseBomInfo,
+  delBaseBomInfo,
+  addBaseBomInfo,
+  updateBaseBomInfo,
+  addAutomaticSynchronizationBOM
+} from '@/api/production/baseBomInfo'
 import {findFactoryList} from "@//api/base/factory";
 import addBom from '@//views/base/orderBomInfo/addBom.vue';
+import { addSAPCalendar } from '@//api/production/calendarInfo'
 
 export default {
   name: "BaseBomInfo",
@@ -247,7 +263,7 @@ export default {
         bomCode: null,
         materialCode: null,
         materialName: null,
-        materialType: 0,
+        materialType: 100,
         standardAmount: null,
         parentId: null,
         plantCode: null,
@@ -313,7 +329,7 @@ export default {
         bomCode: null,
         materialCode: null,
         materialName: null,
-        materialType: 0,
+        materialType: null,
         standardAmount: null,
         parentId: null,
         plantCode: null,
@@ -398,6 +414,12 @@ export default {
         }
       });
     },
+    AutomaticSynchronizationBOM(){
+        addAutomaticSynchronizationBOM(this.form).then(response => {
+          this.$modal.msgSuccess('同步成功')
+          this.getList()
+        })
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const objIds = row.objId || this.ids;
diff --git a/src/views/production/planInfo/index.vue b/src/views/production/planInfo/index.vue
index 9d6dded..7089c8a 100644
--- a/src/views/production/planInfo/index.vue
+++ b/src/views/production/planInfo/index.vue
@@ -1,17 +1,17 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="计划编号" prop="planCode">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="计划编号" prop="orderCode">
         <el-input
-          v-model="queryParams.planCode"
+          v-model="queryParams.orderCode"
           placeholder="请输入计划编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工单编号" prop="orderCode">
+      <el-form-item label="工单编号" prop="planCode">
         <el-input
-          v-model="queryParams.orderCode"
+          v-model="queryParams.planCode"
           placeholder="请输入工单编号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -25,25 +25,25 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="开始时间">
+      <el-form-item label="实际开始时间">
         <el-date-picker
           v-model="daterangeBeginTime"
           style="width: 340px"
           value-format="yyyy-MM-dd HH:mm:ss"
           type="datetimerange"
           range-separator="-"
-          start-placeholder="开始时间"
+          start-placeholder="实际开始时间"
           end-placeholder="结束时间"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="完成时间">
+      <el-form-item label="实际完成时间">
         <el-date-picker
           v-model="daterangeEndTime"
           style="width: 340px"
           value-format="yyyy-MM-dd HH:mm:ss"
           type="datetimerange"
           range-separator="-"
-          start-placeholder="开始时间"
+          start-placeholder="实际开始时间"
           end-placeholder="结束时间"
         ></el-date-picker>
       </el-form-item>
@@ -112,12 +112,12 @@
       <el-table-column label="计划工位" align="center" prop="productLineName" v-if="columns[7].visible"/>
       <el-table-column label="计划数量" align="center" prop="planAmount" v-if="columns[8].visible"/>
       <el-table-column label="完成数量" align="center" prop="completeAmount" v-if="columns[9].visible"/>
-      <el-table-column label="开始时间" align="center" prop="beginTime" width="180" v-if="columns[10].visible">
+      <el-table-column label="实际开始时间" align="center" prop="beginTime" width="180" v-if="columns[10].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.beginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="完成时间" align="center" prop="endTime" width="180" v-if="columns[11].visible">
+      <el-table-column label="实际完成时间" align="center" prop="endTime" width="180" v-if="columns[11].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
@@ -204,20 +204,20 @@
         <el-form-item label="完成数量" prop="completeAmount">
           <el-input v-model="form.completeAmount" placeholder="请输入完成数量" />
         </el-form-item>
-        <el-form-item label="开始时间" prop="beginTime">
+        <el-form-item label="实际开始时间" prop="beginTime">
           <el-date-picker clearable
             v-model="form.beginTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择开始时间">
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择实际开始时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="完成时间" prop="endTime">
+        <el-form-item label="实际完成时间" prop="endTime">
           <el-date-picker clearable
             v-model="form.endTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择完成时间">
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择实际完成时间">
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -297,8 +297,8 @@ export default {
             { key: 7, label: `计划工位`, visible: true },
             { key: 8, label: `计划数量`, visible: true },
             { key: 9, label: `完成数量`, visible: true },
-            { key: 10, label: `开始时间`, visible: true },
-            { key: 11, label: `完成时间`, visible: true },
+            { key: 10, label: `实际开始时间`, visible: true },
+            { key: 11, label: `实际完成时间`, visible: true },
             { key: 12, label: `是否标识`, visible: false },
             { key: 13, label: `创建人`, visible: false },
             { key: 14, label: `创建时间`, visible: false },
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 8cd8c8a..1e8b69e 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -142,7 +142,8 @@
           <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
           <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
           <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="所属工位" align="center" key="stationName" prop="stationName" v-if="columns[5].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="所属工位" align="center" key="stationName" prop="stationName" v-if="columns[5].visible"   />
+          <el-table-column label="班组名称" align="center" key="teamName" prop="teamName" v-if="columns[5].visible"   />
           <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
           <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
             <template slot-scope="scope">
@@ -306,6 +307,18 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="班组">
+              <el-select v-model="form.teamCode" placeholder="请输入班组">
+                <el-option
+                  v-for="item in teamMemberList"
+                  :key="item.teamCode"
+                  :label="item.teamName"
+                  :value="item.teamCode"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -359,6 +372,7 @@ import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { findProductLineList } from '@//api/base/productLine'
+import { getTeamMemberList } from '@//api/base/teamMembers'
 
 export default {
   name: "User",
@@ -428,13 +442,15 @@ export default {
       },
       // 工位选项
       findStationList: [],
+      // 班组选项
+      teamMemberList: [],
       // 列信息
       columns: [
         { key: 0, label: `用户编号`, visible: true },
         { key: 1, label: `用户名称`, visible: true },
         { key: 2, label: `用户昵称`, visible: true },
         { key: 3, label: `部门`, visible: true },
-        { key: 4, label: `手机号码`, visible: true },
+        { key: 4, label: `手机号码`, visible: false },
         { key: 5, label: `状态`, visible: true },
         { key: 6, label: `创建时间`, visible: true }
       ],
@@ -494,6 +510,9 @@ export default {
       findProductLineList({productLineType: 2}).then(response => {
         this.findStationList = response.data;
       });
+      getTeamMemberList(null).then(response => {
+        this.teamMemberList = response.data
+      })
     },
     //this
     /** 查询部门下拉树结构 */
@@ -534,6 +553,7 @@ export default {
         userId: undefined,
         deptId: undefined,
         stationCode: undefined,
+        teamCode: undefined,
         userName: undefined,
         nickName: undefined,
         password: undefined,