Merge branch 'stage' into dev0.3

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

@@ -1,6 +1,6 @@
 <template>
   <div class="box">
-    <div class="query bck">
+    <div class="query bck" style="margin-top: 10px">
       <el-form :inline="true" :model="queryForm">
         <el-form-item label="国家">
           <el-select

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

@@ -1,6 +1,6 @@
 <template>
   <div class="tenant">
-    <div class="query bck">
+    <div class="query bck" style="padding-bottom: 0px">
       <el-form :inline="true" :model="queryForm">
         <el-form-item label="查看用户">
           <el-select
@@ -100,7 +100,7 @@
             </div>
           </div>
         </div>
-        <div class="bck" style="margin-left: 20px">
+        <div class="bck" style="margin-left: 20px; flex: 1">
           <TitleInfo :content="titleList[2]"></TitleInfo>
           <div class="one-row" style="margin-top: 15px">
             <div class="one-row-item first" style="margin-right: 15px">
@@ -115,7 +115,7 @@
         </div>
       </div>
       <div style="margin-top: 15px">
-        <div class="bck">
+        <div class="bck scroll">
           <TitleInfo :content="titleList[3]"></TitleInfo>
           <div class="two-row" style="margin-top: 15px">
             <div class="two-row-item first" style="margin-right: 15px">
@@ -201,8 +201,9 @@
           </div>
         </div>
       </div>
+
       <div style="margin-top: 15px">
-        <div class="bck">
+        <div class="bck scroll">
           <TitleInfo :content="titleList[4]"></TitleInfo>
           <div class="two-row" style="margin-top: 15px">
             <div class="two-row-item first" style="margin-right: 15px">
@@ -292,9 +293,9 @@
       </div>
 
       <div style="display: flex; margin-top: 15px">
-        <div class="bck">
+        <div class="bck" style="width: 100%">
           <TitleInfo :content="titleList[5]"></TitleInfo>
-          <div class="two-row" style="margin-top: 15px">
+          <div class="two-row" style="margin-top: 15px; width: 100%">
             <div class="two-row-item first" style="margin-right: 15px">
               <div class="label">待采购</div>
               <div class="value">
@@ -538,6 +539,7 @@ clickBtn(1);
   display: flex;
   .one-row-item {
     min-width: 160px;
+    max-width: 180px;
     padding: 15px;
     border-radius: 10px;
     .label {
@@ -587,6 +589,7 @@ clickBtn(1);
   display: flex;
   .two-row-item {
     min-width: 320px;
+    max-width: 320px;
     padding: 15px;
     border-radius: 10px;
     .label {
@@ -631,4 +634,7 @@ clickBtn(1);
   background: #0084ff;
   color: #fff;
 }
+.scroll {
+  overflow-x: auto;
+}
 </style>

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

@@ -139,10 +139,13 @@
     </el-dialog>
 
     <el-dialog title="打印" v-if="openPrint" v-model="openPrint" width="840px">
-      <FundsPDF v-if="rowData.type != '20'" :rowData="rowData"></FundsPDF>
-      <PaymentPDF v-else :rowData="rowData"></PaymentPDF>
+      <div id="printMe">
+        <FundsPDF v-if="rowData.type != '20'" :rowData="rowData"></FundsPDF>
+        <PaymentPDF v-else :rowData="rowData"></PaymentPDF>
+      </div>
       <template #footer>
         <el-button @click="openPrint = false" size="large">取消</el-button>
+        <el-button v-print="printObj" size="large">打印</el-button>
         <el-button type="primary" @click="clickDownload()" size="large">下载PDF</el-button>
       </template>
     </el-dialog>
@@ -854,6 +857,12 @@ const clickDetail = () => {
   formOption.disabled = true;
   getDtl(rowData.value);
 };
+const printObj = ref({
+  id: "printMe",
+  popTitle: "",
+  extraCss: "https://cdn.bootcdn.net/ajax/libs/animate.css/4.1.1/animate.compat.css, https://cdn.bootcdn.net/ajax/libs/hover.css/2.3.1/css/hover-min.css",
+  extraHead: '<meta http-equiv="Content-Language"content="zh-cn"/>',
+});
 </script>
 
 <style lang="scss" scoped>

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

@@ -33,9 +33,12 @@
     </div>
 
     <el-dialog title="打印" v-if="openPrint" v-model="openPrint" width="840px">
-      <FundsPDF :rowData="rowData"></FundsPDF>
+      <div id="printMe">
+        <FundsPDF :rowData="rowData"></FundsPDF>
+      </div>
       <template #footer>
         <el-button @click="openPrint = false" size="large">取消</el-button>
+        <el-button v-print="printObj" size="large">打印</el-button>
         <el-button type="primary" @click="clickDownload()" size="large">下载PDF</el-button>
       </template>
     </el-dialog>
@@ -547,7 +550,7 @@ const submitSearch = () => {
     return ElMessage("开始时间不能大于结束时间");
   }
   openSearch.value = false;
-  sourceList.value.pagination.keyword = '';
+  sourceList.value.pagination.keyword = "";
   sourceList.value.pagination.pageNum = 1;
   getList();
 };
@@ -564,6 +567,12 @@ const pushProcessApproval = (row) => {
   });
   return;
 };
+const printObj = ref({
+  id: "printMe",
+  popTitle: "",
+  extraCss: "https://cdn.bootcdn.net/ajax/libs/animate.css/4.1.1/animate.compat.css, https://cdn.bootcdn.net/ajax/libs/hover.css/2.3.1/css/hover-min.css",
+  extraHead: '<meta http-equiv="Content-Language"content="zh-cn"/>',
+});
 </script>
 
 <style lang="scss" scoped>