报工调整

src/views/flowManagement/addDialog.vue

@@ -550,9 +550,10 @@ export default {
   },
   mounted() {
     this.openShow = this.visible;
+    this.getDeplLists();
     // this.getRoleUserList();
     this.getDictionary();
-    this.getDeplList();
+    
     if (this.title === '详情' || this.title === '修改') {
       this.getDetails();
       this.getExecuteResultList();
@@ -610,15 +611,15 @@ export default {
       // }
     },
     // 获取部门列表
-    getDeplList() {
+    getDeplLists() {
       getDeplList().then(res => {
-        // console.log(res.data.data, 'res');
+        let data =  res.data.data
-        if (res.data.data.children.length > 0) {
+        data.forEach(item => {
-          this.deplList = res.data.data.children;
+          if (item.deptName == '热表分厂') {
-        } else {
+            console.log(item.children, 'item.deptName');
-          this.deplList = [];
+            this.deplList = item.children||[];
-        }
+          }
-        // this.deplList = res.data.data;
+        });
       });
     },
     // 获取人员

src/views/productionManagement/workReportingManagement/components/wordReporting.vue

@@ -57,7 +57,7 @@
           placeholder="请搜索选择"
           api-url="/blade-desk/BA/TeamSet/list?descs=TS_CODE"
           echo-api="/blade-desk/BA/TeamSet/list?descs=TS_CODE"
-          echoParamsKey="ids"
+          echoParamsKey="id"
           echo-method="get"
           api-method="get"
           list-key="records"
@@ -100,16 +100,18 @@
         <el-button type="primary">保存</el-button>
       </div> -->
       <el-table :data="tableData" style="margin-top: 20px">
-        <el-table-column label="数量" prop="workQty" align="center"></el-table-column>
-        <el-table-column label="报工时间" prop="createTime" align="center"></el-table-column>
         <el-table-column label="报工人" prop="workerName" align="center"> </el-table-column>
+        <el-table-column label="报工数量" prop="workQty" align="center"></el-table-column>
+        <el-table-column label="报工时间" prop="createTime" align="center"></el-table-column>
+        
       </el-table>
     </el-dialog>
     <!-- 转班 -->
     <el-dialog append-to-body title="转班" v-model="teamDialog" width="30%">
       <el-form ref="teamForm" :model="teamForm" :rules="teamRules">
-        <el-form-item> 旧班组:{{ data[0].prWorkOrder.makeTeam.tsName }} </el-form-item>
+        <el-form-item><el-text class="mx-1" type="primary"><el-icon><WarningFilled /></el-icon>转班后，车间订单需排产后再生产！</el-text>  </el-form-item>
-        <el-form-item label="新班组" prop="makeTeam">
+        <el-form-item label="旧班组：">4 </el-form-item>
+        <el-form-item label="新班组：" prop="makeTeam">
           <!-- <el-select v-model="teamForm.makeTeam">
             <el-option
               v-for="(item, index) in teamSetList"
@@ -238,19 +240,19 @@ export default {
             search: false,
           },
           {
-            label: '当前工序',
+            label: '工序',
             prop: 'ppsName',
             span: 24,
             overflow: true,
             search: false,
           },
-          {
+          // {
-            label: '数量',
+          //   label: '数量',
-            prop: 'workQty',
+          //   prop: 'workQty',
-            span: 24,
+          //   span: 24,
-            overflow: true,
+          //   overflow: true,
-            search: false,
+          //   search: false,
-          },
+          // },
           {
             label: '班组',
             prop: 'tsName',
@@ -282,7 +284,7 @@ export default {
             // },
           },
           {
-            label: '现接收人',
+            label: '接收人',
             prop: 'userId',
             span: 24,
             overflow: true,