789

package.json

@@ -31,6 +31,7 @@
     "echarts": "^5.3.3",
     "echarts-wordcloud": "^2.0.0",
     "ele-admin": "^1.11.2",
+    "element-tree-line": "^0.2.1",
     "element-ui": "2.15.7",
     "github-markdown-css": "^5.1.0",
     "highlight.js": "9.18.5",

src/api/maintenance/patrol_maintenance.js

@@ -106,6 +106,16 @@ export async function workOrderRotate(data) {
   return Promise.reject(new Error(res.data.message));
 }
 
+export async function addAssists(data) {
+  const res = await request.get('/eam/workordermaintenance/addAssists', {
+    params: data
+  });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
 // 删除量具送检计划
 export async function workOrderDelete(data) {
   const res = await request.delete('/eam/plan/delete', { data });

src/components/addDoc/api/index.js

@@ -0,0 +1,122 @@
+import request from '@/utils/request';
+
+/**
+ * 查询文件夹分类数据
+ * @data data
+ */
+export async function getDocTreeListAPI(data) {
+  const res = await request.post('/fm/directory/selectTreeList', data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+* 查询文件数据
+* @data data
+*/
+export async function filePageAPI(data) {
+  const res = await request.post('/fm/file/pageBusiness', data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+/**
+ * 保存
+ * @data data
+ */
+export async function fileSaveAPI(data) {
+  const res = await request.post('/fm/file/save', data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 详情
+ * @id id
+ */
+export async function fileGetByIdAPI(id) {
+  const res = await request.get(`/fm/file/getById/${id}`);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * ids查询文件列表
+ * @data data
+ */
+ export async function queryIds(data) {
+  const res = await request.post('/fm/file/queryIds', data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+
+
+
+// 获取编码树
+export async function selectTreeList(data) {
+  const res = await request.post(`/main/business_code_category/selectTreeList`, data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+// 获取右侧列表
+export async function listParentId(data) {
+  const res = await request.post(`/main/business_code_category/listPageParentId`, data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+// 获取右侧码段列表
+export async function pageSegment(data) {
+  const res = await request.post(`/main/business_code_manage/page`, data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+
+// 生成编码
+export async function getCode(id) {
+  const res = await request.get(`/main/business_code_category/applyForCode/`+id);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 上传文件
+ * @param file 文件
+ */
+ export async function uploadFileNew (data) {
+  const formData = new FormData();
+  formData.append('multiPartFile', data.multiPartFile);
+  formData.append('module', data.module);
+  const res = await request.post('/main/file/uploadFile', formData);
+  if (res.data.code === '0') {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+// 编码方案
+export async function listCode() {
+  const res = await request.get(`/main/business_code_category/listCode/WD0001`);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+

src/components/addDoc/browse.vue

@@ -0,0 +1,61 @@
+<template>
+  <ele-modal
+    :visible.sync="showEditFlag"
+    :close-on-click-modal="false"
+    custom-class="ele-dialog-form"
+    append-to-body
+    :fullscreen="true"
+  >
+    <iframe
+      :src="fileUrl"
+      width="100%"
+      v-if="showEditFlag"
+      style="height: calc(100vh - 100px)"
+      frameborder="0"
+      allowfullscreen="true"
+    ></iframe
+  ></ele-modal>
+</template>
+
+<script>
+import { getFileType } from './util.js';
+
+export default {
+  data() {
+    return {
+      fileUrl: '',
+      showEditFlag: false
+    };
+  },
+
+  methods: {
+    open(row){
+      this.showEditFlag=true
+      this.setFileUrl(row)
+    },
+    setFileUrl(row) {
+      let file = row.storagePath[0];
+      let fileNames=file.storePath.split('/')
+      let url = window.location.origin+'/api/main/file/getFile?objectName='+file.storePath+'&fullfilename='+fileNames[fileNames.length-1]
+      this.fileUrl = '/kkfile/onlinePreview?url=' + btoa(url);
+      
+      // const fileExt = file.name.substr(file.name.lastIndexOf('.') + 1);
+      // this.fileType = getFileType().includes(fileExt) ? 2 : 1;
+      // if (this.fileType == 2) {
+      //   this.fileUrl =
+      //     '/fm/' +
+      //     (['dxf', 'dwg'].includes(fileExt) ? '2DViewer' : '3DViewer') +
+      //     '/view.html?url=' +
+      //     sessionStorage.filePath +
+      //     '/' +
+      //     row.outputNdsFiles;
+      // } else {
+      //   this.fileUrl = '/kkfile/onlinePreview?url=' + btoa(url);
+      //   // 'http://192.168.1.107:18082/kkfile/onlinePreview?url=' + btoa(url);
+      // }
+    }
+  }
+};
+</script>
+<style scoped lang="scss">
+</style>

src/components/addDoc/doc_template.vue

@@ -0,0 +1,175 @@
+<template>
+  <div class="ele-body" style="height:60vh;overflow: auto;">
+    <el-card shadow="never" v-loading="loading">
+      <ele-split-layout
+        width="210px"
+        allow-collapse
+        :right-style="{ overflow: 'hidden' }"
+      >
+        <div>
+          <!-- 操作按钮 -->
+          <ele-toolbar class="ele-toolbar-actions">
+            <div style="margin: 5px 0"> </div>
+          </ele-toolbar>
+          <div class="ele-border-lighter sys-organization-list">
+            <el-tree
+              ref="tree"
+              :data="data"
+              highlight-current
+              :draggable="true"
+              node-key="id"
+              :props="{ label: 'name', children: 'sonDirectoryList' }"
+              :expand-on-click-node="false"
+              :default-expand-all="true"
+              @node-click="onNodeClick"
+            >
+              <span class="custom-tree-node" slot-scope="{ node, data }">
+                <ElementTreeLine
+                  :node="node"
+                  :showLabelLine="true"
+                  :indent="20"
+                >
+                  <img src="../../assets/wjj.png" />
+
+                  <span>{{ node.label }}</span>
+                </ElementTreeLine>
+              </span>
+            </el-tree>
+          </div>
+        </div>
+        <template v-slot:content>
+          <FileTableList
+            ref="tableRef"
+            :parentData="current"
+            :disabledTableList="disabledTableList"
+          />
+        </template>
+      </ele-split-layout>
+    </el-card>
+
+    <!-- {{current?.id}} -->
+  </div>
+</template>
+
+<script>
+//
+import FileTableList from './file-table-listTemplate.vue';
+import { getDocTreeListAPI } from './api';
+import { mapGetters } from 'vuex';
+
+import ElementTreeLine from 'element-tree-line';
+// css
+import 'element-tree-line/dist/style.scss';
+export default {
+  components: { FileTableList, ElementTreeLine },
+
+  data() {
+    return {
+      loading: true,
+      // 列表数据
+      data: [],
+      fileType:0,
+      // 选中数据
+      current: {}
+    };
+  },
+  props: {
+    lcyStatus: '', //1：文档工作区 2：文档归档区 3：文档发布区 4：文档废止区
+
+    disabledTableList: {
+      //已选择列表
+      default: () => []
+    }
+  },
+  computed: {
+    ...mapGetters(['user'])
+  },
+  created() {
+    this.query();
+  },
+
+  methods: {
+    /* 查询 */
+    async query() {
+      this.loading = true;
+      let query = {
+        type: this.fileType,
+        currentUserId: this.user.info.userId
+      };
+      this.data = await getDocTreeListAPI(query);
+
+      this.current = null;
+      this.$nextTick(() => {
+        this.$refs.tree.setCurrentKey(this.data[0].id);
+
+        this.onNodeClick(this.data[0]);
+      });
+      this.loading = false;
+    },
+    /* 选择数据 */
+    onNodeClick(row) {
+      if (row) {
+        this.current = row;
+        this.$nextTick(() => {
+          this.$refs.tableRef.reload();
+        });
+      } else {
+        this.current = null;
+      }
+    },
+
+    getTableList() {
+      return this.$refs.tableRef.getTableList();
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.sys-organization-list {
+  height: calc(100vh - 180px);
+  box-sizing: border-box;
+  border-width: 1px;
+  border-style: solid;
+  overflow: auto;
+}
+
+.sys-organization-list :deep(.el-tree-node__content) {
+  height: 30px;
+
+  & > .el-tree-node__expand-icon {
+    margin-left: 10px;
+  }
+}
+.custom-tree-node {
+  display: flex;
+  align-items: center;
+}
+:deep(.el-popover) {
+  min-width: 50px;
+  position: fixed;
+}
+:deep(.el-link--inner) {
+  padding: 3px 0;
+}
+// :deep(.element-tree-node-line-hor) {
+//   border-bottom: 1px solid #dcdfe6;
+// }
+// :deep(.element-tree-node-line-ver) {
+//   border-left: 1px solid #dcdfe6;
+// }
+</style>
+<style lang="scss">
+.el-tree
+  > .el-tree-node
+  > .el-tree-node__content:nth-of-type(1)
+  .element-tree-node-line-hor {
+  border: none;
+}
+.el-tree
+  > .el-tree-node
+  > .el-tree-node__content:nth-of-type(1)
+  .element-tree-node-line-ver {
+  border: none;
+}
+</style>

src/components/addDoc/file-edit.vue

@@ -0,0 +1,263 @@
+<!-- 用户编辑弹窗 -->
+<template>
+  <ele-modal
+    width="500px"
+    :visible.sync="showEditFlag"
+    :close-on-click-modal="false"
+    custom-class="ele-dialog-form"
+    append-to-body
+    @close="cancel"
+    :title="title"
+    ref="Emodal"
+  >
+    <el-form ref="form" :model="form" :rules="rules" label-width="82px">
+      <el-row :gutter="15">
+        <el-col :span="24">
+          <el-form-item label="编码分类" prop="codeType">
+            <ele-tree-select
+              clearable
+              :data="list"
+              v-model="form.codeType"
+              placeholder="请选择"
+              default-expand-all
+              labelKey="name"
+              childrenKey="sonDirectoryList"
+              valueKey="id"
+              @change="typeChange"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="编码方案" prop="businessCodeId">
+            <el-select
+              v-model="form.businessCodeId"
+              placeholder="请选择"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="文档类型" prop="type">
+            <DictSelection
+              dictName="文档类型"
+              v-model="form.type"
+            ></DictSelection>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+          <el-form-item label="文档" prop="storagePath">
+            <div style="display: flex; align-items: center">
+              <fileUpload
+                v-model="form.storagePath"
+                module="main"
+                :limit="100"
+                :multiple="true"
+                @fileChange="fileChange"
+              >
+
+              </fileUpload>
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="文档位置" prop="directoryId">
+            <el-cascader
+              style="width: 100%"
+              v-model="form.directoryId"
+              :options="folderList"
+              :props="{
+                value: 'id',
+                label: 'name',
+                children: 'sonDirectoryList',
+                emitPath: false,
+                checkStrictly: true
+              }"
+            ></el-cascader>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              v-model="form.remark"
+              type="textarea"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template v-slot:footer>
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" :loading="loading" @click="save">
+        确认
+      </el-button>
+    </template>
+  </ele-modal>
+</template>
+
+<script>
+import { fileSaveAPI,selectTreeList, listParentId,getDocTreeListAPI,listCode} from './api/index';
+import FileUpload from './fileUpload.vue';
+import { setFolderList } from './util.js';
+import { mapGetters } from 'vuex';
+export default {
+  components: { FileUpload },
+
+  data() {
+    const defaultForm = {
+      name: '', //名称
+      type: '', //类型
+      sizeUnit: '', //大小，
+      unit: '', //单位
+      remark: '', //备注
+      status: '', //状态
+      storagePathId: '',
+      directoryId: '',
+      businessCodeId: '',
+      storagePath: [],
+      id: '',
+      lcyStatus: 1,
+      fileType:0
+    };
+    return {
+      rules: {
+        businessCodeId: [
+          { required: true, message: '请选择', trigger: 'blur' }
+        ],
+        // codeType: [{ required: true, message: '请选择', trigger: 'blur' }],
+        directoryId: [{ required: true, message: '请选择', trigger: 'blur' }],
+        storagePath: [{ required: true, message: '请选择', trigger: 'blur' }]
+      },
+      templateVisible: false,
+      folderList: [],
+      list: [],
+      options: [],
+      defaultForm,
+      code: '',
+      // 表单数据
+      form: { ...defaultForm },
+
+      // 提交状态
+      loading: false,
+      showEditFlag: false,
+      title: '',
+      type: '新建附件'
+    };
+  },
+  computed: {
+    // 是否开启响应式布局
+    styleResponsive() {
+      return this.$store.state.theme.styleResponsive;
+    },
+    ...mapGetters(['user'])
+  },
+  async created() {
+    let query = {
+      type: 0,
+      currentUserId: this.user.info.userId
+    };
+    this.folderList = await getDocTreeListAPI(query);
+    setFolderList(this.folderList); //权限过滤
+  },
+  methods: {
+    async open() {
+    
+      this.showEditFlag = true;
+      this.list = await selectTreeList();
+      this.options= await listCode();
+      if(this.options.length>0){
+        this.form.businessCodeId=this.options[0].id
+      }
+      this.setTree(this.list);
+    },
+    setTree(data) {
+      data.forEach((item) => {
+        item.sonDirectoryList = item.sonDirectoryList.filter(
+          (item) => item.type == 1
+        );
+        if (item.sonDirectoryList.length > 0) {
+          this.setTree(item.sonDirectoryList);
+        }
+      });
+    },
+    async typeChange(val) {
+      let data = await listParentId({
+        pageNum: 1,
+        size: 100,
+        parentId: val
+      });
+      this.options = data.list.filter((item) => item.type == 2);
+      this.form.businessCodeId = '';
+    },
+
+    fileChange(file) {
+      this.form.name = file.name.replace(/\.[^/.]+$/, '');
+    },
+
+    /* 保存编辑 */
+    save() {
+      this.$refs.form.validate(async (valid) => {
+        if (!valid) {
+          return false;
+        }
+
+        const data = {
+          ...this.form,
+        };
+
+        this.loading = true;
+        fileSaveAPI(data)
+          .then( (msg) => {
+            this.loading = false;
+
+            this.cancel();
+            this.$emit('done',msg);
+          })
+          .catch((e) => {
+            this.loading = false;
+          });
+      });
+    },
+
+    cancel() {
+      this.form = { ...this.defaultForm };
+      this.$refs.form.clearValidate();
+      this.showEditFlag = false;
+    }
+  }
+};
+</script>
+<style scoped lang="scss">
+.aaa {
+  width: 100%;
+
+  ::v-deep .upload-demo {
+    width: 100%;
+
+    .el-upload--text {
+      width: 100%;
+
+      button {
+        width: 100%;
+        background: #ffffff;
+        border: 1px solid #dbdbdb;
+        border-radius: 5px;
+      }
+    }
+
+    .el-upload-list {
+      transform: translate(10px, -39px);
+      position: absolute;
+    }
+  }
+}
+</style>

src/components/addDoc/file-table-listTemplate.vue

@@ -0,0 +1,199 @@
+<template>
+  <div>
+    <!-- 数据表格 -->
+    <ele-pro-table
+      ref="table"
+      :columns="columns"
+      :datasource="datasource"
+      tool-class="ele-toolbar-form"
+      :needPage="false"
+      row-key="id"
+      :selection.sync="selection"
+      :toolbar="false"
+    >
+      <!-- 操作列 -->
+      <template v-slot:action="{ row }">
+        <el-link
+          type="primary"
+          :underline="false"
+          icon="el-icon-edit"
+          @click="browseOpen(row)"
+        >
+          浏览
+        </el-link>
+      </template>
+    </ele-pro-table>
+    <browse ref="browseRef"></browse>
+  </div>
+</template>
+
+<script>
+import { filePageAPI } from './api';
+import browse from './browse.vue';
+
+export default {
+  components: { browse },
+  props: {
+    // 上级
+    parentData: {
+      type: Object,
+      default: () => {}
+    },
+
+    disabledTableList: {
+      //已选择列表
+      default: () => []
+    }
+  },
+
+  data() {
+    return {
+      selection: [],
+      columns: [
+        {
+          width: 45,
+          type: 'selection',
+          columnKey: 'selection',
+          align: 'center',
+          selectable: (row, index) => {
+            return !this.disabledTableList
+              .map((item) => item.id)
+              .includes(row.id);
+          }
+        },
+        {
+          label: '编码',
+          prop: 'code',
+          width: 180,
+          align: 'center',
+          fixed: 'left',
+          showOverflowTooltip: true
+        },
+        {
+          prop: 'name',
+          label: '文档名称',
+          align: 'center',
+          slot: 'name',
+          showOverflowTooltip: true,
+          minWidth: 200
+        },
+        {
+          prop: 'storagePath',
+          label: '文件名称',
+          align: 'center',
+
+          showOverflowTooltip: true,
+          minWidth: 200,
+          formatter: (_row, _column, cellValue) => {
+            return cellValue[0]?.name;
+          }
+        },
+        {
+          prop: 'version',
+          label: '版本',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 100
+        },
+        {
+          prop: 'checkOutUserName',
+          label: '检出人',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 100
+        },
+        {
+          prop: 'checkOutStatus',
+          label: '检出状态',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 100,
+          formatter: (_row, _column, cellValue) => {
+            return cellValue == 1 ? '已检出' : '';
+          }
+        },
+        {
+          prop: 'checkOutTime',
+          label: '检出时间',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 160
+        },
+        {
+          prop: 'createUserName',
+          label: '创建人',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 100
+        },
+        {
+          prop: 'createTime',
+          label: '创建时间',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 160,
+          formatter: (_row, _column, cellValue) => {
+            return this.$util.toDateString(cellValue);
+          }
+        },
+        {
+          prop: 'updateUserName',
+          label: '修改人',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 100
+        },
+        {
+          prop: 'updateTime',
+          label: '修改时间',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 160
+        },
+        {
+          prop: 'sizeUnit',
+          label: '文档大小',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 100
+        },
+        {
+          columnKey: 'action',
+          label: '操作',
+          width: 150,
+          align: 'center',
+          resizable: false,
+          slot: 'action',
+          showOverflowTooltip: true,
+          fixed: 'right'
+        }
+      ]
+    };
+  },
+  created() {},
+
+  methods: {
+    /* 表格数据源 */
+    datasource({ page, limit, where, order }) {
+      return filePageAPI({
+        ...where,
+        ...order,
+        pageNum: page,
+        size: limit,
+        directoryId: this.parentData?.id
+      });
+    },
+    /* 刷新表格 */
+    reload(where) {
+      this.$refs.table.reload({ pageNum: 1, where: where });
+    },
+
+    browseOpen(row) {
+      this.$refs.browseRef.open(row);
+    },
+    getTableList() {
+      return JSON.parse(JSON.stringify(this.selection));
+    }
+  }
+};
+</script>

src/components/addDoc/fileUpload.vue

@@ -0,0 +1,262 @@
+<template>
+  <div class="upload-file">
+    <el-upload
+      class="upload-demo"
+      action="#"
+      v-loading="loading"
+      element-loading-text="上传中"
+      :http-request="handlRequest"
+      :before-remove="beforeRemove"
+      :on-remove="handleRemove"
+      :on-preview="handleItem"
+      :multiple="multiple"
+      :before-upload="beforeUpload"
+      :file-list="fileList"
+      :show-file-list="!showLib"
+      :disabled="disabled"
+    >
+      <!-- <slot>
+        <el-button :disabled="disabled" type="primary" icon="el-icon-plus" size="mini">点击上传</el-button>
+      </slot> -->
+      <el-button
+        slot="trigger"
+        :disabled="disabled"
+        type="primary"
+        icon="el-icon-plus"
+        size="mini"
+        >点击上传</el-button
+      >
+      <slot name="templateBtn"> </slot>
+    </el-upload>
+  </div>
+</template>
+
+<script>
+import {
+  getFileList,
+  getFile,
+  removeFile
+} from '@/api/system/file/index.js';
+import {
+  uploadFileNew,
+} from './api';
+import { getImageUrl, getImagePath } from '@/utils/file';
+export default {
+  props: {
+    value: {
+      type: [Array, String],
+      default: () => []
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    // 所属模块
+    module: {
+      type: String,
+      required: true
+    },
+    // 文档库
+    showLib: {
+      type: Boolean,
+      default: false
+    },
+    // 限制数量
+    limit: {
+      type: Number,
+      default: -1
+    },
+    // 限制大小 mb
+    size: {
+      type: Number,
+      default: 1000
+    },
+    disabled: {
+      default: false,
+      type: Boolean
+    }
+  },
+  data() {
+    return {
+      documentVisible: false,
+      selectItem: null,
+      loading: false,
+      documentForm: {
+        name: ''
+      },
+      columns: [
+        {
+          label: '序号',
+          type: 'index',
+          width: 55,
+          align: 'center'
+        },
+        {
+          label: '文档名称',
+          prop: 'name',
+          minWidth: '180',
+          showOverflowTooltip: true
+        },
+        {
+          label: '文档类型',
+          prop: 'type'
+        },
+        {
+          label: '系统'
+        },
+        {
+          label: '储存路径',
+          prop: 'storePath',
+          minWidth: '180',
+          showOverflowTooltip: true
+        },
+        {
+          label: '模块名',
+          prop: 'module'
+        },
+        {
+          label: '上传时间',
+          prop: 'createTime'
+        }
+      ]
+    };
+  },
+  computed: {
+    fileList: {
+      set(val) {
+        // console.log(val);
+        this.$emit(
+          'input',
+          val.map((item) => ({
+            ...item,
+            url: getImagePath(item.url)
+          }))
+        );
+      },
+      get() {
+        // console.log(this.value, 2);
+        if (!Array.isArray(this.value)) return [];
+        const arr =
+          (this.value &&
+            this.value.map((item) => ({
+              ...item,
+              url: getImageUrl(item.url)
+            }))) ||
+          [];
+        return arr;
+      }
+    }
+  },
+
+  methods: {
+    //点击查看图片
+    handleItem(file) {
+      getFile({ objectName: file.storePath }, file.name);
+    },
+    delFileList() {
+      this.$emit('input', []);
+    },
+    handleOpenLib() {
+      this.documentVisible = true;
+      this.$nextTick(() => {
+        this.reload();
+      });
+    },
+    //图文档勾选
+    submitDocument() {
+      this.$emit('input', [
+        { url: this.selectItem.storePath, ...this.selectItem }
+      ]);
+      this.documentVisible = false;
+    },
+    datasource({ page, limit }) {
+      return getFileList({
+        ...this.documentForm,
+        pageNum: page,
+        size: limit
+      });
+    },
+    reload() {
+      this.$refs.table.reload();
+    },
+    beforeRemove(file) {
+      if (file.id) {
+        return removeFile({
+          fileId: file.id
+        }).then(() => {
+          return true;
+        });
+        return true;
+      } else {
+        return true;
+      }
+    },
+    handleRemove(file, fileList) {
+      this.fileList = fileList;
+    },
+    beforeUpload(file) {
+      // if (file.size / 1024 / 1024 > this.size) {
+      //   this.$message.error(`大小不能超过 ${this.size}MB`);
+      //   return false;
+      // }
+
+      if (this.limit > 0 && this.fileList.length === this.limit) {
+        this.$message.error(`最多上传 ${this.limit}个文件`);
+        return false;
+      }
+      this.loading = true;
+      return uploadFileNew({
+        module: this.module,
+        multiPartFile: file
+      })
+        .then((res) => {
+          if (res.data) {
+            this.$emit('input', [
+              ...(this.value || []),
+              { ...file, url: res.data.storePath, ...res.data }
+            ]);
+          }
+          this.$emit('fileChange', res.data);
+          return res.data;
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    handlRequest() {
+      return Promise.resolve();
+    }
+    // onSuccess(response, file, fileList){
+    //   alert(1)
+    //    this.$emit('fileChange',file)
+    // },
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.upload-file {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+
+  .lib {
+    margin-left: 12px;
+  }
+
+  .imgs-box {
+    margin-left: 10px;
+    flex: 1;
+  }
+  .imgs-box .imgs-p {
+    height: 30px;
+    background: #f0f3f3;
+    line-height: 30px;
+    min-width: 480px;
+    margin-bottom: 5px;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>

src/components/addDoc/getCode.vue

@@ -0,0 +1,176 @@
+<!-- 用户编辑弹窗 -->
+<template>
+  <ele-modal
+    width="500px"
+    :visible.sync="showEditFlag"
+    :close-on-click-modal="false"
+    custom-class="ele-dialog-form"
+    append-to-body
+    @close="cancel"
+    title="申请编码"
+  >
+    <el-form ref="form" :model="form" :rules="rules" label-width="82px">
+      <el-row :gutter="15">
+        <el-col :span="24">
+          <el-form-item label="编码分类" prop="type">
+            <ele-tree-select
+              clearable
+              :data="list"
+              v-model="form.type"
+              placeholder="请选择"
+              default-expand-all
+              labelKey="name"
+              childrenKey="sonDirectoryList"
+              valueKey="id"
+              @change="typeChange"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="编码方案" prop="type1">
+            <el-select
+              v-model="form.type1"
+              placeholder="请选择"
+              style="width: 100%"
+              @change="type1Change"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="编码预览" prop="code">
+            <el-input v-model="form.code" disabled></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <headerTitle title="编码码段"></headerTitle>
+    <template v-slot:footer>
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="save"> 确认 </el-button>
+    </template>
+  </ele-modal>
+</template>
+
+<script>
+import {
+  selectTreeList,
+  listParentId,
+  getCode
+} from './api';
+import headerTitle from '@/components/header-title/index.vue';
+
+export default {
+  data() {
+    return {
+      rules: {
+        type: [{ required: true, message: '请选择', trigger: 'blur' }],
+        type1: [{ required: true, message: '请选择', trigger: 'blur' }],
+        code: [{ required: true, message: '请申请', trigger: 'blur' }]
+      },
+      list: [],
+      options: [],
+      // 表单数据
+      form: {
+        type: '',
+        code: '',
+        type1: ''
+      },
+
+      showEditFlag: false
+    };
+  },
+  computed: {
+    // 是否开启响应式布局
+    styleResponsive() {
+      return this.$store.state.theme.styleResponsive;
+    }
+  },
+  components: {
+    headerTitle
+  },
+  created() {},
+  methods: {
+    async open() {
+      this.list = await selectTreeList();
+      this.setTree(this.list);
+      this.showEditFlag = true;
+    },
+    setTree(data) {
+      data.forEach((item) => {
+        item.sonDirectoryList = item.sonDirectoryList.filter(
+          (item) => item.type == 1
+        );
+        if (item.sonDirectoryList.length > 0) {
+          this.setTree(item.sonDirectoryList);
+        }
+      });
+    },
+    async typeChange(val) {
+      let data = await listParentId({
+        pageNum: 1,
+        size: 100,
+        parentId: val
+      });
+      this.options = data.list.filter((item) => item.type == 2);
+      this.form.type1 = '';
+    },
+    async type1Change(val) {
+      this.form.code = await getCode(val);
+      // let data = await pageSegment({
+      //   pageNum: 1,
+      //   size: 100,
+      //   businessCodeCategoryId: val
+      // });
+      // data.list.map((item) =>{
+      //   console.log(item,'dsds')
+      // });
+      // console.log(code, 'ds');
+      // this.options = data.list.map((item) => item.type == 2);
+    },
+    /* 保存编辑 */
+    save() {
+      this.$emit('success', this.form.code);
+      this.cancel();
+    },
+
+    cancel() {
+      this.form.type = '';
+      this.form.code = '';
+      this.showEditFlag = false;
+    }
+  }
+};
+</script>
+<style scoped lang="scss">
+.aaa {
+  width: 100%;
+
+  ::v-deep .upload-demo {
+    width: 100%;
+
+    .el-upload--text {
+      width: 100%;
+
+      button {
+        width: 100%;
+        background: #ffffff;
+        border: 1px solid #dbdbdb;
+        border-radius: 5px;
+      }
+    }
+
+    .el-upload-list {
+      transform: translate(10px, -39px);
+      position: absolute;
+    }
+  }
+}
+</style>

src/components/addDoc/index.vue

@@ -0,0 +1,74 @@
+<template>
+  <div>
+    <el-badge :value="value.length" class="item">
+      <el-button
+        icon="el-icon-plus"
+        v-if="type != 'view'"
+        type="primary"
+        @click="handleUpload"
+      >
+        上传</el-button
+      >
+      <el-button
+        icon="el-icon-view"
+        v-else
+        type="primary"
+        @click="handleUpload"
+      >
+        查看</el-button
+      >
+    </el-badge>
+
+    <file-upload @success="getFiles" ref="fileUploadRef"></file-upload>
+  </div>
+</template>
+
+<script>
+  import fileUpload from './main.vue';
+
+  export default {
+    name: 'index',
+    components: { fileUpload },
+    model: {
+      prop: 'value',
+      event: 'updateVal'
+    },
+    props: {
+      type: {
+        type: String,
+        default: ''
+      },
+      value: {
+        type: Array,
+        default: () => {
+          return [];
+        }
+      }
+    },
+    data() {
+      return {
+        selectVal: ''
+      };
+    },
+    watch: {
+      value: {
+        handler(newVal) {
+          console.log(newVal, '=======');
+          this.selectVal = newVal || [];
+        },
+        immediate: true
+      }
+    },
+    created() {},
+    methods: {
+      handleUpload() {
+        this.$refs.fileUploadRef.open(this.selectVal, this.type);
+      },
+      getFiles(val = []) {
+        this.$emit('updateVal', val);
+      }
+    }
+  };
+</script>
+
+<style scoped lang="scss"></style>

src/components/addDoc/main.vue

@@ -0,0 +1,214 @@
+<template>
+  <ele-modal
+    width="60%"
+    :visible.sync="showEditFlag"
+    :close-on-click-modal="false"
+    custom-class="ele-dialog-form"
+    append-to-body
+    ref="Emodal"
+  >
+    <!-- 数据表格 -->
+    <ele-pro-table
+      ref="table"
+      :columns="columns"
+      :datasource="tableList"
+      tool-class="ele-toolbar-form"
+      :needPage="false"
+      row-key="id"
+    >
+      <template v-slot:toolbar v-if="type != 'view'">
+        <el-button type="primary" @click="fileEditOpen">本地上传</el-button>
+        <el-button type="primary" @click="fileShow = true">
+          关联文档库
+        </el-button>
+      </template>
+      <!-- 操作列 -->
+      <template v-slot:action="{ row }">
+        <el-link
+          type="primary"
+          :underline="false"
+          icon="el-icon-edit"
+          @click="browseOpen(row)"
+        >
+          浏览
+        </el-link>
+
+        <el-popconfirm
+          v-if="type != 'view'"
+          class="ele-action"
+          title="确定要删除吗？"
+          @confirm="remove(row)"
+        >
+          <template v-slot:reference>
+            <el-link type="danger" :underline="false" icon="el-icon-delete">
+              删除
+            </el-link>
+          </template>
+        </el-popconfirm>
+      </template>
+    </ele-pro-table>
+    <template v-slot:footer>
+      <el-button @click="showEditFlag = false">取消</el-button>
+      <el-button type="primary" @click="addFile" v-if="type != 'view'">
+        确认
+      </el-button>
+    </template>
+    <fileEdit ref="fileEditRef" @done="done"></fileEdit>
+    <ele-modal
+      width="80%"
+      :visible.sync="fileShow"
+      :close-on-click-modal="false"
+      custom-class="ele-dialog-form"
+      append-to-body
+    >
+      <doc_template
+        :disabledTableList="tableList"
+        ref="doc_templateRef"
+      ></doc_template>
+      <template v-slot:footer>
+        <el-button @click="fileShow = false">取消</el-button>
+        <el-button type="primary" @click="addTemplate"> 确认 </el-button>
+      </template>
+    </ele-modal>
+    <browse ref="browseRef"></browse>
+  </ele-modal>
+</template>
+
+<script>
+import doc_template from './doc_template.vue';
+import fileEdit from './file-edit.vue';
+import browse from './browse.vue';
+import { queryIds } from './api';
+
+export default {
+  components: { doc_template, fileEdit, browse },
+
+  data() {
+    return {
+      fileId: [],
+      fileShow: false,
+      showEditFlag: false,
+      tableList: [],
+      type: 'add',
+      columns: [
+        {
+          label: '编码',
+          prop: 'code',
+          width: 180,
+          align: 'center',
+          showOverflowTooltip: true
+        },
+        {
+          prop: 'name',
+          label: '文档名称',
+          align: 'center',
+          slot: 'name',
+          showOverflowTooltip: true,
+          minWidth: 200
+        },
+        {
+          prop: 'storagePath',
+          label: '文件名称',
+          align: 'center',
+
+          showOverflowTooltip: true,
+          minWidth: 200,
+          formatter: (_row, _column, cellValue) => {
+            return cellValue && cellValue[0]?.name;
+          }
+        },
+        {
+          prop: 'version',
+          label: '版本',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 100
+        },
+
+        {
+          prop: 'createUserName',
+          label: '创建人',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 100
+        },
+        {
+          prop: 'createTime',
+          label: '创建时间',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 160
+        },
+
+        {
+          prop: 'sizeUnit',
+          label: '文档大小',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 100
+        },
+
+        {
+          columnKey: 'action',
+          label: '操作',
+          width: 200,
+          align: 'center',
+          resizable: false,
+          slot: 'action',
+          showOverflowTooltip: true
+        }
+      ]
+    };
+  },
+  created() {},
+
+  methods: {
+    open(fileId, type) {
+      //查看详情:view 新增:add
+      this.showEditFlag = true;
+      this.fileId = fileId || [];
+      if (type) {
+        this.type = type;
+      }
+      this.init();
+    },
+    fileEditOpen() {
+      this.$refs.fileEditRef.open();
+    },
+    remove(row) {
+      this.tableList = this.tableList.filter((item) => item.code != row.code);
+      this.fileId = this.tableList.map((item) => item.id);
+    },
+    async init() {
+      if (this.fileId.length > 0) {
+        this.tableList = await queryIds({ ids: "'" + this.fileId + "'" });
+      } else {
+        this.tableList = [];
+      }
+    },
+    done(id) {
+      this.fileId.push(...id);
+      this.init();
+    },
+    browseOpen(row) {
+      this.$refs.browseRef.open(row);
+    },
+    addFile() {
+      this.$emit(
+        'success',
+        this.tableList.map((item) => item.id)
+      );
+      this.showEditFlag = false;
+    },
+    addTemplate() {
+      let list = this.$refs.doc_templateRef.getTableList();
+      this.fileShow = false;
+      if (list.length == 0) {
+        this.$message.error('请选择一条数据');
+        return;
+      }
+      this.tableList.push(...list);
+    }
+  }
+};
+</script>

src/components/addDoc/util.js

@@ -0,0 +1,65 @@
+import store from '@/store';
+const userId = store.state.user.info.userId
+const userName = store.state.user.info.name
+export function isPower(data = {}, power, selection = []) {
+
+    if (power == 'add' && data.userAuthority.length == 0) { //文件夹默认开放新增权限
+        return true
+    }
+    if (!data?.id && selection.length == 0) {
+        return false
+
+    }
+    if (power == 'checkEnter' && data?.checkOutUserId != userId) { //检入特殊处理
+        return false
+    }
+    if (selection.length > 0) { //多选情况处理
+        let isPower = true
+        let userAuthorityS = []
+        let createUserIdS = selection.map(item => item.createUserId).filter(createUserId => createUserId == userId)
+        if (createUserIdS.length == selection.length || userName == 'admin') {
+            return true
+        }
+        selection.forEach(val => {
+            const powerObj = val.userAuthority.find(item => item.id == userId)
+            if (powerObj) {
+                userAuthorityS.push(powerObj)
+            }
+        })
+
+        if (userAuthorityS.length == 0) {
+            isPower = false
+        }
+        userAuthorityS.forEach(item => {
+            if (item[power] != '1') {
+                isPower = false
+            }
+        })
+        return isPower
+    }
+
+    if (data.createUserId == userId || userName == 'admin') { //创建人/admin所有权限
+        return true
+    }
+    if (!power) {
+        return false
+    }
+    const powerObj = data.userAuthority.find(item => item.id == userId)
+    if (powerObj) {
+
+        return powerObj[power] == '1'
+    }
+}
+
+export function setFolderList(data) { //递归过滤文件夹权限
+    data.forEach((item) => {
+        item['disabled'] = !isPower(item, 'add');
+        if (item.sonDirectoryList && item.sonDirectoryList.length > 0) {
+            setFolderList(item.sonDirectoryList);
+        }
+    });
+}
+//新迪预览工具支持的文件格式
+export function getFileType() {
+    return ['par', 'asm', 'psm', 'dft', 'sldprt', 'sldasm', 'ipt', 'iam', 'prt', '3dxml', 'CATPart', 'CATProduct', 'cgr', 'model', 'exp', 'session', 'x_t', 'xmt_txt', 'x_b', 'xmp_bin', 'xmp_txt', 'sat', 'sab', 'igs', 'iges', 'stp', 'step', 'jt', 'xcgm', '3dm', 'stl', 'obj', '3mf', 'fbx', 'vda', 'dxf', 'dwg', 'pdf', 'idf', 'idb', 'emn', 'brd']
+}

src/views/maintenance/components/redeployOther.vue

@@ -1,15 +1,28 @@
 <template>
-  <el-dialog :visible.sync="visible" title="转派工单" width="60%">
+  <el-dialog
+    :visible.sync="visible"
+    title="转派工单"
+    width="60%"
+    :modal="false"
+  >
     <div class="sparepart-apply">
+      <el-tabs
+        v-model="tabValue"
+        class="demo-monitor-tabs"
+        @tab-click="handleClickTab"
+      >
+        <el-tab-pane label="执行人" name="1" />
+        <el-tab-pane label="辅助人" name="2" />
+      </el-tabs>
       <div class="select-box">
         <el-form label-width="80px">
-          <el-row :gutter="40">
-            <el-col :span="10">
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="工单单号">
                 <el-input v-model="row.code" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="10">
+            <el-col :span="12">
               <el-form-item label="部门">
                 <deptSelect v-model="groupId" @changeGroup="deptClick" />
                 <!-- <selectTree
@@ -26,12 +39,12 @@
                       /> -->
               </el-form-item>
             </el-col>
-            <el-col :span="10">
+            <el-col :span="12">
               <el-form-item label="" label-width="10px">
                 <el-input v-model="name" placeholder="搜索姓名"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="12" style="text-align: right">
               <el-form-item label="" label-width="10px">
                 <el-button @click="search" type="primary" icon="el-icon-search"
                   >搜索</el-button
@@ -48,12 +61,15 @@
       <div class="data-tab">
         <ele-pro-table
           ref="tableRef"
+          row-key="id"
           :columns="columns"
           highlight-current-row
           :datasource="datasource"
-          @current-change="handleChange"
+          @selection-change="handleSelectionChange"
           cache-key="redeployOther"
-        ></ele-pro-table>
+          @done="handDone"
+        >
+        </ele-pro-table>
       </div>
       <div slot="footer" class="footer">
         <el-button @click="cancel">返回</el-button>
@@ -67,7 +83,10 @@
 
 <script>
   import deptSelect from '@/components/CommomSelect/dept-select.vue';
-  import { workOrderRotate } from '@/api/maintenance/patrol_maintenance';
+  import {
+    workOrderRotate,
+    addAssists
+  } from '@/api/maintenance/patrol_maintenance';
   import { getUserPage } from '@/api/system/organization';
   export default {
     components: { deptSelect },
@@ -88,11 +107,18 @@
         },
         total: 0,
         selectedRow: {},
+        selectedRowData: [],
         groupId: '',
         executorDeptName: '',
         name: '',
         row: {},
         columns: [
+          {
+            width: 45,
+            type: 'selection',
+            columnKey: 'selection',
+            align: 'center'
+          },
           {
             columnKey: 'index',
             label: '序号',
@@ -126,20 +152,60 @@
             align: 'center',
             showOverflowTooltip: true
           }
-        ]
+        ],
+        tabValue: '1',
+        selectedRowDataId: '',
+        tableData: [],
+        arry: []
       };
     },
-    async created() {},
+    created() {
+      this.getList();
+    },
+
     methods: {
+      async getList() {
+        const data = await getUserPage({
+          pageNum: 1,
+          size: -1,
+          groupId: '',
+          name: '',
+          groupId: this.groupId
+        });
+        this.tableData = data.list;
+      },
+      handleClickTab(tab, event) {
+        this.selectedRow = {};
+        this.selectedRowData = [];
+        this.tabValue = tab.name;
+        this.$refs.tableRef.clearSelection();
+      },
       open(row) {
         this.row = row;
         this.name = '';
         this.groupId = '';
         this.executorDeptName = '';
-        this.selectedRow = {};
+        this.tabValue = '2';
+        this.arry = row.assists.split(',');
         this.visible = true;
       },
 
+      handDone() {
+        this.$nextTick(() => {
+          this.arry.forEach((item) => {
+            this.tableData.find((item2) => {
+              let arr = {
+                id: item2.id,
+                name: item2.name
+              };
+              if (item == item2.id) {
+                this.$refs.tableRef.toggleRowSelection(arr, true);
+              }
+            });
+          });
+        });
+      },
+
       //重置
       reset() {
         this.name = '';
@@ -169,32 +235,65 @@
         });
       },
 
-      // 表格选中行
-      handleChange(row) {
-        console.log(row);
-        if (row) {
-          this.selectedRow = row;
+      handleSelectionChange(row) {
+        if (this.tabValue == '1') {
+          if (row.length > 1) {
+            this.$refs.tableRef.clearSelection();
+            this.$refs.tableRef.toggleRowSelection(row.pop());
+          }
+          this.selectedRow = row[0];
+        } else {
+          this.selectedRowData = row;
+          let arr = row.map((item) => {
+            return item.id;
+          });
+          this.selectedRowDataId = arr.toString();
         }
       },
 
+      changeSelectAll(arr) {
+        console.log(arr, 'sssss');
+        if (arr.length != 0) {
+          this.checkRadioData = arr;
+        } else {
+          this.checkRadioData = [];
+        }
+      },
       async submit() {
-        if (this.selectedRow.id) {
+        if (this.tabValue == '1') {
+          if (this.selectedRow.id) {
+            this.btnLoading = true;
+            let params = {
+              acceptUserId: this.selectedRow.id,
+              workOrderId: this.row.id
+            };
+            workOrderRotate(params).then(() => {
+              this.$message.success(`该工单成功转派给${this.selectedRow.name}`);
+              this.visible = false;
+              this.$emit('refresh');
+              this.btnLoading = false;
+            });
+          } else {
+            return this.$message.warning('请选择转派人员');
+          }
+        } else {
           this.btnLoading = true;
           let params = {
-            acceptUserId: this.selectedRow.id,
+            acceptUserId: this.selectedRowDataId,
             workOrderId: this.row.id
           };
-          workOrderRotate(params).then(() => {
-            this.$message.success(`该工单成功转派给${this.selectedRow.name}`);
+          addAssists(params).then(() => {
             this.visible = false;
             this.$emit('refresh');
             this.btnLoading = false;
           });
-        } else {
-          return this.$message.warning('请选择转派人员');
         }
       },
       cancel() {
+        this.tabValue = '1';
+        this.selectedRow = {};
+        this.selectedRowData = [];
+        datasourcope;
         this.visible = false;
       }
     }
@@ -205,7 +304,7 @@
   .sparepart-apply {
     min-height: 40vh;
     .select-box {
-      margin-bottom: 10px;
+      padding: 10px 0;
     }
 
     .material-item + .material-item {

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

@@ -143,6 +143,13 @@
         </div>
         <div slot="description" class="work_report_desc">
           <div> 处理说明：{{ logs[item.id].content.reason }} </div>
+          <div style="display: flex">
+            附件：
+            <fileMain
+              v-model="logs[item.id].content.attachments"
+              type="view"
+            ></fileMain>
+          </div>
           <div class="work_report_imgs" style="width: 50px; height: 50px">
             <img
               v-for="(item, index) in logs[item.id].content.workOrderImgList"
@@ -461,7 +468,11 @@
 <script>
   // import repair from '@/api/maintenance/repair/repair'
   // import {  getSparePartDetail , getUseDetail } from '@/api/stockManagement/stocking'
+  import fileMain from '@/components/addDoc/index.vue';
   export default {
+    components: {
+      fileMain
+    },
     props: {
       equipmentInfo: {
         type: Object,

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

@@ -1,10 +1,15 @@
 <template>
   <!-- 报工 -->
   <el-dialog :visible.sync="visible" title="报工" width="80%">
-    <el-form>
-      <el-form-item label="实际起始时间">
+    <el-form
+      ref="ruleForm"
+      :model="formData"
+      :rules="rules"
+      label-width="110px"
+    >
+      <el-form-item label="实际起始时间" prop="time">
         <el-date-picker
-          v-model="time"
+          v-model="formData.time"
           type="datetimerange"
           value-format="yyyy-MM-dd HH:mm:ss"
           range-separator="至"
@@ -13,155 +18,166 @@
         >
         </el-date-picker>
       </el-form-item>
-    </el-form>
-    <div class="page">
-      <div class="content-detail">
-        <div class="maintain_equipment_info">
-          <HeaderTitle title="报修设备" size="16px"></HeaderTitle>
-          <div class="maintain_equipment_info_content">
-            <div
-              class="equipment_item"
-              v-for="item in infoData.planDeviceList"
-              :key="item.id"
-            >
-              <div class="equipment_info" v-if="item.substance">
-                <div class="item_info">
-                  <span class="item_label">设备编码</span>
-                  <span class="item_value">{{ item.substance.code }}</span>
-                </div>
-                <div class="item_info">
-                  <span class="item_label">设备名称</span>
-                  <span class="item_value">{{ item.substance.name }}</span>
-                </div>
-                <div class="item_info">
-                  <span class="item_label">设备型号</span>
-                  <span class="item_value">{{ item.substance.model }}</span>
-                </div>
-                <div class="item_info">
-                  <span class="item_label">工单编号</span>
-                  <span class="item_value">{{ workCode}}</span>
-                </div>
-                <div class="item_info">
-                  <span class="item_label">设备位置</span>
-                  <span class="item_value">{{
-                    item.substance.positionNames
-                  }}</span>
-                </div>
-                <div class="item_info">
-                  <span class="item_label">固资编码</span>
-                  <span class="item_value">{{ item.substance.fixCode }}</span>
-                </div>
-                <div class="item_info">
-                  <span class="item_label">编号</span>
-                  <span class="item_value">{{
-                    item.substance.extInfo.codeNumber
-                  }}</span>
+
+      <div class="page">
+        <div class="content-detail">
+          <div class="maintain_equipment_info">
+            <HeaderTitle title="报修设备" size="16px"></HeaderTitle>
+            <div class="maintain_equipment_info_content">
+              <div
+                class="equipment_item"
+                v-for="item in infoData.planDeviceList"
+                :key="item.id"
+              >
+                <div class="equipment_info" v-if="item.substance">
+                  <div class="item_info">
+                    <span class="item_label">设备编码</span>
+                    <span class="item_value">{{ item.substance.code }}</span>
+                  </div>
+                  <div class="item_info">
+                    <span class="item_label">设备名称</span>
+                    <span class="item_value">{{ item.substance.name }}</span>
+                  </div>
+                  <div class="item_info">
+                    <span class="item_label">设备型号</span>
+                    <span class="item_value">{{ item.substance.model }}</span>
+                  </div>
+                  <div class="item_info">
+                    <span class="item_label">工单编号</span>
+                    <span class="item_value">{{ workCode }}</span>
+                  </div>
+                  <div class="item_info">
+                    <span class="item_label">设备位置</span>
+                    <span class="item_value">{{
+                      item.substance.positionNames
+                    }}</span>
+                  </div>
+                  <div class="item_info">
+                    <span class="item_label">固资编码</span>
+                    <span class="item_value">{{ item.substance.fixCode }}</span>
+                  </div>
+                  <div class="item_info">
+                    <span class="item_label">编号</span>
+                    <span class="item_value">{{
+                      item.substance.extInfo.codeNumber
+                    }}</span>
+                  </div>
                 </div>
-              </div>
-              <p>操作事项</p>
-              <div class="ruleMatters_box">
-                <el-table :data="item.workItems" border>
-                  <el-table-column label="序号" width="50">
-                    <template slot-scope="scope">
-                      <span>{{ scope.$index + 1 }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="事项" prop="name" width="100">
-                    <template slot-scope="scope">
-                      <div>
-                        <span>{{ scope.row.name }}</span>
-                      </div>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="内容" prop="content" width="300">
-                    <template slot-scope="scope">
-                      <div>
-                        <span>{{ scope.row.content }}</span>
-                      </div>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="操作指导" prop="operationGuide">
-                    <template slot-scope="scope">
-                      <div class="operationGuide_box">
-                        <div class="left_content">
-                          <template v-if="scope.row.operationGuide">
-                            <div
-                              v-for="(item, index) in scope.row.operationGuide
-                                .toolList"
-                              :key="item.id"
-                              >{{ index + 1 }}.{{ item.name }}</div
-                            >
-                          </template>
+                <p>操作事项</p>
+                <div class="ruleMatters_box">
+                  <el-table :data="item.workItems" border>
+                    <el-table-column label="序号" width="50">
+                      <template slot-scope="scope">
+                        <span>{{ scope.$index + 1 }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="事项" prop="name" width="100">
+                      <template slot-scope="scope">
+                        <div>
+                          <span>{{ scope.row.name }}</span>
                         </div>
-                        <div class="line"></div>
-                        <div class="right_content">
-                          <template v-if="scope.row.operationGuide">
-                            <div
-                              v-for="(item, index) in scope.row.operationGuide
-                                .procedureList"
-                              :key="item.id"
-                              >{{ index + 1 }}.{{ item.content }}</div
-                            >
-                          </template>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="内容" prop="content" width="300">
+                      <template slot-scope="scope">
+                        <div>
+                          <span>{{ scope.row.content }}</span>
+                        </div>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="操作指导" prop="operationGuide">
+                      <template slot-scope="scope">
+                        <div class="operationGuide_box">
+                          <div class="left_content">
+                            <template v-if="scope.row.operationGuide">
+                              <div
+                                v-for="(item, index) in scope.row.operationGuide
+                                  .toolList"
+                                :key="item.id"
+                                >{{ index + 1 }}.{{ item.name }}</div
+                              >
+                            </template>
+                          </div>
+                          <div class="line"></div>
+                          <div class="right_content">
+                            <template v-if="scope.row.operationGuide">
+                              <div
+                                v-for="(item, index) in scope.row.operationGuide
+                                  .procedureList"
+                                :key="item.id"
+                                >{{ index + 1 }}.{{ item.content }}</div
+                              >
+                            </template>
+                          </div>
+                        </div>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="标准" prop="norm" width="100">
+                      <template slot-scope="scope">
+                        <div>
+                          <span>{{ scope.row.norm }}</span>
                         </div>
-                      </div>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="标准" prop="norm" width="100">
-                    <template slot-scope="scope">
-                      <div>
-                        <span>{{ scope.row.norm }}</span>
-                      </div>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="" prop="status" width="150">
-                    <template slot-scope="scope">
-                      <template>
-                        <el-select
-                          v-model="scope.row.status"
-                          placeholder="请选择"
-                        >
-                          <el-option
-                            v-for="item in options"
-                            :label="item.label"
-                            :value="item.value"
-                            :key="item.value"
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="" prop="status" width="150">
+                      <template slot-scope="scope">
+                        <template>
+                          <el-select
+                            v-model="scope.row.status"
+                            placeholder="请选择"
                           >
-                          </el-option>
-                        </el-select>
+                            <el-option
+                              v-for="item in options"
+                              :label="item.label"
+                              :value="item.value"
+                              :key="item.value"
+                            >
+                            </el-option>
+                          </el-select>
+                        </template>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="结果" prop="result" width="250">
+                      <template slot-scope="scope">
+                        <el-input
+                          v-model="scope.row.result"
+                          placeholder="请输入内容"
+                        ></el-input>
                       </template>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="结果" prop="result" width="250">
-                    <template slot-scope="scope">
-                      <el-input
-                        v-model="scope.row.result"
-                        placeholder="请输入内容"
-                      ></el-input>
-                    </template>
-                  </el-table-column>
-                </el-table>
+                    </el-table-column>
+                  </el-table>
+                </div>
               </div>
             </div>
           </div>
-          <div class="control">
-            <span>处理说明：</span>
-            <el-input
-              type="textarea"
-              placeholder="请输入内容"
-              v-model="infoData.reason"
-            >
-            </el-input>
-          </div>
         </div>
       </div>
-    </div>
+      <el-row>
+        <el-form-item label="附件：" prop="attachments">
+          <fileMain v-model="formData.attachments"></fileMain>
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-form-item label="处理说明：" prop="reason">
+          <el-input
+            type="textarea"
+            placeholder="请输入内容"
+            v-model="formData.reason"
+          >
+          </el-input>
+        </el-form-item>
+      </el-row>
+    </el-form>
     <div slot="footer" class="footer">
       <el-button @click="cancel">返回</el-button>
+      <!-- <el-button :loading="btnLoading" type="primary" @click="noFinishSubmit"
+        >非完成报工</el-button
+      > -->
       <el-button :loading="btnLoading" type="primary" @click="submit"
-        >提交</el-button
+        >报工</el-button
       >
     </div>
+    <!-- <redeployOther ref="redeployOtherRef" @refresh="onClose" /> -->
   </el-dialog>
 </template>
 
@@ -171,10 +187,22 @@
     getById,
     getRepairInfoById
   } from '@/api/maintenance/patrol_maintenance';
+
+  import fileMain from '@/components/addDoc/index.vue';
+  import redeployOther from '@/views/maintenance/components/redeployOther.vue';
+
   export default {
+    components: {
+      fileMain,
+      redeployOther
+    },
     data() {
       return {
-        time: [],
+        formData: {
+          time: [],
+          reason: '',
+          attachments: []
+        },
         btnLoading: false,
         options: [
           {
@@ -187,46 +215,69 @@
           }
         ],
         visible: false,
-        infoData: {
-          reason: ''
+        infoData: {},
+        workCode: '',
+        rules: {
+          reason: [
+            { required: true, message: '请输入处理说明', trigger: 'blur' }
+          ],
+          time: [
+            { required: true, message: '请选择实际起始时间', trigger: 'blur' }
+          ]
         },
-        workCode:''
+        rowData: {}
       };
     },
     methods: {
       open(row, isRepaire) {
+        this.rowData = row;
         this.getInfo(row, isRepaire);
         this.visible = true;
       },
       cancel() {
         this.visible = false;
       },
+      onClose() {
+        this.$refs.redeployOtherRef.visible = false;
+        this.getInfo(this.rowData);
+      },
+      // async noFinishSubmit() {
+      //   this.$refs.redeployOtherRef.open(this.rowData);
+      // },
       async submit() {
-        console.log(this.time);
-        if (this.time.length > 0) {
-          this.infoData.acceptTime = this.time[0];
-          this.infoData.finishTime = this.time[1];
-          this.infoData.deviceList = this.infoData.planDeviceList;
-          console.log(this.infoData);
-          this.btnLoading = true;
-          let deviceList = this.infoData.deviceList
-            .map((item) => {
-              return item.workItems;
-            })
-            .flat();
-          let boolen = deviceList.every((item) => item.status > -1);
-          this.infoData.isAbnormal = boolen ? 1 : 0;
-          report(this.infoData).then((res) => {
-            if (res.code == 0) {
-              this.$message.success('报工成功');
-              this.visible = false;
-              this.btnLoading = false;
-              this.$emit('refresh');
-            }
-          });
-        } else {
-          this.$message.error('请选择实际起始时间');
-        }
+        this.$refs.ruleForm.validate(async (valid) => {
+          if (valid) {
+            // if (this.formData.time.length > 0) {
+            this.infoData.acceptTime = this.formData.time[0];
+            this.infoData.finishTime = this.formData.time[1];
+            this.infoData.deviceList = this.infoData.planDeviceList;
+            this.infoData.reason = this.formData.reason;
+            this.infoData.attachments = this.formData.attachments;
+            console.log(this.infoData);
+            this.btnLoading = true;
+            let deviceList = this.infoData.deviceList
+              .map((item) => {
+                return item.workItems;
+              })
+              .flat();
+            let boolen = deviceList.every((item) => item.status > -1);
+            this.infoData.isAbnormal = boolen ? 1 : 0;
+            report(this.infoData).then((res) => {
+              if (res.code == 0) {
+                this.$message.success('报工成功');
+                this.visible = false;
+                this.btnLoading = false;
+                this.$emit('refresh');
+              }
+            });
+            // } else {
+            //   this.$message.error('请选择实际起始时间');
+            // }
+          } else {
+            console.log('error submit!!');
+            return false;
+          }
+        });
       },
       // 表格数据
       async getInfo(row, isRepaire) {
@@ -240,7 +291,7 @@
           res = await getById(row.planId);
         }
         console.log(row);
-        this.workCode=row.code
+        this.workCode = row.code;
         this.infoData = res.data;
         this.infoData.workOrderId = row.id;
       }
@@ -255,7 +306,7 @@
     }
   }
   .page {
-    padding: 10px;
+    // padding: 10px;
   }
   .page-title {
     background: #fff;
@@ -280,7 +331,7 @@
   }
   .content-detail {
     background: #fff;
-    padding: 20px;
+    // padding: 20px;
   }
   .flows {
     .flow-left {

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

@@ -201,6 +201,14 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'assistsName',
+            label: '辅助人',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+
           {
             prop: 'acceptTime',
             label: '开始时间',
@@ -399,6 +407,7 @@
 
       // 转派
       toRedeploy(row) {
+        console.log(row, 'd');
         this.$refs.redeployOtherRef.open(row);
       },
       // 报工