diff --git a/src/api/purchase/goodsBind.js b/src/api/purchase/goodsBind.js
index c87f6429..c72fe8ad 100644
--- a/src/api/purchase/goodsBind.js
+++ b/src/api/purchase/goodsBind.js
@@ -22,6 +22,15 @@ export function getNewBuyBindListDetailsApi(query) {
     })
 }
 
+//二级页面 查看
+export function getMaCodeInfo(query) {
+    return request({
+        url: '/material/purchase_macode_info/list',
+        method: 'get',
+        params: query,
+    })
+}
+
 //任务 详情
 export function bindAllData(data) {
     return request({
@@ -40,6 +49,7 @@ export function getListDetailById(query) {
     })
 }
 
+
 // 导出
 export function exportNewBuy(data) {
     return request({
diff --git a/src/api/repair/testExamine.js b/src/api/repair/testExamine.js
index f287f288..90872f63 100644
--- a/src/api/repair/testExamine.js
+++ b/src/api/repair/testExamine.js
@@ -17,7 +17,14 @@ export function getAuditInfo(query) {
   })
 }
 
-
+//修试审核二级-通过，驳回
+export function auditPass(data) {
+  return request({
+    url: '/material/repair_audit_details',
+    method: 'put',
+    data: data,
+  })
+}
 
 
 
diff --git a/src/views/material/lease/outBound/index.vue b/src/views/material/lease/outBound/index.vue
index 4d690bf3..034b0659 100644
--- a/src/views/material/lease/outBound/index.vue
+++ b/src/views/material/lease/outBound/index.vue
@@ -118,7 +118,7 @@
         label="申请数量"
         align="center"
         prop="preCountNum"
-        width="110px"
+        width="80px"
         :show-overflow-tooltip="true"
       >
       </el-table-column>
@@ -127,7 +127,7 @@
         label="已出库数量"
         align="center"
         prop="alNum"
-        width="110px"
+        width="90px"
         :show-overflow-tooltip="true"
       >
       </el-table-column>
@@ -175,7 +175,7 @@
         :show-overflow-tooltip="true"
       />
 
-      <el-table-column label="操作" align="center" width="230">
+      <el-table-column label="操作" align="center" width="270">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -189,7 +189,6 @@
             style="margin-bottom: 10px"
             type="primary"
             @click="handleOut(scope.row)"
-            v-if="scope.row.taskStatus != 5"
             v-hasPermi="['purchase:info:edit']"
             >出库</el-button
           >
@@ -197,15 +196,15 @@
           <el-button
             size="mini"
             type="warning"
-            @click="handlePrint(scope.row)"
-            v-if="scope.row.taskStatus == 5"
+            @click="handleLld(scope.row)"
+            v-if="scope.row.taskStatus == 4"
             >领料单</el-button
           >
           <el-button
             size="mini"
             type="warning"
             @click="handlePrint(scope.row)"
-            v-if="scope.row.taskStatus == 5"
+            v-if="scope.row.taskStatus == 4"
             >出库检验单</el-button
           >
         </template>
@@ -310,13 +309,13 @@
           </template>
         </el-table-column>
       </el-table>
-      <!-- <pagination
+      <pagination
         v-show="dialogTotal > 0"
         :total="dialogTotal"
-        :page.sync="dialogQuery.pageNum"
-        :limit.sync="dialogQuery.pageSize"
+        :page.sync="queryOutInfo.pageNum"
+        :limit.sync="queryOutInfo.pageSize"
         @pagination="getDialogList"
-      /> -->
+      />
     </el-dialog>
 
     <!-- 查看弹窗 -->
@@ -375,7 +374,7 @@
         <el-table-column
           label="待出库数量"
           align="center"
-          prop="roleName"
+          prop="outNum"
           :show-overflow-tooltip="true"
         />
         <el-table-column
@@ -384,37 +383,14 @@
           prop="alNum"
           :show-overflow-tooltip="true"
         />
-        <el-table-column
-          label="操作"
-          align="center"
-          class-name="small-padding fixed-width"
-        >
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              @click="codeOut(scope.row)"
-              v-if="scope.row.manageType == 0"
-            >
-              编码出库
-            </el-button>
-            <el-button
-              size="mini"
-              type="primary"
-              v-if="scope.row.manageType == 1"
-              @click="numOut(scope.row)"
-            >
-              数量出库
-            </el-button>
-          </template>
-        </el-table-column>
       </el-table>
-      <!-- <pagination
+      <pagination
         v-show="ViewTotal > 0"
         :total="ViewTotal"
         :page.sync="queryOutView.pageNum"
         :limit.sync="queryOutView.pageSize"
         @pagination="getListView"
-      /> -->
+      />
     </el-dialog>
 
     <!-- 编码出库 -->
@@ -489,8 +465,7 @@
           :show-overflow-tooltip="true"
         />
       </el-table>
-    </el-dialog>
-    <!-- <pagination
+      <pagination
         v-show="outTotal > 0"
         :total="outTotal"
         :page.sync="outQuery.pageNum"
@@ -640,15 +615,168 @@
         <el-button @click="openPrint = 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.leaseUnit }}
+            </div>
+            <div
+              class="item"
+              style="
+                width: 50%;
+                flex-shrink: 0;
+                margin-bottom: 5px;
+                font-size: 14px;
+              "
+            >
+              <span>工程名称：</span>
+              {{ leaseApplyData.leaseProject }}
+            </div>
+            <div
+              class="item"
+              style="
+                width: 50%;
+                flex-shrink: 0;
+                margin-bottom: 5px;
+                font-size: 14px;
+              "
+            >
+              <span>时间：</span>
+              {{ leaseApplyData.createTime }}
+            </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 label="序号" align="center" type="index" />
+            <el-table-column label="类型名称" align="center" prop="typeName" />
+            <!--            <el-table-column type="expand">
+              <template slot-scope="scope">
+                <div class="nested-table-container">
+                  <el-table :data="scope.row.maTypeDetails" style="width: 100%">
+                    &lt;!&ndash; 子表格的列 &ndash;&gt;
+                    <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="typeName"
+                      :show-overflow-tooltip="true"
+                    />
+                    <el-table-column
+                      label="单位"
+                      align="center"
+                      prop="unitName"
+                      :show-overflow-tooltip="true"
+                    />
+                    <el-table-column
+                      label="预领数量"
+                      align="center"
+                      prop="preNum"
+                      :show-overflow-tooltip="true"
+                    />
+                  </el-table>
+                </div>
+              </template>
+            </el-table-column>-->
+            <el-table-column label="规格型号" align="center" prop="typeName" />
+            <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"
+            >
+              <template slot-scope="scope">
+                <dict-tag
+                  :options="dict.type.ma_type_manage_type"
+                  :value="scope.row.manageType"
+                />
+              </template>
+            </el-table-column>
+            <!--            <el-table-column-->
+            <!--              label="出库方式"-->
+            <!--              align="center"-->
+            <!--              prop="manageTypeName"-->
+            <!--            />-->
+          </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>
+        </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 { getListLeaseApply } from "@/api/lease/apply";
+import { getListLeaseApply, getApplyInfo } from "@/api/lease/apply";
 import { outInfoList, getDetailsByTypeId, submitOut } from "@/api/lease/out";
+import vueEasyPrint from "vue-easy-print";
 export default {
   dicts: ["lease_task_status"],
-  // components: { vueEasyPrint },
+  components: { vueEasyPrint },
   data() {
     return {
       // 遮罩层
@@ -660,6 +788,7 @@ export default {
       showOutInfo: false,
       //编码出库的显示
       openCode: false,
+      open: false,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -672,6 +801,7 @@ export default {
       total: 0,
       ViewTotal: 0,
       outTotal: 0,
+      dialogTotal: 0,
       // 弹出层标题
       title: "",
       typeList: [],
@@ -716,6 +846,10 @@ export default {
       outNum: 0,
       outObj: {},
       parentIdTemp: undefined,
+      //领料单
+      leaseApplyDetails: [],
+      // 领料任务详情数据
+      leaseApplyData: {},
     };
   },
   created() {
@@ -732,6 +866,7 @@ export default {
           manageType: 0,
           maId: item.maId,
           parentId: this.parentIdTemp,
+          outNum: 1,
         });
       });
       this.single = selection.length != 1;
@@ -773,10 +908,19 @@ export default {
       this.getDialogList();
     },
 
+    getListView() {
+      outInfoList(this.queryOutView.id).then((response) => {
+        this.getListOutInfo = response.data.leaseApplyDetailsList;
+        // this.dialogTotal = response.
+        // this.loading = false;
+      });
+    },
+
     /** 出库查询列表 */
     getDialogList() {
       outInfoList(this.queryOutInfo.id).then((response) => {
         this.getListOutInfo = response.data.leaseApplyDetailsList;
+        // this.dialogTotal = response.
         // this.loading = false;
       });
     },
@@ -786,6 +930,11 @@ export default {
     handleView(row) {
       this.title = "查看";
       this.showOutView = true;
+      this.queryOutView.id = row.id;
+      outInfoList(row.id).then((response) => {
+        this.getListOutInfo = response.data.leaseApplyDetailsList;
+        // this.loading = false;
+      });
     },
     /** 出库按钮操作 */
     handleOut(row) {
@@ -803,10 +952,10 @@ export default {
 
     //编码出库
     codeOut(row) {
-      // this.title = '编码出库'
+      this.title = "编码出库";
       this.openCode = true;
       // this.resetForm("codeOutForm");
-      // this.resetForm("outQuery");
+      this.resetForm("outQuery");
       this.parentIdTemp = row.parentId;
       this.outNum = row.outNum;
       this.outQuery.typeId = row.typeId;
@@ -872,6 +1021,18 @@ export default {
       this.openPrint = true;
       this.title = "机具设备到货验收单";
     },
+
+    //打开领料单
+    async handleLld(row) {
+      this.open = true;
+      var ids = row.id;
+      const res = await getApplyInfo(ids);
+      console.log(res);
+      this.leaseApplyDetails = res.data.leaseApplyDetailsList;
+      this.leaseApplyData = res.data.leaseApplyInfo;
+      console.log(this.leaseApplyData);
+    },
+
     //打印
     print() {
       this.$refs.remarksPrintRef.print();
diff --git a/src/views/material/purchase/goodsAccept/detail.vue b/src/views/material/purchase/goodsAccept/detail.vue
index 1377d08b..f3fa9636 100644
--- a/src/views/material/purchase/goodsAccept/detail.vue
+++ b/src/views/material/purchase/goodsAccept/detail.vue
@@ -1,17 +1,28 @@
 <template>
-    <div class="app-container">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
-        <el-form-item label="类型规格："  prop="typeId" >
-          <el-select v-model="queryParams.typeId" placeholder="请选择类型规格" clearable>
-            <el-option
-              v-for="dict in materialModelList"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <!-- <el-form-item label="机具厂家："  prop="supplierId">
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="90px"
+    >
+      <el-form-item label="类型规格：" prop="typeId">
+        <el-select
+          v-model="queryParams.typeId"
+          placeholder="请选择类型规格"
+          clearable
+        >
+          <el-option
+            v-for="dict in materialModelList"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- <el-form-item label="机具厂家："  prop="supplierId">
           <el-select v-model="queryParams.supplierId" placeholder="请选择机具厂家" clearable>
             <el-option
               v-for="dict in supplierList"
@@ -21,90 +32,188 @@
             />
           </el-select>
         </el-form-item> -->
-        <el-form-item label="出厂日期："  prop="productionTime"> 
-            <el-date-picker 
-                v-model="queryParams.productionTime"
-                placeholder="请选择出厂日期" 
-                value-format="yyyy-MM-dd HH:mm:ss"
-                type="datetime">
-            </el-date-picker>
-        </el-form-item>
+      <el-form-item label="出厂日期：" prop="productionTime">
+        <el-date-picker
+          v-model="queryParams.productionTime"
+          placeholder="请选择出厂日期"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetime"
+        >
+        </el-date-picker>
+      </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-button
-                    type="primary"
-                    size="mini"
-                    icon="el-icon-back"
-                    @click="jumpList"
-                    >新购到货验收</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-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          size="mini"
+          icon="el-icon-back"
+          @click="jumpList"
+          >新购到货验收</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="success" @click="batchPass"
-                    icon="el-icon-check" v-show="!isView"
-                    size="mini" :disabled="multiple"
-                >合格</el-button>
-            </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          @click="batchPass"
+          icon="el-icon-check"
+          v-show="!isView"
+          size="mini"
+          :disabled="multiple"
+          >合格</el-button
+        >
+      </el-col>
 
-            <el-col :span="1.5">
-                <el-button
-                    type="danger" @click="batchReject"
-                    icon="el-icon-close" v-show="!isView"
-                    size="mini" :disabled="multiple"
-                >不合格</el-button>
-            </el-col>
-        </el-row>
-  
-      <el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="typeId" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" :reserve-selection="true" v-if="!isView"/>
-        <el-table-column label="序号" align="center" width="80" type="index">
-        </el-table-column>
-        <el-table-column label="物资名称" align="center" prop="maTypeName" :show-overflow-tooltip="true"/>
-        <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true"/>
-        <el-table-column label="单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
-        <el-table-column label="采购数量" align="center" prop="purchaseNum" :show-overflow-tooltip="true"/>
-        <el-table-column label="购置单价(元含税)" align="center" prop="purchaseTaxPrice" :show-overflow-tooltip="true"/>
-        <el-table-column label="购置单价（元不含税）" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/>
-        <!-- <el-table-column label="供应商" align="center" prop="supplierName" /> -->
-        <el-table-column label="是否未固定资产" align="center" prop="fixCodeStr" :show-overflow-tooltip="true"/>
-        <el-table-column label="出厂日期" align="center" prop="productionTime" :show-overflow-tooltip="true"/>
-        <el-table-column label="相关配套资料" align="center" prop="" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            <div style="color: rgb(2, 167, 240);cursor: pointer;" @click="openFileDialog(scope.row)">报告管理</div>
-          </template>
-        </el-table-column>
-        <el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true">
-            <template slot-scope="scope">
-                <dict-tag :options="dict.type.purchase_task_status" :value="scope.row.status"/>
-            </template>
-        </el-table-column>
-        <el-table-column label="验收结论" align="center" prop="checkResult" :show-overflow-tooltip="true"/>
-        <el-table-column label="操作" align="center" width="180">
-            <template slot-scope="scope">
-                <el-button size="mini" type="success" @click="pass(scope.row)">
-                    合格
-                </el-button>
-                <el-button size="mini" type="danger" @click="reject(scope.row)">
-                    不合格
-                </el-button>
-            </template>
-        </el-table-column>
-      </el-table>
-  
-      <!-- <pagination
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          @click="batchReject"
+          icon="el-icon-close"
+          v-show="!isView"
+          size="mini"
+          :disabled="multiple"
+          >不合格</el-button
+        >
+      </el-col>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="tableList"
+      ref="multipleTable"
+      row-key="typeId"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column
+        type="selection"
+        width="55"
+        align="center"
+        :reserve-selection="true"
+        v-if="!isView"
+      />
+      <el-table-column label="序号" align="center" width="80" type="index">
+      </el-table-column>
+      <el-table-column
+        label="物资名称"
+        align="center"
+        prop="maTypeName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="规格型号"
+        align="center"
+        prop="typeName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="单位"
+        align="center"
+        prop="unitName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="采购数量"
+        align="center"
+        prop="purchaseNum"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="购置单价(元含税)"
+        align="center"
+        prop="purchaseTaxPrice"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="购置单价（元不含税）"
+        align="center"
+        prop="purchasePrice"
+        :show-overflow-tooltip="true"
+      />
+      <!-- <el-table-column label="供应商" align="center" prop="supplierName" /> -->
+      <el-table-column
+        label="是否未固定资产"
+        align="center"
+        prop="fixCodeStr"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="出厂日期"
+        align="center"
+        prop="productionTime"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="相关配套资料"
+        align="center"
+        prop=""
+        :show-overflow-tooltip="true"
+      >
+        <template slot-scope="scope">
+          <div
+            style="color: rgb(2, 167, 240); cursor: pointer"
+            @click="openFileDialog(scope.row)"
+          >
+            报告管理
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="状态"
+        align="center"
+        prop="status"
+        :show-overflow-tooltip="true"
+      >
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.purchase_task_status"
+            :value="scope.row.status"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="验收结论"
+        align="center"
+        prop="checkResult"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="操作" align="center" width="180">
+        <template slot-scope="scope">
+          <el-button size="mini" type="success" @click="pass(scope.row)">
+            合格
+          </el-button>
+          <el-button size="mini" type="danger" @click="reject(scope.row)">
+            不合格
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- <pagination
         v-show="total>0"
         :total="total"
         :page.sync="queryParams.pageNum"
@@ -112,27 +221,61 @@
         @pagination="getList"
       /> -->
 
-      <el-dialog title="报告管理" :visible.sync="open" width="900px" append-to-body> 
-        <el-table v-loading="dialogLoading" :data="fileDataList" width="100%" height="350px">
-            <el-table-column label="序号" type="index" width="55" align="center"/>
-            <el-table-column label="报告类型" align="center" prop="dictLabel" :show-overflow-tooltip="true"/>
-            <el-table-column label="文件名称" align="center" prop="name" :show-overflow-tooltip="true"/>
-            <el-table-column label="类型名称" align="center" :show-overflow-tooltip="true">
-              <template>
-                <div>{{this.rowData.maTypeName}}</div>
-              </template>
-            </el-table-column>
-            <el-table-column label="规格型号" align="center" :show-overflow-tooltip="true">
-              <template>
-                <div>{{this.rowData.typeName}}</div>
-              </template>
-            </el-table-column>
-            <!-- <el-table-column label="报告日期" align="center" prop="orgName" :show-overflow-tooltip="true"/>
+    <el-dialog
+      title="报告管理"
+      :visible.sync="open"
+      width="900px"
+      append-to-body
+    >
+      <el-table
+        v-loading="dialogLoading"
+        :data="fileDataList"
+        width="100%"
+        height="350px"
+      >
+        <el-table-column label="序号" type="index" width="55" align="center" />
+        <el-table-column
+          label="报告类型"
+          align="center"
+          prop="dictLabel"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="文件名称"
+          align="center"
+          prop="name"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="类型名称"
+          align="center"
+          :show-overflow-tooltip="true"
+        >
+          <template>
+            <div>{{ this.rowData.maTypeName }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="规格型号"
+          align="center"
+          :show-overflow-tooltip="true"
+        >
+          <template>
+            <div>{{ this.rowData.typeName }}</div>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="报告日期" align="center" prop="orgName" :show-overflow-tooltip="true"/>
             <el-table-column label="截止有效期" align="center" prop="orgName" :show-overflow-tooltip="true"/> -->
-            <el-table-column label="操作" align="center" width="100">
-            <template slot-scope="scope">
-              <div style="display: flex;align-items: center;justify-content: center;">
-                <!-- <el-upload ref="upload" :limit="1" :headers="upload.headers" v-show="!isView"
+        <el-table-column label="操作" align="center" width="100">
+          <template slot-scope="scope">
+            <div
+              style="
+                display: flex;
+                align-items: center;
+                justify-content: center;
+              "
+            >
+              <!-- <el-upload ref="upload" :limit="1" :headers="upload.headers" v-show="!isView"
                   :action="upload.url" :show-file-list="false" accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
                   :on-success="handleFileSuccess"   :auto-upload="true"
                 >
@@ -140,354 +283,390 @@
                         上传
                   </el-button>
                 </el-upload> -->
-                
-                <el-button size="mini" type="text" @click="picturePreview(scope.row)" v-if="scope.row.url" style="margin-left: 10px;">
-                    查看
-                </el-button>
-              </div>
-             
-                    
-            </template>
+
+              <el-button
+                size="mini"
+                type="text"
+                @click="picturePreview(scope.row)"
+                v-if="scope.row.url"
+                style="margin-left: 10px"
+              >
+                查看
+              </el-button>
+            </div>
+          </template>
         </el-table-column>
-        </el-table>
-      </el-dialog>
+      </el-table>
+    </el-dialog>
 
-       <!-- 图片查看弹窗 -->
-      <el-dialog :visible.sync="dialogVisible" width="500px" height="500px" >
-        <img width="100%" height="500px" :src="dialogImageUrl"  />
-      </el-dialog>
+    <!-- 图片查看弹窗 -->
+    <el-dialog :visible.sync="dialogVisible" width="500px" height="500px">
+      <img width="100%" height="500px" :src="dialogImageUrl" />
+    </el-dialog>
 
-      <!-- 验收弹窗 -->
-      <el-dialog :visible.sync="confirmShow" width="500px" height="300px" >
-        <div style="width: 100%;height: 80%;display: flex;">
-          <div>验收结论</div>
-          <el-input type="textarea" :rows="2" placeholder="请输入结论" v-model="checkResult" maxlength="100">
-          </el-input>
-        </div>
-        <div style="width: 100%;height: 20%;display: flex;justify-content: flex-end;align-items: center;">
-          <el-button type="primary" @click="confirmCheck">确认</el-button>
-          <el-button size="mini" @click="confirmShow=false">取消</el-button>
-        </div>
-      </el-dialog>
-    </div>
-  </template> 
+    <!-- 验收弹窗 -->
+    <el-dialog :visible.sync="confirmShow" width="500px" height="300px">
+      <div style="width: 100%; height: 80%; display: flex">
+        <div>验收结论</div>
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入结论"
+          v-model="checkResult"
+          maxlength="100"
+        >
+        </el-input>
+      </div>
+      <div
+        style="
+          width: 100%;
+          height: 20%;
+          display: flex;
+          justify-content: flex-end;
+          align-items: center;
+        "
+      >
+        <el-button type="primary" @click="confirmCheck">确认</el-button>
+        <el-button size="mini" @click="confirmShow = false">取消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template> 
   
   <script>
-  import { getDeviceType} from "@/api/ma/device";
-  import { getManufacturerSelect} from "@/api/ma/supplier";
-  import { getPurchaseDetailsList,acceptInnerVerifyer,getPurchaseFileList,uploadPurchaseFile } from "@/api/purchase/goodsAccept";
-  import { downloadFile } from '@/utils/download'
-  import { getToken } from '@/utils/auth'
-  export default {
-    name: "GoodsAcceptDetail",
-    dicts: ['purchase_task_status'],
-    data() {
-      return {
-        Id:'',
-        taskId:'',
-        // 遮罩层
-        loading: false,     
-        dialogLoading: false,     
-        isView: false,     
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true, 
-        // 显示搜索条件
-        showSearch: true,
-        showHouse: false, 
-        materialModelList:[],//规格型号下拉
-        supplierList:[],//厂家下拉
-        ids:[],
-        checkList:[],
-        // 总条数
-        total: 0, 
-        //表格数据
-        tableList: [], 
-        fixCodeList:["否","是"],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        rowData:{},
-        fileDataList: [
-          {dictLabel:"合格证",fileType:"0",name:"",url:""},
-          {dictLabel:"型式试验报告",fileType:"1",name:"",url:""},
-          {dictLabel:"出厂检测报告",fileType:"2",name:"",url:""},
-          {dictLabel:"第三方监测报告",fileType:"3",name:"",url:""},
-          {dictLabel:"其他报告",fileType:"4",name:"",url:""},
-        ], 
-        // 查询参数
-        queryParams: {
-          // pageNum: 1,
-          // pageSize: 10,
-          typeId:undefined,
-          supplierId:undefined,
-          productionTime:undefined,
-        },
-        //确认弹窗
-        confirmShow: false,
-        taskStatus:"",//3合格、1不合格
-        checkResult:"",
-         //图片查看弹窗
-        dialogImageUrl: '',
-        dialogVisible: false,
-        //上传
-        upload: {
-          // 设置上传的请求头部
-          headers: { Authorization: 'Bearer ' + getToken() },
-          // 上传的地址
-          url: process.env.VUE_APP_BASE_API + '/file/upload'
-        },
-        
-      };
-    },
-    mounted() {
-        const taskId = this.$route.query && this.$route.query.taskId
-        const Id = this.$route.query && this.$route.query.Id
-        const isView = this.$route.query && this.$route.query.isView
-        this.taskId = taskId;
-        this.Id = Id;
-        if(isView=='true'){
-            this.isView=true;
-        }else{
-            this.isView=false;
-        }
-        this.getDeviceType()
-        // this.getSupplierList()
-        console.log(this.isView)
-        this.getList()
-    },
-    methods: {
-        // 返回列表页
-        jumpList() {
-            const obj = { path: '/purchase/goodsAccept' }
-            this.$tab.closeOpenPage(obj)
-        },
-        getDeviceType(){ 
-            getDeviceType({level:4,skipPermission:1}).then(response => {
-            let matModelRes = response.data;
-            this.materialModelList = matModelRes.map((item) => {
-                    return {
-                    label: item.typeName,
-                    value: item.typeId,
-                    };
-                });
-            });
-        },
-        getSupplierList(){ 
-            getManufacturerSelect().then(response => {
-            let arrRes = response.rows;
-            this.supplierList = arrRes.map((item) => {
-                    return {
-                        label: item.supplier,
-                        value: item.supplierId,
-                    };
-                });
-            });
-        },
-        /** 查询列表 */
-        getList() {
-            this.loading = true;
-            this.queryParams.id=this.Id
-            this.queryParams.taskId=this.taskId
-            this.queryParams.taskStatus=2
-            this.queryParams.statusList=[2,12]
-            getPurchaseDetailsList(this.queryParams).then(response => {
-                this.tableList = response.data.purchaseCheckDetailsList;
-                this.tableList.forEach((item) => {
-                    item.fixCodeStr = this.fixCodeList[Number(item.fixCode)]
-                })
-                // this.total = response.total;
-                this.loading = false;
-            });
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.resetForm("queryForm");
-            this.queryParams.keyWord=null;
-            this.handleQuery();
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.queryParams.pageNum = 1;
-            this.getList();
-        }, 
-        // 多选框选中数据
-        handleSelectionChange(selection) {
-            this.ids = selection
-            this.single = selection.length != 1
-            this.multiple = !selection.length
-        },
-        //合格
-        pass(row){
-          this.taskStatus='3';
-          this.checkResult="合格";
-          let obj = {
-              taskId:row.taskId,
-              typeId:row.typeId,
-              status:this.taskStatus,
-              checkResult:this.checkResult
-          }
-          this.checkList=[]
-          this.checkList.push(obj)
-          this.confirmShow=true;
-        },
-        //不合格
-        reject(row){
-          this.taskStatus='1';
-          this.checkResult="不合格";
-          let obj = {
-              taskId:row.taskId,
-              typeId:row.typeId,
-              status:this.taskStatus,
-              checkResult:this.checkResult
-          }
-          this.checkList=[]
-          this.checkList.push(obj)
-          this.confirmShow=true;
-        },
-        //批量合格
-        batchPass(){
-          this.taskStatus='3';
-          this.checkResult="合格";
-          this.checkList=[]
-          this.checkList=this.ids.map(item=>{
-            let obj = {
-              taskId:item.taskId,
-              typeId:item.typeId,
-              status:this.taskStatus,
-              checkResult:this.checkResult
-            }
-            return obj
-          }) 
-          this.confirmShow=true;
-        },
-        //批量不合格
-        batchReject(){ 
-          this.taskStatus='1';
-          this.checkResult="不合格";
-          this.checkList=[]
-          this.checkList=this.ids.map(item=>{
-            let obj = {
-              taskId:item.taskId,
-              typeId:item.typeId,
-              status:this.taskStatus,
-              checkResult:this.checkResult
-            }
-            return obj
-          }) 
-          this.confirmShow=true;
-        },
-        //验收确认请求
-        confirmCheck(){
-          this.checkList.forEach(item=>{
-            item.checkResult=this.checkResult
-          })
-          console.log(this.checkList)
-          acceptInnerVerifyer(this.checkList).then(response => {
-            if(response.code==200){
-              this.$modal.msgSuccess('验收成功')
-              this.confirmShow=false;
-              this.getList()
-              this.$refs.multipleTable.clearSelection()
-            }
-          });
-        },
-        //文件管理
-        openFileDialog(row){
-          this.rowData=row;
-          this.fileDataList = [{dictLabel:"合格证",fileType:"0",name:"",url:""},
-                {dictLabel:"型式试验报告",fileType:"1",name:"",url:""},
-                {dictLabel:"出厂检测报告",fileType:"2",name:"",url:""},
-                {dictLabel:"第三方监测报告",fileType:"3",name:"",url:""},
-                {dictLabel:"其他报告",fileType:"4",name:"",url:""}]
-          this.getFileData()
-          this.open=true
-        },
-        //获取已上传文件
-        getFileData(){
-          let param = {
-            modelId:this.rowData.typeId,
-            taskType:0,
-            taskId:this.rowData.taskId
-          }
-          getPurchaseFileList(param).then((response) => {
-            if(response.rows.length>0){
-                response.rows.forEach(item=>{
-                    let index = this.fileDataList.findIndex(v=>v.fileType==item.fileType)
-                    this.fileDataList[index].name = item.name
-                    this.fileDataList[index].url = item.url
-                })
-            }
-            }).catch(() => {
-            })
-        },
-        //上传
-        beforeFileUpload(row){
-          this.rowData.fileType=row.fileType;
-          // this.rowData.dictLabel=row.dictLabel;
-        },
-        // 文件上传成功处理
-        handleFileSuccess(response, file, fileList) { 
-          if(response.code==200){ 
-            let param = {
-              "taskId": this.taskId,
-              "taskType": "0",
-              "name": response.data.name,
-              "url": response.data.url,
-              "modelId": this.rowData.typeId,
-              "fileType": this.rowData.fileType,
-            }
-            console.log(param) 
-            uploadPurchaseFile(param).then((response) => {
-                this.$modal.msgSuccess('上传成功')
-                this.getFileData()
-            }).catch(() => {
-                  this.$modal.msgError('上传失败')
-            })
-          }
-        },
-        //图片查看
-        picturePreview(file) {
-          this.dialogImageUrl = file.url;
-          const parts = file.name.split('.');
-          const extension = parts.pop();
-          if(extension === 'doc'||extension === 'docx'||extension === 'pdf'){
-            const windowName = file.name;
-            window.open(file.url,windowName)
-          }else{
-            this.dialogVisible = true
-          }
-        },
-        /** 导出按钮操作 */
-        handleExport() {
-            this.download('/material/purchase_check_info/exportDetails',{taskId:this.taskId},`新购到货详情_${new Date().getTime()}.xlsx`)
-        },
-
+import { getDeviceType } from "@/api/ma/device";
+import { getManufacturerSelect } from "@/api/ma/supplier";
+import {
+  getPurchaseDetailsList,
+  acceptInnerVerifyer,
+  getPurchaseFileList,
+  uploadPurchaseFile,
+} from "@/api/purchase/goodsAccept";
+import { downloadFile } from "@/utils/download";
+import { getToken } from "@/utils/auth";
+export default {
+  name: "GoodsAcceptDetail",
+  dicts: ["purchase_task_status"],
+  data() {
+    return {
+      Id: "",
+      taskId: "",
+      // 遮罩层
+      loading: false,
+      dialogLoading: false,
+      isView: false,
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      showHouse: false,
+      materialModelList: [], //规格型号下拉
+      supplierList: [], //厂家下拉
+      ids: [],
+      checkList: [],
+      // 总条数
+      total: 0,
+      //表格数据
+      tableList: [],
+      fixCodeList: ["否", "是"],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      rowData: {},
+      fileDataList: [
+        { dictLabel: "合格证", fileType: "0", name: "", url: "" },
+        { dictLabel: "型式试验报告", fileType: "1", name: "", url: "" },
+        { dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" },
+        { dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" },
+        { dictLabel: "其他报告", fileType: "4", name: "", url: "" },
+      ],
+      // 查询参数
+      queryParams: {
+        // pageNum: 1,
+        // pageSize: 10,
+        typeId: undefined,
+        supplierId: undefined,
+        productionTime: undefined,
+      },
+      //确认弹窗
+      confirmShow: false,
+      taskStatus: "", //3合格、1不合格
+      checkResult: "",
+      //图片查看弹窗
+      dialogImageUrl: "",
+      dialogVisible: false,
+      //上传
+      upload: {
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/file/upload",
+      },
+    };
+  },
+  mounted() {
+    const taskId = this.$route.query && this.$route.query.taskId;
+    const Id = this.$route.query && this.$route.query.Id;
+    const isView = this.$route.query && this.$route.query.isView;
+    this.taskId = taskId;
+    this.Id = Id;
+    if (isView == "true") {
+      this.isView = true;
+    } else {
+      this.isView = false;
     }
-  };
-  </script>
-  <style lang="scss" scoped>
-  .uploadImg {
-    padding-top: 20px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-  .deviceCode {
-      margin-top: 10px;
-      padding-bottom: 20px;
-      font-size: 18px;
-  }
-  ::v-deep.el-table .fixed-width .el-button--mini {
-      width: 60px !important;
-      margin-bottom: 10px;
-  }
-  //隐藏图片上传框的css
-  ::v-deep.disabled {
-      .el-upload--picture-card {
-          display: none;
+    this.getDeviceType();
+    // this.getSupplierList()
+    console.log(this.isView);
+    this.getList();
+  },
+  methods: {
+    // 返回列表页
+    jumpList() {
+      const obj = { path: "/purchase/goodsAccept" };
+      this.$tab.closeOpenPage(obj);
+    },
+    getDeviceType() {
+      getDeviceType({ level: 4, skipPermission: 1 }).then((response) => {
+        let matModelRes = response.data;
+        this.materialModelList = matModelRes.map((item) => {
+          return {
+            label: item.typeName,
+            value: item.typeId,
+          };
+        });
+      });
+    },
+    getSupplierList() {
+      getManufacturerSelect().then((response) => {
+        let arrRes = response.rows;
+        this.supplierList = arrRes.map((item) => {
+          return {
+            label: item.supplier,
+            value: item.supplierId,
+          };
+        });
+      });
+    },
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.id = this.Id;
+      this.queryParams.taskId = this.taskId;
+      this.queryParams.taskStatus = 2;
+      this.queryParams.statusList = [2, 12];
+      getPurchaseDetailsList(this.queryParams).then((response) => {
+        this.tableList = response.data.purchaseCheckDetailsList;
+        this.tableList.forEach((item) => {
+          item.fixCodeStr = this.fixCodeList[Number(item.fixCode)];
+        });
+        // this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.queryParams.keyWord = null;
+      this.handleQuery();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection;
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    //合格
+    pass(row) {
+      this.taskStatus = "3";
+      this.checkResult = "合格";
+      let obj = {
+        taskId: row.taskId,
+        typeId: row.typeId,
+        status: this.taskStatus,
+        checkResult: this.checkResult,
+        manageType: row.manageType,
+      };
+      this.checkList = [];
+      this.checkList.push(obj);
+      this.confirmShow = true;
+    },
+    //不合格
+    reject(row) {
+      this.taskStatus = "1";
+      this.checkResult = "不合格";
+      let obj = {
+        taskId: row.taskId,
+        typeId: row.typeId,
+        status: this.taskStatus,
+        checkResult: this.checkResult,
+        manageType: row.manageType,
+      };
+      this.checkList = [];
+      this.checkList.push(obj);
+      this.confirmShow = true;
+    },
+    //批量合格
+    batchPass() {
+      this.taskStatus = "3";
+      this.checkResult = "合格";
+      this.checkList = [];
+      this.checkList = this.ids.map((item) => {
+        let obj = {
+          taskId: item.taskId,
+          typeId: item.typeId,
+          status: this.taskStatus,
+          checkResult: this.checkResult,
+          manageType: item.manageType,
+        };
+        return obj;
+      });
+      this.confirmShow = true;
+    },
+    //批量不合格
+    batchReject() {
+      this.taskStatus = "1";
+      this.checkResult = "不合格";
+      this.checkList = [];
+      this.checkList = this.ids.map((item) => {
+        let obj = {
+          taskId: item.taskId,
+          typeId: item.typeId,
+          status: this.taskStatus,
+          checkResult: this.checkResult,
+          manageType: item.manageType,
+        };
+        return obj;
+      });
+      this.confirmShow = true;
+    },
+    //验收确认请求
+    confirmCheck() {
+      this.checkList.forEach((item) => {
+        item.checkResult = this.checkResult;
+      });
+      console.log(this.checkList);
+      acceptInnerVerifyer(this.checkList).then((response) => {
+        if (response.code == 200) {
+          this.$modal.msgSuccess("验收成功");
+          this.confirmShow = false;
+          this.getList();
+          this.$refs.multipleTable.clearSelection();
+        }
+      });
+    },
+    //文件管理
+    openFileDialog(row) {
+      this.rowData = row;
+      this.fileDataList = [
+        { dictLabel: "合格证", fileType: "0", name: "", url: "" },
+        { dictLabel: "型式试验报告", fileType: "1", name: "", url: "" },
+        { dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" },
+        { dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" },
+        { dictLabel: "其他报告", fileType: "4", name: "", url: "" },
+      ];
+      this.getFileData();
+      this.open = true;
+    },
+    //获取已上传文件
+    getFileData() {
+      let param = {
+        modelId: this.rowData.typeId,
+        taskType: 0,
+        taskId: this.rowData.taskId,
+      };
+      getPurchaseFileList(param)
+        .then((response) => {
+          if (response.rows.length > 0) {
+            response.rows.forEach((item) => {
+              let index = this.fileDataList.findIndex(
+                (v) => v.fileType == item.fileType
+              );
+              this.fileDataList[index].name = item.name;
+              this.fileDataList[index].url = item.url;
+            });
+          }
+        })
+        .catch(() => {});
+    },
+    //上传
+    beforeFileUpload(row) {
+      this.rowData.fileType = row.fileType;
+      // this.rowData.dictLabel=row.dictLabel;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      if (response.code == 200) {
+        let param = {
+          taskId: this.taskId,
+          taskType: "0",
+          name: response.data.name,
+          url: response.data.url,
+          modelId: this.rowData.typeId,
+          fileType: this.rowData.fileType,
+        };
+        console.log(param);
+        uploadPurchaseFile(param)
+          .then((response) => {
+            this.$modal.msgSuccess("上传成功");
+            this.getFileData();
+          })
+          .catch(() => {
+            this.$modal.msgError("上传失败");
+          });
       }
+    },
+    //图片查看
+    picturePreview(file) {
+      this.dialogImageUrl = file.url;
+      const parts = file.name.split(".");
+      const extension = parts.pop();
+      if (extension === "doc" || extension === "docx" || extension === "pdf") {
+        const windowName = file.name;
+        window.open(file.url, windowName);
+      } else {
+        this.dialogVisible = true;
+      }
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/material/purchase_check_info/exportDetails",
+        { taskId: this.taskId },
+        `新购到货详情_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>
+  <style lang="scss" scoped>
+.uploadImg {
+  padding-top: 20px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.deviceCode {
+  margin-top: 10px;
+  padding-bottom: 20px;
+  font-size: 18px;
+}
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+//隐藏图片上传框的css
+::v-deep.disabled {
+  .el-upload--picture-card {
+    display: none;
   }
-  </style>
\ No newline at end of file
+}
+</style>
\ No newline at end of file
diff --git a/src/views/material/purchase/goodsArrived/component/home.vue b/src/views/material/purchase/goodsArrived/component/home.vue
index 994bdef4..724f7982 100644
--- a/src/views/material/purchase/goodsArrived/component/home.vue
+++ b/src/views/material/purchase/goodsArrived/component/home.vue
@@ -787,8 +787,8 @@ export default {
                   message: "操作成功",
                   type: "success",
                 });
-                this.noticeOpen = false;
-                this.getTaskInfo();
+                this.showPeople = false;
+                this.getList();
               }
             });
           } else {
diff --git a/src/views/material/purchase/goodsBind/component/bindTools.vue b/src/views/material/purchase/goodsBind/component/bindTools.vue
index 8e1a419e..ae9fb5e4 100644
--- a/src/views/material/purchase/goodsBind/component/bindTools.vue
+++ b/src/views/material/purchase/goodsBind/component/bindTools.vue
@@ -1,619 +1,813 @@
 <template>
-    <!-- 编码绑定查看与编码页面 -->
-    <div>
-        <el-form
-            size="small"
-            :model="maForm"
-            :inline="true"
-            ref="maFormRef"
-            label-width="100px"
-        >
-            <el-form-item label="类型规格" prop="keyWord">
-                <el-input
-                    clearable
-                    maxlength="50"
-                    style="width: 240px"
-                    v-model="maForm.keyWord"
-                    placeholder="请输入类型规格"
-                />
-            </el-form-item>
-
-            <el-form-item label="机具厂家" prop="typeId">
-                <el-select
-                    clearable
-                    filterable
-                    style="width: 240px"
-                    v-model="maForm.typeId"
-                    placeholder="请选择机具厂家"
-                >
-                    <el-option
-                        :key="m.value"
-                        :value="m.value"
-                        :label="m.label"
-                        v-for="m in millList"
-                    />
-                </el-select>
-            </el-form-item>
-            <el-form-item label="出厂日期" prop="productDate">
-                <el-date-picker
-                    type="date"
-                    style="width: 240px"
-                    value-format="yyyy-MM-dd"
-                    placeholder="请选择出厂日期"
-                    v-model="maForm.productDate"
-                ></el-date-picker>
-            </el-form-item>
-            <el-form-item>
-                <el-button
-                    size="mini"
-                    type="primary"
-                    icon="el-icon-search"
-                    @click="handleQuery"
-                >
-                    查询
-                </el-button>
-                <el-button
-                    size="mini"
-                    icon="el-icon-refresh"
-                    @click="resetQuery"
-                >
-                    重置
-                </el-button>
-            </el-form-item>
-        </el-form>
-        <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-                <el-button
-                    plain
-                    size="mini"
-                    type="danger"
-                    icon="el-icon-plus"
-                    @click="handleBackAll"
-                >
-                    驳回
-                </el-button>
-            </el-col>
-        </el-row>
-
-        <el-table
-            v-loading="loading"
-            :data="codeList"
-            @selection-change="handleSelectionChange"
-        >
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column
-                align="center"
-                label="序号"
-                type="index"
-                width="55"
-            />
-            <el-table-column
-                align="center"
-                label="物资名称"
-                prop="maTypeName"
-                show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-                align="center"
-                label="规格型号"
-                prop="typeName"
-                show-overflow-tooltip
-            />
-            <el-table-column
-                align="center"
-                label="到货数量"
-                prop="purchaseNum"
-                show-overflow-tooltip
-            />
-            <el-table-column align="center" label="单位" prop="unitName" />
-            <el-table-column
-                align="center"
-                label="供应商"
-                prop="supplierName"
-                show-overflow-tooltip
-            />
-            <el-table-column
-                align="center"
-                label="出厂日期"
-                prop="productionTime"
-                show-overflow-tooltip
-            />
-
-            <el-table-column
-                label="相关配套资料"
-                align="center"
-                prop="checkUrlName"
-            >
-                <!-- <template slot-scope="scope">
-            <div @click="openGt(scope.row)" style="color: #02a7f0; cursor: pointer">
-                {{ '报告管理' }}
-            </div>
-            </template> -->
-            </el-table-column>
-
-            <el-table-column align="center" label="状态">
-                <template slot-scope="{ row }">
-                    <dict-tag
-                        :value="row.status"
-                        :options="dict.type.purchase_task_status"
-                    />
-                </template>
-            </el-table-column>
-
-            <el-table-column label="操作" align="center" width="300">
-                <template slot-scope="{ row }">
-                    <el-button
-                        size="mini"
-                        type="primary"
-                        icon="el-icon-zoom-in"
-                        @click="handleView(row)"
-                    >
-                        查看
-                    </el-button>
-                    <el-button
-                        plain
-                        size="mini"
-                        type="warning"
-                        @click="handleBind(row)"
-                    >
-                        <svg-icon icon-class="bind-icon" />
-                        绑定
-                    </el-button>
-                    <el-button
-                        size="mini"
-                        type="danger"
-                        icon="el-icon-close"
-                        @click="handleReject(row)"
-                    >
-                        驳回
-                    </el-button>
-                    <!-- 当从主列表点击查看时可显示二维码下载按钮 -->
-                    <el-button
-                        plain
-                        size="mini"
-                        type="success"
-                        @click="onDownloadQr(row)"
-                        v-if="queryType === 1"
-                    >
-                        <svg-icon icon-class="qr-icon" />
-                        下载
-                    </el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-
-        <pagination
-            v-show="total > 0"
-            :total="total"
-            :page.sync="maForm.pageNum"
-            :limit.sync="maForm.pageSize"
-            @pagination="getCodeList"
+  <!-- 编码绑定查看与编码页面 -->
+  <div>
+    <el-form
+      size="small"
+      :model="maForm"
+      :inline="true"
+      ref="maFormRef"
+      label-width="100px"
+    >
+      <el-form-item label="类型规格" prop="keyWord">
+        <el-input
+          clearable
+          maxlength="50"
+          style="width: 240px"
+          v-model="maForm.keyWord"
+          placeholder="请输入类型规格"
         />
+      </el-form-item>
 
-        <!-- 编码查看弹框-->
-        <el-dialog
-            width="70%"
-            append-to-body
-            title="查看编码"
-            :visible.sync="viewCodeVisible"
+      <el-form-item label="机具厂家" prop="typeId">
+        <el-select
+          clearable
+          filterable
+          style="width: 240px"
+          v-model="maForm.typeId"
+          placeholder="请选择机具厂家"
         >
-            <el-table border max-height="600px" :data="viewCodeList">
-                <el-table-column label="序号" align="center" type="index" />
-                <el-table-column
-                    align="center"
-                    label="类型名称"
-                    prop="materialName"
-                />
-                <el-table-column
-                    align="center"
-                    label="规格型号"
-                    prop="materialModel"
-                />
-                <el-table-column
-                    align="center"
-                    prop="maCode"
-                    label="设备编码"
-                />
-                <el-table-column
-                    align="center"
-                    label="绑定人员"
-                    prop="createBy"
-                />
-                <el-table-column
-                    align="center"
-                    label="绑定时间"
-                    prop="createTime"
-                />
-                <el-table-column
-                    align="center"
-                    label="出厂编号"
-                    prop="outFacCode"
-                />
-                <el-table-column
-                    align="center"
-                    label="出厂时间"
-                    prop="productDate"
-                />
-            </el-table>
-        </el-dialog>
+          <el-option
+            :key="m.value"
+            :value="m.value"
+            :label="m.label"
+            v-for="m in millList"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="出厂日期" prop="productDate">
+        <el-date-picker
+          type="date"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择出厂日期"
+          v-model="maForm.productDate"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          size="mini"
+          type="primary"
+          icon="el-icon-search"
+          @click="handleQuery"
+        >
+          查询
+        </el-button>
+        <el-button size="mini" icon="el-icon-refresh" @click="resetQuery">
+          重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          plain
+          size="mini"
+          type="danger"
+          icon="el-icon-plus"
+          @click="handleBackAll"
+        >
+          驳回
+        </el-button>
+      </el-col>
+    </el-row>
 
-        <!-- 绑定弹框-->
-        <el-dialog
-            width="70%"
-            append-to-body
-            title="编码绑定"
-            :visible.sync="bindCodeVisible"
-        >
-            <el-form
-                size="small"
-                :inline="true"
-                ref="queryFormBindRef"
-                :model="queryBindForm"
-                :rules="queryBindFormRules"
+    <el-table
+      v-loading="loading"
+      :data="codeList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column align="center" label="序号" type="index" width="55" />
+      <el-table-column
+        align="center"
+        label="物资名称"
+        prop="maTypeName"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        label="规格型号"
+        prop="typeName"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        align="center"
+        label="到货数量"
+        prop="purchaseNum"
+        show-overflow-tooltip
+      />
+      <el-table-column align="center" label="单位" prop="unitName" />
+      <!-- <el-table-column
+        align="center"
+        label="供应商"
+        prop="supplierName"
+        show-overflow-tooltip
+      /> -->
+      <el-table-column
+        align="center"
+        label="出厂日期"
+        prop="productionTime"
+        show-overflow-tooltip
+      />
+
+      <el-table-column label="相关配套资料" align="center" prop="bmFileInfos">
+        <template slot-scope="scope">
+          <div
+            style="color: rgb(2, 167, 240); cursor: pointer"
+            @click="openFileDialog(scope.row)"
+          >
+            报告管理
+          </div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" label="状态">
+        <template slot-scope="{ row }">
+          <dict-tag
+            :value="row.status"
+            :options="dict.type.purchase_task_status"
+          />
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作" align="center" width="300">
+        <template slot-scope="{ row }">
+          <el-button
+            size="mini"
+            type="primary"
+            icon="el-icon-zoom-in"
+            @click="handleView(row)"
+          >
+            查看
+          </el-button>
+          <el-button plain size="mini" type="warning" @click="handleBind(row)">
+            <svg-icon icon-class="bind-icon" />
+            绑定
+          </el-button>
+          <el-button
+            size="mini"
+            type="danger"
+            icon="el-icon-close"
+            @click="handleReject(row)"
+          >
+            驳回
+          </el-button>
+          <!-- 当从主列表点击查看时可显示二维码下载按钮 -->
+          <el-button
+            plain
+            size="mini"
+            type="success"
+            @click="onDownloadQr(row)"
+            v-if="queryType === 1"
+          >
+            <svg-icon icon-class="qr-icon" />
+            下载
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="maForm.pageNum"
+      :limit.sync="maForm.pageSize"
+      @pagination="getCodeList"
+    />
+
+    <!-- 编码查看弹框-->
+    <el-dialog
+      width="70%"
+      append-to-body
+      title="查看编码"
+      :visible.sync="viewCodeVisible"
+    >
+      <el-table border max-height="600px" :data="viewCodeList">
+        <el-table-column label="序号" align="center" type="index" />
+        <el-table-column align="center" label="类型名称" prop="maTypeName" />
+        <el-table-column align="center" label="规格型号" prop="typeName" />
+        <el-table-column align="center" label="设备编码" prop="maCode" />
+        <el-table-column align="center" label="绑定人员" prop="createBy" />
+        <el-table-column align="center" label="绑定时间" prop="createTime" />
+        <el-table-column align="center" label="出厂编号" prop="outFacCode" />
+        <!-- <el-table-column
+          align="center"
+          label="出厂时间"
+          prop="productionTime"
+        /> -->
+      </el-table>
+    </el-dialog>
+
+    <!-- 绑定弹框-->
+    <el-dialog
+      width="70%"
+      append-to-body
+      title="编码绑定"
+      :visible.sync="bindCodeVisible"
+    >
+      <el-form
+        size="small"
+        :inline="true"
+        ref="queryFormBindRef"
+        :model="queryBindForm"
+        :rules="queryBindFormRules"
+      >
+        <el-form-item label="前缀" prop="codePrefix">
+          <el-input
+            clearable
+            maxlength="20"
+            placeholder="请输入前缀"
+            v-model="queryBindForm.codePrefix"
+          />
+        </el-form-item>
+
+        <el-form-item label="后缀范围" prop="codeSuffixStart">
+          <el-input
+            clearable
+            placeholder="开始数值"
+            v-model="queryBindForm.codeSuffixStart"
+          />
+        </el-form-item>
+        <el-form-item prop="codeSuffixEnd">
+          <el-input
+            clearable
+            placeholder="结束数值"
+            v-model="queryBindForm.codeSuffixEnd"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" size="mini" @click="handleAdd"
+            >填充</el-button
+          >
+          <el-button type="primary" size="mini" @click="handleCodeBinding"
+            >绑定</el-button
+          >
+        </el-form-item>
+        <el-form-item>
+          <div style="margin-left: 10px">
+            当前待绑定数量：
+            <span style="font-weight: bold; color: #ff4949">
+              {{ waitBindNum }}
+            </span>
+          </div>
+        </el-form-item>
+      </el-form>
+      <el-table border max-height="600px" :data="codeTableList">
+        <el-table-column align="center" label="序号" type="index" />
+        <el-table-column align="center" label="设备名称" prop="maTypeName" />
+        <el-table-column align="center" label="规格型号" prop="typeName" />
+        <el-table-column align="center" label="设备编码">
+          <template slot-scope="{ row }">
+            <el-input clearable v-model="row.maCode" placeholder="请填写编码" />
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="出厂编号">
+          <template slot-scope="{ row }">
+            <el-input
+              clearable
+              v-model="row.outFacCode"
+              placeholder="请填写出厂编号"
+            />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column align="center" label="出厂时间">
+          <template slot-scope="{ row }">
+            <el-date-picker
+              type="date"
+              v-model="row.productDate"
+              placeholder="请选择出厂日期"
+            />
+          </template>
+        </el-table-column> -->
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="danger"
+              icon="el-icon-remove"
+              @click="handleRemove(scope.$index)"
             >
-                <el-form-item label="前缀" prop="codePrefix">
-                    <el-input
-                        clearable
-                        maxlength="20"
-                        placeholder="请输入前缀"
-                        v-model="queryBindForm.codePrefix"
-                    />
-                </el-form-item>
+              移除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
 
-                <el-form-item label="后缀范围" prop="codeSuffixStart">
-                    <el-input
-                        clearable
-                        placeholder="开始数值"
-                        v-model="queryBindForm.codeSuffixStart"
-                    />
-                </el-form-item>
-                <el-form-item prop="codeSuffixEnd">
-                    <el-input
-                        clearable
-                        placeholder="结束数值"
-                        v-model="queryBindForm.codeSuffixEnd"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" size="mini" @click="handleAdd"
-                        >填充</el-button
-                    >
-                    <el-button
-                        type="primary"
-                        size="mini"
-                        @click="handleCodeBinding"
-                        >绑定</el-button
-                    >
-                </el-form-item>
-                <el-form-item>
-                    <div style="margin-left: 10px">
-                        当前待绑定数量：
-                        <span style="font-weight: bold; color: #ff4949">
-                            {{ waitBindNum }}
-                        </span>
-                    </div>
-                </el-form-item>
-            </el-form>
-            <el-table border max-height="600px" :data="codeTableList">
-                <el-table-column align="center" label="序号" type="index" />
-                <el-table-column
-                    align="center"
-                    label="设备名称"
-                    prop="materialName"
-                />
-                <el-table-column
-                    align="center"
-                    label="规格型号"
-                    prop="materialModel"
-                />
-                <el-table-column align="center" label="设备编码">
-                    <template slot-scope="{ row }">
-                        <el-input
-                            clearable
-                            v-model="row.maCode"
-                            placeholder="请填写编码"
-                        />
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" label="出厂编号">
-                    <template slot-scope="{ row }">
-                        <el-input
-                            clearable
-                            v-model="row.outFacCode"
-                            placeholder="请填写出厂编码"
-                        />
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" label="出厂时间">
-                    <template slot-scope="{ row }">
-                        <el-date-picker
-                            type="date"
-                            v-model="row.productDate"
-                            placeholder="请选择出厂日期"
-                        />
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作" align="center">
-                    <template slot-scope="scope">
-                        <el-button
-                            size="mini"
-                            type="danger"
-                            icon="el-icon-remove"
-                            @click="handleRemove(scope.$index)"
-                        >
-                            移除
-                        </el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </el-dialog>
-    </div>
+    <el-dialog
+      title="报告管理"
+      :visible.sync="open"
+      width="900px"
+      append-to-body
+    >
+      <el-table :data="fileDataList" width="100%" height="350px">
+        <el-table-column label="序号" type="index" width="55" align="center" />
+        <el-table-column
+          label="报告类型"
+          align="center"
+          prop="dictLabel"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="文件名称"
+          align="center"
+          prop="name"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="类型名称"
+          align="center"
+          :show-overflow-tooltip="true"
+        >
+          <template>
+            <div>{{ this.rowData.maTypeName }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="规格型号"
+          align="center"
+          :show-overflow-tooltip="true"
+        >
+          <template>
+            <div>{{ this.rowData.typeName }}</div>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="报告日期" align="center" prop="orgName" :show-overflow-tooltip="true"/>
+                <el-table-column label="截止有效期" align="center" prop="orgName" :show-overflow-tooltip="true"/> -->
+        <el-table-column label="操作" align="center" width="100">
+          <template slot-scope="scope">
+            <div
+              style="
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+              "
+            >
+              <el-upload
+                ref="upload"
+                :limit="1"
+                :headers="upload.headers"
+                :action="upload.url"
+                :show-file-list="false"
+                accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
+                :on-success="handleFileSuccess"
+                :auto-upload="true"
+              >
+                <el-button
+                  size="mini"
+                  type="text"
+                  @click="beforeFileUpload(scope.row)"
+                >
+                  上传
+                </el-button>
+              </el-upload>
+
+              <el-button
+                size="mini"
+                type="text"
+                @click="picturePreview(scope.row)"
+                v-if="scope.row.url"
+              >
+                查看
+              </el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+
+    <!-- 图片查看弹窗 -->
+    <el-dialog :visible.sync="dialogVisible" width="500px" height="500px">
+      <img width="100%" height="500px" :src="dialogImageUrl" />
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import {
-    bindAllData,
-    getListDetailById,
-    getNewBuyBindListDetailsApi,
-} from '@/api/purchase/goodsBind'
+  bindAllData,
+  getListDetailById,
+  getNewBuyBindListDetailsApi,
+  getMaCodeInfo,
+} from "@/api/purchase/goodsBind";
+import { getToken } from "@/utils/auth";
+import {
+  uploadPurchaseFile,
+  getPurchaseFileList,
+} from "@/api/purchase/goodsAccept";
 
 export default {
-    name: 'BindTools',
-    dicts: ['purchase_task_status'],
-    props: {
-        // 查询参数 taskId
-        queryTaskId: {
-            type: [String, Number],
-            default: () => '',
-        },
-        // 查询参数 id
-        queryId: {
-            type: [String, Number],
-            default: () => '',
-        },
-        // 页面展示类型 1. 查看 2. 编码
-        queryType: {
-            type: Number,
-            default: () => 1,
-        },
+  name: "BindTools",
+  dicts: ["purchase_task_status"],
+  props: {
+    // 查询参数 taskId
+    queryTaskId: {
+      type: [String, Number],
+      default: () => "",
     },
-    data() {
-        return {
-            total: 0, //                列表总条数
-            waitBindNum: 0, //          待绑定数量
-            loading: false, //          列表 loading 遮罩层
-            showSearch: true, //        显示搜索条件
-            viewCodeVisible: false, //  查看弹框
-            bindCodeVisible: false, //  绑定弹框
-            millList: [{ label: '测试公司', value: 1 }], //            厂家列表
-            codeList: [], //            列表
-            selectList: [], //          列表复选框选中数据
-            viewCodeList: [], //        查看列表
-            codeTableList: [], //       填充列表
-            // 编码绑定表单数据源
-            queryBindForm: {
-                typeId: '', //          物资typeId
-                typeName: '', //        规格型号
-                codePrefix: '', //      编码前缀
-                maTypeName: '', //      物资名称
-                codeSuffixEnd: '', //   后缀结束
-                codeSuffixStart: '', // 后缀开始
-            },
-            // 编码校验规则
-            queryBindFormRules: {
-                codePrefix: [
-                    { required: true, message: '请输入前缀', trigger: 'blur' },
-                ],
-                codeSuffixStart: [
-                    {
-                        required: true,
-                        trigger: 'blur',
-                        message: '请输入前缀',
-                    },
-                    {
-                        pattern: /^[1-9][0-9]*$/,
-                        message: '请输入大于0且不能以0开头的正整数',
-                    },
-                ],
-                codeSuffixEnd: [
-                    {
-                        required: true,
-                        trigger: 'blur',
-                        message: '请输入后缀',
-                    },
+    // 查询参数 id
+    queryId: {
+      type: [String, Number],
+      default: () => "",
+    },
+    // 页面展示类型 1. 查看 2. 编码
+    queryType: {
+      type: Number,
+      default: () => 1,
+    },
+  },
+  data() {
+    return {
+      total: 0, //                列表总条数
+      waitBindNum: 0, //          待绑定数量
+      loading: false, //          列表 loading 遮罩层
+      showSearch: true, //        显示搜索条件
+      viewCodeVisible: false, //  查看弹框
+      bindCodeVisible: false, //  绑定弹框
+      millList: [{ label: "测试公司", value: 1 }], //            厂家列表
+      codeList: [], //            列表
+      selectList: [], //          列表复选框选中数据
+      viewCodeList: [], //        查看列表
+      codeTableList: [], //       填充列表
+      // 编码绑定表单数据源
+      queryBindForm: {
+        typeId: "", //          物资typeId
+        typeName: "", //        规格型号
+        codePrefix: "", //      编码前缀
+        maTypeName: "", //      物资名称
+        codeSuffixEnd: "", //   后缀结束
+        codeSuffixStart: "", // 后缀开始
+      },
+      // 编码校验规则
+      queryBindFormRules: {
+        codePrefix: [
+          { required: true, message: "请输入前缀", trigger: "blur" },
+        ],
+        codeSuffixStart: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "请输入前缀",
+          },
+          {
+            pattern: /^[1-9][0-9]*$/,
+            message: "请输入大于0且不能以0开头的正整数",
+          },
+        ],
+        codeSuffixEnd: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "请输入后缀",
+          },
 
-                    {
-                        pattern: /^[1-9][0-9]*$/,
-                        message: '请输入大于0且不能以0开头的正整数',
-                    },
-                ],
-            },
-            // 列表查询参数
-            maForm: {
-                pageNum: 1,
-                pageSize: 10,
-                taskId: '',
-                keyWord: '',
-                productDate: '',
-                taskStatus: 3,
-            },
+          {
+            pattern: /^[1-9][0-9]*$/,
+            message: "请输入大于0且不能以0开头的正整数",
+          },
+        ],
+      },
+      // 列表查询参数
+      maForm: {
+        pageNum: 1,
+        pageSize: 10,
+        taskId: "",
+        keyWord: "",
+        productDate: "",
+        taskStatus: 3,
+      },
+      taskId: "",
+      // 是否显示弹出层
+      open: false,
+      rowData: {},
+      fileDataList: [
+        { dictLabel: "合格证", fileType: "0", name: "", url: "" },
+        { dictLabel: "型式试验报告", fileType: "1", name: "", url: "" },
+        { dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" },
+        { dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" },
+        { dictLabel: "其他报告", fileType: "4", name: "", url: "" },
+      ],
+      //图片查看弹窗
+      dialogImageUrl: "",
+      dialogVisible: false,
+      //上传
+      upload: {
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/file/upload",
+      },
+    };
+  },
+  created() {
+    // 绑定按钮事件添加防抖 防止重复编码
+    this.handleCodeBinding = this.debounce(this.handleCodeBinding, 1000);
+  },
+  mounted() {
+    this.taskId = this.queryTaskId;
+    this.getCodeList();
+  },
+  methods: {
+    // 获取列表数据
+    async getCodeList() {
+      this.loading = true;
+      this.maForm.taskId = this.queryTaskId;
+      this.maForm.id = this.queryId;
+      this.maForm.statusList = [3, 13];
+      const { data: res } = await getNewBuyBindListDetailsApi(this.maForm);
+      this.loading = false;
+      // this.total = res.total
+      this.codeList = res.purchaseCheckDetailsList;
+      this.total = res.purchaseCheckDetailsList.length || 0;
+    },
+    // 搜索
+    handleQuery() {
+      this.getCodeList();
+    },
+    // 重置
+    resetQuery() {
+      this.resetForm("maFormRef");
+      this.getCodeList();
+    },
+    // 驳回 (批量)
+    handleBackAll() {
+      if (this.selectList.length < 1) {
+        this.$modal.msgError("请勾选数据！");
+        return;
+      }
+    },
+    // 列表复选框事件
+    handleSelectionChange(list) {
+      this.selectList = list;
+    },
+    // 查看
+    handleView(row) {
+      this.viewCodeVisible = true;
+      getMaCodeInfo({ taskId: row.taskId, typeId: row.typeId }).then(
+        (response) => {
+          this.viewCodeList = response.rows;
+          this.titleBind = "查看";
+          this.loadingTwo = false;
         }
+      );
+      // this.loadingTwo = true
+      // getListDetailById({ taskId: row.taskId, typeId: row.typeId }).then(
+      //     (response) => {
+      //         this.getListBind = response.rows
+      //         this.showBind = true
+      //         this.titleBind = '查看'
+      //         this.loadingTwo = false
+      //     },
+      // )
     },
-    created() {
-        // 绑定按钮事件添加防抖 防止重复编码
-        this.handleCodeBinding = this.debounce(this.handleCodeBinding, 1000)
+    // 绑定
+    handleBind(row) {
+      this.bindCodeVisible = true;
+      this.waitBindNum = row.checkNum - row.bindNum;
+      this.queryBindForm.typeId = row.typeId;
+      this.queryBindForm.typeName = row.typeName;
+      this.queryBindForm.maTypeName = row.maTypeName;
+      // this.queryBindTwo = {}
+      // this.resetForm('queryFormBind')
+      // this.titleTwo = '绑定'
+      // this.showTwo = true
+      // this.num = row.checkNum
+      // this.materialName = row.materialName
+      // this.materialModel = row.materialModel
+      // this.productDate = row.productDate
+      // this.taskIdTemp = row.taskId
+      // this.typeIdTemp = row.typeId
     },
-    mounted() {
-        this.getCodeList()
+    // 驳回
+    handleReject(row) {
+      this.$confirm("是否确定驳回", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {})
+        .catch(() => {});
     },
-    methods: {
-        // 获取列表数据
-        async getCodeList() {
-            this.loading = true
-            this.maForm.taskId = this.queryTaskId
-            this.maForm.id = this.queryId
-            this.maForm.statusList=[3,13]
-            const { data: res } = await getNewBuyBindListDetailsApi(this.maForm)
-            this.loading = false
-            // this.total = res.total
-            this.codeList = res.purchaseCheckDetailsList
-            this.total = res.purchaseCheckDetailsList.length || 0
-        },
-        // 搜索
-        handleQuery() {
-            this.getCodeList()
-        },
-        // 重置
-        resetQuery() {
-            this.resetForm('maFormRef')
-            this.getCodeList()
-        },
-        // 驳回 (批量)
-        handleBackAll() {
-            if (this.selectList.length < 1) {
-                this.$modal.msgError('请勾选数据！')
-                return
+
+    //文件管理
+    openFileDialog(row) {
+      this.rowData = row;
+      this.fileDataList = [
+        { dictLabel: "合格证", fileType: "0", name: "", url: "" },
+        { dictLabel: "型式试验报告", fileType: "1", name: "", url: "" },
+        { dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" },
+        { dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" },
+        { dictLabel: "其他报告", fileType: "4", name: "", url: "" },
+      ];
+      if (this.taskId == "") {
+        // console.log(this.rowData)
+        // console.log(this.rowData.bmFileInfos)
+        if (this.rowData.bmFileInfos.length > 0) {
+          this.rowData.bmFileInfos.forEach((item) => {
+            let index = this.fileDataList.findIndex(
+              (v) => v.fileType == item.fileType
+            );
+            this.fileDataList[index].name = item.name;
+            this.fileDataList[index].url = item.url;
+          });
+        }
+      } else {
+        this.getFileData();
+      }
+      this.open = true;
+    },
+    getFileData() {
+      let param = {
+        modelId: this.rowData.typeId,
+        taskType: 0,
+        taskId: this.rowData.taskId,
+      };
+      getPurchaseFileList(param)
+        .then((response) => {
+          if (response.rows.length > 0) {
+            response.rows.forEach((item) => {
+              let index = this.fileDataList.findIndex(
+                (v) => v.fileType == item.fileType
+              );
+              this.fileDataList[index].name = item.name;
+              this.fileDataList[index].url = item.url;
+            });
+          }
+        })
+        .catch(() => {});
+    },
+    beforeFileUpload(row) {
+      this.rowData.fileType = row.fileType;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      if (response.code == 200) {
+        if (this.taskId == "") {
+          //新增逻辑
+          // console.log(response)
+          // console.log(this.rowData)
+          // console.log(this.rowData.bmFileInfos)
+          let obj = {
+            taskId: this.taskId,
+            taskType: "0",
+            name: response.data.name,
+            url: response.data.url,
+            modelId: this.rowData.typeId,
+            fileType: this.rowData.fileType,
+            //   "dictLabel": this.rowData.dictLabel,
+          };
+          //根据文件上传返回更新文件管理弹窗内容
+          let index = this.fileDataList.findIndex(
+            (v) => v.fileType == this.rowData.fileType
+          );
+          this.fileDataList[index].name = response.data.name;
+          this.fileDataList[index].url = response.data.url;
+          //判断当前上传的文件是否已上传过-再往机具类型数据中插入
+          if (this.rowData.bmFileInfos.length > 0) {
+            let index2 = this.rowData.bmFileInfos.findIndex(
+              (v) => v.fileType == this.rowData.fileType
+            );
+            if (index2 > -1) {
+              //相同类型文件重复上传-替换
+              this.rowData.bmFileInfos.splice(index2, 0, obj);
+            } else {
+              //不存在相同类型文件-添加
+              this.rowData.bmFileInfos.push(obj);
             }
-        },
-        // 列表复选框事件
-        handleSelectionChange(list) {
-            this.selectList = list
-        },
-        // 查看
-        handleView(row) {
-            this.viewCodeVisible = true
-            // this.loadingTwo = true
-            // getListDetailById({ taskId: row.taskId, typeId: row.typeId }).then(
-            //     (response) => {
-            //         this.getListBind = response.rows
-            //         this.showBind = true
-            //         this.titleBind = '查看'
-            //         this.loadingTwo = false
-            //     },
-            // )
-        },
-        // 绑定
-        handleBind(row) {
-            this.bindCodeVisible = true
-            this.waitBindNum = row.purchaseNum
-            this.queryBindForm.typeId = row.typeId
-            this.queryBindForm.typeName = row.typeName
-            this.queryBindForm.maTypeName = row.maTypeName
-            // this.queryBindTwo = {}
-            // this.resetForm('queryFormBind')
-            // this.titleTwo = '绑定'
-            // this.showTwo = true
-            // this.num = row.checkNum
-            // this.materialName = row.materialName
-            // this.materialModel = row.materialModel
-            // this.productDate = row.productDate
-            // this.taskIdTemp = row.taskId
-            // this.typeIdTemp = row.typeId
-        },
-        // 驳回
-        handleReject(row) {
-            this.$confirm('是否确定驳回', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning',
+          } else {
+            this.rowData.bmFileInfos.push(obj);
+          }
+        } else {
+          //编辑逻辑
+          let param = {
+            taskId: this.taskId,
+            taskType: "0",
+            name: response.data.name,
+            url: response.data.url,
+            modelId: this.rowData.typeId,
+            fileType: this.rowData.fileType,
+            //   "dictLabel": this.rowData.dictLabel,
+          };
+          uploadPurchaseFile(param)
+            .then((response) => {
+              this.$modal.msgSuccess("上传成功");
+              this.getFileData();
             })
-                .then(() => {})
-                .catch(() => {})
-        },
-        // 下载
-        onDownloadQr() {
-            console.log('二维码下载')
-        },
-        // 填充
-        handleAdd() {
-            // 1. 校验表单
-            this.$refs.queryFormBindRef.validate((valid) => {
-                if (valid) {
-                    // 1.1 判断结束值是否大于开始值
-                    const {
-                        typeName,
-                        codePrefix,
-                        maTypeName,
-                        codeSuffixEnd,
-                        codeSuffixStart,
-                    } = this.queryBindForm
-                    if (parseInt(codeSuffixEnd) < parseInt(codeSuffixStart)) {
-                        this.$modal.msgError('结束值不可小于开始值')
-                        return
-                    }
-                    // 1.2 判断可编码数量
-                    let waitCodeNum = this.waitBindNum // 待编码数量
-                    // 可编码数量 如相减大于代编码数量 则取待编码数量 如小于待编码数量 则取相减后值
-                    let passCodeNUm =
-                        codeSuffixEnd - codeSuffixStart > waitCodeNum
-                            ? waitCodeNum
-                            : codeSuffixEnd - codeSuffixStart
-
-                    this.codeTableList = []
-                    // 1.3 循环生成编码
-                    for (let i = 0; i < passCodeNUm; i++) {
-                        const codeItem = {
-                            typeName,
-                            maTypeName,
-                            outFacCode: '',
-                            productDate: '',
-                            maCode: `${codePrefix}${
-                                parseInt(codeSuffixStart) + i
-                            }`,
-                        }
-                        this.codeTableList.push(codeItem)
-                    }
-                }
-            })
-        },
-        //  绑定
-        async handleCodeBinding() {
-            if (this.codeTableList.length < 1) {
-                this.$modal.msgError('请填充编码')
-                return
-            }
-
-            let isCodePass = false
-            try {
-                this.codeTableList.forEach((e, index) => {
-                    if (!e.maCode) {
-                        this.$modal.msgError(
-                            `序号为${index + 1}的编码为空，请填写`,
-                        )
-                        isCodePass = true
-                        throw new Error()
-                    }
-                })
-            } catch (error) {}
-
-            if (isCodePass) return
-            // 调后台接口
-            const res = await bindAllData({
-                taskId: this.queryTaskId,
-                dtoList: this.codeTableList,
-                typeId: this.queryBindForm.typeId,
-            })
-
-            console.log(res, '编码结果--')
-        },
-        //  移除
-        handleRemove(index) {
-            this.codeTableList.splice(index, 1)
-        },
-
-        // 防抖函数
-        debounce(fn, delay) {
-            let timer = null
-            return (...args) => {
-                if (timer) {
-                    clearTimeout(timer)
-                }
-                // 设置新的定时器，延迟执行函数
-                timer = setTimeout(() => {
-                    fn.apply(...args)
-                }, delay)
-            }
-        },
+            .catch(() => {
+              this.$modal.msgError("上传失败");
+            });
+        }
+      }
     },
-}
+    //图片查看
+    picturePreview(file) {
+      this.dialogImageUrl = file.url;
+      const parts = file.name.split(".");
+      const extension = parts.pop();
+      if (extension === "doc" || extension === "docx" || extension === "pdf") {
+        const windowName = file.name;
+        window.open(file.url, windowName);
+      } else {
+        this.dialogVisible = true;
+      }
+    },
+
+    // 下载
+    onDownloadQr() {
+      console.log("二维码下载");
+    },
+    // 填充
+    handleAdd() {
+      // 1. 校验表单
+      this.$refs.queryFormBindRef.validate((valid) => {
+        if (valid) {
+          // 1.1 判断结束值是否大于开始值
+          const {
+            typeName,
+            codePrefix,
+            maTypeName,
+            codeSuffixEnd,
+            codeSuffixStart,
+          } = this.queryBindForm;
+          if (parseInt(codeSuffixEnd) < parseInt(codeSuffixStart)) {
+            this.$modal.msgError("结束值不可小于开始值");
+            return;
+          }
+          // 1.2 判断可编码数量
+          let waitCodeNum = this.waitBindNum; // 待编码数量
+          // 可编码数量 如相减大于代编码数量 则取待编码数量 如小于待编码数量 则取相减后值
+          let passCodeNUm =
+            codeSuffixEnd - codeSuffixStart + 1 > waitCodeNum
+              ? waitCodeNum
+              : codeSuffixEnd - codeSuffixStart + 1;
+
+          this.codeTableList = [];
+          // 1.3 循环生成编码
+          for (let i = 0; i < passCodeNUm; i++) {
+            const codeItem = {
+              typeName,
+              maTypeName,
+              outFacCode: "",
+              //   productDate: "",
+              maCode: `${codePrefix}${parseInt(codeSuffixStart) + i}`,
+            };
+            this.codeTableList.push(codeItem);
+          }
+        }
+      });
+    },
+    //  绑定
+    async handleCodeBinding() {
+      if (this.codeTableList.length < 1) {
+        this.$modal.msgError("请填充编码");
+        return;
+      }
+
+      let isCodePass = false;
+      try {
+        this.codeTableList.forEach((e, index) => {
+          if (!e.maCode) {
+            this.$modal.msgError(`序号为${index + 1}的编码为空，请填写`);
+            isCodePass = true;
+            throw new Error();
+          }
+        });
+      } catch (error) {}
+
+      if (isCodePass) return;
+      // 调后台接口
+      const res = await bindAllData({
+        taskId: this.queryTaskId,
+        dtoList: this.codeTableList,
+        typeId: this.queryBindForm.typeId,
+      });
+      if (res.code == 200) {
+        this.$modal.msgSuccess("绑定成功");
+      }
+      this.getCodeList();
+      this.bindCodeVisible = false;
+      this.resetForm("queryFormBindRef");
+      this.codeTableList = [];
+      console.log(res, "编码结果--");
+    },
+    //  移除
+    handleRemove(index) {
+      this.codeTableList.splice(index, 1);
+    },
+
+    // 防抖函数
+    debounce(fn, delay) {
+      let timer = null;
+      return (...args) => {
+        if (timer) {
+          clearTimeout(timer);
+        }
+        // 设置新的定时器，延迟执行函数
+        timer = setTimeout(() => {
+          fn.apply(...args);
+        }, delay);
+      };
+    },
+  },
+};
 </script>
diff --git a/src/views/material/repair/testExamine/component/queryToolsApply.vue b/src/views/material/repair/testExamine/component/queryToolsApply.vue
index 3b445331..ceab022f 100644
--- a/src/views/material/repair/testExamine/component/queryToolsApply.vue
+++ b/src/views/material/repair/testExamine/component/queryToolsApply.vue
@@ -4,7 +4,6 @@
       :model="maForm"
       ref="maForm"
       size="small"
-      :rules="rules"
       :inline="true"
       label-width="120px"
     >
@@ -48,17 +47,17 @@
         <el-button
           type="success"
           plain
-          icon="el-icon-download"
+          icon="el-icon-check"
           size="mini"
           @click="handlePassAll"
-          >合格</el-button
+          >通过</el-button
         >
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
+          type="danger"
           plain
-          icon="el-icon-download"
+          icon="el-icon-close"
           size="mini"
           @click="handleFailAll"
           >驳回</el-button
@@ -71,18 +70,23 @@
       row-key="id"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center" />
+      <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="maTypeName"
+        prop="specificationType"
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="规格型号"
         align="center"
-        prop="typeName"
+        prop="machineTypeName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
@@ -95,41 +99,73 @@
       <el-table-column
         label="退料数量"
         align="center"
-        prop="storageNum"
+        prop="scrapNum"
         :show-overflow-tooltip="true"
       >
       </el-table-column>
       <el-table-column
         label="已修数量"
         align="center"
-        prop="preNum"
+        prop="repairedNum"
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="待修数量"
         align="center"
-        prop="alNum"
+        prop="waitNum"
         :show-overflow-tooltip="true"
-      />
+      >
+        <template slot-scope="scope">
+          <div>
+            {{ scope.row.repairNum - scope.row.repairedNum }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         label="管理模式"
         align="center"
         prop="alNum"
         :show-overflow-tooltip="true"
       />
+
+      <el-table-column
+        label="审核状态"
+        align="center"
+        prop="status"
+        :show-overflow-tooltip="true"
+      >
+        <template slot-scope="scope">
+          <div v-if="scope.row.status == '0'" style="color: #e6a23c">
+            {{ "未审核" }}
+          </div>
+          <div v-if="scope.row.status == '1'" style="color: #67c23a">
+            {{ "已审核" }}
+          </div>
+          <div v-if="scope.row.status == '2'" style="color: #f56c6c">
+            {{ "驳回" }}
+          </div>
+          <!-- <div v-else style="color: red;"></div> -->
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" width="300">
         <template slot-scope="scope">
           <el-button
             size="mini"
             style="margin-bottom: 10px"
             type="primary"
+            v-if="scope.row.status == '0'"
             @click="handlePass(scope.row)"
             >通过
           </el-button>
 
-          <el-button size="mini" type="danger" @click="handleFail(scope.row)"
+          <el-button
+            size="mini"
+            type="danger"
+            @click="handleFail(scope.row)"
+            v-if="scope.row.status == '0'"
             >驳回
           </el-button>
+          <div v-if="scope.row.status != '0'">-</div>
         </template>
       </el-table-column>
     </el-table>
@@ -144,7 +180,7 @@
 </template>
 
 <script>
-import { getAuditInfo } from "@/api/repair/testExamine";
+import { getAuditInfo, auditPass } from "@/api/repair/testExamine";
 import { getToken } from "@/utils/auth";
 export default {
   name: "QueryTools",
@@ -191,6 +227,8 @@ export default {
       projectList: [],
       // 表格数据
       equipmentList: [],
+      passTemp: [],
+      faliTemp: [],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -216,9 +254,25 @@ export default {
     this.getTaskInfo();
   },
   methods: {
+    //是否可用勾选框
+    selectable(row) {
+      if (row.status == "0") {
+        return true;
+      } else {
+        return false;
+      }
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.passTemp = [];
+      this.failTemp = [];
       this.ids = selection.map((item) => item.id);
+      selection.forEach((item) => {
+        this.passTemp.push({ id: item.id, status: "1" });
+      });
+      selection.forEach((item) => {
+        this.failTemp.push({ id: item.id, status: "2" });
+      });
       this.single = selection.length != 1;
       this.multiple = !selection.length;
     },
@@ -232,23 +286,29 @@ export default {
         this.loading = false;
       });
     },
+    //单个通过
     handlePass(row) {
+      const param = [];
+      param.push({ id: row.id, status: "1" });
       this.$modal
-        .confirm("是否确认合格所选择的数据项？")
+        .confirm("是否确认通过所选择的数据项？")
         .then(function () {
-          // return applySend(row.id);
+          return auditPass(param);
         })
         .then(() => {
           this.getTaskInfo();
-          this.$modal.msgSuccess("合格成功");
+          this.$modal.msgSuccess("通过成功");
         })
         .catch(() => {});
     },
+    //单个驳回
     handleFail(row) {
+      const param = [];
+      param.push({ id: row.id, status: "2" });
       this.$modal
         .confirm("是否确认驳回所选择的数据项？")
         .then(function () {
-          // return applySend(row.id);
+          return auditPass(param);
         })
         .then(() => {
           this.getTaskInfo();
@@ -256,6 +316,7 @@ export default {
         })
         .catch(() => {});
     },
+    //多个通过
     handlePassAll() {
       if (this.ids.length == 0) {
         this.$alert("请至少勾选一条审核数据", "提示", {
@@ -264,14 +325,15 @@ export default {
         });
         return;
       } else {
-        // applySendAll(this.sendTemp).then((response) => {
-        //   if (response.code == 200) {
-        //     this.$modal.msgSuccess("合格成功");
-        //   }
-        //  this.getTaskInfo();
-        // });
+        auditPass(this.passTemp).then((response) => {
+          if (response.code == 200) {
+            this.$modal.msgSuccess("通过成功");
+          }
+          this.getTaskInfo();
+        });
       }
     },
+    //多个驳回
     handleFailAll() {
       if (this.ids.length == 0) {
         this.$alert("请至少勾选一条审核数据", "提示", {
@@ -280,12 +342,12 @@ export default {
         });
         return;
       } else {
-        // applySendAll(this.sendTemp).then((response) => {
-        //   if (response.code == 200) {
-        //     this.$modal.msgSuccess("驳回成功");
-        //   }
-        //  this.getTaskInfo();
-        // });
+        auditPass(this.failTemp).then((response) => {
+          if (response.code == 200) {
+            this.$modal.msgSuccess("驳回成功");
+          }
+          this.getTaskInfo();
+        });
       }
     },
   },