src/views/group/base/groupClasses/index.vue

@@ -76,10 +76,10 @@ const tableProps = [
 		label: '班次状态',
 		subcomponent: StatusBtn,
 	},
-	// {
+	{
-	// 	prop: 'remark',
+		prop: 'remark',
-	// 	label: '备注',
+		label: '备注',
-	// },
+	},
 ];
 export default {
 	name: 'GroupClass',

src/views/group/base/groupTeamScheduling/index.vue

@@ -82,7 +82,7 @@
 						</div>
 						<!-- 班次班组 -->
 						<!-- class有两个样式，一个是类似class1，还有个是选中红框显示 -->
-						<!-- <el-row
+						<el-row
 							:gutter="2"
 							:class="
 								'class' +
@@ -92,14 +92,6 @@
 									: '')
 							"
 							v-for="(item, index) in list[Number(data.day.split('-')[2])]"
-							:key="index"> -->
-						<el-row
-							:gutter="2"
-							:class="
-								'class' +
-								(index + 1)
-							"
-							v-for="(item, index) in list[Number(data.day.split('-')[2])]"
 							:key="index">
 							<el-col :span="12">
 								<div class="selectDiv">
@@ -149,9 +141,6 @@
 							</el-col>
 						</el-row>
 					</div>
-					<div v-else style='font-size: 20px;font-weight: 500;text-align: right;'>
-						{{ Number(data.day.split('-')[2]) }}
-					</div>
 				</template>
 			</el-calendar>
 		</div>

src/views/group/base/schedulingPlanConfig/components/schedulingPlanConfigAdd.vue

@@ -211,9 +211,6 @@ export default {
 										this.$modal.msgSuccess('操作成功');
 										this.$emit('successSubmit');
 									});
-								}else{
-									this.$modal.msgSuccess('操作成功');
-									this.$emit('successSubmit');
 								}
 							}
 						});
@@ -229,9 +226,6 @@ export default {
 										this.$modal.msgSuccess('操作成功');
 										this.$emit('successSubmit');
 									});
-								}else{
-									this.$modal.msgSuccess('操作成功');
-									this.$emit('successSubmit');
 								}
 							}
 						});

src/views/group/base/schedulingPlanConfig/index.vue

@@ -176,7 +176,7 @@ export default {
 				if (res.code === 0 && res.data.list && res.data.list.length > 0) {
           res.data.list.forEach(item => {
             if(item.isProduction){
-              item.str = item.strList?item.strList.join('，'):'-'
+              item.str = item.strList?item.strList.join(','):'-'
             }
           });
 					this.list = res.data.list;

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

@@ -18,7 +18,7 @@
         v-if="tableBtn.length"
         slot="handleBtn"
         :width="80"
-        label="生产情况"
+        label="操作"
         :method-list="tableBtn"
         @clickBtn="handleClick"
       />
@@ -122,8 +122,8 @@ export default {
       tableBtn: [
       this.$auth.hasPermi('base:team-production:detail')
           ? {
-              type: 'prodDetail',
+              type: 'detail',
-              btnName: '查看'
+              btnName: '详情'
             }
           : undefined
       ].filter((v) => v),