diff --git a/ruoyi-ui/src/views/pay/workOrderBaohuo/index.vue b/ruoyi-ui/src/views/pay/workOrderBaohuo/index.vue
index 95a45e6..f77da3b 100644
--- a/ruoyi-ui/src/views/pay/workOrderBaohuo/index.vue
+++ b/ruoyi-ui/src/views/pay/workOrderBaohuo/index.vue
@@ -401,19 +401,19 @@
             </el-row>
           </el-card>
         </el-form>
-        <el-form ref="form" :model="form" :rules="rules" label-width="100px" v-if="title === '包活派工单详情'">
-          <el-card class="panel-group-top">
+        <el-form ref="form" :model="form" :rules="rules" label-width="90px" v-if="title === '包活派工单详情'">
+          <el-card>
             <el-row>
               <el-col :span="6">
                 <el-form-item label="部门" prop="deptId">
-                  <treeselect class="depselect" v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" disabled />
+                  <treeselect disabled class="depselect" v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" style="height: 30px;"/>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="车间" prop="workshop">
-                  <el-select v-model="form.workshop" placeholder="请选择车间" clearable disabled>
+                  <el-select v-model="form.workshop" placeholder="请选择车间" clearable style="width:100%" disabled>
                     <el-option
-                      v-for="dict in dict.type.sgr_workshop"
+                      v-for="dict in dict.type.pay_workshop"
                       :key="dict.value"
                       :label="dict.label"
                       :value="dict.value"
@@ -423,68 +423,66 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="工单名称" prop="name">
-                  <el-input v-model="form.name" placeholder="请输入包活工单名称" disabled />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="工作内容">
-                  <el-input
-                    type="textarea"
-                    :rows="2"
-                    placeholder="请输入工作内容"
-                    v-model="form.content" disabled>
-                  </el-input>
+                  <el-input v-model="form.name" placeholder="请输入包活工单名称" disabled/>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
               <el-col :span="6">
-                <el-form-item label="质检人员" prop="qualityName">
-                  <el-input v-model="form.qualityName" placeholder="请输入质检人员" disabled />
+                <el-form-item label="项目经理" prop="managerName">
+                  <el-input v-model="form.managerName" placeholder="请输入项目经理" disabled/>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="检验说明" prop="qualityRemark">
-                  <el-input v-model="form.qualityRemark" type="textarea" placeholder="请输入内容" disabled />
+                <el-form-item label="实际入库数量" prop="instorageNum" label-width="100px">
+                  <el-input-number v-model="form.instorageNum" :min="0" :max="10000" style="width: 100%;" disabled></el-input-number>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="入库时间" prop="instorageTime">
-                  <el-date-picker clearable
+                  <el-date-picker clearable style="width:100%" disabled
                                   v-model="form.instorageTime"
                                   type="date"
                                   value-format="yyyy-MM-dd"
-                                  placeholder="请选择入库日期" disabled>
+                                  placeholder="请选择入库日期">
                   </el-date-picker>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="入库人员" prop="instorageName">
-                  <el-input v-model="form.instorageName" placeholder="请输入入库人员" disabled />
+                  <el-input v-model="form.instorageName" placeholder="请输入入库人员" disabled/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="质检人员" prop="qualityName">
+                  <el-input v-model="form.qualityName" placeholder="请输入质检人员" disabled/>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
               <el-col :span="12">
-                <el-form-item label="实际入库数量" prop="instorageNum">
-                  <el-input-number v-model="form.instorageNum" :min="0" :max="10000" disabled ></el-input-number>
+                <el-form-item label="工作内容">
+                  <el-input disabled
+                    type="textarea"
+                    :rows="2"
+                    placeholder="请输入工作内容"
+                    v-model="form.content">
+                  </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="项目经理" prop="managerName">
-                  <el-input v-model="form.managerName" placeholder="请输入项目经理" disabled />
+                <el-form-item label="检验说明" prop="qualityRemark">
+                  <el-input v-model="form.qualityRemark" type="textarea" placeholder="请输入内容" disabled/>
                 </el-form-item>
               </el-col>
             </el-row>
           </el-card>
           <el-card class="panel-group-top" style="margin-top: 10px;">
             <el-row v-for="(emp, index) in form.empList" :key="emp.key">
-              <el-col :span="1.5">
+              <el-col :span="8">
                 <el-form-item label="员工姓名" :prop="'empList.' + index + '.empName'" :rules="{required: true, message: '员工姓名不能为空', trigger: 'change'}">
