From 12caaecf88c7149fd492faa4ac5cdf0c0c03ec1d Mon Sep 17 00:00:00 2001
From: liukang <lukg6892>
Date: Tue, 27 Aug 2024 18:18:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=8F=91=E5=B8=83=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=92=8C=E4=BD=BF=E7=94=A8=E7=94=B3=E8=AF=B7=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   8 +-
 .../user-selector/src/user-selector.vue       |  19 +-
 src/store/getters.js                          |   1 +
 src/views/tool/index.vue                      | 337 +++---------------
 .../workflowList/addWorkflow/tool_release.vue | 108 +++---
 .../workflowList/addWorkflow/use_apply.vue    |  62 ++--
 6 files changed, 159 insertions(+), 376 deletions(-)

diff --git a/.env.development b/.env.development
index a145863..d511e49 100644
--- a/.env.development
+++ b/.env.development
@@ -7,14 +7,14 @@ ENV = 'development'
 VUE_APP_CONTEXT_PATH = '/tool-tech'
 
 # 工具与技术交流管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.2.85:8080/tool-tech-admin'
-VUE_APP_WS_URL = 'ws://192.168.2.85:8080/tool-tech-admin/websocket'
+VUE_APP_BASE_API = 'http://localhost:8080/tool-tech-admin'
+VUE_APP_WS_URL = 'ws://localhost:8080/tool-tech-admin/websocket'
 
 # 文档在线预览服务
-VUE_APP_TOOL_TECH_FILE_VIEW_API = 'http://192.168.1.2:8012/tool-tech-file-view'
+VUE_APP_TOOL_TECH_FILE_VIEW_API = 'http://localhost:8012/tool-tech-file-view'
 
 # 流程管理服务地址
