From abee022ced98f66adf3d8993370f98ab3dcc565b Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Mon, 24 Oct 2022 11:21:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=80=E6=9C=89=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E8=A1=A8=E5=8D=95=E6=8F=90=E4=BA=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activiti/applyList.vue              |  6 +-
 src/views/activiti/doneManage.vue             | 18 ++---
 .../form/ProcessMaterialBorrowingForm.vue     | 76 ++++++++++--------
 .../form/ProcessMaterialWarehousingForm.vue   | 77 +++++++++++--------
 .../form/ProcessMaterialsAllotForm.vue        | 76 ++++++++++--------
 .../form/ProcessMaterialsDeliveryForm.vue     | 76 ++++++++++--------
 .../form/ProcessMaterialsReturnForm.vue       | 76 ++++++++++--------
 .../form/ProcessSmaterialsScrapForm.vue       | 76 ++++++++++--------
 .../form/ProcessSpecialMaterialsForm.vue      | 76 ++++++++++--------
 .../activiti/form/ProcessUdgetPlanForm.vue    | 15 +---
 src/views/system/modules/PasswordModal.vue    |  4 +-
 11 files changed, 318 insertions(+), 258 deletions(-)

diff --git a/src/views/activiti/applyList.vue b/src/views/activiti/applyList.vue
index 3814db4..3124ff9 100644
--- a/src/views/activiti/applyList.vue
+++ b/src/views/activiti/applyList.vue
@@ -219,10 +219,10 @@
             <a-select-option :value="2">紧急</a-select-option>
           </a-select>
         </a-form-item>
-        <a-form-item label="消息通知">
+        <a-form-item label="消息通知" v-show="false">
           <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>
diff --git a/src/views/activiti/doneManage.vue b/src/views/activiti/doneManage.vue
index 9034a9f..25b6fc7 100644
--- a/src/views/activiti/doneManage.vue
+++ b/src/views/activiti/doneManage.vue
@@ -109,7 +109,7 @@
     </a-card>
     <!---->
     <a-modal title="审批历史" v-model="modalLsVisible" :mask-closable="false" :width="'80%'" :footer="null">
-      <div v-if="modalLsVisible">
+     <div v-if="modalLsVisible">
         <component :is="historicDetail" :procInstId="procInstId"></component>
       </div>
     </a-modal>
@@ -213,6 +213,13 @@ export default {
         );
         return;
       }
