Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

angular.json

@@ -39,7 +39,8 @@
             ],
             "scripts": [
               "node_modules/quill/dist/quill.min.js",
-              "node_modules/perfect-scrollbar/dist/perfect-scrollbar.js"
+              "node_modules/perfect-scrollbar/dist/perfect-scrollbar.js",
+              "node_modules/qrious/dist/qrious.min.js"
             ],
             "allowedCommonJsDependencies": [
               "ajv",
@@ -48,36 +49,28 @@
           },
           "configurations": {
             "production": {
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
-                }
-              ],
+              "fileReplacements": [{
+                "replace": "src/environments/environment.ts",
+                "with": "src/environments/environment.prod.ts"
+              }],
               "outputHashing": "all",
-              "budgets": [
-                {
-                  "type": "initial",
-                  "maximumWarning": "4mb",
-                  "maximumError": "10mb"
-                }
-              ]
+              "budgets": [{
+                "type": "initial",
+                "maximumWarning": "4mb",
+                "maximumError": "10mb"
+              }]
             },
             "dev": {
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/eascs/environment.dev.ts"
-                }
-              ],
+              "fileReplacements": [{
+                "replace": "src/environments/environment.ts",
+                "with": "src/environments/eascs/environment.dev.ts"
+              }],
               "outputHashing": "all",
-              "budgets": [
-                {
-                  "type": "initial",
-                  "maximumWarning": "4mb",
-                  "maximumError": "10mb"
-                }
-              ]
+              "budgets": [{
+                "type": "initial",
+                "maximumWarning": "4mb",
+                "maximumError": "10mb"
+              }]
             },
             "development": {
               "buildOptimizer": false,
@@ -160,4 +153,4 @@
     }
   },
   "defaultProject": "ng-alain"
-}
+}

package-lock.json

@@ -14811,6 +14811,11 @@
       "integrity": "sha1-xF6cYYAL0IfviNfiVkI73Unl0HE=",
       "dev": true
     },
+    "qrious": {
+      "version": "4.0.2",
+      "resolved": "http://npm.eascs.com/qrious/-/qrious-4.0.2.tgz",
+      "integrity": "sha1-CcTUB50rlhYX9ixpz/O5u2ajlpM="
+    },
     "qs": {
       "version": "6.7.0",
       "resolved": "https://registry.nlark.com/qs/download/qs-6.7.0.tgz",

package.json

@@ -63,6 +63,7 @@
     "ngx-tinymce": "^12.0.0",
     "ngx-trend": "^7.0.0",
     "perfect-scrollbar": "^1.5.2",
+    "qrious": "^4.0.2",
     "quill": "^1.3.7",
     "quill-image-resize-module": "^3.0.0",
     "rxjs": "~6.6.0",
@@ -133,4 +134,4 @@
     "name": "pro",
     "version": "12.0.0"
   }
-}
+}

src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html

@@ -23,7 +23,7 @@
                 {{headerInfo?.ltdName}}
             </se>
             <se label="收款人" required>
-                {{headerInfo?.payBankTypeLabel}}
+                {{headerInfo?.hrToLabel}}
             </se>
             <se label="付款账户" required>
                 {{headerInfo?.ltdAccountId}}