|
@@ -87,7 +87,7 @@ export default defineComponent({
|
|
|
const proxyData = reactive({
|
|
|
parseImgUrl: parseImgUrl,
|
|
|
leaveBtnFlag: false,
|
|
|
- workkArr: props.workkArr,
|
|
|
+ workkArr: [],
|
|
|
forcedOverTimeFlag: false, // 强制加班标记 false:不需要强制加班
|
|
|
onSubmit(values: any) {
|
|
|
router.push({ path: "/choice-project" });
|
|
@@ -98,6 +98,21 @@ export default defineComponent({
|
|
|
},
|
|
|
timerText: timerText,
|
|
|
text: text,
|
|
|
+ // 过滤审批数据
|
|
|
+ formateApproveData() {
|
|
|
+ let data: any = proxyData.workkArr || [];
|
|
|
+ for (let i = 0; i < data.length; i++) {
|
|
|
+ let customSceneList: any = data[i]?.customSceneList ?? [];
|
|
|
+ customSceneList.map((item: any, index: any) => {
|
|
|
+ if (item.hasOwnProperty("approvalStatus")) {
|
|
|
+ if (item.approvalStatus !== 1) {
|
|
|
+ customSceneList.splice(index, 1);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ },
|
|
|
// 处理时间和第二天和未来连续的问题
|
|
|
formateTimeContinuous(
|
|
|
index: any = 1,
|
|
@@ -532,8 +547,9 @@ export default defineComponent({
|
|
|
watch(
|
|
|
props,
|
|
|
(newProps: any) => {
|
|
|
- proxyData.workkArr = newProps.workkArr;
|
|
|
- if (proxyData.workkArr && proxyData.workkArr.length) {
|
|
|
+ if (newProps.workkArr && newProps.workkArr.length) {
|
|
|
+ proxyData.workkArr = JSON.parse(JSON.stringify(newProps.workkArr));
|
|
|
+ proxyData.formateApproveData();
|
|
|
proxyData.formateWorkTime();
|
|
|
}
|
|
|
},
|