lanjianrong 5 سال پیش
والد
کامیت
736567033f

+ 1 - 1
src/components/EditableForm/src/editableFormItem.jsx

@@ -218,7 +218,7 @@ const EditableFormItem = ({
   }
 
   return (
-    <Col span={span}>
+    <Col span={24} xl={{ span }}>
       <Row wrap={false} className="border-t-1px border-hex-f3f3f3 border-solid pt-8px pb-8px">
         <Col flex="100px" className="text-right">
           <span className="leading-32px mr-10px">{label}:</span>

+ 49 - 10
src/pages/Product/Lock/Lockstore/components/LocksDetail/Form.jsx

@@ -37,7 +37,8 @@ const LockForm = props => {
     })
     toggleDrawer()
   }
-  const longleStatusNum = {
+  // 出库状态
+  const longleStockStatusNum = {
     1: '生成',
     2: '接收'
   }
@@ -61,10 +62,10 @@ const LockForm = props => {
   return (
     <div>
       <Row>
-        <Col span={15}>
+        <Col span={16}>
           <h2 className="text-2xl pb-4">{longle.keyNum}</h2>
         </Col>
-        <Col span={9} className="text-right text-gray-500">
+        <Col span={8} className="text-right text-gray-500">
           {longle.staffName} 创建于 {longle.makeDay}
         </Col>
       </Row>
@@ -80,25 +81,63 @@ const LockForm = props => {
         <Divider style={{ margin: '12px 0' }} />
         <Col span={6}>期限</Col>
         <Col span={18}>{longle.allotedTime}</Col>
+      </Row>
+      <Row>
         <Divider style={{ margin: '12px 0' }} />
-        <Col span={6}>使用状态</Col>
-        <Col span={18}>{longleStatusNum[longle.status]}</Col>
+        <Col span={12}>
+          <Row>
+            <Col span={9}>出库状态</Col>
+            <Col span={13}>{longleStockStatusNum[longle.stockStatus]}</Col>
+          </Row>
+        </Col>
+        <Col span={12}>
+          <Row>
+            <Col span={9}>出库时间</Col>
+            <Col span={13}>{dayjsFormat(longle.stockTime, 'YYYY-MM-DD')}</Col>
+          </Row>
+        </Col>
+        <Divider style={{ margin: '12px 0' }} />
+        <Col span={12}>
+          <Row>
+            <Col span={9}>销售状态</Col>
+            <Col span={13}>{longleSellStatusNum[longle.sellStatus]}</Col>
+          </Row>
+        </Col>
+        <Col span={12}>
+          <Row>
+            <Col span={9}>销售时间</Col>
+            <Col span={13}>{dayjsFormat(longle.sellTime, 'YYYY-MM-DD')}</Col>
+          </Row>
+        </Col>
+        <Divider style={{ margin: '12px 0' }} />
+        <Col span={12}>
+          <Row>
+            <Col span={9}>维护状态</Col>
+            <Col span={13}>{longlePreserveStatusNum[longle.preserveStatus]}</Col>
+          </Row>
+        </Col>
+        <Col span={12}>
+          <Row>
+            <Col span={9}>维护时间</Col>
+            <Col span={13}>{dayjsFormat(longle.preserveTime, 'YYYY-MM-DD')}</Col>
+          </Row>
+        </Col>
+        {/* <Col span={6}>使用状态</Col> */}
+        {/* <Col span={18}>{longleStatusNum[longle.status]}</Col> */}
         <Divider style={{ margin: '12px 0' }} />
         <Col span={6}>负责人</Col>
         <Col span={18}>{longle.responsible}</Col>
         <Divider style={{ margin: '12px 0' }} />
-        <Col span={6}>联系人</Col>
+        <Col span={6}>客户</Col>
         <Col span={18}>
           <span className="textPurple text-hex-967bbd cursor-pointer" onClick={handleCompanyClick}>
             {longle.customerName}
           </span>
         </Col>
         <Divider style={{ margin: '12px 0' }} />
-        <Col span={6}>客户</Col>
+        <Col span={6}>联系人</Col>
         <Col span={18}>
-          <span className="textPurple text-hex-967bbd cursor-pointer" onClick={handleCompanyClick}>
-            {longle.customerName}
-          </span>
+          <ChangeClient dataSource={changeCopInputData} />
         </Col>
         <Divider style={{ margin: '12px 0' }} />
         <Col span={6}>注册码</Col>