diff --git a/src/views/device/upkeepPlan/index.vue b/src/views/device/upkeepPlan/index.vue
index c7be21a..38fc6aa 100644
--- a/src/views/device/upkeepPlan/index.vue
+++ b/src/views/device/upkeepPlan/index.vue
@@ -225,7 +225,7 @@
         >添加计划
         </el-button>
       </el-col>
-      <el-col :span="1.5">
+      <el-col v-if="false" :span="1.5">
         <el-button
           type="success"
           plain
@@ -297,7 +297,15 @@
       </el-table-column>
       <el-table-column v-if="false" label="是否可生产-限制" align="center" prop="planRestrict"/>
       <el-table-column v-if="false" label="维护类型" align="center" prop="planType"/>
-      <el-table-column v-if="false" label="是否委外" align="center" prop="planOutsource"/>
+      <el-table-column label="保养类型" align="center" prop="upkeep">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.device_upkeep_type" :value="scope.row.upkeep"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="委外人员" align="center" prop="workPerson"/>
+      <el-table-column label="委外单位" align="center" prop="workOutsourcingUnit"/>
+      <el-table-column label="联系方式" align="center" prop="workConnection"/>
+      <el-table-column label="原因" align="center" prop="workReason"/>
       <el-table-column v-if="false" label="委外工单编码" align="center" prop="workCode"/>
       <el-table-column v-if="false" label="工厂" align="center" prop="factoryCode"/>
       <el-table-column v-if="false" label="备用字段1" align="center" prop="attr1"/>
@@ -349,15 +357,12 @@
     <!-- 添加或修改保养计划对话框 -->
     <el-dialog v-loading="planLoading" :title="title" :visible.sync="open" width="900px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item v-if="false" label="计划编码" prop="planCode">
-          <el-input v-model="form.planCode" placeholder="请输入计划编码"/>
-        </el-form-item>
         <div class="my-step-mar">
           <el-steps :active="upkeepSteps" finish-status="success" align-center>
             <el-step title="保养计划基本信息"></el-step>
             <el-step title="选择设备、保养项"></el-step>
-            <el-step v-if="false" title="更换备件"></el-step>
-            <el-step title="人员"></el-step>
+            <el-step title="人员" v-if="this.form.upkeep == '0'"></el-step>
+            <el-step title="委外信息" v-if="this.form.upkeep == '1'"></el-step>
           </el-steps>
           <!-- 保养计划基本信息 -->
           <div class="my-step-body" v-if="this.upkeepSteps==0">
@@ -432,12 +437,18 @@
               </div>
             </el-row>
             <el-row>
-              <el-col :span="20">
+              <el-col :span="12">
                 <el-form-item label-width="110px" label="是否停机保养:">
                   <el-radio v-model="form.shutDown" label="0">停机保养</el-radio>
                   <el-radio v-model="form.shutDown" label="1">开机保养</el-radio>
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item label-width="110px" label="保养类型:">
+                  <el-radio v-model="form.upkeep" label="0">内部</el-radio>
+                  <el-radio v-model="form.upkeep" label="1">外部</el-radio>
+                </el-form-item>
+              </el-col>
             </el-row>
           </div>
           <!-- 选择设备、保养项 -->
@@ -756,54 +767,9 @@
 
             </el-dialog>
 
-          </div>
-          <!-- 更换备件 -->
-          <div class="my-step-body" v-if="false">
-            <el-row>
-              <el-col class="my-step-mar" :span="1.5">
-                <el-button
-                  type="primary"
-                  plain
-                  size="mini"
-                  @click="selectSpareBtn">
-                  选择备件
-                </el-button>
-              </el-col>
-            </el-row>
-            <el-table
-              :data="form.selectSpareList"
-              stripe
-              style="width: 100%">
-              <el-table-column type="selection" width="55" align="center"/>
-              <el-table-column
-                prop="materialCode"
-                label="备件号"
-                width="180">
-              </el-table-column>
-              <el-table-column
-                prop="materialDesc"
-                label="备件名称"
-                width="180">
-              </el-table-column>
-              <el-table-column
-                prop="amount"
-                label="库存数量"
-                width="300">
-              </el-table-column>
-              <el-table-column
-                fixed="right"
-                label="操作"
-              >
-                <template slot-scope="scope">
-                  <el-button @click="editorTheItem(scope.row)" type="text" size="small">编辑</el-button>
-                  <el-button @click="delTheEquItem(scope.row)" type="text" size="small">删除</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-
           </div>
           <!-- 人员 -->
-          <div class="my-step-body" v-if="this.upkeepSteps==2">
+          <div class="my-step-body" v-if="this.upkeepSteps==2 && this.form.upkeep == '0' ">
             <el-row>
               <el-col :span="24" :offset="1">
                 <el-transfer
@@ -817,8 +783,39 @@
               </el-col>
             </el-row>
           </div>
+          <!-- 委外信息 -->
+          <div class="my-step-body" v-if="this.upkeepSteps==2 && this.form.upkeep == '1'">
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="委外单位:">
+                  <el-input v-model="form.workOutsourcingUnit" placeholder="请输入委外单位"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="7" :offset="1">
+                <el-form-item label="委外人员:">
+                  <el-input v-model="form.workPerson" placeholder="请输入委外人员"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="7" :offset="1">
+                <el-form-item label="联系方式:">
+                  <el-input v-model="form.workConnection" placeholder="请输入联系方式"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="申领原因:">
+                  <el-input
+                    type="textarea"
+                    autosize
+                    placeholder="请输入申领原因"
+                    v-model="form.workReason">
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
         </div>
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button style="margin-top: 12px;" v-if="this.upkeepSteps > 0" @click="stepLast">上一步</el-button>
@@ -842,7 +839,7 @@ import {delPlan, getEquList, getPersonList, getWorkCenter, initUpdatePlanInfo, l
 
 export default {
   name: "UpkeepPlan",
-  dicts: ['device_loop_type', 'sys_normal_disable'],
+  dicts: ['device_loop_type', 'sys_normal_disable','device_upkeep_type'],
   data() {
     return {
       // 日期范围选择快捷
@@ -1398,13 +1395,17 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        upkeep: '1',
+        upkeep: '0',
         calculationRule: '0',
         shutDown: '0',
         equipmentItem: [],
         personList:[],
         selectSpareList: [],
         planTimeArray:[],
+        workPerson: null,
+        workOutsourcingUnit: null,
+        workConnection: null,
+        workReason: null,
       };
       this.resetForm("form");
     },