From 56bb8dabc0dcb60a0094ef4db2a213c07250a285 Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Thu, 20 Oct 2022 20:26:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=8E=B7=E5=8F=96=E5=AD=90=E5=88=97=E8=A1=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activiti/applyHome.vue              |  16 +-
 .../activiti/form/ProcessUdgetPlanForm.vue    |  89 +++++----
 src/views/activiti/historicDetailBak.vue      | 186 ++++++++++++++++++
 .../modules/ProcessUdgetPlanForm.vue          |  40 +++-
 .../modules/ProcessUdgetPlanModal.vue         | 167 +++-------------
 5 files changed, 313 insertions(+), 185 deletions(-)
 create mode 100644 src/views/activiti/historicDetailBak.vue

diff --git a/src/views/activiti/applyHome.vue b/src/views/activiti/applyHome.vue
index 8fde2d5..11c9e9c 100644
--- a/src/views/activiti/applyHome.vue
+++ b/src/views/activiti/applyHome.vue
@@ -31,10 +31,19 @@
         </a-collapse>
       </div>
     <!--流程表单-->
-    <a-modal :destroyOnClose="true" :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%">
+    <a-modal
+      :destroyOnClose="true"
+      :title="lcModa.title"
+      v-model="lcModa.visible"
+      switchFullscreen
+      :footer="null"
+      :maskClosable="false"
+      :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+      width="80%">
       <component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent"
                  :processData="lcModa.processData" :isNew = "lcModa.isNew"
-                 @afterSubmit="afterSub" @close="lcModa.visible=false,lcModa.disabled = false"></component>
+                 @afterSubmit="afterSub" @close="lcModa.visible=false,lcModa.disabled = false" >
+      </component>
     </a-modal>
   </a-card>
 
@@ -58,6 +67,7 @@
       return {
         description: '所有',
         dictOptions:[],
+        disableSubmit: false,
         url: {
           getProcessDataList: "/activiti_process/listData",
           getFirstNode:'/actProcessIns/getFirstNode',
@@ -163,7 +173,7 @@
       /*提交成功申请后*/
       afterSub(formData){
           this.lcModa.visible = false;
-          this.$message("请前往我的申请列表提交审批！")
+        this.$message.success("请前往我的申请列表提交审批！")
       },
       /*前往我的申请页面*/
       handleToApplyList() {
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 33b6adb..c4a67bb 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -57,7 +57,7 @@
       </a-form>
     </j-form-container>
     <!-- 子表单区域 -->
-    <a-tabs v-model="activeKey" @change="handleChangeTabs">
+    <a-tabs v-model="activeKey" @change="handleChangeTabs" ref="tabs">
       <a-tab-pane tab="预算计划采购流程物料清单表" :key="refKeys[0]" :forceRender="true">
         <j-editable-table
           :ref="refKeys[0]"
@@ -85,12 +85,13 @@
 </template>
 
 <script>
+  import { validateTables } from '../../../utils/JEditableTableUtil'
 
+  const VALIDATE_NO_PASSED = Symbol()
   import pick from 'lodash.pick'
   import { getAction } from '@/api/manage'
-  import { FormTypes, getRefPromise } from '@/utils/JEditableTableUtil'
+  import { FormTypes, getRefPromise,validateFormAndTables } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
-  import { validateDuplicateValue } from '@/utils/util'
   import JFormContainer from '@/components/jeecg/JFormContainer'
   import JDate from '@/components/jeecg/JDate'
   import JUpload from '@/components/jeecg/JUpload'
@@ -108,7 +109,7 @@
       JSelectDepart,
       JSelectUserByDep,
       JDictSelectTag,
-      JSelectCompany
+      JSelectCompany,
     },
     data() {
       return {
@@ -142,7 +143,7 @@
             {
               title: '物料组',
               key: 'materialGroup',
-              type: FormTypes.sel_search,
+              type: FormTypes.select,
               dictCode: '',
               width: '200px',
               placeholder: '请输入${title}',
@@ -259,10 +260,7 @@
             {
               title: '对比单价',
               key: 'contrastPrice',
-              type: FormTypes.popup,
-              popupCode: '',
-              destFields: '',
-              orgFields: '',
+              type: FormTypes.normal,
               width: '200px',
               placeholder: '请输入${title}',
               defaultValue: ''
@@ -370,6 +368,7 @@
       if (!this.isNew){
         this.init();
       }
+      this.getAllTable()
     },
     methods: {
       /*回显数据*/
@@ -386,7 +385,7 @@
             this.data = formData;
             console.log("表单回显数据",this.data)
             this.$nextTick(() => {
-              this.form.setFieldsValue(pick(this.data,'name'))
+              this.form.setFieldsValue(pick(this.data,'company', 'createTime', 'sysOrgCode', 'createBy', 'materialType', 'processPlan', 'needTime', 'orderNumber', 'fileId'))
             });
             this.btndisabled = false;
           }else {
@@ -411,7 +410,11 @@
         this.processUdgetPlanMaterialTable.dataSource = []
       },
       getAllTable() {
-        let values = this.tableKeys.map(key => getRefPromise(this, key))
+        console.log('-------------------->')
+        if (!(this.refKeys instanceof Array)) {
+          throw this.throwNotArray('refKeys')
+        }
+        let values = this.refKeys.map(key => getRefPromise(this, key))
         return Promise.all(values)
       },
       /** 调用完edit()方法之后会自动调用此方法 */
@@ -445,6 +448,7 @@
           })
         }
       },
+
       validateError(msg) {
         this.$message.error(msg)
       },
@@ -453,34 +457,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)
-
-            var url = this.url.add;
-            if (!this.isNew){
-              url = this.url.edit;
-            }
-            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)
+          console.log('格式化后的数据',formData)
+          // 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.processUdgetPlanMaterialTable.dataSource=[]
+          //     console.log('子表数据')
+          //     var url = this.url.add;
+          //     if (!this.isNew){
+          //       url = this.url.edit;
+          //     }
+          //     //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;
+          //     // })
+          //   }
+          // })
         })
