diff --git a/src/views/mes/pro/procard/index.vue b/src/views/mes/pro/procard/index.vue
index 57f14e8..400b87a 100644
--- a/src/views/mes/pro/procard/index.vue
+++ b/src/views/mes/pro/procard/index.vue
@@ -47,6 +47,32 @@
       </el-form-item>
     </el-form>
 
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['mes:pro:procard:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['mes:pro:procard:remove']"
+        >删除</el-button>
+      </el-col>
+
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
     <el-table v-loading="loading" :data="procardList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />      
       <el-table-column label="流转卡编号" align="center" prop="cardCode" >
@@ -88,7 +114,7 @@
 
     <!-- 添加或修改工序流转卡对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>      
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" label-width="100px">
         <el-row>
           <el-col :span="16">
             <el-row>
@@ -98,9 +124,12 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="生产工单号" prop="workorderCode">
-                  <el-input v-model="form.workorderCode" placeholder="请输入生产工单编号" />
+                <el-form-item label="生产工单" prop="workorderCode">
+                  <el-input v-model="form.workorderCode" placeholder="请选择生产工单" >
+                    <el-button slot="append" icon="el-icon-search" @click="handleWorkorderSelect"></el-button>
+                  </el-input>
                 </el-form-item>
+                <WorkorderSelect ref="woSelect" @onSelected="onWorkorderSelected"></WorkorderSelect>
               </el-col>
             </el-row>
             <el-row>
@@ -168,10 +197,11 @@
 import { listProcard, getProcard, delProcard, addProcard, updateProcard } from "@/api/mes/pro/procard";
 import BarcodeImg from "@/components/barcodeImg/index.vue"
 import Procardprocess from "./process.vue"
+import WorkorderSelect from "@/components/workorderSelect/single.vue"
 import { getToken } from "@/utils/auth";
 export default {
   name: "Procard",
-  components: {BarcodeImg,Procardprocess},
+  components: {BarcodeImg,Procardprocess,WorkorderSelect},
   data() {
     return {
       optType: null,
@@ -311,7 +341,23 @@ export default {
       this.download('pro/procard/export', {
         ...this.queryParams
       }, `procard_${new Date().getTime()}.xlsx`)
-    }
+    },
+    //选择生产工单
+    handleWorkorderSelect(){
+      this.$refs.woSelect.showFlag = true;
+    },
+    onWorkorderSelected(row){
+      if(row != undefined && row != null){        
+        this.form.workorderId = row.workorderId;
+        this.form.workorderCode = row.workorderCode;
+        this.form.workorderName = row.workorderName;
+        this.form.itemId = row.productId;
+        this.form.itemCode = row.productCode;
+        this.form.itemName = row.productName;
+        this.form.specification = row.specification;
+        this.form.unitOfMeasure = row.unitOfMeasure;
+      }
+    },
   }
 };
 </script>
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index 8ec4d47..a6045b0 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/mes/pro/workorder/index.vue
@@ -546,7 +546,7 @@ export default {
       listWorkorder().then(response => {
         this.workorderOptions = [];
         const data = { workorderId: 0, workorderName: '顶级节点', children: [] };
-        data.children = this.handleTree(response.data, "workorderId", "parentId");
+        data.children = this.handleTree(response.rows, "workorderId", "parentId");
         this.workorderOptions.push(data);
       });
     },