diff --git a/admin-hanhai-vue/src/views/tbOrder/TbOrderList.vue b/admin-hanhai-vue/src/views/tbOrder/TbOrderList.vue
index 44bf26f..10708ab 100644
--- a/admin-hanhai-vue/src/views/tbOrder/TbOrderList.vue
+++ b/admin-hanhai-vue/src/views/tbOrder/TbOrderList.vue
@@ -10,6 +10,19 @@
                     </a-form-item>
                   </a-col>
 
+                  <a-col :xl="6" :lg="7" :md="8" :sm="24">
+                    <a-form-item label="工人id">
+                      <a-input placeholder="请输入工人id" v-model="queryParam.workId"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                                    <a-col :xl="6" :lg="7" :md="8" :sm="24">
+                                      <a-form-item label="老板id">
+                                        <a-input placeholder="请输入老板id" v-model="queryParam.bossId"></a-input>
+                                      </a-form-item>
+                                    </a-col>
+
+
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="老板名">
               <a-input placeholder="请输入老板名" v-model="queryParam.userName"></a-input>
@@ -32,8 +45,8 @@
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="订单状态 0待聘用 1 已接单 2 进行中 3试工完成 4 企业确认 5已支付 6已完成 7已取消">
-                <j-dict-select-tag placeholder="请选择订单状态 0待聘用 1 已接单 2 进行中 3试工完成 4 企业确认 5已支付 6已完成 7已取消" v-model="queryParam.orderStatus" dictCode="order_status"/>
+              <a-form-item label="订单状态">
+                <j-dict-select-tag placeholder="请选择订单状态" v-model="queryParam.orderStatus" dictCode="order_status"/>
               </a-form-item>
             </a-col>
           </template>
@@ -52,22 +65,7 @@
     </div>
     <!-- 查询区域-END -->
 
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('tb_order')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
+
 
     <!-- table区域-begin -->
     <div>
@@ -165,16 +163,27 @@
               return parseInt(index)+1;
             }
           },
-                    {
-                      title:'订单id',
-                      align:"center",
-                      dataIndex: 'id'
-                    },
+          {
+            title:'订单id',
+            align:"center",
+            dataIndex: 'id'
+          },
+          {
+            title:'老板id',
+            align:"center",
+            dataIndex: 'bossId'
+          },
+
           {
             title:'老板名',
             align:"center",
             dataIndex: 'userName'
           },
+                    {
+                      title:'工人id',
+                      align:"center",
+                      dataIndex: 'workId'
+                    },
           {
             title:'工人名',
             align:"center",
@@ -196,7 +205,7 @@
             dataIndex: 'workerAddress'
           },
           {
-            title:'出行方式 0出租车 1 网约车 2 公交地铁 3无',
+            title:'出行方式',
             align:"center",
             dataIndex: 'travelType_dictText'
           },
@@ -257,52 +266,52 @@
             dataIndex: 'workTime'
           },
           {
-            title:'订单状态 0待聘用 1 已接单 2 进行中 3试工完成 4 企业确认 5已支付 6已完成 7已取消',
+            title:'订单状态',
             align:"center",
             dataIndex: 'orderStatus_dictText'
           },
           {
-            title:'结算方式 0提前支付 1 试用后支付',
+            title:'结算方式',
             align:"center",
             dataIndex: 'payType_dictText'
           },
           {
-            title:'付款金额（元）、',
+            title:'付款金额（元）',
             align:"center",
             dataIndex: 'payMoney'
           },
           {
-            title:'支付方式 0微信支付 1 余额支付',
+            title:'支付方式',
             align:"center",
             dataIndex: 'moneyType_dictText'
           },
           {
-            title:'保险费（元）、',
+            title:'保险费（元）',
             align:"center",
             dataIndex: 'premium'
           },
           {
-            title:'交通费用金额（元）、',
+            title:'交通费用金额（元）',
             align:"center",
             dataIndex: 'travelMoney'
           },
           {
-            title:'试工费用金额（元）、',
+            title:'试工费用金额（元）',
             align:"center",
             dataIndex: 'workMoney'
           },
           {
-            title:'总金额（元）、',
+            title:'总金额（元）',
             align:"center",
             dataIndex: 'amount'
           },
           {
-            title:'平台手续费（元）、',
+            title:'平台手续费（元）',
             align:"center",
             dataIndex: 'rateMoney'
           },
           {
-            title:'平台手续费率）、',
+            title:'平台手续费率',
             align:"center",
             dataIndex: 'rate'
           },
