故障知识库 删除按钮配置权限

src/views/salesServiceManagement/accessory/components/accessoryDialog.vue

@@ -283,13 +283,11 @@
         this.form.docNo = row.docNo;
         this.form.orderCode = row.orderCode;
         this.form.processInstanceId = row.processInstanceId;
-        console.log(this.form,'this.form ++++++')
       },
       handleTag(val) {
         this.activeComp = val;  
         if (val == 'store') {
           this.$nextTick(() => {
-            console.log(this.form.orderCode,'this.form.orderCode ===')
             this.$refs.innerBoundDetailsRef._getInfo(this.form.code);
           });
         }

src/views/salesServiceManagement/components/AssetsDialog.vue

@@ -514,15 +514,12 @@ export default {
         this.tableData = data.list;
         this.total = data.count;
       }
-      console.log(this.tableData);
     },
     open(tableList, value) {
       this.dataSources = value || '0';
-      console.log(value, 'value -- ==');
       this.visible1 = true;
       this.tableList = JSON.parse(JSON.stringify(tableList));
       this.$nextTick(() => {
-        console.log(this.$refs, 'this.$refs.treeList');
         this.$refs.treeList.getTreeData().then((data) => {
           this.handleNodeClick(data);
         });
@@ -589,7 +586,6 @@ export default {
       this.selectionList = val;
     },
     handleNodeClick(data) {
-      console.log(data);
       this.categoryLevelId = data.id;
       this.searchForm.categoryLevelId = data.id;
       this.doSearch();

src/views/salesServiceManagement/components/applyForSpare.vue

@@ -202,13 +202,11 @@
   import {
     saveOrUpdateSalesWorkOrder,
     saveOrUpdateSalesPlan,
-    getSalesWorkOrderById
   } from '@/api/salesServiceManagement/index';
   import AssetsDialog from './AssetsDialog.vue';
   // import productList from '@/BIZComponents/product-list.vue';
   import deptSelect from '@/components/CommomSelect/dept-select.vue';
   import { getUserPage } from '@/api/system/organization';
-  import { parameterGetByCode } from '@/api/main/index.js';
   export default {
     components: {
       AssetsDialog,
@@ -414,14 +412,7 @@
         this.$refs['form'].resetFields();
       },
       async addEquipment() {
-        // const res = await parameterGetByCode({code: 'after_sales_accessory_source'});
         this.$refs.selectStockLedgerDialogRef.open(this.tableList);
-        // if(res.value == '1'){
-        //   this.$refs.productListRef.open('', index);
-        // }else{
-        //   this.$refs.selectStockLedgerDialogRef.open(this.tableList);
-        // }
-        // console.log(res, 'res --');
       },
       /* 保存编辑 */
       async save() {

src/views/salesServiceManagement/components/info.vue

@@ -49,7 +49,6 @@
             >
             </el-option>
           </el-select>
-          <!-- <el-input :readonly="type == 'view'" v-model="form.name" /> -->
         </el-form-item>
       </el-col>
       <el-col :span="6">
@@ -117,7 +116,6 @@
         </el-form-item>
       </el-col>
       <el-col :span="6">
-        <!-- 做下拉，做字典 -->
         <el-form-item
           label="故障等级:"
           prop="faultLevel"
@@ -163,11 +161,6 @@
       row-key="id"
       default-expand-all
     >
-      <!-- 
-      :expanded-row-keys="expandedRowKeys"
-      :default-expanded-keys="expandedKeys"
-      -->
-      <!-- ***  -->
       <template v-slot:measureQuantity="{ row }">
         <el-input
           @input="totalCountChange(row, 'measureQuantity')"
@@ -320,7 +313,6 @@
                 @confirm="delSon(row, $index)"
               >
                 <template v-slot:reference>
-                  <!-- v-if="faultOperate(data)" -->
                   <el-link
                     type="danger"
                     v-if="faultOperate(data)"
@@ -330,13 +322,6 @@
                   >
                 </template>
               </el-popconfirm>
-              <!-- <el-link
-                type="danger"
-                :underline="false"
-                icon="el-icon-delete"
-                v-if="type != 'view'"
-                @click="del(row, $index)"
-              >删除</el-link>-->
             </template>
 
             <template v-slot:headerType="{ column }">
@@ -368,9 +353,6 @@
           ></el-input>
         </el-form-item>
       </template>
-      <!-- <template v-slot:attachments="{ row }">
-        <fileMain v-model="row.attachments" :type="type == 'view' ? 'view' : 'add'"></fileMain>
-      </template>-->
       <template v-slot:action="{ row, $index }">
         <el-link
           type="primary"
@@ -387,20 +369,7 @@
           @click="del(row, $index)"
           >删除</el-link
         >
-        <!-- <el-link
-          type="danger"
-          :underline="false"
-          icon="el-icon-delete"
-          @click="del(row, $index)"
-          >查看历史记录
-        </el-link>-->
       </template>
-      <!-- <template v-slot:headerTypeDescribe="{ column }">
-        <span class="is-required">{{ column.label }}</span>
-      </template>-->
-      <!-- <template v-slot:headerType="{ column }">
-        <span class="is-required">{{ column.label }}</span>
-      </template>-->
     </ele-pro-table>
     <headerTitle
       title="联系人信息"
@@ -528,9 +497,8 @@
 
 <script>
   import dictMixins from '@/mixins/dictMixins';
-  // import fileMain from '@/components/addDoc/index.vue';
   import PhotoList from './photoList.vue';
-  import { mapGetters, mapActions } from 'vuex';
+  import { mapGetters } from 'vuex';
   import { contactDetail } from '@/api/saleManage/contact';
   import parentList from '@/views/saleManage/contact/components/parentList.vue';
   import invoiceDialog from './invoiceDialog.vue';
@@ -625,12 +593,6 @@
             align: 'center',
             showOverflowTooltip: true
           },
-          // {
-          //   action: 'select',
-          //   slot: 'select',
-          //   align: 'center',
-          //   label: '选择'
-          // },
           {
             width: 45,
             type: 'expand',
@@ -712,70 +674,6 @@
             align: 'center',
             showOverflowTooltip: true
           },
-          // {
-          //   prop: 'packageNo',
-          //   label: '包装编码',
-          //   align: 'center',
-          //   showOverflowTooltip: true
-          // },
-          // {
-          //   prop: 'packingQuantity',
-          //   label: '包装数量',
-          //   align: 'center',
-          //   showOverflowTooltip: true
-          // },
-          // {
-          //   prop: 'packingUnit',
-          //   label: '包装单位',
-          //   align: 'center',
-          //   showOverflowTooltip: true
-          // },
-
-          // {
-          //   prop: 'materielDesignation',
-          //   label: '物料代号',
-          //   align: 'center',
-          //   showOverflowTooltip: true
-          // },
-          // {
-          //   prop: 'engrave',
-          //   label: '刻码',
-          //   align: 'center',
-          //   showOverflowTooltip: true
-          // },
-          //   {
-          //     prop: 'useLocation',
-          //     label: '使用地点',
-          //     align: 'center',
-          //     slot: 'useLocation',
-          //     showOverflowTooltip: true,
-          //     width: 200
-          //   },
-          // {
-          //     prop: 'type',
-          //     slot: 'type',
-          //     label: '问题类型',
-          //     align: 'center',
-          //     headerSlot: 'headerType',
-          //     showOverflowTooltip: true,
-          //     width: 120
-          //   },
-          //   {
-          //     prop: 'typeDescribe',
-          //     slot: 'typeDescribe',
-          //     label: '问题描述',
-          //     headerSlot: 'headerTypeDescribe',
-          //     align: 'center',
-          //     showOverflowTooltip: true,
-          //     width: 400
-          //   },
-          //   {
-          //     prop: 'attachments',
-          //     slot: 'attachments',
-          //     label: '附件',
-          //     align: 'center',
-          //     width: 120
-          //   },
           {
             columnKey: 'action',
             label: '操作',
@@ -860,7 +758,6 @@
       },
       // 需求表格修改权限 ***
       tableOperate() {
-        console.log(this.type, '--------------- type');
         if (this.isReportDetails) {
           return false;
         }
@@ -937,10 +834,6 @@
       }
     },
     watch: {
-      type(val) {
-        console.log(val, 'val ---');
-      },
-
       demandList: {
         handler(val) {
           this.demandList = val;
@@ -951,8 +844,6 @@
     },
     data() {
       return {
-        // expandedRowKeys: [],
-        // expandedKeys: [], // 选中
         tableList: [],
         selection: [],
         // 日期选择器配置
@@ -978,11 +869,9 @@
         phoneVisible: false
       };
     },
-
     created() {},
     methods: {
       async init(res) {
-        console.log(this.type, 'res 000');
         this.$set(this.form, 'tableList', res.productDetail);
         this.$set(this.form, 'orderCode', res.orderCode);
         this.$set(this.form, 'orderId', res.orderId);
@@ -1003,7 +892,6 @@
       seeImage(row) {
         this.phoneList = row.imageUrl || [];
         this.phoneVisible = true;
-        console.log(row, 'row --');
       },
       closePhone() {
         this.phoneList = [];
@@ -1073,7 +961,6 @@
       },
       //发货单回调
       invoiceChange(data) {
-        console.log(data, '明细数据');
         this.$set(this.form, 'orderCode', data.orderCode);
         this.$set(this.form, 'orderId', data.orderId);
         let list = JSON.parse(JSON.stringify(data.tableList));
@@ -1083,11 +970,6 @@
             (el.measureQuantity = el.measureQuantity ? el.measureQuantity : 1)
         );
         this.$set(this.form, 'tableList', list);
-        // 单选赋值 ***
-        // if (data.tableList && data.tableList.length > 0) {
-        //   this.radio = data.tableList[0].id;
-        //   this.radio = 0;
-        // }
       },
       addBank() {
         this.form.contactInfoVOS.push({

src/views/salesServiceManagement/components/invoiceDialog.vue

@@ -333,7 +333,6 @@ export default {
       });
     },
     onSearch() {
-      console.log(this.searchForm, 'form');
       let data = JSON.parse(JSON.stringify(this.searchForm));
       if (data.time?.length > 0) {
         data.createTimeStart = data.time[0];
@@ -376,7 +375,6 @@ export default {
       this.addRepairNotesDialog = false;
     },
     submitAdd() {
-      console.log(this.selection, 'this.selection 确定');
       if (!this.selection.length) {
         return this.$message.warning('请至少选择一条数据');
       }

src/views/salesServiceManagement/components/sparePartsList.vue

@@ -319,7 +319,6 @@
       };
     },
     created() {
-      console.log('请求');
       this.getLevelCode('after_sales_project');
     },
     computed: {
@@ -516,7 +515,6 @@
       }
     },
     mounted() {
-      console.log(this.obtain, 'obtain');
       if (this.source == '配件回收') {
         this.typeIdList = [
           {
@@ -700,7 +698,6 @@
         }
 
         this.$set(this.form.tableList[this.currentIndex], 'typeId', '2');
-        console.log(this.form.tableList, '----------------');
         this.$forceUpdate();
       },
       async warehouseChange(item, row, index) {

src/views/salesServiceManagement/demandList/components/addDialog.vue

@@ -73,7 +73,6 @@
     methods: {
       // 初始化数据(父组件调用)
       init(row, type) {
-        console.log(type, 'type');
         this.addRepairNotesDialog = true;
         this.type = type;
         this.title = type == 'add' ? '新增' : type == 'view' ? '详情' : '修改';
@@ -183,7 +182,6 @@
         } catch (err) {}
       },
       savExit() {
-        console.log('执行')
         this.$emit('refresh');
         this.handleClose();
       },
@@ -196,7 +194,6 @@
         // }
         try {
           let pData = await this.handleParameter();
-          console.log(pData, 'pData +++');
           if (!pData) {
             return;
           }

src/views/salesServiceManagement/demandList/components/submitDialog.vue

@@ -92,7 +92,6 @@
         this.auditDialog = true;
         submitData = data;
         let currentUser = getCurrentUser();
-        console.log(currentUser, 'currentUser 123');
         if (
           this.loginChangeGroupVOList &&
           this.loginChangeGroupVOList.length > 0
@@ -108,8 +107,6 @@
       },
       //选择部门(搜索)
       searchDeptNodeClick(info, data) {
-        console.log(info, 'info');
-        console.log(data, 'data data +++');
         if (info) {
           // 根据部门获取人员
           this.formData.planExecuteGroupName = data.name;

src/views/salesServiceManagement/demandList/index.vue

@@ -401,7 +401,6 @@
         });
       },
       handleAudit(row) {
-        console.log(this.$refs, '12345');
         this.$refs.submitRef.open(row, 'edit');
         // this.auditDialog = true;
         // this.rowData = row;

src/views/salesServiceManagement/evaluate/components/addDialog.vue

@@ -113,7 +113,6 @@
 
         try {
           let valid = await this.$refs.form.validate();
-          console.log(this.form);
           const res = await evaluateSave(this.form);
           if (res) {
             this.$message.success('操作成功!');

src/views/salesServiceManagement/knowledge/index.vue

@@ -3,23 +3,55 @@
     <el-card shadow="never" v-loading="loading">
       <search-table @search="reload" :typeOptions="typeOptions"></search-table>
       <!-- 数据表格 -->
-      <ele-pro-table ref="table" :columns="columns" :datasource="datasource" cache-key="systemRoleTable" :pageSize="20">
+      <ele-pro-table
+        ref="table"
+        :columns="columns"
+        :datasource="datasource"
+        cache-key="systemRoleTable"
+        :pageSize="20"
+      >
         <!-- 表头工具栏 -->
         <template v-slot:toolbar>
-          <el-button size="small" type="primary" icon="el-icon-plus" class="ele-btn-icon"
-            @click="openAdd('', 'add')">新建</el-button>
+          <el-button
+            size="small"
+            type="primary"
+            icon="el-icon-plus"
+            class="ele-btn-icon"
+            @click="openAdd('', 'add')"
+            >新建</el-button
+          >
         </template>
         <template v-slot:attachments="{ row }">
           <fileMain type="view" v-model="row.attachments"></fileMain>
         </template>
         <template v-slot:code="{ row }">
-          <el-link type="primary" :underline="false" @click="openEdit(row, 'view')">{{ row.code }}</el-link>
+          <el-link
+            type="primary"
+            :underline="false"
+            @click="openEdit(row, 'view')"
+            >{{ row.code }}</el-link
+          >
         </template>
+        <!-- eom:aftersalesfaultknowledgebase:delete -->
         <template v-slot:action="{ row }">
-          <el-link v-if="!row.workId" type="primary" :underline="false" @click="openEdit(row, 'edit')">修改</el-link>
-          <el-popconfirm class="ele-action" title="确定要删除当前故障吗？" @confirm="deleteFault(row)">
+          <!-- v-if="!row.workId" -->
+          <el-link
+            v-if="!row.workId"
+            type="primary"
+            :underline="false"
+            @click="openEdit(row, 'edit')"
+            >修改</el-link
+          >
+          <el-popconfirm
+            v-if="$hasPermission('eom:aftersalesfaultknowledgebase:delete')"
+            class="ele-action"
+            title="确定要删除当前故障吗？"
+            @confirm="deleteFault(row)"
+          >
             <template v-slot:reference>
-              <el-link v-if="!row.workId" type="danger" icon="el-icon-delete" :underline="false">删除</el-link>
+              <el-link type="danger" icon="el-icon-delete" :underline="false"
+                >删除</el-link
+              >
             </template>
           </el-popconfirm>
         </template>
@@ -31,129 +63,132 @@
   </div>
 </template>
 <script>
-import searchTable from './components/searchTable.vue';
-import { knowledgePage, faultDelete } from '@/api/salesServiceManagement/index';
-import knowledeDialog from './components/knowledeDialog.vue';
-import EditDialog from './components/editDialog.vue';
-import fileMain from '@/components/addDoc/index.vue';
-// import dictMixins from '@/mixins/dictMixins';
-export default {
-  //   mixins: [dictMixins],
-  components: {
-    // search
-    knowledeDialog,
-    EditDialog,
-    fileMain,
-    searchTable,
-  },
-  data() {
-    return {
-      // 加载状态
-      loading: false,
-      typeOptions: [
-        { label: '维修', value: '1' },
-        { label: '保养', value: '2' },
-        { label: '安装', value: '3' }
-      ]
-    };
-  },
-  computed: {
-    columns() {
-      return [
-        {
-          columnKey: 'index',
-          label: '序号',
-          type: 'index',
-          width: 55,
-          align: 'center',
-          showOverflowTooltip: true,
-          fixed: 'left'
-        },
-        {
-          slot: 'code',
-          prop: 'code',
-          label: '编码',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'type',
-          label: '故障类型',
-          align: 'center',
-          showOverflowTooltip: true,
-          formatter: (row) => {
-            return this.typeOptions.find((item) => item.value == row.type)
-              ?.label;
-          }
-        },
-        {
-          prop: 'faultPhenomenon',
-          label: '故障现象',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'faultReason',
-          label: '故障原因',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'maintenanceProcess',
-          label: '维修过程',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          columnKey: 'attachments',
-          prop: 'attachments',
-          label: '附件',
-          align: 'center',
-          slot: 'attachments',
-          showOverflowTooltip: true
-        },
-        {
-          columnKey: 'action',
-          slot: 'action',
-          label: '操作',
-          align: 'center',
-          width: 180,
-          resizable: false,
-          showOverflowTooltip: true
-        }
-      ];
-    }
-  },
-  created() { },
-  methods: {
-    /* 表格数据源 */
-    datasource({ page, limit, where, order }) {
-      return knowledgePage({ pageNum: page, size: limit, ...where });
+  import searchTable from './components/searchTable.vue';
+  import {
+    knowledgePage,
+    faultDelete
+  } from '@/api/salesServiceManagement/index';
+  import knowledeDialog from './components/knowledeDialog.vue';
+  import EditDialog from './components/editDialog.vue';
+  // import fileMain from '@/components/addDoc/index.vue';
+  // import dictMixins from '@/mixins/dictMixins';
+  export default {
+    //   mixins: [dictMixins],
+    components: {
+      // search
+      knowledeDialog,
+      EditDialog,
+      // fileMain,
+      searchTable
     },
-    /* 刷新表格 */
-    reload(where) {
-      this.$refs.table.reload({ page: 1, where });
-    },
-
-    // 打开详情/修改
-    openEdit(row, type) {
-      this.$refs.editDialog.init(row, type);
+    data() {
+      return {
+        // 加载状态
+        loading: false,
+        typeOptions: [
+          { label: '维修', value: '1' },
+          { label: '保养', value: '2' },
+          { label: '安装', value: '3' }
+        ]
+      };
     },
-    // 打开新增
-    openAdd() {
-      this.$refs.knowledeDialog.init();
+    computed: {
+      columns() {
+        return [
+          {
+            columnKey: 'index',
+            label: '序号',
+            type: 'index',
+            width: 55,
+            align: 'center',
+            showOverflowTooltip: true,
+            fixed: 'left'
+          },
+          {
+            slot: 'code',
+            prop: 'code',
+            label: '编码',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'type',
+            label: '故障类型',
+            align: 'center',
+            showOverflowTooltip: true,
+            formatter: (row) => {
+              return this.typeOptions.find((item) => item.value == row.type)
+                ?.label;
+            }
+          },
+          {
+            prop: 'faultPhenomenon',
+            label: '故障现象',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'faultReason',
+            label: '故障原因',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'maintenanceProcess',
+            label: '维修过程',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            columnKey: 'attachments',
+            prop: 'attachments',
+            label: '附件',
+            align: 'center',
+            slot: 'attachments',
+            showOverflowTooltip: true
+          },
+          {
+            columnKey: 'action',
+            slot: 'action',
+            label: '操作',
+            align: 'center',
+            width: 180,
+            resizable: false,
+            showOverflowTooltip: true
+          }
+        ];
+      }
     },
-    // 删除
-    deleteFault(row) {
-      faultDelete([row.id]).then((res) => {
-        if (res) {
-          this.$message.success('操作成功!');
-          this.reload();
-        }
-      });
+    created() {},
+    methods: {
+      /* 表格数据源 */
+      datasource({ page, limit, where, order }) {
+        return knowledgePage({ pageNum: page, size: limit, ...where });
+      },
+      /* 刷新表格 */
+      reload(where) {
+        this.$refs.table.reload({ page: 1, where });
+      },
+
+      // 打开详情/修改
+      openEdit(row, type) {
+        this.$refs.editDialog.init(row, type);
+      },
+      // 打开新增
+      openAdd() {
+        this.$refs.knowledeDialog.init();
+      },
+      // 删除
+      deleteFault(row) {
+        faultDelete([row.id]).then((res) => {
+          if (res) {
+            this.$message.success('操作成功!');
+            this.reload();
+          }
+        });
+      }
     }
-  }
-};
+  };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped></style>

src/views/salesServiceManagement/toDoList/components/addOrUpdateDialog.vue

@@ -412,7 +412,6 @@
         if (!res.executeGroupId) {
           this.departmentAss();
         }
-        console.log('修改数据', res);
         // 默认赋值 时间单位
         this.addForm.durationUnit = this.addForm.durationUnit
           ? this.addForm.durationUnit

src/views/salesServiceManagement/toDoList/components/generateForm.vue

@@ -199,7 +199,6 @@ export default {
     },
     methods: {
         open(row) {
-            console.log(row,'row ----')
             // this.addForm = row;
             this.visibleDialog = true;
             this.getDetail(row);
@@ -211,9 +210,7 @@ export default {
 
         async getDetail(row) {
             const res = await generateQuotationSheet(row.id);
-            console.log(res,'res ----')
             this.rowData = row;
-            console.log(res, 'fffff');
             this.form = res;
             this.tableList = res.details;
             this.productDetailList = res?.afterSalesDemandVO.productDetail || [];

src/views/salesServiceManagement/workOrder/components/work-search.vue

@@ -84,7 +84,6 @@
     methods: {
       /* 搜索 */
       search(e) {
-        console.log(e, 'eeeeeeeeee');
         this.$emit('search', {
           ...e
         });

src/views/salesServiceManagement/workOrder/index.vue

@@ -105,7 +105,7 @@
           >
           <el-link
             type="primary"
-            v-if="row.orderStatus == 3 || row.orderStatus == 6"
+            v-if="acceptShow(row)"
             :underline="false"
             @click="handleCommand('checkAndAccept', row)"
             >验收</el-link
@@ -113,7 +113,7 @@
           <!--    v-if="row.orderStatus == 4" -->
           <el-link
             type="primary"
-            v-if="row.orderStatus == 4"
+            v-if="evaluateShow(row)"
             :underline="false"
             @click="handleCommand('evaluate', row)"
             >评价</el-link
@@ -329,15 +329,6 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
-
-          // {
-          //     prop: 'assistsName',
-          //     label: '辅助人',
-          //     align: 'center',
-          //     showOverflowTooltip: true,
-          //     minWidth: 110
-          // },
-
           {
             prop: 'acceptTime',
             label: '开始时间',
@@ -359,9 +350,16 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: '',
+            label: '费用',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             columnKey: 'inFactDuration',
-            label: '实际售后时长(小时)',
+            label: '工时',
             align: 'center',
             resizable: false,
             showOverflowTooltip: true,
@@ -371,13 +369,6 @@
                 let str = ((row.inFactDuration - 0) / 60).toFixed(1);
                 return str + '  小时';
               }
-              // if (row.finishTime && row.acceptTime) {
-              //   return parseInt(
-              //     (new Date(row.finishTime).getTime() -
-              //       new Date(row.acceptTime).getTime()) /
-              //       60000
-              //   );
-              // }
             }
           },
           {
@@ -410,7 +401,31 @@
         orderStatus: 'all'
       };
     },
-    computed: {},
+
+    computed: {
+      // 登录人id
+      loginPersonId() {
+        return this.$store.state.user?.info.id;
+      },
+      // 评价
+      evaluateShow() {
+        return (row) => {
+          if (row.executeUserId == this.loginPersonId) {
+            return false;
+          }
+          return row.orderStatus == 4;
+        };
+      },
+      // 验收
+      acceptShow() {
+        return (row) => {
+          if (row.executeUserId == this.loginPersonId) {
+            return false;
+          }
+          return row.orderStatus == 3 || row.orderStatus == 6;
+        };
+      }
+    },
     created() {
       this.getLevelCode('fault_level');
     },
@@ -487,7 +502,6 @@
             }
           })
         };
-        console.log(dataP, 'dataPdataPdataPdataPdataPdataPdataPdataP');
         this.$refs.edit.open(JSON.parse(JSON.stringify(dataP)), 'work');
       },
       //接收
@@ -531,8 +545,8 @@
       },
       // 校验
       async permission(row, command) {
-        // 点评论的话不走这个方法
-        if (command == 'evaluate') {
+        // 点评论/验收的话不走这个方法
+        if (command == 'evaluate' || command == 'checkAndAccept') {
           return true;
         }
         try {