成品发货

src/views/group/base/groupTeam/components/workerEdit.vue

@@ -142,7 +142,7 @@ export default {
           {
             type: 'input',
             label: '关键字',
-            placeholder: '关键字',
+            placeholder: '姓名',
             param: 'workerName'
           },
           {
@@ -168,7 +168,7 @@ export default {
           {
             type: 'input',
             label: '关键字',
-            placeholder: '关键字',
+            placeholder: '姓名',
             param: 'workerName'
           },
           {
@@ -242,12 +242,13 @@ export default {
       this.getList()
     },
     handleClick(val) {
+      console.log(val)
       switch (val.type) {
         case 'edit':
           this.addOrEditTitle = '编辑'
           this.centervisible = true
           this.$nextTick(() => {
-            this.$refs.workerTeamAdd.init({'teamId': this.queryParams.teamId, id: val.data.id})
+            this.$refs.workerTeamAdd.init({'teamId': this.queryParams.teamId, 'id': val.data.id, 'workName':val.data.workerName, 'majorName':val.data.workerMajorName})
           })
           break
         default:
@@ -266,6 +267,16 @@ export default {
         }).catch(() => {});
     },
     closeD() {
+      this.teamData.teamName = ''
+      this.teamData.leaderName = ''
+      this.teamData.teamNum = ''
+      this.teamData.leaderTelephone = ''
+      this.teamData.teamId = ''
+      this.queryParams.pageNo = 1
+      this.queryParams.pageSize = 20
+      this.queryParams.teamId = ''
+      this.queryParams.workerName = ''
+      this.total = 0
       this.$emit('closeDrawer')
     }
   }

src/views/group/base/groupTeam/components/workerTeamAdd.vue

@@ -1,6 +1,6 @@
 <template>
   <el-form ref="form" :rules="rules" label-width="100px" :model="form">
-    <el-form-item label="员工" prop="workerId">
+    <el-form-item label="员工" prop="workerId" v-if='!isEdit'>
       <el-select v-model="form.workerId" placeholder="请选择" filterable style="width: 100%;" @change="selectWorker()">
         <el-option
           v-for="item in workerList"
@@ -10,6 +10,9 @@
         </el-option>
       </el-select>
     </el-form-item>
+    <el-form-item label="员工" prop="workerId" v-if='isEdit'>
+      <el-input v-model="workName" disabled></el-input>
+    </el-form-item>
     <el-form-item label="专业" prop="majorName">
       <el-input v-model="form.majorName" disabled></el-input>
     </el-form-item>
@@ -19,7 +22,7 @@
   </el-form>
 </template>
 <script>
-import { getWorkerList } from '@/api/base/worker'
+import { otherWorkerList } from '@/api/base/worker'
 import { teamDetCreate, teamDetUpdate, groupTeamDet } from '@/api/base/groupTeam'
 export default {
   name: 'WorkerTeamAdd',
@@ -33,6 +36,8 @@ export default {
         majorName: '',
         id: ''
       },
+      isEdit: false,
+      workName: '',//编辑时用
       rules: {
         workerId: [{ required: true, message: '员工不能为空', trigger: 'change' }]
       }
@@ -41,7 +46,9 @@ export default {
   methods: {
     init(param) {
       this.form.teamId = param.teamId
-      getWorkerList().then(res => {
+      this.form.majorName = param.majorName
+      this.workName = param.workName
+      otherWorkerList({teamId:this.form.teamId}).then(res => {
         this.workerList = res.data || []
         if (param.id) {
           this.isEdit = true
@@ -49,7 +56,6 @@ export default {
           groupTeamDet({id: this.form.id}).then((res) => {
             if (res.code === 0) {
               this.form.workerId = res.data.workerId
-              this.selectWorker()
               this.form.remark = res.data.remark
             }
           })
@@ -106,6 +112,8 @@ export default {
     },
     formClear() {
       this.$refs.form.resetFields()
+      this.workName = ''
+      this.form.majorName = ''
       this.isEdit = false
     }
   }

src/views/group/monitoring/teamProduction/index.vue

@@ -34,36 +34,42 @@
   </div>
 </template>
 <script>
-import { groupTeamSchedulingPage } from '@/api/monitoring/teamProduction'
+import { groupTeamSchedulingPage, groupClassesListAll } from '@/api/monitoring/teamProduction'
 import { parseTime } from '@/utils/ruoyi'
 import TeamProductionDetail from './components/teamProductionDetail'
 const tableProps = [
   {
     prop: 'createTime',
     label: '排班创建时间',
-    filter: parseTime
+    filter: parseTime,
+    minWidth: 150
   },
   {
     prop: 'startDay',
-    label: '上班日期'
+    label: '上班日期',
+    minWidth: 100
   },
   {
     prop: 'startTime',
     label: '上班时间',
-    filter: parseTime
+    filter: parseTime,
+    minWidth: 150
   },
   {
     prop: 'endTime',
     label: '下班时间',
-    filter: parseTime
+    filter: parseTime,
+    minWidth: 150
   },
   {
     prop: 'classesName',
-    label: '班次名称'
+    label: '班次名称',
+    showOverflowtooltip: true
   },
   {
     prop: 'teamName',
-    label: '班组名称'
+    label: '班组名称',
+    showOverflowtooltip: true
   }
 ]
 const tableBtn = [
@@ -93,8 +99,9 @@ export default {
           type: 'datePicker',
           label: '上班日期',
           dateType: 'date',
-          format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: "timestamp",
+          format: 'yyyy-MM-dd',
+          valueFormat: 'yyyy-MM-dd',
+          // valueFormat: "timestamp",
           param: 'startDay',
           defaultSelect: '',
           width: 200
@@ -117,7 +124,7 @@ export default {
       tableProps,
       tableBtn,
       list: [],
-      tableH: this.tableHeight(220),
+      tableH: this.tableHeight(260),
       total: 0,
       paramVisible: false
     }
@@ -125,25 +132,30 @@ export default {
   components: { TeamProductionDetail },
   mounted() {
     window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(220)
+      this.tableH = this.tableHeight(260)
     })
+    this.getGroupClass()
     this.getList()
   },
   methods: {
     buttonClick(val) {
       this.queryParams.pageNo = 1;
-      this.queryParams.cnName = val.cnName
+      this.queryParams.classesId = val.classesId
+      this.queryParams.teamName = val.teamName
+      this.queryParams.startDay = val.startDay
       this.getList()
     },
     getList() {
-      groupTeamSchedulingPage().then(res => {
+      groupTeamSchedulingPage({...this.queryParams}).then(res => {
         console.log(res)
         this.list = res.data.list || []
         this.total = res.data.total || 0
       })
     },
     getGroupClass() {
-      
+      groupClassesListAll().then(res => {
+        this.formConfig[0].selectOptions = res.data || []
+      })
     },
     handleClick(val) {
       console.log(val)