Merge branch 'master' into 测试

src/views/subsidiary/finance/check-bill/index.vue

@@ -8,6 +8,12 @@
         :loading="loading"
         :searchConfig="searchConfig"
         highlight-current-row
+        :action-list="[
+          {
+            text: 'Excel文件',
+            action: () => clickExcelFile(),
+          },
+        ]"
         @get-list="getList"
         @clickReset="clickReset">
         <template #timePeriod="{ item }">
@@ -52,10 +58,17 @@
           <PrintBOM :rowData="rowData" :activeName="activeName" @clickCancel="openPrint = false"></PrintBOM>
         </el-tab-pane>
         <el-tab-pane label="订单对账单" name="order">
-          <PrintOrder :rowData="rowData" :activeName="activeName" @clickCancel="openPrint = false"></PrintOrder>
+          <PrintOrder :rowData="rowData" :activeName="activeName" @clickCancel="clickCancel"></PrintOrder>
         </el-tab-pane>
       </el-tabs>
     </el-dialog>
+    
+    <el-dialog title="Excel文件" v-if="openFileList" v-model="openFileList" width="60%">
+      <ExcelFile></ExcelFile>
+      <template #footer>
+        <el-button @click="openFileList = false" size="large">关 闭</el-button>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -64,6 +77,7 @@ import byTable from "/src/components/byTable/index";
 import PrintSKU from "/src/views/group/finance/check-bill/printSKU.vue";
 import PrintBOM from "/src/views/group/finance/check-bill/printBOM.vue";
 import PrintOrder from "/src/views/group/finance/check-bill/printOrder.vue";
+import ExcelFile from "/src/views/group/finance/check-bill/ExcelFile.vue";
 
 const { proxy } = getCurrentInstance();
 const sourceList = ref({
@@ -224,6 +238,16 @@ const clickPrint = (row) => {
   rowData.value = row;
   openPrint.value = true;
 };
+const openFileList = ref(false);
+const clickCancel = (status) => {
+  openPrint.value = false;
+  if (status) {
+    openFileList.value = true;
+  }
+};
+const clickExcelFile = () => {
+  openFileList.value = true;
+};
 </script>
 
 <style lang="scss" scoped>

src/views/subsidiary/finance/summary/index.vue

@@ -8,6 +8,12 @@
         :loading="loading"
         :searchConfig="searchConfig"
         highlight-current-row
+        :action-list="[
+          {
+            text: 'Excel文件',
+            action: () => clickExcelFile(),
+          },
+        ]"
         @get-list="getList"
         @clickReset="clickReset"
         @changeRadioGroup="changeRadioGroup">
@@ -23,10 +29,17 @@
           <PrintBOM :rowData="rowData" :activeName="activeName" @clickCancel="openPrint = false"></PrintBOM>
         </el-tab-pane>
         <el-tab-pane label="订单对账单" name="order">
-          <PrintOrder :rowData="rowData" :activeName="activeName" @clickCancel="openPrint = false"></PrintOrder>
+          <PrintOrder :rowData="rowData" :activeName="activeName" @clickCancel="clickCancel"></PrintOrder>
         </el-tab-pane>
       </el-tabs>
     </el-dialog>
+    
+    <el-dialog title="Excel文件" v-if="openFileList" v-model="openFileList" width="60%">
+      <ExcelFile></ExcelFile>
+      <template #footer>
+        <el-button @click="openFileList = false" size="large">关 闭</el-button>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -35,6 +48,7 @@ import byTable from "/src/components/byTable/index";
 import PrintSKU from "/src/views/group/finance/summary/printSKU.vue";
 import PrintBOM from "/src/views/group/finance/summary/printBOM.vue";
 import PrintOrder from "/src/views/group/finance/summary/printOrder.vue";
+import ExcelFile from "/src/views/group/finance/check-bill/ExcelFile.vue";
 
 const { proxy } = getCurrentInstance();
 const sourceList = ref({
@@ -184,6 +198,16 @@ const clickPrint = (row) => {
   rowData.value = row;
   openPrint.value = true;
 };
+const openFileList = ref(false);
+const clickCancel = (status) => {
+  openPrint.value = false;
+  if (status) {
+    openFileList.value = true;
+  }
+};
+const clickExcelFile = () => {
+  openFileList.value = true;
+};
 </script>
 
 <style lang="scss" scoped>