From 95ba75749efea543a2c605cce9350d74951c2bc0 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Thu, 20 Feb 2025 15:28:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=8F=E5=85=8D=E8=AE=B0=E5=BD=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=AE=A1=E7=90=86=EF=BC=8C=E7=9B=98=E7=82=B9=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=9F=E9=A1=B5=E9=9D=A2=E6=90=AD=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/cost/cost.js                          |   18 +-
 src/api/repair/scrapLedgerReview.js           |    9 +
 src/views/business/discountApply/index.vue    | 1203 +++++++++++++++++
 src/views/business/reliefRecord/index.vue     |  147 +-
 src/views/material/basic/bmUnit/index.vue     |    2 +-
 src/views/material/cost/costDecreaseList.vue  |   70 +-
 src/views/material/part/partAccept/index.vue  |    3 +-
 .../material/part/partAcceptTwo/index.vue     |    1 -
 .../component/addToolsApply.vue               |   81 +-
 .../material/repair/scrapLedger/detail.vue    |  440 +-----
 .../material/repair/scrapLedger/index.vue     |  294 +---
 11 files changed, 1430 insertions(+), 838 deletions(-)
 create mode 100644 src/views/business/discountApply/index.vue

diff --git a/src/api/cost/cost.js b/src/api/cost/cost.js
index 2c83c50f..3dc97090 100644
--- a/src/api/cost/cost.js
+++ b/src/api/cost/cost.js
@@ -101,7 +101,23 @@ export function addRelief(params){
   })
 }
 
-
+// 减免费用详情
+export function getDiscountViewList(id) {
+  return request({
+    url: '/material/derateRecordQuery/' + id,
+    method: 'get'
+  })
+}
+
+
+// 减免费用修改
+export function editRelief(params){
+  return request({
+    url: '/material/slt_agreement_reduce/editApply',
+    method: 'post',
+    data: params
+  })
+}
 
 
 
diff --git a/src/api/repair/scrapLedgerReview.js b/src/api/repair/scrapLedgerReview.js
index 0cf87f1b..6e61f85e 100644
--- a/src/api/repair/scrapLedgerReview.js
+++ b/src/api/repair/scrapLedgerReview.js
@@ -35,4 +35,13 @@ export function ledgerReject(data) {
     method: 'post',
     data: data,
   })
+}
+
+//盘带报废编码获取下拉框
+export function getMachineListByCode(query) {
+  return request({
+    url: '/material/ma_machine/getMachineList',
+    method: 'get',
+    params: query
+  })
 }
