修复bug

src/pages/B_enterTibet/B1collect/B1edit/B1MoAdd/index.tsx

@@ -159,6 +159,7 @@ function B1MoAdd({ info, closeFu, succFu, look = false }: Props) {
                 options={cascaderObjFu()['年代']}
                 placeholder={look ? '（空）' : '请选择'}
                 fieldNames={{ label: 'name', value: 'id', children: 'children' }}
+                changeOnSelect
               />
             </Form.Item>
 
@@ -168,6 +169,7 @@ function B1MoAdd({ info, closeFu, succFu, look = false }: Props) {
                 options={cascaderObjFu()['年代']}
                 placeholder={look ? '（空）' : '请选择'}
                 fieldNames={{ label: 'name', value: 'id', children: 'children' }}
+                changeOnSelect
               />
             </Form.Item>
 
@@ -188,8 +190,8 @@ function B1MoAdd({ info, closeFu, succFu, look = false }: Props) {
                     readOnly={look}
                     min={0}
                     max={99999999}
-                    precision={2}
-                    placeholder={look ? '（空）' : '请输入数字，最多两位小数'}
+                    precision={3}
+                    placeholder={look ? '（空）' : '请输入数字，最多三位小数'}
                   />
                 </Form.Item>
 
@@ -198,8 +200,8 @@ function B1MoAdd({ info, closeFu, succFu, look = false }: Props) {
                     readOnly={look}
                     min={0}
                     max={99999999}
-                    precision={2}
-                    placeholder={look ? '（空）' : '请输入数字，最多两位小数'}
+                    precision={3}
+                    placeholder={look ? '（空）' : '请输入数字，最多三位小数'}
                   />
                 </Form.Item>
                 <Form.Item label='通高' name='sizeH'>
@@ -207,8 +209,8 @@ function B1MoAdd({ info, closeFu, succFu, look = false }: Props) {
                     readOnly={look}
                     min={0}
                     max={99999999}
-                    precision={2}
-                    placeholder={look ? '（空）' : '请输入数字，最多两位小数'}
+                    precision={3}
+                    placeholder={look ? '（空）' : '请输入数字，最多三位小数'}
                   />
                 </Form.Item>
 
@@ -229,8 +231,8 @@ function B1MoAdd({ info, closeFu, succFu, look = false }: Props) {
                   readOnly={look}
                   min={0}
                   max={99999999}
-                  precision={2}
-                  placeholder={look ? '（空）' : '请输入数字，最多两位小数'}
+                  precision={3}
+                  placeholder={look ? '（空）' : '请输入数字，最多三位小数'}
                 />
               </Form.Item>
 
@@ -249,8 +251,8 @@ function B1MoAdd({ info, closeFu, succFu, look = false }: Props) {
                     readOnly={look}
                     min={0}
                     max={99999999}
-                    precision={2}
-                    placeholder={look ? '（空）' : '请输入数字，最多两位小数'}
+                    precision={4}
+                    placeholder={look ? '（空）' : '请输入数字，最多四位小数'}
                   />
                 </Form.Item>
               </div>

src/pages/B_enterTibet/B2identify/B2edit/B2MoAdd/index.tsx

@@ -197,6 +197,7 @@ function B2MoAdd({ info, closeFu, succFu, look = false }: Props) {
                 options={cascaderObjFu()['年代']}
                 placeholder={look ? '（空）' : '请选择'}
                 fieldNames={{ label: 'name', value: 'id', children: 'children' }}
+                changeOnSelect
               />
             </Form.Item>
 
@@ -208,8 +209,8 @@ function B2MoAdd({ info, closeFu, succFu, look = false }: Props) {
                     readOnly={look}
                     min={0}
                     max={99999999}
-                    precision={2}
-                    placeholder={look ? '（空）' : '请输入数字，最多两位小数'}
+                    precision={3}
+                    placeholder={look ? '（空）' : '请输入数字，最多三位小数'}
                   />
                 </Form.Item>
 
@@ -218,8 +219,8 @@ function B2MoAdd({ info, closeFu, succFu, look = false }: Props) {
                     readOnly={look}
                     min={0}
                     max={99999999}
-                    precision={2}
-                    placeholder={look ? '（空）' : '请输入数字，最多两位小数'}
+                    precision={3}
+                    placeholder={look ? '（空）' : '请输入数字，最多三位小数'}
                   />
                 </Form.Item>
                 <Form.Item label='通高' name='sizeH'>
@@ -227,8 +228,8 @@ function B2MoAdd({ info, closeFu, succFu, look = false }: Props) {
                     readOnly={look}
                     min={0}
                     max={99999999}
-                    precision={2}
-                    placeholder={look ? '（空）' : '请输入数字，最多两位小数'}
+                    precision={3}
+                    placeholder={look ? '（空）' : '请输入数字，最多三位小数'}
                   />
                 </Form.Item>
 
@@ -249,8 +250,8 @@ function B2MoAdd({ info, closeFu, succFu, look = false }: Props) {
                   readOnly={look}
                   min={0}
                   max={99999999}
-                  precision={2}
-                  placeholder={look ? '（空）' : '请输入数字，最多两位小数'}
+                  precision={3}
+                  placeholder={look ? '（空）' : '请输入数字，最多三位小数'}
                 />
               </Form.Item>
 

src/pages/B_enterTibet/B34typeIn/B34MoAdd/index.tsx

@@ -202,6 +202,7 @@ function B34MoAdd({ info, closeFu, succFu, type, look = false }: Props) {
                 options={cascaderObjFu()['年代']}
                 placeholder={look ? '（空）' : '请选择'}
                 fieldNames={{ label: 'name', value: 'id', children: 'children' }}
+                changeOnSelect
               />
             </Form.Item>
 

src/pages/C_goodsManage/C1register/AddGoods/index.module.scss

@@ -109,6 +109,7 @@
             }
           }
         }
+
         .B3Nrow0 {
           .ant-input {
             width: 260px;

src/pages/C_goodsManage/C1register/AddGoods/index.tsx

@@ -38,6 +38,7 @@ export const cascaderChArr = [
   'source',
   'dictHouse1',
   'dictHouse2',
+  'preserveState',
   // 其他模块有的级联字段
   'dictAgeFirst'
 ]
@@ -545,6 +546,7 @@ function AddGoods({ nowSta, closeFu, succFu, isEdit, editSnap }: Props) {
                     placeholder='请选择'
                     fieldNames={{ label: 'name', value: 'id', children: 'children' }}
                     allowClear={false}
+                    changeOnSelect
                   />
                 </Form.Item>
               </div>
@@ -674,12 +676,6 @@ function AddGoods({ nowSta, closeFu, succFu, isEdit, editSnap }: Props) {
               </div>
 
               <div className='B3Nrow'>
-                <Form.Item label='保存状态' name='preserveState'>
-                  <TextArea maxLength={500} showCount placeholder='请输入内容' />
-                </Form.Item>
-              </div>
-
-              <div className='B3Nrow'>
                 <Form.Item label='色泽' name='color'>
                   <TextArea maxLength={500} showCount placeholder='请输入内容' />
                 </Form.Item>
@@ -698,10 +694,26 @@ function AddGoods({ nowSta, closeFu, succFu, isEdit, editSnap }: Props) {
               </div>
 
               <div className='B3Nrow'>
+                <Form.Item label='保存状态' name='preserveState'>
+                  <Cascader
+                    options={cascaderObjFu()['保存状态']}
+                    placeholder='请选择'
+                    fieldNames={{ label: 'name', value: 'id', children: 'children' }}
+                    allowClear={true}
+                  />
+                </Form.Item>
+                <div className='B3NrowDing'>
+                  <Form.Item label='著者' name='pressAuthor'>
+                    <Input maxLength={30} showCount placeholder='请输入内容' />
+                  </Form.Item>
+                </div>
+              </div>
+
+              {/* <div className='B3Nrow'>
                 <Form.Item label='著者' name='pressAuthor'>
                   <Input maxLength={30} showCount placeholder='请输入内容' />
                 </Form.Item>
-              </div>
+              </div> */}
 
               <div className='B3Nrow'>
                 <Form.Item label='版本' name='pressVersion'>
@@ -744,8 +756,8 @@ function AddGoods({ nowSta, closeFu, succFu, isEdit, editSnap }: Props) {
                     <InputNumber
                       min={0}
                       max={99999999}
-                      precision={2}
-                      placeholder='请输入数字，最多两位小数'
+                      precision={3}
+                      placeholder='请输入数字，最多三位小数'
                     />
                   </Form.Item>
 
@@ -753,16 +765,16 @@ function AddGoods({ nowSta, closeFu, succFu, isEdit, editSnap }: Props) {
                     <InputNumber
                       min={0}
                       max={99999999}
-                      precision={2}
-                      placeholder='请输入数字，最多两位小数'
+                      precision={3}
+                      placeholder='请输入数字，最多三位小数'
                     />
                   </Form.Item>
                   <Form.Item label='通高' name='sizeH'>
                     <InputNumber
                       min={0}
                       max={99999999}
-                      precision={2}
-                      placeholder='请输入数字，最多两位小数'
+                      precision={3}
+                      placeholder='请输入数字，最多三位小数'
                     />
                   </Form.Item>
 
@@ -795,8 +807,8 @@ function AddGoods({ nowSta, closeFu, succFu, isEdit, editSnap }: Props) {
                     <InputNumber
                       min={0}
                       max={99999999}
-                      precision={2}
-                      placeholder='请输入数字，最多两位小数'
+                      precision={3}
+                      placeholder='请输入数字，最多三位小数'
                     />
                   </Form.Item>
 

src/pages/C_goodsManage/C22goodEdit/data.ts

@@ -13,6 +13,9 @@ type C22baseFormDataType = {
   endTime: string
   status: string
   userType: string
+  // 藏品编辑新增字段
+  goodsNum: string
+  goodsName: string
 }
 
 export type C22InputKeyType = keyof C22baseFormDataType
@@ -28,7 +31,11 @@ export const C22baseFormData: C22baseFormDataType = {
   startTime: '',
   endTime: '',
   status: '',
-  userType: ''
+  userType: '',
+
+  // 藏品编辑新增字段
+  goodsNum: '',
+  goodsName: ''
 }
 
 // 藏品编辑模块(藏品登记模块/藏品删除模块)特有的按钮过滤

src/pages/C_goodsManage/C22goodEdit/index.module.scss

@@ -15,7 +15,7 @@
           display: flex;
           align-items: center;
           .ant-input {
-            width: 230px;
+            width: 154px;
           }
         }
       }

src/pages/C_goodsManage/C22goodEdit/index.tsx

@@ -248,6 +248,26 @@ function C22goodEdit() {
       <div className='C22top'>
         <div className='C22topll'>
           <div>
+            <span>藏品编号：</span>
+            <Input
+              placeholder='请输入藏品编号'
+              maxLength={30}
+              value={formData.goodsNum}
+              onChange={e => txtChangeFu(e.target.value, 'goodsNum')}
+            />
+          </div>
+
+          <div>
+            <span>藏品名称：</span>
+            <Input
+              placeholder='请输入藏品名称'
+              maxLength={30}
+              value={formData.goodsName}
+              onChange={e => txtChangeFu(e.target.value, 'goodsName')}
+            />
+          </div>
+
+          <div>
             <span>业务单号：</span>
             <Input
               placeholder='请输入业务单号'
@@ -257,20 +277,6 @@ function C22goodEdit() {
             />
           </div>
           <div>
-            <span>编辑类型：</span>
-            <Select
-              allowClear={true}
-              placeholder='全部'
-              style={{ width: 198 }}
-              value={formData.type ? formData.type : null}
-              onChange={e => setFormData({ ...formData, type: e })}
-              options={[
-                { value: 'DJ', label: '藏品登记' },
-                { value: 'BJ', label: '藏品编辑' }
-              ]}
-            />
-          </div>
-          <div>
             <span>发起部门：</span>
             <Input
               placeholder='请输入发起部门'
@@ -299,6 +305,20 @@ function C22goodEdit() {
       <div className='C22top'>
         <div className='C22topll'>
           <div>
+            <span>编辑类型：</span>
+            <Select
+              allowClear={true}
+              placeholder='全部'
+              style={{ width: 175 }}
+              value={formData.type ? formData.type : null}
+              onChange={e => setFormData({ ...formData, type: e })}
+              options={[
+                { value: 'DJ', label: '藏品登记' },
+                { value: 'BJ', label: '藏品编辑' }
+              ]}
+            />
+          </div>
+          <div>
             <span>发起日期范围：</span>
             <RangePicker
               value={
@@ -312,7 +332,7 @@ function C22goodEdit() {
             <Select
               allowClear={true}
               placeholder='全部'
-              style={{ width: 198 }}
+              style={{ width: 175 }}
               value={formData.status ? formData.status : null}
               onChange={e => setFormData({ ...formData, status: e })}
               options={selectObj['申请状态'].filter(v => v.label !== '待盘点')}
@@ -323,7 +343,7 @@ function C22goodEdit() {
             <span>选择角色：</span>
             <Select
               allowClear={true}
-              style={{ width: 198 }}
+              style={{ width: 175 }}
               placeholder='全部'
               options={selectObj['角色']}
               // fieldNames={{ value: 'id', label: 'roleName' }}

src/pages/Y_goodsDetails/Y1cathet/data.tsx

@@ -80,7 +80,13 @@ export const Y11infoArr2: ArrKeyType = [
       return txt1 + txt2 + txt3
     }
   },
-  { name: '保存状态', key: 'preserveState' },
+  {
+    name: '保存状态',
+    key: 'preserveState',
+    backFu: info => {
+      return resJiLianFu(info.preserveState)
+    }
+  },
   {
     name: '完残程度',
     key: 'dictTorn',

src/store/action/layout.ts

@@ -47,7 +47,7 @@ export const fileTypeRes = (fileName: string) => {
   let type = 'other'
 
   for (const k in fileObj) {
-    if (fileObj[k].includes(txt)) type = k
+    if (fileObj[k].includes(txt.toLowerCase())) type = k
   }
   return type
 }