合并

src/views/design/appointment/index.vue

@@ -476,7 +476,7 @@ const designUser = async () => {
     form.reviewers = [];
     form.approved = [];
     form.auditor = [];
-
+    disabledForm.value = false;
     if (res.code == 200 && Array.isArray(res.rows) && res.rows.length > 0) {
       disabledForm.value = true;
       // 1. 按用户类型分类数据（明确类型）

src/views/design/billofQuantities/indexEdit3.vue

@@ -113,7 +113,7 @@ const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
 //按钮组件
 const flowCodeOptions = [
   {
-    value: currentProject.value?.id + '_equipmentList',
+    value: currentProject.value?.id + '_materialsPlans',
     label: '物资设备清单审核'
   }
 ];

src/views/design/designChange/indexEdit.vue

@@ -314,14 +314,14 @@ let volumeMap = new Map();
 
 const handleSelect = (val) => {
   let obj = volumeMap.get(val);
-  console.log('🚀 ~ handleSelect ~ obj:', obj);
-
   fileVoList.value = obj.fileVoList;
   designId.value = obj.design;
   form.value.volumeName = obj.volumeName;
   form.value.specialty = obj.specialty;
   form.value.specialtyName = obj.specialtyName;
   form.value.extendDetail.subName = obj.designSubitem;
+  form.value.saveFile = [];
+  getBlueprintList();
 };
 // 获取图纸列表
 const blueprintListAll = ref([]);
@@ -331,9 +331,6 @@ const getBlueprintList = async () => {
 };
 const handleRadio = (val) => {
   form.value.saveFile = [];
-  if (val == 2) {
-    getBlueprintList();
-  }
 };
 
 /** 表单重置 */
@@ -351,8 +348,15 @@ const getInfo = () => {
     let id = routeParams.value.id.split('_')[0];
     const res = await getDesignChange(id);
     Object.assign(form.value, res.data);
-    console.log(form.value);
-
+    if (form.value.status != 'draft') {
+      form.value.id = id + '_audit';
+    }
+    if (form.value.extendDetail.designDisposal == 2) {
+      let obj = volumeMap.get(form.value.volumeNo);
+      designId.value = obj.design;
+      form.value.saveFile = form.value.saveFile.split(',');
+      getBlueprintList();
+    }
     if (form.value.changeReason.length > 0) {
       form.value.changeReason = form.value.changeReason.split(',');
     }
@@ -381,8 +385,11 @@ const submitForm = (status1: string) => {
       if (valid) {
         buttonLoading.value = true;
         var res;
+        delete form.value.id;
         res = await addDesignChange({ ...form.value, changeReason, saveFile }).finally(() => (buttonLoading.value = false));
         if (res.code == 200) {
+          routeParams.value.type = 'update';
+          form.value = res.data;
           if (form.value.costEstimation == '0') {
             ElMessage.success('通知成功');
             goBack();
@@ -425,6 +432,9 @@ const handleStartWorkFlow = async (data: LeaveForm) => {
 };
 //审批记录
 const handleApprovalRecord = () => {
+  if (form.value.id.indexOf('_audit') == -1) {
+    form.value.id = form.value.id + '_audit';
+  }
   approvalRecordRef.value.init(form.value.id);
 };
 //提交回调

src/views/design/subcontract/index.vue

@@ -49,7 +49,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button v-hasPermi="['design:subcontract:add']" :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>

src/views/design/volumeCatalog/index.vue

@@ -109,7 +109,12 @@
           </el-select>
         </el-form-item>
         <el-form-item label="设计人员" prop="principal">
-          <el-select :disabled="!form.specialty" v-model="form.principal" placeholder="请选择设计人员" class="transition-all duration-300 border-gray-300">
+          <el-select
+            :disabled="!form.specialty"
+            v-model="form.principal"
+            placeholder="请选择设计人员"
+            class="transition-all duration-300 border-gray-300"
+          >
             <el-option v-for="item in userAppList" :key="item.userId" :label="item.userName" :value="item.userId.toString()" />
           </el-select>
         </el-form-item>
@@ -146,12 +151,16 @@
           /></el-select>
         </el-form-item>
         <el-form-item v-if="uploadForm.type == '3'" label="蓝图" prop="fileIds">
+<<<<<<< HEAD
           <file-upload
             :fileType="['pdf']"
             :isShowTip="false"
             :fileSize="100"
  .           v-model="uploadForm.fileIds"
           ></file-upload>
+=======
+          <file-upload :fileType="['pdf']" :isShowTip="false" :fileSize="100" v-model="uploadForm.fileIds"></file-upload>
+>>>>>>> 8a3f338e2734575bcb743e917b1232bedc76f105
         </el-form-item>
         <el-form-item v-if="uploadForm.type == '1'" label="过程图纸" prop="cancellationIds">
           <file-upload :fileType="['pdf']" :isShowTip="false" :fileSize="100" v-model="uploadForm.cancellationIds"></file-upload>
@@ -252,7 +261,8 @@ import {
   delVolumeCatalog,
   addVolumeCatalog,
   updateVolumeCatalog,
-  uploadVolumeFile,majorList,
+  uploadVolumeFile,
+  majorList,
   getVolumeCatafileList,
   volumeFileList
 } from '@/api/design/volumeCatalog';
@@ -263,10 +273,10 @@ import TableContent from './comm/tableContent.vue';
 const fileList = ref([]);
 import { designUserList } from '@/api/design/appointment';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { design_state, wf_business_status, } = toRefs(proxy?.useDict('design_state', 'wf_business_status'));
+const { design_state, wf_business_status } = toRefs(proxy?.useDict('design_state', 'wf_business_status'));
 import { drawingreviewReceiptsDetail, drawingreviewReceiptsList } from '@/api/design/drawingreview';
 const volumeCatalogList = ref<VolumeCatalogVO[]>([]);
-const des_user_major= ref([]);
+const des_user_major = ref([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
@@ -361,21 +371,21 @@ const data = reactive({
     documentName: [{ required: true, message: '资料名称不能为空', trigger: 'blur' }],
     plannedCompletion: [{ required: true, message: '计划出图事件不能为空', trigger: 'blur' }],
     principal: [{ required: true, message: '设计人员不能为空', trigger: 'blur' }],
-    specialty: [{ required: true, message: '专业不能为空', trigger: 'blur' }],
+    specialty: [{ required: true, message: '专业不能为空', trigger: 'blur' }]
   }
 });
 
 const { queryParams, form, rules } = toRefs(data);
-const changeSpecialty=(val)=>{
+const changeSpecialty = (val) => {
   form.value.principal = ''; //清空
   getUserAppList(val);
-}
+};
 // 获取专业列表
 const getSpecialtyList = async () => {
-  const res = await majorList({ projectId: currentProject.value?.id ,userType:2});
+  const res = await majorList({ projectId: currentProject.value?.id, userType: 2 });
   console.log(res);
   if (res.code === 200) {
-   des_user_major.value = res.data;
+    des_user_major.value = res.data;
   }
 };
 /** 查询卷册目录列表 */
@@ -390,7 +400,7 @@ const getList = async () => {
   }
 };
 const getUserAppList = async (userMajor) => {
-  const res = await designUserList({ projectId: currentProject.value?.id ,userType:2,userMajor});
+  const res = await designUserList({ projectId: currentProject.value?.id, userType: 2, userMajor });
   if (res.code === 200) {
     userAppList.value = res.rows;
   }
@@ -655,7 +665,7 @@ const handleAuditInfo = (row) => {
   // 审核图纸
 };
 onMounted(() => {
-    getSpecialtyList();
+  getSpecialtyList();
   getList();
 });