Merge branch 'master' into dev0.3

src/assets/styles/element-ui.scss

@@ -157,7 +157,12 @@
   color:#606266!important;
 }
 
-.el-textarea.is-disabled .el-textarea__inner::-webkit-input-placeholder{
-  color:#999!important;
-  -webkit-text-fill-color:#999!important;
+.el-input.is-disabled .el-input__inner::placeholder{
+  color:#c2bdbd!important;
+  -webkit-text-fill-color:#c2bdbd!important;
+}
+
+.is-disabled .el-textarea__inner::placeholder{
+  color:#c2bdbd!important;
+  -webkit-text-fill-color:#c2bdbd!important;
 }

src/views/dataBoard/board/customerAnalysis/index.vue

@@ -12,7 +12,7 @@
           >
             <el-option
               v-for="item in countryData"
-              :label="item.name"
+              :label="item.chineseName"
               :value="item.id"
               :key="item.id"
             >

src/views/finance/fundManage/accountStatement/index.vue

@@ -795,11 +795,12 @@ const submitFormOne = () => {
         });
       }
     }
-    const total = submitData.taxRefundDetailsList.reduce(
+    let total = submitData.taxRefundDetailsList.reduce(
       (sum, crr) => (sum += crr.amount),
       0
     );
-    if (total !== Number(submitData.amount)) {
+    total = parseFloat(total).toFixed(2);
+    if (Number(total) !== Number(submitData.amount)) {
       return ElMessage({
         message: "关联合同明细的关联金额总合必须等于退税金额",
         type: "info",
@@ -813,6 +814,7 @@ const submitFormOne = () => {
           type: "success",
         });
         dialogVisibleOne.value = false;
+        loadingDialog.value = false;
         getList();
       },
       (err) => {