Merge branch 'lzw' of yinet2020/YinetOASystemWeb into master

src/components/files/option.vue

@@ -24,9 +24,10 @@
               <el-form-item label="档案id" prop="taskid">
                 <el-input v-model="form.taskId" placeholder="请输入档案名称" />
               </el-form-item>
-
+              <el-form-item label="流程名称" prop="taskName">
+                <el-input v-model="form.taskName" placeholder="请输入流程名称" />
+              </el-form-item>
               <el-button type="primary" @click="submit()">归档</el-button>
-
             </el-form>
       <el-dialog :title="tctitle" :visible.sync="deptOpen" width="20%" append-to-body style="size: 30px">
         <el-tree
@@ -58,7 +59,7 @@
     components: {
       Treeselect
     },
-    props:['optiontitle','optionactkey','optionid'],
+    props:['optiontitle','optionactkey','optionid','optionName'],
     data(){
       return{
         depid: [],
@@ -107,6 +108,7 @@
         this.form.archivesName = this.optiontitle;
         this.form.actkey = this.optionactkey;
         this.form.taskId = this.optionid;
+        this.form.taskName=this.optionName;
       },
 
       /** 查询文档列表 */

src/views/system/actwork/todo.vue

@@ -47,31 +47,15 @@
       <el-table-column label="标题" align="center" prop="title" />
       <el-table-column label="当前处理" width="180" align="center" prop="name" />
       <el-table-column label="到达时间" width="180" align="center" prop="createTime" :formatter="formatDate">
-<!--        <template slot-scope="scope">-->
-<!--&lt;!&ndash;          <span>{{scope.row.createTime | timefilters}}</span>&ndash;&gt;-->
-<!--          <span>{{scope.row.createTime | format('yyyy-MM-dd hh:mm')}}</span>-->
-<!--        </template>-->
       </el-table-column>
-     <!-- <el-table-column label="到达时间" width="180" align="center" prop="updateTime" >
-        <template slot-scope="scope">
-          <span>{{scope.row.updateTime | format('yyyy-MM-dd hh:mm')}}</span>
-        </template>
-      </el-table-column>-->
       <el-table-column label="操作" width="200" align="center" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button
             size="small"
             type="text"
             icon="el-icon-edit"
-            @click="openactform(scope.row.processInstanceId,scope.row.businessKey,scope.row.name,scope.row.title)"
+            @click="openactform(scope.row.processInstanceId,scope.row.businessKey,scope.row.name,scope.row.title,scope.row.taskName)"
           >办理</el-button>
-
-        <!--  <el-button
-            size="small"
-            type="text"
-            icon="el-icon-share"
-            @click="details(scope.row)"
-          >审批进度</el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -88,7 +72,7 @@
       <!-- 动态引入组件-->
       <component :is="actForm" :data="details":actOpen="actOpen" @getList="getList" ></component>
 
-      <Option :optiontitle="optiontitle" :optionactkey="optionactkey" :optionid="optionid" v-show="optiontrue"></Option>
+      <Option :optiontitle="optiontitle" :optionactkey="optionactkey" :optionid="optionid" :optionName="optionName" v-show="optiontrue"></Option>
     </el-dialog>
 
   </div>
@@ -116,6 +100,7 @@
         optiontrue:false,
         optiontitle:'',
         optionactkey:'',
+        optionName:'',
         optionid:'',
         // 遮罩层
         loading: true,
@@ -166,13 +151,14 @@
             this.$router.push({path:'/actwork/todo/tododetails',query: {id:actkey }})
         },
       //通过流程key查询启动的表单fromkey
-      openactform(actkey,id,name,title) {
+      openactform(actkey,id,name,title,taskName) {
 
         if(name == "赋文号归档分发"){
           this.optiontrue = true;
           this.optiontitle = title;
           this.optionactkey = actkey;
           this.optionid = id;
+          this.optionName=taskName;
         }else{
           this.optiontrue = false;
         }

vue.config.js

@@ -33,7 +33,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.1.5:8081`,
+        target: `http://192.168.1.20:8081`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''