\ No newline at end of file
diff --git a/src/views/business/discountApply/index.vue b/src/views/business/discountApply/index.vue
new file mode 100644
index 00000000..d6b7aa83
--- /dev/null
+++ b/src/views/business/discountApply/index.vue
@@ -0,0 +1,1203 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" v-show="showSearch" :inline="true" label-width="80px">
+            <el-form-item label="结算单位" prop="unitId">
+                <treeselect
+                    v-model="queryParams.unitId"
+                    :options="unitList" :normalizer="normalizer"
+                    :show-count="true" style="width: 215px" :disable-branch-nodes="true"
+                    noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
+                    placeholder="请选择单位" @select="unitChange"
+                /> 
+            </el-form-item>
+
+            <el-form-item label="结算工程" prop="projectId">
+                <treeselect
+                    v-model="queryParams.projectId"
+                    :options="proList" :normalizer="normalizer"
+                    :show-count="true" style="width: 215px" :disable-branch-nodes="true"
+                    noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
+                    placeholder="请选择工程" @select="proChange"
+                />
+            </el-form-item>
+
+            <el-form-item prop="agreementCode">
+                <el-input v-model="queryParams.agreementCode" placeholder="请输入协议号" clearable disabled/>
+            </el-form-item>
+
+            <el-form-item label="选择时间范围" prop="time" label-width="120px">
+              <el-date-picker
+                    v-model="queryParams.time"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    type="daterange"
+                    value-format="yyyy-MM-dd"
+                    style="width: 350px"
+                ></el-date-picker>
+            </el-form-item>
+
+      <div>
+            <el-form-item  prop="deviceName">
+              <el-input
+                    maxlength="50"
+                    v-model="queryParams.deviceName"
+                    placeholder="请输入检索设备名称"
+                    clearable
+                    style="width: 240px"
+                />
+            </el-form-item>
+            <el-form-item  prop="typeName">
+              <el-input
+                    maxlength="50"
+                    v-model="queryParams.typeName"
+                    placeholder="请输入检索规格型号"
+                    clearable
+                    style="width: 240px"
+                />
+            </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-button
+                type="danger"
+                icon="el-icon-minus"
+                plain
+                size="mini"
+                @click="handleApply"
+                :disabled="ids.length == 0"
+                >减免申请</el-button
+        >
+      </el-form-item>
+    </div>
+    </el-form>
+    <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+
+    <el-table
+      v-loading="loading"
+      :data="pushReviewList"
+      ref="multipleTable"
+      row-key="id"
+      @selection-change="handleSelectionChange"
+      :span-method="objectSpanMethod"
+      border
+    >
+    <el-table-column type="selection" width="55" align="center"  />
+      <el-table-column label="序号" align="center" width="80" type="index">
+        <template scope="scope">
+                    <span style="background-color: #f8f8f9;text-align: center;" v-if="scope.$index==pushReviewList.length-1">小计：</span>
+                    <span v-else>{{ scope.$index+1 }} </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备名称" align="center" prop="maName"  show-overflow-tooltip />
+      <el-table-column label="规格型号" align="center" prop="maModel"  show-overflow-tooltip />
+      <el-table-column label="单位" align="center" prop="maUnit"  show-overflow-tooltip />
+      <el-table-column label="租赁单价" align="center" prop="leasePrice" :show-overflow-tooltip="true">
+        <!-- <template slot-scope="scope" v-if="scope.row.num">
+            {{ scope.row.leasePrice.toFixed(2) }}
+        </template> -->
+      </el-table-column>
+      <el-table-column label="租赁数量" align="center" prop="num" :show-overflow-tooltip="true">
+          <!-- <template slot-scope="scope">
+              {{ scope.row.num.toFixed(2) }}
+          </template> -->
+      </el-table-column>
+      <el-table-column label="租赁日期" align="center" prop="startTime" :show-overflow-tooltip="true" />
+      <!-- <el-table-column label="归还数量" align="center" prop="backNum" :show-overflow-tooltip="true" /> -->
+      <el-table-column label="归还日期 " align="center" prop="endTime" :show-overflow-tooltip="true" />
+      <el-table-column label="租赁天数" align="center" prop="days" :show-overflow-tooltip="true">
+          <!-- <template slot-scope="scope" v-if="scope.row.num">
+              {{ Number(scope.row.leaseDays).toFixed(2) }}
+          </template> -->
+      </el-table-column>
+      <el-table-column label="租赁费用（元）" align="center" prop="leaseMoney" :show-overflow-tooltip="true">
+          <!-- <template slot-scope="scope" v-if="scope.row.costs">
+              {{ scope.row.costs.toFixed(2) }}
+          </template> -->
+      </el-table-column>  
+    </el-table>
+    <!-- <div class="tabelFirstBottom">
+                <div class="columnFirstNum">合计费用</div>
+                <div style="display: flex;width:58%">
+                <div class="columnFirst">{{ leaseAll.toFixed(2) }}</div>
+                <div class="columnFirst">{{ repairAll.toFixed(2) }}</div>
+                <div class="columnFirst">{{ scrapAll.toFixed(2) }}</div>
+                <div class="columnFirst">{{ loseAll.toFixed(2) }}</div>
+                <div class="columnFirst">{{ moneyAll.toFixed(2) }}</div>
+                <div class="columnFirstRight"></div>
+              </div>
+    </div> -->
+
+      <!-- 减免费用弹窗-->
+      <el-dialog :title="title" :visible.sync="showApply" width="1400px"  append-to-body @close="closeDiag">
+        <el-form :model="dialogAppy" ref="dialogAppy" :rules="rules"  label-width="120px">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="减免开始日期" prop="reduceStartTime">
+                <el-date-picker
+                  style="width: 80%"
+                  v-model="dialogAppy.reduceStartTime"
+                  value-format="yyyy-MM-dd"
+                  type="date"
+                  placeholder="请选择开始日期"
+                  @input="updateTableStartTime"
+                ></el-date-picker>
+              </el-form-item>
+            </el-col> 
+            <el-col :span="12">
+              <el-form-item label="减免结束日期" prop="reduceEndTime">
+                <el-date-picker
+                  style="width: 80%"
+                  v-model="dialogAppy.reduceEndTime"
+                  value-format="yyyy-MM-dd"
+                  type="date"
+                  placeholder="请选择结束日期"
+                  @input="updateTableEndTime"
+                ></el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="减免原因" prop="remark">
+                <el-input
+                  type="textarea"
+                  style="width: 80%"
+                  :rows="5"
+                  placeholder="请输入减免原因"
+                  v-model="dialogAppy.remark"
+                  maxlength="100"
+                  show-word-limit
+                >
+              </el-input>
+              </el-form-item>
+            </el-col> 
+            <el-col :span="12">
+              <el-form-item label="附件" prop="decreaseFile">
+                <el-upload
+                :action="uploadUrl"
+                :file-list="dialogAppy.decreaseFile"
+                :show-file-list="true"
+                :auto-upload="true"
+                :key="uploadKey"
+                :limit="3"
+                list-type="picture-card"
+                accept=".png, .jpg, .jpeg, .pdf"
+                :on-change="handleChangeBusinessList"
+                :class="{ disabledFbs: uploadDisabled }"
+                :on-preview="picturePreview"
+                :on-remove="handleRemoveElectricianImgList"
+              >
+
+                <!-- 文件格式下载，图片格式预览 -->
+                <div slot="file" slot-scope="{file}" >
+                  <img v-if="isImage(file)" class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+                  <div v-else class="picture-card-container">
+                    <img class="picture-card" :src="urlTemp" alt="">
+                    <p class="file-name">{{ file.name }}</p>
+                  </div>
+                  <span class="el-upload-list__item-actions">
+                    <span v-if="updataIf(file)" class="el-upload-list__item-delete" @click="handleDownload(file)">
+                    <i class="el-icon-download"/>
+                    </span>
+                    <span v-else class="el-upload-list__item-preview" @click="picturePreview(file)">
+                    <i class="el-icon-zoom-in"/>
+                    </span>
+                    <span class="el-upload-list__item-delete" @click="handleRemoveElectricianImgList(file)">
+                    <i class="el-icon-delete"/>
+                    </span>
+                  </span>
+                </div>
+                <i class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+
+        <el-row style="margin-bottom:20px;margin-left:20px">
+            <el-col :span="10">
+               <span style="font-family: Arial; font-size: 16px; position: relative; padding-left: 20px;">
+                 <span style="position: absolute; left: 0; top: 50%; transform: translateY(-50%); width: 10px; height: 10px; background-color: #f5f7fa; border-radius: 50%; display: inline-block;"></span>
+                 当前减免时间符合的数据条数：{{ num1 }}
+               </span>
+            </el-col> 
+            <el-col :span="8">
+                <span style="font-family: Arial; font-size: 16px; position: relative; padding-left: 20px;">
+                 <span style="position: absolute; left: 0; top: 50%; transform: translateY(-50%); width: 10px; height: 10px; background-color: #c0e6fa; border-radius: 50%; display: inline-block;"></span>
+                 当前减免时间不符合的数据条数：{{ num2 }}
+               </span>
+            </el-col>
+            <el-col :span="6">
+               <el-button
+                  type="success"
+                  size="small"
+                  @click="handleClean"
+                  v-if="num2>0"
+                  >一键去除</el-button
+                >
+            </el-col>
+          </el-row>
+
+        <el-table v-loading="loading"  row-key="id" :data="applyList"  
+        :span-method="objectSpanMethodApply"  
+        border  
+        :row-class-name="getRowClassName" >
+          <el-table-column label="减免数量" align="center" prop="reduceNum"  width="120px">
+            <template v-slot="scope">
+                    <span style="background-color: #f8f8f9;text-align: center;" v-if="scope.$index==applyList.length-1">小计：</span>
+                    <span v-else>                    
+                      <el-input
+                        v-model.number="scope.row.reduceNum"
+                        controls-position="right" type="number"
+                        style="width: 100%" 
+                        :min="0"
+                        @change="updateLeaseNum(scope.row)"
+                    ></el-input></span>
+            </template>
+          </el-table-column>
+          <el-table-column label="机具名称" align="center" prop="maName" :show-overflow-tooltip="true"/>
+          <el-table-column label="规格型号" align="center" prop="maModel" :show-overflow-tooltip="true"/>
+          <el-table-column label="领料数量" align="center" prop="num" :show-overflow-tooltip="true"/>
+          <el-table-column label="领料日期" align="center" prop="startTime" :show-overflow-tooltip="true"/>
+          <el-table-column label="退料日期" align="center" prop="endTime" :show-overflow-tooltip="true"/>
+          <el-table-column label="减免开始时间" align="center" prop="reduceStartTime"  width="160px">
+            <template slot-scope="scope">
+                    <el-date-picker
+                        v-model="scope.row.reduceStartTime"
+                        style="width: 100%"
+                        value-format="yyyy-MM-dd"
+                        type="date"  
+                        placeholder="开始时间"
+                        clearable
+                        v-if="scope.$index!=applyList.length-1"
+                        @input="updateLeaseDaysStart(scope.row)"
+                    ></el-date-picker>
+                </template>
+          </el-table-column>
+          <el-table-column label="减免结束时间" align="center" prop="reduceEndTime"  width="160px">
+            <template slot-scope="scope">
+                    <el-date-picker
+                        v-model="scope.row.reduceEndTime"
+                        style="width: 100%"
+                        value-format="yyyy-MM-dd"
+                        type="date"  
+                        placeholder="结束时间"
+                        clearable
+                        v-if="scope.$index!=applyList.length-1"
+                        @input="updateLeaseDaysEnd(scope.row)"
+                    ></el-date-picker>
+                </template>
+          </el-table-column>
+          <el-table-column label="租赁单价（元/天）" align="center" prop="leasePrice"  width="130px"/>
+          <el-table-column label="减免天数" align="center" prop="reduceDays" :show-overflow-tooltip="true"/>
+          <el-table-column label="减免费用（元）" align="center" width="126px" prop="reduceLeaseMoney" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+                  <span >{{ scope.row.reduceLeaseMoney.toFixed(2) }}</span>
+            </template>
+          </el-table-column>          
+        </el-table>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm" >确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-dialog>
+
+      <!-- 图片查看弹窗 -->
+      <el-dialog :visible.sync="dialogVisible" width="600px" height="600px">
+        <img width="100%" height="500px" :src="dialogImageUrl"/>
+      </el-dialog>
+
+  </div>
+</template> 
+  
+  <script>
+import {
+    getProjectList,
+    getUnitList,
+    getAgreementInfoById, 
+} from '@/api/back/index.js' 
+import {getReliefList,addRelief } from "@/api/cost/cost";
+import {downloadFile, downloadFileData} from '@/utils/download'
+import {getToken} from '@/utils/auth'
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+export default {
+    name: "",
+  data() {
+    return {
+      // 遮罩层
+      loading: false,
+      // 显示搜索条件
+      showSearch: true,
+
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+
+      // 总条数
+      total: 0,
+      // 费用推送审核表格数据
+      pushReviewList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 单位数据
+      unitList: [],
+      // 工程数据
+      proList: [],
+
+      //合计
+      moneyAll: 0,
+      //租赁合计
+      leaseAll: 0,
+
+      // 查询参数
+      queryParams: {
+        unitId: null,
+        projectId: null,
+        agreementId: '',
+        agreementCode: '',
+        time:null,
+      },
+
+      // 多选框选中数据
+      ids: [],
+
+      //减免申请list
+      applyList: [],
+      //备份所选的数据
+      applyListTemp: [],
+
+      //减免费用弹窗
+      showApply: false,
+      dialogLeaseList: [], //租赁费用列表
+      dialogAppy: {
+        reduceStartTime: undefined,
+        reduceEndTime: undefined,
+        remark: '',
+        decreaseFile: [],
+      },
+      rules: {
+        reduceStartTime: [
+          { required: true, message: "请选择减免开始日期", trigger: "change" },
+        ],
+        reduceEndTime: [
+          { required: true, message: "请选择减免结束日期", trigger: "change" },
+        ],
+        remark: [
+          { required: true, message: "减免原因不能为空", trigger: "blur" },
+        ],
+        decreaseFile: [
+          { required: true, message: "请上传减免附件", trigger: "change" },
+        ],
+      },
+      //图片查看弹窗
+      dialogImageUrl: '',
+      dialogVisible: false,
+      uploadKey: Date.now(),
+      //上传
+      // upload: {
+      //   // 设置上传的请求头部
+      //   headers: {Authorization: 'Bearer ' + getToken()},
+      //   // 上传的地址
+      //   url: process.env.VUE_APP_BASE_API + '/file/upload'
+      // },
+      uploadUrl: process.env.VUE_APP_BASE_API + "/file/upload", // 上传的图片服务器地址
+
+      delBusinessFileIdList: [], // 删除的图片id
+
+      //弹窗确定按钮是否能点击
+      btnDisabled: false,
+
+      //当前符合的数据条数
+      num1: 0,
+      //当前不符合的数据条数
+      num2: 0,
+    };
+  },
+  created() {
+    this.GetUnitData()
+    this.GetProData()
+    this.getList();
+  },
+  computed: {
+    //图片上传1张后，隐藏上传框
+    uploadDisabled() {
+      return this.dialogAppy.decreaseFile && this.dialogAppy.decreaseFile.length == 3
+    },
+  },
+  components: { Treeselect },
+  methods: {
+      getRowClassName({ row, rowIndex }) {
+      if (this.dialogAppy.reduceStartTime && this.dialogAppy.reduceEndTime) {
+        if ((!row.reduceStartTime || !row.reduceEndTime) && rowIndex!=this.applyList.length-1) {
+          return 'highlight-row'
+        }else{
+        }
+      }
+      return '';
+    },
+
+      //多选框选中数据
+      handleSelectionChange(val) {
+        this.ids = val.map(item => item.id);
+      },
+
+      /** 转换菜单数据结构 */
+      normalizer(node) {
+        if (node.children && !node.children.length) {
+          delete node.children;
+        }
+        return {
+          id: node.id,
+          label: node.name,
+          children: node.children,
+        };
+      },
+      // 获取 单位 列表数据
+      async GetUnitData() {
+        const params = {
+          // projectId: this.queryParams.projectId /*  */,
+        }
+        const res = await getUnitList(params)
+        this.unitList = res.data;
+
+        this.getAgreementInfo()
+      },
+      unitChange(val) {
+        setTimeout(() => {
+          this.queryParams.projectId = null
+          this.queryParams.agreementId = null
+          this.queryParams.agreementCode = null
+          this.GetProData()
+        }, 500)
+      },
+      // 获取 工程名称 列表数据
+      async GetProData() {
+        const params = {
+          unitId: this.queryParams.unitId,
+        }
+        const res = await getProjectList(params)
+        this.proList = res.data;
+
+        this.getAgreementInfo()
+      },
+      proChange(val) {
+        setTimeout(() => {
+          this.GetUnitData()
+        }, 500)
+      },
+
+      // 获取 协议id
+      async getAgreementInfo() {
+        if (this.queryParams.unitId && this.queryParams.projectId) {
+          const params = {
+            unitId: this.queryParams.unitId,
+            projectId: this.queryParams.projectId,
+          }
+          const res = await getAgreementInfoById(params)
+          console.log(res)
+          if (!(res.data && res.data.agreementId)) {
+            this.$message.error('当前单位和工程无协议！')
+            this.queryParams.unitId = null
+            this.queryParams.projectId = null
+            this.GetUnitData()
+            this.GetProData()
+          } else {
+            this.queryParams.agreementId = res.data.agreementId
+            this.queryParams.agreementCode = res.data.agreementCode
+          }
+        }
+      },
+
+
+      /** 查询列表 */
+     async getList() {
+        this.loading = true;
+      const params = {
+        deviceName: this.queryParams.deviceName,
+        typeName: this.queryParams.typeName,
+        agreementId: this.queryParams.agreementId,
+        startTime: this.queryParams.time && this.queryParams.time[0],
+        endTime: this.queryParams.time && this.queryParams.time[1],
+      }
+
+        getReliefList(params).then((response) => {
+          this.pushReviewList = response.data;
+          console.log('22222222',this.pushReviewList)
+          this.leaseAll = this.pushReviewList.reduce((total, item) => {
+            return total + Number(item.leaseMoney);
+          }, 0);
+          let obj = {
+            id:null,
+            leaseMoney: this.leaseAll,
+          }
+          this.pushReviewList.push(obj)
+        });
+
+        this.loading = false;
+      },
+
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.queryParams = {
+          unitId: null,
+          projectId: null,
+          agreementId: '',
+          agreementCode: '',
+        }
+        this.resetForm('queryForm')
+        this.queryParams.time=[]
+        this.handleQuery()
+      },
+
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.getList();
+      },
+
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map((item) => item.id)
+        this.single = selection.length != 1
+        this.multiple = !selection.length
+      },
+
+
+      /** 减免申请按钮 */
+      handleApply() {
+        if (this.ids.length == 0) {
+              this.$message({
+                type: 'warning',
+                message: '请选择数据',
+              })
+            return;
+        }
+        this.uploadKey = Date.now();
+        this.delBusinessFileIdList=[];
+        this.applyList=[];
+        this.applyListTemp=[];
+        // 去除 pushReviewList 数组的最后一个元素，将剩余元素赋值给 paramList
+        const paramList = this.pushReviewList.slice(0, -1);
+        paramList.forEach((item) => {
+          if (this.ids.includes(item.id)) {
+            // 创建对象的副本
+            const newItem = { ...item };
+            this.$set(newItem, 'reduceNum', newItem.num);
+            this.$set(newItem, 'reduceDays', 0);
+            this.$set(newItem, 'reduceLeaseMoney', 0);
+           this.applyList.push(newItem)
+          }
+        });
+        //添加结尾合计
+        let obj = {
+          id:0,
+          reduceNum: 0,
+          reduceLeaseMoney: 0,
+        }
+        this.applyList.push(obj)
+        this.applyListTemp = this.applyList;
+        this.showApply = true;
+        this.title = "减免申请";
+     },
+
+      // 合并单元格 rowIndex=行数  columnIndex=列数
+      // 这里是合并table的除表头外的第一行的第二列 + 除表头外的第二行的第二列
+      // 注意列数和行数从 0 开始
+      objectSpanMethod ({ row, column, rowIndex, columnIndex }) {
+        if (rowIndex === this.pushReviewList.length-1 && columnIndex == 1) {
+          let rowspan = 2
+          let colspan = 4
+          return { rowspan, colspan }
+        }
+        // 解决偏移的重要代码
+        // 重点在 else if 判断必须加因为合并单元格数据会出现偏移、
+        // 否则如果是 第二行 的 第二列 那么隐藏原有第二行 的 第二列的数据使他隐藏
+        else if (rowIndex === this.pushReviewList.length-1 && columnIndex < 4) {
+          return {
+            rowspan: 0,
+            colspan: 0
+          }
+        }
+      },
+
+      //减免费用申请弹窗合并
+      objectSpanMethodApply ({ row, column, rowIndex, columnIndex }) {
+        if (rowIndex === this.applyList.length-1 && columnIndex == 0) {
+
+          let rowspan = 1
+          let colspan = 4
+          return { rowspan, colspan }
+        }
+        // 解决偏移的重要代码
+
+        else if (rowIndex === this.applyList.length-1 && columnIndex < 4) {
+          return {
+            rowspan: 0,
+            colspan: 0
+          }
+        }
+      },
+
+    isImage(file) {
+    this.urlTemp = require('@/assets/file.png');
+      if (this.updataIf(file)) {
+        return false
+      } else {
+        return true
+      }
+    },
+
+    // 判断文件类型,图片预览，文件下载
+    updataIf(e) {
+      if (e.fileName) {
+        const parts = e.fileName.split('.');
+        const extension = parts.pop();
+        if (extension === 'png' || extension === 'jpeg' || extension === 'jpg') {
+          return false
+        } else {
+          return true
+        }
+      } else {
+        const parts = e.name.split('.');
+        const extension = parts.pop();
+        if (extension === 'png' || extension === 'jpeg' || extension === 'jpg') {
+          return false
+        } else {
+          return true
+        }
+      }
+    },
+
+    //附件
+    handleChangeBusinessList(file, fileList) {
+      const fileListTemp = fileList.filter(item => {
+        return item.uid != file.uid
+      });
+      const parts = file.name.split('.');
+      const extension = parts.pop();
+      if (fileList.length > 3) {
+        this.$message.warning('最多上传3张附件')
+        fileList = fileList.filter(item => {
+          return item.uid != file.uid
+        })
+      } else if (!(extension === 'pdf' || extension === 'png' || extension === 'jpg' || extension === 'jpeg')) {
+        this.$message.warning('文件格式不正确')
+        fileList = fileList.filter(item => {
+          return item.uid != file.uid
+        })
+      } else if (file.size > 1024 * 1024 * 10) {
+        this.$message.warning('文件大小不能超过10Mb')
+        fileList = fileList.filter(item => {
+          return item.uid != file.uid
+        })
+      } else if (file.name.length > 40) {
+        this.$message.warning('文件名长度不能超过40个字符')
+        fileList = fileList.filter(item => {
+          return item.uid != file.uid
+        })
+      } else if (fileListTemp.some(item => item.name === file.name)) {
+        this.$message.warning('文件名重复')
+        fileList = fileList.filter(item => {
+          return item.uid != file.uid
+        })
+      }
+      fileList.forEach(file => {
+        if (extension === 'pdf') {
+          this.urlTemp = require('../../../assets/file.png');
+
+        }
+      });
+      this.dialogAppy.decreaseFile = fileList;
+      // 手动触发表单验证
+      this.$refs.dialogAppy.validateField('decreaseFile');
+
+    },
+
+    handleDownload(file) {
+      console.log(file)
+      if (file.status === 'ready') {
+        downloadFile({fileName: file.name, fileData: file.raw, fileType: 'application/vnd.ms-excel;charset=utf-8'})
+      } else if (file.status === 'success') {
+
+        downloadFileData({fileName: file.name, fileUrl: file.url})
+        // downloadFileData({ fileName: file.name,fileUrl:file.url })
+      }
+    },
+
+    //上传组件-图片查看
+    picturePreview(file) {
+      this.dialogImageUrl = file.url.replaceAll('#','%23');
+      const parts = file.name.split('.');
+      const extension = parts.pop();
+      if (extension === 'pdf') {
+        const windowName = file.name;
+        window.open(file.url, windowName)
+      } else {
+        this.dialogVisible = true
+      }
+    },
+
+    //上传组件-图片删除
+    handleRemoveElectricianImgList(file, fileList) {
+      let sum = 0
+      this.dialogAppy.decreaseFile.forEach((item, index) => {
+        if (item.uid == file.uid) {
+          sum = index
+        }
+      })
+      this.dialogAppy.decreaseFile.splice(sum, 1)
+      if (file.status == 'success') {
+        this.delBusinessFileIdList.push(file.url);
+      }
+    },
+
+    updateNum() {
+        if (this.dialogAppy.reduceStartTime && this.dialogAppy.reduceEndTime) {
+            this.num2 = this.applyList.slice(0,-1).filter(item =>!item.reduceStartTime ||!item.reduceEndTime).length;
+            this.num1 = this.applyList.filter(item => item.reduceStartTime && item.reduceEndTime).length;
+        }
+    },
+
+    // 更新表格中所有数据的减免开始时间
+    updateTableStartTime() {
+      this.applyList = this.applyListTemp;
+      if (this.dialogAppy.reduceEndTime) {
+        const pickStartTime = new Date(this.dialogAppy.reduceStartTime);
+        const pickEndTime = new Date(this.dialogAppy.reduceEndTime);
+        if(pickStartTime > pickEndTime){
+          this.$modal.msgError('开始日期不能大于结束日期')
+          return;
+        }
+        this.applyList.slice(0,-1).forEach(item => {
+          const startTime = new Date(item.reduceStartTime);
+          const endTime = new Date(item.reduceEndTime);
+          const startTimeTemp = item.reduceStartTime;
+          const endTimeTemp = item.reduceEndTime;
+
+          const oneDay = 24 * 60 * 60 * 1000; // 一天的毫秒数
+          if(pickStartTime<=new Date(item.startTime) && pickEndTime>=new Date(item.endTime)){
+            this.$set(item, 'reduceStartTime', new Date(item.startTime)); 
+            this.$set(item,'reduceEndTime', new Date(item.endTime));
+            const diffDays = Math.ceil(Math.abs((item.reduceEndTime - item.reduceStartTime) / oneDay)) + (item.reduceEndTime - item.reduceStartTime === 0 ? 1 : 1);
+            this.$set(item, 'reduceDays', diffDays);
+            if(item.reduceNum && item.reduceDays && item.leasePrice){
+              this.$set(item, 'reduceLeaseMoney', item.reduceDays*item.leasePrice*item.reduceNum);
+            }
+          }else if(pickStartTime>=new Date(item.startTime) && pickEndTime<=new Date(item.endTime)){
+            this.$set(item,'reduceStartTime', pickStartTime);
+            this.$set(item,'reduceEndTime', pickEndTime); 
+            const diffDays = Math.ceil(Math.abs((item.reduceEndTime - item.reduceStartTime) / oneDay)) + (item.reduceEndTime - item.reduceStartTime === 0 ? 1 : 1);
+            this.$set(item, 'reduceDays', diffDays);
+            if(item.reduceNum && item.reduceDays && item.leasePrice){
+              this.$set(item, 'reduceLeaseMoney', item.reduceDays*item.leasePrice*item.reduceNum);
+            }
+          }else if(pickStartTime>=new Date(item.startTime) && pickEndTime>=new Date(item.endTime) && pickStartTime<=new Date(item.endTime)){
+            this.$set(item,'reduceStartTime', pickStartTime);
+            this.$set(item,'reduceEndTime', new Date(item.endTime)); 
+            const diffDays = Math.ceil(Math.abs((item.reduceEndTime - item.reduceStartTime) / oneDay)) + (item.reduceEndTime - item.reduceStartTime === 0 ? 1 : 1);
+            this.$set(item, 'reduceDays', diffDays);
+            if(item.reduceNum && item.reduceDays && item.leasePrice){
+              this.$set(item, 'reduceLeaseMoney', item.reduceDays*item.leasePrice*item.reduceNum);
+            }
+          }else if(pickStartTime<=new Date(item.startTime) && pickEndTime<=new Date(item.endTime) && pickEndTime>=new Date(item.startTime)){
+            this.$set(item,'reduceStartTime', new Date(item.startTime));
+            this.$set(item,'reduceEndTime', pickEndTime);  
+            const diffDays = Math.ceil(Math.abs((item.reduceEndTime - item.reduceStartTime) / oneDay)) + (item.reduceEndTime - item.reduceStartTime === 0 ? 1 : 1);
+            this.$set(item, 'reduceDays', diffDays); 
+            if(item.reduceNum && item.reduceDays && item.leasePrice){
+              this.$set(item, 'reduceLeaseMoney', item.reduceDays*item.leasePrice*item.reduceNum);
+            }          
+          }else if(pickStartTime>=new Date(item.startTime) && pickStartTime>=new Date(item.endTime) ){
+            this.$set(item,'reduceStartTime', null);
+            this.$set(item,'reduceEndTime', null); 
+            this.$set(item, 'reduceDays', 0); 
+           this.$set(item, 'reduceLeaseMoney', 0);
+          }else if(pickEndTime<=new Date(item.startTime) && pickEndTime<=new Date(item.endTime)){
+            this.$set(item,'reduceStartTime', null);
+            this.$set(item,'reduceEndTime', null);
+            this.$set(item, 'reduceDays', 0); 
+            this.$set(item, 'reduceLeaseMoney', 0);
+          }
+
+
+          // if (startTimeTemp!=null && endTimeTemp!=null && startTime.getTime()!=0 && endTime.getTime()!=0 && endTime.getTime() >= startTime.getTime()) {
+          //   const oneDay = 24 * 60 * 60 * 1000; // 一天的毫秒数
+          //   const diffDays = Math.ceil(Math.abs((endTime - startTime) / oneDay)) + (endTime - startTime === 0 ? 1 : 1);
+          //   this.$set(item, 'reduceDays', diffDays);
+          //   if(item.reduceNum && item.reduceDays && item.leasePrice){
+          //     this.$set(item, 'reduceLeaseMoney', item.reduceDays*item.leasePrice*item.reduceNum);
+          //   }
+          //   // row.leaseDays = diffDays;
+          // }else if(startTimeTemp!=null && item.reduceEndTime==null && startTimeTemp>=item.startTime && startTimeTemp<=item.endTime){
+          //   this.$set(item, 'reduceEndTime', startTime); 
+          //   this.$set(item, 'reduceDays', 0); 
+          //   this.$set(item, 'reduceLeaseMoney', 0);
+          // }
+          // else {
+          // this.$set(item, 'reduceStartTime', null); 
+          // // 如果日期无效，将减免天数设为 0 或者清空
+          // this.$set(item, 'reduceDays', 0); 
+          // this.$set(item, 'reduceLeaseMoney', 0);
+          // }
+          this.applyList[this.applyList.length-1].reduceLeaseMoney = this.applyList.slice(0,-1).reduce((total, item) => {
+          return total + Number(item.reduceLeaseMoney);
+        }, 0);
+      });
+      }
+      this.updateNum()
+    },
+    // 更新表格中所有数据的减免结束时间
+    updateTableEndTime() {
+      this.applyList = this.applyListTemp;
+      // const pickEndTime = new Date(this.dialogAppy.reduceEndTime);
+      // this.applyList.slice(0,-1).forEach(item => {
+      //    let validEndTime = item.endTime ? new Date(item.endTime) : new Date();
+      //    console.log('666666666666',item.startTime,pickEndTime)
+      //   if(pickEndTime < new Date(item.startTime) || pickEndTime > validEndTime){
+          
+      //     this.$set(item, 'reduceEndTime', null);
+      //   }else{
+      //     this.$set(item, 'reduceEndTime', this.dialogAppy.reduceEndTime);
+      //   }
+      //   // item.reduceStartTime = this.dialogAppy.reduceStartTime;
+      // });
+      if (this.dialogAppy.reduceStartTime) {
+        const pickStartTime = new Date(this.dialogAppy.reduceStartTime);
+        const pickEndTime = new Date(this.dialogAppy.reduceEndTime);
+        console.log('dadad',pickStartTime,pickEndTime)
+        if(pickStartTime > pickEndTime){
+          this.$modal.msgError('结束日期不能小于开始日期')
+          return;
+        }
+        this.applyList.slice(0,-1).forEach(item => {
+          const startTime = new Date(item.reduceStartTime);
+          const endTime = new Date(item.reduceEndTime);
+          const startTimeTemp = item.reduceStartTime;
+          const endTimeTemp = item.reduceEndTime;
+
+          const oneDay = 24 * 60 * 60 * 1000; // 一天的毫秒数
+          if(pickStartTime<=new Date(item.startTime) && pickEndTime>=new Date(item.endTime)){
+            this.$set(item, 'reduceStartTime', new Date(item.startTime)); 
+            this.$set(item,'reduceEndTime', new Date(item.endTime));
+            const diffDays = Math.ceil(Math.abs((item.reduceEndTime - item.reduceStartTime) / oneDay)) + (item.reduceEndTime - item.reduceStartTime === 0 ? 1 : 1);
+            this.$set(item, 'reduceDays', diffDays);
+            if(item.reduceNum && item.reduceDays && item.leasePrice){
+              this.$set(item, 'reduceLeaseMoney', item.reduceDays*item.leasePrice*item.reduceNum);
+            }
+          }else if(pickStartTime>=new Date(item.startTime) && pickEndTime<=new Date(item.endTime)){
+            this.$set(item,'reduceStartTime', pickStartTime);
+            this.$set(item,'reduceEndTime', pickEndTime); 
+            const diffDays = Math.ceil(Math.abs((item.reduceEndTime - item.reduceStartTime) / oneDay)) + (item.reduceEndTime - item.reduceStartTime === 0 ? 1 : 1);
+            this.$set(item, 'reduceDays', diffDays);
+            if(item.reduceNum && item.reduceDays && item.leasePrice){
+              this.$set(item, 'reduceLeaseMoney', item.reduceDays*item.leasePrice*item.reduceNum);
+            }
+          }else if(pickStartTime>=new Date(item.startTime) && pickEndTime>=new Date(item.endTime) && pickStartTime<=new Date(item.endTime)){
+            this.$set(item,'reduceStartTime', pickStartTime);
+            this.$set(item,'reduceEndTime', new Date(item.endTime)); 
+            const diffDays = Math.ceil(Math.abs((item.reduceEndTime - item.reduceStartTime) / oneDay)) + (item.reduceEndTime - item.reduceStartTime === 0 ? 1 : 1);
+            this.$set(item, 'reduceDays', diffDays);
+            if(item.reduceNum && item.reduceDays && item.leasePrice){
+              this.$set(item, 'reduceLeaseMoney', item.reduceDays*item.leasePrice*item.reduceNum);
+            }
+          }else if(pickStartTime<=new Date(item.startTime) && pickEndTime<=new Date(item.endTime) && pickEndTime>=new Date(item.startTime)){
+            this.$set(item,'reduceStartTime', new Date(item.startTime));
+            this.$set(item,'reduceEndTime', pickEndTime);  
+              console.log('xxxxxxsadadadsa',item.reduceEndTime,item.reduceStartTime)
+            const diffDays = Math.ceil(Math.abs((item.reduceEndTime - item.reduceStartTime) / oneDay)) + (item.reduceEndTime - item.reduceStartTime === 0 ? 1 : 1);
+            this.$set(item, 'reduceDays', diffDays); 
+            if(item.reduceNum && item.reduceDays && item.leasePrice){
+              this.$set(item, 'reduceLeaseMoney', item.reduceDays*item.leasePrice*item.reduceNum);
+            }          
+          }else if(pickStartTime>=new Date(item.startTime) && pickStartTime>=new Date(item.endTime) ){
+            this.$set(item,'reduceStartTime', null);
+            this.$set(item,'reduceEndTime', null); 
+            this.$set(item, 'reduceDays', 0); 
+           this.$set(item, 'reduceLeaseMoney', 0);
+          }else if(pickEndTime<=new Date(item.startTime) && pickEndTime<=new Date(item.endTime)){
+            this.$set(item,'reduceStartTime', null);
+            this.$set(item,'reduceEndTime', null);
+            this.$set(item, 'reduceDays', 0); 
+            this.$set(item, 'reduceLeaseMoney', 0);
+          }
+          this.applyList[this.applyList.length-1].reduceLeaseMoney = this.applyList.slice(0,-1).reduce((total, item) => {
+          return total + Number(item.reduceLeaseMoney);
+        }, 0);
+      });
+      }
+            this.updateNum()
+    },
+
+    //table中时间改变
+    updateLeaseDaysStart(row) {
+      const startTime = new Date(row.reduceStartTime);
+      const startTimeTemp = row.reduceStartTime
+      console.log('1111111111111',startTime)
+      const endTime = new Date(row.reduceEndTime);
+       const endTimeTemp = row.reduceEndTime     
+      let pickStartTime = new Date(row.startTime);
+      let pickEndTime = null;
+      if(row.endTime==null){
+         pickEndTime = new Date();
+      }else{
+         pickEndTime = new Date(row.endTime);
+      }
+      // 判断减免开始时间和结束时间是否在领料日期和退料日期之间
+      if (startTime < pickStartTime || startTime > pickEndTime) {
+        console.log('2222222222222',startTime, pickStartTime, pickEndTime)
+        this.$set(row, 'reduceStartTime', null);
+        this.$set(row, 'reduceDays', 0); 
+        this.$set(row, 'reduceLeaseMoney', 0); 
+        this.$modal.msgError('请选择有效的减免开始时间！!') 
+      }else if (startTimeTemp!=null && endTimeTemp!=null && startTime.getTime()!=0 && endTime.getTime()!=0 && endTime.getTime() >= startTime.getTime()) {
+        const oneDay = 24 * 60 * 60 * 1000; // 一天的毫秒数
+        const diffDays = Math.ceil(Math.abs((endTime - startTime) / oneDay)) + (endTime - startTime === 0 ? 1 : 1);
+        this.$set(row, 'reduceDays', diffDays);
+        if(row.reduceNum && row.reduceDays && row.leasePrice){
+          this.$set(row, 'reduceLeaseMoney', row.reduceDays*row.leasePrice*row.reduceNum);
+        }
+        // row.leaseDays = diffDays;
+      }else if(endTimeTemp!=null && endTime.getTime()<startTime.getTime()){
+                console.log('333333333',endTime, startTime)
+        // 如果日期无效，将减免天数设为 0 或者清空
+        this.$set(row, 'reduceStartTime', null);
+        this.$set(row, 'reduceDays', 0); 
+        this.$set(row, 'reduceLeaseMoney', 0); 
+        this.$modal.msgError('请选择有效的减免开始时间！') 
+      }else{
+        this.$set(row, 'reduceDays', 0); 
+        this.$set(row, 'reduceLeaseMoney', 0);   
+        }
+        this.applyList[this.applyList.length-1].reduceLeaseMoney = this.applyList.slice(0,-1).reduce((total, item) => {
+          return total + Number(item.reduceLeaseMoney);
+        }, 0);
+        this.updateNum()
+    },
+
+    updateLeaseDaysEnd(row) {
+      const startTime = new Date(row.reduceStartTime);
+      const startTimeTemp = row.reduceStartTime
+      const endTimeTemp = row.reduceEndTime
+      const endTime = new Date(row.reduceEndTime);
+      let pickStartTime = new Date(row.startTime);
+      let pickEndTime = null;
+      if(row.endTime==null){
+         pickEndTime = new Date();
+      }else{
+         pickEndTime = new Date(row.endTime);
+      }
+      // 判断减免开始时间和结束时间是否在领料日期和退料日期之间
+    if( endTime < pickStartTime || endTime > pickEndTime){
+        this.$set(row, 'reduceEndTime', null);
+        this.$set(row, 'reduceDays', 0); 
+        this.$set(row, 'reduceLeaseMoney', 0); 
+        this.$modal.msgError('请选择有效的减免结束时间！') 
+      }else if (startTimeTemp!=null && endTimeTemp!=null && startTime.getTime()!=0 && endTime.getTime()!=0 && endTime.getTime() >= startTime.getTime()) {
+        const oneDay = 24 * 60 * 60 * 1000; // 一天的毫秒数
+        const diffDays = Math.ceil(Math.abs((endTime - startTime) / oneDay)) + (endTime - startTime === 0 ? 1 : 1);
+        // const diffDays = Math.round(Math.abs((endTime - startTime) / oneDay));
+        this.$set(row, 'reduceDays', diffDays);
+        if(row.reduceNum && row.reduceDays && row.leasePrice){
+          this.$set(row, 'reduceLeaseMoney', row.reduceDays*row.leasePrice*row.reduceNum);
+        }
+        // row.leaseDays = diffDays;
+      }else if(startTimeTemp!=null && endTime.getTime()<startTime.getTime()){
+        // 如果日期无效，将减免天数设为 0 或者清空
+        this.$set(row, 'reduceEndTime', null);
+        this.$set(row, 'reduceDays', 0); 
+        this.$set(row, 'reduceLeaseMoney', 0); 
+        this.$modal.msgError('请选择有效的减免结束时间！') 
+      }else{
+        this.$set(row, 'reduceDays', 0);
+        this.$set(row, 'reduceLeaseMoney', 0);
+        }
+        this.applyList[this.applyList.length-1].reduceLeaseMoney = this.applyList.slice(0,-1).reduce((total, item) => {
+          return total + Number(item.reduceLeaseMoney);
+        }, 0);
+        this.updateNum()
+    },
+
+    //table中数量改变
+    updateLeaseNum(row) {
+      if (row.reduceNum > row.num) {
+      this.$message.error('减免数量不能大于领料数量');
+      }else{
+        if(row.reduceNum && row.leasePrice && row.reduceDays){
+        this.$set(row, 'reduceLeaseMoney', row.reduceDays*row.leasePrice*row.reduceNum);
+      }
+        this.applyList[this.applyList.length-1].reduceLeaseMoney = this.applyList.slice(0,-1).reduce((total, item) => {
+          return total + Number(item.reduceLeaseMoney);
+        }, 0); 
+      }
+    },
+
+
+    //减免申请确认按钮
+     submitForm() {
+      this.$refs.dialogAppy.validate((valid) => {
+        if (valid) {
+          let index =this.applyList.slice(0,-1).findIndex(item=>new Date(item.reduceEndTime).getTime() < new Date(item.reduceStartTime).getTime())
+          let index2 =this.applyList.slice(0,-1).findIndex(item=>item.reduceNum > item.num)
+          let index3 =this.applyList.slice(0,-1).findIndex(item=>item.reduceNum == 0)
+          let index4 =this.applyList.slice(0,-1).findIndex(item=>isNaN(new Date(item.reduceStartTime).getTime()) || new Date(item.reduceStartTime).getTime()==0)
+          let index5 =this.applyList.slice(0,-1).findIndex(item=>isNaN(new Date(item.reduceEndTime).getTime()) || new Date(item.reduceEndTime).getTime()==0)
+          if(index3>-1){
+            this.$modal.msgError('减免数量不能为0！') 
+          }else if(index4>-1){
+            this.$modal.msgError('请先去除减免时间不符合的数据！') 
+          }else if(index5>-1){
+            this.$modal.msgError('请先去除减免时间不符合的数据！')
+          }else if(index2>-1){
+            this.$modal.msgError('减免数量不能大于领料数量！')
+          }else if(index>-1){
+            this.$modal.msgError('请先去除减免时间不符合的数据！')
+          }else{
+            const param = {
+              agreementId: this.queryParams.agreementId,
+              reduceStartTime: this.dialogAppy.reduceStartTime,
+              reduceEndTime: this.dialogAppy.reduceEndTime,
+              bmFileInfos: this.dialogAppy.decreaseFile,
+              remark: this.dialogAppy.remark,
+              detailList: this.applyList.slice(0,-1),
+              }
+              addRelief(param).then((response) => {
+                if (response.code == 200) {
+                  this.$modal.msgSuccess("提交成功");
+                  this.confirmShow = false;
+                  this.getList();
+                  this.showApply = false;
+                  this.$refs.multipleTable.clearSelection();
+                }
+              });
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+
+    //减免申请取消按钮
+    cancel() {
+      this.$refs.dialogAppy.resetFields();
+      this.dialogAppy.decreaseFile = [];
+      this.applyList=[];
+      this.showApply = false;
+    },
+    closeDiag() {
+      this.cancel();
+    },
+
+    handleClean(){
+      // 过滤掉不符合的数据
+      this.applyList = this.applyList.filter((item, index) => {
+        return index === this.applyList.length - 1 || (item.reduceStartTime && item.reduceEndTime);
+      });
+      // 更新符合和不符合的数据条数
+      this.updateNum();
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+::v-deep .el-table__body tr.highlight-row {
+  background-color: #c0e6fa;
+}
+::v-deep .el-table {
+  table-layout: auto;
+}
+.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.disabledFbs {
+    .el-upload--picture-card {
+      display: none;
+    }
+  }
+::v-deep .el-upload-list__item {
+  margin-bottom: 20px;
+  overflow: unset !important;
+}
+::v-deep .el-upload-list__item-actions {
+  overflow: unset !important;
+}
+
+.el-upload-list__item-thumbnail {
+  height: 145px !important;
+}
+
+.picture-card-container {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  position: relative;
+}
+
+.picture-card {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  justify-content: center;
+  
+  // border: 1px solid  #ddd;
+  // border-radius: 4px;
+}
+
+.file-name {
+  width: 90%;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  position: absolute;
+  bottom: -35px;
+  margin-top: 8px;
+  text-align: center;
+  font-size: 12px;
+  color: #333;
+  z-index: 999999;
+}
+
+.file-overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #fff;
+  font-size: 20px;
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/business/reliefRecord/index.vue b/src/views/business/reliefRecord/index.vue
index 6b2c4b65..d15dc51b 100644
--- a/src/views/business/reliefRecord/index.vue
+++ b/src/views/business/reliefRecord/index.vue
@@ -159,13 +159,13 @@
 
           <el-row>
             <el-col :span="12">
-              <el-form-item label="减免原因" prop="reason">
+              <el-form-item label="减免原因" prop="remark">
                 <el-input
                   type="textarea"
                   style="width: 80%"
                   :rows="5"
                   placeholder="请输入减免原因"
-                  v-model="dialogAppy.reason"
+                  v-model="dialogAppy.remark"
                   maxlength="100"
                   show-word-limit
                 >
@@ -298,7 +298,7 @@
           </el-table-column>          
         </el-table>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitForm" >确 定</el-button>
+          <el-button type="primary" @click="submitForm" v-if="!isView">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </el-dialog>
@@ -313,7 +313,7 @@
   
   <script>
 
-import {getReliefList,addRelief } from "@/api/cost/cost";
+import {getReliefList,editRelief,getDiscountViewList } from "@/api/cost/cost";
 import {getReliefRecordList,deleteRedif } from "@/api/business/index";
 import {downloadFile, downloadFileData} from '@/utils/download'
 import {getToken} from '@/utils/auth'
@@ -373,7 +373,7 @@ export default {
       dialogAppy: {
         reduceStartTime: undefined,
         reduceEndTime: undefined,
-        reason: '',
+        remark: '',
         decreaseFile: [],
       },
       rules: {
@@ -412,6 +412,9 @@ export default {
       num1: 0,
       //当前不符合的数据条数
       num2: 0,
+      isView: false,
+      agreementId: '',
+      idTemp: null,
     };
   },
   created() {
@@ -466,13 +469,11 @@ export default {
       /** 重置按钮操作 */
       resetQuery() {
         this.queryParams = {
-          unitId: null,
-          projectId: null,
-          agreementId: '',
-          agreementCode: '',
+          keyWord: null,
+          status: null,
+          time: null,
         }
         this.resetForm('queryForm')
-        this.queryParams.time=[]
         this.handleQuery()
       },
 
@@ -533,35 +534,63 @@ export default {
 
      //查看
      handleView(row) {
-      this.showApply = true;
+      this.isView = true;
       this.title = "查看";
       this.uploadKey = Date.now();
-      this.delBusinessFileIdList=[];
-      this.applyList=[];
-      this.applyListTemp=[];
-      this.applyList = JSON.parse(JSON.stringify(row));
-      this.applyList.forEach((item) => {
-        this.$set(item,'reduceNum', item.num);
-        this.$set(item,'reduceDays', 0);
-        this.$set(item,'reduceLeaseMoney', 0);
-      });
+
+      getDiscountViewList(row.id).then(async(response) => {
+      if(response.code==200){
+        this.dialogAppy.decreaseFile = response.data.bmFileInfos;
+        this.dialogAppy.reduceStartTime = response.data.reduceStartTime;
+        this.dialogAppy.reduceEndTime = response.data.reduceEndTime;
+        this.dialogAppy.remark = response.data.remark;
+        this.applyList = response.data.detailList; 
+        this.leaseAll = this.applyList.reduce((total, item) => {
+            return total + Number(item.reduceLeaseMoney);
+          }, 0);
+        let obj = {
+          id:null,
+          reduceLeaseMoney: this.leaseAll,
+        }
+        this.applyList.push(obj)
+        this.applyListTemp=this.applyList;  
+        await  this.updateNum();
+      }
+      })
+            this.showApply = true;
      },
 
      //编辑
      handleEdit(row) {
-      this.showApply = true;
-      this.title = "编辑";
+      this.isView = false;
+      this.title = "修改";
       this.uploadKey = Date.now();
-      this.delBusinessFileIdList=[];
-      this.applyList=[];
-      this.applyListTemp=[];
-      this.applyList = JSON.parse(JSON.stringify(row));
-      this.applyList.forEach((item) => {
-        this.$set(item,'reduceNum', item.num);
-        this.$set(item,'reduceDays', 0);
-        this.$set(item,'reduceLeaseMoney', 0);
-      });
+
+      getDiscountViewList(row.id).then(async (response) => {
+      if(response.code==200){
+        this.agreementId = response.data.agreementId;
+        this.idTemp = response.data.id;
+        this.dialogAppy.decreaseFile = response.data.bmFileInfos;
+        this.dialogAppy.reduceStartTime = response.data.reduceStartTime;
+        this.dialogAppy.reduceEndTime = response.data.reduceEndTime;
+        this.dialogAppy.remark = response.data.remark;
+        this.applyList = response.data.detailList; 
+         this.leaseAll = this.applyList.reduce((total, item) => {
+            return total + Number(item.reduceLeaseMoney);
+          }, 0);
+        let obj = {
+          id:null,
+          reduceLeaseMoney: this.leaseAll,
+        }
+        this.applyList.push(obj)
+        this.applyListTemp=this.applyList;
+          await  this.updateNum();
+      }
+
+      })
+          this.showApply = true;
      },
+
       // 合并单元格 rowIndex=行数  columnIndex=列数
       // 这里是合并table的除表头外的第一行的第二列 + 除表头外的第二行的第二列
       // 注意列数和行数从 0 开始
@@ -780,27 +809,6 @@ export default {
             this.$set(item, 'reduceDays', 0); 
             this.$set(item, 'reduceLeaseMoney', 0);
           }
-
-
-          // if (startTimeTemp!=null && endTimeTemp!=null && startTime.getTime()!=0 && endTime.getTime()!=0 && endTime.getTime() >= startTime.getTime()) {
-          //   const oneDay = 24 * 60 * 60 * 1000; // 一天的毫秒数
-          //   const diffDays = Math.ceil(Math.abs((endTime - startTime) / oneDay)) + (endTime - startTime === 0 ? 1 : 1);
-          //   this.$set(item, 'reduceDays', diffDays);
-          //   if(item.reduceNum && item.reduceDays && item.leasePrice){
-          //     this.$set(item, 'reduceLeaseMoney', item.reduceDays*item.leasePrice*item.reduceNum);
-          //   }
-          //   // row.leaseDays = diffDays;
-          // }else if(startTimeTemp!=null && item.reduceEndTime==null && startTimeTemp>=item.startTime && startTimeTemp<=item.endTime){
-          //   this.$set(item, 'reduceEndTime', startTime); 
-          //   this.$set(item, 'reduceDays', 0); 
-          //   this.$set(item, 'reduceLeaseMoney', 0);
-          // }
-          // else {
-          // this.$set(item, 'reduceStartTime', null); 
-          // // 如果日期无效，将减免天数设为 0 或者清空
-          // this.$set(item, 'reduceDays', 0); 
-          // this.$set(item, 'reduceLeaseMoney', 0);
-          // }
           this.applyList[this.applyList.length-1].reduceLeaseMoney = this.applyList.slice(0,-1).reduce((total, item) => {
           return total + Number(item.reduceLeaseMoney);
         }, 0);
@@ -811,18 +819,6 @@ export default {
     // 更新表格中所有数据的减免结束时间
     updateTableEndTime() {
       this.applyList = this.applyListTemp;
-      // const pickEndTime = new Date(this.dialogAppy.reduceEndTime);
-      // this.applyList.slice(0,-1).forEach(item => {
-      //    let validEndTime = item.endTime ? new Date(item.endTime) : new Date();
-      //    console.log('666666666666',item.startTime,pickEndTime)
-      //   if(pickEndTime < new Date(item.startTime) || pickEndTime > validEndTime){
-          
-      //     this.$set(item, 'reduceEndTime', null);
-      //   }else{
-      //     this.$set(item, 'reduceEndTime', this.dialogAppy.reduceEndTime);
-      //   }
-      //   // item.reduceStartTime = this.dialogAppy.reduceStartTime;
-      // });
       if (this.dialogAppy.reduceStartTime) {
         const pickStartTime = new Date(this.dialogAppy.reduceStartTime);
         const pickEndTime = new Date(this.dialogAppy.reduceEndTime);
@@ -1015,22 +1011,23 @@ export default {
             this.$modal.msgError('请先去除减免时间不符合的数据！')
           }else{
             const param = {
-              agreementId: this.queryParams.agreementId,
+              id: this.idTemp,
+              agreementId: this.agreementId,
+              reduceStartTime: this.dialogAppy.reduceStartTime,
+              reduceEndTime: this.dialogAppy.reduceEndTime,
+              bmFileInfos: this.dialogAppy.decreaseFile,
+              remark: this.dialogAppy.remark,
               detailList: this.applyList.slice(0,-1),
-              }
-              addRelief(param).then((response) => {
+            }
+              console.log("xxxxxxxxxxxxxx",param.bmFileInfos)
+              editRelief(param).then((response) => {
                 if (response.code == 200) {
-                  this.$modal.msgSuccess("驳回成功");
+                  this.$modal.msgSuccess("修改成功");
                   this.confirmShow = false;
                   this.getList();
-                  this.$refs.multipleTable.clearSelection();
+                  this.showApply = false;
                 }
               });
-            this.$message({
-            type: 'success',
-            message: '提交成功!',
-          })
-          this.showApply = false;
           }
         } else {
           return false;
@@ -1060,7 +1057,7 @@ export default {
 
     handleAdd() {
       console.log('减免申请')
-      this.$router.push({ path: '/cost/costDecreaseList' })
+      this.$router.push({ path: '/business/businessHandling/discountApply' })
     },
     handleExport() {
       
diff --git a/src/views/material/basic/bmUnit/index.vue b/src/views/material/basic/bmUnit/index.vue
index 4a931a82..25b392de 100644
--- a/src/views/material/basic/bmUnit/index.vue
+++ b/src/views/material/basic/bmUnit/index.vue
@@ -448,7 +448,7 @@ export default {
             this.reset()
             unitInfoAll(row.unitId).then((response) => {
                 this.form = response.data
-                this.form.typeId = this.form.typeId+''
+                this.form.typeId = this.form.typeId
             })
             this.open = true
             this.title = '编辑'
diff --git a/src/views/material/cost/costDecreaseList.vue b/src/views/material/cost/costDecreaseList.vue
index edeb7425..d6b7aa83 100644
--- a/src/views/material/cost/costDecreaseList.vue
+++ b/src/views/material/cost/costDecreaseList.vue
@@ -168,13 +168,13 @@
 
           <el-row>
             <el-col :span="12">
-              <el-form-item label="减免原因" prop="reason">
+              <el-form-item label="减免原因" prop="remark">
                 <el-input
                   type="textarea"
                   style="width: 80%"
                   :rows="5"
                   placeholder="请输入减免原因"
-                  v-model="dialogAppy.reason"
+                  v-model="dialogAppy.remark"
                   maxlength="100"
                   show-word-limit
                 >
@@ -386,7 +386,7 @@ export default {
       dialogAppy: {
         reduceStartTime: undefined,
         reduceEndTime: undefined,
-        reason: '',
+        remark: '',
         decreaseFile: [],
       },
       rules: {
@@ -396,7 +396,7 @@ export default {
         reduceEndTime: [
           { required: true, message: "请选择减免结束日期", trigger: "change" },
         ],
-        reason: [
+        remark: [
           { required: true, message: "减免原因不能为空", trigger: "blur" },
         ],
         decreaseFile: [
@@ -526,56 +526,6 @@ export default {
       /** 查询列表 */
      async getList() {
         this.loading = true;
-        // this.pushReviewList = [
-        //   {
-        //     id:1,
-        //     deviceName: '小吊绳',
-        //     typeName: '200m',
-        //     unit: '根',
-        //     leasePrice: 3.00,
-        //     num: 10,
-        //     startTime: '2025-01-07',
-        //     backNum: '1',
-        //     endTime: null,
-        //     leaseDays: 17,
-        //     costs: 510.00,
-        //   },
-        //   {
-        //     id:2,
-        //     deviceName: '牵引绳卡线器',
-        //     typeName: 'φ11~15',
-        //     unit: '把',
-        //     leasePrice: 0.9,
-        //     num: 26,
-        //     startTime: '2025-01-06',
-        //     backNum: '1',
-        //     endTime: '2025-01-23',
-        //     leaseDays: 18,
-        //     costs: 421.20,
-        //   },
-        //   {
-        //     id:3,
-        //     deviceName: '挡土地锚',
-        //     typeName: 'DTDM-1',
-        //     unit: '只',
-        //     leasePrice: 0.04,
-        //     num: 76,
-        //     startTime: '2025-01-07',
-        //     backNum: '1',
-        //     endTime: '2025-01-23',
-        //     leaseDays: 17,
-        //     costs: 51.68,
-        //   },
-        // ];
-        // this.leaseAll = this.pushReviewList.reduce((total, item) => {
-        //   return total + Number(item.costs);
-        // }, 0);
-        // let obj = {
-        //   id:null,
-        //   costs: this.leaseAll,
-        // }
-        // this.pushReviewList.push(obj)
-
       const params = {
         deviceName: this.queryParams.deviceName,
         typeName: this.queryParams.typeName,
@@ -1117,21 +1067,21 @@ export default {
           }else{
             const param = {
               agreementId: this.queryParams.agreementId,
+              reduceStartTime: this.dialogAppy.reduceStartTime,
+              reduceEndTime: this.dialogAppy.reduceEndTime,
+              bmFileInfos: this.dialogAppy.decreaseFile,
+              remark: this.dialogAppy.remark,
               detailList: this.applyList.slice(0,-1),
               }
               addRelief(param).then((response) => {
                 if (response.code == 200) {
-                  this.$modal.msgSuccess("驳回成功");
+                  this.$modal.msgSuccess("提交成功");
                   this.confirmShow = false;
                   this.getList();
+                  this.showApply = false;
                   this.$refs.multipleTable.clearSelection();
                 }
               });
-            this.$message({
-            type: 'success',
-            message: '提交成功!',
-          })
-          this.showApply = false;
           }
         } else {
           return false;
diff --git a/src/views/material/part/partAccept/index.vue b/src/views/material/part/partAccept/index.vue
index a6d0eccb..52079956 100644
--- a/src/views/material/part/partAccept/index.vue
+++ b/src/views/material/part/partAccept/index.vue
@@ -55,7 +55,6 @@
 
 
       <el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="taskId" @selection-change="handleSelectionChange" border>
-        <el-table-column type="selection" width="55" align="center" :reserve-selection="true" :selectable="selectable"/>
         <el-table-column label="序号" align="center" width="80" type="index">
           <template slot-scope="scope">
             <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
@@ -189,7 +188,7 @@
               prop="partName"
             />
             <el-table-column label="单位" align="center" prop="unitName" />
-            <el-table-column label="采购数量" align="center" prop="purchaseNum" />
+            <el-table-column label="入库数量" align="center" prop="inputNum" />
             <!-- <el-table-column label="验收情况" align="center">
               <el-table-column
                 label="到货数量"
diff --git a/src/views/material/part/partAcceptTwo/index.vue b/src/views/material/part/partAcceptTwo/index.vue
index 63502776..cb1f072e 100644
--- a/src/views/material/part/partAcceptTwo/index.vue
+++ b/src/views/material/part/partAcceptTwo/index.vue
@@ -55,7 +55,6 @@
 
 
       <el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="taskId" @selection-change="handleSelectionChange" border>
-        <el-table-column type="selection" width="55" align="center" :reserve-selection="true" :selectable="selectable"/>
         <el-table-column label="序号" align="center" width="80" type="index">
           <template slot-scope="scope">
             <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
diff --git a/src/views/material/repair/inventoryScrap/component/addToolsApply.vue b/src/views/material/repair/inventoryScrap/component/addToolsApply.vue
index fb47e6e3..f01c15e4 100644
--- a/src/views/material/repair/inventoryScrap/component/addToolsApply.vue
+++ b/src/views/material/repair/inventoryScrap/component/addToolsApply.vue
@@ -62,6 +62,7 @@
           </el-col>
         </el-row>
       </el-form-item>
+      <div>
       <el-form-item label="附件" prop="bmFileInfos" >
           <el-upload
             :action="uploadUrl"
@@ -100,6 +101,7 @@
             <i class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
         </el-form-item>
+      </div>
     </el-form>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -138,17 +140,39 @@
       />
       <el-table-column align="center" label="计量单位" prop="unitName" />
       <el-table-column align="center" label="当前库存" prop="storageNum" />
-      <el-table-column label="预领数量" prop="preNum" align="center">
+      <el-table-column label="报废数量" prop="preNum" align="center">
+          <template v-slot="scope">
+            <span>{{ scope.row.preNum }}</span>
+          </template>
+      </el-table-column>
+      <el-table-column label="设备编号" align="center" prop="deviceCode" width="200px">
         <template v-slot="scope">
-          <el-input
-              v-model.number="scope.row.preNum"
-              controls-position="right" type="number"
-              style="width: 100%" :disabled="scope.row.alNum && scope.row.alNum != 0 ? true : false"
-              :min="0" @input="(v)=>(scope.row.unitValue==1?scope.row.preNum=Number(v.replace(/[^\d.]/g,'')) : scope.row.preNum=Number(v.replace(/[^\d]/g,'')))"
-              ></el-input>
+          <template v-if="scope.row.manageType === '0'">
+            <el-select 
+            v-model="scope.row.deviceCode" 
+            placeholder="请选择设备编号" 
+            multiple 
+            collapse-tags 
+            filterable
+            @change="handleDeviceCodeChange(scope.row)"
+            style="width: 180px;"
+            >
+              <el-option
+                v-for="item in scope.row.deviceCodeOptions"
+                :key="item.id"
+                :label="item.code"
+                :value="item.code"
+              ></el-option>
+            </el-select>
+          </template>
+          <template v-else-if="scope.row.manageType === '1'">
+            <span>计数</span>
+          </template>
+          <template v-else>
+            <span>{{ scope.row.deviceCode }}</span>
+          </template>
         </template>
       </el-table-column>
-      <el-table-column label="已出库数量" align="center" prop="alNum" v-if="maForm.taskId" :show-overflow-tooltip="true"/>
       <!-- <el-table-column align="center" label="出库数量" prop="alNum" /> -->
       <el-table-column
         label="备注"
@@ -207,6 +231,9 @@ import {
 import {downloadFile, downloadFileData} from '@/utils/download'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import {
+  getMachineListByCode
+} from "@/api/repair/scrapLedgerReview";
 
 export default {
   name: "AddTools",
@@ -363,11 +390,16 @@ export default {
     }
   },
   methods: {
+    handleDeviceCodeChange(row) {
+      const newDeviceCount = row.deviceCode.length;
+      row.preNum = newDeviceCount;
+    },
 
     /** 机具类型 */
     equipmentType() {
       equipmentTypeTree().then((response) => {
         this.equipmentTypeList = response.data;
+        console.log("this.equipmentTypeList", this.equipmentTypeList);
         // 处理并扁平化所有类型数据
         this.flattenTypeOptions = this.processTypeData(response.data);
         // 初始显示所有选项
@@ -396,7 +428,8 @@ export default {
             maTypeName: parents[parents.length - 1] || '',
             specificationType: node.typeName,
             unitName: node.unitName,
-            unitValue: node.unitValue
+            unitValue: node.unitValue,
+            manageType: node.manageType
           });
         }
 
@@ -428,7 +461,7 @@ export default {
       // 获取新选中的项
       const lastSelected = val[val.length - 1];
       const typeData = this.flattenTypeOptions.find(item => item.typeId === lastSelected);
-
+      console.log("typeData", typeData)
       if (typeData) {
         if (this.equipmentList.some(item => item.typeId === lastSelected)) {
           this.$message({
@@ -440,17 +473,22 @@ export default {
           this.$message.error("所选物资规格类型暂时无库存，无法申请！");
           this.tempDeviceType = this.tempDeviceType.filter(id => id !== lastSelected);
         } else {
-          // 将新项添加到数组开头，实现倒序
-          this.equipmentList.unshift({
+          const newItem = {
             ...typeData,
-            preNum: 0
-          });
+            preNum: 0,
+          };
+          // 将新项添加到数组开头，实现倒序
+          this.equipmentList.unshift(newItem);
           this.deviceType.push(lastSelected);
           this.$message({
             message: `已添加 ${typeData.typeName}`,
             type: 'success'
           });
-        }
+          // 调用 getDeviceCodeOptions 并赋值
+          this.getDeviceCodeOptions(newItem).then(options => {
+            this.$set(newItem, 'deviceCodeOptions', options);
+          });
+            }
       }
 
       // 清空临时选中值
@@ -458,6 +496,19 @@ export default {
         this.tempDeviceType = [];
       });
     },
+
+    getDeviceCodeOptions(row) {
+      // 这里假设 handleTypeChange 中有相关数据，你需要根据实际情况调整
+      // 例如，假设 this.equipmentList 中有相关数据
+      return  getMachineListByCode({"typeId":row.typeId}).then((response) => {
+          console.log("response", response);
+          const relatedData = response.data.map(item => ({ id: item.maId, code: item.maCode,type: item.typeId  }));
+          console.log("relatedData", relatedData);
+          return relatedData;
+        });
+    },
+
+
     //获取任务详情--- 编辑回显数据
     async getTaskInfo() {
       // this.loading = true;
diff --git a/src/views/material/repair/scrapLedger/detail.vue b/src/views/material/repair/scrapLedger/detail.vue
index f713dadc..d45b6e2b 100644
--- a/src/views/material/repair/scrapLedger/detail.vue
+++ b/src/views/material/repair/scrapLedger/detail.vue
@@ -8,38 +8,21 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item label="类型规格：" prop="partId">
-        <el-select
-          v-model="queryParams.partId"
-          placeholder="请选择类型规格"
-          clearable
-        >
-          <el-option
-            v-for="dict in materialModelList"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
+      <el-form-item  prop="dateRange">
+          <el-date-picker
+            v-model="queryParams.time"
+            type="month"
+            placeholder="请选择月份">
+          </el-date-picker>
       </el-form-item>
-      <!-- <el-form-item label="机具厂家："  prop="supplierId">
-          <el-select v-model="queryParams.supplierId" placeholder="请选择机具厂家" clearable>
-            <el-option
-              v-for="dict in supplierList"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item> -->
-      <el-form-item label="出厂日期：" prop="productionTime">
-        <el-date-picker
-          v-model="queryParams.productionTime"
-          placeholder="请选择出厂日期"
-          value-format="yyyy-MM-dd"
-          type="date"
-        >
-        </el-date-picker>
+      <el-form-item  prop="keyWord">
+          <el-input
+              v-model="queryParams.keyWord"
+              placeholder="请输入关键词"
+              clearable
+              @keyup.enter.native="handleQuery"
+              maxlength="20"
+          />
       </el-form-item>
 
       <el-form-item>
@@ -63,43 +46,20 @@
           size="mini"
           icon="el-icon-back"
           @click="jumpList"
-          >配件验收</el-button
+          >报废台账</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
+      <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-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
@@ -107,172 +67,20 @@
       :data="tableList"
       ref="multipleTable"
       row-key="partId"
-      @selection-change="handleSelectionChange"
     >
-      <el-table-column
-        type="selection"
-        width="55"
-        align="center" :selectable="selectable"
-        :reserve-selection="true"
-      />
       <el-table-column label="序号" align="center" width="80" type="index">
       </el-table-column>
-      <el-table-column
-        label="配件类型"
-        align="center"
-        prop="maName"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="配件名称"
-        align="center"
-        prop="maTypeName"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="规格型号"
-        align="center"
-        prop="partName"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="到货数量"
-        align="center"
-        prop="purchaseNum"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="单位"
-        align="center"
-        prop="unitName"
-        :show-overflow-tooltip="true"
-      />
-
-      <!-- <el-table-column
-        label="供应商"
-        align="center"
-        prop="supplier"
-        :show-overflow-tooltip="true"
-      /> -->
-      <el-table-column
-        label="出厂日期"
-        align="center"
-        prop="productionTime"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-            label="相关配套资料"
-            align="center"
-            prop=""
-        >
-      <template slot-scope="scope">
-          <div style="color: #02A7F0;cursor: pointer;" @click="openFileDialog(scope.row)" v-if="scope.row.isExitFile==1">报告管理</div>
-          <div style="color: red;cursor: pointer;" @click="openFileDialog(scope.row)" v-if="scope.row.isExitFile==0">报告管理</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" width="180" v-if="!isView">
-        <template slot-scope="scope">
-          <el-button size="mini" type="success" @click="pass(scope.row)" v-if="scope.row.status==0">
-            入库
-          </el-button>
-          <el-button size="mini" type="danger" @click="reject(scope.row)" v-if="scope.row.status==0">
-            驳回
-          </el-button>
-        </template>
-      </el-table-column> -->
+      <el-table-column label="类型名称" align="center" prop="maName" :show-overflow-tooltip="true" />
+      <el-table-column label="规格型号" align="center" prop="maTypeName" :show-overflow-tooltip="true" />
+      <el-table-column label="计量单位" align="center" prop="partName" :show-overflow-tooltip="true" />
+      <el-table-column label="报废数量" align="center" prop="purchaseNum" :show-overflow-tooltip="true" />
+      <el-table-column label="报废费用(万元)" align="center" prop="unitName" :show-overflow-tooltip="true" />
+      <el-table-column label="报废类型" align="center" prop="productionTime" :show-overflow-tooltip="true" />
+      <el-table-column label="损坏类型" align="center" prop="productionTime" :show-overflow-tooltip="true" />
+      <el-table-column label="审核人" align="center" prop="productionTime" :show-overflow-tooltip="true" />
+      <el-table-column label="审核日期" align="center" prop="productionTime" :show-overflow-tooltip="true" />
+      <el-table-column label="备注" align="center" prop="status" :show-overflow-tooltip="true" />
     </el-table>
-
-    <!-- 验收弹窗 -->
-    <el-dialog title="验收" :visible.sync="confirmShow" width="600px" height="300px">
-      <div style="width: 100%; height: 80%; display: flex;margin-bottom: 10px;">
-        <div style="width:15%;">验收结论：</div>
-        <el-input
-          type="textarea"
-          :rows="3" style="width:80%;"
-          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>
-
-      <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" :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.partName}}</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"
-                    :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="picturePreviewFile(scope.row)" v-if="scope.row.fileListTemp!=0">
-                        查看
-                    </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>
-
-        <!-- 文件查看列表 -->
-        <el-dialog title="文件列表" :visible.sync="dialogVisibleFile" width="500px" height="500px" >
-            <el-table :data="fileListInfo" width="100%" height="350px">
-                <el-table-column label="序号" type="index"  width="55" align="center"/>
-                <el-table-column label="文件名称" align="center" prop="name" :show-overflow-tooltip="true"/>
-                <el-table-column label="操作" align="center" >
-                    <template slot-scope="scope">
-                    <el-button size="mini" type="text" @click="picturePreview(scope.row)" v-if="scope.row.url" >
-                        查看
-                    </el-button>  
-                    </template>
-                </el-table-column>
-            </el-table>
-        </el-dialog>
   </div>
 </template>
 
@@ -288,8 +96,7 @@ import { getPartTypeCheckInfo,getPartTypeFileList } from '@/api/part/partArrived
 import { downloadFile } from "@/utils/download";
 import { getToken } from "@/utils/auth";
 export default {
-  name: "AcceptDetail",
-  dicts: ["purchase_task_status"],
+  name: "ScrapLedgerDetail",
   data() {
     return {
       Id: "",
@@ -370,18 +177,10 @@ export default {
     this.getList();
   },
   methods: {
-    //是否可用勾选框
-    selectable(row) {
-      console.log(row)
-      if (row.status == 2||row.status == 13 ||row.status == 14) {
-          return true
-      } else {
-          return false
-      }
-    },
+
     // 返回列表页
     jumpList() {
-      const obj = { path: "/part/partAcceptTwo" };
+      const obj = { path: "/repair/scrapLedger" };
       this.$tab.closeOpenPage(obj);
     },
     getPartType() {
@@ -428,185 +227,8 @@ export default {
       this.queryParams.pageNum = 1;
       this.getList();
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection;
-      this.infos = [];
-      selection.forEach((item) => {
-        this.infos.push({id:item.id,partId:item.partId,purchaseNum:item.purchaseNum,taskId:item.taskId});
-      });
-      this.single = selection.length != 1;
-      this.multiple = !selection.length;
-    },
-    //入库
-    pass(row) {
-      // if(this.infos==0){
-      //   this.$modal.msgError("请选择配件");
-      //   return;
-      // }
 
-      const infos=[{id:row.id,partId:row.partId,purchaseNum:row.purchaseNum,taskId:this.taskId}]
-      this.$modal.confirm('是否确认入库该配件？')
-            .then(function() {
-              return partTypeWarehouse(infos)
-            }).then(() => {
-                  this.$modal.msgSuccess('入库成功')
-                  this.getList()
-            }).catch(() => {});
-    },
-    //驳回
-    reject(row) {
-      const infos=[{id:row.id,partId:row.partId,purchaseNum:row.purchaseNum,taskId:this.taskId}]
-      this.$modal.confirm('是否确认驳回该配件？')
-            .then(function() {
-              return partTypeReject(infos)
-            }).then(() => {
-                  this.$modal.msgSuccess('驳回成功')
-                  this.getList()
-            }).catch(() => {});
-    },
-
-    //批量入库
-    batchPass() {
-      if(this.infos==0){
-        this.$modal.msgError("请选择配件");
-        return;
-      }
-      this.taskStatus = "3";
-      this.checkResult = "合格";
-      this.verifyPass = true;
-      this.checkList = [];
-      this.checkList = this.ids.map((item) => {
-        let obj = {
-          taskId: item.taskId,
-          partId: item.partId,
-          checkResult: this.checkResult,
-        };
-        return obj;
-      });
-      this.confirmShow = true;
-    },
-
-    //批量驳回
-    batchReject() {
-     if(this.infos==0){
-        this.$modal.msgError("请选择配件");
-        return;
-      }
-      this.taskStatus = "1";
-      this.checkResult = "不合格";
-      this.verifyPass = false;
-      this.checkList = [];
-      this.checkList = this.ids.map((item) => {
-        let obj = {
-          taskId: item.taskId,
-          partId: item.partId,
-          checkResult: this.checkResult,
-        };
-        return obj;
-      });
-      this.confirmShow = true;
-    },
-
-    //验收确认请求
-    confirmCheck() {
-      this.checkList.forEach((item) => {
-        item.checkResult = this.checkResult;
-      });
-      let param = {
-        purchaseCheckDetailsList:this.checkList,
-        verifyPass:this.verifyPass
-      }
-      console.log(param);
-      innerVerify(param).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:"",fileList:[],fileListTemp:[]},
-              {dictLabel:"型式试验报告",fileType:"1",name:"",url:"",fileList:[],fileListTemp:[]},
-              {dictLabel:"出厂检测报告",fileType:"2",name:"",url:"",fileList:[],fileListTemp:[]},
-              {dictLabel:"第三方监测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]},
-              {dictLabel:"其他",fileType:"4",name:"",url:"",fileList:[],fileListTemp:[]}] 
-        this.getFileData()  
-        this.open=true
-      },
-      getFileData(){
-        let param = {
-          modelId:this.rowData.partId,
-          taskType:13,
-          taskId:this.rowData.taskId
-        }
-        getPartTypeFileList(param).then((response) => {
-          if(response.data.length>0){
-              response.data.forEach(item=>{
-                  let index = this.fileDataList.findIndex(v => v.fileType == item.fileType)
-                  item.fileDetailList.forEach(item2=>{
-                      this.fileDataList[index].fileList.push({
-                          name:item2.name,
-                          url:item2.url
-                      })
-                      this.fileDataList[index].fileListTemp.push({
-                          name:item2.name,
-                          url:item2.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("上传失败");
-          });
-      }
-    },
-    picturePreviewFile(row) {
-          this.fileListInfo = row.fileListTemp
-
-          this.dialogVisibleFile = true
-      },
-    //图片查看
-    picturePreview(file) {
-      this.dialogImageUrl = file.url;
-      const parts = file.name.split(".");
-      const extension = parts.pop();
-      if (extension === 'doc' || extension === 'DOC' || extension === 'docx' || extension === 'DOCX' || extension === 'pdf' || extension === 'PDF') {
-        const windowName = file.name;
-        window.open(file.url, windowName);
-      } else {
-        this.dialogVisible = true;
-      }
-    },
+   
     /** 导出按钮操作 */
     handleExport() {
       this.download(
diff --git a/src/views/material/repair/scrapLedger/index.vue b/src/views/material/repair/scrapLedger/index.vue
index 63502776..4a49044a 100644
--- a/src/views/material/repair/scrapLedger/index.vue
+++ b/src/views/material/repair/scrapLedger/index.vue
@@ -3,12 +3,9 @@
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item  prop="dateRange">
             <el-date-picker
-                v-model="dateRange"
-                type="daterange"
-                value-format="yyyy-MM-dd"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期">
+              v-model="queryParams.time"
+              type="month"
+              placeholder="请选择月份">
             </el-date-picker>
         </el-form-item>
         <el-form-item  prop="keyWord">
@@ -20,22 +17,6 @@
                 maxlength="20"
             />
         </el-form-item>
-        <el-form-item  prop="taskStatus">
-            <el-select
-                clearable
-                filterable
-                style="width: 240px"
-                placeholder="状态筛选"
-                v-model="queryParams.taskStatus"
-            >
-                <el-option
-                    :key="dict.id"
-                    :label="dict.name"
-                    :value="dict.id"
-                    v-for="dict in taskStatusList"
-                />
-            </el-select>
-        </el-form-item>
 
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
@@ -54,51 +35,27 @@
         </el-row>
 
 
-      <el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="taskId" @selection-change="handleSelectionChange" border>
-        <el-table-column type="selection" width="55" align="center" :reserve-selection="true" :selectable="selectable"/>
+      <el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="taskId"  border>
         <el-table-column label="序号" align="center" width="80" type="index">
           <template slot-scope="scope">
             <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="到货时间" align="center" prop="arrivalTime" width="200" :show-overflow-tooltip="true"/>
-        <el-table-column label="采购单号" align="center" prop="code" width="150" :show-overflow-tooltip="true"/>
-        <el-table-column label="采购配件" align="center" prop="purchaseMaTypeName" :show-overflow-tooltip="true"/>
-        <el-table-column label="采购数量" align="center" prop="purchaseMaNumber"  :show-overflow-tooltip="true"/>
-        <el-table-column label="物资厂家" align="center" prop="supplier" :show-overflow-tooltip="true"/>
-        <el-table-column label="创建人" align="center" prop="createBy" :show-overflow-tooltip="true"/>
-        <el-table-column label="创建时间" align="center" prop="createTime" width="200" :show-overflow-tooltip="true"/>
-        <el-table-column label="状态" align="center" prop="taskStatusName" :show-overflow-tooltip="true">
-<!--            <template slot-scope="scope">-->
-<!--                <dict-tag :options="dict.type.purchase_task_status" :value="scope.row.taskStatus"/>-->
-<!--            </template>-->
-        </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
+        <el-table-column label="月份" align="center" prop="arrivalTime"  :show-overflow-tooltip="true"/>
+        <el-table-column label="报废数量" align="center" prop="code"  :show-overflow-tooltip="true"/>
+        <el-table-column label="报废费用(万元)" align="center" prop="purchaseMaTypeName" :show-overflow-tooltip="true"/>
         <el-table-column label="操作" align="center" width="230">
-                        <template slot-scope="scope">
-                            <el-button
-                                size="mini"
-                                @click="handleView(scope.row)"
-                            >
-                                查看
-                            </el-button>
-                            <el-button
-                                size="mini"
-                                type="primary" v-if="scope.row.taskStatusName == '未完成'"
-                                @click="handleUpdate(scope.row)"
-                            >
-                                验收
-                            </el-button>
-                            <el-button
-                                size="mini"
-                                type="warning"
-                                @click="handlePrint(scope.row)"
-                            >
-                                验收单
-                            </el-button>
-
-                        </template>
-                    </el-table-column>
+              <template slot-scope="scope">
+                  <el-button
+                      type="primary" 
+                      icon="el-icon-search"
+                      size="mini"
+                      @click="handleView(scope.row)"
+                  >
+                      查看
+                  </el-button>
+              </template>
+        </el-table-column>
       </el-table>
 
       <pagination
@@ -109,140 +66,6 @@
         @pagination="getList"
       />
 
-    <!-- 入库单弹窗 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="openPrint"
-      width="1090px"
-      append-to-body
-    >
-      <div style="height: 500px; overflow-y: scroll">
-        <!-- <vue-easy-print tableShow ref="remarksPrintRef" class="print"> -->
-        <div id="checkId">
-          <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: 100%;
-                flex-shrink: 0;
-                margin-bottom: 5px;
-                font-size: 14px;
-              "
-            >
-              <span>单据编号：{{printData.code}}</span>
-            </div>
-            <div
-              class="item"
-              style="
-                width: 50%;
-                flex-shrink: 0;
-                margin-bottom: 5px;
-                font-size: 14px;
-              "
-            >
-              <span>生产厂家（供应商）：{{printData.supplier}}</span>
-            </div>
-
-            <div
-              class="item"
-              style="
-                width: 50%;
-                flex-shrink: 0;
-                margin-bottom: 5px;
-                font-size: 14px;
-              "
-            >
-              <span>到货日期：{{printData.arrivalTime}}</span>
-            </div>
-          </div>
-          <el-table
-            :data="printTableData"
-            class="table"
-            style="margin-top: 20px; width: 1000px; "
-            border
-          >
-            <!--          <el-table-column type="selection" width="55" align="center" />-->
-            <el-table-column label="序号" align="center" type="index" row="2" width="60px"/>
-            <el-table-column
-              label="配件类型"
-              align="center"
-              prop="maName"
-            />
-            <el-table-column
-              label="配件名称"
-              align="center"
-              prop="maTypeName"
-            />
-            <el-table-column
-              label="规格型号"
-              align="center"
-              prop="partName"
-            />
-            <el-table-column label="单位" align="center" prop="unitName" />
-            <!-- <el-table-column label="采购数量" align="center" prop="purchaseNum" /> -->
-            <el-table-column label="验收情况" align="center">
-              <el-table-column
-                label="到货数量"
-                align="center"
-                prop="purchaseNum"
-              />
-              <el-table-column
-                label="验收结论"
-                align="center"
-                prop="checkResult"
-              />
-            </el-table-column>
-          </el-table>
-
-          <div class="fillIn" style="margin-top: 20px;display: flex;justify-content: space-between;" >
-              <div class="item" style="width: 33%;display: flex;align-items: center;">
-                  <div style="width: 25%;">供应科：</div>
-                  <div style="width: 75%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printDataSign.gySignUrl">
-                      <div v-for="(sign, index) in printDataSign.gySignUrl" :key="index" style="width: 35%;margin-left: 5px;">
-                          <img :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt=""> 
-                      </div>
-                  </div>
-              </div>
-
-              <div class="item" style="width: 33%;display: flex;align-items: center;">
-                  <div style="width: 30%;">生产技术科：</div>
-                  <div style="width: 70%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printDataSign.scSignUrl">
-                      <div v-for="(sign, index) in printDataSign.scSignUrl" :key="index" style="width: 35%;margin-left: 5px;">
-                          <img :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt=""> 
-                      </div>
-                  </div>
-              </div>
-              <div class="item" style="width: 33%;display: flex;align-items: center;">
-                  <div style="width: 25%;">库管班：</div>
-                  <div style="width: 75%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printDataSign.kgSignUrl">
-                      <div v-for="(sign, index) in printDataSign.kgSignUrl" :key="index" style="width: 35%;margin-left: 5px;">
-                          <img :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt=""> 
-                      </div>
-                  </div>
-                  <!-- <div>
-                      <span>库管班：{{printData.warehouseTeam}}</span>
-                  </div> -->
-              </div>
-          </div>
-          </div>
-        <!-- </vue-easy-print> -->
-      </div>
-
-      <div slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" @click="print">打 印</el-button>
-        <el-button @click="openPrint = false">关 闭</el-button>
-      </div>
-    </el-dialog>
-
     </div>
   </template>
 
@@ -253,7 +76,7 @@ import vueEasyPrint from "vue-easy-print";
 import { downloadFile } from '@/utils/download'
 import { getToken } from '@/utils/auth'
   export default {
-    name: "PartAcceptList",
+    name: "ScrapLedgerList",
     dicts: ['part_task_status'],
     components: { vueEasyPrint },
     data() {
@@ -339,92 +162,15 @@ import { getToken } from '@/utils/auth'
         this.queryParams.pageNum = 1;
         this.getList();
         },
-        // 多选框选中数据
-        handleSelectionChange(selection) {
-            this.ids = selection.map(item => item.taskId)
-            this.infos = [];
-            selection.forEach((item) => {
-                this.infos.push({taskId:item.taskId});
-            });
-            this.single = selection.length != 1
-            this.multiple = !selection.length
-        },
-        handleUpdate(row){
-            console.log(row)
-            let query = { Id:row.id,taskId: row.taskId,isView:"false" }
-            this.$tab.closeOpenPage({
-                path: '/part/partAcceptDetailTwo',
-                query,
-            })
-        },
         //查看
         handleView(row){
             console.log(row)
             let query = { Id:row.id,taskId: row.taskId,isView:"true" }
             this.$tab.closeOpenPage({
-                path: '/part/partAcceptDetailTwo',
+                path: '/repair/scrapLedgerDetail',
                 query,
             })
         },
-        //批量入库
-        passAll(){
-            passAll(this.infos).then((response) => {
-                if(response.code==200){
-                    this.$modal.msgSuccess('入库成功')
-                }else{
-                    this.$modal.msgSuccess('入库失败')
-                }
-                this.getList()
-                this.$refs.multipleTable.clearSelection()
-          }).catch(() => {
-                this.$modal.msgError('入库失败')
-          })
-        },
-        //批量驳回
-        rejectAll(){
-            rejectAll(this.infos).then((response) => {
-                if(response.code==200){
-                    this.$modal.msgSuccess('驳回成功')
-                }else{
-                    this.$modal.msgSuccess('驳回失败')
-                }
-                this.getList()
-                this.$refs.multipleTable.clearSelection()
-            }).catch(() => {
-                this.$modal.msgError('驳回失败')
-            })
-        },
-        //查看入库单
-        handlePrint(row) {
-        // this.query.taskId = row.taskId
-        this.openPrint = true;
-        this.title = "机具配件到货验收单";
-        let params = {
-            id: row.id,
-            taskId: row.taskId,
-        };
-        this.getPrintTable(params)
-        },
-        //获取入库单数据
-        getPrintTable(params) {
-        getInBoundForm({ id: params.id,taskId:params.taskId }).then((response) => {
-            this.printDataSign = response.data;
-            this.printData = response.data.partTypeCheckInfo;
-            this.printTableData = response.data.partTypeCheckDetailsList;
-
-        });
-        },
-        //打印
-        print() {
-          // this.$refs.remarksPrintRef.print()
-          printJS({
-          printable: 'checkId',
-          type: 'html',
-          targetStyles: ['*'],
-          maxWidth:'1400'
-          // 其他配置选项
-        });
-        },
         handleExport() {
             this.download(
                 "/material/part_arrived/export",