diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
index 1361f7c0..77827666 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
@@ -414,7 +414,7 @@
             },
             /** 重置按钮操作 */
             resetQuery() {
-                this.dateRange = []
+                this.queryParams.time = []
                 this.resetForm('queryForm')
                 this.handleQuery()
             },
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
index ffe62865..d4052392 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
@@ -1,55 +1,89 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="申请日期" prop="time">
-        <el-date-picker
-          v-model="queryParams.time"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="往来单位" prop="unitId">
-        <el-select  v-model="queryParams.unitId" filterable clearable @change="GetProData" style="width: 240px" placeholder="请选择">
-          <el-option
-            v-for="item in unitList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="工程名称" prop="proId">
-        <el-select  v-model="queryParams.proId" filterable clearable @change="GetUnitData" style="width: 240px" placeholder="请选择">
-          <el-option
-            v-for="item in proList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="关键字" prop="keyword">
-        <el-input
-          v-model="queryParams.keyword"
-          placeholder="请输入关键字"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+    <div class="app-container">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="80px"
+        >
+            <el-form-item label="申请日期" prop="time">
+                <el-date-picker
+                    v-model="queryParams.time"
+                    type="daterange"
+                    value-format="yyyy-MM-dd"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                >
+                </el-date-picker>
+            </el-form-item>
+            <el-form-item label="往来单位" prop="unitId">
+                <el-select
+                    v-model="queryParams.unitId"
+                    filterable
+                    clearable
+                    @change="GetProData"
+                    style="width: 240px"
+                    placeholder="请选择"
+                >
+                    <el-option
+                        v-for="item in unitList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    >
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="工程名称" prop="proId">
+                <el-select
+                    v-model="queryParams.proId"
+                    filterable
+                    clearable
+                    @change="GetUnitData"
+                    style="width: 240px"
+                    placeholder="请选择"
+                >
+                    <el-option
+                        v-for="item in proList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    >
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="关键字" prop="keyword">
+                <el-input
+                    v-model="queryParams.keyword"
+                    placeholder="请输入关键字"
+                    clearable
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
 
+            <el-form-item>
+                <el-button
+                    type="primary"
+                    icon="el-icon-search"
+                    size="mini"
+                    @click="handleQuery"
+                    >查询</el-button
+                >
+                <el-button
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="resetQuery"
+                    >重置</el-button
+                >
+            </el-form-item>
+        </el-form>
 
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
+        <el-row :gutter="10" class="mb8">
+            <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -58,474 +92,674 @@
           @click="handleAdd"
         >新建</el-button>
       </el-col> -->
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
-      </el-col>
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="danger"-->
-      <!--          plain-->
-      <!--          icon="el-icon-refresh"-->
-      <!--          size="mini"-->
-      <!--          @click="handleRefreshCache"-->
-      <!--          v-hasPermi="['store:labelType:remove']"-->
-      <!--        >刷新缓存</el-button>-->
-      <!--      </el-col>-->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="leaseAuditList" @selection-change="handleSelectionChange">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="序号" align="center" type="index" />
-      <el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" />
-      <el-table-column label="领料单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
-      <el-table-column label="领料工程" align="center" prop="proName" :show-overflow-tooltip="true" />
-      <el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true" />
-      <el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true" />
-      <el-table-column label="联系电话" align="center" prop="leasePhone" :show-overflow-tooltip="true" />
-      <el-table-column label="申请人" align="center" prop="applyFor" :show-overflow-tooltip="true" />
-      <el-table-column label="申请时间" align="center" prop="createTimes" :show-overflow-tooltip="true" />
-      <el-table-column label="任务状态" align="center" prop="taskName" :show-overflow-tooltip="true" />
-<!--      <el-table-column label="审批结果 " align="center" prop="dictName" :show-overflow-tooltip="true" />-->
-      <el-table-column label="备注" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span>{{ scope.row.leaseApplyInfoList[0].remark }}</span>
-
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="left" width="250" class-name="small-padding fixed-width" fixed="right">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            @click="handleView(scope.row)"
-          >查看</el-button>
-          <el-button
-            size="mini"
-            type="primary"
-            @click="handleExamine(scope.row)"
-            v-hasPermi="['receive:examine:fgs']"
-            v-if="Number(scope.row.examineStatusId)==30"
-          >审批</el-button>
-          <el-button
-            size="mini"
-            type="primary"
-            @click="handleExamine(scope.row)"
-            v-hasPermi="['receive:examine:sgb']"
-            v-if="Number(scope.row.examineStatusId)==31 && (scope.row.leaseApplyInfoList[0].status=='0'||scope.row.leaseApplyInfoList[0].status=='7'||scope.row.leaseApplyInfoList[0].status=='8'||scope.row.leaseApplyInfoList[0].status=='6')"
-          >审批</el-button>
-          <el-button
-            size="mini"
-            type="primary"
-            @click="handleExamine(scope.row)"
-            v-hasPermi="['receive:examine:ajb']"
-            v-if="Number(scope.row.examineStatusId)==31 && (scope.row.leaseApplyInfoList[0].status=='0'||scope.row.leaseApplyInfoList[0].status=='5'||scope.row.leaseApplyInfoList[0].status=='6'||scope.row.leaseApplyInfoList[0].status=='8')"
-          >审批</el-button>
-          <el-button
-            size="mini"
-            type="primary"
-            @click="handleExamine(scope.row,'jjfgs')"
-            v-hasPermi="['receive:examine:nbry-jjfgs']"
-            v-if="Number(scope.row.examineStatusId)==32 && (scope.row.leaseApplyInfoList[0].status=='5'||scope.row.leaseApplyInfoList[0].status=='7'||scope.row.leaseApplyInfoList[0].status=='4'||scope.row.leaseApplyInfoList[0].status=='2')"
-          >审批</el-button>
-          <el-button
-            size="mini"
-            type="primary"
-            @click="handleExamine(scope.row,'sbfgs')"
-            v-hasPermi="['receive:examine:nbry-sbfgs']"
-            v-if="Number(scope.row.examineStatusId)==32 && (scope.row.leaseApplyInfoList[0].status=='5'||scope.row.leaseApplyInfoList[0].status=='7'||scope.row.leaseApplyInfoList[0].status=='4'||scope.row.leaseApplyInfoList[0].status=='2')"
-          >审批</el-button>
-          <el-button
-            size="mini"
-            type="info" 
-            @click="openLld(scope.row)"
-          >领料单</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 领料单弹窗 -->
-    <el-dialog  :visible.sync="open" width="800px" append-to-body>
-      <div style="height: 500px;overflow-y: scroll;padding: 0 20px;">
-      <vue-easy-print tableShow ref="remarksPrintRef" class="print">
-        <div class="title" style="text-align: center;font-weight: 600;font-size: 16px;">
-          领料单
-        </div>
-        <div class="info" style="margin-top: 10px;display: flex;flex-wrap: wrap;">
-          <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
-            <span>领料单位：</span>{{ leaseApplyData.unitName }}
-          </div>
-          <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
-            <span>工程名称：</span>{{ leaseApplyData.proName }}
-          </div>
-          <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
-            <span>时间：</span>{{ leaseApplyData.updateTimes }}
-          </div>
-          <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
-            <span>编号：</span>{{ leaseApplyData.code }}
-          </div>
-        </div>
-        <el-table :data="leaseApplyDetails" class="table" border style="margin-top: 20px;padding: 1px">
-          <!--          <el-table-column type="selection" width="55" align="center" />-->
-          <el-table-column label="序号" align="center" type="index" />
-          <el-table-column label="类型名称" align="center" prop="typeName"  />
-          <el-table-column label="规格型号" align="center" prop="typeModelName"  />
-          <el-table-column label="计量单位" align="center" prop="unitName" />
-          <el-table-column label="预领数量" align="center" prop="preNum" />
-          <el-table-column label="备注" align="center" prop="remark" />
-          <el-table-column label="出库方式" align="center" prop="manageTypeName"  />
+            <el-col :span="1.5">
+                <el-button
+                    type="warning"
+                    plain
+                    icon="el-icon-download"
+                    size="mini"
+                    @click="handleExport"
+                    >导出</el-button
+                >
+            </el-col>
+            <!--      <el-col :span="1.5">-->
+            <!--        <el-button-->
+            <!--          type="danger"-->
+            <!--          plain-->
+            <!--          icon="el-icon-refresh"-->
+            <!--          size="mini"-->
+            <!--          @click="handleRefreshCache"-->
+            <!--          v-hasPermi="['store:labelType:remove']"-->
+            <!--        >刷新缓存</el-button>-->
+            <!--      </el-col>-->
+            <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+            ></right-toolbar>
+        </el-row>
 