+
       },
 
     }
diff --git a/src/views/activiti/historicDetailBak.vue b/src/views/activiti/historicDetailBak.vue
new file mode 100644
index 0000000..284809c
--- /dev/null
+++ b/src/views/activiti/historicDetailBak.vue
@@ -0,0 +1,186 @@
+<style lang="less">
+</style>
+<template>
+  <div class="search">
+    <a-card style="margin-bottom:10px;">
+      <p slot="title">
+        <span>流程审批进度历史</span>
+      </p>
+      <a-row style="position:relative">
+        <a-table :loading="loading" rowKey="id"
+                 :dataSource="data"
+                 :pagination="false"
+                  ref="table">
+          <a-table-column title="#"  width="50">
+            <template slot-scope="t,r,i" >
+              <span> {{i+1}} </span>
+            </template>
+          </a-table-column>
+          <a-table-column title="任务名称" dataIndex="name"  width="150" align="center">
+            <template slot-scope="t">
+              <span> {{t}} </span>
+            </template>
+          </a-table-column>
+          <a-table-column title="处理人" dataIndex="assignees"  width="150" align="center">
+            <template slot-scope="t">
+              <div v-if="t">
+                <span v-for="item in t">
+                  <span v-if="item.isExecutor" style="color: #00DB00;">{{item.username}} </span>
+                  <span v-else style="color: #999;">{{item.username}} </span>
+                </span>
+              </div>
+            </template>
+          </a-table-column>
+          <a-table-column title="审批操作" dataIndex="deleteReason"  width="150" align="center">
+            <template slot-scope="t">
+              <span v-if="t.toString().indexOf('通过')>-1" style="color: #00DB00">{{t}}</span>
+              <span v-else-if="t.toString().indexOf('驳回')>-1" style="color: red;">{{t}}</span>
+              <span v-else>{{t}}</span>
+            </template>
+          </a-table-column>
+          <a-table-column title="审批意见" dataIndex="comment"  width="150" align="center">
+            <template slot-scope="t">
+              <span>{{t}}</span>
+            </template>
+          </a-table-column>
+          <a-table-column title="耗时" dataIndex="duration"  width="150" align="center">
+            <template slot-scope="t">
+              <span>{{millsToTime(t)}}</span>
+            </template>
+          </a-table-column>
+          <a-table-column title="创建时间" dataIndex="createTime"  width="150" align="center">
+            <template slot-scope="t">
+              <span>{{t}}</span>
+            </template>
+          </a-table-column>
+          <a-table-column title="完成时间" dataIndex="endTime"  width="150" align="center">
+            <template slot-scope="t">
+              <span>{{t}}</span>
+            </template>
+          </a-table-column>
+          <a-table-column title="状态" dataIndex="endTime" key="aaa" width="150" align="center">
+            <template slot-scope="t">
+              <span v-if="t" style="color: blue;">已办理</span>
+              <span v-else style="color: #999999">待处理</span>
+            </template>
+          </a-table-column>
+        </a-table>
+      </a-row>
+    </a-card>
+
+    <a-tabs type="card" @change="callback">
+      <a-tab-pane key="1" tab="实时流程图">
+        <a-card>
+          <!--<p slot="title">
+            <span>实时流程图</span>
+          </p>-->
+          <a-row style="position:relative">
+            <img :src="imgUrl" />
+            <a-spin size="large" fix v-if="loadingImg"></a-spin>
+          </a-row>
+        </a-card>
+      </a-tab-pane>
+      <a-tab-pane key="2" tab="表单数据" v-if="lcModa">
+        <a-card>
+          <!--流程表单-->
+          <component :disabled="lcModa.disabled" :is="lcModa.formComponent"
+          :processData="lcModa.processData" :isNew="lcModa.isNew" :task="lcModa.isTask"
+          @afterSubmit="afterSub"
+          @passTask="pass(lcModa.processData)"
+          @backTask="back(lcModa.processData)"
+          @close="lcModa.visible=false,lcModa.disabled = false"></component>
+        </a-card>
+      </a-tab-pane>
+    </a-tabs>
+  </div>
+</template>
+
+<script>
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import { activitiMixin } from '@/views/activiti/mixins/activitiMixin'
+export default {
+  name: "historic_detail_bak",
+  mixins:[activitiMixin,JeecgListMixin],
+  props: {
+    /**/
+    procInstId: {
+      type: String,
+      default: '',
+      required: true
+    },
+    lcModa: {
+      type: Object,
+      required: false
+    }
+  },
+  data() {
+    return {
+      url:{
+        historicFlow:'/actTask/historicFlow/',
+        getHighlightImg:`${window._CONFIG['domianURL']}/activiti/models/getHighlightImg/`
+      },
+      type: 0,
+      loading: false, // 表单加载状态
+      loadingImg: false,
+      data: [],
+      id: "",
+      imgUrl: "",
+      backRoute: ""
+    };
+  },
+  created() {
+    this.init();
+  },
+  watch: {
+    procInstId:function(newval ,oldName) {
+      this.init();
+    }
+  },
+  methods: {
+    loadData(){
+
+    },
+    init() {
+      this.id = this.procInstId;
+      this.imgUrl =this.url.getHighlightImg + this.id + "?time=" + new Date();
+      this.getDataList();
+    },
+    getDataList() {
+      this.loading = true;
+      this.getAction(this.url.historicFlow+this.id).then(res => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result;
+          if (!res.result || res.result.length == 0) {
+            this.$message.info( "未找到该记录审批历史数据,历史数据可能已被删除");
+          }
+        }else {
+          this.$message.error( res.message);
+        }
+      });
+    },
+    handleTableChange(pagination, filters, sorter) {
+      //分页、排序、筛选变化时触发
+      //TODO 筛选
+      if (Object.keys(sorter).length > 0) {
+        this.isorter.column = sorter.field;
+        this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
+      }
+      this.ipagination = pagination;
+      // this.loadData();
+    },
+    callback(key){
+    },
+    afterSub(){
+
+    },
+    pass(v){
+      this.$emit('passTask',v)
+    },
+    back(v){
+      this.$emit('backTask',v)
+    }
+  },
+
+};
+</script>
\ No newline at end of file
diff --git a/src/views/processmaterials/modules/ProcessUdgetPlanForm.vue b/src/views/processmaterials/modules/ProcessUdgetPlanForm.vue
index a98bc9d..94a1916 100644
--- a/src/views/processmaterials/modules/ProcessUdgetPlanForm.vue
+++ b/src/views/processmaterials/modules/ProcessUdgetPlanForm.vue
@@ -26,12 +26,12 @@
           </a-col>
           <a-col :span="12" >
             <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="" placeholder="请选择物资类型" />