+      this.lcModa.disabled = true
+      this.lcModa.title = '查看流程业务信息：' + r.processName
+      this.lcModa.formComponent = this.getFormComponent(r.routeName).component
+      this.lcModa.processData = r
+      this.lcModa.isNew = false
+      this.lcModa.isTask = true
+      this.lcModa.visible = true
     },
     history(r) {
       if (!r.procInstId) {
@@ -221,15 +228,6 @@ export default {
       }
       this.procInstId = r.procInstId;
       this.modalLsVisible = true;
-
-      this.lcModa.disabled = true
-      this.lcModa.title = '查看流程业务信息：' + r.processName
-      this.lcModa.formComponent = this.getFormComponent(r.routeName).component
-      this.lcModa.processData = r
-      this.lcModa.isNew = false
-      this.lcModa.isTask = true
-      this.lcModa.visible = true
-
     },
     remove(v) {
       this.postFormAction(this.url.deleteHistoricTask+v.id).then(res => {
diff --git a/src/views/activiti/form/ProcessMaterialBorrowingForm.vue b/src/views/activiti/form/ProcessMaterialBorrowingForm.vue
index a7f702f..6a66d61 100644
--- a/src/views/activiti/form/ProcessMaterialBorrowingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialBorrowingForm.vue
@@ -73,8 +73,8 @@
 <script>
 
   import pick from 'lodash.pick'
-  import { getAction } from '@/api/manage'
-  import { FormTypes,getRefPromise } from '@/utils/JEditableTableUtil'
+  import { getAction,httpAction } from '@/api/manage'
+  import { FormTypes, getRefPromise,validateFormAndTables } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
   import JFormContainer from '@/components/jeecg/JFormContainer'
@@ -221,6 +221,7 @@
           ]
         },
         url: {
+          getForm:'/actBusiness/getForm',
           add: "/hy/processMaterialBorrowing/add",
           edit: "/hy/processMaterialBorrowing/edit",
           queryById: "/hy/processMaterialBorrowing/queryById",
@@ -300,9 +301,7 @@
             formData.tableName = r.tableName;
             this.data = formData;
             console.log("表单回显数据",this.data)
-            this.$nextTick(() => {
-              this.form.setFieldsValue(pick(this.data,'name'))
-            });
+            this.editAfter();
             this.btndisabled = false;
           }else {
             this.$message.error(res.message)
@@ -331,13 +330,13 @@
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.model,'updateFirm','createTime','sysOrgCode','createBy','materialType','borrowedDepartments','fileId')
+        let fieldval = pick(this.data,'updateFirm','createTime','sysOrgCode','createBy','materialType','borrowedDepartments','fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
         // 加载子表数据
-        if (this.model.id) {
-          let params = { id: this.model.id }
+        if (this.data.id) {
+          let params = { id: this.data.id }
           this.requestSubTableData(this.url.processMaterialBorrowingList.list, params, this.processMaterialBorrowingListTable)
         }
       },
@@ -368,34 +367,45 @@
      },
       // handler
       handleSubmit (e) {
-        e.preventDefault()
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            let formData = Object.assign(this.data||{}, values)
-            formData.procDefId = this.processData.id;
-            formData.procDeTitle = this.processData.name;
-            if (!formData.tableName)formData.tableName = this.processData.businessTable;
-            formData.filedNames = _.keys(values).join(",");
-            console.log('formData', values)
+        this.getAllTable().then(tables => {
+          return validateFormAndTables(this.form, tables)
+        }).then(allValues=>{
+          console.log('所有数据',allValues)
+          if (typeof this.classifyIntoFormData !== 'function') {
+            throw this.throwNotFunction('classifyIntoFormData')
+          }
+          let formData = this.classifyIntoFormData(allValues)
 
-            var url = this.url.addApply;
-            if (!this.isNew){
-              url = this.url.editForm;
-            }
-            this.btndisabled = true;
-            this.postFormAction(url,formData).then((res)=>{
-              if (res.success){
-                this.$message.success("保存成功！")
-                //todo 将表单的数据传给父组件
-                this.$emit('afterSubmit',formData)
-              }else {
-                this.$message.error(res.message)
+          this.form.validateFields((err, values) => {
+            if (!err) {
+              formData.procDefId = this.processData.id;
+              formData.procDeTitle = this.processData.name;
+              formData.title=this.processData.description;
+              if (!formData.tableName)formData.tableName = this.processData.businessTable;
+              console.log('格式化后的数据',formData)
+              var url = this.url.add;
+              let method='post';
+              if (!this.isNew){
+                url = this.url.edit;
+                method='put';
               }
-            }).finally(()=>{
-              this.btndisabled = false;
-            })
-          }
+              console.log('提交方法',method)
+              this.btndisabled = true;
+              httpAction(url,formData,method).then((res)=>{
+                if (res.success){
+                  this.$message.success("保存成功！")
+                  //todo 将表单的数据传给父组件
+                  this.$emit('afterSubmit',formData)
+                }else {
+                  this.$message.error(res.message)
+                }
+              }).finally(()=>{
+                this.btndisabled = false;
+              })
+            }
+          })
         })
+
       },
 
     }
diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
index 5f7afcf..d2b948a 100644
--- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
@@ -84,8 +84,8 @@
 <script>
 
   import pick from 'lodash.pick'
-  import { getAction } from '@/api/manage'
-  import { FormTypes,getRefPromise } from '@/utils/JEditableTableUtil'
+  import { getAction,httpAction } from '@/api/manage'
+  import { FormTypes, getRefPromise,validateFormAndTables } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { validateDuplicateValue } from '@/utils/util'
 import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
@@ -309,6 +309,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
           ]
         },
         url: {
+          getForm:'/actBusiness/getForm',
           add: "/hy/processMaterialWarehousing/add",
           edit: "/hy/processMaterialWarehousing/edit",
           queryById: "/hy/processMaterialWarehousing/queryById",
@@ -388,9 +389,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
             formData.tableName = r.tableName;
             this.data = formData;
             console.log("表单回显数据",this.data)
-            this.$nextTick(() => {
-              this.form.setFieldsValue(pick(this.data,'name'))
-            });
+            this.editAfter();
             this.btndisabled = false;
           }else {
             this.$message.error(res.message)
@@ -410,34 +409,44 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
         this.$emit('backTask')
       },
       handleSubmit (e) {
-        e.preventDefault()
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            let formData = Object.assign(this.data||{}, values)
-            formData.procDefId = this.processData.id;
-            formData.procDeTitle = this.processData.name;
-            if (!formData.tableName)formData.tableName = this.processData.businessTable;
-            formData.filedNames = _.keys(values).join(",");
-            console.log('formData', values)
-
-            var url = this.url.addApply;
-            if (!this.isNew){
-              url = this.url.editForm;
-            }
-            this.btndisabled = true;
-            this.postFormAction(url,formData).then((res)=>{
-              if (res.success){
-                this.$message.success("保存成功！")
-                //todo 将表单的数据传给父组件
-                this.$emit('afterSubmit',formData)
-              }else {
-                this.$message.error(res.message)
-              }
-            }).finally(()=>{
-              this.btndisabled = false;
-            })
+        this.getAllTable().then(tables => {
+          return validateFormAndTables(this.form, tables)
+        }).then(allValues=>{
+          console.log('所有数据',allValues)
+          if (typeof this.classifyIntoFormData !== 'function') {
+            throw this.throwNotFunction('classifyIntoFormData')
           }
+          let formData = this.classifyIntoFormData(allValues)
+          this.form.validateFields((err, values) => {
+            if (!err) {
+              formData.procDefId = this.processData.id;
+              formData.procDeTitle = this.processData.name;
+              formData.title=this.processData.description;
+              if (!formData.tableName)formData.tableName = this.processData.businessTable;
+              console.log('格式化后的数据',formData)
+              var url = this.url.add;
+              let method='post';
+              if (!this.isNew){
+                url = this.url.edit;
+                method='put';
+              }
+              console.log('提交方法',method)
+              this.btndisabled = true;
+              httpAction(url,formData,method).then((res)=>{
+                if (res.success){
+                  this.$message.success("保存成功！")
+                  //todo 将表单的数据传给父组件
+                  this.$emit('afterSubmit',formData)
+                }else {
+                  this.$message.error(res.message)
+                }
+              }).finally(()=>{
+                this.btndisabled = false;
+              })
+            }
+          })
         })
+
       },
       addBefore(){
         this.form.resetFields()
@@ -449,13 +458,13 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.model,'company','createTime','sysOrgCode','createBy','processUdgetPlanId','materialType','targetLibrary','warehousingBatch','fileId')
+        let fieldval = pick(this.data,'company','createTime','sysOrgCode','createBy','processUdgetPlanId','materialType','targetLibrary','warehousingBatch','fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
         // 加载子表数据
-        if (this.model.id) {
-          let params = { id: this.model.id }
+        if (this.data.id) {
+          let params = { id: this.data.id }
           this.requestSubTableData(this.url.processMaterialWarehousingList.list, params, this.processMaterialWarehousingListTable)
         }
       },
diff --git a/src/views/activiti/form/ProcessMaterialsAllotForm.vue b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
index 5c4f4cd..10ccff7 100644
--- a/src/views/activiti/form/ProcessMaterialsAllotForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
@@ -73,8 +73,8 @@
 <script>
 
   import pick from 'lodash.pick'
-  import { getAction } from '@/api/manage'
-  import { FormTypes,getRefPromise } from '@/utils/JEditableTableUtil'
+  import { getAction,httpAction } from '@/api/manage'
+  import { FormTypes, getRefPromise,validateFormAndTables } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
   import JFormContainer from '@/components/jeecg/JFormContainer'
@@ -222,6 +222,7 @@
           ]
         },
         url: {
+          getForm:'/actBusiness/getForm',
           add: "/hy/processMaterialsAllot/add",
           edit: "/hy/processMaterialsAllot/edit",
           queryById: "/hy/processMaterialsAllot/queryById",
@@ -301,9 +302,7 @@
             formData.tableName = r.tableName;
             this.data = formData;
             console.log("表单回显数据",this.data)
-            this.$nextTick(() => {
-              this.form.setFieldsValue(pick(this.data,'name'))
-            });
+            this.editAfter();
             this.btndisabled = false;
           }else {
             this.$message.error(res.message)
@@ -323,34 +322,45 @@
         this.$emit('backTask')
       },
       handleSubmit (e) {
-        e.preventDefault()
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            let formData = Object.assign(this.data||{}, values)
-            formData.procDefId = this.processData.id;
-            formData.procDeTitle = this.processData.name;
-            if (!formData.tableName)formData.tableName = this.processData.businessTable;
-            formData.filedNames = _.keys(values).join(",");
-            console.log('formData', values)
+        this.getAllTable().then(tables => {
+          return validateFormAndTables(this.form, tables)
+        }).then(allValues=>{
+          console.log('所有数据',allValues)
+          if (typeof this.classifyIntoFormData !== 'function') {
+            throw this.throwNotFunction('classifyIntoFormData')
+          }
+          let formData = this.classifyIntoFormData(allValues)
 
-            var url = this.url.addApply;
-            if (!this.isNew){
-              url = this.url.editForm;
-            }
-            this.btndisabled = true;
-            this.postFormAction(url,formData).then((res)=>{
-              if (res.success){
-                this.$message.success("保存成功！")
-                //todo 将表单的数据传给父组件
-                this.$emit('afterSubmit',formData)
-              }else {
-                this.$message.error(res.message)
+          this.form.validateFields((err, values) => {
+            if (!err) {
+              formData.procDefId = this.processData.id;
+              formData.procDeTitle = this.processData.name;
+              formData.title=this.processData.description;
+              if (!formData.tableName)formData.tableName = this.processData.businessTable;
+              console.log('格式化后的数据',formData)
+              var url = this.url.add;
+              let method='post';
+              if (!this.isNew){
+                url = this.url.edit;
+                method='put';
               }
-            }).finally(()=>{
-              this.btndisabled = false;
-            })
-          }
+              console.log('提交方法',method)
+              this.btndisabled = true;
+              httpAction(url,formData,method).then((res)=>{
+                if (res.success){
+                  this.$message.success("保存成功！")
+                  //todo 将表单的数据传给父组件
+                  this.$emit('afterSubmit',formData)
+                }else {
+                  this.$message.error(res.message)
+                }
+              }).finally(()=>{
+                this.btndisabled = false;
+              })
+            }
+          })
         })
+
       },
       addBefore(){
         this.form.resetFields()
@@ -362,13 +372,13 @@
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.model,'company','createTime','sysOrgCode','createBy','materialType','beAllotDepartment','fileId')
+        let fieldval = pick(this.data,'company','createTime','sysOrgCode','createBy','materialType','beAllotDepartment','fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
         // 加载子表数据
-        if (this.model.id) {
-          let params = { id: this.model.id }
+        if (this.data.id) {
+          let params = { id: this.data.id }
           this.requestSubTableData(this.url.processMaterialsAllotList.list, params, this.processMaterialsAllotListTable)
         }
       },
diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
index 2379bc8..ba960a1 100644
--- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
@@ -73,8 +73,8 @@
 <script>
 
   import pick from 'lodash.pick'
-  import { getAction } from '@/api/manage'
-  import { FormTypes,getRefPromise } from '@/utils/JEditableTableUtil'
+  import { getAction,httpAction } from '@/api/manage'
+  import { FormTypes, getRefPromise,validateFormAndTables } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { validateDuplicateValue } from '@/utils/util'
   import JFormContainer from '@/components/jeecg/JFormContainer'
@@ -230,6 +230,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
           ]
         },
         url: {
+          getForm:'/actBusiness/getForm',
           add: "/hy/processMaterialsDelivery/add",
           edit: "/hy/processMaterialsDelivery/edit",
           queryById: "/hy/processMaterialsDelivery/queryById",
@@ -309,9 +310,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
             formData.tableName = r.tableName;
             this.data = formData;
             console.log("表单回显数据",this.data)
-            this.$nextTick(() => {
-              this.form.setFieldsValue(pick(this.data,'name'))
-            });
+            this.editAfter();
             this.btndisabled = false;
           }else {
             this.$message.error(res.message)
@@ -331,34 +330,45 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
         this.$emit('backTask')
       },
       handleSubmit (e) {
-        e.preventDefault()
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            let formData = Object.assign(this.data||{}, values)
-            formData.procDefId = this.processData.id;
-            formData.procDeTitle = this.processData.name;
-            if (!formData.tableName)formData.tableName = this.processData.businessTable;
-            formData.filedNames = _.keys(values).join(",");
-            console.log('formData', values)
+        this.getAllTable().then(tables => {
+          return validateFormAndTables(this.form, tables)
+        }).then(allValues=>{
+          console.log('所有数据',allValues)
+          if (typeof this.classifyIntoFormData !== 'function') {
+            throw this.throwNotFunction('classifyIntoFormData')
+          }
+          let formData = this.classifyIntoFormData(allValues)
 
-            var url = this.url.addApply;
-            if (!this.isNew){
-              url = this.url.editForm;
-            }
-            this.btndisabled = true;
-            this.postFormAction(url,formData).then((res)=>{
-              if (res.success){
-                this.$message.success("保存成功！")
-                //todo 将表单的数据传给父组件
-                this.$emit('afterSubmit',formData)
-              }else {
-                this.$message.error(res.message)
+          this.form.validateFields((err, values) => {
+            if (!err) {
+              formData.procDefId = this.processData.id;
+              formData.procDeTitle = this.processData.name;
+              formData.title=this.processData.description;
+              if (!formData.tableName)formData.tableName = this.processData.businessTable;
+              console.log('格式化后的数据',formData)
+              var url = this.url.add;
+              let method='post';
+              if (!this.isNew){
+                url = this.url.edit;
+                method='put';
               }
-            }).finally(()=>{
-              this.btndisabled = false;
-            })
-          }
+              console.log('提交方法',method)
+              this.btndisabled = true;
+              httpAction(url,formData,method).then((res)=>{
+                if (res.success){
+                  this.$message.success("保存成功！")
+                  //todo 将表单的数据传给父组件
+                  this.$emit('afterSubmit',formData)
+                }else {
+                  this.$message.error(res.message)
+                }
+              }).finally(()=>{
+                this.btndisabled = false;
+              })
+            }
+          })
         })
+
       },
       addBefore(){
         this.form.resetFields()
@@ -370,13 +380,13 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.model,'company','createTime','sysOrgCode','createBy','materialType','deliveryTime','fileId')
+        let fieldval = pick(this.data,'company','createTime','sysOrgCode','createBy','materialType','deliveryTime','fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
         // 加载子表数据
-        if (this.model.id) {
-          let params = { id: this.model.id }
+        if (this.data.id) {
+          let params = { id: this.data.id }
           this.requestSubTableData(this.url.processMaterialsDeliveryList.list, params, this.processMaterialsDeliveryListTable)
         }
       },
diff --git a/src/views/activiti/form/ProcessMaterialsReturnForm.vue b/src/views/activiti/form/ProcessMaterialsReturnForm.vue
index 58d8d81..05f7fa7 100644
--- a/src/views/activiti/form/ProcessMaterialsReturnForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsReturnForm.vue
@@ -73,8 +73,8 @@
 <script>
 
   import pick from 'lodash.pick'
-  import { getAction } from '@/api/manage'
-  import { FormTypes,getRefPromise } from '@/utils/JEditableTableUtil'
+  import { getAction,httpAction } from '@/api/manage'
+  import { FormTypes, getRefPromise,validateFormAndTables } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { validateDuplicateValue } from '@/utils/util'
   import JFormContainer from '@/components/jeecg/JFormContainer'
@@ -223,6 +223,7 @@
           ]
         },
         url: {
+          getForm:'/actBusiness/getForm',
           add: "/hy/processMaterialsReturn/add",
           edit: "/hy/processMaterialsReturn/edit",
           queryById: "/hy/processMaterialsReturn/queryById",
@@ -302,9 +303,7 @@
             formData.tableName = r.tableName;
             this.data = formData;
             console.log("表单回显数据",this.data)
-            this.$nextTick(() => {
-              this.form.setFieldsValue(pick(this.data,'name'))
-            });
+            this.editAfter();
             this.btndisabled = false;
           }else {
             this.$message.error(res.message)
@@ -324,34 +323,45 @@
         this.$emit('backTask')
       },
       handleSubmit (e) {
-        e.preventDefault()
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            let formData = Object.assign(this.data||{}, values)
-            formData.procDefId = this.processData.id;
-            formData.procDeTitle = this.processData.name;
-            if (!formData.tableName)formData.tableName = this.processData.businessTable;
-            formData.filedNames = _.keys(values).join(",");
-            console.log('formData', values)
+        this.getAllTable().then(tables => {
+          return validateFormAndTables(this.form, tables)
+        }).then(allValues=>{
+          console.log('所有数据',allValues)
+          if (typeof this.classifyIntoFormData !== 'function') {
+            throw this.throwNotFunction('classifyIntoFormData')
+          }
+          let formData = this.classifyIntoFormData(allValues)
 
-            var url = this.url.addApply;
-            if (!this.isNew){
-              url = this.url.editForm;
-            }
-            this.btndisabled = true;
-            this.postFormAction(url,formData).then((res)=>{
-              if (res.success){
-                this.$message.success("保存成功！")
-                //todo 将表单的数据传给父组件
-                this.$emit('afterSubmit',formData)
-              }else {
-                this.$message.error(res.message)
+          this.form.validateFields((err, values) => {
+            if (!err) {
+              formData.procDefId = this.processData.id;
+              formData.procDeTitle = this.processData.name;
+              formData.title=this.processData.description;
+              if (!formData.tableName)formData.tableName = this.processData.businessTable;
+              console.log('格式化后的数据',formData)
+              var url = this.url.add;
+              let method='post';
+              if (!this.isNew){
+                url = this.url.edit;
+                method='put';
               }
-            }).finally(()=>{
-              this.btndisabled = false;
-            })
-          }
+              console.log('提交方法',method)
+              this.btndisabled = true;
+              httpAction(url,formData,method).then((res)=>{
+                if (res.success){
+                  this.$message.success("保存成功！")
+                  //todo 将表单的数据传给父组件
+                  this.$emit('afterSubmit',formData)
+                }else {
+                  this.$message.error(res.message)
+                }
+              }).finally(()=>{
+                this.btndisabled = false;
+              })
+            }
+          })
         })
+
       },
       addBefore(){
         this.form.resetFields()
@@ -363,13 +373,13 @@
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.model,'company','createTime','sysOrgCode','createBy','materialType','processBorrowId','fileId')
+        let fieldval = pick(this.data,'company','createTime','sysOrgCode','createBy','materialType','processBorrowId','fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
         // 加载子表数据
-        if (this.model.id) {
-          let params = { id: this.model.id }
+        if (this.data.id) {
+          let params = { id: this.data.id }
           this.requestSubTableData(this.url.processMaterialsReturnList.list, params, this.processMaterialsReturnListTable)
         }
       },
diff --git a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
index fc0ca5f..d06ed47 100644
--- a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
+++ b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
@@ -73,8 +73,8 @@
 <script>
 
   import pick from 'lodash.pick'
-  import { getAction } from '@/api/manage'
-  import { FormTypes,getRefPromise } from '@/utils/JEditableTableUtil'
+  import { getAction,httpAction } from '@/api/manage'
+  import { FormTypes, getRefPromise,validateFormAndTables } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { validateDuplicateValue } from '@/utils/util'
   import JFormContainer from '@/components/jeecg/JFormContainer'
@@ -224,6 +224,7 @@
           ]
         },
         url: {
+          getForm:'/actBusiness/getForm',
           add: "/hy/processSmaterialsScrap/add",
           edit: "/hy/processSmaterialsScrap/edit",
           queryById: "/hy/processSmaterialsScrap/queryById",
@@ -300,9 +301,7 @@
             formData.tableName = r.tableName;
             this.data = formData;
             console.log("表单回显数据",this.data)
-            this.$nextTick(() => {
-              this.form.setFieldsValue(pick(this.data,'name'))
-            });
+            this.editAfter();
             this.btndisabled = false;
           }else {
             this.$message.error(res.message)
@@ -322,34 +321,45 @@
         this.$emit('backTask')
       },
       handleSubmit (e) {
-        e.preventDefault()
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            let formData = Object.assign(this.data||{}, values)
-            formData.procDefId = this.processData.id;
-            formData.procDeTitle = this.processData.name;
-            if (!formData.tableName)formData.tableName = this.processData.businessTable;
-            formData.filedNames = _.keys(values).join(",");
-            console.log('formData', values)
+        this.getAllTable().then(tables => {
+          return validateFormAndTables(this.form, tables)
+        }).then(allValues=>{
+          console.log('所有数据',allValues)
+          if (typeof this.classifyIntoFormData !== 'function') {
+            throw this.throwNotFunction('classifyIntoFormData')
+          }
+          let formData = this.classifyIntoFormData(allValues)
 
-            var url = this.url.addApply;
-            if (!this.isNew){
-              url = this.url.editForm;
-            }
-            this.btndisabled = true;
-            this.postFormAction(url,formData).then((res)=>{
-              if (res.success){
-                this.$message.success("保存成功！")
-                //todo 将表单的数据传给父组件
-                this.$emit('afterSubmit',formData)
-              }else {
-                this.$message.error(res.message)
+          this.form.validateFields((err, values) => {
+            if (!err) {
+              formData.procDefId = this.processData.id;
+              formData.procDeTitle = this.processData.name;
+              formData.title=this.processData.description;
+              if (!formData.tableName)formData.tableName = this.processData.businessTable;
+              console.log('格式化后的数据',formData)
+              var url = this.url.add;
+              let method='post';
+              if (!this.isNew){
+                url = this.url.edit;
+                method='put';
               }
-            }).finally(()=>{
-              this.btndisabled = false;
-            })
-          }
+              console.log('提交方法',method)
+              this.btndisabled = true;
+              httpAction(url,formData,method).then((res)=>{
+                if (res.success){
+                  this.$message.success("保存成功！")
+                  //todo 将表单的数据传给父组件
+                  this.$emit('afterSubmit',formData)
+                }else {
+                  this.$message.error(res.message)
+                }
+              }).finally(()=>{
+                this.btndisabled = false;
+              })
+            }
+          })
         })
+
       },
       addBefore(){
         this.form.resetFields()
@@ -361,13 +371,13 @@
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.model,'company','createTime','sysOrgCode','createBy','materialType','processOutflowId','fileId')
+        let fieldval = pick(this.data,'company','createTime','sysOrgCode','createBy','materialType','processOutflowId','fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
         // 加载子表数据
-        if (this.model.id) {
-          let params = { id: this.model.id }
+        if (this.data.id) {
+          let params = { id: this.data.id }
           this.requestSubTableData(this.url.processSmaterialsScrapList.list, params, this.processSmaterialsScrapListTable)
         }
       },
diff --git a/src/views/activiti/form/ProcessSpecialMaterialsForm.vue b/src/views/activiti/form/ProcessSpecialMaterialsForm.vue
index 367820e..c2c75be 100644
--- a/src/views/activiti/form/ProcessSpecialMaterialsForm.vue
+++ b/src/views/activiti/form/ProcessSpecialMaterialsForm.vue
@@ -73,8 +73,8 @@
 <script>
 
   import pick from 'lodash.pick'
-  import { getAction } from '@/api/manage'
-  import { FormTypes,getRefPromise } from '@/utils/JEditableTableUtil'
+  import { getAction,httpAction } from '@/api/manage'
+  import { FormTypes, getRefPromise,validateFormAndTables } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { validateDuplicateValue } from '@/utils/util'
   import JFormContainer from '@/components/jeecg/JFormContainer'
@@ -216,6 +216,7 @@
           ]
         },
         url: {
+          getForm:'/actBusiness/getForm',
           add: "/hy/processSpecialMaterials/add",
           edit: "/hy/processSpecialMaterials/edit",
           queryById: "/hy/processSpecialMaterials/queryById",
@@ -295,9 +296,7 @@
             formData.tableName = r.tableName;
             this.data = formData;
             console.log("表单回显数据",this.data)
-            this.$nextTick(() => {
-              this.form.setFieldsValue(pick(this.data,'name'))
-            });
+            this.editAfter();
             this.btndisabled = false;
           }else {
             this.$message.error(res.message)
@@ -317,34 +316,45 @@
         this.$emit('backTask')
       },
       handleSubmit (e) {
-        e.preventDefault()
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            let formData = Object.assign(this.data||{}, values)
-            formData.procDefId = this.processData.id;
-            formData.procDeTitle = this.processData.name;
-            if (!formData.tableName)formData.tableName = this.processData.businessTable;
-            formData.filedNames = _.keys(values).join(",");
-            console.log('formData', values)
+        this.getAllTable().then(tables => {
+          return validateFormAndTables(this.form, tables)
+        }).then(allValues=>{
+          console.log('所有数据',allValues)
+          if (typeof this.classifyIntoFormData !== 'function') {
+            throw this.throwNotFunction('classifyIntoFormData')
+          }
+          let formData = this.classifyIntoFormData(allValues)
 
-            var url = this.url.addApply;
-            if (!this.isNew){
-              url = this.url.editForm;
-            }
-            this.btndisabled = true;
-            this.postFormAction(url,formData).then((res)=>{
-              if (res.success){
-                this.$message.success("保存成功！")
-                //todo 将表单的数据传给父组件
-                this.$emit('afterSubmit',formData)
-              }else {
-                this.$message.error(res.message)
+          this.form.validateFields((err, values) => {
+            if (!err) {
+              formData.procDefId = this.processData.id;
+              formData.procDeTitle = this.processData.name;
+              formData.title=this.processData.description;
+              if (!formData.tableName)formData.tableName = this.processData.businessTable;
+              console.log('格式化后的数据',formData)
+              var url = this.url.add;
+              let method='post';
+              if (!this.isNew){
+                url = this.url.edit;
+                method='put';
               }
-            }).finally(()=>{
-              this.btndisabled = false;
-            })
-          }
+              console.log('提交方法',method)
+              this.btndisabled = true;
+              httpAction(url,formData,method).then((res)=>{
+                if (res.success){
+                  this.$message.success("保存成功！")
+                  //todo 将表单的数据传给父组件
+                  this.$emit('afterSubmit',formData)
+                }else {
+                  this.$message.error(res.message)
+                }
+              }).finally(()=>{
+                this.btndisabled = false;
+              })
+            }
+          })
         })
+
       },
       addBefore(){
         this.form.resetFields()
@@ -356,13 +366,13 @@
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.model,'company','createTime','sysOrgCode','createBy','materialType','processReturnId','fileId')
+        let fieldval = pick(this.data,'company','createTime','sysOrgCode','createBy','materialType','processReturnId','fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
         // 加载子表数据
-        if (this.model.id) {
-          let params = { id: this.model.id }
+        if (this.data.id) {
+          let params = { id: this.data.id }
           this.requestSubTableData(this.url.processSpecialMaterialsList.list, params, this.processSpecialMaterialsListTable)
         }
       },
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 6a70725..91da774 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -389,14 +389,7 @@
             formData.tableName = r.tableName;
             this.data = formData;
             console.log("表单回显数据",this.data)
-            this.$nextTick(() => {
-              this.form.setFieldsValue(pick(this.data,'id','company', 'createTime', 'sysOrgCode', 'createBy', 'materialType', 'processPlan', 'needTime', 'orderNumber', 'fileId'))
-            });
-            // 加载子表数据
-            if (this.data.id) {
-              let params = { id: this.data.id }
-              this.requestSubTableData(this.url.processUdgetPlanMaterial.list, params, this.processUdgetPlanMaterialTable)
-            }
+           this.editAfter();
             this.btndisabled = false;
           }else {
             this.$message.error(res.message)
@@ -429,13 +422,13 @@
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.model, 'company', 'createTime', 'sysOrgCode', 'createBy', 'materialType', 'processPlan', 'needTime', 'orderNumber', 'fileId')
+        let fieldval = pick(this.data, 'company', 'createTime', 'sysOrgCode', 'createBy', 'materialType', 'processPlan', 'needTime', 'orderNumber', 'fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
         // 加载子表数据
-        if (this.model.id) {
-          let params = { id: this.model.id }
+        if (this.data.id) {
+          let params = { id: this.data.id }
           this.requestSubTableData(this.url.processUdgetPlanMaterial.list, params, this.processUdgetPlanMaterialTable)
         }
       },
diff --git a/src/views/system/modules/PasswordModal.vue b/src/views/system/modules/PasswordModal.vue
index 10982ef..308dd7d 100644
--- a/src/views/system/modules/PasswordModal.vue
+++ b/src/views/system/modules/PasswordModal.vue
@@ -41,7 +41,7 @@
         confirmLoading: false,
         confirmDirty: false,
         validatorRules:{
-          password:{
+         /* password:{
             // rules: [{
             //   required: true,
             //   pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
@@ -49,7 +49,7 @@
             // }, {
             //   validator: this.validateToNextPassword,
             // }],
-          },
+          },*/
           confirmpassword:{
             rules: [{
               required: true, message: '请重新输入登录密码!',