1.工具管理

新增字段【加密方式、服务时间、联系人、联系方式】
修改字段：“归属部门”修改为【归属单位】，“”测试情况“”名称修改为【测评机构】、“功能描述”修改为【功能简介】、工具状态修改为【工具形态】
涉及的功能
工具管理：工具发布、修改、提交、暂存、全量导出、批量导出、列表查询条件
2.word导出功能，批量导出未按批量执行问题修复，导出模板调整

public/tool.docx

@@ -1,19 +1,34 @@
 {#list}
-             {resName}
+{index}、{toolName}
-                                 工具名称
+                                    编号
+{toolCode}
+中文名称
 {toolName}
-                                 工具类别
+                                    来源
-{toolTypeName}
-                                 工具来源
 {toolSourceName}
-                                   负责人
+形态
-{toolPrincipalsName}
+{status}
-                                 归属单位
+                                    类别
+{toolTypeName}
+用途
+{toolUse}
+                                 测评机构
+{testSituation}
+功能简介
+{functionDesc}
+                                 适用条件
+{applyCondition}
+加密方式
+{encryptionMode}
+                                 服务时间
+{serviceTime}
+归属单位
 {toolRespDeptName}
-                                    状态
+                                   联系人
-{statusName}
+{contactPerson}
-                                 流程状态
+联系方式
-{recordStatusName}
+{contactPhone}
-                                 创建时间
+                                    备注
-{createTime}
+{remark}
+                                  表 {index}
 {/list}

src/views/tool/index.vue

@@ -73,10 +73,10 @@
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item label="工具状态" prop="status">
+              <el-form-item label="工具形态" prop="status">
                 <el-select
                   v-model="queryParams.status"
-                  placeholder="工具状态"
+                  placeholder="工具形态"
                   clearable
                   @change="handleQuery"
                 >
@@ -250,14 +250,21 @@
             <el-col :span="24">
               <el-form-item label="导出字段">
                 <el-checkbox-group v-model="checkList">
+                  <el-checkbox label="toolCode">工具编号</el-checkbox>
                   <el-checkbox label="toolName">工具名称</el-checkbox>
-                  <el-checkbox label="toolType">工具类别</el-checkbox>
                   <el-checkbox label="toolSource">工具来源</el-checkbox>
-                  <el-checkbox label="toolPrincipalsName">负责人</el-checkbox>
+                  <el-checkbox label="status">形态</el-checkbox>
+                  <el-checkbox label="toolType">类别</el-checkbox>
+                  <el-checkbox label="toolUse">用途</el-checkbox>
+                  <el-checkbox label="testSituation">测评机构</el-checkbox>
+                  <el-checkbox label="functionDesc">功能简介</el-checkbox>
+                  <el-checkbox label="applyCondition">适用条件</el-checkbox>
+                  <el-checkbox label="encryptionMode">加密方式</el-checkbox>
+                  <el-checkbox label="serviceTime">服务时间</el-checkbox>
                   <el-checkbox label="toolRespDeptName">归属单位</el-checkbox>
-                  <el-checkbox label="status">状态</el-checkbox>
+                  <el-checkbox label="contactPerson">联系人</el-checkbox>
-                  <el-checkbox label="recordStatus">流程状态</el-checkbox>
+                  <el-checkbox label="contactPhone">联系方式</el-checkbox>
-                  <el-checkbox label="createTime">创建时间</el-checkbox>
+                  <el-checkbox label="remark">备注</el-checkbox>
 <!--                  <el-checkbox label="toolUse">工具用途</el-checkbox>-->
 <!--                  <el-checkbox label="testSituation">测评情况</el-checkbox>
                   <el-checkbox label="functionDesc">功能描述</el-checkbox>
@@ -371,7 +378,7 @@ export default {
       deptOptions: undefined,
       toolPrincipalsData: [],
       //'toolUse', 'testSituation', 'functionDesc', 'applyCondition', 'operateExplain', 'remark'
-      columnList: ['toolName', 'toolType', 'toolSource', 'toolPrincipalsName', 'toolRespDeptName', 'status', 'recordStatus','createTime'],
+      columnList: ['toolCode', 'toolName',  'toolSource', 'status', 'toolType', 'toolUse','testSituation','functionDesc','applyCondition','encryptionMode', 'serviceTime','toolRespDeptName','contactPerson','contactPhone', 'remark'],
       checkList: [],
       toolDetail: {},
       // 是否显示弹出层
@@ -712,6 +719,9 @@ export default {
         // 正在下载数据，请稍候
         exportWordList(params).then(r => {
           if (r.data.length != 0) {
+            r.data.forEach((item, index) =>{
+              item['index'] = index + 1
+            })
             const data = {
               form: null,
               list: r.data

src/views/tool/toolDetail.vue

@@ -11,10 +11,14 @@
                 <el-col :span="12"> <el-form-item label="工具来源"><dict-tag :options="dict.type.tool_source" :value="detailData.toolSource"/></el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="负责人">{{detailData.toolPrincipalsName}}</el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="归属单位">{{detailData.toolRespDeptName}}</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="工具状态"><dict-tag :options="dict.type.tool_status" :value="detailData.status"/></el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="工具形态"><dict-tag :options="dict.type.tool_status" :value="detailData.status"/></el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="加密方式">{{detailData.encryptionMode}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="服务时间">{{detailData.serviceTime}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="联系人">{{detailData.contactPerson}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="联系方式">{{detailData.contactPhone}}</el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="工具用途">{{detailData.toolUse}}</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="测评情况">{{detailData.testSituation}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="测评机构">{{detailData.testSituation}}</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="功能描述">{{detailData.functionDesc}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="功能简介">{{detailData.functionDesc}}</el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="适用条件">{{detailData.applyCondition}}</el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="操作说明">{{detailData.operateExplain}}</el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="备注">{{detailData.remark}}</el-form-item> </el-col>

src/views/workflowList/addWorkflow/tool_release.vue

@@ -127,7 +127,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="工具状态" prop="status">
+              <el-form-item label="工具形态" prop="status">
                 <el-radio-group v-model="form.status" v-if="editStatus">
                   <el-radio
                     v-for="dict in dict.type.tool_status"
@@ -139,6 +139,34 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="加密方式" prop="encryptionMode">
+                <el-input v-if="editStatus" v-model="form.encryptionMode" placeholder="请输入加密方式"/>
+                <span v-else>{{form.encryptionMode}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="服务时间" prop="serviceTime">
+                <el-input v-if="editStatus" v-model="form.serviceTime" placeholder="请输入服务时间"/>
+                <span v-else>{{form.serviceTime}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="联系人" prop="contactPerson">
+                <el-input v-if="editStatus" v-model="form.contactPerson" placeholder="请输入联系人"/>
+                <span v-else>{{form.contactPerson}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系方式" prop="contactPhone">
+                <el-input v-if="editStatus" v-model="form.contactPhone" placeholder="请输入联系方式"/>
+                <span v-else>{{form.contactPhone}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="负责人" prop="toolPrincipals">
@@ -147,7 +175,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="归属部门">
+              <el-form-item label="归属单位">
                 {{userInfo.dept.deptName}}
                 <!--                <treeselect :disabled="!editStatus" v-model="form.toolRespDept" :options="deptOptions" @select="handleSelectNode" :show-count="true" placeholder="请选择归属部门" />-->
               </el-form-item>
@@ -156,14 +184,14 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="测试情况" prop="testSituation">
+              <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="功能描述" prop="functionDesc">
+              <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>
@@ -520,6 +548,18 @@ export default {
         status: [
           { required: true, message: "请选择状态", trigger: "change" },
         ],
+        encryptionMode: [
+          { required: true, message: "请输入加密方式", trigger: "blur" },
+        ],
+        serviceTime: [
+          { required: true, message: "请输入服务时间", trigger: "blur" },
+        ],
+        contactPerson: [
+          { required: true, message: "请输入联系人", trigger: "blur" },
+        ],
+        contactPhone: [
+          {required: true, pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '请输入正确的手机号码'}
+        ],
       },
       kuozhanshuju: {},
       kuozhanshujuBool: {},

src/views/workflowList/addWorkflow/use_apply.vue

@@ -97,7 +97,7 @@
             <el-form-item label="负责人">{{applyToolDetail ? applyToolDetail.toolPrincipalsName:''}}</el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="归属部门">{{applyToolDetail ? applyToolDetail.toolRespDeptName:''}}</el-form-item>
+            <el-form-item label="归属单位">{{applyToolDetail ? applyToolDetail.toolRespDeptName:''}}</el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="工具来源">
@@ -113,15 +113,27 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="工具状态">
+            <el-form-item label="工具形态">
               <dict-tag :options="dict.type.tool_status" :value="applyToolDetail.status"/>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="加密方式">{{applyToolDetail ? applyToolDetail.encryptionMode:''}}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="服务时间">{{applyToolDetail ? applyToolDetail.serviceTime:''}}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系人">{{applyToolDetail ? applyToolDetail.contactPerson:''}}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系方式">{{applyToolDetail ? applyToolDetail.contactPhone:''}}</el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="测试情况">{{applyToolDetail ? applyToolDetail.testSituation:''}}</el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="功能描述">{{applyToolDetail ? applyToolDetail.functionDesc:''}}</el-form-item>
+            <el-form-item label="功能简介">{{applyToolDetail ? applyToolDetail.functionDesc:''}}</el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="适用条件">{{applyToolDetail ? applyToolDetail.applyCondition:''}}</el-form-item>