diff --git a/src/views/cxtj/edit.vue b/src/views/cxtj/edit.vue
index 606f33b..8eaa3f3 100644
--- a/src/views/cxtj/edit.vue
+++ b/src/views/cxtj/edit.vue
@@ -1,7 +1,7 @@
 <template>
   <el-container>
     <el-header style="width: 100%">
-      <VxeForm :data="formData.data" :items="formData.items" />
+      <VxeForm :data="formData" :items="formItems" />
     </el-header>
     <el-container style="padding-top: 10px">
       <el-container>
@@ -22,6 +22,53 @@
 
 <script>
 import edit from "@/views/cxtj/edit";
+import request from '@/utils/request'
+import { VXETable } from 'vxe-table'
+
+const 获取钢加公司目标达成率统计=()=>{
+  return request({
+    url: "/YdjhKban/getMbdc",
+    method: "get",
+  });
+}
+
+const 保存钢加公司目标达成率统计=(data)=>{
+  return request({
+    url: "/YdjhKban/saveMbdc",
+    method: "post",
+    data,
+  });
+}
+
+const 保存双周达成率=(data)=>{
+  return request({
+    url: "/YdjhKban/saveSzdc",
+    method: "post",
+    data,
+  });
+}
+
+const 获取配送达成率=()=>{
+  return request({
+    url: "/YdjhKban/getPsdc",
+    method: "get",
+  });
+}
+
+const 保存配送达成率=(data)=>{
+  return request({
+    url: "/YdjhKban/savePsdc",
+    method: "post",
+    data,
+  });
+}
+
+const 获取双周达成率=()=>{
+  return request({
+    url: "/YdjhKban/getSzdc",
+    method: "get",
+  });
+}
 
 export default {
   name:'CXTJ',
@@ -29,9 +76,36 @@ export default {
     return{
       activeName:'one',
       formData:{
-        data:{},
-        items:[]
+        ndgc:0,
+        jhwc:0,
       },
+      formItems:[
+        { field: 'ndgc', title: '年度钢材加工', span: 4,
+          itemRender: {
+            name: '$input', props: {placeholder: '年度钢材加工' }
+          }
+        },
+        { field: 'jhwc', title: '年度计划完成率', span: 4 ,
+          itemRender: {
+            name: '$input', props: {placeholder: '年度计划完成率' }
+          }
+        },
+        {align:'center',
+          itemRender: {
+            name: '$button', props: {content:'保存',status:'primary'},events:{click:this.butClick}
+          }
+        },
+        {span:13,align:'right',
+          itemRender: {
+            name: '$button', props: {content:'新增',status:'primary'},events:{click:this.addClick}
+          }
+        },
+        {align:'right',
+          itemRender: {
+            name: '$button', props: {content:'保存',status:'primary'},events:{click:this.saveClick}
+          }
+        },
+      ],
       gridOptions1:{},
       gridOptions2:{},
       setActiveName:null
@@ -41,14 +115,62 @@ export default {
     const {formData,formItems,options1,options2,columns,activeName,setActiveName}=edit(this.$route.path)
     this.setActiveName=setActiveName
     this.activeName=activeName
-    this.formData.data=formData
-    this.formData.items=formItems
+    // this.formData.data=formData
+    // this.formData.items=formItems
     this.gridOptions1=options1
     this.gridOptions1.columns=columns
     this.gridOptions2=options2
     this.gridOptions2.columns=columns
   },
+  mounted(){
+    this.$nextTick(()=>{
+      获取钢加公司目标达成率统计().then(res=>{
+        this.formData=res.data
+      })
+    })
+  },
   methods:{
+    init配送达成率(){
+      获取配送达成率().then(res=>{
+        this.gridOptions2.data=res.data||[]
+      })
+    },
+    addClick(){
+      console.log(this.activeName)
+      if(this.activeName==='one'){
+        this.gridOptions1.data.push({})
+      }
+
+      if(this.activeName==='two'){
+        this.gridOptions2.data.push({})
+      }
+    },
+    saveClick(){
+      if(this.activeName==='one'){
+        保存双周达成率(this.gridOptions1.data).then(()=>{
+          this.init双周达成率()
+        })
+      }
+
+      if(this.activeName==='two'){
+        保存配送达成率(this.gridOptions2.data).then(()=>{
+          this.init配送达成率()
+        })
+      }
+    },
+    butClick(){
+      保存钢加公司目标达成率统计(this.formData).then(res=>{
+        if(res.success){
+          VXETable.modal.message({ content: '成功', status: 'success' })
+        }
+      })
+    },
+    init双周达成率(){
+      console.log(111)
+      获取双周达成率().then(res=>{
+        this.gridOptions1.data=res.data||[]
+      })
+    },
     handleClick(tab, event){
       this.setActiveName(this.activeName)
     },
diff --git a/src/views/cxtj/看板数据编辑.js b/src/views/cxtj/看板数据编辑.js
index 04d390a..861510f 100644
--- a/src/views/cxtj/看板数据编辑.js
+++ b/src/views/cxtj/看板数据编辑.js
@@ -4,6 +4,7 @@ import { VXETable } from 'vxe-table'
 const 看板数据编辑=()=>{
 
   const butClick=()=>{
+    console.log(data.formData)
     保存钢加公司目标达成率统计(data.formData).then(res=>{
       if(res.success){
         VXETable.modal.message({ content: '成功', status: 'success' })
@@ -107,9 +108,9 @@ const 看板数据编辑=()=>{
     ],
   }
 
-  获取钢加公司目标达成率统计().then(res=>{
-    data.formData=res.data
-  })
+  // 获取钢加公司目标达成率统计().then(res=>{
+  //   data.formData=res.data
+  // })
 
   const init双周达成率=()=>{
     console.log(111)
@@ -129,7 +130,7 @@ const 看板数据编辑=()=>{
   return data
 }
 
-const 获取钢加公司目标达成率统计=()=>{
+export const 获取钢加公司目标达成率统计=()=>{
   return request({
     url: "/YdjhKban/getMbdc",
     method: "get",