调整车间报错

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/planView/todayPlan/distribution.vue

@@ -238,9 +238,9 @@ export default {
     },
     changeDepartmentSelection(list) {
       const { value, label } = list[0] || {}
-      console.log(this.distributionList, label)
-      const str = (this.distributionList || []).map(item => item.prodProcedure && item.prodProcedure.name).join(',')
-      const ids = (this.distributionList || []).map(item => item.id).join(',')
+      const selectedData = this.distributionList.filter(item => item.prodProcedure && item.prodProcedure.isSelected)
+      const str = (selectedData || []).map(item => item.prodProcedure && item.prodProcedure.name).join(',')
+      const ids = (selectedData || []).map(item => item.id).join(',')
       Dialog.confirm({
         title: '改派',
         message: `确定将【${str}】改派给【${label}】部门吗？`,

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/workReport/daily.vue

@@ -161,7 +161,7 @@
                                                         <el-button v-if="permissions.reportsDeleteAll" size="small" @click="deleteOneReport(item2.id)" style="float: right;">删除</el-button>
                                                     </p>
                                                     <p v-if="item2.planType == 1">任务变更通知号：<b>{{item2.taskChangeNoticeNum}}</b></p>
-                                                    <p >钢印号：<el-tag v-for="num in JSON.parse(item2.steelNumArray)" :key="num" size="small" type="info">{{num}}</el-tag></p>
+                                                    <p >钢印号：<el-tag v-for="num in JSON.parse((item2.steelNumArray || '[]'))" :key="num" size="small" type="info">{{num}}</el-tag></p>
                                                     <p>工作时长：<b style="color:goldenrod">{{item2.workingTime.toFixed(2)}} </b>分钟</p>
                                                     <p v-if="item2.planType == 0">产品名称：<b>{{item2.productName}}</b></p>
                                                     <p v-if="item2.planType == 0">工序名称：<b>{{item2.procedureName}}</b></p>