md

src/utils/tool.js

@@ -405,20 +405,6 @@ export function randomCode(len = 16) {
   return stepNums.join('');
 }
 
-/**
- * 将目标对象中有的属性值与源对象中的属性值合并
- * @param {Object} target 目标对象
- * @param {Object} sources 源对象
- */
-export function objAssign(target, sources) {
-  for (const key in target) {
-    if (Object.hasOwnProperty.call(sources, key)) {
-      target[key] = sources[key];
-    }
-  }
-  return target;
-}
-
 /**
  * 判断对象类型
  * @param {*} obj 对象

src/views/sop/sop-monitor/violation-registration/add-violation-dialog.vue

@@ -107,7 +107,7 @@
 <script setup name="AddViolationDialog">
 import { ref, reactive, watch } from 'vue';
 import { VIOLATION_TYPE } from '@/config/constants';
-import { dictToOptionList, objAssign } from '@/utils/tool';
+import { dictToOptionList } from '@/utils/tool';
 import { saveViolation } from '@/api/sop';
 import { MessagePlugin } from 'tdesign-vue-next';
 
@@ -163,11 +163,9 @@ watch(
   () => props.visible,
   (val) => {
     if (val) {
-      const info = objAssign(
-        { crmNo: '', serviceId: null, sopNo: '' },
-        props.sop
-      );
-      formData = objAssign(initFormData, info);
+      formData.crmNo = props.sop.crmNo || '';
+      formData.serviceId = props.sop.serviceId || '';
+      formData.sopNo = props.sop.sopNo || '';
     }
   }
 );