diff --git a/ZR.Vue/src/views/productManagement/workplan.vue b/ZR.Vue/src/views/productManagement/workplan.vue
index 41daf62c..4cd46ac1 100644
--- a/ZR.Vue/src/views/productManagement/workplan.vue
+++ b/ZR.Vue/src/views/productManagement/workplan.vue
@@ -1,17 +1,175 @@
 <template>
-   <div class="app-container">
-    
+  <div class="app-container">
+    <div class="workplantable">
+      <div>
+        <el-form :model="search" inline>
+          <el-form-item label="年">
+            <el-input v-model="search.year" placeholder="输入年份"></el-input>
+          </el-form-item>
+          <el-form-item label="周">
+            <el-input v-model="search.week" placeholder="输入周"></el-input>
+          </el-form-item>
+          <el-form-item label="零件号">
+            <el-input v-model="search.partNumber" placeholder="输入零件号"></el-input>
+          </el-form-item>
+          <el-form-item label="颜色">
+            <el-input v-model="search.color" placeholder="输入颜色名称"></el-input>
+          </el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="getList">搜索</el-button>
+        </el-form>
+      </div>
+      <div>
+        <el-row :gutter="20">
+          <el-col :span="16"> <el-button type="primary">新建生产计划</el-button> </el-col>
+        </el-row>
 
+        <el-table border stripe :data="workplanList" style="width: 100%" height="500" highlight-current-row @current-change="handleCurrentChange">
+          <el-table-column prop="id" label="流水号" sortable></el-table-column>
+          <el-table-column prop="year" label="年"> </el-table-column>
+          <el-table-column prop="week" label="周"> </el-table-column>
+          <el-table-column prop="source" label="来源"> </el-table-column>
+          <el-table-column prop="partnumber" label="零件号"> </el-table-column>
+          <el-table-column prop="version" label="版本"> </el-table-column>
+          <el-table-column prop="color" label="颜色"> </el-table-column>
+          <el-table-column prop="colorcode" label="颜色代码"> </el-table-column>
+          <el-table-column prop="neednumber" label="本周要货数量"> </el-table-column>
+          <el-table-column prop="passpercent" label="产品合格率"> </el-table-column>
+          <el-table-column prop="batchNumber" label="每挂数量"> </el-table-column>
+          <el-table-column prop="productionRhythm" label="生产节拍"> </el-table-column>
+          <el-table-column prop="hangerNumber" label="总挂具数"> </el-table-column>
+          <el-table-column prop="needhangerNumber" label="订单需生产挂具数量"> </el-table-column>
+          <el-table-column prop="actualplanNumber" label="实际计划数量"> </el-table-column>
+          <el-table-column prop="carNumber" label="车数"> </el-table-column>
+          <el-table-column prop="circleNumber" label="圈数"> </el-table-column>
+          <el-table-column prop="producttime" label="订单生产时间(分钟)"> </el-table-column>
+          <el-table-column prop="needcertainty" label="计划需求定性"> </el-table-column>
+          <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" type="success">查看工单</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="total > 0"
+          :total="pagination.total"
+          :page.sync="pagination.pageNum"
+          :limit.sync="pagination.pageSize"
+          @pagination="getList"
+        />
+      </div>
+    </div>
+
+    <div class="workordertable">
+      <el-row :gutter="20">
+        <el-col :span="16"> <el-button type="primary">新建生产工单</el-button> </el-col>
+        <el-col :span="8"> 选中计划: </el-col>
+      </el-row>
+      <el-table border stripe :data="workplanList" style="width: 100%" height="300">
+        <el-table-column prop="id" label="流水号"> </el-table-column>
+        <el-table-column prop="fk_pro_plan_id" label="生产计划id"> </el-table-column>
+        <el-table-column prop="year" label="年份"> </el-table-column>
+        <el-table-column prop="week" label="周"> </el-table-column>
+        <el-table-column prop="date" label="周几"> </el-table-column>
+        <el-table-column prop="arrange_starttime" label="排产开始时间"> <i class="el-icon-time"></i> </el-table-column>
+        <el-table-column prop="arrange_endtime" label="排产结束时间"> <i class="el-icon-time"></i></el-table-column>
+        <el-table-column prop="production_time" label="预计工时"> </el-table-column>
+        <el-table-column prop="production_name" label="产品名称"> </el-table-column>
+        <el-table-column prop="color" label="颜色"> </el-table-column>
+        <el-table-column prop="paint_cylinder_number" label="油漆缸号"> </el-table-column>
+        <el-table-column prop="specification" label="规格"> </el-table-column>
+        <el-table-column prop="carnum" label="车数"> </el-table-column>
+        <el-table-column prop="rack" label="挂具摆放"> </el-table-column>
+        <el-table-column prop="require_num" label="上件数"> </el-table-column>
+        <el-table-column prop="workblankpartnumber" label="毛坯零件号"> </el-table-column>
+        <el-table-column prop="finishedpartnumber" label="成品零件号"> </el-table-column>
+        <el-table-column prop="actualnumber" label="实际上件数"> </el-table-column>
+        <el-table-column fixed="right" label="操作" width="150">
+          <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>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
   </div>
 </template>
 
 <script>
 export default {
-  name:"workplan"
-
+  name: 'workplan',
+  data() {
+    return {
+      search: {
+        year: new Date().getFullYear(),
+        week: '1',
+        partNumber: '',
+        color: '',
+      },
+      workplanList: [
+        {
+          id: 1,
+          year: 2012,
+          week: 2,
+          source: 12,
+          partnumber: 1234,
+          version: 1,
+          color: 1,
+          colorcode: 1,
+          neednumber: 12,
+          passpercent: 12,
+          batchNumber: 12,
+          productionRhythm: 12,
+          hangerNumber: 12,
+          needhangerNumber: 12,
+          actualplanNumber: 12,
+          carNumber: 12,
+          circleNumber: 12,
+          producttime: 12,
+          needcertainty: 12,
+          remark: 12,
+        },
+        {
+          id: 1,
+          year: 2012,
+          week: 2,
+          source: 12,
+          partnumber: 1234,
+          version: 1,
+          color: 1,
+          colorcode: 1,
+          neednumber: 12,
+          passpercent: 12,
+          batchNumber: 12,
+          productionRhythm: 12,
+          hangerNumber: 12,
+          needhangerNumber: 12,
+          actualplanNumber: 12,
+          carNumber: 12,
+          circleNumber: 12,
+          producttime: 12,
+          needcertainty: 12,
+          remark: 12,
+        },
+      ], //生产计划列表
+      pagination: {},
+    }
+  },
+  mounted() {},
+  methods: {},
 }
 </script>
 
 <style lang="scss" scoped>
+.workplantable {
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
+  
+}
+.workordertable {
+  margin-top: 50px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
 
-</style>
\ No newline at end of file
+}
+</style>
diff --git a/ZR.Vue/src/views/system/dict/index.vue b/ZR.Vue/src/views/system/dict/index.vue
index 82b19f6e..9ccf49cc 100644
--- a/ZR.Vue/src/views/system/dict/index.vue
+++ b/ZR.Vue/src/views/system/dict/index.vue
@@ -124,6 +124,7 @@ import {
   updateType,
   exportType,
 } from "@/api/system/dict/type";
+
 export default {
   name: "dict",
   components: { dictData },