Sfoglia il codice sorgente

fix: 软件锁相关修改

outaozhen 4 anni fa
parent
commit
e0b1308bb6

+ 7 - 11
src/pages/Product/Lock/LockStore/components/LocksDetail/LockModal.jsx

@@ -73,7 +73,8 @@ const LockModal = props => {
     if (type === lockTypeEnum.CHANGE) {
       const { data: { longle, total } = { longle: [], total: 0 }, code = -1 } = await queryLock({
         ...params,
-        waiver: true
+        waiver: true,
+        recordAction: '更换'
       })
       if (code === consts.RET_CODE.SUCCESS) {
         if (params?.current === 1) {
@@ -268,8 +269,7 @@ const LockModal = props => {
             </Button>
           </div>
         )
-      }
-    >
+      }>
       {type === lockTypeEnum.SALE ? (
         <div className="text-center mb-6">
           <Radio.Group value={state.sellStatus} buttonStyle="solid" onChange={checkGroupOnChange}>
@@ -284,8 +284,7 @@ const LockModal = props => {
           className={styles.modalContainer}
           ref={scrollRef}
           onScroll={handleListScroll}
-          style={{ paddingBottom: 0 }}
-        >
+          style={{ paddingBottom: 0 }}>
           <div className={styles.modalContent}>
             <Spin spinning={state.loading}>
               {type === lockTypeEnum.SALE &&
@@ -300,8 +299,7 @@ const LockModal = props => {
                         title="确认选择ta"
                         onConfirm={() => connectClient(item.id)}
                         okText="确认"
-                        cancelText="取消"
-                      >
+                        cancelText="取消">
                         <Button type="primary" size="small">
                           选择ta
                         </Button>
@@ -319,8 +317,7 @@ const LockModal = props => {
                         title="确认选择ta"
                         onConfirm={() => connectLongle(item.id)}
                         okText="确认"
-                        cancelText="取消"
-                      >
+                        cancelText="取消">
                         <Button type="primary" size="small">
                           更换
                         </Button>
@@ -354,8 +351,7 @@ const LockModal = props => {
                     return Promise.resolve(value)
                   }
                 })
-              ]}
-            >
+              ]}>
               <Select
                 placeholder="请选择产品"
                 onDropdownVisibleChange={async e => {

+ 8 - 15
src/pages/Product/Lock/LockStore/components/LocksDetail/TabList.jsx

@@ -119,9 +119,8 @@ const LockTabList = props => {
                         {servicelogEnum[item.status]}{' '}
                         <span
                           className="textPurple text-hex-967bbd cursor-pointer"
-                          onClick={handleClientClick}
-                        >
-                          {item.client}
+                          onClick={handleClientClick}>
+                          {item.status !== 6 ? <>{item.client}</> : null}
                         </span>
                         <br />
                         <a>@{item.operator}</a>{' '}
@@ -143,8 +142,7 @@ const LockTabList = props => {
                             title="确认删除"
                             onConfirm={() => delLonglelog(item.id)}
                             okText="确认"
-                            cancelText="取消"
-                          >
+                            cancelText="取消">
                             <Button className="mt-2" type="primary" ghost size="small" danger>
                               删除
                             </Button>
@@ -168,8 +166,7 @@ const LockTabList = props => {
             className="mr-3px"
             onClick={() =>
               setAddLonglelog({ ...setAddLonglelog, visible: true, type: lockTypeEnum.RECEIVE })
-            }
-          >
+            }>
             接收
           </Button>
         ) : null}
@@ -181,8 +178,7 @@ const LockTabList = props => {
             className="mr-3px"
             onClick={() =>
               setAddLonglelog({ ...setAddLonglelog, visible: true, type: lockTypeEnum.SALE })
-            }
-          >
+            }>
             借销赠
           </Button>
         ) : null}
@@ -209,8 +205,7 @@ const LockTabList = props => {
                 visible: true,
                 type: lockTypeEnum.CHANGE
               })
-            }
-          >
+            }>
             更换
           </Button>
         ) : null}
@@ -221,8 +216,7 @@ const LockTabList = props => {
           className="mr-1"
           onClick={() =>
             setAddLonglelog({ ...setAddLonglelog, visible: true, type: lockTypeEnum.RECOVER })
-          }
-        >
+          }>
           收回
         </Button>
         <Button
@@ -231,8 +225,7 @@ const LockTabList = props => {
           size="small"
           onClick={() =>
             setAddLonglelog({ ...setAddLonglelog, visible: true, type: lockTypeEnum.REMARK })
-          }
-        >
+          }>
           备注
         </Button>
 

+ 1 - 0
src/pages/Product/Lock/LockStore/index.jsx

@@ -262,6 +262,7 @@ const LockStore = ({ prodList = [], dispatch, shouldUpdate }) => {
       filters: true,
       filterMultiple: false,
       valueEnum: {
+        99: { text: '未销售' },
         1: { text: '借出' },
         2: { text: '销售' },
         3: { text: '赠送' }