111

src/pages/repair/failure/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-12-02 11:41:03
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2023-02-08 13:22:34
+ * @Last Modified time: 2023-02-10 17:58:21
  */
 
 import * as React from 'react';
@@ -79,17 +79,7 @@ function Failure(props) {
         </PremButton>
       );
     } else {
-      return (
-        <PremButton
-          btn={{
-            size: 'small',
-            type: 'danger',
-            disabled: true,
-          }}
-        >
-          删除
-        </PremButton>
-      );
+      return <></>;
     }
   };
 

src/pages/setting/users/columns.js

@@ -12,7 +12,7 @@ function getcolumns(setDrawer, ifs, formRef) {
       title: '用户名-姓名',
       dataIndex: 'username',
       width: 120,
-      key: 'username',
+      key: 'usernamefullname',
       hideInTable: true,
       search: false,
       formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },

src/pages/setting/users/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-11-09 14:44:44
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-12-19 10:32:30
+ * @Last Modified time: 2023-02-10 17:54:56
  */
 
 import * as React from 'react';
@@ -68,7 +68,7 @@ function User(props) {
             setDrawer((s) => ({
               ...s,
               visible: true,
-              item: row,
+              item: { ...row, usernamefullname: `${row?.username}-${row?.fullName}` },
               type: 'edit',
               title: '编辑',
               val: 'only',
@@ -176,10 +176,11 @@ function User(props) {
               }
               let params = {
                 ...vals,
-                username: vals?.username.slice(0, vals?.username?.indexOf('-')),
+                username: vals?.usernamefullname.slice(0, vals?.usernamefullname?.indexOf('-')),
                 id: drawer?.title == '编辑' ? drawer?.item?.id : '',
                 userCharReqList,
               };
+              delete params.usernamefullname;
               delete params.shopId;
               //console.log(params, '!!!!');
               let res = await doFetch({
@@ -212,6 +213,7 @@ function User(props) {
       case 'edit':
         return (
           <ExtendField
+            defaultFormValue={drawer.item}
             setDrawer={setDrawer}
             drawer={drawer}
             actionRef={actionRef}
@@ -231,10 +233,12 @@ function User(props) {
               }
               let params = {
                 ...vals,
+                username: vals?.usernamefullname.slice(0, vals?.usernamefullname?.indexOf('-')),
                 id: drawer?.title == '编辑' ? drawer?.item?.id : '',
                 userCharReqList,
               };
               delete params.shopId;
+              delete params.usernamefullname;
               //console.log(params, '!!!!');
               let res = await doFetch({
                 url: urlParams.save,

src/pages/spare/outstore/index.jsx

@@ -142,7 +142,7 @@ function Outstore(props) {
               setdrawer((s) => ({
                 ...s,
                 open: true,
-                item: null,
+                item: { outType: '2' },
                 title: '新增',
                 val: 'add',
               }));

src/pages/spare/setting/index.jsx

@@ -121,6 +121,7 @@ function Setting(props) {
         actionRef={actionRef}
         path={pathconfig?.list || '/ngic-auth/sysUser/query/page'}
         pageextra={pathconfig?.enableadd ? 'add' : null}
+        childposition="left"
         resizeable={false}
         addconfig={{
           // access: 'sysDepartment_save',
@@ -130,7 +131,7 @@ function Setting(props) {
               setdrawer((s) => ({
                 ...s,
                 open: true,
-                item: null,
+                item: { isLife: 1 },
                 title: '新增',
                 val: 'add',
               }));

src/pages/spare/supplier/index.jsx

@@ -158,7 +158,7 @@ function Supplier(props) {
               setdrawer((s) => ({
                 ...s,
                 open: true,
-                item: null,
+                item: { status: 1 },
                 title: '新增',
                 val: 'add',
               }));