Преглед на файлове

fix(frontend): restore water facility build compatibility

Kazerin преди 1 седмица
родител
ревизия
6e748d0cca
променени са 2 файла, в които са добавени 42 реда и са изтрити 13 реда
  1. 27 9
      src/api/work/order.js
  2. 15 4
      src/views/subSystem/basic/pipeInfo/index.vue

+ 27 - 9
src/api/work/order.js

@@ -35,6 +35,33 @@ export function verifyWorkOrder(data) {
   })
 }
 
+/** 接单操作 */
+export function acceptWorkOrder(orderId) {
+  return request({
+    url: '/api/work-order/accept',
+    method: 'put',
+    params: { orderId }
+  })
+}
+
+/** 开始处理操作 */
+export function startWorkOrder(orderId) {
+  return request({
+    url: '/api/work-order/start',
+    method: 'put',
+    params: { orderId }
+  })
+}
+
+/** 驳回验收 */
+export function rejectWorkOrder(data) {
+  return request({
+    url: '/api/work-order/reject',
+    method: 'put',
+    data
+  })
+}
+
 /** 处理操作 */
 export function processWorkOrder(data) {
   return request({
@@ -70,15 +97,6 @@ export function cancelWorkOrder(orderId) {
   })
 }
 
-/** 驳回工单(待派单/待接单 -> 已驳回) */
-export function rejectWorkOrder(data) {
-  return request({
-    url: '/api/work-order/reject',
-    method: 'put',
-    data
-  })
-}
-
 /** 验收通过/结案 */
 export function closeWorkOrder(data) {
   return request({

+ 15 - 4
src/views/subSystem/basic/pipeInfo/index.vue

@@ -54,6 +54,9 @@
       <el-col :span="1.5">
         <el-button type="danger" plain icon="Delete" size="small" :disabled="multiple" @click="handleDelete" v-hasPermi="['waterSupply:pipeInfo:remove']">删除</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Download" size="small" @click="handleExport" v-hasPermi="['waterSupply:waterPipe:export']">导出</el-button>
+      </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
     </el-row>
 
@@ -76,10 +79,10 @@
       <el-table-column label="状态" align="center" width="80">
         <template #default="{ row }">
           <el-tag 
-            :type="row.status == 1 ? 'success' : 'danger'" 
+            :type="String(row.status) === '0' ? 'success' : 'danger'"
             size="small"
           >
-            {{ row.status == 1 ? '正常' : '停用' }}
+            {{ String(row.status) === '0' ? '正常' : '停用' }}
           </el-tag>
         </template>
       </el-table-column>
@@ -244,6 +247,8 @@
 <script>
 import { listPipeInfo, getPipeInfo, addPipeInfo, updatePipeInfo, delPipeInfo, listRecyclePipeInfo, restorePipeInfo, deletePhysicallyPipeInfo } from '@/api/pipeNetwork/pipeInfo'
 import { getDicts } from '@/api/system/dict/data'
+import { saveAs } from 'file-saver'
+import { exportWaterPipe } from '@/api/pipeNetwork/waterSupply'
 
 export default {
   name: 'WaterPipeInfo',
@@ -286,8 +291,8 @@ export default {
       recycleIds: [],
       // 系统状态字典
       sysNormalDisable: [ 
-        { value: 1, label: '正常' },
-        { value: 0, label: '停用' }
+        { value: '0', label: '正常' },
+        { value: '1', label: '停用' }
       ],
       // 查询参数
       queryParams: {
@@ -354,6 +359,12 @@ export default {
       this.handleQuery()
     },
     /** 多选框选中数据 */
+    /** 导出当前筛选结果 */
+    handleExport() {
+      exportWaterPipe(this.addDateRange(this.queryParams, this.dateRange)).then(blob => {
+        saveAs(new Blob([blob]), `管网信息_${new Date().toISOString().slice(0, 10)}.xlsx`)
+      }).catch(() => {})
+    },
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1