+        <el-table
+            v-loading="loading"
+            :data="leaseAuditList"
+            @selection-change="handleSelectionChange"
+        >
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column label="序号" align="center" type="index" />
+            <el-table-column
+                label="领料单号"
+                align="center"
+                prop="code"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="领料单位"
+                align="center"
+                prop="unitName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="领料工程"
+                align="center"
+                prop="proName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="协议号"
+                align="center"
+                prop="agreementCode"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="领料人"
+                align="center"
+                prop="leasePerson"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="联系电话"
+                align="center"
+                prop="leasePhone"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="申请人"
+                align="center"
+                prop="applyFor"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="申请时间"
+                align="center"
+                prop="createTimes"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="任务状态"
+                align="center"
+                prop="taskName"
+                :show-overflow-tooltip="true"
+            />
+            <!--      <el-table-column label="审批结果 " align="center" prop="dictName" :show-overflow-tooltip="true" />-->
+            <el-table-column
+                label="备注"
+                align="center"
+                :show-overflow-tooltip="true"
+            >
+                <template slot-scope="scope">
+                    <span>{{ scope.row.leaseApplyInfoList[0].remark }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="操作"
+                align="left"
+                width="250"
+                class-name="small-padding fixed-width"
+                fixed="right"
+            >
+                <template slot-scope="scope">
+                    <el-button size="mini" @click="handleView(scope.row)"
+                        >查看</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        @click="handleExamine(scope.row)"
+                        v-hasPermi="['receive:examine:fgs']"
+                        v-if="Number(scope.row.examineStatusId) == 30"
+                        >审批</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        @click="handleExamine(scope.row)"
+                        v-hasPermi="['receive:examine:sgb']"
+                        v-if="
+                            Number(scope.row.examineStatusId) == 31 &&
+                            (scope.row.leaseApplyInfoList[0].status == '0' ||
+                                scope.row.leaseApplyInfoList[0].status == '7' ||
+                                scope.row.leaseApplyInfoList[0].status == '8' ||
+                                scope.row.leaseApplyInfoList[0].status == '6')
+                        "
+                        >审批</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        @click="handleExamine(scope.row)"
+                        v-hasPermi="['receive:examine:ajb']"
+                        v-if="
+                            Number(scope.row.examineStatusId) == 31 &&
+                            (scope.row.leaseApplyInfoList[0].status == '0' ||
+                                scope.row.leaseApplyInfoList[0].status == '5' ||
+                                scope.row.leaseApplyInfoList[0].status == '6' ||
+                                scope.row.leaseApplyInfoList[0].status == '8')
+                        "
+                        >审批</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        @click="handleExamine(scope.row, 'jjfgs')"
+                        v-hasPermi="['receive:examine:nbry-jjfgs']"
+                        v-if="
+                            Number(scope.row.examineStatusId) == 32 &&
+                            (scope.row.leaseApplyInfoList[0].status == '5' ||
+                                scope.row.leaseApplyInfoList[0].status == '7' ||
+                                scope.row.leaseApplyInfoList[0].status == '4' ||
+                                scope.row.leaseApplyInfoList[0].status == '2')
+                        "
+                        >审批</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        @click="handleExamine(scope.row, 'sbfgs')"
+                        v-hasPermi="['receive:examine:nbry-sbfgs']"
+                        v-if="
+                            Number(scope.row.examineStatusId) == 32 &&
+                            (scope.row.leaseApplyInfoList[0].status == '5' ||
+                                scope.row.leaseApplyInfoList[0].status == '7' ||
+                                scope.row.leaseApplyInfoList[0].status == '4' ||
+                                scope.row.leaseApplyInfoList[0].status == '2')
+                        "
+                        >审批</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="info"
+                        @click="openLld(scope.row)"
+                        >领料单</el-button
+                    >
+                </template>
+            </el-table-column>
         </el-table>
 
-        <div class="fillIn" style="margin-top: 30px;display: flex;justify-content: space-between;">
-          <div class="item" style="width: 25%;">
-            <span>审核：</span>
-          </div>
-          <div class="item" style="width: 25%;">
-            <span>领料：</span>
-          </div>
-          <div class="item" style="width: 25%;">
-            <span>仓库：</span>
-          </div>
-          <div class="item" style="width: 25%;">
-            <span>操作人：</span>
-          </div>
-        </div>
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />
 
-      </vue-easy-print>
-      </div>
-      <div slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" @click="print">打 印</el-button>
-        <el-button @click="open = false">关 闭</el-button>
-      </div>
-    </el-dialog>
+        <!-- 领料单弹窗 -->
+        <el-dialog :visible.sync="open" width="800px" append-to-body>
+            <div style="height: 500px; overflow-y: scroll; padding: 0 20px">
+                <vue-easy-print tableShow ref="remarksPrintRef" class="print">
+                    <div
+                        class="title"
+                        style="
+                            text-align: center;
+                            font-weight: 600;
+                            font-size: 16px;
+                        "
+                    >
+                        领料单
+                    </div>
+                    <div
+                        class="info"
+                        style="margin-top: 10px; display: flex; flex-wrap: wrap"
+                    >
+                        <div
+                            class="item"
+                            style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+                        >
+                            <span>领料单位：</span>{{ leaseApplyData.unitName }}
+                        </div>
+                        <div
+                            class="item"
+                            style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+                        >
+                            <span>工程名称：</span>{{ leaseApplyData.proName }}
+                        </div>
+                        <div
+                            class="item"
+                            style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+                        >
+                            <span>时间：</span>{{ leaseApplyData.updateTimes }}
+                        </div>
+                        <div
+                            class="item"
+                            style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+                        >
+                            <span>编号：</span>{{ leaseApplyData.code }}
+                        </div>
+                    </div>
+                    <el-table
+                        :data="leaseApplyDetails"
+                        class="table"
+                        border
+                        style="margin-top: 20px; padding: 1px"
+                    >
+                        <!--          <el-table-column type="selection" width="55" align="center" />-->
+                        <el-table-column
+                            label="序号"
+                            align="center"
+                            type="index"
+                        />
+                        <el-table-column
+                            label="类型名称"
+                            align="center"
+                            prop="typeName"
+                        />
+                        <el-table-column
+                            label="规格型号"
+                            align="center"
+                            prop="typeModelName"
+                        />
+                        <el-table-column
+                            label="计量单位"
+                            align="center"
+                            prop="unitName"
+                        />
+                        <el-table-column
+                            label="预领数量"
+                            align="center"
+                            prop="preNum"
+                        />
+                        <el-table-column
+                            label="备注"
+                            align="center"
+                            prop="remark"
+                        />
+                        <el-table-column
+                            label="出库方式"
+                            align="center"
+                            prop="manageTypeName"
+                        />
+                    </el-table>
 
-
-
-
-  </div>
+                    <div
+                        class="fillIn"
+                        style="
+                            margin-top: 30px;
+                            display: flex;
+                            justify-content: space-between;
+                        "
+                    >
+                        <div class="item" style="width: 25%">
+                            <span>审核：</span>
+                        </div>
+                        <div class="item" style="width: 25%">
+                            <span>领料：</span>
+                        </div>
+                        <div class="item" style="width: 25%">
+                            <span>仓库：</span>
+                        </div>
+                        <div class="item" style="width: 25%">
+                            <span>操作人：</span>
+                        </div>
+                    </div>
+                </vue-easy-print>
+            </div>
+            <div slot="footer" class="dialog-footer" style="text-align: center">
+                <el-button type="primary" @click="print">打 印</el-button>
+                <el-button @click="open = false">关 闭</el-button>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
-import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-import { getLeaseManageListAll, getUnitData, getProData, getLeaseListAll } from '@/api/claimAndRefund/receive'
-import { getInfo } from '@/api/login'
-import vueEasyPrint from 'vue-easy-print';
-export default {
-  // name: "ReceiveManage",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 字典表格数据
-      typeList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 日期范围
-      dateRange: [],
-      // 查询参数
-      queryParams: {
-        time:[],
-        unitId:null,
-        proId:null,
-        keyword:'',
-        types:2,
+    import {
+        listType,
+        getType,
+        delType,
+        addType,
+        updateType,
+        refreshCache,
+    } from '@/api/system/dict/type'
+    import {
+        getLeaseManageListAll,
+        getUnitData,
+        getProData,
+        getLeaseListAll,
+    } from '@/api/claimAndRefund/receive'
+    import { getInfo } from '@/api/login'
+    import vueEasyPrint from 'vue-easy-print'
+    export default {
+        // name: "ReceiveManage",
+        data() {
+            return {
+                // 遮罩层
+                loading: true,
+                // 选中数组
+                ids: [],
+                // 非单个禁用
+                single: true,
+                // 非多个禁用
+                multiple: true,
+                // 显示搜索条件
+                showSearch: true,
+                // 总条数
+                total: 0,
+                // 字典表格数据
+                typeList: [],
+                // 弹出层标题
+                title: '',
+                // 是否显示弹出层
+                open: false,
+                // 日期范围
+                dateRange: [],
+                // 查询参数
+                queryParams: {
+                    time: [],
+                    unitId: null,
+                    proId: null,
+                    keyword: '',
+                    types: 2,
 
-        pageNum: 1,
-        pageSize: 10,
-        dictName: undefined,
-        dictType: undefined,
-        status: undefined
-      },
-      user:{},
-      unitList:[],
-      proList: [],
-      leaseAuditList:[],
-      showJJExamineBtn:false, //内部审批-机具分公司
-      showSBExamineBtn:false, //内部审批-调试分公司
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        dictName: [
-          { required: true, message: "字典名称不能为空", trigger: "blur" }
-        ],
-        dictType: [
-          { required: true, message: "字典类型不能为空", trigger: "blur" }
-        ]
-      },
-      peopleOpen:false,
-      noticeOpen:false,
-      nform:{
-        notice:''
-      },
-      nrules: {
-        notice: [
-          { required: true, message: "通知内容不能为空", trigger: "blur" }
-        ]
-      },
-      deptName: undefined,
+                    pageNum: 1,
+                    pageSize: 10,
+                    dictName: undefined,
+                    dictType: undefined,
+                    status: undefined,
+                },
+                user: {},
+                unitList: [],
+                proList: [],
+                leaseAuditList: [],
+                showJJExamineBtn: false, //内部审批-机具分公司
+                showSBExamineBtn: false, //内部审批-调试分公司
+                // 表单参数
+                form: {},
+                // 表单校验
+                rules: {
+                    dictName: [
+                        {
+                            required: true,
+                            message: '字典名称不能为空',
+                            trigger: 'blur',
+                        },
+                    ],
+                    dictType: [
+                        {
+                            required: true,
+                            message: '字典类型不能为空',
+                            trigger: 'blur',
+                        },
+                    ],
+                },
+                peopleOpen: false,
+                noticeOpen: false,
+                nform: {
+                    notice: '',
+                },
+                nrules: {
+                    notice: [
+                        {
+                            required: true,
+                            message: '通知内容不能为空',
+                            trigger: 'blur',
+                        },
+                    ],
+                },
+                deptName: undefined,
 
-      //领料单
-      leaseApplyDetails:[],
-      // 领料任务详情数据
-      leaseApplyData:{}
-    };
-  },
-  created() {
-    this.GetUserInfo()
-    // this.getList();
+                //领料单
+                leaseApplyDetails: [],
+                // 领料任务详情数据
+                leaseApplyData: {},
+            }
+        },
+        created() {
+            this.GetUserInfo()
+            // this.getList();
 
-    this.GetUnitData()
-    this.GetProData()
-  },
-  components:{vueEasyPrint},
-  methods: {
-    // 获取用户信息
-    async GetUserInfo(){
-      const res = await getInfo()
-      this.user = res.user
-      // console.log(this.user)
-      this.getList();
-    },
-    /** 查询列表 */
-    async getList() {
-      this.loading = true;
-      const params = {
-        unitId:this.queryParams.unitId,
-        projectId:this.queryParams.proId,
-        keyWord:this.queryParams.keyword,
-        startTime:this.queryParams.time && this.queryParams.time[0],
-        endTime:this.queryParams.time && this.queryParams.time[1],
-        types:this.queryParams.types,
-        souceBy:0,
-        pageSize: this.queryParams.pageSize,
-        pageNum: this.queryParams.pageNum
-      }
+            this.GetUnitData()
+            this.GetProData()
+        },
+        components: { vueEasyPrint },
+        methods: {
+            // 获取用户信息
+            async GetUserInfo() {
+                const res = await getInfo()
+                this.user = res.user
+                // console.log(this.user)
+                this.getList()
+            },
+            /** 查询列表 */
+            async getList() {
+                this.loading = true
+                const params = {
+                    unitId: this.queryParams.unitId,
+                    projectId: this.queryParams.proId,
+                    keyWord: this.queryParams.keyword,
+                    startTime:
+                        this.queryParams.time && this.queryParams.time[0],
+                    endTime: this.queryParams.time && this.queryParams.time[1],
+                    types: this.queryParams.types,
+                    souceBy: 0,
+                    pageSize: this.queryParams.pageSize,
+                    pageNum: this.queryParams.pageNum,
+                }
 
-      const res = await getLeaseManageListAll(params)
-      this.loading = false;
-      console.log('getList ============',res)
-      this.leaseAuditList = res.data.rows;
-      // this.leaseAuditList.forEach((item,index)=>{
-      //   console.log(item.leaseApplyInfoList)
-      //   if(item.leaseApplyInfoList.length>0){
-      //       // item.showExamineBtn = true;
-      //       if(item.leaseApplyInfoList[0].status=="0"||item.leaseApplyInfoList[0].status=="5"||item.leaseApplyInfoList[0].status=="7"||item.leaseApplyInfoList[0].status=="8"){
-      //         item.showExamineBtn = true;
-      //       }
-      //   }
+                const res = await getLeaseManageListAll(params)
+                this.loading = false
+                console.log('getList ============', res)
+                this.leaseAuditList = res.data.rows
+                // this.leaseAuditList.forEach((item,index)=>{
+                //   console.log(item.leaseApplyInfoList)
+                //   if(item.leaseApplyInfoList.length>0){
+                //       // item.showExamineBtn = true;
+                //       if(item.leaseApplyInfoList[0].status=="0"||item.leaseApplyInfoList[0].status=="5"||item.leaseApplyInfoList[0].status=="7"||item.leaseApplyInfoList[0].status=="8"){
+                //         item.showExamineBtn = true;
+                //       }
+                //   }
 
-      // })
-      console.log(this.leaseAuditList)
-      this.total = res.data.total;
-    },
+                // })
+                console.log(this.leaseAuditList)
+                this.total = res.data.total
+            },
 
-    // 获取 来往单位 列表数据
-    async GetUnitData(){
-      const params = {
-        id:this.queryParams.proId
-      }
-      const res = await getUnitData(params)
-      this.unitList = res.data
-    },
-    // 获取 工程名称 列表数据
-    async GetProData(){
-      const params = {
-        id:this.queryParams.unitId
-      }
-      const res = await getProData(params)
-      this.proList = res.data
-    },
+            // 获取 来往单位 列表数据
+            async GetUnitData() {
+                const params = {
+                    id: this.queryParams.proId,
+                }
+                const res = await getUnitData(params)
+                this.unitList = res.data
+            },
+            // 获取 工程名称 列表数据
+            async GetProData() {
+                const params = {
+                    id: this.queryParams.unitId,
+                }
+                const res = await getProData(params)
+                this.proList = res.data
+            },
 
+            // 取消按钮
+            cancel() {
+                this.open = false
+                this.reset()
+            },
+            // 表单重置
+            reset() {
+                this.form = {
+                    dictId: undefined,
+                    dictName: undefined,
+                    dictType: undefined,
+                    status: '0',
+                    remark: undefined,
+                }
+                this.resetForm('form')
+            },
+            /** 搜索按钮操作 */
+            handleQuery() {
+                this.queryParams.pageNum = 1
+                this.getList()
+            },
+            /** 重置按钮操作 */
+            resetQuery() {
+                this.queryParams.time = []
+                this.resetForm('queryForm')
+                this.handleQuery()
+            },
+            handleNotice() {
+                this.noticeOpen = true
+            },
+            /** 新增按钮操作 */
+            handleAdd() {
+                // this.$tab.closeOpenPage("/claimAndRefund/receive/receiveManageAdd");
+                // this.reset();
+                // this.open = true;
+                // this.title = "添加字典类型";
+            },
+            handleExamine(row, type) {
+                this.$tab.closeOpenPage({
+                    path: '/claimAndRefund/receive/receiveExamine',
+                    query: {
+                        taskId: row.taskId,
+                    },
+                })
+            },
+            handleView(row) {
+                this.$tab.closeOpenPage({
+                    path: '/claimAndRefund/receive/receiveExamine?isView=true',
+                    query: {
+                        taskId: row.taskId,
+                    },
+                })
+            },
+            //打开领料单
+            async openLld(row) {
+                this.open = true
 
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        dictId: undefined,
-        dictName: undefined,
-        dictType: undefined,
-        status: "0",
-        remark: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    handleNotice(){
-      this.noticeOpen = true;
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      // this.$tab.closeOpenPage("/claimAndRefund/receive/receiveManageAdd");
-      // this.reset();
-      // this.open = true;
-      // this.title = "添加字典类型";
-    },
-    handleExamine(row,type) {
-      this.$tab.closeOpenPage({
-        path:"/claimAndRefund/receive/receiveExamine",
-        query: {
-          taskId:row.taskId
-        }
-      });
-    },
-    handleView(row) {
-      this.$tab.closeOpenPage({
-        path:"/claimAndRefund/receive/receiveExamine?isView=true",
-        query: {
-          taskId:row.taskId
-        }
-      });
-    },
-    //打开领料单
-    async openLld(row){
-      this.open = true
+                const res = await getLeaseListAll({ taskId: row.taskId })
 
-      const res = await getLeaseListAll({taskId:row.taskId})
+                this.leaseApplyDetails = res.rows[0].leaseApplyDetails
+                this.leaseApplyData = res.rows[0]
 
-      this.leaseApplyDetails = res.rows[0].leaseApplyDetails
-      this.leaseApplyData = res.rows[0]
+                console.log(
+                    'this.leaseApplyData ============',
+                    this.leaseApplyData,
+                )
+            },
+            // 领料单 打印
+            print() {
+                this.$refs.remarksPrintRef.print()
+            },
 
-      console.log('this.leaseApplyData ============',this.leaseApplyData)
-    },
-    // 领料单 打印
-    print(){
-      this.$refs.remarksPrintRef.print();
-    },
-
-
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.dictId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const dictId = row.dictId || this.ids
-      getType(dictId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "验收";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.dictId != undefined) {
-            updateType(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addType(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const dictIds = row.dictId || this.ids;
-      this.$modal.confirm('是否确认删除该数据项？').then(function() {
-        return delType(dictIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('base/tm_task/applyExport', {
-        ...this.queryParams
-      }, `领料审批单_${new Date().getTime()}.xlsx`)
-    },
-    /** 刷新缓存按钮操作 */
-    handleRefreshCache() {
-      refreshCache().then(() => {
-        this.$modal.msgSuccess("刷新成功");
-        this.$store.dispatch('dict/cleanDict');
-      });
+            // 多选框选中数据
+            handleSelectionChange(selection) {
+                this.ids = selection.map((item) => item.dictId)
+                this.single = selection.length != 1
+                this.multiple = !selection.length
+            },
+            /** 修改按钮操作 */
+            handleUpdate(row) {
+                this.reset()
+                const dictId = row.dictId || this.ids
+                getType(dictId).then((response) => {
+                    this.form = response.data
+                    this.open = true
+                    this.title = '验收'
+                })
+            },
+            /** 提交按钮 */
+            submitForm: function () {
+                this.$refs['form'].validate((valid) => {
+                    if (valid) {
+                        if (this.form.dictId != undefined) {
+                            updateType(this.form).then((response) => {
+                                this.$modal.msgSuccess('修改成功')
+                                this.open = false
+                                this.getList()
+                            })
+                        } else {
+                            addType(this.form).then((response) => {
+                                this.$modal.msgSuccess('新增成功')
+                                this.open = false
+                                this.getList()
+                            })
+                        }
+                    }
+                })
+            },
+            /** 删除按钮操作 */
+            handleDelete(row) {
+                const dictIds = row.dictId || this.ids
+                this.$modal
+                    .confirm('是否确认删除该数据项？')
+                    .then(function () {
+                        return delType(dictIds)
+                    })
+                    .then(() => {
+                        this.getList()
+                        this.$modal.msgSuccess('删除成功')
+                    })
+                    .catch(() => {})
+            },
+            /** 导出按钮操作 */
+            handleExport() {
+                this.download(
+                    'base/tm_task/applyExport',
+                    {
+                        ...this.queryParams,
+                    },
+                    `领料审批单_${new Date().getTime()}.xlsx`,
+                )
+            },
+            /** 刷新缓存按钮操作 */
+            handleRefreshCache() {
+                refreshCache().then(() => {
+                    this.$modal.msgSuccess('刷新成功')
+                    this.$store.dispatch('dict/cleanDict')
+                })
+            },
+        },
     }
-  }
-};
 </script>
 
 <style lang="scss" scoped>
+    .print {
+        .title {
+            text-align: center;
+            font-weight: 600;
+            font-size: 16px;
+        }
+        .info {
+            margin-top: 10px;
+            display: flex;
+            flex-wrap: wrap;
 
-  .print{
-    .title{
-      text-align: center;
-      font-weight: 600;
-      font-size: 16px;
-    }
-    .info{
-      margin-top: 10px;
-      display: flex;
-      flex-wrap: wrap;
+            .item {
+                width: 50%;
+                flex-shrink: 0;
+                margin-bottom: 5px;
+                font-size: 14px;
+            }
+        }
 
-      .item{
-        width: 50%;
-        flex-shrink: 0;
-        margin-bottom: 5px;
-        font-size: 14px;
-      }
+        .fillIn {
+            margin-top: 15px;
+            display: flex;
+            justify-content: space-between;
+        }
     }
-
-    .fillIn{
-      margin-top: 15px;
-       display: flex;
-      justify-content: space-between;
+    ::v-deep.el-table .fixed-width .el-button--mini {
+        width: 60px !important;
+        margin-bottom: 10px;
     }
-  }
-  ::v-deep.el-table .fixed-width .el-button--mini {
-    width: 60px !important;
-    margin-bottom: 10px;
-  }
 </style>
diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
index 656a226a..be2838b2 100644
--- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
@@ -1,55 +1,89 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="申请日期" prop="time">
-        <el-date-picker
-          v-model="queryParams.time"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="往来单位" prop="unitId">
-        <el-select  v-model="queryParams.unitId" filterable clearable @change="GetProData" style="width: 240px" placeholder="请选择">
-          <el-option
-            v-for="item in unitList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="工程名称" prop="proId">
-        <el-select  v-model="queryParams.proId" filterable clearable @change="GetUnitData" style="width: 240px" placeholder="请选择">
-          <el-option
-            v-for="item in proList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="关键字" prop="keyword">
-        <el-input
-          v-model="queryParams.keyword"
-          placeholder="请输入关键字"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+    <div class="app-container">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="80px"
+        >
+            <el-form-item label="申请日期" prop="time">
+                <el-date-picker
+                    v-model="queryParams.time"
+                    type="daterange"
+                    value-format="yyyy-MM-dd"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                >
+                </el-date-picker>
+            </el-form-item>
+            <el-form-item label="往来单位" prop="unitId">
+                <el-select
+                    v-model="queryParams.unitId"
+                    filterable
+                    clearable
+                    @change="GetProData"
+                    style="width: 240px"
+                    placeholder="请选择"
+                >
+                    <el-option
+                        v-for="item in unitList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    >
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="工程名称" prop="proId">
+                <el-select
+                    v-model="queryParams.proId"
+                    filterable
+                    clearable
+                    @change="GetUnitData"
+                    style="width: 240px"
+                    placeholder="请选择"
+                >
+                    <el-option
+                        v-for="item in proList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    >
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="关键字" prop="keyword">
+                <el-input
+                    v-model="queryParams.keyword"
+                    placeholder="请输入关键字"
+                    clearable
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
 
+            <el-form-item>
+                <el-button
+                    type="primary"
+                    icon="el-icon-search"
+                    size="mini"
+                    @click="handleQuery"
+                    >查询</el-button
+                >
+                <el-button
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="resetQuery"
+                    >重置</el-button
+                >
+            </el-form-item>
+        </el-form>
 
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
+        <el-row :gutter="10" class="mb8">
+            <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -58,461 +92,647 @@
           @click="handleAdd"
         >新建</el-button>
       </el-col> -->
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
-      </el-col>
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="danger"-->
-      <!--          plain-->
-      <!--          icon="el-icon-refresh"-->
-      <!--          size="mini"-->
-      <!--          @click="handleRefreshCache"-->
-      <!--          v-hasPermi="['store:labelType:remove']"-->
-      <!--        >刷新缓存</el-button>-->
-      <!--      </el-col>-->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+            <el-col :span="1.5">
+                <el-button
+                    type="warning"
+                    plain
+                    icon="el-icon-download"
+                    size="mini"
+                    @click="handleExport"
+                    >导出</el-button
+                >
+            </el-col>
+            <!--      <el-col :span="1.5">-->
+            <!--        <el-button-->
+            <!--          type="danger"-->
+            <!--          plain-->
+            <!--          icon="el-icon-refresh"-->
+            <!--          size="mini"-->
+            <!--          @click="handleRefreshCache"-->
+            <!--          v-hasPermi="['store:labelType:remove']"-->
+            <!--        >刷新缓存</el-button>-->
+            <!--      </el-col>-->
+            <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+            ></right-toolbar>
+        </el-row>
 
-    <el-table v-loading="loading" :data="leaseAuditList" @selection-change="handleSelectionChange">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="序号" align="center" type="index" />
-      <el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" />
-      <el-table-column label="领料类型" align="center" prop="leaseType" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span v-if="scope.row.leaseType==0">工程租赁</span>
-          <span v-if="scope.row.leaseType==1">长期领用</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="领料单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
-      <el-table-column label="领料工程" align="center" prop="proName" :show-overflow-tooltip="true" />
-      <el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true" />
-      <el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true" />
-      <el-table-column label="联系电话" align="center" prop="leasePhone" :show-overflow-tooltip="true" />
-      <el-table-column label="申请人" align="center" prop="applyFor" :show-overflow-tooltip="true" />
-      <el-table-column label="预计领料时间" align="center" prop="estimateLeaseTime" :show-overflow-tooltip="true" />
-      <el-table-column label="申请时间" align="center" prop="createTimes" :show-overflow-tooltip="true" />
-      <el-table-column label="任务状态" align="center" prop="taskName" :show-overflow-tooltip="true" />
-<!--      <el-table-column label="审批结果 " align="center" prop="dictName" :show-overflow-tooltip="true" />-->
-      <el-table-column label="备注" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span>{{ scope.row.leaseApplyInfoList[0].remark }}</span>
-
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="left" width="250" class-name="small-padding fixed-width" fixed="right">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            @click="handleView(scope.row)"
-          >查看</el-button>
-          <el-button
-            size="mini"
-            type="primary"
-            @click="handleExamine(scope.row)"
-            v-hasPermi="['receive:examine:fgs']"
-            v-if="Number(scope.row.examineStatusId)==31||Number(scope.row.examineStatusId)==117"
-          >审批</el-button>
-          <el-button
-            size="mini"
-            type="primary"
-            @click="handleExamine(scope.row)"
-            v-hasPermi="['receive:examine:nbs']"
-            v-if="Number(scope.row.examineStatusId)==32"
-          >审批</el-button>
-         
-          <el-button
-            size="mini"
-            type="info" 
-            @click="openLld(scope.row)"
-          >领料单</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 领料单弹窗 -->
-    <el-dialog  :visible.sync="open" width="800px" append-to-body>
-      <div style="height: 500px;overflow-y: scroll;padding: 0 20px;">
-      <vue-easy-print tableShow ref="remarksPrintRef" class="print">
-        <div class="title" style="text-align: center;font-weight: 600;font-size: 16px;">
-          领料单
-        </div>
-        <div class="info" style="margin-top: 10px;display: flex;flex-wrap: wrap;">
-          <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
-            <span>领料单位：</span>{{ leaseApplyData.unitName }}
-          </div>
-          <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
-            <span>工程名称：</span>{{ leaseApplyData.proName }}
-          </div>
-          <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
-            <span>时间：</span>{{ leaseApplyData.updateTimes }}
-          </div>
-          <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
-            <span>编号：</span>{{ leaseApplyData.code }}
-          </div>
-        </div>
-        <el-table :data="leaseApplyDetails" class="table" border style="margin-top: 20px;padding: 1px">
-          <!--          <el-table-column type="selection" width="55" align="center" />-->
-          <el-table-column label="序号" align="center" type="index" />
-          <el-table-column label="类型名称" align="center" prop="typeName"  />
-          <el-table-column label="规格型号" align="center" prop="typeModelName"  />
-          <el-table-column label="计量单位" align="center" prop="unitName" />
-          <el-table-column label="预领数量" align="center" prop="preNum" />
-          <el-table-column label="备注" align="center" prop="remark" />
-          <el-table-column label="出库方式" align="center" prop="manageTypeName"  />
+        <el-table
+            v-loading="loading"
+            :data="leaseAuditList"
+            @selection-change="handleSelectionChange"
+        >
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column label="序号" align="center" type="index" />
+            <el-table-column
+                label="领料单号"
+                align="center"
+                prop="code"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="领料类型"
+                align="center"
+                prop="leaseType"
+                :show-overflow-tooltip="true"
+            >
+                <template slot-scope="scope">
+                    <span v-if="scope.row.leaseType == 0">工程租赁</span>
+                    <span v-if="scope.row.leaseType == 1">长期领用</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="领料单位"
+                align="center"
+                prop="unitName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="领料工程"
+                align="center"
+                prop="proName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="协议号"
+                align="center"
+                prop="agreementCode"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="领料人"
+                align="center"
+                prop="leasePerson"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="联系电话"
+                align="center"
+                prop="leasePhone"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="申请人"
+                align="center"
+                prop="applyFor"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="预计领料时间"
+                align="center"
+                prop="estimateLeaseTime"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="申请时间"
+                align="center"
+                prop="createTimes"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="任务状态"
+                align="center"
+                prop="taskName"
+                :show-overflow-tooltip="true"
+            />
+            <!--      <el-table-column label="审批结果 " align="center" prop="dictName" :show-overflow-tooltip="true" />-->
+            <el-table-column
+                label="备注"
+                align="center"
+                :show-overflow-tooltip="true"
+            >
+                <template slot-scope="scope">
+                    <span>{{ scope.row.leaseApplyInfoList[0].remark }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="操作"
+                align="left"
+                width="250"
+                class-name="small-padding fixed-width"
+                fixed="right"
+            >
+                <template slot-scope="scope">
+                    <el-button size="mini" @click="handleView(scope.row)"
+                        >查看</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        @click="handleExamine(scope.row)"
+                        v-hasPermi="['receive:examine:fgs']"
+                        v-if="
+                            Number(scope.row.examineStatusId) == 31 ||
+                            Number(scope.row.examineStatusId) == 117
+                        "
+                        >审批</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        @click="handleExamine(scope.row)"
+                        v-hasPermi="['receive:examine:nbs']"
+                        v-if="Number(scope.row.examineStatusId) == 32"
+                        >审批</el-button
+                    >
 
+                    <el-button
+                        size="mini"
+                        type="info"
+                        @click="openLld(scope.row)"
+                        >领料单</el-button
+                    >
+                </template>
+            </el-table-column>
         </el-table>
 
-        <div class="fillIn" style="margin-top: 30px;display: flex;justify-content: space-between;">
-          <div class="item" style="width: 25%;">
-            <span>审核：</span>
-          </div>
-          <div class="item" style="width: 25%;">
-            <span>领料：</span>
-          </div>
-          <div class="item" style="width: 25%;">
-            <span>仓库：</span>
-          </div>
-          <div class="item" style="width: 25%;">
-            <span>操作人：</span>
-          </div>
-        </div>
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />
 
-      </vue-easy-print>
-      </div>
-      <div slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" @click="print">打 印</el-button>
-        <el-button @click="open = false">关 闭</el-button>
-      </div>
-    </el-dialog>
+        <!-- 领料单弹窗 -->
+        <el-dialog :visible.sync="open" width="800px" append-to-body>
+            <div style="height: 500px; overflow-y: scroll; padding: 0 20px">
+                <vue-easy-print tableShow ref="remarksPrintRef" class="print">
+                    <div
+                        class="title"
+                        style="
+                            text-align: center;
+                            font-weight: 600;
+                            font-size: 16px;
+                        "
+                    >
+                        领料单
+                    </div>
+                    <div
+                        class="info"
+                        style="margin-top: 10px; display: flex; flex-wrap: wrap"
+                    >
+                        <div
+                            class="item"
+                            style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+                        >
+                            <span>领料单位：</span>{{ leaseApplyData.unitName }}
+                        </div>
+                        <div
+                            class="item"
+                            style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+                        >
+                            <span>工程名称：</span>{{ leaseApplyData.proName }}
+                        </div>
+                        <div
+                            class="item"
+                            style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+                        >
+                            <span>时间：</span>{{ leaseApplyData.updateTimes }}
+                        </div>
+                        <div
+                            class="item"
+                            style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+                        >
+                            <span>编号：</span>{{ leaseApplyData.code }}
+                        </div>
+                    </div>
+                    <el-table
+                        :data="leaseApplyDetails"
+                        class="table"
+                        border
+                        style="margin-top: 20px; padding: 1px"
+                    >
+                        <!--          <el-table-column type="selection" width="55" align="center" />-->
+                        <el-table-column
+                            label="序号"
+                            align="center"
+                            type="index"
+                        />
+                        <el-table-column
+                            label="类型名称"
+                            align="center"
+                            prop="typeName"
+                        />
+                        <el-table-column
+                            label="规格型号"
+                            align="center"
+                            prop="typeModelName"
+                        />
+                        <el-table-column
+                            label="计量单位"
+                            align="center"
+                            prop="unitName"
+                        />
+                        <el-table-column
+                            label="预领数量"
+                            align="center"
+                            prop="preNum"
+                        />
+                        <el-table-column
+                            label="备注"
+                            align="center"
+                            prop="remark"
+                        />
+                        <el-table-column
+                            label="出库方式"
+                            align="center"
+                            prop="manageTypeName"
+                        />
+                    </el-table>
 
-
-
-
-  </div>
+                    <div
+                        class="fillIn"
+                        style="
+                            margin-top: 30px;
+                            display: flex;
+                            justify-content: space-between;
+                        "
+                    >
+                        <div class="item" style="width: 25%">
+                            <span>审核：</span>
+                        </div>
+                        <div class="item" style="width: 25%">
+                            <span>领料：</span>
+                        </div>
+                        <div class="item" style="width: 25%">
+                            <span>仓库：</span>
+                        </div>
+                        <div class="item" style="width: 25%">
+                            <span>操作人：</span>
+                        </div>
+                    </div>
+                </vue-easy-print>
+            </div>
+            <div slot="footer" class="dialog-footer" style="text-align: center">
+                <el-button type="primary" @click="print">打 印</el-button>
+                <el-button @click="open = false">关 闭</el-button>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
-import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-import { getLeaseManageListAllCq, getUnitData, getProData, getLeaseListAllCq } from '@/api/claimAndRefund/receive'
-import { getInfo } from '@/api/login'
-import vueEasyPrint from 'vue-easy-print';
-export default {
-  // name: "ReceiveManage",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 字典表格数据
-      typeList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 日期范围
-      dateRange: [],
-      // 查询参数
-      queryParams: {
-        time:[],
-        unitId:null,
-        proId:null,
-        keyword:'',
-        types:2,
+    import {
+        listType,
+        getType,
+        delType,
+        addType,
+        updateType,
+        refreshCache,
+    } from '@/api/system/dict/type'
+    import {
+        getLeaseManageListAllCq,
+        getUnitData,
+        getProData,
+        getLeaseListAllCq,
+    } from '@/api/claimAndRefund/receive'
+    import { getInfo } from '@/api/login'
+    import vueEasyPrint from 'vue-easy-print'
+    export default {
+        // name: "ReceiveManage",
+        data() {
+            return {
+                // 遮罩层
+                loading: true,
+                // 选中数组
+                ids: [],
+                // 非单个禁用
+                single: true,
+                // 非多个禁用
+                multiple: true,
+                // 显示搜索条件
+                showSearch: true,
+                // 总条数
+                total: 0,
+                // 字典表格数据
+                typeList: [],
+                // 弹出层标题
+                title: '',
+                // 是否显示弹出层
+                open: false,
+                // 日期范围
+                dateRange: [],
+                // 查询参数
+                queryParams: {
+                    time: [],
+                    unitId: null,
+                    proId: null,
+                    keyword: '',
+                    types: 2,
 
-        pageNum: 1,
-        pageSize: 10,
-        dictName: undefined,
-        dictType: undefined,
-        status: undefined
-      },
-      user:{},
-      unitList:[],
-      proList: [],
-      leaseAuditList:[],
-      showJJExamineBtn:false, //内部审批-机具分公司
-      showSBExamineBtn:false, //内部审批-调试分公司
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        dictName: [
-          { required: true, message: "字典名称不能为空", trigger: "blur" }
-        ],
-        dictType: [
-          { required: true, message: "字典类型不能为空", trigger: "blur" }
-        ]
-      },
-      peopleOpen:false,
-      noticeOpen:false,
-      nform:{
-        notice:''
-      },
-      nrules: {
-        notice: [
-          { required: true, message: "通知内容不能为空", trigger: "blur" }
-        ]
-      },
-      deptName: undefined,
+                    pageNum: 1,
+                    pageSize: 10,
+                    dictName: undefined,
+                    dictType: undefined,
+                    status: undefined,
+                },
+                user: {},
+                unitList: [],
+                proList: [],
+                leaseAuditList: [],
+                showJJExamineBtn: false, //内部审批-机具分公司
+                showSBExamineBtn: false, //内部审批-调试分公司
+                // 表单参数
+                form: {},
+                // 表单校验
+                rules: {
+                    dictName: [
+                        {
+                            required: true,
+                            message: '字典名称不能为空',
+                            trigger: 'blur',
+                        },
+                    ],
+                    dictType: [
+                        {
+                            required: true,
+                            message: '字典类型不能为空',
+                            trigger: 'blur',
+                        },
+                    ],
+                },
+                peopleOpen: false,
+                noticeOpen: false,
+                nform: {
+                    notice: '',
+                },
+                nrules: {
+                    notice: [
+                        {
+                            required: true,
+                            message: '通知内容不能为空',
+                            trigger: 'blur',
+                        },
+                    ],
+                },
+                deptName: undefined,
 
-      //领料单
-      leaseApplyDetails:[],
-      // 领料任务详情数据
-      leaseApplyData:{}
-    };
-  },
-  created() {
-    this.GetUserInfo()
-    // this.getList();
+                //领料单
+                leaseApplyDetails: [],
+                // 领料任务详情数据
+                leaseApplyData: {},
+            }
+        },
+        created() {
+            this.GetUserInfo()
+            // this.getList();
 
-    this.GetUnitData()
-    this.GetProData()
-  },
-  components:{vueEasyPrint},
-  methods: {
-    // 获取用户信息
-    async GetUserInfo(){
-      const res = await getInfo()
-      this.user = res.user
-      // console.log(this.user)
-      this.getList();
-    },
-    /** 查询列表 */
-    async getList() {
-      this.loading = true;
-      const params = {
-        unitId:this.queryParams.unitId,
-        projectId:this.queryParams.proId,
-        keyWord:this.queryParams.keyword,
-        startTime:this.queryParams.time && this.queryParams.time[0],
-        endTime:this.queryParams.time && this.queryParams.time[1],
-        types:this.queryParams.types,
-        souceBy:0,
-        pageSize: this.queryParams.pageSize,
-        pageNum: this.queryParams.pageNum
-      }
+            this.GetUnitData()
+            this.GetProData()
+        },
+        components: { vueEasyPrint },
+        methods: {
+            // 获取用户信息
+            async GetUserInfo() {
+                const res = await getInfo()
+                this.user = res.user
+                // console.log(this.user)
+                this.getList()
+            },
+            /** 查询列表 */
+            async getList() {
+                this.loading = true
+                const params = {
+                    unitId: this.queryParams.unitId,
+                    projectId: this.queryParams.proId,
+                    keyWord: this.queryParams.keyword,
+                    startTime:
+                        this.queryParams.time && this.queryParams.time[0],
+                    endTime: this.queryParams.time && this.queryParams.time[1],
+                    types: this.queryParams.types,
+                    souceBy: 0,
+                    pageSize: this.queryParams.pageSize,
+                    pageNum: this.queryParams.pageNum,
+                }
 
-      const res = await getLeaseManageListAllCq(params)
-      this.loading = false;
-      console.log('getList ============',res)
-      this.leaseAuditList = res.data.rows;
-      // this.leaseAuditList.forEach((item,index)=>{
-      //   console.log(item.leaseApplyInfoList)
-      //   if(item.leaseApplyInfoList.length>0){
-      //       // item.showExamineBtn = true;
-      //       if(item.leaseApplyInfoList[0].status=="0"||item.leaseApplyInfoList[0].status=="5"||item.leaseApplyInfoList[0].status=="7"||item.leaseApplyInfoList[0].status=="8"){
-      //         item.showExamineBtn = true;
-      //       }
-      //   }
+                const res = await getLeaseManageListAllCq(params)
+                this.loading = false
+                console.log('getList ============', res)
+                this.leaseAuditList = res.data.rows
+                // this.leaseAuditList.forEach((item,index)=>{
+                //   console.log(item.leaseApplyInfoList)
+                //   if(item.leaseApplyInfoList.length>0){
+                //       // item.showExamineBtn = true;
+                //       if(item.leaseApplyInfoList[0].status=="0"||item.leaseApplyInfoList[0].status=="5"||item.leaseApplyInfoList[0].status=="7"||item.leaseApplyInfoList[0].status=="8"){
+                //         item.showExamineBtn = true;
+                //       }
+                //   }
 
-      // })
-      console.log(this.leaseAuditList)
-      this.total = res.data.total;
-    },
+                // })
+                console.log(this.leaseAuditList)
+                this.total = res.data.total
+            },
 
-    // 获取 来往单位 列表数据
-    async GetUnitData(){
-      const params = {
-        id:this.queryParams.proId
-      }
-      const res = await getUnitData(params)
-      this.unitList = res.data
-    },
-    // 获取 工程名称 列表数据
-    async GetProData(){
-      const params = {
-        id:this.queryParams.unitId
-      }
-      const res = await getProData(params)
-      this.proList = res.data
-    },
+            // 获取 来往单位 列表数据
+            async GetUnitData() {
+                const params = {
+                    id: this.queryParams.proId,
+                }
+                const res = await getUnitData(params)
+                this.unitList = res.data
+            },
+            // 获取 工程名称 列表数据
+            async GetProData() {
+                const params = {
+                    id: this.queryParams.unitId,
+                }
+                const res = await getProData(params)
+                this.proList = res.data
+            },
 
+            // 取消按钮
+            cancel() {
+                this.open = false
+                this.reset()
+            },
+            // 表单重置
+            reset() {
+                this.form = {
+                    dictId: undefined,
+                    dictName: undefined,
+                    dictType: undefined,
+                    status: '0',
+                    remark: undefined,
+                }
+                this.resetForm('form')
+            },
+            /** 搜索按钮操作 */
+            handleQuery() {
+                this.queryParams.pageNum = 1
+                this.getList()
+            },
+            /** 重置按钮操作 */
+            resetQuery() {
+                this.queryParams.time = []
+                this.resetForm('queryForm')
+                this.handleQuery()
+            },
+            handleNotice() {
+                this.noticeOpen = true
+            },
+            /** 新增按钮操作 */
+            handleAdd() {
+                // this.$tab.closeOpenPage("/claimAndRefund/receive/receiveManageAdd");
+                // this.reset();
+                // this.open = true;
+                // this.title = "添加字典类型";
+            },
+            handleExamine(row, type) {
+                this.$tab.closeOpenPage({
+                    path: '/claimAndRefund/receiveByCq/receiveExamine',
+                    query: {
+                        taskId: row.taskId,
+                    },
+                })
+            },
+            handleView(row) {
+                this.$tab.closeOpenPage({
+                    path: '/claimAndRefund/receiveByCq/receiveExamine?isView=true',
+                    query: {
+                        taskId: row.taskId,
+                    },
+                })
+            },
+            //打开领料单
+            async openLld(row) {
+                this.open = true
 
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        dictId: undefined,
-        dictName: undefined,
-        dictType: undefined,
-        status: "0",
-        remark: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    handleNotice(){
-      this.noticeOpen = true;
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      // this.$tab.closeOpenPage("/claimAndRefund/receive/receiveManageAdd");
-      // this.reset();
-      // this.open = true;
-      // this.title = "添加字典类型";
-    },
-    handleExamine(row,type) {
-      this.$tab.closeOpenPage({
-        path:"/claimAndRefund/receiveByCq/receiveExamine",
-        query: {
-          taskId:row.taskId
-        }
-      });
-    },
-    handleView(row) {
-      this.$tab.closeOpenPage({
-        path:"/claimAndRefund/receiveByCq/receiveExamine?isView=true",
-        query: {
-          taskId:row.taskId
-        }
-      });
-    },
-    //打开领料单
-    async openLld(row){
-      this.open = true
+                const res = await getLeaseListAllCq({ taskId: row.taskId })
 
-      const res = await getLeaseListAllCq({taskId:row.taskId})
+                this.leaseApplyDetails = res.rows[0].leaseApplyDetails
+                this.leaseApplyData = res.rows[0]
 
-      this.leaseApplyDetails = res.rows[0].leaseApplyDetails
-      this.leaseApplyData = res.rows[0]
+                console.log(
+                    'this.leaseApplyData ============',
+                    this.leaseApplyData,
+                )
+            },
+            // 领料单 打印
+            print() {
+                this.$refs.remarksPrintRef.print()
+            },
 
-      console.log('this.leaseApplyData ============',this.leaseApplyData)
-    },
-    // 领料单 打印
-    print(){
-      this.$refs.remarksPrintRef.print();
-    },
-
-
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.dictId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const dictId = row.dictId || this.ids
-      getType(dictId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "验收";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.dictId != undefined) {
-            updateType(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addType(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const dictIds = row.dictId || this.ids;
-      this.$modal.confirm('是否确认删除该数据项？').then(function() {
-        return delType(dictIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('base/tm_task/applyExport', {
-        ...this.queryParams
-      }, `领料审批单_${new Date().getTime()}.xlsx`)
-    },
-    /** 刷新缓存按钮操作 */
-    handleRefreshCache() {
-      refreshCache().then(() => {
-        this.$modal.msgSuccess("刷新成功");
-        this.$store.dispatch('dict/cleanDict');
-      });
+            // 多选框选中数据
+            handleSelectionChange(selection) {
+                this.ids = selection.map((item) => item.dictId)
+                this.single = selection.length != 1
+                this.multiple = !selection.length
+            },
+            /** 修改按钮操作 */
+            handleUpdate(row) {
+                this.reset()
+                const dictId = row.dictId || this.ids
+                getType(dictId).then((response) => {
+                    this.form = response.data
+                    this.open = true
+                    this.title = '验收'
+                })
+            },
+            /** 提交按钮 */
+            submitForm: function () {
+                this.$refs['form'].validate((valid) => {
+                    if (valid) {
+                        if (this.form.dictId != undefined) {
+                            updateType(this.form).then((response) => {
+                                this.$modal.msgSuccess('修改成功')
+                                this.open = false
+                                this.getList()
+                            })
+                        } else {
+                            addType(this.form).then((response) => {
+                                this.$modal.msgSuccess('新增成功')
+                                this.open = false
+                                this.getList()
+                            })
+                        }
+                    }
+                })
+            },
+            /** 删除按钮操作 */
+            handleDelete(row) {
+                const dictIds = row.dictId || this.ids
+                this.$modal
+                    .confirm('是否确认删除该数据项？')
+                    .then(function () {
+                        return delType(dictIds)
+                    })
+                    .then(() => {
+                        this.getList()
+                        this.$modal.msgSuccess('删除成功')
+                    })
+                    .catch(() => {})
+            },
+            /** 导出按钮操作 */
+            handleExport() {
+                this.download(
+                    'base/tm_task/applyExport',
+                    {
+                        ...this.queryParams,
+                    },
+                    `领料审批单_${new Date().getTime()}.xlsx`,
+                )
+            },
+            /** 刷新缓存按钮操作 */
+            handleRefreshCache() {
+                refreshCache().then(() => {
+                    this.$modal.msgSuccess('刷新成功')
+                    this.$store.dispatch('dict/cleanDict')
+                })
+            },
+        },
     }
-  }
-};
 </script>
 
 <style lang="scss" scoped>
+    .print {
+        .title {
+            text-align: center;
+            font-weight: 600;
+            font-size: 16px;
+        }
+        .info {
+            margin-top: 10px;
+            display: flex;
+            flex-wrap: wrap;
 
-  .print{
-    .title{
-      text-align: center;
-      font-weight: 600;
-      font-size: 16px;
-    }
-    .info{
-      margin-top: 10px;
-      display: flex;
-      flex-wrap: wrap;
+            .item {
+                width: 50%;
+                flex-shrink: 0;
+                margin-bottom: 5px;
+                font-size: 14px;
+            }
+        }
 
-      .item{
-        width: 50%;
-        flex-shrink: 0;
-        margin-bottom: 5px;
-        font-size: 14px;
-      }
+        .fillIn {
+            margin-top: 15px;
+            display: flex;
+            justify-content: space-between;
+        }
     }
-
-    .fillIn{
-      margin-top: 15px;
-       display: flex;
-      justify-content: space-between;
+    ::v-deep.el-table .fixed-width .el-button--mini {
+        width: 60px !important;
+        margin-bottom: 10px;
     }
-  }
-  ::v-deep.el-table .fixed-width .el-button--mini {
-    width: 60px !important;
-    margin-bottom: 10px;
-  }
 </style>
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
index 64cfa38c..2bb6da18 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
@@ -726,7 +726,7 @@
             },
             /** 重置按钮操作 */
             resetQuery() {
-                this.dateRange = []
+                this.queryParams.time = []
                 // this.resetForm("queryForm");
                 this.$refs.queryForm.resetFields()
                 this.$refs.mychildSon.inputValue = ''
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue
index 514ab098..5413528e 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue
@@ -720,7 +720,7 @@
             },
             /** 重置按钮操作 */
             resetQuery() {
-                this.dateRange = []
+                this.queryParams.time = []
                 // this.resetForm("queryForm");
                 this.$refs.queryForm.resetFields()
                 this.initSelectData()
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
index d8df4f8a..d8bee5cc 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
@@ -577,7 +577,7 @@
             },
             /** 重置按钮操作 */
             resetQuery() {
-                this.dateRange = []
+                this.queryParams.time = []
                 this.resetForm('queryForm')
                 this.handleQuery()
             },
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue
index 1020dece..9377b4ce 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue
@@ -1,678 +1,913 @@
 <template>
-  <div class="app-container" id="newDevicesWarehousing">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="日期">
-        <el-date-picker
-          v-model="queryParams.time"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期">
-        </el-date-picker>
-      </el-form-item>
-
-      <el-form-item label="设备类型" prop="typeId">
-        <el-select
-          v-model="queryParams.typeId"
-          placeholder="请选择设备类型"
-          clearable filterable
-          style="width: 240px"
+    <div class="app-container" id="newDevicesWarehousing">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="100px"
         >
-          <el-option
-            v-for="typeItem in typeList"
-            :key="typeItem.typeId"
-            :label="typeItem.typeName"
-            :value="typeItem.typeId"
-          />
-        </el-select>
-      </el-form-item>
+            <el-form-item label="日期">
+                <el-date-picker
+                    v-model="queryParams.time"
+                    type="daterange"
+                    value-format="yyyy-MM-dd"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                >
+                </el-date-picker>
+            </el-form-item>
 
-      <el-form-item label="关键字" prop="keyWord">
-        <el-input
-          v-model="queryParams.keyWord"
-          placeholder="请输入关键字"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
+            <el-form-item label="设备类型" prop="typeId">
+                <el-select
+                    v-model="queryParams.typeId"
+                    placeholder="请选择设备类型"
+                    clearable
+                    filterable
+                    style="width: 240px"
+                >
+                    <el-option
+                        v-for="typeItem in typeList"
+                        :key="typeItem.typeId"
+                        :label="typeItem.typeName"
+                        :value="typeItem.typeId"
+                    />
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="关键字" prop="keyWord">
+                <el-input
+                    v-model="queryParams.keyWord"
+                    placeholder="请输入关键字"
+                    clearable
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+
+            <el-form-item>
+                <el-button
+                    type="primary"
+                    icon="el-icon-search"
+                    size="mini"
+                    @click="handleQuery"
+                    >查询</el-button
+                >
+                <el-button
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="resetQuery"
+                    >重置</el-button
+                >
+            </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button
+                    type="warning"
+                    plain
+                    icon="el-icon-download"
+                    size="mini"
+                    @click="handleExport"
+                    v-hasPermi="['system:dict:export']"
+                    >导出</el-button
+                >
+            </el-col>
+            <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+            ></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="tableList">
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column
+                label="序号"
+                align="center"
+                type="index"
+                width="55px"
+            />
+            <el-table-column
+                label="采购单号"
+                align="center"
+                prop="code"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="采购日期"
+                align="center"
+                prop="purchaseTime"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="到货日期"
+                align="center"
+                prop="arrivalTime"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="采购机具设备"
+                align="center"
+                prop="purchasingTypeName"
+                :show-overflow-tooltip="true"
+                width="250"
+            />
+            <el-table-column
+                label="采购员"
+                align="center"
+                prop="purchaserName"
+                :show-overflow-tooltip="true"
+                width="100"
+            />
+            <el-table-column
+                label="提交时间"
+                align="center"
+                prop="createTime"
+                :show-overflow-tooltip="true"
+            />
+
+            <el-table-column label="采购状态" align="center" prop="taskStatus">
+                <template slot-scope="scope">
+                    <span v-if="scope.row.taskStatus == '26'">已验收合格</span>
+                    <span v-if="scope.row.taskStatus == '105'">入库待审核</span>
+                    <span v-if="scope.row.taskStatus == '106'">已驳回</span>
+                    <span v-if="scope.row.taskStatus == '28'">已入库</span>
+                    <span v-if="scope.row.taskStatus == '107'">入库驳回</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="备注"
+                align="center"
+                prop="remark"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="操作"
+                align="center"
+                class-name="small-padding fixed-width"
+                width="200"
+            >
+                <template slot-scope="scope">
+                    <el-button
+                        size="mini"
+                        icon="el-icon-zoom-in"
+                        @click="handleView(scope.row)"
+                        >查看</el-button
+                    >
+
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        icon="el-icon-edit"
+                        v-if="scope.row.taskStatus == '26'"
+                        @click="handleUpdate(scope.row)"
+                        >审核</el-button
+                    >
+                    <!--          <el-button-->
+                    <!--            size="mini"-->
+                    <!--            type="info"-->
+                    <!--            icon="el-icon-edit"-->
+                    <!--            v-if="scope.row.taskStatus=='28'"-->
+                    <!--            @click="handlePrint(scope.row)"-->
+                    <!--          >入库单</el-button>-->
+                    <!--          <el-button-->
+                    <!--            size="mini"-->
+                    <!--            type="text"-->
+                    <!--            icon="el-icon-delete"-->
+                    <!--            @click="handleDelete(scope.row)"-->
+                    <!--            v-hasPermi="['system:dict:remove']"-->
+                    <!--          >删除</el-button>-->
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
         />
-      </el-form-item>
 
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+        <!--审批对话框 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="open"
+            width="1000px"
+            append-to-body
+        >
+            <el-form
+                :model="query"
+                ref="query"
+                size="small"
+                :inline="true"
+                v-show="showSearch"
+                label-width="68px"
+            >
+                <el-form-item label="关键字" prop="dictName">
+                    <el-input
+                        v-model="query.dictName"
+                        placeholder="请输入关键字"
+                        clearable
+                        style="width: 240px"
+                        @keyup.enter.native="handleQuery"
+                    />
+                </el-form-item>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:dict:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+                <el-form-item>
+                    <el-button
+                        type="primary"
+                        icon="el-icon-search"
+                        size="mini"
+                        @click="handleDialogQuery"
+                        >查询</el-button
+                    >
+                    <!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> -->
+                </el-form-item>
+            </el-form>
+            <el-row :gutter="10" class="mb8" v-if="showHandle">
+                <el-col :span="1.5">
+                    <el-button
+                        type="primary"
+                        plain
+                        size="mini"
+                        :disabled="multiple"
+                        @click="passAll"
+                        >批量通过</el-button
+                    >
+                </el-col>
+                <el-col :span="1.5">
+                    <el-button
+                        type="danger"
+                        plain
+                        size="mini"
+                        @click="refusedAll"
+                        :disabled="multiple"
+                        >批量不通过</el-button
+                    >
+                </el-col>
+                <!--        <el-col :span="1.5">-->
+                <!--          <el-button-->
+                <!--            type="warning"-->
+                <!--            plain-->
+                <!--            icon="el-icon-download"-->
+                <!--            size="mini"-->
+                <!--            @click="handleExport"-->
+                <!--            v-hasPermi="['system:dict:export']"-->
+                <!--          >导出</el-button>-->
+                <!--        </el-col>-->
+            </el-row>
+            <el-table
+                v-loading="loading"
+                :data="detailTableList"
+                @selection-change="handleSelectionChange"
+                height="400"
+            >
+                <el-table-column
+                    type="selection"
+                    width="55"
+                    align="center"
+                    :selectable="selectable"
+                />
+                <el-table-column label="序号" align="center" type="index" />
+                <el-table-column
+                    label="机具类型"
+                    align="center"
+                    prop="typeName"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="规格型号"
+                    align="center"
+                    prop="specificationType"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="数量"
+                    align="center"
+                    prop="checkNum"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="编号"
+                    align="center"
+                    prop="maCode"
+                    :show-overflow-tooltip="true"
+                    width="200"
+                />
 
-    <el-table v-loading="loading" :data="tableList" >
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="序号" align="center" type="index" width="55px"/>
-      <el-table-column label="采购单号" align="center" prop="code" :show-overflow-tooltip="true" />
-      <el-table-column label="采购日期" align="center" prop="purchaseTime" :show-overflow-tooltip="true" />
-      <el-table-column label="到货日期" align="center" prop="arrivalTime" :show-overflow-tooltip="true" />
-      <el-table-column label="采购机具设备" align="center" prop="purchasingTypeName" :show-overflow-tooltip="true" width="250"/>
-      <el-table-column label="采购员" align="center" prop="purchaserName" :show-overflow-tooltip="true" width="100"/>
-      <el-table-column label="提交时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
+                <el-table-column
+                    label="不通过原因"
+                    align="center"
+                    prop="remark"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column label="状态" align="center" prop="status">
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.status == '0'">待审核</span>
+                        <span v-if="scope.row.status == '1'">已入库</span>
+                        <span v-if="scope.row.status == '2'">入库驳回</span>
+                        <span v-if="scope.row.status == '3'">入库待审核</span>
+                        <span v-if="scope.row.status == '4'">已驳回</span>
+                    </template>
+                </el-table-column>
 
-      <el-table-column label="采购状态" align="center" prop="taskStatus">
-        <template slot-scope="scope">
-          <span v-if="scope.row.taskStatus=='26'">已验收合格</span>
-          <span v-if="scope.row.taskStatus=='105'">入库待审核</span>
-          <span v-if="scope.row.taskStatus=='106'">已驳回</span>
-          <span v-if="scope.row.taskStatus=='28'">已入库</span>
-          <span v-if="scope.row.taskStatus=='107'">入库驳回</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            icon="el-icon-zoom-in"
-            @click="handleView(scope.row)"
-          >查看</el-button>
+                <el-table-column
+                    label="操作"
+                    align="center"
+                    class-name="small-padding fixed-width"
+                    v-if="showHandle"
+                    width="150"
+                >
+                    <template slot-scope="scope">
+                        <el-button
+                            size="mini"
+                            type="text"
+                            v-if="scope.row.status == '0'"
+                            @click="pass(scope.row)"
+                            >通过</el-button
+                        >
+                        <el-button
+                            size="mini"
+                            type="text"
+                            v-if="scope.row.status == '0'"
+                            @click="refused(scope.row)"
+                            >不通过</el-button
+                        >
+                        <!--          <el-button-->
+                        <!--            size="mini"-->
+                        <!--            type="text"-->
+                        <!--            icon="el-icon-delete"-->
+                        <!--            @click="handleDelete(scope.row)"-->
+                        <!--            v-hasPermi="['system:dict:remove']"-->
+                        <!--          >删除</el-button>-->
+                    </template>
+                </el-table-column>
+            </el-table>
 
-          <el-button
-            size="mini"
-            type="primary"
-            icon="el-icon-edit"
-            v-if="scope.row.taskStatus=='26'"
-            @click="handleUpdate(scope.row)"
-          >审核</el-button>
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="info"-->
-<!--            icon="el-icon-edit"-->
-<!--            v-if="scope.row.taskStatus=='28'"-->
-<!--            @click="handlePrint(scope.row)"-->
-<!--          >入库单</el-button>-->
-          <!--          <el-button-->
-          <!--            size="mini"-->
-          <!--            type="text"-->
-          <!--            icon="el-icon-delete"-->
-          <!--            @click="handleDelete(scope.row)"-->
-          <!--            v-hasPermi="['system:dict:remove']"-->
-          <!--          >删除</el-button>-->
-        </template>
-      </el-table-column>
-    </el-table>
+            <pagination
+                v-show="dialogTotal > 0"
+                :total="dialogTotal"
+                :page.sync="query.pageNum"
+                :limit.sync="query.pageSize"
+                @pagination="getDialogTable"
+            />
+        </el-dialog>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+        <!-- 入库单弹窗 -->
+        <el-dialog :visible.sync="openPrint" width="900px" append-to-body>
+            <div style="height: 600px; overflow-y: scroll">
+                <vue-easy-print tableShow ref="remarksPrintRef" class="print">
+                    <div
+                        class="title"
+                        style="
+                            text-align: center;
+                            font-weight: 600;
+                            font-size: 16px;
+                        "
+                    >
+                        入库单
+                    </div>
+                    <div
+                        class="info"
+                        style="margin-top: 10px; display: flex; flex-wrap: wrap"
+                    >
+                        <div
+                            class="item"
+                            style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+                        >
+                            <span>工程名称：</span>
+                        </div>
+                        <div
+                            class="item"
+                            style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+                        >
+                            <span>日期：</span>
+                        </div>
+                        <div
+                            class="item"
+                            style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+                        >
+                            <span>领料单号</span>
+                        </div>
+                        <div
+                            class="item"
+                            style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+                        >
+                            <span>车辆信息：</span>
+                        </div>
+                    </div>
+                    <el-table
+                        :data="printTableData"
+                        class="table"
+                        style="
+                            margin-top: 20px;
+                            padding-bottom: 1px;
+                            padding-right: 1px;
+                        "
+                        border
+                    >
+                        <!--          <el-table-column type="selection" width="55" align="center" />-->
+                        <el-table-column
+                            label="序号"
+                            align="center"
+                            type="index"
+                        />
+                        <el-table-column
+                            label="类型名称"
+                            align="center"
+                            prop="typeName"
+                        />
+                        <el-table-column
+                            label="规格型号"
+                            align="center"
+                            prop="specificationType"
+                        />
+                        <el-table-column
+                            label="计量单位"
+                            align="center"
+                            prop="unitName"
+                        />
+                        <el-table-column
+                            label="数量"
+                            align="center"
+                            prop="checkNum"
+                        />
+                        <el-table-column
+                            label="备注"
+                            align="center"
+                            prop="remark"
+                        />
+                        <!-- <el-table-column label="出库方式" align="center" prop="manageTypeName"  /> -->
+                    </el-table>
 
-    <!--审批对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
-      <el-form :model="query" ref="query" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="关键字" prop="dictName">
-          <el-input
-            v-model="query.dictName"
-            placeholder="请输入关键字"
-            clearable
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
+                    <div
+                        class="fillIn"
+                        style="
+                            margin-top: 20px;
+                            display: flex;
+                            justify-content: space-between;
+                        "
+                    >
+                        <div class="item" style="width: 25%">
+                            <span>审核：</span>
+                        </div>
 
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleDialogQuery">查询</el-button>
-          <!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> -->
-        </el-form-item>
-      </el-form>
-      <el-row :gutter="10" class="mb8" v-if="showHandle">
-        <el-col :span="1.5">
-          <el-button
-            type="primary"
-            plain
-            size="mini"
-            :disabled="multiple"
-            @click="passAll"
-          >批量通过</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="danger"
-            plain
-            size="mini"
-            @click="refusedAll"
-            :disabled="multiple"
-          >批量不通过</el-button>
-        </el-col>
-        <!--        <el-col :span="1.5">-->
-        <!--          <el-button-->
-        <!--            type="warning"-->
-        <!--            plain-->
-        <!--            icon="el-icon-download"-->
-        <!--            size="mini"-->
-        <!--            @click="handleExport"-->
-        <!--            v-hasPermi="['system:dict:export']"-->
-        <!--          >导出</el-button>-->
-        <!--        </el-col>-->
-      </el-row>
-      <el-table v-loading="loading" :data="detailTableList" @selection-change="handleSelectionChange" height="400">
-        <el-table-column type="selection" width="55" align="center"  :selectable="selectable"/>
-        <el-table-column label="序号" align="center" type="index" />
-        <el-table-column label="机具类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
-        <el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" />
-        <el-table-column label="数量" align="center" prop="checkNum" :show-overflow-tooltip="true" />
-        <el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" width="200"/>
-
-        <el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" />
-        <el-table-column label="状态" align="center" prop="status">
-          <template slot-scope="scope">
-            <span v-if="scope.row.status=='0'">待审核</span>
-            <span v-if="scope.row.status=='1'">已入库</span>
-            <span v-if="scope.row.status=='2'">入库驳回</span>
-            <span v-if="scope.row.status=='3'">入库待审核</span>
-            <span v-if="scope.row.status=='4'">已驳回</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="showHandle" width="150">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              v-if="scope.row.status=='0'"
-              @click="pass(scope.row)"
-            >通过</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              v-if="scope.row.status=='0'"
-              @click="refused(scope.row)"
-            >不通过</el-button>
-            <!--          <el-button-->
-            <!--            size="mini"-->
-            <!--            type="text"-->
-            <!--            icon="el-icon-delete"-->
-            <!--            @click="handleDelete(scope.row)"-->
-            <!--            v-hasPermi="['system:dict:remove']"-->
-            <!--          >删除</el-button>-->
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <pagination
-        v-show="dialogTotal>0"
-        :total="dialogTotal"
-        :page.sync="query.pageNum"
-        :limit.sync="query.pageSize"
-        @pagination="getDialogTable"
-      />
-
-
-
-
-    </el-dialog>
-
-    <!-- 入库单弹窗 -->
-    <el-dialog  :visible.sync="openPrint" width="900px" append-to-body>
-
-      <div style="height: 600px;overflow-y: scroll;">
-        <vue-easy-print tableShow ref="remarksPrintRef" class="print">
-
-          <div class="title" style="text-align: center;font-weight: 600;font-size: 16px;">
-            入库单
-          </div>
-          <div class="info" style="margin-top: 10px;display: flex;flex-wrap: wrap;">
-            <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
-              <span>工程名称：</span>
-            </div>
-            <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
-              <span>日期：</span>
-            </div>
-            <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
-              <span>领料单号</span>
-            </div>
-            <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
-              <span>车辆信息：</span>
-            </div>
-          </div>
-          <el-table :data="printTableData" class="table" style="margin-top: 20px;;padding-bottom: 1px;padding-right:1px;" border>
-            <!--          <el-table-column type="selection" width="55" align="center" />-->
-            <el-table-column label="序号" align="center" type="index" />
-            <el-table-column label="类型名称" align="center" prop="typeName"  />
-            <el-table-column label="规格型号" align="center" prop="specificationType"  />
-            <el-table-column label="计量单位" align="center" prop="unitName" />
-            <el-table-column label="数量" align="center" prop="checkNum" />
-            <el-table-column label="备注" align="center" prop="remark" />
-            <!-- <el-table-column label="出库方式" align="center" prop="manageTypeName"  /> -->
-
-          </el-table>
-
-          <div class="fillIn" style="margin-top: 20px;display: flex;justify-content: space-between;">
-            <div class="item" style="width: 25%;">
-              <span>审核：</span>
+                        <div class="item" style="width: 25%">
+                            <span>库管员：</span>
+                        </div>
+                        <div class="item" style="width: 25%">
+                            <span>经办人：</span>
+                        </div>
+                        <div class="item" style="width: 25%">
+                            <!-- <span>经办人：</span> -->
+                        </div>
+                    </div>
+                </vue-easy-print>
             </div>
 
-            <div class="item" style="width: 25%;">
-              <span>库管员：</span>
+            <div slot="footer" class="dialog-footer" style="text-align: center">
+                <el-button type="primary" @click="print">打 印</el-button>
+                <el-button @click="openPrint = false">关 闭</el-button>
             </div>
-            <div class="item" style="width: 25%;">
-              <span>经办人：</span>
-            </div>
-            <div class="item" style="width: 25%;">
-              <!-- <span>经办人：</span> -->
-            </div>
-          </div>
-
-        </vue-easy-print>
-      </div>
-
-
-
-
-
-      <div slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" @click="print">打 印</el-button>
-        <el-button @click="openPrint = false">关 闭</el-button>
-      </div>
-    </el-dialog>
-
-
-
-  </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
-import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-import {getRepairedDetailList, getTypeList, inputByType} from "@/api/store/warehousing";
-import { getPutInList,getPutinDetailsList ,changePutinStatus,warehousingEntry} from "@/api/store/newDevicesServiceCenterList";
-import vueEasyPrint from 'vue-easy-print';
-export default {
-  // name: "NewDevicesWarehousing",
-  dicts: ['sys_normal_disable'],
-  components:{vueEasyPrint},
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 总条数
-      dialogTotal: 0,
-      //搜索下拉数据
-      typeList: [],
-      modelList: [],
-      // 表格数据
-      tableList: [],
-      detailTableList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      openPrint: false,
-      printData:{},
-      printTableData:[],
-      showHandle: true,
-      // 日期范围
-      dateRange: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        dictName: undefined,
-        dictType: undefined,
-        status: undefined
-      },
-      query: {
-        pageNum: 1,
-        pageSize: 10,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        dictName: [
-          { required: true, message: "字典名称不能为空", trigger: "blur" }
-        ],
-        dictType: [
-          { required: true, message: "字典类型不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-    this.getTypeList();
-  },
-  methods: {
-    getTypeList() {
-      getTypeList({level:'3'}).then(response => {
-          this.typeList = response.data;
-        }
-      );
-      getTypeList({level:'4'}).then(response => {
-          this.modelList = response.data;
-        }
-      );
-    },
+    import {
+        listType,
+        getType,
+        delType,
+        addType,
+        updateType,
+        refreshCache,
+    } from '@/api/system/dict/type'
+    import {
+        getRepairedDetailList,
+        getTypeList,
+        inputByType,
+    } from '@/api/store/warehousing'
+    import {
+        getPutInList,
+        getPutinDetailsList,
+        changePutinStatus,
+        warehousingEntry,
+    } from '@/api/store/newDevicesServiceCenterList'
+    import vueEasyPrint from 'vue-easy-print'
+    export default {
+        // name: "NewDevicesWarehousing",
+        dicts: ['sys_normal_disable'],
+        components: { vueEasyPrint },
+        data() {
+            return {
+                // 遮罩层
+                loading: true,
+                // 选中数组
+                ids: [],
+                // 非单个禁用
+                single: true,
+                // 非多个禁用
+                multiple: true,
+                // 显示搜索条件
+                showSearch: true,
+                // 总条数
+                total: 0,
+                // 总条数
+                dialogTotal: 0,
+                //搜索下拉数据
+                typeList: [],
+                modelList: [],
+                // 表格数据
+                tableList: [],
+                detailTableList: [],
+                // 弹出层标题
+                title: '',
+                // 是否显示弹出层
+                open: false,
+                openPrint: false,
+                printData: {},
+                printTableData: [],
+                showHandle: true,
+                // 日期范围
+                dateRange: [],
+                // 查询参数
+                queryParams: {
+                    pageNum: 1,
+                    pageSize: 10,
+                    dictName: undefined,
+                    dictType: undefined,
+                    status: undefined,
+                },
+                query: {
+                    pageNum: 1,
+                    pageSize: 10,
+                },
+                // 表单参数
+                form: {},
+                // 表单校验
+                rules: {
+                    dictName: [
+                        {
+                            required: true,
+                            message: '字典名称不能为空',
+                            trigger: 'blur',
+                        },
+                    ],
+                    dictType: [
+                        {
+                            required: true,
+                            message: '字典类型不能为空',
+                            trigger: 'blur',
+                        },
+                    ],
+                },
+            }
+        },
+        created() {
+            this.getList()
+            this.getTypeList()
+        },
+        methods: {
+            getTypeList() {
+                getTypeList({ level: '3' }).then((response) => {
+                    this.typeList = response.data
+                })
+                getTypeList({ level: '4' }).then((response) => {
+                    this.modelList = response.data
+                })
+            },
 
-    /** 查询字典类型列表 */
-    getList() {
-      this.loading = true;
-      const params = {
-        keyWord:this.queryParams.keyWord,
-        startTime:this.queryParams.time && this.queryParams.time[0],
-        endTime:this.queryParams.time && this.queryParams.time[1],
-        typeId:this.queryParams.typeId,
-        pageSize: this.queryParams.pageSize,
-        pageNum: this.queryParams.pageNum
-      }
-      getPutInList(this.addDateRange(params)).then(response => {
-          this.tableList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
-    },
+            /** 查询字典类型列表 */
+            getList() {
+                this.loading = true
+                const params = {
+                    keyWord: this.queryParams.keyWord,
+                    startTime:
+                        this.queryParams.time && this.queryParams.time[0],
+                    endTime: this.queryParams.time && this.queryParams.time[1],
+                    typeId: this.queryParams.typeId,
+                    pageSize: this.queryParams.pageSize,
+                    pageNum: this.queryParams.pageNum,
+                }
+                getPutInList(this.addDateRange(params)).then((response) => {
+                    this.tableList = response.rows
+                    this.total = response.total
+                    this.loading = false
+                })
+            },
 
-    getDialogTable(){
-      this.loading = true;
-      getPutinDetailsList(this.query).then(response => {
-          this.detailTableList = response.rows;
-          this.dialogTotal = response.total;
-          this.loading = false;
-        }
-      );
-    },
+            getDialogTable() {
+                this.loading = true
+                getPutinDetailsList(this.query).then((response) => {
+                    this.detailTableList = response.rows
+                    this.dialogTotal = response.total
+                    this.loading = false
+                })
+            },
 
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        dictId: undefined,
-        dictName: undefined,
-        dictType: undefined,
-        status: "0",
-        remark: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 搜索按钮操作 */
-    handleDialogQuery() {
-      this.query.pageNum = 1;
-      this.getDialogTable();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    //是否可用勾选框
-    selectable(row){
-      console.log(row)
-      if(row.status=='0'){
-        return true
-      }else{
-        return false
-      }
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      // this.reset();
-      this.query.taskId = row.taskId
-      this.getDialogTable()
-      this.open = true;
-      this.showHandle = true
-      this.title = "审核";
-    },
+            // 取消按钮
+            cancel() {
+                this.open = false
+                this.reset()
+            },
+            // 表单重置
+            reset() {
+                this.form = {
+                    dictId: undefined,
+                    dictName: undefined,
+                    dictType: undefined,
+                    status: '0',
+                    remark: undefined,
+                }
+                this.resetForm('form')
+            },
+            /** 搜索按钮操作 */
+            handleQuery() {
+                this.queryParams.pageNum = 1
+                this.getList()
+            },
+            /** 搜索按钮操作 */
+            handleDialogQuery() {
+                this.query.pageNum = 1
+                this.getDialogTable()
+            },
+            /** 重置按钮操作 */
+            resetQuery() {
+                this.queryParams.time = []
+                this.resetForm('queryForm')
+                this.handleQuery()
+            },
+            //是否可用勾选框
+            selectable(row) {
+                console.log(row)
+                if (row.status == '0') {
+                    return true
+                } else {
+                    return false
+                }
+            },
+            // 多选框选中数据
+            handleSelectionChange(selection) {
+                this.ids = selection.map((item) => item)
+                this.single = selection.length != 1
+                this.multiple = !selection.length
+            },
+            /** 修改按钮操作 */
+            handleUpdate(row) {
+                // this.reset();
+                this.query.taskId = row.taskId
+                this.getDialogTable()
+                this.open = true
+                this.showHandle = true
+                this.title = '审核'
+            },
 
-    //通过
-    pass(row) {
-      console.log(row)
-      console.log(this.query.taskId)
-      row.taskId = this.query.taskId;
-      let obj = {
-        taskId:this.query.taskId,
-        maId:row.maId,
-        inputNum:row.checkNum,
-        maCode:row.maCode,
-        typeId:row.typeId,
-      }
+            //通过
+            pass(row) {
+                console.log(row)
+                console.log(this.query.taskId)
+                row.taskId = this.query.taskId
+                let obj = {
+                    taskId: this.query.taskId,
+                    maId: row.maId,
+                    inputNum: row.checkNum,
+                    maCode: row.maCode,
+                    typeId: row.typeId,
+                }
 
-      let param ={
-        taskId:this.query.taskId,
-        checkResult:'1',
-        inputRecordList:[obj]
-      }
-      changePutinStatus(param).then(response => {
-        if(response.code==200){
-          this.$modal.msgSuccess("审批成功");
-          this.getDialogTable();
-          this.getList()
-        }else{
-          this.$modal.msgSuccess("审批失败");
-        }
-      });
-    },
-    passAll() {
-      // console.log(this.query.taskId)
-      // console.log(this.ids)
-      this.ids.forEach(item => {
-        item.taskId = this.query.taskId;
-        // item.typeId= item.typeId
-        // item.maId= item.maId
-        item.inputNum= item.checkNum
-        // item.maCode= item.maCode
-      });
-      let param ={
-        taskId:this.query.taskId,
-        checkResult:'1',
-        inputRecordList:this.ids
-      }
-      changePutinStatus(param).then(response => {
-        if(response.code==200){
-          this.$modal.msgSuccess("审批成功");
-          this.getDialogTable();
-          this.getList()
-        }else{
-          this.$modal.msgSuccess("审批失败");
-        }
-      });
-    },
-    //拒绝
-    refused(row) {
-      // console.log(row)
-      // console.log(this.query.taskId)
-      row.taskId = this.query.taskId;
-      let obj = {
-        taskId:this.query.taskId,
-        maId:row.maId,
-        maCode:row.maCode,
-        inputNum:row.checkNum,
-        typeId:row.typeId,
-      }
+                let param = {
+                    taskId: this.query.taskId,
+                    checkResult: '1',
+                    inputRecordList: [obj],
+                }
+                changePutinStatus(param).then((response) => {
+                    if (response.code == 200) {
+                        this.$modal.msgSuccess('审批成功')
+                        this.getDialogTable()
+                        this.getList()
+                    } else {
+                        this.$modal.msgSuccess('审批失败')
+                    }
+                })
+            },
+            passAll() {
+                // console.log(this.query.taskId)
+                // console.log(this.ids)
+                this.ids.forEach((item) => {
+                    item.taskId = this.query.taskId
+                    // item.typeId= item.typeId
+                    // item.maId= item.maId
+                    item.inputNum = item.checkNum
+                    // item.maCode= item.maCode
+                })
+                let param = {
+                    taskId: this.query.taskId,
+                    checkResult: '1',
+                    inputRecordList: this.ids,
+                }
+                changePutinStatus(param).then((response) => {
+                    if (response.code == 200) {
+                        this.$modal.msgSuccess('审批成功')
+                        this.getDialogTable()
+                        this.getList()
+                    } else {
+                        this.$modal.msgSuccess('审批失败')
+                    }
+                })
+            },
+            //拒绝
+            refused(row) {
+                // console.log(row)
+                // console.log(this.query.taskId)
+                row.taskId = this.query.taskId
+                let obj = {
+                    taskId: this.query.taskId,
+                    maId: row.maId,
+                    maCode: row.maCode,
+                    inputNum: row.checkNum,
+                    typeId: row.typeId,
+                }
 
-      let param ={
-        taskId:this.query.taskId,
-        checkResult:'2',
-        inputRecordList:[obj]
-      }
-      changePutinStatus(param).then(response => {
-        if(response.code==200){
-          this.$modal.msgSuccess("审批成功");
-          this.getDialogTable();
-          this.getList()
-        }else{
-          this.$modal.msgSuccess("审批失败");
-        }
-      });
-    },
-    refusedAll() {
-      // console.log(this.query.taskId)
-      // console.log(this.ids)
-      this.ids.forEach(item => {
-        item.taskId = this.query.taskId;
-        // item.typeId= item.typeId
-        // item.maId= item.maId
-        item.inputNum= item.checkNum
-        // item.maCode= item.maCode
-      });
-      let param ={
-        taskId:this.query.taskId,
-        checkResult:'2',
-        inputRecordList:this.ids
-      }
+                let param = {
+                    taskId: this.query.taskId,
+                    checkResult: '2',
+                    inputRecordList: [obj],
+                }
+                changePutinStatus(param).then((response) => {
+                    if (response.code == 200) {
+                        this.$modal.msgSuccess('审批成功')
+                        this.getDialogTable()
+                        this.getList()
+                    } else {
+                        this.$modal.msgSuccess('审批失败')
+                    }
+                })
+            },
+            refusedAll() {
+                // console.log(this.query.taskId)
+                // console.log(this.ids)
+                this.ids.forEach((item) => {
+                    item.taskId = this.query.taskId
+                    // item.typeId= item.typeId
+                    // item.maId= item.maId
+                    item.inputNum = item.checkNum
+                    // item.maCode= item.maCode
+                })
+                let param = {
+                    taskId: this.query.taskId,
+                    checkResult: '2',
+                    inputRecordList: this.ids,
+                }
 
-      changePutinStatus(param).then(response => {
-        if(response.code==200){
-          this.$modal.msgSuccess("审批成功");
-          this.getDialogTable();
-          this.getList()
-        }else{
-          this.$modal.msgSuccess("审批失败");
-        }
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.dictId != undefined) {
-            updateType(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addType(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    //查看操作
-    handleView(row) {
-      this.query.taskId = row.taskId
-      this.getDialogTable()
-      this.open = true;
-      this.showHandle = false
-      this.title = "查看";
-    },
-    //获取入库单数据
-    getPrintTable(taskId){
-      warehousingEntry({taskId:taskId}).then(response => {
-          this.printTableData = response.data;
-          // this.dialogTotal = response.total;
-        }
-      );
-    },
-    //查看入库单
-    handlePrint(row) {
-      this.query.taskId = row.taskId
-      this.getPrintTable(row.taskId)
-      this.openPrint = true
-      this.title = "入库单";
-    },
-    //打印
-    print(){
-      this.$refs.remarksPrintRef.print();
-    },
+                changePutinStatus(param).then((response) => {
+                    if (response.code == 200) {
+                        this.$modal.msgSuccess('审批成功')
+                        this.getDialogTable()
+                        this.getList()
+                    } else {
+                        this.$modal.msgSuccess('审批失败')
+                    }
+                })
+            },
+            /** 提交按钮 */
+            submitForm: function () {
+                this.$refs['form'].validate((valid) => {
+                    if (valid) {
+                        if (this.form.dictId != undefined) {
+                            updateType(this.form).then((response) => {
+                                this.$modal.msgSuccess('修改成功')
+                                this.open = false
+                                this.getList()
+                            })
+                        } else {
+                            addType(this.form).then((response) => {
+                                this.$modal.msgSuccess('新增成功')
+                                this.open = false
+                                this.getList()
+                            })
+                        }
+                    }
+                })
+            },
+            //查看操作
+            handleView(row) {
+                this.query.taskId = row.taskId
+                this.getDialogTable()
+                this.open = true
+                this.showHandle = false
+                this.title = '查看'
+            },
+            //获取入库单数据
+            getPrintTable(taskId) {
+                warehousingEntry({ taskId: taskId }).then((response) => {
+                    this.printTableData = response.data
+                    // this.dialogTotal = response.total;
+                })
+            },
+            //查看入库单
+            handlePrint(row) {
+                this.query.taskId = row.taskId
+                this.getPrintTable(row.taskId)
+                this.openPrint = true
+                this.title = '入库单'
+            },
+            //打印
+            print() {
+                this.$refs.remarksPrintRef.print()
+            },
 
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const dictIds = row.dictId || this.ids;
-      this.$modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？').then(function() {
-        return delType(dictIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('material/purchaseCheckInfo/putInExport', {
-        ...this.queryParams
-      }, `新购工机具入库_${new Date().getTime()}.xlsx`)
-    },
-    /** 刷新缓存按钮操作 */
-    handleRefreshCache() {
-      refreshCache().then(() => {
-        this.$modal.msgSuccess("刷新成功");
-        this.$store.dispatch('dict/cleanDict');
-      });
+            /** 删除按钮操作 */
+            handleDelete(row) {
+                const dictIds = row.dictId || this.ids
+                this.$modal
+                    .confirm(
+                        '是否确认删除字典编号为"' + dictIds + '"的数据项？',
+                    )
+                    .then(function () {
+                        return delType(dictIds)
+                    })
+                    .then(() => {
+                        this.getList()
+                        this.$modal.msgSuccess('删除成功')
+                    })
+                    .catch(() => {})
+            },
+            /** 导出按钮操作 */
+            handleExport() {
+                this.download(
+                    'material/purchaseCheckInfo/putInExport',
+                    {
+                        ...this.queryParams,
+                    },
+                    `新购工机具入库_${new Date().getTime()}.xlsx`,
+                )
+            },
+            /** 刷新缓存按钮操作 */
+            handleRefreshCache() {
+                refreshCache().then(() => {
+                    this.$modal.msgSuccess('刷新成功')
+                    this.$store.dispatch('dict/cleanDict')
+                })
+            },
+        },
     }
-  }
-};
 </script>
 <style lang="scss" scoped>
-.print{
-  width: 90%;
-  padding-left: 5%;
-  padding-right:1%;
+    .print {
+        width: 90%;
+        padding-left: 5%;
+        padding-right: 1%;
 
-  .title{
-    text-align: center;
-    font-weight: 600;
-    font-size: 16px;
-  }
-  .info{
-    margin-top: 10px;
-    display: flex;
-    flex-wrap: wrap;
+        .title {
+            text-align: center;
+            font-weight: 600;
+            font-size: 16px;
+        }
+        .info {
+            margin-top: 10px;
+            display: flex;
+            flex-wrap: wrap;
 
-    .item{
-      width: 50%;
-      flex-shrink: 0;
-      margin-bottom: 5px;
-      font-size: 14px;
+            .item {
+                width: 50%;
+                flex-shrink: 0;
+                margin-bottom: 5px;
+                font-size: 14px;
+            }
+        }
+
+        .fillIn {
+            margin-top: 15px;
+            display: flex;
+            justify-content: space-between;
+        }
+    }
+    ::v-deep.el-table .fixed-width .el-button--mini {
+        width: 60px !important;
+        margin-bottom: 10px;
     }
-  }
-
-  .fillIn{
-    margin-top: 15px;
-    display: flex;
-    justify-content: space-between;
-  }
-}
-::v-deep.el-table .fixed-width .el-button--mini {
-  width: 60px !important;
-  margin-bottom: 10px;
-}
 </style>