Merge branch 'develop_0715' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into develop_0715

src/components/DDComponents/DDPhotoField/index.js

@@ -11,8 +11,8 @@ function DDPhotoField(props) {
   const OnModelFileDone = file => {
     var path = ossData.host + '/' + file.url;
     let newValue = [...value, path];
-    onChange(newValue);
     setValue(newValue);
+    onChange(JSON.stringify(newValue));
   };
   const OnUploading = file => {};
 
@@ -26,7 +26,7 @@ function DDPhotoField(props) {
     <div>
       <div>
         {value.map(img => (
-          <Image width={200} src={img} />
+          <Image height={200} src={img} />
         ))}
       </div>
       <AliyunOssUploader

src/components/DDComponents/DepartmentField/index.js

@@ -31,7 +31,7 @@ function DepartmentField(props) {
   const onChangeValue = newValue => {
     console.log(newValue);
     let dep = treeData.find(dep => dep.id == newValue);
-    onChange(dep?.title);
+    onChange({ value: dep?.title, extValue: JSON.stringify([{ name: dep?.title }]) });
   };
 
   useEffect(() => {

src/pages/PurchaseAdmin/PurchaseList/Detail/CommitAuditModal.js

@@ -267,6 +267,14 @@ function CommitAuditModal(props) {
               .map(item => {
                 const itemProps = item.props;
                 if (!itemProps.label) return;
+                let val = allValues[itemProps.id];
+                if (val instanceof Object) {
+                  return {
+                    name: itemProps.label,
+                    id: itemProps.id,
+                    ...val,
+                  };
+                }
                 return {
                   name: itemProps.label,
                   // id: itemProps.id,