update:新增代办

src/views/task/simulationTask/newDemand/components/animation.vue

@@ -26,6 +26,7 @@
           :hideKeys="hideKeys"
           :colNum="3"
           @change="changeFun"
+          @load="loadFun"
         >
           <template #form-pMemberList v-if="enableConfigByTenant([TENANT_ENUM.LYRIC])">
             <el-select v-model="editFormInfo.pMemberList" filterable placeholder="请选择">
@@ -44,12 +45,11 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted } from 'vue';
+import { ref } from 'vue';
 import PlanningInformation from '@/tenants/lyric/views/task/components/planningInformation.vue';
 import TableForm from '@/components/common/table/tableForm.vue';
 import { enableConfigByTenant, TENANT_ENUM } from '@/tenants/tenant';
 import {
-  // getDeptListData,
   setPhaseListByProjectId,
   setMachineListByPhaseId,
   setWorkspaceListByMachineId,
@@ -57,11 +57,12 @@ import {
   toggleUrgencyDesc,
 } from './lib';
 
-defineProps({
-  deptOptions: {
-    type: Array<any>,
-    default: () => [],
-  },
+interface Props {
+  deptOptions: any;
+}
+
+withDefaults(defineProps<Props>(), {
+  deptOptions: [],
 });
 
 const emits = defineEmits(['submit']);
@@ -87,12 +88,10 @@ const attachmentRemark = ref(
 );
 
 const editFormInfo = ref<any>({});
-// const deptOptions = ref<any>([]);
 
-onMounted(async () => {
-  // deptOptions.value = await getDeptListData();
-  TableFormRef.value.setOptionsFun('simType', getSimTypeList('机器人仿真'));
-});
+const loadFun = () => {
+  TableFormRef.value.setOptionsFun('simType', getSimTypeList('动画仿真'));
+};
 
 const changeFun = async (cbData: any) => {
   const { key, data } = cbData;

src/views/task/simulationTask/newDemand/components/finiteElement.vue

@@ -32,6 +32,7 @@
           :hideKeys="hideKeys"
           :colNum="3"
           @change="changeFun"
+          @load="loadFun"
         >
           <template #form-pMemberList v-if="enableConfigByTenant([TENANT_ENUM.LYRIC])">
             <el-select v-model="editFormInfo.pMemberList" filterable placeholder="请选择">
@@ -61,12 +62,11 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted } from 'vue';
+import { ref } from 'vue';
 import PlanningInformation from '@/tenants/lyric/views/task/components/planningInformation.vue';
 import TableForm from '@/components/common/table/tableForm.vue';
 import { enableConfigByTenant, TENANT_ENUM } from '@/tenants/tenant';
 import {
-  // getDeptListData,
   setPhaseListByProjectId,
   setMachineListByPhaseId,
   setWorkspaceListByMachineId,
@@ -77,11 +77,12 @@ import {
   disposeFiniteElementDeptMember,
 } from './lib';
 
-const props = defineProps({
-  deptOptions: {
-    type: Array<any>,
-    default: () => [],
-  },
+interface Props {
+  deptOptions: any;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  deptOptions: [],
 });
 
 const emits = defineEmits(['submit']);
@@ -113,13 +114,11 @@ const simTypeTipText = ref(`
 `);
 
 const editFormInfo = ref<any>({});
-// const deptOptions = ref<any>([]);
 const finiteElementPurposeOptions = ref<any>(getPurposeList());
 
-onMounted(async () => {
-  // deptOptions.value = await getDeptListData();
-  TableFormRef.value.setOptionsFun('simType', getSimTypeList('机器人仿真'));
-});
+const loadFun = () => {
+  TableFormRef.value.setOptionsFun('simType', getSimTypeList('有限元仿真'));
+};
 
 const changeFun = async (cbData: any) => {
   const { key, data } = cbData;

src/views/task/simulationTask/newDemand/components/index.vue

@@ -67,12 +67,42 @@
     @close="closeFun"
   >
     <div v-if="diaVisible">
-      <Animation v-if="currentName === 'animation'" ref="CurrentRef" @submit="submitFun" :deptOptions="deptOptions"/>
-      <FiniteElement v-if="currentName === 'finiteElement'" ref="CurrentRef" @submit="submitFun" :deptOptions="deptOptions" />
-      <Industry v-if="currentName === 'industry'" ref="CurrentRef" @submit="submitFun" :deptOptions="deptOptions" />
-      <Logistics v-if="currentName === 'logistics'" ref="CurrentRef" @submit="submitFun" :deptOptions="deptOptions" />
-      <Robot v-if="currentName === 'robot'" ref="CurrentRef" @submit="submitFun" :deptOptions="deptOptions" />
-      <Tolerance v-if="currentName === 'tolerance'" ref="CurrentRef" @submit="submitFun" :deptOptions="deptOptions" />
+      <Animation
+        v-if="currentName === 'animation'"
+        ref="CurrentRef"
+        @submit="submitFun"
+        :deptOptions="deptOptions"
+      />
+      <FiniteElement
+        v-if="currentName === 'finiteElement'"
+        ref="CurrentRef"
+        @submit="submitFun"
+        :deptOptions="deptOptions"
+      />
+      <Industry
+        v-if="currentName === 'industry'"
+        ref="CurrentRef"
+        @submit="submitFun"
+        :deptOptions="deptOptions"
+      />
+      <Logistics
+        v-if="currentName === 'logistics'"
+        ref="CurrentRef"
+        @submit="submitFun"
+        :deptOptions="deptOptions"
+      />
+      <Robot
+        v-if="currentName === 'robot'"
+        ref="CurrentRef"
+        @submit="submitFun"
+        :deptOptions="deptOptions"
+      />
+      <Tolerance
+        v-if="currentName === 'tolerance'"
+        ref="CurrentRef"
+        @submit="submitFun"
+        :deptOptions="deptOptions"
+      />
     </div>
     <template #footer>
       <div>

src/views/task/simulationTask/newDemand/components/lib.ts

@@ -161,7 +161,6 @@ export const toggleMaterialNo = (data: any) => {
 
 // 处理有限元的确认人
 export const disposeFiniteElementDeptMember = async (editFormInfo: any, deptList: any[]) => {
-  console.log('editFormInfo', editFormInfo);
   let pMemberId = '';
   editFormInfo.pMemberList = '';
   editFormInfo.pMemberName = '';
@@ -198,7 +197,6 @@ export const disposeFiniteElementDeptMember = async (editFormInfo: any, deptList
 
 // 处理非有限元的确认人
 export const disposeNotFiniteElementDeptMember = async (editFormInfo: any, deptList: any[]) => {
-  console.log('editFormInfo', editFormInfo);
   let pMemberId = '';
   editFormInfo.pMemberList = '';
   editFormInfo.pMemberName = '';
@@ -207,8 +205,7 @@ export const disposeNotFiniteElementDeptMember = async (editFormInfo: any, deptL
   }
   for (let index = 0; index < deptList.length; index++) {
     if (editFormInfo.simType === deptList[index].deptName) {
-      editFormInfo.pMemberList =
-        deptList[index].userId + '-' + deptList[index].deptName;
+      editFormInfo.pMemberList = deptList[index].userId + '-' + deptList[index].deptName;
       pMemberId = deptList[index].userId;
       editFormInfo.pMemberName = deptList[index].userResp.nickname;
     }

src/views/task/simulationTask/newDemand/components/logistics.vue

@@ -27,6 +27,7 @@
           }"
           :hideKeys="hideKeys"
           :colNum="3"
+          @load="loadFun"
           @change="changeFun"
         >
           <template #form-pMemberList v-if="enableConfigByTenant([TENANT_ENUM.LYRIC])">
@@ -46,12 +47,11 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted } from 'vue';
+import { ref } from 'vue';
 import PlanningInformation from '@/tenants/lyric/views/task/components/planningInformation.vue';
 import TableForm from '@/components/common/table/tableForm.vue';
 import { enableConfigByTenant, TENANT_ENUM } from '@/tenants/tenant';
 import {
-  // getDeptListData,
   setPhaseListByProjectId,
   setMachineListByPhaseId,
   setWorkspaceListByMachineId,
@@ -60,11 +60,12 @@ import {
 } from './lib';
 import dayjs from 'dayjs';
 
-defineProps({
-  deptOptions: {
-    type: Array<any>,
-    default: () => [],
-  },
+interface Props {
+  deptOptions: any;
+}
+
+withDefaults(defineProps<Props>(), {
+  deptOptions: [],
 });
 
 const emits = defineEmits(['submit']);
@@ -92,12 +93,10 @@ CAD布局
 时序节拍参数`);
 
 const editFormInfo = ref<any>({});
-// const deptOptions = ref<any>([]);
 
-onMounted(async () => {
-  // deptOptions.value = await getDeptListData();
-  TableFormRef.value.setOptionsFun('simType', getSimTypeList('机器人仿真'));
-});
+const loadFun = () => {
+  TableFormRef.value.setOptionsFun('simType', getSimTypeList('物流仿真'));
+};
 
 const changeFun = async (cbData: any) => {
   const { key, data } = cbData;

src/views/task/simulationTask/newDemand/components/robot.vue

@@ -26,6 +26,7 @@
           :hideKeys="hideKeys"
           :colNum="3"
           @change="changeFun"
+          @load="loadFun"
         >
           <template #form-pMemberList v-if="enableConfigByTenant([TENANT_ENUM.LYRIC])">
             <el-select v-model="editFormInfo.pMemberList" filterable placeholder="请选择">
@@ -44,12 +45,11 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted } from 'vue';
+import { ref } from 'vue';
 import PlanningInformation from '@/tenants/lyric/views/task/components/planningInformation.vue';
 import TableForm from '@/components/common/table/tableForm.vue';
 import { enableConfigByTenant, TENANT_ENUM } from '@/tenants/tenant';
 import {
-  // getDeptListData,
   setPhaseListByProjectId,
   setMachineListByPhaseId,
   setWorkspaceListByMachineId,
@@ -57,11 +57,12 @@ import {
   toggleUrgencyDesc,
 } from './lib';
 
-defineProps({
-  deptOptions: {
-    type: Array<any>,
-    default: () => [],
-  },
+interface Props {
+  deptOptions: any;
+}
+
+withDefaults(defineProps<Props>(), {
+  deptOptions: [],
 });
 
 const emits = defineEmits(['submit']);
@@ -94,12 +95,10 @@ const attachmentRemark = ref(`
 `);
 
 const editFormInfo = ref<any>({});
-// const deptOptions = ref<any>([]);
 
-onMounted(async () => {
-  // deptOptions.value = await getDeptListData();
+const loadFun = () => {
   TableFormRef.value.setOptionsFun('simType', getSimTypeList('机器人仿真'));
-});
+};
 
 const changeFun = async (cbData: any) => {
   const { key, data } = cbData;

src/views/task/simulationTask/newDemand/components/tolerance.vue

@@ -23,6 +23,7 @@
           :hideKeys="hideKeys"
           :colNum="3"
           @change="changeFun"
+          @load="loadFun"
         >
           <template #form-pMemberList v-if="enableConfigByTenant([TENANT_ENUM.LYRIC])">
             <el-select v-model="editFormInfo.pMemberList" filterable placeholder="请选择">
@@ -41,12 +42,11 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted } from 'vue';
+import { ref } from 'vue';
 import PlanningInformation from '@/tenants/lyric/views/task/components/planningInformation.vue';
 import TableForm from '@/components/common/table/tableForm.vue';
 import { enableConfigByTenant, TENANT_ENUM } from '@/tenants/tenant';
 import {
-  // getDeptListData,
   setPhaseListByProjectId,
   setMachineListByPhaseId,
   setWorkspaceListByMachineId,
@@ -54,11 +54,12 @@ import {
   toggleUrgencyDesc,
 } from './lib';
 
-defineProps({
-  deptOptions: {
-    type: Array<any>,
-    default: () => [],
-  },
+interface Props {
+  deptOptions: any;
+}
+
+withDefaults(defineProps<Props>(), {
+  deptOptions: [],
 });
 
 const emits = defineEmits(['submit']);
@@ -87,12 +88,10 @@ const hideKeys = ref([
 const endTimeRemark = ref('【需求时间】请参考发图时间或客户评审时间');
 
 const editFormInfo = ref<any>({});
-// const deptOptions = ref<any>([]);
 
-onMounted(async () => {
-  // deptOptions.value = await getDeptListData();
-  TableFormRef.value.setOptionsFun('simType', getSimTypeList('机器人仿真'));
-});
+const loadFun = () => {
+  TableFormRef.value.setOptionsFun('simType', getSimTypeList('公差分析'));
+};
 
 const changeFun = async (cbData: any) => {
   const { key, data } = cbData;