diff --git a/ZR.Vue/src/api/productManagement/workplan.js b/ZR.Vue/src/api/productManagement/workplan.js
index b9e95573..7c970c31 100644
--- a/ZR.Vue/src/api/productManagement/workplan.js
+++ b/ZR.Vue/src/api/productManagement/workplan.js
@@ -7,4 +7,16 @@ export function getWorkplanList(query) {
       method: 'get',
       params: query,
     })
-  }
\ No newline at end of file
+  }
+
+
+  export function addNewworkplan(data) {
+    return request({
+      url: '/mes/pro/workplan/addworkplan',
+      method: 'post',
+      data: data,
+      contextType:"application/json"
+    })
+  }
+  
+  
\ No newline at end of file
diff --git a/ZR.Vue/src/views/productManagement/workplan.vue b/ZR.Vue/src/views/productManagement/workplan.vue
index d6c9b254..e3ad7983 100644
--- a/ZR.Vue/src/views/productManagement/workplan.vue
+++ b/ZR.Vue/src/views/productManagement/workplan.vue
@@ -64,8 +64,8 @@
           <el-table-column prop="remark" label="备注"> </el-table-column>
           <el-table-column fixed="right" label="操作" width="280">
             <template slot-scope="scope">
-              <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
-              <el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+              <el-button size="mini" @click="workplan_handleEdit(scope.$index, scope.row)">编辑</el-button>
+              <el-button size="mini" type="danger" @click="workplan_handleDelete(scope.$index, scope.row)">删除</el-button>
               <el-button size="mini" type="success">查看工单</el-button>
             </template>
           </el-table-column>
@@ -82,16 +82,16 @@
 
     <!-- 添加或修改生产计划对话框 -->
     <el-dialog :title="dialog_1.title" :visible.sync="dialog_1.open" width="98%">
-      <el-form ref="dialog_1.form" :model="form" :rules="dialog_1.rules" label-width="80px">
+      <el-form ref="dialog_1form" :model="dialog_1.form" :rules="dialog_1.rules" label-width="150px">
         <el-row>
           <el-col :span="6">
-            <el-form-item label="年份"> <el-input v-model="dialog_1.form.year"></el-input> </el-form-item
+            <el-form-item label="年份" prop="year"> <el-input v-model="dialog_1.form.year"></el-input> </el-form-item
           ></el-col>
           <el-col :span="6">
-            <el-form-item label="周"> <el-input v-model="dialog_1.form.week"></el-input> </el-form-item
+            <el-form-item label="周" prop="week"> <el-input v-model="dialog_1.form.week"></el-input> </el-form-item
           ></el-col>
           <el-col :span="6">
-            <el-form-item label="来源">
+            <el-form-item label="来源" prop="source">
               <el-select v-model="dialog_1.form.source" placeholder="请选择来源">
                 <el-option label="订单" value="订单"></el-option>
                 <el-option label="紧急插单" value="紧急插单"></el-option>
@@ -99,15 +99,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="零件号"> <el-input v-model="dialog_1.form.partnumber"></el-input> </el-form-item
+            <el-form-item label="零件号" prop="partnumber"> <el-input v-model="dialog_1.form.partnumber"></el-input> </el-form-item
           ></el-col>
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="版本"> <el-input v-model="dialog_1.form.version"></el-input> </el-form-item>
+            <el-form-item label="版本" prop="version"> <el-input v-model="dialog_1.form.version"></el-input> </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="颜色"> <el-input v-model="dialog_1.form.color"></el-input> </el-form-item>
+            <el-form-item label="颜色" prop="color"> <el-input v-model="dialog_1.form.color"></el-input> </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="颜色代码"> <el-input v-model="dialog_1.form.colorcode"></el-input> </el-form-item>
@@ -197,7 +197,7 @@
 </template>
 
 <script>
-import { getWorkplanList } from '@/api/productManagement/workplan.js'
+import { getWorkplanList, addNewworkplan } from '@/api/productManagement/workplan.js'
 export default {
   name: 'workplan',
   data() {
@@ -263,11 +263,31 @@ export default {
       dialog_1: {
         title: '新增生产计划',
         open: false,
-        rules: [],
         form: {
           year: new Date().getFullYear(),
           week: null,
           source: null,
+          partnumber: null,
+          version: null,
+          color: null,
+          colorcode: null,
+          neednumber: null,
+          passpercent: null,
+          batchNumber: null,
+          productionRhythm: null,
+          actualplanNumber: null,
+          carNumber: null,
+          circleNumber: null,
+          producttime: 0,
+          needcertainty: null,
+          remark: null,
+        },
+        rules: {
+          year: [{ required: true, message: '年不能为空', trigger: 'blur' }],
+          week: [{ required: true, message: '周不能为空', trigger: 'blur' }],
+          source: [{ required: true, message: '来源不能为空', trigger: 'blur' }],
+          partnumber: [{ required: true, message: '零件号不能为空', trigger: 'blur' }],
+          color: [{ required: true, message: '颜色不能为空', trigger: 'blur' }],
         },
       },
     }
@@ -286,9 +306,47 @@ export default {
         }
       })
     },
-
+    //新增按钮
     newplan() {
       this.dialog_1.open = true
+      this.dialog_1.title = '新增生产计划'
+    },
+    // 新增修改提交处理
+    submitForm_1() {
+      // 1.上传数据
+      this.$refs['dialog_1form'].validate((valid) => {
+        if (valid) {
+          addNewworkplan(this.dialog_1.form).then((res) => {
+            if (res.code == 200) {
+              this.$$notify.success('新增成功')
+              this.getList()
+              this.dialog_1.open = false
+            }
+          })
+        }
+      })
+    },
+
+    cancel_1() {
+      this.dialog_1.open = false
+      // this.dialog_1reset();
+      this.resetForm('dialog_1form')
+    },
+
+    //删除生产计划
+    workplan_handleEdit(index,row) {
+      deleteworkplan().then(res=>{
+        if(res.code==200){
+          if(res.data=1){
+            this.$notify.success("删除成功");
+          }else{
+            this.$notify.error("上传")
+          }
+
+        }
+      })
+
+
     },
   },
 }