diff --git a/src/views/mes/pro/schedule/index.vue b/src/views/mes/pro/schedule/index.vue
index 57604d0..2f475dc 100644
--- a/src/views/mes/pro/schedule/index.vue
+++ b/src/views/mes/pro/schedule/index.vue
@@ -322,6 +322,7 @@ export default {
         pageSize: 10,
         workorderCode: null,
         workorderName: null,
+        workorderType: 'SELF', //这里的排产要排除自产之外的外协和外购
         orderSource: null,
         sourceCode: null,
         productId: null,
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index 6aee0e8..51ff35d 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/mes/pro/workorder/index.vue
@@ -59,6 +59,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="工单类型" prop="workorderType">
+        <el-input
+          v-model="queryParams.workorderType"
+          placeholder="请选择工单类型"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="需求日期" prop="requestDate">
         <el-date-picker clearable
           v-model="queryParams.requestDate"
@@ -137,6 +145,11 @@
         </template>
       </el-table-column>
       <el-table-column label="工单名称" width="200" align="center" prop="workorderName" :show-overflow-tooltip="true"/>
+      <el-table-column label="工单类型" align="center" prop="workorderType" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.mes_workorder_type" :value="scope.row.workorderType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="工单来源" align="center" prop="orderSource" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mes_workorder_sourcetype" :value="scope.row.orderSource"/>
@@ -210,7 +223,7 @@
 
     <!-- 添加或修改生产工单对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="8">
             <el-form-item label="工单编号" prop="workorderCode">
@@ -270,7 +283,19 @@
           </el-col> 
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="8">
+            <el-form-item label="工单类型" prop="workorderType">
+              <el-select v-model="form.workorderType" placeholder="请选择类型">
+                <el-option
+                  v-for="dict in dict.type.mes_workorder_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item label="产品编号" prop="productCode">
               <el-input v-model="form.productCode" placeholder="请选择产品" >
                 <el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
@@ -278,7 +303,7 @@
               <ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="产品名称" prop="productName">
               <el-input v-model="form.productName" placeholder="请选择产品" disabled/>
             </el-form-item>
@@ -321,7 +346,7 @@
         <el-row v-if="form.orderSource == 'ORDER'">
           <el-col :span="12">
             <el-form-item label="客户编码" prop="clientCode">
-              <el-input v-model="form.clientCode" placeholder="请输入客户编码" >
+              <el-input v-model="form.clientCode" placeholder="请选择客户" >
                 <el-button slot="append" @click="handleSelectClient" icon="el-icon-search"></el-button>
               </el-input>
               <ClientSelect ref="clientSelect" @onSelected="onClientSelected" > </ClientSelect>
@@ -334,6 +359,22 @@
           </el-col>
           <el-col></el-col>
         </el-row>
+        <el-row v-if="form.workorderType == 'OUTSOURCE' || form.workorderType == 'PURCHASE'">
+          <el-col :span="12">
+            <el-form-item label="供应商编码" prop="vendorCode">
+              <el-input v-model="form.vendorCode" placeholder="请选择供应商" >
+                <el-button slot="append" @click="handleSelectVendor" icon="el-icon-search"></el-button>
+              </el-input>
+              <VendorSelect ref="vendorSelect" @onSelected="onVendorSelected" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="供应商名称" prop="vendorName">
+              <el-input v-model="form.vendorName" readonly="readonly" placeholder="请选择供应商" />
+            </el-form-item>
+          </el-col>
+          <el-col></el-col>
+        </el-row>
         <el-row>
           <el-col></el-col>
           <el-col></el-col>
@@ -357,8 +398,8 @@
       </el-tabs>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
-        <el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">确 定</el-button>
-        <el-button type="success" @click="handleConfirm" v-if="form.status =='PREPARE' && optType !='view'  && form.workorderId !=null">完成</el-button>
+        <el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button>
+        <el-button type="success" @click="handleConfirm" v-if="form.status =='PREPARE' && optType !='view'  && form.workorderId !=null">确 认</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -371,17 +412,19 @@ import Workorderbom from "./bom/bom.vue";
 import WorkorderItemList from "./items/item.vue";
 import ItemSelect  from "@/components/itemSelect/single.vue";
 import ClientSelect from "@/components/clientSelect/single.vue";
+import VendorSelect from "@/components/vendorSelect/single.vue";
 import {genCode} from "@/api/system/autocode/rule"
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Workorder",
-  dicts: ['mes_order_status','mes_workorder_sourcetype'],
+  dicts: ['mes_order_status','mes_workorder_sourcetype','mes_workorder_type'],
   components: {
     Treeselect,
     ItemSelect ,
     ClientSelect,
+    VendorSelect,
     Workorderbom,
     WorkorderItemList
   },
@@ -443,6 +486,9 @@ export default {
         workorderName: [
           { required: true, message: "工单名称不能为空", trigger: "blur" }
         ],
+        workorderType: [
+          { required: true, message: "请选择生产工单类型", trigger: "blur" }
+        ],
         orderSource: [
           { required: true, message: "来源类型不能为空", trigger: "blur" }
         ],
@@ -508,6 +554,7 @@ export default {
         workorderId: null,
         workorderCode: null,
         workorderName: null,
+        workorderType: 'SELF',
         orderSource: null,
         sourceCode: null,
         productId: null,
@@ -522,6 +569,9 @@ export default {
         clientId: null,
         clientCode: null,
         clientName: null,
+        vendorId: null,
+        vendorCode: null,
+        vendorName: null,
         requestDate: null,
         parentId: null,
         status: "PREPARE",
@@ -681,6 +731,19 @@ export default {
           this.form.clientName = obj.clientName;
         }
     },
+    //供应商选择
+    handleSelectVendor(){
+      this.$refs.vendorSelect.showFlag = true;
+    },
+    //供应商选择弹出框
+    onVendorSelected(obj){
+        debugger;
+        if(obj != undefined && obj != null){
+          this.form.vendorId = obj.vendorId;
+          this.form.vendorCode = obj.vendorCode;
+          this.form.vendorName = obj.vendorName;
+        }
+    },
     //自动生成编码
     handleAutoGenChange(autoGenFlag){
       if(autoGenFlag){