shaogen1995 2 năm trước cách đây
mục cha
commit
246f5545c2

+ 3 - 0
src/components/ObjectAdd/index.css

@@ -93,6 +93,9 @@
 .ObjectAdd .formRowFull .ant-form-item .ant-select-in-form-item {
   width: 858px;
 }
+.ObjectAdd .formRowLast {
+  margin-top: -20px;
+}
 .ObjectAdd .fileBox .fileBoxRow {
   margin-bottom: 24px;
   display: flex;

+ 6 - 1
src/components/ObjectAdd/index.less

@@ -87,7 +87,8 @@
       input {
         width: 298px;
       }
-      .ant-input-number{
+
+      .ant-input-number {
         width: 300px;
       }
 
@@ -129,6 +130,10 @@
     }
   }
 
+  .formRowLast {
+    margin-top: -20px;
+  }
+
   // 附件
   .fileBox {
     .fileBoxRow {

+ 16 - 0
src/components/ObjectAdd/index.tsx

@@ -6,6 +6,7 @@ import {
   InputNumber,
   Modal,
   Popconfirm,
+  Radio,
   Select,
   Table,
 } from "antd";
@@ -58,6 +59,7 @@ function ObjectAdd({ id, colsePage, editId, dirCode, upInfoAPIFu }: Props) {
     for (const k in values) {
       if (values[k]) oldObj[k] = values[k];
     }
+
     // 外形尺寸 3个 字段 变成一个组数
     const size = [values.size1, values.size2, values.size3];
     // 具体质量 + 单位
@@ -91,6 +93,7 @@ function ObjectAdd({ id, colsePage, editId, dirCode, upInfoAPIFu }: Props) {
       registerId: dirCode,
       dictAge,
       dictTexture,
+      display: values.display,
     };
 
     // -----------------藏品修改
@@ -266,6 +269,7 @@ function ObjectAdd({ id, colsePage, editId, dirCode, upInfoAPIFu }: Props) {
         dictQualityScope: options6[0].name ? options6[0].name : null,
         complete: options7[0].name ? options7[0].name : null,
         dictCheckInScope: options9[0].name ? options9[0].name : null,
+        display: 0,
       });
       // 初始化附件仓库信息
       dispatch({
@@ -804,6 +808,18 @@ function ObjectAdd({ id, colsePage, editId, dirCode, upInfoAPIFu }: Props) {
                 />
               </Form.Item>
             </div>
+            <div className="formRow formRowLast">
+              <Form.Item
+                rules={[{ required: true, message: "不能为空!" }]}
+                label="展示状态"
+                name="display"
+              >
+                <Radio.Group>
+                  <Radio value={1}> 是 </Radio>
+                  <Radio value={0}> 否 </Radio>
+                </Radio.Group>
+              </Form.Item>
+            </div>
           </div>
           {/* -----------------------附件信息 */}
           <div hidden={titSelect === "tit1"}>

+ 4 - 1
src/pages/ObjectSon/Object2/index.tsx

@@ -156,6 +156,10 @@ export default function Object2() {
         dataIndex: "dictTexture",
       },
       {
+        title: "展示状态",
+        render: (item: any) => (item.display ? "是" : "否"),
+      },
+      {
         title: "状态",
         dataIndex: "storageStatusTxt",
       },
@@ -181,7 +185,6 @@ export default function Object2() {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-
   // 点击导出
   const deriveFu = useCallback(async () => {
     if (results.list.length === 0)

+ 6 - 0
src/pages/ObjectSon/Object5/AuditObject5/index.tsx

@@ -64,6 +64,12 @@ function AuditObject5() {
             oldVal: `通长:${oldValArr[0]}cm,通宽:${oldValArr[1]}cm,通高:${oldValArr[2]}cm`,
             newVal: `通长:${newValArr[0]}cm,通宽:${newValArr[1]}cm,通高:${newValArr[2]}cm`,
           });
+        } else if (k === "display") {
+          list.push({
+            label: goodsChangeObj[k],
+            oldVal: oldData[k] === 1 ? "是" : "否",
+            newVal: newData[k] === 1 ? "是" : "否",
+          });
         } else {
           list.push({
             label: goodsChangeObj[k],

+ 6 - 0
src/pages/ObjectSon/Object5/LookObject5/index.tsx

@@ -53,6 +53,12 @@ function LookObject5() {
             oldVal: `通长:${oldValArr[0]}cm,通宽:${oldValArr[1]}cm,通高:${oldValArr[2]}cm`,
             newVal: `通长:${newValArr[0]}cm,通宽:${newValArr[1]}cm,通高:${newValArr[2]}cm`,
           });
+        } else if (k === "display") {
+          list.push({
+            label: goodsChangeObj[k],
+            oldVal: oldData[k] === 1 ? "是" : "否",
+            newVal: newData[k] === 1 ? "是" : "否",
+          });
         } else {
           list.push({
             label: goodsChangeObj[k],

+ 1 - 0
src/utils/dataChange.ts

@@ -24,6 +24,7 @@ export const goodsChangeObj = {
   vision: "版本",
   onFile: "存卷",
   description: "来源说明",
+  display: "展示状态",
   thumb: "藏品图片",
   fileIds: "附件信息",
 } as any;