Merge branch 'dev' of http://git.ycjcjy.com/jgz/admin into dev

src/pages/purchase/bill/edit/index.jsx

@@ -12,11 +12,13 @@ import {
   ProFormDigit,
 } from "@ant-design/pro-components";
 import { useNavigate, useSearchParams } from "react-router-dom";
-import { Card, Col, message, Row, Space, Form, Button } from "antd";
+import { Card, Col, Modal, Row, Space, Form, Button } from "antd";
 import { useEffect, useRef, useState } from "react";
-import { MinusCircleOutlined, PlusOutlined } from "@ant-design/icons";
+import { ExclamationCircleOutlined } from '@ant-design/icons';
 import { floatMultiply, floatDivide } from "@/utils/float";
 
+const { confirm } = Modal;
+
 export default (props) => {
   const [searchParams] = useSearchParams();
   const id = searchParams.get("id");
@@ -53,8 +55,6 @@ export default (props) => {
   }, [id]);
 
   const onFinish = async (values) => {
-    console.log(values, "===");
-
     let data = {
       id: id ? Number(id) : null,
       ...values,
@@ -74,9 +74,15 @@ export default (props) => {
   };
 
   const onBillFinish = ({ form }) => {
-    form.validateFields().then((res) => {
-      console.log(res, "===--");
-      onFinish({ ...res, isCompleted: true });
+    confirm({
+      title: '确认采购完成?',
+      icon: <ExclamationCircleOutlined />,
+      content: '确定之后, 将不能再做修改!',
+      onOk: () => {
+        form.validateFields().then((res) => {
+          onFinish({ ...res, isCompleted: true });
+        });
+      }
     });
   };
 
@@ -184,7 +190,10 @@ export default (props) => {
                         name={[name, "actAmount"]}
                         label="采购数量"
                         placeholder="请输入采购数量"
-                        rules={[{ required: true, message: "请输入采购数量" }]}
+                        rules={[
+                          { required: true, message: "请输入采购数量" },
+                          { validator: (_, val) => val > 0 ? Promise.resolve() : Promise.reject(), message: "采购数量必须大于0" },
+                        ]}
                         width={100}
                         fieldProps={{
                           precision: 10,
@@ -196,7 +205,10 @@ export default (props) => {
                         name={[name, "actUnitPrice"]}
                         label="采购单价"
                         placeholder="请输入采购单价"
-                        rules={[{ required: true, message: "请输入采购单价" }]}
+                        rules={[
+                          { required: true, message: "请输入采购单价" },
+                          { validator: (_, val) => val > 0 ? Promise.resolve() : Promise.reject(), message: "采购单价必须大于0" },
+                        ]}
                         fieldProps={{ precision: 2, prefix: "￥" }}
                         width={100}
                       />

src/pages/purchase/inStore/edit/index.jsx

@@ -1,45 +1,45 @@
 import {
-  savePurchaseInStore,
   getPurchaseDetail,
+  savePurchaseInStore,
 } from "@/services/purchase";
 import { getStoreList } from "@/services/stock";
-import {
-  PageContainer,
-  ProForm,
-  ProFormSelect,
-  ProFormText,
-  ProFormDigit,
-} from "@ant-design/pro-components";
 import { useNavigate, useSearchParams } from "react-router-dom";
-import { Card, Col, message, Row, Space, Form, Button } from "antd";
-import { useEffect, useRef, useState } from "react";
-import { MinusCircleOutlined, PlusOutlined } from "@ant-design/icons";
+import { Card, Descriptions, Button } from "antd";
+import { useEffect, useMemo, useState } from "react";
+import moment from "moment";
 import { floatMultiply, floatDivide } from "@/utils/float";
+import useBool from "@/utils/hooks/useBool";
+
+const Item = Descriptions;
 
 export default (props) => {
   const [searchParams] = useSearchParams();
   const id = searchParams.get("id");
   const [storeList, setStoreList] = useState([]);
-  const [isInStore, setIsInStore] = useState(false);
+  const [detail, setDetail] = useState({});
   const navigate = useNavigate();
+  const [loading, startLoading, cancelLoading] = useBool();
+
+  const dtStr = useMemo(() => detail.completedDate ? moment(detail.completedDate).format('YYYY-MM-DD'): '', [detail.completedDate]);
+
+  const onSumbit = () => {
+    startLoading()
+    savePurchaseInStore(id).then(() => {
+      cancelLoading()
+      setDetail({ ...detail, isInStore: true })
+    }).catch(cancelLoading)
+  }
   
-  const formRef = useRef();
   useEffect(() => {
     getStoreList({ pageSize: 9999 }).then((res) => {
-      setStoreList(
-        res?.records?.map((x) => ({
-          label: x.name,
-          value: x.id,
-        }))
-      );
+      setStoreList(res.records || []);
     });
   }, []);
 
   useEffect(() => {
     if (id) {
       getPurchaseDetail(id).then((res) => {
-        setIsInStore(res.isInStore)
-        formRef.current.setFieldsValue({
+        setDetail({
           ...res,
           itemsList: res.itemsList?.map((x) => ({
             ...x,
@@ -55,143 +55,48 @@ export default (props) => {
     }
   }, [id]);
 
-  const onFinish = async (values) => {
-    console.log(values, "===");
-
-
-
-    savePurchaseInStore(Number(id)).then((res) => {
-      // message.success("添加成功");
-      navigate(-1);
-    });
-
-    return false;
-  };
-
-
-
   return (
-    <PageContainer>
-      <Card>
-        <ProForm
-        
-          formRef={formRef}
-          layout={"horizontal"}
-          labelCol={{ span: 2 }}
-          wrapperCol={{ span: 8 }}
-          onFinish={onFinish}
-          submitter={{
-            searchConfig: {
-              resetText: "返回",
-              submitText:'入库'
-            },
-            onReset: () => navigate(-1),
-            render: (props, doms) => {
-              console.log(props, doms, "renderprops");
-              return (
-                <Row>
-                  <Col span={8} offset={2}>
-                    <Space>
-                      {doms?.map((x, index) => {
-                        if (index === 1 && isInStore) {
-                          return null;
-                        }
-                        return x;
-                      })}
-                    </Space>
-                  </Col>
-                </Row>
-              );
-            },
-          }}
-        >
-          <ProFormText
-            name="title"
-            label="采购计划"
-            placeholder="请输入采购计划"
-            disabled
-            width={480}
-          />
-          <ProFormText
-            name="planDate"
-            label="计划时间"
-            placeholder="请输入计划时间"
-            disabled
-            width={480}
-          />
-          <Form.Item
-            label="采购清单"
-            labelCol={{ span: 2 }}
-            wrapperCol={{ span: 22 }}
+    <Card
+      title={<div>采购单</div>}
+      extra={(
+        <>
+          <Button
+            type="primary"            
+            disabled={detail.isInStore || !detail.isCompleted}
+            loading={loading}
+            onClick={onSumbit}
           >
-            <Form.List name="itemsList">
-              {(fields, { add, remove }) => (
-                <>
-                  {fields.map(({ key, name, ...restField }) => (
-                    <Space
-                      key={key}
-                      style={{ display: "flex" }}
-                      align="baseline"
-                    >
-                      <ProFormSelect
-                        {...restField}
-                        name={[name, "storeId"]}
-                        label="库存名称"
-                        placeholder="请选择库存名称"
-                        disabled
-                        options={storeList}
-                      />
+            入库
+          </Button>
+          <Button style={{ marginLeft: '2em' }} onClick={() => navigate(-1)}>返回</Button> 
+        </>
+      )}
+    >
+      <Descriptions title="基本信息" bordered>
+        <Item label="采购时间">{dtStr}</Item>
+        <Item label="计划时间">{detail.planDate}</Item>
+      </Descriptions>
+      <Descriptions title="明细信息" bordered style={{ marginTop: '24px' }} column={5}>
+        {
+          (detail.itemsList || []).reduce((acc, it, inx) => {
+
+            const store = storeList.filter(x => x.id === it.storeId)[0] || {};
+            const planUnitPrice = it.planUnitPrice ? `${it.planUnitPrice} 元` : '-';
+            const planAmount = it.planAmount ? `${it.planAmount} ${store.unit}` : '-';
+            const actUnitPrice = it.actUnitPrice ? `${it.actUnitPrice} 元` : '-';
+            const actAmount = it.actAmount ? `${it.actAmount} ${store.unit}` : '-';
 
-                      <ProFormDigit
-                        {...restField}
-                        name={[name, "planAmount"]}
-                        label="计划数量"
-                        placeholder="请输入计划数量"
-                        disabled
-                        width={100}
-                        fieldProps={{
-                          precision: 10,
-                          formatter: (value) => value,
-                        }}
-                      />
-                      <ProFormDigit
-                        {...restField}
-                        name={[name, "planUnitPrice"]}
-                        label="预估单价"
-                        placeholder="请输入预估单价"
-                        disabled
-                        fieldProps={{ precision: 2, prefix: "￥" }}
-                        width={100}
-                      />
-                      <ProFormDigit
-                        {...restField}
-                        name={[name, "actAmount"]}
-                        label="采购数量"
-                        placeholder="请输入采购数量"
-                        disabled
-                        width={100}
-                        fieldProps={{
-                          precision: 10,
-                          formatter: (value) => value,
-                        }}
-                      />
-                      <ProFormDigit
-                        {...restField}
-                        name={[name, "actUnitPrice"]}
-                        label="采购单价"
-                        placeholder="请输入采购单价"
-                        disabled
-                        fieldProps={{ precision: 2, prefix: "￥" }}
-                        width={100}
-                      />
-                    </Space>
-                  ))}
-                </>
-              )}
-            </Form.List>
-          </Form.Item>
-        </ProForm>
-      </Card>
-    </PageContainer>
+            return acc.concat([
+                <Item key={`t-${inx}-1`} label="采购物品名称">{store.name}</Item>,
+                <Item key={`t-${inx}-2`} label="计划采购单价">{planUnitPrice}</Item>,
+                <Item key={`t-${inx}-3`} label="计划采购数量">{planAmount}</Item>,
+                <Item key={`t-${inx}-4`} label="实际采购单价">{actUnitPrice}</Item>,
+                <Item key={`t-${inx}-5`} label="实际采购数量">{actAmount}</Item>,
+              ]
+            )
+          }, [])
+        }
+      </Descriptions>
+    </Card>
   );
 };

src/utils/request.js

@@ -18,9 +18,9 @@ instance.interceptors.request.use(function (config) {
     successTip,
     headers: {
       ...headers,
-      responseType: download ? 'blob' : responseType,
       Authorization: token,
-    }
+    },    
+    responseType: download ? 'blob' : responseType,
   };
 }, function (error) {
   // 对请求错误做些什么
@@ -33,8 +33,8 @@ instance.interceptors.response.use(function (response) {
   // 对响应数据做点什么
 
   const { data, config } = response;
-  if (config.download) {
-    return downloadBlob(response.data, '下载文件');
+  if (config.download && !data.code) {
+    return downloadBlob(response, '下载文件');
   }
   
   if (data.code === 1000) {
@@ -128,15 +128,16 @@ export function restful(url) {
 
 function downloadBlob(response) {
   let fileName = '未知文件';
+  const contentType = response.headers['content-type'];
   const contentDisposition = response.headers['content-disposition'];
   if (contentDisposition) {
     const parts = contentDisposition.split(';filename=');
     if (parts[1]) {
-      fileName = parts[1];
+      fileName = decodeURIComponent(parts[1]);
     }
   }
-
-  const url = window.URL.createObjectURL(response.data);
+console.log(response);
+  const url = window.URL.createObjectURL(new Blob([response.data], { type: contentType }));
   const link = document.createElement('a');
   link.href = url;
   link.setAttribute('download', fileName);