-                  <el-input v-model="emp.empName" placeholder="请输入员工姓名" disabled/>
+                  <el-input placeholder="请选择员工姓名" readonly v-model="emp.empName" @focus="changeEmp(emp, index)" disabled>
+                    <i slot="suffix" class="el-input__icon el-icon-search" style="color:#0f00d1; font-weight: bolder"></i>
+                  </el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="1.5">
+              <el-col :span="8">
                 <el-form-item label="是否帮工" :prop="'empList.' + index + '.helper'">
                   <template>
                     <el-radio v-model="emp.helper" :label=0 disabled>否</el-radio>
@@ -495,93 +493,95 @@
             </el-row>
           </el-card>
           <el-card class="panel-group-top" style="margin-top: 10px;">
-            <el-row v-for="(pro, index) in form.prodList" :key="pro.key">
-              <el-col :span="1.5">
+            <el-row v-for="(pro, index) in form.prodList" :key="pro.key" style="border: 1px solid #eeeeee;padding-top: 10px;margin-top: 5px">
+              <el-col :span="6">
                 <el-form-item label="产品名称" :prop="'prodList.' + index + '.productName'" :rules="{required: true, message: '产品名称不能为空', trigger: 'change'}">
-                  <el-input v-model="pro.productName" placeholder="请输入产品名称" disabled/>
+                  <el-input placeholder="请选择产品名称" readonly v-model="pro.productName" @focus="changeProduct(pro, index)" disabled>
+                    <i slot="suffix" class="el-input__icon el-icon-search" style="color:#0f00d1; font-weight: bolder"></i>
+                  </el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="1.5">
-                <el-form-item label="产品价格">
-                <span style="color: red">
-                  {{pro.minPrice !== null ? pro.minPrice+'元 - '+ pro.maxPrice+ '元' : null}}
-                </span>
+              <el-col :span="6">
+                <el-form-item label="产品价格" label-width="80px">
+                  <div style="color: red; background: #eeeeee; padding: 0 2px; box-sizing: border-box;height: 35px;">
+                    {{pro.minPrice !== null ? pro.minPrice+'元 - '+ pro.maxPrice+ '元' : null}}
+                  </div>
                 </el-form-item>
               </el-col>
-              <el-col :span="1.5">
-                <el-form-item label="产品规格">
-                  <el-input v-model="pro.productSpecification" placeholder="请输入产品规格" disabled />
+              <el-col :span="6">
+                <el-form-item label="产品规格" label-width="80px">
+                  <el-input v-model="pro.productSpecification" placeholder="请输入产品规格" disabled/>
                 </el-form-item>
               </el-col>
-              <el-col :span="1.5">
-                <el-form-item label="工序">
-                  <el-input v-model="pro.process" placeholder="请输入工序" disabled />
+              <el-col :span="6">
+                <el-form-item label="工序" label-width="55px">
+                  <el-input v-model="pro.process" placeholder="请输入工序" disabled/>
                 </el-form-item>
               </el-col>
-              <el-col :span="1.5">
+              <el-col :span="6">
                 <el-form-item label="加工数量" :prop="'prodList.' + index + '.productNum'" :rules="{required: true, validator: validator, trigger: 'change'}">
-                  <el-input-number v-model="pro.productNum" :min="0" :max="10000" style="width: 125px;" @change="changeProductNum(index)" disabled></el-input-number>
+                  <el-input-number v-model="pro.productNum" :min="0" :max="10000" style="width: 100%;" @change="changeProductNum(index)" disabled></el-input-number>
                 </el-form-item>
               </el-col>
-              <el-col :span="1.5">
-                <el-form-item label="原材料">
-                  <el-input v-model="pro.productMaterial" placeholder="请输入原材料" disabled />
+              <el-col :span="6">
+                <el-form-item label="原材料" label-width="80px">
+                  <el-input v-model="pro.productMaterial" placeholder="请输入原材料" disabled/>
                 </el-form-item>
               </el-col>
-              <el-col :span="1.5">
-                <el-form-item label="单位" :prop="'prodList.' + index + '.unit'">
-                  <el-input v-model="pro.unit" placeholder="请输入原材料" disabled/>
+              <el-col :span="6">
+                <el-form-item label="单位" label-width="80px" :prop="'prodList.' + index + '.unit'">
+                  <el-input v-model="pro.unit" placeholder="请输入单位" disabled/>
                 </el-form-item>
               </el-col>
