upp

src/pages/ObjectSon/Object2/LookObject2/index.tsx

@@ -270,7 +270,7 @@ function LookObject2() {
                   <>
                     <AuthButton
                       id={205}
-                      disabled={info.tempMove !== 0}
+                      disabled={info.tempMove !== 0||info.storageStatus==='out'}
                       size="small"
                       type="primary"
                       onClick={() => titCutFu("2")}

src/pages/ObjectSon/Object3/LookObject3/index.tsx

@@ -146,7 +146,7 @@ function LookObject3() {
             </div>
           </div>
           <div className="topInfoTex" title={info.description}>
-            <span>登记说明：</span>
+            <span>入库说明：</span>
             {info.description ? info.description : "-"}
           </div>
           <div className="topInfoTex" title={info.reason}>

src/pages/ObjectSon/Object3/index.tsx

@@ -155,7 +155,18 @@ export default function Object3() {
       },
       {
         title: "入库说明",
-        render: (item: any) => (item.description ? item.description : "-"),
+        render: (item: any) =>
+          item.description ? (
+            item.description.length >= 50 ? (
+              <span style={{ cursor: "pointer" }} title={item.description}>
+                {item.description.substring(0, 20) + "..."}
+              </span>
+            ) : (
+              item.description
+            )
+          ) : (
+            "-"
+          ),
       },
       {
         title: "创建日期",

src/pages/ObjectSon/Object4/index.tsx

@@ -155,7 +155,18 @@ export default function Object4() {
       },
       {
         title: "出库说明",
-        render: (item: any) => (item.description ? item.description : "-"),
+        render: (item: any) =>
+          item.description ? (
+            item.description.length >= 50 ? (
+              <span style={{ cursor: "pointer" }} title={item.description}>
+                {item.description.substring(0, 20) + "..."}
+              </span>
+            ) : (
+              item.description
+            )
+          ) : (
+            "-"
+          ),
       },
       {
         title: "登记日期",

src/pages/ObjectSon/Object6/index.tsx

@@ -146,7 +146,7 @@ export default function Object6() {
   const columns = useMemo(() => {
     return [
       {
-        title: "入库编号",
+        title: "注销编号",
         dataIndex: "num",
       },
       {
@@ -154,8 +154,19 @@ export default function Object6() {
         dataIndex: "creatorName",
       },
       {
-        title: "入库说明",
-        render: (item: any) => (item.description ? item.description : "-"),
+        title: "注销说明",
+        render: (item: any) =>
+          item.description ? (
+            item.description.length >= 50 ? (
+              <span style={{ cursor: "pointer" }} title={item.description}>
+                {item.description.substring(0, 20) + "..."}
+              </span>
+            ) : (
+              item.description
+            )
+          ) : (
+            "-"
+          ),
       },
       {
         title: "创建日期",

src/pages/SystemSon/System2/index.tsx

@@ -326,7 +326,7 @@ function System2() {
       <div className="objectSonMain">
         <div className="tableSelectBox">
           <div className="row">
-            <span>账号：</span>
+            <span>角色名：</span>
             <Input
               maxLength={10}
               style={{ width: 150 }}

src/store/action/object1.ts

@@ -22,6 +22,7 @@ export const object1AddUpFileAPI = (data: any) => {
   UpAsyncLodingDom.style.opacity = 1;
 
   return http.post("cms/register/goods/file/upload", data, {
+    timeout:30000,
     // 显示进度条
     onUploadProgress: (e: any) => {
       const complete = (e.loaded / e.total) * 100 || 0;

src/utils/http.ts

@@ -18,7 +18,7 @@ const http = axios.create({
 
   // --------打包或线上环境接口需要加上api/
   baseURL: baseURL + "/api/",
-  timeout: 20000,
+  timeout: 5000,
 });
 
 let axajInd = 0;
@@ -42,10 +42,6 @@ http.interceptors.request.use(
 
 let timeId = -1;
 
-// 上传附件的进度条
-const UpAsyncLodingDom: any = document.querySelector("#UpAsyncLoding");
-const progressDom: any = document.querySelector("#progress");
-
 // 响应拦截器
 http.interceptors.response.use(
   function (response) {
@@ -71,10 +67,9 @@ http.interceptors.response.use(
   async function (err) {
     axajInd = 0;
     store.dispatch({ type: "login/asyncLoding", payload: false });
-
-    // 响应错误也要取消 上传文件的进度条
-    UpAsyncLodingDom.style.opacity = 0;
-    progressDom.style.width = "0%";
+    // 上传附件的进度条
+    const UpAsyncLodingDom: any = document.querySelector("#UpAsyncLoding");
+    const progressDom: any = document.querySelector("#progress");
 
     // 如果因为网络原因，response没有，给提示消息
     if (!err.response) {
@@ -82,6 +77,9 @@ http.interceptors.response.use(
     } else {
       message.warning("错误!");
     }
+    // 响应错误也要取消 上传文件的进度条
+    UpAsyncLodingDom.style.opacity = 0;
+    progressDom.style.width = "0%";
 
     return Promise.reject(err);
   }