+              <j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="material_type" placeholder="请选择物资类型" />
             </a-form-item>
           </a-col>
           <a-col :span="12" >
             <a-form-item label="流程计划" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag type="list" v-decorator="['processPlan']" :trigger-change="true" dictCode="" placeholder="请选择流程计划" />
+              <j-dict-select-tag type="list" v-decorator="['processPlan']" :trigger-change="true" dictCode="process_plan" placeholder="请选择流程计划" />
             </a-form-item>
           </a-col>
           <a-col :span="12" >
@@ -78,14 +78,14 @@
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { validateDuplicateValue } from '@/utils/util'
   import JFormContainer from '@/components/jeecg/JFormContainer'
-  import JDate from '@/components/jeecg/JDate'  
+  import JDate from '@/components/jeecg/JDate'
   import JUpload from '@/components/jeecg/JUpload'
   import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
   import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
   import JDictSelectTag from "@/components/dict/JDictSelectTag"
 
   export default {
-    name: 'ProcessUdgetPlanForm',
+    name: 'ProcessUdgetPlanFormff',
     mixins: [JEditableTableMixin],
     components: {
       JFormContainer,
@@ -245,10 +245,7 @@
             {
               title: '对比单价',
               key: 'contrastPrice',
-              type: FormTypes.popup,
-              popupCode:"",
-              destFields:"",
-              orgFields:"",
+              type: FormTypes.inputNumber,
               width:"200px",
               placeholder: '请输入${title}',
               defaultValue:'',
@@ -285,6 +282,30 @@
               placeholder: '请输入${title}',
               defaultValue:'',
             },
+            {
+              title: '删除标志',
+              key: 'delFlag',
+              type: FormTypes.inputNumber,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+            {
+              title: '删除时间',
+              key: 'delTime',
+              type: FormTypes.input,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+            {
+              title: '修改人',
+              key: 'updateBy',
+              type: FormTypes.input,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
           ]
         },
         url: {
@@ -342,11 +363,13 @@
     },
     methods: {
       addBefore(){
+        alert(3)
         this.form.resetFields()
         this.processUdgetPlanMaterialTable.dataSource=[]
       },
       getAllTable() {
         let values = this.tableKeys.map(key => getRefPromise(this, key))
+        console.log('-------->',values)
         return Promise.all(values)
       },
       /** 调用完edit()方法之后会自动调用此方法 */
@@ -363,6 +386,7 @@
       },
       /** 整理成formData */
       classifyIntoFormData(allValues) {
+        alert(JSON.stringify(allValues))
         let main = Object.assign(this.model, allValues.formValue)
         return {
           ...main, // 展开
diff --git a/src/views/processmaterials/modules/ProcessUdgetPlanModal.vue b/src/views/processmaterials/modules/ProcessUdgetPlanModal.vue
index 42c5951..24c8d32 100644
--- a/src/views/processmaterials/modules/ProcessUdgetPlanModal.vue
+++ b/src/views/processmaterials/modules/ProcessUdgetPlanModal.vue
@@ -1,125 +1,45 @@
 <template>
   <j-modal
     :title="title"
-    :width="width"
+    :width="1200"
     :visible="visible"
-    :confirmLoading="confirmLoading"
+    :maskClosable="false"
     switchFullscreen
     @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-        <a-row>
-          <a-col :span="24">
-            <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-select-depart v-decorator="['company']" multi />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="流程发起部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-select-depart v-decorator="['sysOrgCode']" multi />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-select-user-by-dep v-decorator="['createBy']" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="" placeholder="请选择物资类型" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="流程计划" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag type="list" v-decorator="['processPlan']" :trigger-change="true" dictCode="" placeholder="请选择流程计划" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="需求时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择需求时间" v-decorator="['needTime']" :trigger-change="true" style="width: 100%" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="顺序号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input-number v-decorator="['orderNumber']" placeholder="请输入顺序号" style="width: 100%" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-upload v-decorator="['fileId']" :trigger-change="true"  ></j-upload>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </a-spin>
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel">
+    <process-udget-plan-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"/>
   </j-modal>
 </template>
 
 <script>
 
-  import { httpAction } from '@/api/manage'
-  import pick from 'lodash.pick'
-  import { validateDuplicateValue } from '@/utils/util'
-  import JDate from '@/components/jeecg/JDate'  
-  import JUpload from '@/components/jeecg/JUpload'
-  import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
-  import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
-  import JDictSelectTag from "@/components/dict/JDictSelectTag"
+  import ProcessUdgetPlanForm from './ProcessUdgetPlanForm'
 
   export default {
-    name: "ProcessUdgetPlanModal",
-    components: { 
-      JDate,
-      JUpload,
-      JSelectDepart,
-      JSelectUserByDep,
-      JDictSelectTag,
+    name: 'ProcessUdgetPlanModal',
+    components: {
+      ProcessUdgetPlanForm
     },
-    data () {
+    data() {
       return {
-        form: this.$form.createForm(this),
-        title:"操作",
+        title:'',
         width:800,
         visible: false,
-        model: {},
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-
-        confirmLoading: false,
-        validatorRules: {
-        },
-        url: {
-          add: "/hy/processUdgetPlan/add",
-          edit: "/hy/processUdgetPlan/edit",
-        }
-     
+        disableSubmit: false
       }
     },
-    created () {
-    },
-    methods: {
+    methods:{
       add () {
-        this.edit({});
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
       },
       edit (record) {
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'company','createTime','sysOrgCode','createBy','materialType','processPlan','needTime','orderNumber','fileId'))
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
         })
       },
       close () {
@@ -127,45 +47,18 @@
         this.visible = false;
       },
       handleOk () {
-        const that = this;
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            let formData = Object.assign(this.model, values);
-            console.log("表单提交数据",formData)
-            httpAction(httpurl,formData,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-              that.close();
-            })
-          }
-         
-        })
+        this.$refs.realForm.handleOk();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
       },
       handleCancel () {
         this.close()
-      },
-      popupCallback(row){
-        this.form.setFieldsValue(pick(row,'company','createTime','sysOrgCode','createBy','materialType','processPlan','needTime','orderNumber','fileId'))
-      },
-
-      
+      }
     }
   }
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file