-              <el-col :span="1.5">
-                <el-form-item label="单价" :prop="'prodList.' + index + '.price'" :rules="{ required: true, message: '单价不能为空', trigger: 'blur' }">
-                  <el-input v-model="pro.price" oninput ="value=value.replace(/[^0-9.]/g,'')" @input="inputProductNum(index)" style="width: 145px;" disabled />
+              <el-col :span="6">
+                <el-form-item label="单价" label-width="55px" :prop="'prodList.' + index + '.price'" :rules="{ required: true, message: '单价不能为空', trigger: 'blur' }">
+                  <el-input v-model="pro.price" placeholder="请输入单价" oninput ="value=value.replace(/[^0-9.]/g,'')" @input="inputProductNum(index)" disabled/>
                 </el-form-item>
               </el-col>
-              <el-col :span="1.5">
+              <el-col :span="6">
                 <el-form-item label="总金额" :prop="'prodList.' + index + '.amount'" :rules="{ required:true, message: '总金额不能为空', trigger: 'blur' }">
-                  <el-input v-model="pro.amount" placeholder="请输入加工总金额" oninput ="value=value.replace(/[^0-9.]/g,'')" style="width: 145px;" disabled/>
+                  <el-input v-model="pro.amount" placeholder="请输入加工总金额" oninput ="value=value.replace(/[^0-9.]/g,'')" disabled/>
                 </el-form-item>
               </el-col>
             </el-row>
           </el-card>
           <el-card class="panel-group-top" style="margin-top: 10px;">
             <el-row v-for="(work, index) in form.worktimeList" :key="work.key">
-              <el-col :span="1.5">
+              <el-col :span="6">
                 <el-form-item
                   label="干活日期"
                   :prop="'worktimeList.' + index + '.date'"
                   :rules="{required: true, message: '干活日期不能为空', trigger: 'blur'}">
-                  <el-date-picker
+                  <el-date-picker disabled
                     v-model="work.date"
                     type="date"
                     value-format="yyyy-MM-dd"
-                    placeholder="选择干活日期" style="width: 145px;" disabled>
+                    placeholder="选择干活日期" style="width: 100%">
                   </el-date-picker>
                 </el-form-item>
               </el-col>
-              <el-col :span="1.5">
+              <el-col :span="5">
                 <el-form-item
                   label="开始时间"
                   :prop="'worktimeList.' + index + '.beginTime'"
                   :rules="{required: true, message: '开始时间不能为空', trigger: 'blur'}">
-                  <el-time-picker v-model="work.beginTime" placeholder="开始时间" value-format="HH:mm" format="HH:mm" style="width: 145px;" disabled></el-time-picker>
+                  <el-time-picker disabled v-model="work.beginTime" placeholder="开始时间" value-format="HH:mm" format="HH:mm" style="width: 145px;"></el-time-picker>
                 </el-form-item>
               </el-col>
-              <el-col :span="1.5">
+              <el-col :span="5">
                 <el-form-item
                   label="结束时间"
                   :prop="'worktimeList.' + index + '.endTime'"
                   :rules="{required: true, message: '结束时间不能为空', trigger: 'blur'}">
-                  <el-time-picker v-model="work.endTime" value-format="HH:mm" format="HH:mm" placeholder="结束时间" style="width: 145px;" disabled></el-time-picker>
+                  <el-time-picker disabled v-model="work.endTime" value-format="HH:mm" format="HH:mm" placeholder="结束时间" style="width: 145px;"></el-time-picker>
                 </el-form-item>
               </el-col>
-              <el-col :span="1.5">
+              <el-col :span="5">
                 <el-form-item
                   label="有效时长"
                   :prop="'worktimeList.' + index + '.validHours'"
                   :rules="{required: true, message: '有效时长不能为空', trigger: 'blur'}">
-                  <el-input v-model="work.validHours" placeholder="请输入有效工作时长" disabled />
+                  <el-input v-model="work.validHours" placeholder="请输入有效工作时长" disabled/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -1077,6 +1077,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      console.log(this.form,555555);
       this.form.worktimeList.forEach(item => {
         item.stime = item.date + ' ' + item.beginTime + ':00';
         item.etime = item.date + ' ' + item.endTime + ':00';