修改

src/api/maintenance/patrol_maintenance.js

@@ -32,6 +32,16 @@ export async function revocation(id) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+// 撤回（量具送检）
+export async function revocationDelivery(id) {
+  const res = await request.get(`/eam/plan/revocation/${id}`);
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
 // 查询未派单设备数据
 export async function getNotSendOrderList(planId) {
   const res = await request.get(
@@ -84,3 +94,12 @@ export async function workOrderRotate(data) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+// 删除量具送检计划
+export async function workOrderDelete(data) {
+  const res = await request.delete('/eam/plan/delete', { data });
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/views/ledgerAssets/boat/edit copy.vue

@@ -21,7 +21,7 @@
         </div>
         <div v-if="pageType == 'add'">
           <el-button type="primary" plain @click="handlwpbm"
-            >选择物品编码</el-button
+            >选择物品</el-button
           >
         </div>
         <div class="content">

src/views/ledgerAssets/boat/edit.vue

@@ -337,7 +337,7 @@
       // 提交
       submit() {
         if (JSON.stringify(this.basicInfo) === '{}' && this.pageType == 'add') {
-          return this.$message.error('请选择物品编码');
+          return this.$message.error('请选择物品');
         }
         this.$refs.form.validate(async (valid) => {
           if (valid) {

src/views/ledgerAssets/components/DialogGoods.vue

@@ -133,7 +133,7 @@
       return {
         productId: '',
         visibleSync: false,
-        title: '选择物品编码',
+        title: '选择物品',
         searchForm: {
           searchKey: '',
           categoryLevelId: '1'

src/views/ledgerAssets/equipment/components/DialogGoods.vue

@@ -133,7 +133,7 @@
       return {
         productId: '',
         visibleSync: false,
-        title: '选择物品编码',
+        title: '选择物品',
         searchForm: {
           searchKey: '',
           categoryLevelId: '1'

src/views/ledgerAssets/equipment/edit copy.vue

@@ -28,7 +28,7 @@
               <el-form-item class="label-none" label-width="0">
                 <span style="color: red; padding-right: 5px">*</span>
                 <el-button type="primary" plain @click="handlwpbm"
-                  >选择物品编码</el-button
+                  >选择物品</el-button
                 >
               </el-form-item>
             </template>

src/views/ledgerAssets/equipment/edit.vue

@@ -334,7 +334,7 @@
       // 提交
       submit() {
         if (JSON.stringify(this.basicInfo) === '{}' && this.pageType == 'add') {
-          return this.$message.error('请选择物品编码');
+          return this.$message.error('请选择物品');
         }
         this.$refs.form.validate(async (valid) => {
           if (valid) {

src/views/ledgerAssets/equipment/edit_old.vue

@@ -14,9 +14,7 @@
         </div>
       </div>
       <div v-if="pageType == 'add'">
-        <el-button type="primary" plain @click="handlwpbm"
-          >选择物品编码</el-button
-        >
+        <el-button type="primary" plain @click="handlwpbm">选择物品</el-button>
       </div>
       <el-form
         label-width="120px"

src/views/ledgerAssets/material/edit copy.vue

@@ -14,9 +14,7 @@
         </div>
       </div>
       <div v-if="pageType == 'add'">
-        <el-button type="primary" plain @click="handlwpbm"
-          >选择物品编码</el-button
-        >
+        <el-button type="primary" plain @click="handlwpbm">选择物品</el-button>
       </div>
       <el-form
         label-width="120px"

src/views/ledgerAssets/material/edit.vue

@@ -336,7 +336,7 @@
       // 提交
       submit() {
         if (JSON.stringify(this.basicInfo) === '{}' && this.pageType == 'add') {
-          return this.$message.error('请选择物品编码');
+          return this.$message.error('请选择物品');
         }
         this.$refs.form.validate(async (valid) => {
           if (valid) {

src/views/ledgerAssets/meter/components/DialogGoods.vue

@@ -133,7 +133,7 @@
       return {
         productId: '',
         visibleSync: false,
-        title: '选择物品编码',
+        title: '选择物品',
         searchForm: {
           searchKey: '',
           categoryLevelId: '1'

src/views/ledgerAssets/meter/edit copy.vue

@@ -14,9 +14,7 @@
         </div>
       </div>
       <div v-if="pageType == 'add'">
-        <el-button type="primary" plain @click="handlwpbm"
-          >选择物品编码</el-button
-        >
+        <el-button type="primary" plain @click="handlwpbm">选择物品</el-button>
       </div>
       <el-form
         label-width="120px"

src/views/ledgerAssets/meter/edit.vue

@@ -340,7 +340,7 @@
       // 提交
       submit() {
         if (JSON.stringify(this.basicInfo) === '{}' && this.pageType == 'add') {
-          return this.$message.error('请选择物品编码');
+          return this.$message.error('请选择物品');
         }
         this.$refs.form.validate(async (valid) => {
           if (valid) {

src/views/ledgerAssets/mould/edit copy.vue

@@ -21,7 +21,7 @@
         </div>
         <div v-if="pageType == 'add'">
           <el-button type="primary" plain @click="handlwpbm"
-            >选择物品编码</el-button
+            >选择物品</el-button
           >
         </div>
         <div class="content">

src/views/ledgerAssets/mould/edit.vue

@@ -337,7 +337,7 @@
       // 提交
       submit() {
         if (JSON.stringify(this.basicInfo) === '{}' && this.pageType == 'add') {
-          return this.$message.error('请选择物品编码');
+          return this.$message.error('请选择物品');
         }
         this.$refs.form.validate(async (valid) => {
           if (valid) {

src/views/ledgerAssets/office/edit copy.vue

@@ -21,7 +21,7 @@
         </div>
         <div v-if="pageType == 'add'">
           <el-button type="primary" plain @click="handlwpbm"
-            >选择物品编码</el-button
+            >选择物品</el-button
           >
         </div>
         <div label-width="120px">

src/views/ledgerAssets/sparepart/edit copy.vue

@@ -21,7 +21,7 @@
         </div>
         <div v-if="pageType == 'add'">
           <el-button type="primary" plain @click="handlwpbm"
-            >选择物品编码</el-button
+            >选择物品</el-button
           >
         </div>
         <div label-width="120px">

src/views/ledgerAssets/sparepart/edit.vue

@@ -336,7 +336,7 @@
       // 提交
       submit() {
         if (JSON.stringify(this.basicInfo) === '{}' && this.pageType == 'add') {
-          return this.$message.error('请选择物品编码');
+          return this.$message.error('请选择物品');
         }
         this.$refs.form.validate(async (valid) => {
           if (valid) {

src/views/ledgerAssets/turnoverCar/edit copy.vue

@@ -21,7 +21,7 @@
         </div>
         <div v-if="pageType == 'add'">
           <el-button type="primary" plain @click="handlwpbm"
-            >选择物品编码</el-button
+            >选择物品</el-button
           >
         </div>
         <div label-width="120px">

src/views/ledgerAssets/turnoverCar/edit.vue

@@ -339,7 +339,7 @@
       // 提交
       submit() {
         if (JSON.stringify(this.basicInfo) === '{}' && this.pageType == 'add') {
-          return this.$message.error('请选择物品编码');
+          return this.$message.error('请选择物品');
         }
         this.$refs.form.validate(async (valid) => {
           if (valid) {

src/views/ledgerAssets/turnoverDisks/components/DialogGoods.vue

@@ -132,7 +132,7 @@
       return {
         productId: '',
         visibleSync: false,
-        title: '选择物品编码',
+        title: '选择物品',
         searchForm: {
           searchKey: '',
           categoryLevelId: ''

src/views/ledgerAssets/turnoverDisks/edit copy.vue

@@ -14,9 +14,7 @@
         </div>
       </div>
       <div v-if="pageType == 'add'">
-        <el-button type="primary" plain @click="handlwpbm"
-          >选择物品编码</el-button
-        >
+        <el-button type="primary" plain @click="handlwpbm">选择物品</el-button>
       </div>
       <el-form
         label-width="120px"

src/views/ledgerAssets/turnoverDisks/edit.vue

@@ -336,7 +336,7 @@
       // 提交
       submit() {
         if (JSON.stringify(this.basicInfo) === '{}' && this.pageType == 'add') {
-          return this.$message.error('请选择物品编码');
+          return this.$message.error('请选择物品');
         }
         this.$refs.form.validate(async (valid) => {
           if (valid) {

src/views/maintenance/components/programRulesDialog.vue

@@ -41,7 +41,9 @@
         <el-col :span="8">
           <el-form-item label="自动派单" prop="autoOrder">
             <el-select
-              :disabled="dialogTitle === '派单'"
+              :disabled="
+                dialogTitle === '派单' || dialogTitle.includes('量具送检')
+              "
               v-model="addForm.autoOrder"
               size="small"
               style="width: 100%"
@@ -70,7 +72,10 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="8" v-if="addForm.autoOrder">
+        <el-col
+          :span="8"
+          v-if="addForm.autoOrder && !dialogTitle.includes('量具送检')"
+        >
           <el-form-item label="部门" prop="groupId">
             <deptSelect
               v-model="addForm.groupId"
@@ -79,7 +84,10 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8" v-if="addForm.autoOrder">
+        <el-col
+          :span="8"
+          v-if="addForm.autoOrder && !dialogTitle.includes('量具送检')"
+        >
           <el-form-item label="负责人" prop="executeId">
             <el-select
               v-model="addForm.executeId"
@@ -98,7 +106,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="8" v-if="!dialogTitle.includes('量具送检')">
           <el-form-item label="审核人" prop="approvalUserId">
             <el-select
               :disabled="dialogTitle === '派单'"

src/views/maintenance/delivery/plan/index.vue

@@ -3,12 +3,12 @@
     <el-card shadow="never" v-loading="loading">
       <plan-search @search="reload"> </plan-search>
       <!-- 数据表格 -->
+      <!-- :default-sort="{ prop: 'createTime', order: 'ascending' }" -->
       <ele-pro-table
         ref="table"
         :columns="columns"
         :datasource="datasource"
         cache-key="systemRoleTable"
-        :default-sort="{ prop: 'createTime', order: 'ascending' }"
       >
         <!-- 表头工具栏 -->
         <template v-slot:toolbar>
@@ -43,7 +43,7 @@
         </template>
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
-          <el-link
+          <!-- <el-link
             v-if="row.cycleType == 0 || row.planStatus == 4"
             type="primary"
             :underline="false"
@@ -60,9 +60,9 @@
             @click="openAdd('派单', row)"
           >
             派单
-          </el-link>
+          </el-link> -->
           <el-link
-            v-if="row.planStatus != 2 && row.planStatus != 3"
+            v-if="row.planStatus != 3"
             type="primary"
             :underline="false"
             icon="el-icon-edit"
@@ -70,6 +70,15 @@
           >
             撤回
           </el-link>
+          <el-link
+            v-if="row.planStatus == 4"
+            type="primary"
+            :underline="false"
+            icon="el-icon-edit"
+            @click="deleted(row)"
+          >
+            删除
+          </el-link>
         </template>
       </ele-pro-table>
     </el-card>
@@ -92,7 +101,11 @@
   import DispatchDialog from '@/components/addPatrolPlanDialog/DispatchDialog';
   import AddPatrolPlanDialog from '@/components/addPatrolPlanDialog';
   import PlanSearch from './components/plan-search.vue';
-  import { getPage, revocation } from '@/api/maintenance/patrol_maintenance';
+  import {
+    getPage,
+    revocationDelivery,
+    workOrderDelete
+  } from '@/api/maintenance/patrol_maintenance';
   import { getByCode } from '@/api/system/dictionary-data';
   export default {
     components: {
@@ -191,7 +204,7 @@
             prop: 'createTime',
             label: '生成时间',
             align: 'center',
-            sortable: true,
+            // sortable: true,
             showOverflowTooltip: true,
             minWidth: 150,
             formatter: (_row, _column, cellValue) => {
@@ -224,6 +237,22 @@
       this.dict.planStatus = statusObject;
     },
     methods: {
+      /* 删除工单 */
+      deleted(row) {
+        this.$confirm('是否确定删除？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(async () => {
+            const data = await workOrderDelete([row.id]);
+            if (data.code == '0') {
+              this.$message.success('删除成功!');
+              this.reload();
+            }
+          })
+          .catch(() => {});
+      },
       /* 表格数据源 */
       datasource({ page, limit, where, order }) {
         return getPage({ pageNum: page, size: limit, ...where, planType: 5 });
@@ -247,7 +276,7 @@
       handleWithdraw(row) {
         // 撤回
         this.$confirm(`确认撤回?`, '提示').then(async () => {
-          revocation(row.id)
+          revocationDelivery(row.id)
             .then(() => {
               this.$message.success('撤回成功！');
               this.reload();

src/views/maintenance/delivery/workOrder/index.vue

@@ -3,12 +3,12 @@
     <el-card shadow="never" v-loading="loading">
       <work-search @search="reload"> </work-search>
       <!-- 数据表格 -->
+      <!-- :default-sort="{ prop: 'createTime', order: 'ascending' }" -->
       <ele-pro-table
         ref="table"
         :columns="columns"
         :datasource="datasource"
         cache-key="systemRoleTable"
-        :default-sort="{ prop: 'createTime', order: 'ascending' }"
       >
         <!-- 表头工具栏 -->
         <!-- <template v-slot:toolbar>
@@ -127,7 +127,7 @@
           {
             prop: 'createTime',
             label: '工单生成时间',
-            sortable: true,
+            // sortable: true,
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 170

src/views/maintenance/equipment/plan/index.vue

@@ -3,12 +3,12 @@
     <el-card shadow="never" v-loading="loading">
       <plan-search @search="reload"> </plan-search>
       <!-- 数据表格 -->
+      <!-- :default-sort="{ prop: 'createTime', order: 'ascending' }" -->
       <ele-pro-table
         ref="table"
         :columns="columns"
         :datasource="datasource"
         cache-key="systemRoleTable"
-        :default-sort="{ prop: 'createTime', order: 'ascending' }"
       >
         <!-- 表头工具栏 -->
         <template v-slot:toolbar>
@@ -190,7 +190,7 @@
           {
             prop: 'createTime',
             label: '生成时间',
-            sortable: true,
+            // sortable: true,
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 150,

src/views/maintenance/equipment/workOrder/index.vue

@@ -3,12 +3,12 @@
     <el-card shadow="never" v-loading="loading">
       <work-search @search="reload"> </work-search>
       <!-- 数据表格 -->
+      <!-- :default-sort="{ prop: 'createTime', order: 'ascending' }" -->
       <ele-pro-table
         ref="table"
         :columns="columns"
         :datasource="datasource"
         cache-key="systemRoleTable"
-        :default-sort="{ prop: 'createTime', order: 'ascending' }"
       >
         <!-- 表头工具栏 -->
         <!-- <template v-slot:toolbar>
@@ -127,7 +127,7 @@
           {
             prop: 'createTime',
             label: '工单生成时间',
-            sortable: true,
+            // sortable: true,
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 170

src/views/maintenance/patrol/plan/index.vue

@@ -3,11 +3,11 @@
     <el-card shadow="never" v-loading="loading">
       <plan-search @search="reload"> </plan-search>
       <!-- 数据表格 -->
+      <!-- :default-sort="{ prop: 'createTime', order: 'descending' }" -->
       <ele-pro-table
         ref="table"
         :columns="columns"
         :datasource="datasource"
-        :default-sort="{ prop: 'createTime', order: 'descending' }"
         cache-key="systemRoleTable"
       >
         <!-- 表头工具栏 -->
@@ -189,7 +189,7 @@
             prop: 'createTime',
             label: '生成时间',
             align: 'center',
-            sortable: true,
+            // sortable: true,
             showOverflowTooltip: true,
             minWidth: 150,
             formatter: (_row, _column, cellValue) => {

src/views/maintenance/patrol/workOrder/index.vue

@@ -3,12 +3,12 @@
     <el-card shadow="never" v-loading="loading">
       <work-search @search="reload"> </work-search>
       <!-- 数据表格 -->
+      <!-- :default-sort="{ prop: 'createTime', order: 'descending' }" -->
       <ele-pro-table
         ref="table"
         :columns="columns"
         :datasource="datasource"
         cache-key="patrolOrderTable"
-        :default-sort="{ prop: 'createTime', order: 'descending' }"
       >
         <template v-slot:code="{ row }">
           <el-link type="primary" @click="goDetail(row)">
@@ -117,7 +117,7 @@
             prop: 'createTime',
             label: '工单生成时间',
             align: 'center',
-            sortable: true,
+            // sortable: true,
             showOverflowTooltip: true,
             width: 170
           },