设计管理优化

src/views/materials/materialsEquipment/materialReceive/index.vue

@@ -62,7 +62,7 @@
         <el-table-column label="供货单位" align="center" prop="supplierUnit" />
         <el-table-column label="设备材料入库/移交" align="center" prop="storageType">
           <template #default="scope">
-            <dict-tag :options="storage_type" :value="scope.row.storageType ? scope.row.storageType.split(',') : []" />
+            <dict-tag :options="storage_type" :value="scope.row.storageType" />
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" />
@@ -183,7 +183,7 @@
                       :prop="`itemList.${index}.acceptedQuantity`"
                       :rules="{ required: true, message: '验收数量不能为空', trigger: 'blur' }"
                     >
-                      <el-input  type="number" v-model="item.acceptedQuantity" placeholder="请输入验收" />
+                      <el-input type="number" v-model="item.acceptedQuantity" placeholder="请输入验收" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
@@ -235,11 +235,16 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="设备材料入库/移交" prop="storageType">
-              <el-checkbox-group v-model="form.storageType">
+              <el-radio-group v-model="form.storageType">
+                <el-radio v-for="dict in storage_type" :key="dict.value" :label="dict.value">
+                  {{ dict.label }}
+                </el-radio>
+              </el-radio-group>
+              <!-- <el-checkbox-group v-model="form.storageType">
                 <el-checkbox v-for="dict in storage_type" :key="dict.value" :label="dict.value">
                   {{ dict.label }}
                 </el-checkbox>
-              </el-checkbox-group>
+              </el-checkbox-group> -->
             </el-form-item> </el-col
           ><el-col :span="24"
             ><el-form-item label="备注" prop="remark">
@@ -317,7 +322,7 @@ const getInitFormData = () => {
     techDocCountFileId: undefined,
     licenseCount: undefined,
     licenseCountFileId: undefined,
-    storageType: [],
+    storageType: '',
     remark: undefined,
     docId: undefined,
     docCode: undefined,
@@ -425,12 +430,6 @@ const handleUpdate = async (row?: MaterialReceiveVO) => {
   const _id = row?.id || ids.value[0];
   const res = await getMaterialReceive(_id);
   Object.assign(form.value, res.data);
-  if (form.value.storageType && form.value.storageType.length) {
-    form.value.storageType = form.value.storageType.split(',');
-  } else {
-    form.value.storageType = [];
-  }
-
   // 为每个条目添加监听
   form.value.itemList.forEach((_, index) => {
     watchItemChanges(index);
@@ -445,11 +444,10 @@ const submitForm = () => {
   materialReceiveFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
-      form.value.storageType = form.value.storageType.join(',');
       if (form.value.id) {
-        await updateMaterialReceive(form.value).finally(() => (buttonLoading.value = false));
+        await updateMaterialReceive({ ...form.value }).finally(() => (buttonLoading.value = false));
       } else {
-        await addMaterialReceive(form.value).finally(() => (buttonLoading.value = false));
+        await addMaterialReceive({ ...form.value }).finally(() => (buttonLoading.value = false));
       }
       proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;

src/views/materials/materialsEquipment/materialReceive/word/index.vue

@@ -82,9 +82,9 @@
                   <span>是否附带以下随机资料</span>
                   <div class="file_detail">
                     <span>(1) 合格证 {{ formData.certCountFile ? formData.certCountFile.length : 0 }} 份</span>
-                    <span>(2) 出厂报告 {{ formData.reportCountFileId ? formData.reportCountFileId.length : 0 }} 份</span>
-                    <span>(3) 技术资料文件 {{ formData.techDocCountFileId ? formData.techDocCountFileId.length : 0 }} 份</span>
-                    <span>(4) 厂家资质文件 {{ formData.licenseCountFileId ? formData.licenseCountFileId.length : 0 }} 份</span>
+                    <span>(2) 出厂报告 {{ formData.reportCountFileId ? formData.reportCountFile.length : 0 }} 份</span>
+                    <span>(3) 技术资料文件 {{ formData.techDocCountFileId ? formData.techDocCountFile.length : 0 }} 份</span>
+                    <span>(4) 厂家资质文件 {{ formData.licenseCountFileId ? formData.licenseCountFile.length : 0 }} 份</span>
                   </div>
                 </td>
               </tr>

src/views/materials/purchaseDoc/index.vue

@@ -333,6 +333,9 @@ const data = reactive({
   },
   rules: {
     id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
+    docCode: [{ required: true, message: '采购单编号不能为空', trigger: 'blur' }],
+    planId: [{ required: true, message: '需求计划不能为空', trigger: 'blur' }],
+    mrpBaseId: [{ required: true, message: '需求批次号不能为空', trigger: 'blur' }],
     // 电话号码验证
     technicalDirectorTel: [
       { required: true, message: '请输入电话', trigger: 'blur' },

src/views/materials/purchaseDoc/indexEdit.vue

@@ -296,7 +296,7 @@ const submitCallback = async () => {
 };
 //审批
 const approvalVerifyOpen = async () => {
-  submitVerifyRef.value.openDialog(routeParams.value.taskId, true, routeParams.value.businessId);
+  submitVerifyRef.value.openDialog(routeParams.value.taskId, false, routeParams.value.businessId);
   // submitVerifyRef.value.openDialog(routeParams.value.taskId);
 };
 // 图纸上传成功之后 开始提交