修改设备维修管理

src/components/AssetDialog/categoryDialog.vue

@@ -41,8 +41,10 @@
           @selection-change="selectItem"
           :header-cell-style="{ background: '#F0F3F3' }"
         >
-          <el-table-column prop="code" label="物品编码"></el-table-column>
+          <!-- <el-table-column prop="code" label="物品编码"></el-table-column> -->
           <el-table-column prop="name" label="物品名称"></el-table-column>
+          <el-table-column prop="fixCode" label="固资编码"></el-table-column>
+          <el-table-column prop="codeNumber" label="编号"></el-table-column>
           <el-table-column
             :prop="item.prop"
             :label="item.label"

src/views/ledgerAssets/boat/components/boat-list.vue

@@ -106,9 +106,10 @@
           {
             columnKey: 'code',
             prop: 'code',
+            slot: 'code',
             label: '编码',
             showOverflowTooltip: true,
-            minWidth: 130
+            minWidth: 200
           },
           {
             prop: 'name',

src/views/ledgerAssets/boat/detail.vue

@@ -28,14 +28,18 @@
         </el-page-header>
       </div>
       <div class="content-wrapper">
-        <component :is="activeComp" :rowId="rowId"></component>
+        <component
+          :is="activeComp"
+          :rowId="rowId"
+          :showTitle="false"
+        ></component>
       </div>
     </el-card>
   </div>
 </template>
 
 <script>
-  import baseInfo from './components/baseInfo.vue';
+  import baseInfo from './edit.vue';
   import maintain from '../components/details/maintain.vue';
   import repair from '../components/details/repair.vue';
   import malfunction from '../components/details/malfunction.vue';

src/views/ledgerAssets/boat/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="equipment_edit" class="ele-body baseinfo-container">
     <el-card shadow="never">
-      <div class="page-title">
+      <div class="page-title" v-if="showTitle">
         <el-page-header @back="$router.go(-1)">
           <div slot="content" class="pageContent">
             <div>{{ title }}</div>
@@ -240,6 +240,12 @@
         id: ''
       };
     },
