RaoMeng 5 лет назад
Родитель
Сommit
3fe2f6df2f

+ 2 - 2
uas-office-web/wxuasapproval/public/index.html

@@ -2,14 +2,14 @@
 <html lang="en">
 <head>
     <meta charset="utf-8">
-    <link rel="shortcut icon" href="%PUBLIC_URL%/uas.ico">
+    <link rel="shortcut icon" href="./uas.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no, user-scalable=no">
     <meta name="theme-color" content="#000000">
     <!--
       manifest.json provides metadata used when your web app is added to the
       homescreen on Android. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
+    <link rel="manifest" href="./manifest.json">
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.

+ 15 - 15
uas-office-web/wxuasapproval/public/manifest.json

@@ -1,15 +1,15 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}
+{
+  "short_name": "React App",
+  "name": "Create React App Sample",
+  "icons": [
+    {
+      "src": "uas.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}

+ 1 - 5
uas-office-web/wxuasapproval/src/pages/approval/BillDetails.jsx

@@ -479,18 +479,14 @@ export default class ApprovalAdd extends Component {
     let titleBillModel = new BillModel()
     titleBillModel.groupIndex = g
     titleBillModel.type = TYPE_TITLE
+    titleBillModel.allowBlank = 'F'
     if (billGroup.isForm == true) {
       titleBillModel.caption = billGroup.group
-      titleBillModel.allowBlank = 'F'
-
     } else {
       if (gridStartIndex === -1) {
         gridStartIndex = g
       }
       titleBillModel.caption = `明细${g - gridStartIndex + 1}`
-      titleBillModel.allowBlank = billGroup.isDeleteAble == true
-        ? 'T'
-        : 'F'
     }
     if (!isObjEmpty(titleBillModel.caption)) {
       formItems.push(