申请报销表单 流程发布查询界面 提交界面

src/views/activiti/ProcessModelList.vue

@@ -50,7 +50,7 @@
     </div>
 
     <!-- table区域-begin -->
-    <a-table :scroll="{x:2200,y:500}" bordered
+    <a-table :scroll="{x:2000,y:500}" bordered
       ref="table"
       size="middle"
       rowKey="id"
@@ -91,11 +91,11 @@
           <span @click="showResource(r)" style="color: blue;cursor: pointer;">{{t}}</span>
         </template>
       </a-table-column>
-      <a-table-column title="表单路由" dataIndex="routeName" :width="200" align="center">
+      <!-- <a-table-column title="表单路由" dataIndex="routeName" :width="200" align="center">
         <template slot-scope="t,r,i">
           <span @click="viewForm(t)" style="color: blue;cursor: pointer;"> {{getFormComponent(t).text}} </span>
         </template>
-      </a-table-column>
+      </a-table-column> -->
       <a-table-column title="状态" dataIndex="status" :width="200" align="center">
         <template slot-scope="t,r,i">
           <span v-if="t==1" style="color: #00A0E9;"> 已启用 </span>
@@ -157,7 +157,7 @@
               </span>
             </a-select-option>
           </a-select>
-          <a href="javascrip:void(0)" @click="viewForm">预览表单</a>
+          <!-- <a href="javascrip:void(0)" @click="viewForm">预览表单</a> -->
         </a-form-item>
         <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="角色授权" >
           <j-select-role placeholder="不选择则所有人可用" v-decorator="[ 'roles', {initialValue:editObj.roles, rules: []}]"/>

src/views/activiti/applyList.vue

@@ -215,8 +215,8 @@
         </a-form-item>
         <a-form-item label="消息通知">
           <a-checkbox v-model="form.sendMessage">站内消息通知</a-checkbox>
-          <a-checkbox v-model="form.sendSms" disabled>短信通知</a-checkbox>
-          <a-checkbox v-model="form.sendEmail" disabled>邮件通知</a-checkbox>
+          <!-- <a-checkbox v-model="form.sendSms" disabled>短信通知</a-checkbox>
+          <a-checkbox v-model="form.sendEmail" disabled>邮件通知</a-checkbox> -->
         </a-form-item>
         <div slot="footer">
           <a-button type="text" @click="modalVisible=false">取消</a-button>

src/views/activiti/form/cdLeaveForm.vue

@@ -78,6 +78,7 @@
           label="图片"
           :labelCol="{lg: {span: 7}, sm: {span: 7}}"
           :wrapperCol="{lg: {span: 10}, sm: {span: 17} }"
+          name="fileList"
         >
           <div class="clearfix">
             <a-upload
@@ -200,7 +201,8 @@ export default {
           this.$nextTick(() => {
             // this.form.setFieldsValue(pick(this.data,'type'))
             console.log('表单回显数据', this.data.start_time)
-            this.fileList=[{fileUrl:"file/20210602/微信图片_20200831182839_1622623148179.jpg"}]
+            
+            this.fileList=JSON.parse(JSON.stringify(res.result.childList))
             this.getFileList()
             console.log(this.fileList)
             this.form.setFieldsValue({
@@ -314,13 +316,13 @@ export default {
       //文件集合不为空则显示文件下载
       if (this.fileList && this.fileList != null && this.fileList.length > 0) {
         this.fileList.forEach((element, index) => {
-          const fileName = setAppendix(element)
-          ;(element.uid = '-1'),
+          const fileName = setAppendix(element);
+            // (element.uid = '-1'),
             (element.uid = index + 1),
             (element.name = fileName),
             (element.status = 'done'),
-            (element.url ='/jeecg-boot/sys/common/downloadFile/' + element.fileUrl)
-          element.response = { message: element.fileUrl }
+            (element.url ='/jeecg-boot/sys/common/downloadFile/' + element.file_url)
+          element.response = { message: element.file_url }
         })
       }
     }

src/views/activiti/form/cdReimbursementForm.vue

@@ -196,7 +196,7 @@ export default {
           this.$nextTick(() => {
             // this.form.setFieldsValue(pick(this.data,'type'))
             console.log('表单回显数据', this.data.start_time)
-            this.fileList = [{ fileUrl: 'file/20210602/微信图片_20200831182839_1622623148179.jpg' }]
+            this.fileList = JSON.parse(JSON.stringify(res.result.childList))
             this.getFileList()
             console.log(this.fileList)
             this.form.setFieldsValue({
@@ -222,13 +222,13 @@ export default {
           formData.procDefId = this.processData.id
           formData.procDeTitle = this.processData.name
           if (!formData.tableName) formData.tableName = this.processData.businessTable
-          formData.filedNames = _.keys(values).join(',')
+          formData.filedNames = _.keys(values).join(',')+",table_name_b"
           var url = this.url.addApply
           if (!this.isNew) {
             url = this.url.editForm
           }
           //获取文件集合
-          formData.tableNameB = 'cd_leave_file' //子表表名
+          formData.table_name_b = 'cd_reimbursement_file' //子表表名
           formData.childList = '' //子表数据
           let childList = []
           if (this.fileList != null && this.fileList.length > 0) {
@@ -283,8 +283,8 @@ export default {
             (element.uid = index + 1),
             (element.name = fileName),
             (element.status = 'done'),
-            (element.url = '/jeecg-boot/sys/common/downloadFile/' + element.fileUrl)
-          element.response = { message: element.fileUrl }
+            (element.url = '/jeecg-boot/sys/common/downloadFile/' + element.file_url)
+          element.response = { message: element.file_url }
         })
       }
     }

src/views/activiti/mixins/activitiMixin.js

@@ -17,24 +17,24 @@ export const activitiMixin = {
     /*所有的流程表单，组件化注册，在此维护*/
     allFormComponent:function(){
       return [
-        {
-          text:'示例表单',
-          routeName:'@/views/activiti/form/demoForm',
-          component:() => import(`@/views/activiti/form/demoForm`),
-          businessTable:'test_demo'
-        },
-        {
-          text:'示例表单1',
-          routeName:'@/views/activiti/form/demoForm1',
-          component:() => import(`@/views/activiti/form/demoForm1`),
-          businessTable:'test_demo1'
-        },
-        {
-          text:'示例表单2',
-          routeName:'@/views/activiti/form/demoForm2',
-          component:() => import(`@/views/activiti/form/demoForm2`),
-          businessTable:'test_demo2'
-        },
+        // {
+        //   text:'示例表单',
+        //   routeName:'@/views/activiti/form/demoForm',
+        //   component:() => import(`@/views/activiti/form/demoForm`),
+        //   businessTable:'test_demo'
+        // },
+        // {
+        //   text:'示例表单1',
+        //   routeName:'@/views/activiti/form/demoForm1',
+        //   component:() => import(`@/views/activiti/form/demoForm1`),
+        //   businessTable:'test_demo1'
+        // },
+        // {
+        //   text:'示例表单2',
+        //   routeName:'@/views/activiti/form/demoForm2',
+        //   component:() => import(`@/views/activiti/form/demoForm2`),
+        //   businessTable:'test_demo2'
+        // },
       {
         text:'请假申请',
           routeName:'@/views/activiti/form/cdLeaveForm',