@@ -342,6 +351,10 @@
         let fieldList=[];
         fieldList.push({type:'string',value:'userName',text:'老板名',dictCode:''})
         fieldList.push({type:'string',value:'workName',text:'工人名',dictCode:''})
+                fieldList.push({type:'string',value:'workId',text:'工人id',dictCode:''})
+                fieldList.push({type:'string',value:'bossId',text:'老板id',dictCode:''})
+
+
         fieldList.push({type:'string',value:'title',text:'工作标题',dictCode:''})
         fieldList.push({type:'string',value:'companyName',text:'公司名称',dictCode:''})
         fieldList.push({type:'string',value:'workerAddress',text:'工人出发地址',dictCode:''})
diff --git a/admin-hanhai-vue/src/views/tbOrder/modules/TbOrderForm.vue b/admin-hanhai-vue/src/views/tbOrder/modules/TbOrderForm.vue
index bb8a191..c1fa62e 100644
--- a/admin-hanhai-vue/src/views/tbOrder/modules/TbOrderForm.vue
+++ b/admin-hanhai-vue/src/views/tbOrder/modules/TbOrderForm.vue
@@ -29,8 +29,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="出行方式 0出租车 1 网约车 2 公交地铁 3无" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="travelType">
-              <j-dict-select-tag type="list" v-model="model.travelType" dictCode="travel_type" placeholder="请选择出行方式 0出租车 1 网约车 2 公交地铁 3无" />
+            <a-form-model-item label="出行方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="travelType">
+              <j-dict-select-tag type="list" v-model="model.travelType" dictCode="travel_type" placeholder="请选择出行方式" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -99,53 +99,53 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="订单状态 0待聘用 1 已接单 2 进行中 3试工完成 4 企业确认 5已支付 6已完成 7已取消" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderStatus">
-              <j-dict-select-tag type="list" v-model="model.orderStatus" dictCode="order_status" placeholder="请选择订单状态 0待聘用 1 已接单 2 进行中 3试工完成 4 企业确认 5已支付 6已完成 7已取消" />
+            <a-form-model-item label="订单状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderStatus">
+              <j-dict-select-tag type="list" v-model="model.orderStatus" dictCode="order_status" placeholder="请选择订单状态" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="结算方式 0提前支付 1 试用后支付" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payType">
-              <j-dict-select-tag type="list" v-model="model.payType" dictCode="pay_type" placeholder="请选择结算方式 0提前支付 1 试用后支付" />
+            <a-form-model-item label="结算方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payType">
+              <j-dict-select-tag type="list" v-model="model.payType" dictCode="pay_type" placeholder="请选择结算方式" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="付款金额（元）、" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payMoney">
-              <a-input-number v-model="model.payMoney" placeholder="请输入付款金额（元）、" style="width: 100%" />
+              <a-input-number v-model="model.payMoney" placeholder="请输入付款金额（元）" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="支付方式 0微信支付 1 余额支付" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="moneyType">
-              <j-dict-select-tag type="list" v-model="model.moneyType" dictCode="money_type" placeholder="请选择支付方式 0微信支付 1 余额支付" />
+            <a-form-model-item label="支付方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="moneyType">
+              <j-dict-select-tag type="list" v-model="model.moneyType" dictCode="money_type" placeholder="请选择支付方式" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="保险费（元）、" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="premium">
-              <a-input-number v-model="model.premium" placeholder="请输入保险费（元）、" style="width: 100%" />
+              <a-input-number v-model="model.premium" placeholder="请输入保险费（元）" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="交通费用金额（元）、" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="travelMoney">
-              <a-input-number v-model="model.travelMoney" placeholder="请输入交通费用金额（元）、" style="width: 100%" />
+              <a-input-number v-model="model.travelMoney" placeholder="请输入交通费用金额（元）" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="试工费用金额（元）、" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workMoney">
-              <a-input-number v-model="model.workMoney" placeholder="请输入试工费用金额（元）、" style="width: 100%" />
+              <a-input-number v-model="model.workMoney" placeholder="请输入试工费用金额（元）" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="总金额（元）、" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="amount">
-              <a-input-number v-model="model.amount" placeholder="请输入总金额（元）、" style="width: 100%" />
+              <a-input-number v-model="model.amount" placeholder="请输入总金额（元）" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="平台手续费（元）、" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="rateMoney">
-              <a-input-number v-model="model.rateMoney" placeholder="请输入平台手续费（元）、" style="width: 100%" />
+              <a-input-number v-model="model.rateMoney" placeholder="请输入平台手续费（元）" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="平台手续费率）、" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="rate">
-              <a-input-number v-model="model.rate" placeholder="请输入平台手续费率）、" style="width: 100%" />
+              <a-input-number v-model="model.rate" placeholder="请输入平台手续费率）" style="width: 100%" />
             </a-form-model-item>
           </a-col>
         </a-row>
