Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eam into dengfei

src/store/modules/user.js

@@ -66,7 +66,7 @@ export default {
     },
     // 设置登录用户的权限
     setAuthorities(state, authorities) {
-      state.authorities = authorities;
+     state.authorities = authorities.map((item) => item.permissionCode);
     },
     // 设置登录用户的权限路由
     setAuthoritiesRouter(state, authoritiesRouter) {

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

@@ -26,6 +26,7 @@
           icon="el-icon-plus"
           class="ele-btn-icon"
           @click="add"
+          v-if="$hasPermission('main:substance:save')"
         >
           新建
         </el-button>
@@ -35,6 +36,7 @@
           class="ele-btn-icon"
           type="primary"
           @click="exportFile"
+          v-if="$hasPermission('main:exportFile:save')"
         >
           导出
         </el-button>
@@ -53,6 +55,7 @@
           icon="el-icon-thumb"
           class="ele-btn-icon"
           @click="moveTo(checkRadioData, 'person')"
+          v-if="$hasPermission('main:substance:update')"
         >
           设置片区负责人
         </el-button>
@@ -62,6 +65,7 @@
           icon="el-icon-s-tools"
           class="ele-btn-icon"
           @click="batchSettings(1)"
+          v-if="$hasPermission('main:substance:update')"
         >
           设置权属部门
         </el-button>
@@ -71,6 +75,7 @@
           icon="el-icon-setting"
           class="ele-btn-icon"
           @click="batchSettings(2)"
+          v-if="$hasPermission('main:substance:update')"
         >
           设置使用单位
         </el-button>
@@ -80,6 +85,7 @@
           icon="el-icon-delete"
           class="ele-btn-icon"
           @click="handlDelete"
+          v-if="$hasPermission('main:substance:delete')"
           >批量删除</el-button
         >
         <!-- <el-button
@@ -102,6 +108,7 @@
           class="ele-action"
           title="确定要删除此设备数据吗？"
           @confirm="handleRemove(row)"
+          v-if="$hasPermission('main:substance:delete')"
         >
           <template v-slot:reference>
             <el-link type="danger" :underline="false" icon="el-icon-delete"
@@ -114,6 +121,7 @@
           :underline="false"
           icon="el-icon-edit"
           @click="handEdit(row)"
+          v-if="$hasPermission('main:substance:update')"
         >
           编辑
         </el-link>
@@ -264,6 +272,13 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'workstationInfo.name',
+            label: '工位名称',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+
           {
             prop: 'usePerson',
             label: '使用人',

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

@@ -17,7 +17,7 @@
             >
           </HeaderTitle>
           <el-row>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-col :span="12">
                 <el-form-item label="计划单号">
                   <span> {{ infoData?.code }} </span>
@@ -97,9 +97,9 @@
                 </el-form-item>
               </el-col>
             </el-col>
-            <el-col :span="12">
-              <!-- <img :src="infoData.imageUrl" alt="" /> -->
-            </el-col>
+            <!-- <el-col :span="12">
+              <img :src="infoData.imageUrl" alt="" />
+            </el-col> -->
           </el-row>
         </div>
 

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

@@ -16,7 +16,7 @@
             >
           </HeaderTitle>
           <el-row>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-col :span="12">
                 <el-form-item label="计划单号">
                   <span> {{ infoData.planCode }} </span>
@@ -96,9 +96,9 @@
                 </el-form-item>
               </el-col>
             </el-col>
-            <el-col :span="12">
+            <!-- <el-col :span="12">
               <img :src="data.imageUrl" alt="" />
-            </el-col>
+            </el-col> -->
           </el-row>
         </div>
 

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

@@ -95,10 +95,7 @@
                   <span> {{ infoData.remark }} </span>
                 </el-form-item>
               </el-col>
-            </el-col>
-            <el-col :span="12">
-              <!-- <img :src="infoData.imageUrl" alt="" /> -->
-            </el-col>
+  
           </el-row>
         </div>
         <!-- 备品备件 -->

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

@@ -16,7 +16,7 @@
             >
           </HeaderTitle>
           <el-row>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-col :span="12">
                 <el-form-item label="计划单号">
                   <span> {{ infoData.planCode }} </span>
@@ -96,9 +96,9 @@
                 </el-form-item>
               </el-col>
             </el-col>
-            <el-col :span="12">
+            <!-- <el-col :span="12">
               <img :src="data.imageUrl" alt="" />
-            </el-col>
+            </el-col> -->
           </el-row>
         </div>
 

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

@@ -38,9 +38,9 @@
           </el-link> -->
           <jimureportBrowse
             :businessId="row.id"
-            businessCode="qmsprint"
+            businessCode="eommaintenance"
+            v-if="row.orderStatus==3"
           ></jimureportBrowse>
-
           <el-link
             v-if="row.orderStatus !== 3 && row.orderStatus !== 4"
             type="primary"

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

@@ -17,7 +17,7 @@
             >
           </HeaderTitle>
           <el-row>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-col :span="12">
                 <el-form-item label="计划单号">
                   <span> {{ infoData.code }} </span>
@@ -97,9 +97,9 @@
                 </el-form-item>
               </el-col>
             </el-col>
-            <el-col :span="12">
-              <!-- <img :src="infoData.imageUrl" alt="" /> -->
-            </el-col>
+            <!-- <el-col :span="12">
+              <img :src="infoData.imageUrl" alt="" />
+            </el-col> -->
           </el-row>
         </div>
         <!-- 备品备件 -->

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

@@ -16,7 +16,7 @@
             >
           </HeaderTitle>
           <el-row>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-col :span="12">
                 <el-form-item label="计划单号">
                   <span> {{ infoData.planCode }} </span>
@@ -96,9 +96,9 @@
                 </el-form-item>
               </el-col>
             </el-col>
-            <el-col :span="12">
+            <!-- <el-col :span="12">
               <img :src="data.imageUrl" alt="" />
-            </el-col>
+            </el-col> -->
           </el-row>
         </div>
 

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

@@ -17,14 +17,11 @@
         </template>
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
-          <el-link
-            v-if="row.orderStatus === 3"
-            type="primary"
-            :underline="false"
-            @click="handleExport(row)"
-          >
-            预览打印
-          </el-link>
+          <jimureportBrowse
+            :businessId="row.id"
+            businessCode="eampatrolinspectionprint"
+            v-if="row.orderStatus==3"
+          ></jimureportBrowse>
           <el-link
             v-if="row.orderStatus !== 3 && row.orderStatus !== 4"
             type="primary"
@@ -74,6 +71,7 @@
     getWorkOrderPage,
     getWordOrderDetail
   } from '@/api/maintenance/patrol_maintenance';
+  import jimureportBrowse from '@/components/jimureport/browseModal.vue';
 
   import dictMixins from '@/mixins/dictMixins';
 
@@ -83,6 +81,7 @@
       WorkSearch,
       redeployOther,
       signingUpWork,
+      jimureportBrowse,
       edit
     },
     mixins: [dictMixins],