Merge remote-tracking branch 'origin/master'

itdmWeb/src/api/manage.js

@@ -3,11 +3,11 @@ import { axios } from '@/utils/request'
 import signMd5Utils from '@/utils/encryption/signMd5Utils'
 
 const api = {
-  user: '/mock/api/user',
-  role: '/mock/api/role',
-  service: '/mock/api/service',
-  permission: '/mock/api/permission',
-  permissionNoPager: '/mock/api/permission/no-pager'
+  user: '/mock/api-base/user',
+  role: '/mock/api-base/role',
+  service: '/mock/api-base/service',
+  permission: '/mock/api-base/permission',
+  permissionNoPager: '/mock/api-base/permission/no-pager'
 }
 
 export default api
@@ -16,9 +16,7 @@ export default api
 export function postAction(url,parameter) {
   let sign = signMd5Utils.getSign(url, parameter);
   //将签名和时间戳，添加在请求接口 Header
-  // update-begin--author:taoyan---date:20220421--for: VUEN-410【签名改造】 X-TIMESTAMP牵扯
-  let signHeader = {"X-Sign": sign,"X-TIMESTAMP": signMd5Utils.getTimestamp()};
-  // update-end--author:taoyan---date:20220421--for: VUEN-410【签名改造】 X-TIMESTAMP牵扯
+  let signHeader = {"X-Sign": sign,"X-TIMESTAMP": signMd5Utils.getDateTimeToString()};
 
   return axios({
     url: url,
@@ -32,9 +30,7 @@ export function postAction(url,parameter) {
 export function httpAction(url,parameter,method) {
   let sign = signMd5Utils.getSign(url, parameter);
   //将签名和时间戳，添加在请求接口 Header
-  // update-begin--author:taoyan---date:20220421--for: VUEN-410【签名改造】 X-TIMESTAMP牵扯
-  let signHeader = {"X-Sign": sign,"X-TIMESTAMP": signMd5Utils.getTimestamp()};
-  // update-end--author:taoyan---date:20220421--for: VUEN-410【签名改造】 X-TIMESTAMP牵扯
+  let signHeader = {"X-Sign": sign,"X-TIMESTAMP": signMd5Utils.getDateTimeToString()};
 
   return axios({
     url: url,
@@ -44,6 +40,20 @@ export function httpAction(url,parameter,method) {
   })
 }
 
+export function httpActionBlob(url,parameter,method) {
+  let sign = signMd5Utils.getSign(url, parameter);
+  //将签名和时间戳，添加在请求接口 Header
+  let signHeader = {"X-Sign": sign,"X-TIMESTAMP": signMd5Utils.getDateTimeToString()};
+
+  return axios({
+    url: url,
+    method:method ,
+    data: parameter,
+    headers: signHeader,
+    responseType: "arraybuffer"
+  })
+}
+
 //put
 export function putAction(url,parameter) {
   return axios({
@@ -57,9 +67,7 @@ export function putAction(url,parameter) {
 export function getAction(url,parameter) {
   let sign = signMd5Utils.getSign(url, parameter);
   //将签名和时间戳，添加在请求接口 Header
-  // update-begin--author:taoyan---date:20220421--for: VUEN-410【签名改造】 X-TIMESTAMP牵扯
-  let signHeader = {"X-Sign": sign,"X-TIMESTAMP": signMd5Utils.getTimestamp()};
-  // update-end--author:taoyan---date:20220421--for: VUEN-410【签名改造】 X-TIMESTAMP牵扯
+  let signHeader = {"X-Sign": sign,"X-TIMESTAMP": signMd5Utils.getDateTimeToString()};
 
   return axios({
     url: url,
@@ -68,7 +76,18 @@ export function getAction(url,parameter) {
     headers: signHeader
   })
 }
+export function banli(url,parameter) {
+  let sign = signMd5Utils.getSign(url, parameter);
+  //将签名和时间戳，添加在请求接口 Header
+  let signHeader = {"X-Sign": sign,"X-TIMESTAMP": signMd5Utils.getDateTimeToString()};
 
+  return axios({
+    url: url,
+    method: 'post',
+    params: parameter,
+    headers: signHeader
+  })
+}
 //deleteAction
 export function deleteAction(url,parameter) {
   return axios({
@@ -126,23 +145,13 @@ export function saveService(parameter) {
  * @param parameter
  * @returns {*}
  */
-export function downFile(url,parameter, method='get'){
-  if(method=='get'){
-    return axios({
-      url: url,
-      params: parameter,
-      method: method ,
-      responseType: 'blob'
-    })
-  }else{
-    return axios({
-      url: url,
-      method: method,
-      data: parameter,
-      responseType: 'blob'
-    })
-  }
-
+export function downFile(url,parameter){
+  return axios({
+    url: url,
+    params: parameter,
+    method:'get' ,
+    responseType: 'blob'
+  })
 }
 
 /**
@@ -208,6 +217,6 @@ export function getFileAccessHttpUrl(avatar,subStr) {
       }
     }
   }catch(err){
-   return;
+    return;
   }
 }

itdmWeb/src/views/activiti/ActivitiCommonModel.vue

@@ -14,8 +14,8 @@
               title="确定要发起流程?"
               ok-text="确定"
               cancel-text="取消"
-              @confirm="startflow(list.Id)"
-              @cancel="cancel(list.Key)"
+              @confirm="startflow(list.Id,list.Key)"
+              @cancel="cancel()"
             >
               <a-button style="width: 60%;margin-left: 10px">
                 发起流程
@@ -34,7 +34,25 @@
     >
       <img :src="imgsrc" alt="">
     </a-modal>
-
+    <a-modal
+      title="表单详情"
+      :visible="visiblejson"
+      :confirm-loading="confirmLoading"
+      @ok="handleOkjson"
+      @cancel="handleCanceljson"
+    >
+      <template>
+        <div>
+          <fm-generate-form
+            @on-change="changeValue"
+            :data="jsonData"
+            :value="editData"
+            ref="generateForm"
+          >
+          </fm-generate-form>
+        </div>
+      </template>
+    </a-modal>
     <basic-form ref="BasicForm"></basic-form>
     <basic-form1 ref="BasicForm1"></basic-form1>
   </div>
@@ -63,44 +81,51 @@ export default {
         list: 'service/act/rep/actRepList',//常用流程列表
         getPic: "service/act/showResourceForProc",//查看流程图 72502
         sflow: 'service/act/beforeStartProc',//发起流程
-        rs: 'service/act/startProc'
+        rs: 'service/act/startProc',
+        getjson: 'service/act/beforeStartProc'
       },
       dataSource: [],
-      ModalText: 'Content of the modal',
       visible: false,
       confirmLoading: false,
       imgsrc: '',
+      visiblejson: false,
+      jsonData: {},
+      editData: {
+      },
+      currentKey:'',
     }
   },
   created() {
     this.getDataList();
   },
   methods: {
-    cancel(key){
-      this.loading = true;
-      let p = {};
-      p.procKey = key;
-      p.businessKey = '1';
-      getModelList(this.url.rs, p).then(res => {
-        //console.log('查询数据', res);
-        this.loading = false;
-      })
+    cancel(){
+
     },
-    startflow(id){
+    startflow(id,key){
+      this.currentKey = key;
       this.loading = true;
       let p = {};
       p.pdid = id;
-      getModelList(this.url.sflow, p).then(res => {
-        console.log('查询数据;返回的表单路径', res.result);
+      getModelList(this.url.getjson, p).then(res => {
+        //console.log('查询数据;返回的表单路径', res.result);
         this.loading = false;
-        if(res.result==="BasicForm"){
-          this.$refs.BasicForm.visible= true;
-        }else if(res.result==="BasicForm1"){
-          this.$refs.BasicForm1.visible= true;
-        }else{
-          this.$refs.BasicForm.visible= true;
+        if(res.code == "200"){
+          this.jsonData = JSON.parse(res.result);
+          this.visiblejson= true;
         }
       })
+      // getModelList(this.url.sflow, p).then(res => {
+      //   console.log('查询数据;返回的表单路径', res.result);
+      //   this.loading = false;
+      //   if(res.result==="BasicForm"){
+      //     this.$refs.BasicForm.visible= true;
+      //   }else if(res.result==="BasicForm1"){
+      //     this.$refs.BasicForm1.visible= true;
+      //   }else{
+      //     this.$refs.BasicForm.visible= true;
+      //   }
+      // })
     },
     flowImg(id){
       this.visible = true;
@@ -123,7 +148,6 @@ export default {
       })
     },
     handleOk(e) {
-      this.ModalText = 'The modal will be closed after two seconds';
       this.confirmLoading = true;
       setTimeout(() => {
         this.visible = false;
@@ -134,6 +158,26 @@ export default {
       console.log('Clicked cancel button');
       this.visible = false;
     },
+    changeValue(field,value,data){
+      this.editData = data;
+      console.log('----' + JSON.stringify(this.editData))
+    },
+    handleOkjson(e) {
+      this.loading = true;
+      let p = {};
+      p.procKey = this.currentKey;
+      p.businessKey = '1';
+      p.formData = JSON.stringify(this.editData);
+      getModelList(this.url.rs, p).then(res => {
+        this.visiblejson = false;
+        //console.log('查询数据', res);
+        this.loading = false;
+      })
+    },
+    handleCanceljson(e) {
+      console.log('Clicked cancel button');
+      this.visiblejson = false;
+    },
     // 查询
     getDataList() {
       this.loading = true;

itdmWeb/src/views/activiti/ActivitiDaibanList.vue

@@ -129,6 +129,7 @@ import {getAction, deleteAction, banli, postAction} from '@/api/manage'
           convertToModel: '/act/reprocdef/convertToModel',
           updateHandle: '/act/reprocdef/update',
           banli: '/service/completeTask',
+          banlijson: '/service/getTaskInfo'
         },
         queryParam: {
           category: '',
@@ -147,7 +148,15 @@ import {getAction, deleteAction, banli, postAction} from '@/api/manage'
        this.$refs.picForm.disableSubmit = true;
      },
      handleBanli:function (record){
-       banli(this.url.banli+"/"+record.taskId).then(res => {
+       // banli(this.url.banli+"/"+record.taskId).then(res => {
+       //   console.log('转为模型', res)
+       //   if (res.code == 0) {
+       //     this.$message.success(res.msg);
+       //   } else {
+       //     this.$message.warning(res.msg);
+       //   }
+       // })
+       banli(this.url.banlijson+"/"+record.executionId+"/"+record.taskId).then(res => {
          console.log('转为模型', res)
          if (res.code == 0) {
            this.$message.success(res.msg);

itdmWeb/src/views/customform/CustomFormList.vue

@@ -146,14 +146,11 @@ export default {
       // 表头
       columns: [
         {
-          title: '#',
-          dataIndex: '',
+          title: 'id',
+          dataIndex: 'id',
           key:'rowIndex',
           width:60,
           align:"center",
-          customRender:function (t,r,index) {
-            return parseInt(index)+1;
-          }
         },
         {
           title:'表单信息',