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

qiankun_config/store.js

@@ -19,6 +19,6 @@ export default function (state) {
     store.commit('user/setUserInfo', state.user.info);
   }
   if (state.user?.authorityDept) {
-    store.dispatch('user/getCurrentUserAuthorityDept');
+    // store.dispatch('user/getCurrentUserAuthorityDept');
   }
 }

src/api/main/index.js

@@ -4,39 +4,41 @@ import request from '@/utils/request';
  * 工单信息
  */
 export async function listInspection(data) {
-  const res = await request.get('/eam/workorder/listInspection?type='+data.type);
+  const res = await request.get(
+    '/eam/workorder/listInspection?type=' + data.type
+  );
   if (res.data.code == 0) {
-    return Promise.resolve(res.data.data)
+    return Promise.resolve(res.data.data);
   }
   return Promise.reject(new Error(res.data.message));
 }
 /**
  * 设备状态
  */
- export async function queryRunStatus(data) {
+export async function queryRunStatus(data) {
   const res = await request.get('/eam/workorder/queryRunStatus');
   if (res.data.code == 0) {
-    return Promise.resolve(res.data.data)
+    return Promise.resolve(res.data.data);
   }
   return Promise.reject(new Error(res.data.message));
 }
 /**
  * 部门故障统计率
  */
- export async function queryGroupName(data) {
+export async function queryGroupName(data) {
   const res = await request.get('/eam/workorder/queryGroupName');
   if (res.data.code == 0) {
-    return Promise.resolve(res.data.data)
+    return Promise.resolve(res.data.data);
   }
   return Promise.reject(new Error(res.data.message));
 }
 /**
  * 设备故障数统计
  */
- export async function queryDevice(data) {
+export async function queryDevice(data) {
   const res = await request.get('/eam/workorder/queryDevice');
   if (res.data.code == 0) {
-    return Promise.resolve(res.data.data)
+    return Promise.resolve(res.data.data);
   }
   return Promise.reject(new Error(res.data.message));
 }
@@ -46,7 +48,26 @@ export async function listInspection(data) {
 export async function indexGroupQuery() {
   const res = await request.get('/eam/workorder/indexGroupQuery');
   if (res.data.code == 0) {
-    return Promise.resolve(res.data.data)
+    return Promise.resolve(res.data.data);
   }
   return Promise.reject(new Error(res.data.message));
-}
+}
+
+// 设置权属部门
+export async function updateOwnershipDepartment(data) {
+  const res = await request.post('/main/asset/updateOwnershipDepartment', data);
+  if (res.data.code == 0) {
+    return Promise.resolve(res.data.data);
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+
+// 设置使用单位
+export async function updateUnitUse(data) {
+  const res = await request.post('/main/asset/updateUnitUse', data);
+  if (res.data.code == 0) {
+    return Promise.resolve(res.data.data);
+  }
+  return Promise.reject(new Error(res.data.message));
+}

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

@@ -0,0 +1,87 @@
+<template>
+  <ele-modal
+    width="30%"
+    :visible.sync="visible"
+    custom-class="ele-dialog-form"
+    :before-close="cancel"
+    :title="`设置${title}`"
+    :maxable="true"
+  >
+    <el-form
+      label-width="80px"
+      :model="addForm"
+      ref="form"
+      class="ele-form-search"
+    >
+      <el-form-item :label="title" required>
+        <DeptSelect v-model="addForm.id" />
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="cancel">取 消</el-button>
+      <el-button type="primary" @click="submit" :loading="loading"
+        >确 定</el-button
+      >
+    </span>
+  </ele-modal>
+</template>
+
+<script>
+  import DeptSelect from '@/components/CommomSelect/dept-select.vue';
+  import { updateOwnershipDepartment, updateUnitUse } from '@/api/main/index';
+  export default {
+    components: { DeptSelect },
+    data() {
+      return {
+        title: '所属部门',
+        visible: false,
+        loading: false,
+        addForm: {
+          id: ''
+        },
+        type: 1,
+        ids: []
+      };
+    },
+    methods: {
+      cancel() {
+        this.addForm.id = '';
+        this.ids = [];
+        this.visible = false;
+      },
+      open(type, ids) {
+        this.ids = ids;
+        this.type = type;
+        this.title = type == 1 ? '所属部门' : '所属单位';
+        this.visible = true;
+      },
+      submit() {
+        if (!this.addForm.id) {
+          return this.$message.warning(`请先选择${this.title}`);
+        }
+        let params = {
+          id: this.ids
+        };
+        if (this.type == 1) {
+          params.ownershipGroupId = this.addForm.id;
+        } else {
+          params.postId = this.addForm.id;
+        }
+        const api = this.type == 1 ? updateOwnershipDepartment : updateUnitUse;
+        this.loading = true;
+        api(params)
+          .then((res) => {
+            this.loading = false;
+            if (res) {
+              this.$message.success('操作成功');
+              this.cancel();
+              this.$emit('success',true);
+            }
+          })
+          .catch((err) => {
+            this.loading = false;
+          });
+      }
+    }
+  };
+</script>

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

@@ -56,6 +56,24 @@
         >
           设置片区负责人
         </el-button>
+        <el-button
+          size="small"
+          :disabled="checkRadioData.length == 0"
+          icon="el-icon-s-tools"
+          class="ele-btn-icon"
+          @click="batchSettings(1)"
+        >
+          设置权属部门
+        </el-button>
+        <el-button
+          size="small"
+          :disabled="checkRadioData.length == 0"
+          icon="el-icon-setting"
+          class="ele-btn-icon"
+          @click="batchSettings(2)"
+        >
+          设置使用单位
+        </el-button>
         <el-button
           size="small"
           type="danger"
@@ -106,12 +124,13 @@
     <print ref="printRef"></print>
     <printSr ref="printSrRef"></printSr>
     <printTg ref="printTgRef"></printTg>
-
     <BomDetailsPop ref="bomDrawer"></BomDetailsPop>
+    <batchSetDialog ref="batchSetRef" @success="sucesstion" />
   </div>
 </template>
 
 <script>
+  import batchSetDialog from './batchSetDialog.vue';
   import print from '@/views/ledgerAssets/components/print.vue';
   import printSr from '@/views/ledgerAssets/components/printSr';
   import printTg from '@/views/ledgerAssets/components/printTg';
@@ -150,7 +169,8 @@
       print,
       printSr,
       printTg,
-      BomDetailsPop
+      BomDetailsPop,
+      batchSetDialog
     },
     mixins: [dictMixins],
     props: {
@@ -535,6 +555,14 @@
           isTemp: row.isTemp
         };
         this.$refs.bomDrawer.open(rowData);
+      },
+
+      batchSettings(type) {
+        let ids = this.checkRadioData.map((item) => {
+          return item.id;
+        });
+        this.$refs.batchSetRef.open(type, ids);
+        console.log(this.checkRadioData, 'checkRadioData 123');
       }
     },
     watch: {

src/views/login/index.vue

@@ -191,7 +191,7 @@
               this.$store.commit('user/setUserInfo', res.data);
               this.loading = false;
               this.$message.success(res.message);
-              this.$store.dispatch('user/getCurrentUserAuthorityDept');
+              // this.$store.dispatch('user/getCurrentUserAuthorityDept');
               this.goHome();
             })
             .catch((e) => {