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

src/pages/purchase/plan/list/index.jsx

@@ -91,6 +91,7 @@ const StockList = (props) => {
             key={4}
             style={{ padding: 0 }}
             type="link"
+            disabled={record?.isCompleted}
             onClick={() => {
               navigate(`/purchase/bill/edit?id=${record.id}`);
             }}
@@ -104,6 +105,7 @@ const StockList = (props) => {
             key={5}
             style={{ padding: 0 }}
             type="link"
+            disabled={record?.isInStore}
             onClick={() => {
               navigate(`/purchase/inStore/edit?id=${record.id}`);
             }}
@@ -135,7 +137,7 @@ const StockList = (props) => {
       <ProTable
         actionRef={actionRef}
         rowKey="id"
-        params={type === "inStore"? {isCompleted:true}:{}}
+        params={type === "inStore" ? { isCompleted: true } : {}}
         toolBarRender={() => [
           type === "plan" ? (
             <Button

src/pages/rotationChart/detail/index.jsx

@@ -1,28 +1,19 @@
-import { savePosts, getPostsDetail, updatePosts } from "@/services/posts";
-import {
-  addBanner,
-  getBannerdById,
-  updataBanner,
-} from "@/services/rotationChart";
+import { getBannerdById } from "@/services/rotationChart";
 import { useNavigate, useSearchParams } from "react-router-dom";
-import { Card, Typography, message, Row, Button, Space } from "antd";
-import { useEffect, useRef, useState } from "react";
+import { Card, Button } from "antd";
+import { useEffect, useState } from "react";
 
-const { Title } = Typography;
 export default (props) => {
   const [searchParams] = useSearchParams();
   const id = searchParams.get("id");
   const [data, setData] = useState({});
-  // const [url, setUrl] = useState("");
-  const navigate = useNavigate();
 
-  const formRef = useRef();
+  const navigate = useNavigate();
 
   useEffect(() => {
     if (id) {
       getBannerdById(id).then((res) => {
         setData(res);
-        // setUrl(res.filesList[0]?.fileAddr);
       });
     }
   }, [id]);
@@ -31,21 +22,16 @@ export default (props) => {
     <Card title={<Button onClick={() => navigate(-1)}> 返回</Button>}>
       <div dangerouslySetInnerHTML={{ __html: data?.desc }}></div>
       {data?.type === "1" && data?.image && (
-        <img src={data?.image} alt=""></img>
+        <img src={data?.image} alt="" style={{ width: "100%" }}></img>
       )}
       {data?.type === "2" && data?.video && (
-        <video src={data?.video} autoPlay={false} controls="controls"></video>
+        <video
+          src={data?.video}
+          autoPlay={false}
+          controls="controls"
+          style={{ width: "100%" }}
+        ></video>
       )}
-      {/* {url && (
-        <div style={{marginTop:"2em"}}>
-          <a
-            href={`${url}`}
-            download
-          >
-            {url?.substring(url?.lastIndexOf("/") + 1)}
-          </a>
-        </div>
-      )} */}
     </Card>
   );
 };