diff --git a/admin-hanhai-vue/src/views/tbTask/TbTaskList.vue b/admin-hanhai-vue/src/views/tbTask/TbTaskList.vue
index 87aec01..81ccbf5 100644
--- a/admin-hanhai-vue/src/views/tbTask/TbTaskList.vue
+++ b/admin-hanhai-vue/src/views/tbTask/TbTaskList.vue
@@ -48,19 +48,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('tb_task')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
+
     </div>
 
     <!-- table区域-begin -->
diff --git a/admin-hanhai-vue/src/views/userRole1/TbUserRoleList.vue b/admin-hanhai-vue/src/views/userRole1/TbUserRoleList.vue
index 3f735fc..3e613a9 100644
--- a/admin-hanhai-vue/src/views/userRole1/TbUserRoleList.vue
+++ b/admin-hanhai-vue/src/views/userRole1/TbUserRoleList.vue
@@ -10,8 +10,8 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="审核状态 0审核中 1 审核通过 2审核未通过">
-              <j-dict-select-tag placeholder="请选择审核状态 0审核中 1 审核通过 2审核未通过" v-model="queryParam.auditStatus" dictCode="audit_status"/>
+            <a-form-item label="审核状态">
+              <j-dict-select-tag placeholder="请选择审核状态" v-model="queryParam.auditStatus" dictCode="audit_status"/>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -31,19 +31,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('tb_user_role')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
+
     </div>
 
     <!-- table区域-begin -->
diff --git a/admin-hanhai-vue/src/views/userRole1/modules/TbUserRoleForm.vue b/admin-hanhai-vue/src/views/userRole1/modules/TbUserRoleForm.vue
index af7a7f5..88cf15c 100644
--- a/admin-hanhai-vue/src/views/userRole1/modules/TbUserRoleForm.vue
+++ b/admin-hanhai-vue/src/views/userRole1/modules/TbUserRoleForm.vue
@@ -62,8 +62,8 @@
           </a-col>
 
           <a-col :span="24">
-            <a-form-model-item label="审核状态 0审核中 1 审核通过 2审核未通过" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="auditStatus">
-              <j-dict-select-tag type="list" v-model="model.auditStatus" dictCode="audit_status" placeholder="请选择审核状态 0审核中 1 审核通过 2审核未通过" />
+            <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="auditStatus">
+              <j-dict-select-tag type="list" v-model="model.auditStatus" dictCode="audit_status" placeholder="请选择审核状态" />
             </a-form-model-item>
           </a-col>
         </a-row>