Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-web

src/views/activiti/applyList.vue

@@ -81,16 +81,21 @@
               <span> {{ i + 1 }} </span>
             </template>
           </a-table-column>
-          <a-table-column title="标题" dataIndex="title" :width="150" align="center">
+         <!-- <a-table-column title="标题" dataIndex="title" :width="150" align="center">
             <template slot-scope="t">
               <span> {{ t }} </span>
             </template>
-          </a-table-column>
+          </a-table-column> -->
           <a-table-column title="所属流程" dataIndex="processName" :width="150" align="center">
             <template slot-scope="t">
               <span> {{ t }} </span>
             </template>
           </a-table-column>
+          <a-table-column title="业务信息" dataIndex="description" :width="150" align="center">
+            <template slot-scope="t">
+              <span> {{ t }} </span>
+            </template>
+          </a-table-column>
           <a-table-column title="当前审批环节" dataIndex="currTaskName" :width="150" align="center">
             <template slot-scope="t">
               <span> {{ t }} </span>
@@ -172,9 +177,9 @@
           <a-table-column title="操作" dataIndex="" align="center" :width="200">
             <template slot-scope="t, r">
               <template v-if="r.status == 0">
-                <a href="javascript:void(0);" style="color: #00A0E9" @click="apply(r)">提交申请</a>
+                <!-- <a href="javascript:void(0);" style="color: #00A0E9" @click="apply(r)">提交申请</a>
                 <a-divider type="vertical" />
-                <a href="javascript:void(0);" @click="edit(r)" style="color: #000000">编辑</a>
+                <a href="javascript:void(0);" @click="edit(r)" style="color: #000000">编辑</a> -->
                 <a-divider type="vertical" />
                 <a-popconfirm title="确定删除吗?" @confirm="() => remove(r)">
                   <a href="javascript:void(0);" style="color: red">删除</a>
@@ -183,17 +188,17 @@
               <template v-else-if="r.status == 1">
                 <a href="javascript:void(0);" @click="detail(r)">详情</a>
                 <a-divider type="vertical" />
-                <a href="javascript:void(0);" @click="cancel(r)" style="color:orange;">撤回</a>
-                <a-divider type="vertical" />
+               <!-- <a href="javascript:void(0);" @click="cancel(r)" style="color:orange;">撤回</a>
+                <a-divider type="vertical" /> -->
                 <a href="javascript:void(0);" @click="history(r)" style="color:gray;">审批历史</a>
               </template>
               <template v-else-if="(r.status == 2 && r.result == 3) || r.status == 3">
-                <a-popconfirm title="确定再次提交申请吗?" @confirm="() => apply(r)">
+               <!-- <a-popconfirm title="确定再次提交申请吗?" @confirm="() => apply(r)">
                   <a href="javascript:void(0);" style="color:green;">再次申请</a>
                 </a-popconfirm>
                 <a-divider type="vertical" />
                 <a href="javascript:void(0);" @click="edit(r)" style="color:#000000;">编辑</a>
-                <a-divider type="vertical" />
+                <a-divider type="vertical" /> -->
                 <a href="javascript:void(0);" @click="history(r)" style="color:gray;">审批历史</a>
                 <a-divider type="vertical" />
                 <a-popconfirm title="确定删除吗?" @confirm="() => remove(r)">

src/views/activiti/doneManage.vue

@@ -55,6 +55,11 @@
               <span> {{ t }} </span>
             </template>
           </a-table-column>
+          <a-table-column title="业务信息" dataIndex="description" :width="100" align="center">
+            <template slot-scope="t, r, i">
+              <span> {{ t }} </span>
+            </template>
+          </a-table-column>
           <a-table-column title="委托代办人" dataIndex="owner" :width="100" align="center">
             <template slot-scope="t, r, i">
               <span> {{ t }} </span>

src/views/activiti/form/demoForm2.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="form-main" id="form-main" >
     <div v-if="printTitle" class="no-print" style="text-align: right">
+      
+      <a-button v-if="printMould" :href="printMouldUrl"  target="_blank" 
+      ghost type="primary">模板打印</a-button>
       <a-button v-print="'#printContent'" ghost type="primary">打印</a-button>
     </div>
     <a-card :body-style="{ padding: '15px 32px' }" :bordered="false" id="printContent"  :class="{'abcdefg':true}" >
-    <!-- <div style="text-align: center;">
-        <h3 v-print="'#printContent'" ghost title="点击此处,打印当前页面" >{{printTitle}}</h3>
-        <br/>
-      </div> -->
+
        <section ref="print" id="printContent" class="abcdefg">
       <!-- <a-form @submit="handleSubmit" :form="form">
         <a-form-item