-VUE_APP_WORKFLOW_MANAGE_URL = 'http://192.168.1.2:8080/ebpm-process-manage'
+VUE_APP_WORKFLOW_MANAGE_URL = 'http://192.168.2.20:8085/ebpm-process-manage'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/components/user-selector/src/user-selector.vue b/src/components/user-selector/src/user-selector.vue
index fb33469..4e45aa7 100644
--- a/src/components/user-selector/src/user-selector.vue
+++ b/src/components/user-selector/src/user-selector.vue
@@ -276,15 +276,16 @@
         return result;
       },
       submitForm() {
-        let checkedUserArr = []
-        let checkedUser = {}
-        this.checkedUsers.forEach(userName => {
-          checkedUser['userName'] = userName
-          checkedUser['userId'] = this.getUserIdByUserName(userName)
-          checkedUser['nickName'] = this.getNickNameByUserName(userName)
-          checkedUserArr.push(checkedUser)
-        })
-        this.$emit("submit", checkedUserArr); //返回username和nickname
+        // let checkedUserArr = []
+        // let checkedUser = {}
+        // this.checkedUsers.forEach(userName => {
+        //   checkedUser['userName'] = userName
+        //   checkedUser['userId'] = this.getUserIdByUserName(userName)
+        //   checkedUser['nickName'] = this.getNickNameByUserName(userName)
+        //   checkedUserArr.push(checkedUser)
+        // })
+        // this.$emit("submit", checkedUserArr); //返回username和nickname
+        this.$emit("submit", JSON.parse(JSON.stringify(this.selectedUserList)));
       },
       cancel() {
         this.$emit('cancel');
diff --git a/src/store/getters.js b/src/store/getters.js
index f7f6256..667e425 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -7,6 +7,7 @@ const getters = {
   cachedViews: state => state.tagsView.cachedViews,
   token: state => state.user.token,
   avatar: state => state.user.avatar,
+  userId: state => state.user.id,
   userInfo: state => state.user.info,
   name: state => state.user.name,
   nickName: state => state.user.nickName,
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index cb2899f..a0ffacb 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -89,13 +89,11 @@
             @click="handleAdd"
             v-hasPermi="['system:user:add']"
           >工具发布</el-button>
-          <!-- <el-button type="primary" icon="el-icon-position">发布</el-button> -->
-          <!-- <el-button icon="el-icon-thumb" @click="applyUse()">申请使用</el-button> -->
-          <el-button icon="el-icon-delete">批量删除</el-button>
+          <el-button icon="el-icon-delete" @click="handleDelete(selection)">批量删除</el-button>
           <el-button icon="el-icon-download" @click="exoportDrawerOpen = true">导出</el-button>
         </div><!--operate 操作按钮-->
         <el-table v-loading="loading" :data="toolList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column type="selection" width="50" align="center" :selectable="selectable"/>
           <el-table-column label="工具编号" align="center" key="toolCode" prop="toolCode" v-if="columns[0].visible" />
           <el-table-column label="工具名称" align="center" key="toolName" prop="toolName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
           <el-table-column label="工具类别" align="center" key="toolType" prop="toolType" v-if="columns[2].visible" :show-overflow-tooltip="true" >
@@ -125,16 +123,14 @@
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope">
-              <el-button type="text" icon="el-icon-info" @click="applyUse(scope.row)">申请使用</el-button>
+              <el-button type="text" icon="el-icon-info" v-if="scope.row.recordStatus==='done'" @click="applyUse(scope.row)">申请使用</el-button>
               <el-button type="text" icon="el-icon-info" @click="handleDetail(scope.row)">详情</el-button>
-              <el-button type="text" icon="el-icon-download">下载</el-button>
-              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['tool:edit', 'tool:remove']">
-                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
+              <el-button type="text" icon="el-icon-download" v-if="scope.row.recordStatus==='done'">下载</el-button>
+              <el-dropdown size="mini" v-if="selectable(scope.row)" @command="(command) => handleCommand(command, scope.row)">
+                <el-button size="mini" type="text" icon="el-icon-d-arrow-right" >更多</el-button>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="handleUpdate" icon="el-icon-edit"
-                                    v-hasPermi="['tool:edit']">编辑</el-dropdown-item>
-                  <el-dropdown-item command="handleDelete" icon="el-icon-delete"
-                                    v-hasPermi="['tool:remove']">删除</el-dropdown-item>
+                  <el-dropdown-item command="handleUpdate" icon="el-icon-edit">编辑</el-dropdown-item>
+                  <el-dropdown-item command="handleDelete" icon="el-icon-delete">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
@@ -150,164 +146,6 @@
       </div><!--rt 右-->
     </el-card><!--el-card-->
 
-    <!-- 添加或修改工具信息对话框 -->
-    <el-drawer :visible.sync="addDrawerOpen" size="75%" @open="openEvent">
-      <template #title>
-        <span>新增工具</span>
-        <div class="drawer-head-btn">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div><!--drawer-head-btn 抽屉顶部按钮区域-->
-      </template>
-      <div class="el-form-border">
-        <el-form ref="form" :model="form" :rules="rules" label-width="150px">
-          <div>
-            <div class="box-title">
-              基本信息
-            </div>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="工具编号" prop="toolCode">
-                  <el-input v-model="form.toolCode" placeholder="请输入工具编号"/>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="工具名称" prop="toolName">
-                  <el-input v-model="form.toolName" placeholder="请输入工具名称"/>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="负责人" prop="toolPrincipals">
-                  <el-input v-model="form.toolPrincipalsName" placeholder="请选择负责人" maxlength="11" @focus="toolPrincipalsChoose = true"/>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="归属部门" prop="toolRespDept">
-                  <treeselect v-model="form.toolRespDept" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
-                </el-form-item>
-              </el-col>
-
-            </el-row>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="工具来源" prop="toolSource">
-                  <el-input v-model="form.toolSource" placeholder="请输入工具来源"/>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="工具用途" prop="toolUse">
-                  <el-input v-model="form.toolUse" placeholder="请输入工具用途" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="工具类别">
-                  <el-select v-model="form.toolType" placeholder="请选择工具类别" style="width: 100%">
-                    <el-option
-                      v-for="dict in dict.type.tool_type"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="状态">
-                  <el-radio-group v-model="form.status">
-                    <el-radio
-                      v-for="dict in dict.type.sys_normal_disable"
-                      :key="dict.value"
-                      :label="dict.value"
-                    >{{dict.label}}</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="测试情况">
-                  <el-input v-model="form.testSituation" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="功能描述">
-                  <el-input v-model="form.functionDesc" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="适用条件">
-                  <el-input v-model="form.applyCondition" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="操作说明">
-                  <el-input v-model="form.operateExplain" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="备注">
-                  <el-input v-model="form.remark" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </div>
-          <div>
-            <div class="box-title">
-              关联附件
-            </div>
-            <div class="operate">
-              <el-button type="primary" icon="el-icon-upload2" @click="handleDocAdd">上传</el-button>
-              <el-button icon="el-icon-delete">删除</el-button>
-            </div><!--operate 操作按钮-->
-            <el-table :data="docList" style="width: 100%">
-              <el-table-column type="selection" width="50" align="center"> </el-table-column>
-              <el-table-column label="文档名称" prop="docName" :show-overflow-tooltip="true" />
-              <el-table-column label="类别" prop="docType" :show-overflow-tooltip="true" width="80" />
-              <el-table-column label="负责人" prop="docPrincipals" :show-overflow-tooltip="true" width="80" />
-              <el-table-column label="归属部门" prop="docRespDept" :show-overflow-tooltip="true" width="150" />
-              <el-table-column label="来源" prop="docSource" width="100" />
-              <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-                <template slot-scope="scope">
-                  <span>{{ parseTime(scope.row.createTime) }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="操作" align="center" width="180">
-                <template slot-scope="scope" v-if="scope.row.roleId !== 1">
-                  <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-view"
-                    @click="handlePriew(scope.row)"
-                  >预览</el-button>
-                  <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-delete"
-                    @click="handleDelete(scope.row)"
-                  >删除</el-button>
-                  <el-button type="text" icon="el-icon-download">下载</el-button>
-                </template>
-              </el-table-column>
-            </el-table><!--el-table-->
-          </div>
-        </el-form>
-        <!-- 上传 -->
-        <AddDoc :show.sync="addDocShow" toolId="1111" @callback="openEvent"/>
-      </div><!--el-form-border 表单-->
-    </el-drawer><!--el-drawer 新增抽屉-->
-
     <!-- 工具申请使用对话框 -->
     <el-drawer :visible.sync="applyDrawerOpen" size="75%">
       <template #title>
@@ -408,18 +246,15 @@
       <tool-detail ref="toolDetailRef" :toolDetail="toolDetail"/>
     </el-drawer><!--el-drawer 详情-抽屉-->
 
-    <bl-user-selector  ref="peopleSelect" :type="'single'" :isCheck="true" :open="toolPrincipalsChoose" @cancel="toolPrincipalsChoose=false"   @submit="submitPeople"></bl-user-selector>
   </div><!--app-container-->
 </template>
 
 <script>
-  import { listDocument } from "@/api/document/document";
   import { listTool, getTool, delTool, addTool, updateTool } from "@/api/tool/tool";
   import { deptTreeSelect } from "@/api/system/user";
 import { getToken } from "@/utils/auth";
 import { Base64 } from 'js-base64'
 import Treeselect from "@riophae/vue-treeselect";
-import blUserSelector from "@/components/user-selector/src/user-selector";
 import toolDetail from "./toolDetail";
 import AddDoc from './AddDoc'
 import mainComponent from "@/components/mainComponent/index.vue";
@@ -427,9 +262,10 @@ import mainComponent from "@/components/mainComponent/index.vue";
 export default {
   name: "User",
   dicts: ['sys_normal_disable', 'tool_type'],
-  components: { Treeselect, blUserSelector, toolDetail, AddDoc,mainComponent },
+  components: { Treeselect, toolDetail, AddDoc,mainComponent },
   data() {
     return {
+      userInfo: this.$store.getters.userInfo,
       drawerShow: false,
       path: 'views/workflowList/addWorkflow/',
       code: '',
@@ -444,6 +280,7 @@ export default {
       multiple: true,
       // 显示搜索条件
       showSearch: true,
+      selection: undefined,
       toolPrincipalsChoose: false,
       // 总条数
       total: 0,
@@ -500,7 +337,8 @@ export default {
         pageSize: 10,
         toolCode: undefined,
         toolName: undefined,
-        status: undefined
+        status: undefined,
+        createBy: this.$store.getters.userId
       },
       // 列信息
       columns: [
@@ -512,33 +350,8 @@ export default {
         { key: 5, label: `状态`, visible: true },
         { key: 6, label: `创建时间`, visible: true }
       ],
-      // 表单校验
-      rules: {
-        toolCode: [
-          { required: true, message: "工具编号不能为空", trigger: "blur" },
-          { min: 2, max: 30, message: '工具编号长度必须介于 2 和 30 之间', trigger: 'blur' }
-        ],
-        toolName: [
-          { required: true, message: "工具名称不能为空", trigger: "blur" },
-          { max: 50, message: '工具名称不能超过50个字', trigger: 'blur' }
-        ],
-        toolPrincipals: [
-          { required: true, message: "负责人不能为空", trigger: "blur" }
-        ],
-        toolSource: [
-          { max: 50, message: '工具来源不能超过50个字', trigger: 'blur' }
-        ],
-        toolUse: [
-          { max: 50, message: '工具用途不能超过50个字', trigger: 'blur' }
-        ]
-      },
       // 新增时的关联附件
       docList: [],
-      docQueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        toolId: ''
-      },
       addDocShow: false,
       viewDialogOpen: false,
       viewDialogTitle: '',
@@ -572,12 +385,6 @@ export default {
     },
     handleClick(){
 
-    },
-    submitPeople(peopleList){
-      console.log(peopleList);
-      this.form.toolPrincipals = peopleList[0]['userId']
-      this.form.toolPrincipalsName = peopleList[0]['nickName']
-      this.toolPrincipalsChoose = false;
     },
     /** 查询用户列表 */
     getList() {
@@ -647,7 +454,7 @@ export default {
     /**=============================申请使用Start================================*/
     applyUse(row){
       let _this = this
-      _this.handleOpen({...row,type:'use_apply'})
+      _this.handleOpen({...row,type:'use_apply',procInstId:undefined})
     },
     submitApply(){
 
@@ -671,9 +478,10 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.userId);
-      this.single = selection.length != 1;
-      this.multiple = !selection.length;
+      this.selection=selection
+      // this.ids = selection.map(item => item.userId);
+      // this.single = selection.length != 1;
+      // this.multiple = !selection.length;
     },
     handleDetail(row){
       this.detailDrawerOpen = true
@@ -686,7 +494,7 @@ export default {
           this.handleUpdate(row);
           break;
         case "handleDelete":
-          this.handleDelete(row);
+          this.handleDelete([{...row}]);
           break;
         default:
           break;
@@ -694,14 +502,6 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      // this.reset();
-      // getTool().then(response => {
-      //   this.postOptions = response.posts;
-      //   this.roleOptions = response.roles;
-      //   this.addDrawerOpen = true;
-      //   this.title = "添加工具";
-      //   this.form.password = this.initPassword;
-      // });
       let _this = this
       _this.handleOpen({type:'tool_release'})
     },
@@ -713,61 +513,12 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
-      const toolId = row.toolId || this.ids;
-      getTool(toolId).then(response => {
-        this.form = response.data;
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
-        this.$set(this.form, "postIds", response.postIds);
-        this.$set(this.form, "roleIds", response.roleIds);
-        this.addDrawerOpen = true;
-        this.title = "修改工具";
-        this.form.password = "";
-      });
+      let _this = this
+      _this.handleOpen({type:'tool_release',procInstId:row.procInstId,status:'1'})
     },
     /** 发布按钮操作 */
     handlePublish(row) {
     },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.userId != undefined) {
-            updateTool(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.addDrawerOpen = false;
-              this.getList();
-            });
-          } else {
-            addTool(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.addDrawerOpen = false;
-              this.getList();
-            }).catch((e) => {
-              if (e.response.data.code === 400001001) {
-                let deptName = this.getDeptName(this.deptOptions, this.form.toolRespDept)
-                this.$alert('<strong>' + deptName + '</strong> 下已存在编号为 <strong>' + this.form.toolCode + '</strong> 的工具，请勿重复添加！', '提示', {
-                  dangerouslyUseHTMLString: true,
-                  confirmButtonText: '确定',
-                  callback: action => { }
-                })
-              }
-            })
-          }
-        }
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const toolIds = row.toolId || this.ids;
-      this.$modal.confirm('是否确认删除？').then(function() {
-        return delTool(toolIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('system/user/export', {
@@ -793,21 +544,41 @@ export default {
     submitFileForm() {
       this.$refs.upload.submit();
     },
-    /**
-     * 打开新增页面的回调事件
-     */
-    openEvent() {
-      this.loading = true
-      this.docQueryParams.toolId = '1111'
-      listDocument(this.queryParams).then(response => {
-          this.docList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
-    },
     handleClose(){
       this.drawerShow = false
+      this.getList();
+    },
+    handleDelete(list){
+      let _this = this
+      if (!list||list.length<1) {
+        return
+      }
+      _this.$modal.confirm('删除后，该流程待办任务将会被删除，请谨慎操作。是否确认执行？')
+        .then(async() => {
+          _this.loading = true
+          for (let row of list) {
+            let formData = {
+              toolId: row.toolId,
+              bpmClientInputModel: {
+                model: {
+                  wf_procInstId: row.procInstId,
+                  wf_sendUserId: _this.userInfo.userName,
+                  wf_sendUserOrgId: _this.userInfo.deptId,
+                },
+              },
+              review: false,
+              recordStatus: 'cancel',
+              editStatus: false
+            }
+            await addTool(formData)
+          }
+          _this.$modal.msgSuccess("删除成功");
+          _this.loading = false
+          _this.getList();
+        })
+    },
+    selectable(row,index){
+      return row.recordStatus==='draft'&&row.createBy==this.userInfo.userId
     }
   }
 };
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index 15b9342..73a7208 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -8,7 +8,7 @@
       </div>
       <div class="cell-btn">
         <el-button v-if="pListData&&pListData.procInstId" @click="handleMonitor">流程监控</el-button>
-        <el-button v-if="editStatus&&pListData.procInstId" type="danger" @click="deleteForm">撤销</el-button>
+        <el-button v-if="editStatus&&pListData.procInstId" type="danger" @click="deleteForm">删除</el-button>
         <el-button v-if="(editStatus||workflowStatus)" type="primary" @click="submitForm">提交</el-button>
         <el-button v-if="editStatus" type="primary" @click="saveForm" >保存</el-button>
         <el-button @click="close">关闭</el-button>
@@ -19,7 +19,7 @@
       <el-tab-pane label="审批记录" name="log"></el-tab-pane>
     </el-tabs>
     <div class="el-form-border" v-show="activeName==='info'">
-      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+      <el-form ref="eForm" :model="form" :rules="rules" label-width="150px">
         <div>
           <div class="box-title">
             基本信息
@@ -40,8 +40,8 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="负责人" prop="toolPrincipalsName">
-                <el-input v-if="editStatus" v-model="form.toolPrincipalsName" placeholder="请选择负责人" maxlength="11"/>
+              <el-form-item label="负责人" prop="toolPrincipals">
+                <el-input v-if="editStatus" v-model="form.toolPrincipalsName" placeholder="请选择负责人" maxlength="11" @focus="toolPrincipalsChoose = true"/>
                 <span v-else>{{form.toolPrincipalsName}}</span>
               </el-form-item>
             </el-col>
@@ -68,7 +68,7 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="工具类别">
+              <el-form-item label="工具类别" prop="toolType">
                 <el-select v-if="editStatus" v-model="form.toolType" placeholder="请选择工具类别" style="width: 100%">
                   <el-option
                     v-for="dict in dict.type.tool_type"
@@ -81,7 +81,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="状态">
+              <el-form-item label="状态" prop="status">
                 <el-radio-group v-model="form.status" v-if="editStatus">
                   <el-radio
                     v-for="dict in dict.type.sys_normal_disable"
@@ -95,35 +95,35 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="测试情况">
+              <el-form-item label="测试情况" prop="testSituation">
                 <el-input :readonly="!editStatus" v-model="form.testSituation" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="功能描述">
+              <el-form-item label="功能描述" prop="functionDesc">
                 <el-input :readonly="!editStatus" v-model="form.functionDesc" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="适用条件">
+              <el-form-item label="适用条件" prop="applyCondition">
                 <el-input :readonly="!editStatus" v-model="form.applyCondition" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="操作说明">
+              <el-form-item label="操作说明" prop="operateExplain">
                 <el-input :readonly="!editStatus" v-model="form.operateExplain" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="备注">
+              <el-form-item label="备注" prop="remark">
                 <el-input :readonly="!editStatus" v-model="form.remark" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
               </el-form-item>
             </el-col>
@@ -134,7 +134,7 @@
             关联附件
           </div>
           <div class="operate">
-            <el-button type="primary" icon="el-icon-upload2" @click="handleDocAdd">上传</el-button>
+            <file-upload :isShowTip="false" :fileType="null" @input="handleFileAdd"></file-upload>
             <el-button icon="el-icon-delete">删除</el-button>
           </div><!--operate 操作按钮-->
           <el-table :data="docList" style="width: 100%">
@@ -201,8 +201,6 @@
           </el-row>
         </div>
       </el-form>
-      <!-- 上传 -->
-      <add-doc :show.sync="addDocShow" toolId="1111" @callback="openEvent"/>
     </div><!--el-form-border 表单-->
     <div v-show="activeName==='log'">
       <workflow-logs :procInstId = "pListData.procInstId"></workflow-logs>
@@ -235,6 +233,8 @@
       v-if="monitorDrawerVisible"
       ref="monitorDrawer"
     ></monitor-drawer>
+
+    <bl-user-selector  ref="peopleSelect" :type="'single'" :isCheck="true" :open="toolPrincipalsChoose" @cancel="toolPrincipalsChoose=false"   @submit="submitPeople"></bl-user-selector>
   </div>
 </template>
 <script>
@@ -251,10 +251,12 @@ import AddDoc from '@/views/tool/AddDoc.vue'
 import Treeselect from '@riophae/vue-treeselect'
 import { deptTreeSelect } from "@/api/system/user";
 import { addTool, checkToolExist, getInfoByBpmcId, updateTool } from '@/api/tool/tool'
+import blUserSelector from '@/components/user-selector/src/user-selector.vue'
 // PDF本地文件预览
 export default {
   dicts: ['sys_normal_disable','tool_type'],
   components: {
+    blUserSelector,
     Treeselect, AddDoc,
     WorkflowLogs,
     processcode,
@@ -265,7 +267,7 @@ export default {
     let validatorToolExist = (rule, value, callback) => {
       let _this = this
       if (_this.editStatus&&_this.form.toolCode&&_this.form.toolRespDept) {
-        checkToolExist(_this.form).then((response) => {
+        checkToolExist({toolId:_this.form.toolId,toolCode:_this.form.toolCode,toolRespDept:_this.form.toolRespDept}).then((response) => {
           if (response.data) {
             let deptName = _this.getDeptName(_this.deptOptions, _this.form.toolRespDept)
             callback(new Error(deptName+"下已存在编号为"+_this.form.toolCode+'的工具，请勿重复添加！'))
@@ -278,9 +280,9 @@ export default {
       }
     }
     return {
+      toolPrincipalsChoose: false,
       // 新增时的关联附件
       docList: [],
-      addDocShow: false,
       docQueryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -318,15 +320,38 @@ export default {
           { required: true, message: "工具名称不能为空", trigger: "blur" },
           { max: 50, message: '工具名称不能超过50个字', trigger: 'blur' }
         ],
-        toolPrincipalsName: [
+        toolPrincipals: [
           { required: true, message: "负责人不能为空", trigger: "blur" }
         ],
+        toolRespDept: [
+          { required: true, message: "请选择归属部门", trigger: "blur" }
+        ],
         toolSource: [
+          { required: true, message: "请输入工具来源", trigger: "blur" },
           { max: 50, message: '工具来源不能超过50个字', trigger: 'blur' }
         ],
+        toolType: [
+          { required: true, message: "请选择工具类别", trigger: "blur" }
+        ],
         toolUse: [
+          { required: true, message: "请输入工具用途", trigger: "blur" },
           { max: 50, message: '工具用途不能超过50个字', trigger: 'blur' }
-        ]
+        ],
+        testSituation: [
+          { required: true, message: "请输入测试情况", trigger: "blur" },
+        ],
+        functionDesc: [
+          { required: true, message: "请输入功能描述", trigger: "blur" },
+        ],
+        applyCondition: [
+          { required: true, message: "请输入适用条件", trigger: "blur" },
+        ],
+        operateExplain: [
+          { required: true, message: "请选择状态", trigger: "blur" },
+        ],
+        status: [
+          { required: true, message: "请输入操作说明", trigger: "blur" },
+        ],
       },
       kuozhanshuju: {},
       kuozhanshujuBool: {},
@@ -394,6 +419,7 @@ export default {
         let formData = res.data;
         formData.type = _this.form.type
         _this.form = formData
+        _this.getDocumentList(res.data.toolId)
       }).finally(()=>{
         _this.detailLoading = false
       });
@@ -401,7 +427,6 @@ export default {
     rest(){
       let _this = this
       _this.activeName = "info"
-      _this.openEvent()
     },
     procInstInfoAndStatus(procInstId){
       let _this = this
@@ -510,11 +535,12 @@ export default {
           receiveUserId: _this.userInfo.userName,
           receiveUserOrgId: _this.userInfo.deptId
         });
+        let wf_procTitle = "【工具发布】" + (formData.toolName?formData.toolName:"")
         formData.bpmClientInputModel = {
           model: {
             wf_procDefId: _this.pListData.procDefId,
             wf_procDefKey: _this.procDefKey,
-            wf_procTitle: formData.toolName,
+            wf_procTitle: wf_procTitle,
             wf_sendUserId: _this.userInfo.userName,
             wf_sendUserOrgId: _this.userInfo.deptId,
             wf_receivers: wf_receivers,
@@ -544,20 +570,16 @@ export default {
     },
     deleteForm(){
       let _this = this
-      _this.$modal.confirm('撤销后，该流程待办任务将会被删除，请谨慎操作。是否确认执行？')
+      _this.$modal.confirm('删除后，该流程待办任务将会被删除，请谨慎操作。是否确认执行？')
         .then(()=> {
           _this.loading = true
           let formData = {
             toolId: _this.form.toolId,
             bpmClientInputModel: {
               model: {
-                wf_procDefKey: _this.procDefKey,
-                wf_procDefId: _this.pListData.procDefId,
                 wf_procInstId: _this.pListData.procInstId,
                 wf_sendUserId: _this.userInfo.userName,
                 wf_sendUserOrgId: _this.userInfo.deptId,
-                wf_curActDefName: _this.pListData.curActDefName,
-                wf_curActDefId: _this.pListData.curActDefId,
               },
             },
             review: false,
@@ -566,7 +588,7 @@ export default {
           }
           addTool(formData).then((res) => {
             if (res.code === 200) {
-              this.$modal.msgSuccess("撤销成功");
+              this.$modal.msgSuccess("删除成功");
               this.close(true);
             }
           });
@@ -592,8 +614,8 @@ export default {
           return true;
         }
       }
-      if (!!_this.$refs["form"]) {
-        let valid = await _this.$refs["form"].validate()
+      if (!!_this.$refs["eForm"]) {
+        let valid = await _this.$refs["eForm"].validate()
         if (!valid) {
           dialogVisible = false
         }
@@ -624,13 +646,14 @@ export default {
         // 显示加载中
         _this.flowStepLoading = true
         _this.detailLoading = true
+        let wf_procTitle = "【工具发布】" + (formData.toolName?formData.toolName:"")
         if (_this.pListData && _this.pListData.procInstId) {
           //流程执行参数
           formData.bpmClientInputModel = {
             model: {
               wf_procDefKey: _this.procDefKey,
               wf_procDefId: _this.pListData.procDefId,
-              wf_procTitle: formData.toolName,
+              wf_procTitle: wf_procTitle,
               wf_curActInstId: _this.pListData.curActInstId,
               wf_sendUserId: _this.userInfo.userName,
               wf_sendUserOrgId: _this.userInfo.deptId,
@@ -649,7 +672,7 @@ export default {
           //创建流程参数
           formData.bpmClientInputModel = {
             model: {
-              wf_procTitle:  formData.toolName,
+              wf_procTitle:  wf_procTitle,
               wf_nextActDefId: wf_nextActDefId,
               wf_procDefId: _this.pListData.procDefId,
               wf_procDefKey: _this.procDefKey,
@@ -697,19 +720,11 @@ export default {
     handleDelete(dataList,index){
       dataList.splice(index,1)
     },
-    /**
-     * 新增上传附件
-     */
-    handleDocAdd() {
-      this.addDocShow = true
-    },
-    /**
-     * 打开新增页面的回调事件
-     */
-    openEvent() {
+
+    getDocumentList(toolId) {
       this.loading = true
-      this.docQueryParams.toolId = '1111'
-      listDocument(this.queryParams).then(response => {
+      this.docQueryParams.toolId = toolId
+      listDocument(this.docQueryParams).then(response => {
           this.docList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -733,6 +748,15 @@ export default {
       }
       return label
     },
+    submitPeople(peopleList){
+      this.$set(this.form,'toolPrincipals',peopleList[0]['userId'])
+      this.$set(this.form,'toolPrincipalsName',peopleList[0]['nickName'])
+      this.toolPrincipalsChoose = false;
+      this.$refs['eForm'].validateField("toolPrincipals");
+    },
+    handleFileAdd(fileList){
+      console.log(fileList)
+    }
   },
 };
 </script>
diff --git a/src/views/workflowList/addWorkflow/use_apply.vue b/src/views/workflowList/addWorkflow/use_apply.vue
index da13551..0a66fa7 100644
--- a/src/views/workflowList/addWorkflow/use_apply.vue
+++ b/src/views/workflowList/addWorkflow/use_apply.vue
@@ -3,7 +3,7 @@
     <div class="drawer-head">
       <div class="cell-title">
         <div>
-          <p class="title">新增工具</p>
+          <p class="title">申请使用</p>
         </div>
       </div>
       <div class="cell-btn">
@@ -19,24 +19,23 @@
       <el-tab-pane label="审批记录" name="log"></el-tab-pane>
     </el-tabs>
     <div class="el-form-border" v-show="activeName==='info'">
-      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+      <el-form ref="eForm" :model="form" :rules="rules" label-width="150px">
         <div>
           <div class="box-title">
             基本信息
           </div>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="申请人" prop="userName">
-                <el-input v-if="editStatus" v-model="form.userName" placeholder="请输入申请人"/>
-                <span v-else>{{form.userName}}</span>
+              <el-form-item label="申请人" prop="userId">
+                <el-input v-if="editStatus" v-model="form.nickName" placeholder="请输入申请人" @focus="toolPrincipalsChoose = true"/>
+                <span v-else>{{form.nickName}}</span>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
               <el-form-item label="申请部门" prop="deptId">
-                <el-input v-if="editStatus" v-model="form.deptId" placeholder="请选择申请部门" maxlength="11"/>
-                <span v-else>{{form.deptId}}</span>
+                <span>{{form.deptName}}</span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -129,6 +128,7 @@
       v-if="monitorDrawerVisible"
       ref="monitorDrawer"
     ></monitor-drawer>
+    <bl-user-selector  ref="peopleSelect" :type="'single'" :isCheck="true" :open="toolPrincipalsChoose" @cancel="toolPrincipalsChoose=false"   @submit="submitPeople"></bl-user-selector>
   </div>
 </template>
 <script>
@@ -146,10 +146,12 @@ import Treeselect from '@riophae/vue-treeselect'
 import { deptTreeSelect } from "@/api/system/user";
 import { addApply, getInfoByBpmcId, updateApply } from '@/api/tool/userApply'
 import { listItem } from '@/api/tool/userApplyItem'
+import blUserSelector from '@/components/user-selector/src/user-selector.vue'
 // PDF本地文件预览
 export default {
   dicts: ['sys_normal_disable','tool_type'],
   components: {
+    blUserSelector,
     Treeselect, AddDoc,
     WorkflowLogs,
     processcode,
@@ -158,14 +160,10 @@ export default {
   props: ['data'],
   data() {
     return {
+      toolPrincipalsChoose: false,
       // 新增时的关联附件
       dataList: [],
       addDocShow: false,
-      docQueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        toolId: ''
-      },
       defaultStaff: [],
       yes: 'Y',
       searchQuery: {},
@@ -189,12 +187,9 @@ export default {
       monitorDrawerVisible:false,
       form: {},
       rules: {
-        userName: [
+        userId: [
           { required: true, message: "申请人不能为空", trigger: "blur" }
         ],
-        deptId: [
-          { required: true, message: '申请人不能为空', trigger: 'blur' }
-        ],
         reason: [
           { required: true, message: '申请理由不能为空', trigger: 'blur' }
         ]
@@ -371,7 +366,7 @@ export default {
       formData.itemList = _this.dataList
       formData.recordStatus = "draft";
       formData.editStatus = _this.editStatus
-      if (formData.toolId) {
+      if (formData.id) {
         updateApply(formData).then((res) => {
           if (res.code===200) {
             _this.$message({
@@ -389,7 +384,7 @@ export default {
           receiveUserId: _this.userInfo.userName,
           receiveUserOrgId: _this.userInfo.deptId
         });
-        let wf_procTitle = _this.dataList[0].toolName
+        let wf_procTitle = "【使用申请】"+_this.dataList[0].toolName
         formData.bpmClientInputModel = {
           model: {
             wf_procDefId: _this.pListData.procDefId,
@@ -428,7 +423,7 @@ export default {
         .then(()=> {
           _this.loading = true
           let formData = {
-            toolId: _this.form.toolId,
+            id: _this.form.id,
             bpmClientInputModel: {
               model: {
                 wf_procDefKey: _this.procDefKey,
@@ -472,8 +467,8 @@ export default {
           return true;
         }
       }
-      if (!!_this.$refs["form"]) {
-        let valid = await _this.$refs["form"].validate()
+      if (!!_this.$refs["eForm"]) {
+        let valid = await _this.$refs["eForm"].validate()
         if (!valid) {
           dialogVisible = false
         }
@@ -505,7 +500,7 @@ export default {
         // 显示加载中
         _this.flowStepLoading = true
         _this.detailLoading = true
-      let wf_procTitle = _this.dataList[0].toolName
+      let wf_procTitle = "【使用申请】"+_this.dataList[0].toolName
         if (_this.pListData && _this.pListData.procInstId) {
           //流程执行参数
           formData.bpmClientInputModel = {
@@ -585,22 +580,13 @@ export default {
     handleDocAdd() {
       this.addDocShow = true
     },
-    getDeptName(items, id) {
-      let label = ''
-      items.forEach(item => {
-        if(item['id'] == id){
-          label = item['label']
-          return
-        }
-      })
-      if(label == ''){
-        items.forEach(item => {
-          if (item.children) {
-            label = this.getDeptName(item.children, id)
-          }
-        })
-      }
-      return label
+    submitPeople(peopleList){
+      this.$set(this.form,'userId',peopleList[0]['userId'])
+      this.$set(this.form,'nickName',peopleList[0]['nickName'])
+      this.$set(this.form,'deptId',peopleList[0]['deptId'])
+      this.$set(this.form,'deptName',peopleList[0].dept.deptName)
+      this.toolPrincipalsChoose = false;
+      this.$refs['eForm'].validateField("userId");
     },
   },
 };