From 48df3121fdc1a3d07823f272f2d502a7cfa59bce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Sat, 12 Oct 2024 15:31:39 +0800
Subject: [PATCH] =?UTF-8?q?custom/=E9=A2=86=E6=82=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/CustomBrowser/index.js         | 15 ++-----
 .../lingyue/vouncherSummary/index.js          | 45 ++++++++++++-------
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/pc4mobx/hrmSalary/components/CustomBrowser/index.js b/pc4mobx/hrmSalary/components/CustomBrowser/index.js
index b7afc211..92d2944f 100644
--- a/pc4mobx/hrmSalary/components/CustomBrowser/index.js
+++ b/pc4mobx/hrmSalary/components/CustomBrowser/index.js
@@ -30,24 +30,15 @@ class Index extends Component {
 
   componentDidMount() {
     const { value, fieldConfig } = this.props;
-    const { value: defaultValue, browserConditionParam: { replaceDatas = [] } } = fieldConfig;
-    if ((value || defaultValue) && replaceDatas.length > 0) {
+    const { browserConditionParam: { replaceDatas = [] } } = fieldConfig;
+    if (value && replaceDatas.length > 0) {
       this.setState({
-        searchKeys: (value || defaultValue).split(","),
+        searchKeys: value.split(","),
         selectedData: _.reduce(replaceDatas, (pre, cur) => ({ ...pre, [cur["id"]]: cur }), {})
       });
     }
   }
 
-  componentWillReceiveProps(nextProps, nextContext) {
-    if (
-      (nextProps.value !== this.props.value && _.isEmpty(nextProps.value)) ||
-      (nextProps.fieldConfig.value !== this.props.fieldConfig.value && _.isEmpty(nextProps.fieldConfig.value))
-    ) {
-      this.setState({ searchKeys: [], selectedData: [] });
-    }
-  }
-
   renderSingle = () => {
     const { fieldConfig } = this.props;
     const { selectedData, searchKeys } = this.state;
diff --git a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/vouncherSummary/index.js b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/vouncherSummary/index.js
index 538e6765..5ea76966 100644
--- a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/vouncherSummary/index.js
+++ b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/vouncherSummary/index.js
@@ -80,11 +80,12 @@ class Index extends Component {
                       }
                     }}
                     value={value}
-                    onCustomChange={(value) => {
-                      console.log("onCustomChange",value);
-                    }}
-                    onChange={(value) => onEdit({
-                      record: { ...record, [col["column"]]: value }, index
+                    onCustomChange={(value) => onEdit({
+                      record: {
+                        ...record, [`${col["column"]}Obj`]: _.values(value),
+                        [col["column"]]: _.map(_.values(value), o => o.bh).join(",")
+                      },
+                      index, key: "custom", value: _.map(_.values(value), o => o.bh).join(",")
                     })}
                   />;
                 }
@@ -105,32 +106,44 @@ class Index extends Component {
       dataSource: _.head(datas).dataSource,
       details: _.map(datas, o => ({
         zy: o.zy, kjkm: o.kjkm, jfValue: o.jfValue, dfValue: o.dfValue,
-        fzhsXmqs: !o.fzhsXmqs ? {} : _.isString(o.fzhsXmqs) ? o.fzhsXmqs : {
+        fzhsXmqs: !o.fzhsXmqs ? {} : _.isString(o.fzhsXmqs) ? {
+          bh: o.fzhsXmqsObj[0].bh,
+          fzhslxbh: o.fzhsXmqsObj[0].fzhslxbh
+        } : {
           bh: o.fzhsXmqs.bh,
           fzhslxbh: o.fzhsXmqs.fzhslxbh
         },
-        fzhsFwlb: !o.fzhsFwlb ? {} : _.isString(o.fzhsFwlb) ? o.fzhsFwlb : {
+        fzhsFwlb: !o.fzhsFwlb ? {} : _.isString(o.fzhsFwlb) ? {
+          bh: o.fzhsFwlbObj[0].bh,
+          fzhslxbh: o.fzhsFwlbObj[0].fzhslxbh
+        } : {
           bh: o.fzhsFwlb.bh,
           fzhslxbh: o.fzhsFwlb.fzhslxbh
         },
-        fzhsSllb: !o.fzhsSllb ? {} : _.isString(o.fzhsSllb) ? o.fzhsSllb : {
+        fzhsSllb: !o.fzhsSllb ? {} : _.isString(o.fzhsSllb) ? {
+          bh: o.fzhsSllbObj[0].bh,
+          fzhslxbh: o.fzhsSllbObj[0].fzhslxbh
+        } : {
           bh: o.fzhsSllb.bh,
-          fzhslxbh: o.fzhsFwlb.fzhslxbh
+          fzhslxbh: o.fzhsSllb.fzhslxbh
         },
-        fzhsKs: !o.fzhsKs ? {} : _.isString(o.fzhsKs) ? o.fzhsKs : {
+        fzhsKs: !o.fzhsKs ? {} : _.isString(o.fzhsKs) ? {
+          bh: o.fzhsKsObj[0].bh,
+          fzhslxbh: o.fzhsKsObj[0].fzhslxbh
+        } : {
           bh: o.fzhsKs.bh,
-          fzhslxbh: o.fzhsFwlb.fzhslxbh
+          fzhslxbh: o.fzhsKs.fzhslxbh
         },
-        fzhsOtherBmList: !o.fzhsOther ? [] : _.isString(o.fzhsOther) ? o.fzhsOther.split(",") : _.map(o.fzhsOther, o => (o.bh))
+        fzhsOtherBmList: !o.fzhsOther ? [] : _.isString(o.fzhsOther) ? _.map(o.fzhsOtherObj, k => ({
+          bh: k.bh, fzhslxbh: k.fzhslxbh
+        })) : _.map(o.fzhsOther, o => (o.bh))
       }))
     };
-    console.log(payload, datas);
-    return;
     this.setState({ loading: true });
-    API.pushUCAndSave(payload).then(({ status, errormsg }) => {
+    API.pushUCAndSave(payload).then(({ status, data, errormsg }) => {
       this.setState({ loading: false });
       if (status) {
-        message.success(getLabel(111, "操作成功！"));
+        message.success(data.errMsg);
         this.setState({ visible: false });
         setTimeout(() => window.close(), 1500);
       } else {