报工调整页面逻辑调整

src/views/productionManagement/js/wordReporting.js

@@ -54,8 +54,7 @@ export default {
             span: 24,
             overflow: true,
             search: false,
-            cell:true
-            
+            // cell:true,
         },
         {
             label: '现接收人',
@@ -63,7 +62,7 @@ export default {
             span: 24,
             overflow: true,
             search: false,
-           
+            // cell: true,
         },
         {
             label: '报工人详情',
@@ -71,7 +70,6 @@ export default {
             span: 24,
             overflow: true,
             search: false,
-           
         },
     ],
     'workReportingLog': [

src/views/productionManagement/workReportingManagement.vue

@@ -13,7 +13,6 @@
       v-model="form"
       v-model:page="page"
       ref="crud"
-      @row-del="rowDel"
       @search-change="searchChange"
       @search-reset="searchReset"
       @selection-change="selectionChange"
@@ -28,12 +27,25 @@
             <el-input
               v-model="searchForm.cardNo"
               placeholder="请扫描流程卡号"
-              @keyup.enter.native="handleSearchInput"
+              @keyup.enter="handleSearchInput"
+              @keydown.enter.prevent
             ></el-input>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="saveUpdate" :loading="saveLoading">保存</el-button>
-            <el-button type="primary" @click="changeTeam" :loading="saveLoading">转班</el-button>
+            <el-button
+              type="primary"
+              @click="saveUpdate"
+              :loading="saveLoading"
+              :disabled="data.length <= 0"
+              >保存</el-button
+            >
+            <el-button
+              type="primary"
+              @click="changeTeam"
+              :loading="saveLoading"
+              :disabled="data.length <= 0"
+              >转班</el-button
+            >
           </el-form-item>
         </el-form>
       </template>
@@ -41,6 +53,28 @@
       <template #detail="{ row }" v-if="tabPosition == 'workReporting'">
         <el-button type="text" @click="handleDetail(row)">详情</el-button>
       </template>
+      <!-- 班组 -->
+      <template #tsId="{ row }" v-if="tabPosition == 'workReporting'">
+        <el-select v-model="teamForm.makeTeam">
+          <el-option
+            v-for="(item, index) in teamSetList"
+            :label="item.tsName"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </template>
+      <!-- 接收人 -->
+      <template #tsId="{ row }" v-if="tabPosition == 'workReporting'">
+        <el-select v-model="row.userId" placeholder="请选择" clearable filterable>
+          <el-option
+            v-for="item in userOptions"
+            :key="item.id"
+            :label="item.realName"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+      </template>
     </avue-crud>
 
     <!-- 详情 -->
@@ -51,7 +85,7 @@
       <el-table :data="tableData" style="margin-top: 20px">
         <el-table-column label="数量" prop="workQty"></el-table-column>
         <el-table-column label="报工时间" prop="makeTime"></el-table-column>
-        <el-table-column label="报工人" prop="worker"></el-table-column>
+        <el-table-column label="报工人" prop="worker"> </el-table-column>
       </el-table>
     </el-dialog>
     <!-- 转班 -->
@@ -82,6 +116,8 @@
 import wordReporting from './js/wordReporting';
 import workReportingData from './js/workReportingData';
 import { getTeamSetList } from '@/api/processManagement/taskProcessing';
+import { getRoleUserList } from '@/api/processManagement/taskDispatch';
+
 import {
   getList,
   getRecordList,
@@ -126,7 +162,7 @@ export default {
         tree: false,
         border: true,
         index: true,
-        selection: true,
+        selection: false,
         viewBtn: false,
         delBtn: false,
         editBtn: false,
@@ -155,13 +191,22 @@ export default {
         column: [],
       },
       teamSetList: [], //班组列表
+      userOptions: [], //接收人列表
     };
   },
   mounted() {
     this.option.menu = false;
     this.option.column = wordReporting[this.tabPosition];
+    this.getTeamSetList();
+    this.getRoleUserList();
   },
   methods: {
+    // 获取人员
+    getRoleUserList() {
+      getRoleUserList({ current: 1, size: 9999999 }).then(res => {
+        this.userOptions = res.data.data.records;
+      });
+    },
     // 获取班组列表
     getTeamSetList() {
       getTeamSetList().then(res => {
@@ -170,8 +215,12 @@ export default {
     },
     // 扫描流程卡号 获取数据
     handleSearchInput(key, value) {
+      this.loading= true
       getDataByCardNo({ cardNo: this.searchForm.cardNo }).then(res => {
+         this.loading= false
         this.data = res.data.data.record;
+      }).catch(() => {
+        this.loading= false
       });
     },
     // 保存
@@ -224,9 +273,7 @@ export default {
         }
       });
     },
-    selectionChange(){
-      
-    },
+    selectionChange() {},
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
       this.onLoad(this.page, this.query);