+    props: {
+      showTitle: {
+        type: Boolean,
+        default: true
+      }
+    },
     watch: {},
     computed: {
       // 过保时间

src/views/ledgerAssets/components/assetInformation.vue

@@ -216,7 +216,7 @@
           class="descriptions"
         >
           <el-descriptions-item>
-            <template slot="label"> 维护部门 </template>
+            <template slot="label"> 片区负责人部门 </template>
             <el-form-item label-width="0">
               <div class="input">
                 <DeptSelect v-model="zcInfo.repairGroupId" @input="getwhbm" />
@@ -224,7 +224,7 @@
             </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item>
-            <template slot="label"> 维护人 </template>
+            <template slot="label"> 片区负责人 </template>
             <el-form-item label-width="0">
               <el-select
                 style="width: 100%"
@@ -241,6 +241,16 @@
               </el-select>
             </el-form-item>
           </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 片区负责人电话 </template>
+            <el-form-item label-width="0">
+              <el-input
+                v-model="zcInfo.repairsDeptPhone"
+                disabled
+                placeholder="请输入内容"
+              ></el-input>
+            </el-form-item>
+          </el-descriptions-item>
         </el-descriptions>
         <el-descriptions
           title=""

src/views/ledgerAssets/equipment/components/equipment-list.vue

@@ -14,7 +14,6 @@
       full-height="calc(100vh - 115px)"
       tool-class="ele-toolbar-form"
       cache-key="systemOrgUserTable"
-      @row-click="handleView"
       @select="selectChange"
       @select-all="changeSelectAll"
     >
@@ -66,9 +65,11 @@
         >
       </template>
       <!-- 编码列 -->
-      <!-- <template v-slot:code="{ row }">
-        <span>{{ row.code }}</span>
-      </template> -->
+      <template v-slot:code="{ row }">
+        <el-link type="primary" :underline="false" @click="details(row)">
+          {{ row.code }}
+        </el-link>
+      </template>
       <!-- 操作列 -->
       <template v-slot:action="{ row }">
         <el-link
@@ -144,9 +145,10 @@
           {
             columnKey: 'code',
             prop: 'code',
+            slot: 'code',
             label: '编码',
             showOverflowTooltip: true,
-            minWidth: 130
+            minWidth: 180
           },
           // {
           //   columnKey: 'code',
@@ -387,17 +389,14 @@
       reload(where) {
         this.$refs.table.reload({ pageNum: 1, where: where });
       },
-
       // 跳转到详情页
-      handleView({ id }, column) {
-        if (column.label !== '操作') {
-          this.$router.push({
-            path: '/ledgerAssets/equipment/detail',
-            query: {
-              id
-            }
-          });
-        }
+      details({ id }) {
+        this.$router.push({
+          path: '/ledgerAssets/equipment/detail',
+          query: {
+            id
+          }
+        });
       },
       // 跳转到编辑
       handEdit({ id }) {

src/views/ledgerAssets/equipment/detail.vue

@@ -29,14 +29,19 @@
         </el-page-header>
       </div>
       <div class="content-wrapper" style="margin-left: 10px">
-        <component :is="activeComp" :id="id" :code="code"></component>
+        <component
+          :is="activeComp"
+          :id="id"
+          :code="code"
+          :showTitle="false"
+        ></component>
       </div>
     </el-card>
   </div>
 </template>
 
 <script>
-  import baseInfo from './components/baseInfo.vue';
+  import baseInfo from './edit.vue';
   // import mould from '../components/details/mould.vue'
   import maintain from '../components/details/maintain.vue';
   import repair from '../components/details/repair.vue';

src/views/ledgerAssets/equipment/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="equipment_edit" class="ele-body baseinfo-container">
     <el-card shadow="never">
-      <div class="page-title">
+      <div class="page-title" v-if="showTitle">
         <el-page-header @back="$router.go(-1)">
           <div slot="content" class="pageContent">
             <div>{{ title }}</div>
@@ -147,6 +147,12 @@
       businessInformation,
       basicInfoVue
     },
+    props: {
+      showTitle: {
+        type: Boolean,
+        default: true
+      }
+    },
     data() {
       return {
         labelStyle: {

src/views/ledgerAssets/material/components/material-list.vue

@@ -101,9 +101,10 @@
           {
             columnKey: 'code',
             prop: 'code',
+            slot: 'code',
             label: '编码',
             showOverflowTooltip: true,
-            minWidth: 130
+            minWidth: 180
           },
           // {
           //   columnKey: 'code',
@@ -272,6 +273,15 @@
             : [];
       },
       // 跳转到详情页
+      details({ id }) {
+        this.$router.push({
+          path: '/ledgerAssets/material/detail',
+          query: {
+            id
+          }
+        });
+      },
+      // 跳转到详情页
       add() {
         this.$router.push({
           path: '/ledgerAssets/material/edit'

src/views/ledgerAssets/material/detail.vue

@@ -9,14 +9,18 @@
         </el-page-header>
       </div>
       <div class="content-wrapper">
-        <component :is="activeComp" :rowId="rowId"></component>
+        <component
+          :is="activeComp"
+          :rowId="rowId"
+          :showTitle="false"
+        ></component>
       </div>
     </el-card>
   </div>
 </template>
 
 <script>
-  import baseInfo from './components/baseInfo.vue';
+  import baseInfo from './edit.vue';
   export default {
     components: {
       baseInfo

src/views/ledgerAssets/material/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="equipment_edit" class="ele-body baseinfo-container">
     <el-card shadow="never">
-      <div class="page-title">
+      <div class="page-title" v-if="showTitle">
         <el-page-header @back="$router.go(-1)">
           <div slot="content" class="pageContent">
             <div>{{ title }}</div>
@@ -239,6 +239,12 @@
         id: ''
       };
     },
+    props: {
+      showTitle: {
+        type: Boolean,
+        default: true
+      }
+    },
     watch: {},
     computed: {
       // 过保时间

src/views/ledgerAssets/meter/components/equipment-list.vue

@@ -66,9 +66,11 @@
         >
       </template>
       <!-- 编码列 -->
-      <!-- <template v-slot:code="{ row }">
-        <span>{{ row.code }}</span>
-      </template> -->
+      <template v-slot:code="{ row }">
+        <el-link type="primary" :underline="false" @click="details(row)">
+          {{ row.code }}
+        </el-link>
+      </template>
       <!-- 操作列 -->
       <template v-slot:action="{ row }">
         <el-link
@@ -144,9 +146,10 @@
           {
             columnKey: 'code',
             prop: 'code',
+            slot: 'code',
             label: '编码',
             showOverflowTooltip: true,
-            minWidth: 130
+            minWidth: 200
           },
           // {
           //   columnKey: 'code',
@@ -302,6 +305,15 @@
       this.getAssetLevelOptions();
     },
     methods: {
+      // 跳转到详情页
+      details({ id }) {
+        this.$router.push({
+          path: '/ledgerAssets/meter/detail',
+          query: {
+            id
+          }
+        });
+      },
       // 获取资产级别下拉
       async getAssetLevelOptions() {
         let { data } = await getByCode('asset_level');

src/views/ledgerAssets/meter/detail.vue

@@ -29,14 +29,19 @@
         </el-page-header>
       </div>
       <div class="content-wrapper" style="margin-left: 10px">
-        <component :is="activeComp" :id="id" :code="code"></component>
+        <component
+          :is="activeComp"
+          :id="id"
+          :code="code"
+          :showTitle="false"
+        ></component>
       </div>
     </el-card>
   </div>
 </template>
 
 <script>
-  import baseInfo from './components/baseInfo.vue';
+  import baseInfo from './edit.vue';
   // import mould from '../components/details/mould.vue'
   import maintain from '../components/details/maintain.vue';
   import repair from '../components/details/repair.vue';

src/views/ledgerAssets/meter/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="equipment_edit" class="ele-body baseinfo-container">
     <el-card shadow="never">
-      <div class="page-title">
+      <div class="page-title" v-if="showTitle">
         <el-page-header @back="$router.go(-1)">
           <div slot="content" class="pageContent">
             <div>{{ title }}</div>
@@ -243,6 +243,12 @@
         id: ''
       };
     },
+    props: {
+      showTitle: {
+        type: Boolean,
+        default: true
+      }
+    },
     watch: {},
     computed: {
       // 过保时间

src/views/ledgerAssets/mould/components/mould-list.vue

@@ -129,9 +129,10 @@
           {
             columnKey: 'code',
             prop: 'code',
+            slot: 'code',
             label: '编码',
             showOverflowTooltip: true,
-            minWidth: 130
+            minWidth: 180
           },
           {
             prop: 'name',

src/views/ledgerAssets/mould/detail.vue

@@ -29,14 +29,18 @@
         </el-page-header>
       </div>
       <div class="content-wrapper">
-        <component :is="activeComp" :rowId="rowId"></component>
+        <component
+          :is="activeComp"
+          :rowId="rowId"
+          :showTitle="false"
+        ></component>
       </div>
     </el-card>
   </div>
 </template>
 
 <script>
-  import baseInfo from './components/baseInfo.vue';
+  import baseInfo from './edit.vue';
   import maintain from '../components/details/maintain.vue';
   import repair from '../components/details/repair.vue';
   import malfunction from '../components/details/malfunction.vue';

src/views/ledgerAssets/mould/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="equipment_edit" class="ele-body baseinfo-container">
     <el-card shadow="never">
-      <div class="page-title">
+      <div class="page-title" v-if="showTitle">
         <el-page-header @back="$router.go(-1)">
           <div slot="content" class="pageContent">
             <div>{{ title }}</div>
@@ -240,6 +240,12 @@
         id: ''
       };
     },
+    props: {
+      showTitle: {
+        type: Boolean,
+        default: true
+      }
+    },
     watch: {},
     computed: {
       // 过保时间

src/views/ledgerAssets/office/components/data-list.vue

@@ -40,12 +40,9 @@
 
       <!-- 编码列 -->
       <template v-slot:code="{ row }">
-        <!-- <el-link type="primary" :underline="false" @click="details(row)">
+        <el-link type="primary" :underline="false" @click="details(row)">
           {{ row.code }}
-        </el-link> -->
-        <div>
-          {{ row.code }}
-        </div>
+        </el-link>
       </template>
       <!-- 牌号列 -->
       <template v-slot:brandNum="{ row }">
@@ -129,9 +126,10 @@
           {
             columnKey: 'code',
             prop: 'code',
+            slot: 'code',
             label: '编码',
             showOverflowTooltip: true,
-            minWidth: 130
+            minWidth: 180
           },
           // {
           //   columnKey: 'code',

src/views/ledgerAssets/office/detail.vue

@@ -5,19 +5,23 @@
       <div class="page-title">
         <el-page-header @back="$router.go(-1)">
           <div slot="content" class="pageContent">
-            <div>模具信息详情</div>
+            <div>办公设备信息详情</div>
           </div>
         </el-page-header>
       </div>
       <div class="content-wrapper">
-        <component :is="activeComp" :rowId="rowId"></component>
+        <component
+          :is="activeComp"
+          :rowId="rowId"
+          :showTitle="false"
+        ></component>
       </div>
     </el-card>
   </div>
 </template>
 
 <script>
-  import baseInfo from './components/baseInfo.vue';
+  import baseInfo from './edit.vue';
   export default {
     components: {
       baseInfo

src/views/ledgerAssets/office/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="equipment_edit" class="ele-body baseinfo-container">
     <el-card shadow="never">
-      <div class="page-title">
+      <div class="page-title" v-if="showTitle">
         <el-page-header @back="$router.go(-1)">
           <div slot="content" class="pageContent">
             <div>{{ title }}</div>
@@ -239,6 +239,12 @@
         id: ''
       };
     },
+    props: {
+      showTitle: {
+        type: Boolean,
+        default: true
+      }
+    },
     watch: {},
     computed: {
       // 过保时间

src/views/ledgerAssets/sparepart/components/sparepart-list.vue

@@ -127,9 +127,10 @@
           {
             columnKey: 'code',
             prop: 'code',
+            slot: 'code',
             label: '编码',
             showOverflowTooltip: true,
-            minWidth: 130
+            minWidth: 200
           },
           // {
           //   columnKey: 'code',

src/views/ledgerAssets/sparepart/detail.vue

@@ -29,14 +29,18 @@
         </el-page-header>
       </div>
       <div class="content-wrapper">
-        <component :is="activeComp" :rowId="rowId"></component>
+        <component
+          :is="activeComp"
+          :rowId="rowId"
+          :showTitle="false"
+        ></component>
       </div>
     </el-card>
   </div>
 </template>
 
 <script>
-  import baseInfo from './components/baseInfo.vue';
+  import baseInfo from './edit.vue';
   import maintain from '../components/details/maintain.vue';
   import repair from '../components/details/repair.vue';
   import malfunction from '../components/details/malfunction.vue';

src/views/ledgerAssets/sparepart/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="equipment_edit" class="ele-body baseinfo-container">
     <el-card shadow="never">
-      <div class="page-title">
+      <div class="page-title" v-if="showTitle">
         <el-page-header @back="$router.go(-1)">
           <div slot="content" class="pageContent">
             <div>{{ title }}</div>
@@ -239,6 +239,12 @@
         id: ''
       };
     },
+    props: {
+      showTitle: {
+        type: Boolean,
+        default: true
+      }
+    },
     watch: {},
     computed: {
       // 过保时间

src/views/ledgerAssets/turnoverCar/components/turnovercar-list.vue

@@ -116,9 +116,10 @@
           {
             columnKey: 'code',
             prop: 'code',
+            slot: 'code',
             label: '编码',
             showOverflowTooltip: true,
-            minWidth: 130
+            minWidth: 180
           },
           {
             prop: 'name',

src/views/ledgerAssets/turnoverCar/detail.vue

@@ -29,14 +29,18 @@
         </el-page-header>
       </div>
       <div class="content-wrapper">
-        <component :is="activeComp" :rowId="rowId"></component>
+        <component
+          :is="activeComp"
+          :rowId="rowId"
+          :showTitle="false"
+        ></component>
       </div>
     </el-card>
   </div>
 </template>
 
 <script>
-  import baseInfo from './components/baseInfo.vue';
+  import baseInfo from './edit.vue';
   import maintain from '../components/details/maintain.vue';
   import repair from '../components/details/repair.vue';
   import malfunction from '../components/details/malfunction.vue';

src/views/ledgerAssets/turnoverCar/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="equipment_edit" class="ele-body baseinfo-container">
     <el-card shadow="never">
-      <div class="page-title">
+      <div class="page-title" v-if="showTitle">
         <el-page-header @back="$router.go(-1)">
           <div slot="content" class="pageContent">
             <div>{{ title }}</div>
@@ -242,6 +242,12 @@
         id: ''
       };
     },
+    props: {
+      showTitle: {
+        type: Boolean,
+        default: true
+      }
+    },
     watch: {},
     computed: {
       // 过保时间

src/views/ledgerAssets/turnoverDisks/components/equipment-list.vue

@@ -144,9 +144,10 @@
           {
             columnKey: 'code',
             prop: 'code',
+            slot: 'code',
             label: '编码',
             showOverflowTooltip: true,
-            minWidth: 130
+            minWidth: 180
           },
           {
             prop: 'name',

src/views/ledgerAssets/turnoverDisks/detail.vue

@@ -29,14 +29,19 @@
         </el-page-header>
       </div>
       <div class="content-wrapper" style="margin-left: 10px">
-        <component :is="activeComp" :id="id" :code="code"></component>
+        <component
+          :is="activeComp"
+          :id="id"
+          :code="code"
+          :showTitle="false"
+        ></component>
       </div>
     </el-card>
   </div>
 </template>
 
 <script>
-  import baseInfo from './components/baseInfo.vue';
+  import baseInfo from './edit.vue';
   // import mould from '../components/details/mould.vue'
   import maintain from '../components/details/maintain.vue';
   import repair from '../components/details/repair.vue';
@@ -64,7 +69,7 @@
         code: '',
         activeComp: 'baseInfo',
         tabOptions: [
-          { key: 'baseInfo', name: '新建周转盘信息' },
+          { key: 'baseInfo', name: '周转盘信息' },
           { key: 'pointInspection', name: '巡点检记录' },
           { key: 'maintain', name: '保养记录' },
           // { key: 'mould', name: '关联模具' },

src/views/ledgerAssets/turnoverDisks/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="equipment_edit" class="ele-body baseinfo-container">
     <el-card shadow="never">
-      <div class="page-title">
+      <div class="page-title" v-if="showTitle">
         <el-page-header @back="$router.go(-1)">
           <div slot="content" class="pageContent">
             <div>{{ title }}</div>
@@ -239,6 +239,12 @@
         id: ''
       };
     },
+    props: {
+      showTitle: {
+        type: Boolean,
+        default: true
+      }
+    },
     watch: {},
     computed: {
       // 过保时间

src/views/maintenance/repair/components/RepairDetailsDialog.vue

@@ -18,6 +18,7 @@
           :repairInfoLogList="repairInfoLogs"
           :workOrderInfo="workOrderInfo"
           :planInfo="planInfo"
+          :equipmentInfo="equipmentInfo"
           v-if="tabLabel === '工单信息'"
         />
         <RepairNotesTab

src/views/maintenance/repair/components/RepairNotesTab.vue

@@ -264,7 +264,7 @@
       height: 100%;
       border-radius: 50%;
       box-sizing: border-box;
-      background: #ccc;
+      background-color: #fff;
     }
     .step_active {
       border: 0;

src/views/maintenance/repair/components/WorkOrderTab.vue

@@ -31,11 +31,25 @@
         </el-col>
       </el-row>
       <el-row class="repair_row">
+        <el-col :span="8" class="repair_column">
+          <span>设备名称：</span>
+          <span>{{ equipmentInfo ? equipmentInfo.name : '' }}</span>
+        </el-col>
+        <el-col :span="8" class="repair_column">
+          <span>编号：</span>
+          <span>{{ equipmentInfo ? equipmentInfo.codeNumber : '' }}</span>
+        </el-col>
+        <el-col :span="8" class="repair_column">
+          <span>固定资产编码：</span>
+          <span>{{ equipmentInfo ? equipmentInfo.fixCode : '' }}</span>
+        </el-col>
+      </el-row>
+      <!-- <el-row class="repair_row">
         <el-col :span="24" class="repair_column">
           <span>维修方案：</span>
           <span>{{ workOrderInfo ? workOrderInfo.repairPrograms : '' }}</span>
         </el-col>
-      </el-row>
+      </el-row> -->
     </div>
     <el-steps
       direction="vertical"
@@ -464,6 +478,12 @@
   // import {  getSparePartDetail , getUseDetail } from '@/api/stockManagement/stocking'
   export default {
     props: {
+      equipmentInfo: {
+        type: Object,
+        default: () => {
+          return {};
+        }
+      },
       repairInfoLogList: {
         type: Array,
         default: () => {
@@ -610,6 +630,7 @@
       border: 1px solid #333;
       border-radius: 50%;
       box-sizing: border-box;
+      background-color: #fff;
     }
     .step_active {
       border: 0;

src/views/maintenance/repair/planRepair/components/detailDialog.vue

@@ -113,10 +113,10 @@
               </el-col>
             </el-row>
             <el-row style="border-top: 1px solid #eee">
-              <el-col :span="24" class="column">
+              <!-- <el-col :span="24" class="column">
                 <span class="label">维修方案：</span>
                 <span class="value">{{ item.maintenanceContent }}</span>
-              </el-col>
+              </el-col> -->
               <el-col :span="8" class="column">
                 <span class="label">计划完成时间：</span>
                 <span class="value">{{ item.plannedTime }}</span>
@@ -189,221 +189,221 @@
 </template>
 
 <script>
-// import maintenancePlan from '@/api/maintenance/repair/maintenancePlan'
-// import { sendAudit } from '@/api/stockManagement/stocking'
-// import { imageView } from '@/utils'
-export default {
-  data () {
-    return {
-      repairPlanDetailVisible: false,
-      currentIndex: 0,
-      detailsData: {},
-      urgentObj: {
-        1: '普通',
-        2: '紧急',
-        3: '重要'
-      },
-      stautsObj: {
-        0: '待接收',
-        1: '执行中',
-        2: '待审核',
-        3: '完成',
-        4: '已撤回',
-        5: '已驳回'
-      },
-      cause: '',
-      showtext: false,
-      row: {}
-    }
-  },
-  methods: {
-    // 请求详情数据
-    async openDeatailDialog (row) {
-      this.row = row
-      this.repairPlanDetailVisible = true
-      const res = await maintenancePlan.planInfoDetailApi(row.id)
-      console.log('详情数据：', res)
-      this.detailsData = res.data
-      console.log('详情数据12：', this.detailsData.planDetailRespList)
+  // import maintenancePlan from '@/api/maintenance/repair/maintenancePlan'
+  // import { sendAudit } from '@/api/stockManagement/stocking'
+  // import { imageView } from '@/utils'
+  export default {
+    data() {
+      return {
+        repairPlanDetailVisible: false,
+        currentIndex: 0,
+        detailsData: {},
+        urgentObj: {
+          1: '普通',
+          2: '紧急',
+          3: '重要'
+        },
+        stautsObj: {
+          0: '待接收',
+          1: '执行中',
+          2: '待审核',
+          3: '完成',
+          4: '已撤回',
+          5: '已驳回'
+        },
+        cause: '',
+        showtext: false,
+        row: {}
+      };
+    },
+    methods: {
+      // 请求详情数据
+      async openDeatailDialog(row) {
+        this.row = row;
+        this.repairPlanDetailVisible = true;
+        const res = await maintenancePlan.planInfoDetailApi(row.id);
+        console.log('详情数据：', res);
+        this.detailsData = res.data;
+        console.log('详情数据12：', this.detailsData.planDetailRespList);
 
-      this.detailsData.planDetailRespList.forEach(item => {
-        // 处理图片
-        if (item.repairsImg) {
-          const repairsImg = item.repairsImg
-          item.repairsImg = []
-          repairsImg.split(',').map(itm => {
-            imageView(itm).then(res => {
-              item.repairsImg.push({
-                name: itm.substring('/download/'.length),
-                url: res
-              })
-            })
+        this.detailsData.planDetailRespList.forEach((item) => {
+          // 处理图片
+          if (item.repairsImg) {
+            const repairsImg = item.repairsImg;
+            item.repairsImg = [];
+            repairsImg.split(',').map((itm) => {
+              imageView(itm).then((res) => {
+                item.repairsImg.push({
+                  name: itm.substring('/download/'.length),
+                  url: res
+                });
+              });
 
-            return
-          })
-        }
-      })
-    },
-    handleClose () {
-      this.repairPlanDetailVisible = false
-    },
-    handleRotate (index) {
-      this.currentIndex = index
-    },
-    //通过按钮事件
-    pass () {
-      let params = {
-        id: this.row.id,
-        checked: true,
-        myHandleId: this.row.dbid,
-        handleType: 0,
-        type: 1,
-        cause: ''
-      }
-      sendAudit(params).then(res => {
-        if (res.success) {
-          this.$message.success('审批通过!')
-          this.$emit('refeshone')
-          this.repairPlanDetailVisible = false
-        }
-      })
-    },
-    //驳回按钮事件
-    reject () {
-      this.showtext = true
-    },
-    cancelreject () {
-      this.showtext = false
-      this.cause = ''
-    },
-    surereject () {
-      if (!this.cause) {
-        this.$message.info('请填写驳回原因！')
-      } else {
+              return;
+            });
+          }
+        });
+      },
+      handleClose() {
+        this.repairPlanDetailVisible = false;
+      },
+      handleRotate(index) {
+        this.currentIndex = index;
+      },
+      //通过按钮事件
+      pass() {
         let params = {
           id: this.row.id,
-          checked: false,
+          checked: true,
           myHandleId: this.row.dbid,
           handleType: 0,
           type: 1,
-          cause: this.cause
-        }
-        sendAudit(params).then(res => {
+          cause: ''
+        };
+        sendAudit(params).then((res) => {
           if (res.success) {
-            this.$message.success('审批驳回!')
-            this.$emit('refeshone')
-            this.repairPlanDetailVisible = false
+            this.$message.success('审批通过!');
+            this.$emit('refeshone');
+            this.repairPlanDetailVisible = false;
           }
-        })
+        });
+      },
+      //驳回按钮事件
+      reject() {
+        this.showtext = true;
+      },
+      cancelreject() {
+        this.showtext = false;
+        this.cause = '';
+      },
+      surereject() {
+        if (!this.cause) {
+          this.$message.info('请填写驳回原因！');
+        } else {
+          let params = {
+            id: this.row.id,
+            checked: false,
+            myHandleId: this.row.dbid,
+            handleType: 0,
+            type: 1,
+            cause: this.cause
+          };
+          sendAudit(params).then((res) => {
+            if (res.success) {
+              this.$message.success('审批驳回!');
+              this.$emit('refeshone');
+              this.repairPlanDetailVisible = false;
+            }
+          });
+        }
       }
-    }
-  },
-  watch: {
-    repairPlanDetailVisible (nVal, oVal) {
-      if (!nVal) {
-        this.cause = ''
-        this.showtext = false
+    },
+    watch: {
+      repairPlanDetailVisible(nVal, oVal) {
+        if (!nVal) {
+          this.cause = '';
+          this.showtext = false;
+        }
       }
     }
-  }
-}
+  };
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-dialog__body {
-  padding-top: 10px;
-}
-.info_wrapper {
-  background-color: #f7f7f7;
-  padding-top: 20px;
-  .info_column {
-    display: flex;
-    margin-bottom: 20px;
-    .label {
-      width: 100px;
-      text-align: right;
-      margin-right: 5px;
-      font-weight: 700;
-    }
+  ::v-deep .el-dialog__body {
+    padding-top: 10px;
   }
-}
-.main_info {
-  margin: 20px 20px 0;
-  .main_info_title {
-    background-color: #bdcea3;
-    color: #000;
-    .main_info_column {
+  .info_wrapper {
+    background-color: #f7f7f7;
+    padding-top: 20px;
+    .info_column {
       display: flex;
-      border-right: 1px solid #fff;
-      box-sizing: border-box;
-      position: relative;
+      margin-bottom: 20px;
       .label {
-        padding: 5px 0;
-        font-weight: 700;
-        margin-right: 5px;
-        width: 120px;
+        width: 100px;
         text-align: right;
-      }
-      .value {
-        padding: 5px 0;
-      }
-      .arrow_icon {
-        font-size: 26px;
+        margin-right: 5px;
         font-weight: 700;
-        color: #fff;
-        transform: rotate(90deg);
-        position: absolute;
-        right: 5px;
-        top: 0;
-        cursor: pointer;
-        &:hover {
-          color: #4b7902;
-        }
-      }
-      .rotate90 {
-        transform: rotate(270deg);
       }
     }
   }
-  .transition_container {
-    border: 1px solid #eee;
-    .column {
-      border-right: 1px solid #eee;
-      border-bottom: 1px solid #eee;
-      box-sizing: border-box;
-      display: flex;
-      .label {
-        padding: 5px 0;
-        background-color: #f2f2f2;
-        font-weight: 700;
-        margin-right: 5px;
-        width: 120px;
-        text-align: right;
+  .main_info {
+    margin: 20px 20px 0;
+    .main_info_title {
+      background-color: #bdcea3;
+      color: #000;
+      .main_info_column {
+        display: flex;
+        border-right: 1px solid #fff;
+        box-sizing: border-box;
+        position: relative;
+        .label {
+          padding: 5px 0;
+          font-weight: 700;
+          margin-right: 5px;
+          width: 120px;
+          text-align: right;
+        }
+        .value {
+          padding: 5px 0;
+        }
+        .arrow_icon {
+          font-size: 26px;
+          font-weight: 700;
+          color: #fff;
+          transform: rotate(90deg);
+          position: absolute;
+          right: 5px;
+          top: 0;
+          cursor: pointer;
+          &:hover {
+            color: #4b7902;
+          }
+        }
+        .rotate90 {
+          transform: rotate(270deg);
+        }
       }
-      .value {
-        padding: 5px 0;
+    }
+    .transition_container {
+      border: 1px solid #eee;
+      .column {
+        border-right: 1px solid #eee;
+        border-bottom: 1px solid #eee;
+        box-sizing: border-box;
+        display: flex;
+        .label {
+          padding: 5px 0;
+          background-color: #f2f2f2;
+          font-weight: 700;
+          margin-right: 5px;
+          width: 120px;
+          text-align: right;
+        }
+        .value {
+          padding: 5px 0;
+        }
       }
     }
   }
-}
-.dialog_footer {
-  text-align: right;
-}
-.btnbox {
-  display: flex;
-  justify-content: center;
-  margin-top: 10px;
-}
-::v-deep .el-button {
-  padding: 10px 20px;
-  margin-right: 10px;
-}
-.textbox {
-  margin-top: 10px;
-}
-.textbtnbox {
-  margin-top: 10px;
-  display: flex;
-  justify-content: center;
-}
+  .dialog_footer {
+    text-align: right;
+  }
+  .btnbox {
+    display: flex;
+    justify-content: center;
+    margin-top: 10px;
+  }
+  ::v-deep .el-button {
+    padding: 10px 20px;
+    margin-right: 10px;
+  }
+  .textbox {
+    margin-top: 10px;
+  }
+  .textbtnbox {
+    margin-top: 10px;
+    display: flex;
+    justify-content: center;
+  }
 </style>

src/views/maintenance/repair/repairNotes/components/addDialog.vue

@@ -14,7 +14,7 @@
       >
     </div>
     <div class="main_container">
-      <el-form :model="addForm" :rules="addFormRules" label-width="120px">
+      <el-form :model="addForm" :rules="addFormRules" label-width="130px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="设备编码：" prop="code">
@@ -96,7 +96,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="维修部门：" prop="repairGroupName">
+            <el-form-item label="片区负责人部门：" prop="repairGroupName">
               <dept-select
                 v-model="addForm.repairGroupName"
                 placeholder="选择设备带出"
@@ -107,7 +107,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="维修人：" prop="repairUserName">
+            <el-form-item label="片区负责人：" prop="repairUserName">
               <person-select
                 v-model="addForm.repairUserId"
                 clearable

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

@@ -20,6 +20,11 @@
             详情
           </el-button>
         </template> -->
+        <template v-slot:code="{ row }"
+          ><el-link type="primary" :underline="false" @click="goDetail(row)">
+            {{ row.code }}
+          </el-link></template
+        >
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
           <el-link
@@ -49,14 +54,14 @@
           >
             转派
           </el-link>
-          <el-link
+          <!-- <el-link
             type="primary"
             :underline="false"
             icon="el-icon-edit"
             @click="goDetail(row)"
           >
             详情
-          </el-link>
+          </el-link> -->
         </template>
       </ele-pro-table>
     </el-card>
@@ -122,10 +127,11 @@
           },
           {
             prop: 'code',
+            slot: 'code',
             label: '工单编号',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 110
+            minWidth: 150
           },
           {
             prop: 'planCode',
@@ -149,15 +155,22 @@
             minWidth: 110
           },
           {
-            prop: 'createUserName',
-            label: '创建人',
+            prop: 'equiCode',
+            label: '设备编号',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'equiName',
+            label: '设备名称',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 110
           },
           {
-            prop: 'createTime',
-            label: '创建时间',
+            prop: 'executeUserName',
+            label: '执行人',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 110
@@ -210,7 +223,7 @@
                 0: '待接收',
                 1: '已接收',
                 2: '执行中',
-                3: '已完成',
+                3: '待验收',
                 4: '已验收'
               }[row.orderStatus];
             }
@@ -218,7 +231,7 @@
           {
             columnKey: 'action',
             label: '操作',
-            width: 300,
+            width: 240,
             align: 'center',
             resizable: false,
             slot: 'action',