@@ -122,6 +122,8 @@ export default {
     },
     data () {
         return {
+            printMould:false,
+            printMouldUrl:'',
             printTitle:false,
             printTitleImg:false,
             isSJ: false,
@@ -198,11 +200,10 @@ export default {
     },
     created () {
       // debugger
-		 console.log("==============="+this.processData);    
-		 console.log("==============="+this.processData.status);    
-		 console.log("==============="+this.processData.title);    
-		 console.log("==============="+this.processData.businessTable);    
-        
+		 // console.log("==============="+this.processData);    
+		 // console.log("==============="+this.processData.status);    
+		 // console.log("==============="+this.processData.title);    
+		 // console.log("==============="+this.processData.businessTable);    
         // console.log("==============="+getProjctName());      
         window.deleteRow = this.deleteRow
         // console.log('流程数据', this.processData)
@@ -586,6 +587,19 @@ export default {
                           }else{
                             this.printTitleImg = false;
                           }
+                         let that = this;
+                         let businessTable = this.processData.businessTable;
+                         if(this.printTitleImg){
+                           businessTable = businessTable+'_img'
+                         }
+                         this.getAction('/sys/dict/selectDictByJiMuPrint',{tableName:businessTable}).then(res => {
+                              if(res !=null && res !=''){
+                                that.printMouldUrl = res.value+'?'+res.text+'='+that.processData.tableId ;
+                                this.printMould = true;
+                              }else{
+                                 this.printMould = false;
+                              }
+                         }) 
                          
                         }else{
                           this.printTitleImg = false;
@@ -1132,9 +1146,13 @@ export default {
             // 通过函数获取数据
             this.$refs.KFB.getData()
                 .then(res => {
-                let formData1 = JSON.parse(JSON.stringify(res))
+                // let formData1 = JSON.parse(JSON.stringify(res))
+                //   // 获取数据成功
+                // let formData = JSON.parse(JSON.stringify(res)) 
+                 let formData1 = JSON.parse(JSON.stringify(res, (key, value) => typeof value === 'undefined' ? '' : value))
                   // 获取数据成功
-                let formData = JSON.parse(JSON.stringify(res))  
+                 let formData = JSON.parse(JSON.stringify(res, (key, value) => typeof value === 'undefined' ? '' : value))  
+                 
                  var addForm = 'no'
                  if(this.processData.businessTable == 'employee_leave'){
                     var estimate = this.$refs.KFB.form.getFieldValue('leave_days'),
@@ -1254,7 +1272,7 @@ export default {
                    
 
                     if (!formData.tableName) formData.tableName = this.processData.businessTable
-                    formData.filedNames = _.keys(res).join(',')
+                    formData.filedNames = _.keys(formData1).join(',')
                     formData.filedNames = getFiledNames(formData) // 获取主表字段，排除子表标识
                     var url = this.url.addApply
                     if (!this.isNew) {

src/views/activiti/todoManage.vue

@@ -9,7 +9,7 @@
         <a-form layout="inline" @keyup.enter.native="handleSearch">
           <a-row :gutter="24">
             <a-col :md="6" :sm="8">
-              <a-form-item label="任务名称" prop="name">
+              <a-form-item label="关键字" prop="name">
                 <a-input type="text" allowClear v-model="searchForm.name" placeholder="请输入" />
               </a-form-item>
             </a-col>
@@ -56,6 +56,11 @@
                 <span> {{ t }} </span>
               </template>
             </a-table-column>
+            <a-table-column title="业务信息" dataIndex="description" width="8%" align="center">
+              <template slot-scope="t">
+                <span> {{ t }} </span>
+              </template>
+            </a-table-column>
             <a-table-column title="委托代办人" dataIndex="owner" align="center" width="8%">
               <template slot-scope="t">
                 <span> {{ t }} </span>

src/views/dashboard/MyoaTabs.vue

@@ -80,13 +80,13 @@ export default {
                         if (item.priority == '2') {
                             priorityCode = '<span style="color:red;">紧急</span>'
                         }
-                        var list = [item.id, item.name, item.processName, item.applyer, priorityCode, item.createTime]
+                        var list = [item.id, item.name, item.processName,item.description,item.applyer, priorityCode, item.createTime]
                         scrollData.push(list)
                     })
                     this.todoConfig = {
                         oddRowBGC: 'white',
                         evenRowBGC: 'white',
-                        columnWidth: [150, 200, 200, 200, 200, 300],
+                        columnWidth: [150, 190,190, 190, 190, 120, 300],
                         align: ['center'],
                         rowNum: 5,
                         waitTime: 9000,
@@ -119,13 +119,15 @@ export default {
                             resultCode = '<span style="color:red;">驳回</span>'
                         }
 
-                        var list = [item.id, item.title, item.processName, item.currTaskName, resultCode, item.applyTime]
+                        // var list = [item.id, item.title, item.processName, item.description,item.currTaskName, resultCode, item.applyTime]
+                        var list = [item.id, item.processName, item.description,item.currTaskName, resultCode, item.applyTime]
                         scrollData.push(list)
                     })
                     this.applyConfig = {
                         oddRowBGC: 'white',
                         evenRowBGC: 'white',
-                        columnWidth: [150, 200, 200, 200, 150, 300],
+                        // columnWidth: [150, 200, 200, 200,  200, 150, 300],
+                        columnWidth: [150, 200, 200,  200, 120, 300],
                         align: ['center'],
                         rowNum: 5,
                         waitTime: 2000,
@@ -146,17 +148,19 @@ export default {
                         var reallyResult = ''
                         if (item.deleteReason == '审批通过') {
                             reallyResult = '<span style="color:green">审批通过</span>'
-                        } else {
+                        } else if(item.deleteReason == '审批驳回'){
                             reallyResult = '<span style="color:red">审批驳回</span>'
+                        }else{
+                          reallyResult = item.deleteReason
                         }
 
-                        var list = [item.id, item.name, item.processName, item.applyer, reallyResult, item.createTime]
+                        var list = [item.id, item.name, item.processName, item.description,item.applyer, reallyResult, item.createTime]
                         scrollData.push(list)
                     })
                     this.doneConfig = {
                         oddRowBGC: 'white',
                         evenRowBGC: 'white',
-                        columnWidth: [150, 200, 200, 200, 300, 300],
+                        columnWidth: [150, 200, 200, 200, 150, 150, 300],
                         align: ['center'],
                         rowNum: 5,
                         waitTime: 2000,