Merge branch 'master' of jiaxiaoqiang/JG-ADMIN-TEMP into xf_dev

src/views/base/craftManagement/route/bindProcess.vue

@@ -305,6 +305,7 @@ const getNameByDictType = (dictValue) => {
   justify-content: center;
   overflow-y: auto;
   padding-top: 47px;
+  padding-bottom: 47px;
   .flowContain {
     width: 400px;
 

src/views/report/statistics/outputstatistics/index.vue

@@ -1,9 +1,31 @@
 <template>
   <div class="mainContentBox">
-    <avue-crud ref="crudRef1" v-model:search="data1.search" :data="data1.data" :option="data1.option"
-      v-model:page="data1.page" @row-save="createRow" @row-update="updateRow" @row-del="deleteRow"
-      @search-change="searchChange" @search-reset="resetChange" @size-change="dataList" @current-change="dataList"
-      @selection-change="selectionChange" />
+    <avue-crud
+      ref="crudRef1"
+      v-model:search="data1.search"
+      :data="data1.data"
+      :option="data1.option"
+      v-model:page="data1.page"
+      @row-save="createRow"
+      @row-update="updateRow"
+      @row-del="deleteRow"
+      @search-change="searchChange"
+      @search-reset="resetChange"
+      @size-change="dataList"
+      @current-change="dataList"
+      @selection-change="selectionChange"
+    >
+      <template #menu-right="{}">
+        <el-button
+          class="ml-3"
+          @click="
+            data1.Utils.exportData('/api/v1/process/census/outputInfo/export')
+          "
+        >
+          <template #icon> <i-ep-download /> </template>导出
+        </el-button>
+      </template>
+    </avue-crud>
   </div>
 </template>
 <script setup>

src/views/report/statistics/workeveryday/index.vue

@@ -1,27 +1,51 @@
 <template>
   <div class="mainContentBox">
-    <avue-crud ref="crudRef1" v-model:search="data1.search" :data="data1.data" :option="data1.option"
-      v-model:page="data1.page" @row-save="createRow" @row-update="updateRow" @row-del="deleteRow"
-      @search-change="searchChange" @search-reset="resetChange" @size-change="dataList" @current-change="dataList"
-      @selection-change="selectionChange">
+    <avue-crud
+      ref="crudRef1"
+      v-model:search="data1.search"
+      :data="data1.data"
+      :option="data1.option"
+      v-model:page="data1.page"
+      @row-save="createRow"
+      @row-update="updateRow"
+      @row-del="deleteRow"
+      @search-change="searchChange"
+      @search-reset="resetChange"
+      @size-change="dataList"
+      @current-change="dataList"
+      @selection-change="selectionChange"
+    >
       <template #menu="{ row, index, type }">
-        <el-button @click="ckickCell(row)" icon="el-icon-view" text type="primary">查看</el-button>
+        <el-button
+          @click="ckickCell(row)"
+          icon="el-icon-view"
+          text
+          type="primary"
+          >查看</el-button
+        >
       </template>
       <template #header="">
         <div id="dailystoragecharts"></div>
       </template>
       <template #menu-right="{}">
-        <el-button class="ml-3" @click="
-          data1.Utils.exportData(
-            '/api/v1/process/census/abnormalOperation/export'
-          )
-          ">
+        <el-button
+          class="ml-3"
+          @click="
+            data1.Utils.exportData(
+              '/api/v1/process/census/completeOrder/export'
+            )
+          "
+        >
           <template #icon> <i-ep-download /> </template>导出
         </el-button>
       </template>
     </avue-crud>
-    <el-dialog v-model="editDialog.visible" :title="editDialog.title" width="1200px"
-      @close="editDialog.visible = false">
+    <el-dialog
+      v-model="editDialog.visible"
+      :title="editDialog.title"
+      width="1200px"
+      @close="editDialog.visible = false"
+    >
       <div class="mainContentBox">
         <div id="dailystoragecharts2"></div>
       </div>