diff --git a/src/api/warning-analysis/engineering-in-use.js b/src/api/warning-analysis/engineering-in-use.js
new file mode 100644
index 00000000..baa454ff
--- /dev/null
+++ b/src/api/warning-analysis/engineering-in-use.js
@@ -0,0 +1,6 @@
+import request from '@/utils/request'
+
+// 工程检修在用预警 -- 列表接口
+export const getUseMaintenanceWarningApi = data => {
+    return request.get('/material/useMaintenanceWarning/list', { params: data })
+}
diff --git a/src/views/business-examine/direct-rotation-apply/index.vue b/src/views/business-examine/direct-rotation-apply/index.vue
index 8b4ac5f5..60906de2 100644
--- a/src/views/business-examine/direct-rotation-apply/index.vue
+++ b/src/views/business-examine/direct-rotation-apply/index.vue
@@ -216,7 +216,7 @@ export default {
             console.log('row.configValues', row.configValue)
 
             if (row.configValue) {
-                return row.flowStatus != 2 && row.configValue.includes(this.userId)
+                return (row.flowStatus == 1 || row.flowStatus == 0) && row.configValue.includes(this.userId)
             }
         }
     }
diff --git a/src/views/business-examine/receive-apply/business-details.vue b/src/views/business-examine/receive-apply/business-details.vue
index 487311ac..57caac1a 100644
--- a/src/views/business-examine/receive-apply/business-details.vue
+++ b/src/views/business-examine/receive-apply/business-details.vue
@@ -161,13 +161,12 @@ export default {
         // 通过 或 驳回
         async onHandleAuditing(type) {
             // 组装参数
-
-            const currentAuditing = this.auditingList.filter(e => e.nodeId === this.currentNodeId) // 获取当前审核的节点
-            const currentIndex = this.auditingList.findIndex(e => e.nodeId === this.currentNodeId) // 获取当前的索引
+            const currentAuditing = this.auditingList.filter(e => e.configValues.includes(this.userId)) // 获取当前审核的节点
+            const currentIndex = this.auditingList.findIndex(e => e.configValues.includes(this.userId)) // 获取当前的索引
 
             const { recordId, id, typeId, isAccept } = currentAuditing[0]
 
-            // if (isAccept !== 0) {
+            // if (isAccept != 0) {
             //     this.$modal.msgError('当前已审核，不可重复审核')
             //     return
             // }
@@ -182,6 +181,7 @@ export default {
             }
 
             const res = await submitAuditingApi(this.auditingParams)
+            console.log(res, '提交结果')
 
             if (res.code === 200) {
                 this.$modal.msgSuccess('审核成功')
@@ -190,6 +190,37 @@ export default {
                     this.$tab.closeOpenPage(obj)
                 }, 500)
             }
+
+            // // 组装参数
+
+            // const currentAuditing = this.auditingList.filter(e => e.nodeId === this.currentNodeId) // 获取当前审核的节点
+            // const currentIndex = this.auditingList.findIndex(e => e.nodeId === this.currentNodeId) // 获取当前的索引
+
+            // const { recordId, id, typeId, isAccept } = currentAuditing[0]
+
+            // // if (isAccept !== 0) {
+            // //     this.$modal.msgError('当前已审核，不可重复审核')
+            // //     return
+            // // }
+            // Object.assign(this.auditingParams, {
+            //     typeId,
+            //     recordId,
+            //     nodeId: id
+            // })
+            // this.auditingParams.isAccept = type
+            // if (currentIndex !== this.auditingList.length - 1) {
+            //     this.auditingParams.nextNodeId = this.auditingList[currentIndex + 1].id
+            // }
+
+            // const res = await submitAuditingApi(this.auditingParams)
+
+            // if (res.code === 200) {
+            //     this.$modal.msgSuccess('审核成功')
+            //     setTimeout(() => {
+            //         const obj = { path: '/business-examine/receive-apply' }
+            //         this.$tab.closeOpenPage(obj)
+            //     }, 500)
+            // }
         },
 
         // 获取数据详情 和 审核记录详情
diff --git a/src/views/business-examine/receive-apply/index.vue b/src/views/business-examine/receive-apply/index.vue
index 5ede7c0f..ed59c6c2 100644
--- a/src/views/business-examine/receive-apply/index.vue
+++ b/src/views/business-examine/receive-apply/index.vue
@@ -190,7 +190,7 @@ export default {
         // 判断审核按钮显示隐藏
         auditingShow(row) {
             if (row.configValue) {
-                return row.status != 1 && row.configValue.includes(this.userId)
+                return (row.taskStatus == 1 || row.taskStatus == 0) && row.configValue.includes(this.userId)
             }
         }
     }
diff --git a/src/views/business-examine/reduction-apply/business-details.vue b/src/views/business-examine/reduction-apply/business-details.vue
index 23482690..05d97b1c 100644
--- a/src/views/business-examine/reduction-apply/business-details.vue
+++ b/src/views/business-examine/reduction-apply/business-details.vue
@@ -1,111 +1,135 @@
 <template>
-  <div class="business-details-container">
-    <el-row>
-      <el-col :span="18">
-        <div class="left-container">
-          <div class="pages-title">减免申请详情</div>
-          <TitleTip :title="`基本信息`" />
+    <div class="business-details-container">
+        <el-row>
+            <el-col :span="18">
+                <div class="left-container">
+                    <div class="pages-title">减免申请详情</div>
+                    <TitleTip :title="`基本信息`" />
 
-          <el-form size="small" style="padding: 20px" disabled label-width="120px" :model="detailsInfo">
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="减免开始日期">
-                  <el-input v-model="detailsInfo.reduceStartTime" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="减免结束日期">
-                  <el-input v-model="detailsInfo.reduceEndTime" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="减免原因">
-                  <el-input type="textarea" v-model="detailsInfo.remark" :autosize="{ minRows: 2, maxRows: 4 }" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-          <TitleTip :title="`明细信息`" />
+                    <el-form size="small" style="padding: 20px" disabled label-width="120px" :model="detailsInfo">
+                        <el-row>
+                            <el-col :span="12">
+                                <el-form-item label="减免开始日期">
+                                    <el-input v-model="detailsInfo.reduceStartTime" />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="减免结束日期">
+                                    <el-input v-model="detailsInfo.reduceEndTime" />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="24">
+                                <el-form-item label="减免原因">
+                                    <el-input
+                                        type="textarea"
+                                        v-model="detailsInfo.remark"
+                                        :autosize="{ minRows: 2, maxRows: 4 }"
+                                    />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </el-form>
+                    <TitleTip :title="`明细信息`" />
 
-          <el-table style="margin: 20px 0" :data="detailsList">
-            <el-table-column prop="num" label="减免数量" align="center" show-overflow-tooltip />
-            <el-table-column prop="maName" label="机具名称" align="center" show-overflow-tooltip />
-            <el-table-column prop="maModel" label="规格型号" align="center" show-overflow-tooltip />
-            <el-table-column prop="reduceNum" label="领料数量" align="center" show-overflow-tooltip />
-            <el-table-column prop="startTime" label="领料日期" align="center" show-overflow-tooltip />
-            <el-table-column prop="endTime" label="退料日期" align="center" show-overflow-tooltip />
-            <el-table-column prop="reduceStartTime" label="减免开始时间" align="center" show-overflow-tooltip />
-            <el-table-column prop="reduceEndTime" label="减免结束时间" align="center" show-overflow-tooltip />
-            <el-table-column prop="leasePrice" label="租赁单价(元/天)" align="center" show-overflow-tooltip />
-            <el-table-column prop="reduceDays" label="减免天数" align="center" show-overflow-tooltip />
-            <el-table-column prop="reduceLeaseMoney" label="减免费用(元)" align="center" show-overflow-tooltip />
-          </el-table>
-          <div class="total-amount">
-            <span>合计:</span>
-            <span>{{ totalAmount.toFixed(2) }} / 元</span>
-          </div>
-          <TitleTip :title="`附件信息`" />
+                    <el-table style="margin: 20px 0" :data="detailsList">
+                        <el-table-column prop="num" label="减免数量" align="center" show-overflow-tooltip />
+                        <el-table-column prop="maName" label="机具名称" align="center" show-overflow-tooltip />
+                        <el-table-column prop="maModel" label="规格型号" align="center" show-overflow-tooltip />
+                        <el-table-column prop="reduceNum" label="领料数量" align="center" show-overflow-tooltip />
+                        <el-table-column prop="startTime" label="领料日期" align="center" show-overflow-tooltip />
+                        <el-table-column prop="endTime" label="退料日期" align="center" show-overflow-tooltip />
+                        <el-table-column
+                            prop="reduceStartTime"
+                            label="减免开始时间"
+                            align="center"
+                            show-overflow-tooltip
+                        />
+                        <el-table-column
+                            prop="reduceEndTime"
+                            label="减免结束时间"
+                            align="center"
+                            show-overflow-tooltip
+                        />
+                        <el-table-column
+                            prop="leasePrice"
+                            label="租赁单价(元/天)"
+                            align="center"
+                            show-overflow-tooltip
+                        />
+                        <el-table-column prop="reduceDays" label="减免天数" align="center" show-overflow-tooltip />
+                        <el-table-column
+                            prop="reduceLeaseMoney"
+                            label="减免费用(元)"
+                            align="center"
+                            show-overflow-tooltip
+                        />
+                    </el-table>
+                    <div class="total-amount">
+                        <span>合计:</span>
+                        <span>{{ totalAmount.toFixed(2) }} / 元</span>
+                    </div>
+                    <TitleTip :title="`附件信息`" />
 
-          <div class="file-box">
-            <div v-for="img in fileList" :key="img.id">
-              <el-image style="width: 100%; height: 100%" :src="img.url" fit="cover"></el-image>
-            </div>
-          </div>
-        </div>
-      </el-col>
-      <el-col :span="6">
-        <div class="right-container">
-          <div class="right-title">
-            <div></div>
-            <div></div>
-            <div>流程记录</div>
-          </div>
+                    <div class="file-box">
+                        <div v-for="img in fileList" :key="img.id">
+                            <el-image style="width: 100%; height: 100%" :src="img.url" fit="cover"></el-image>
+                        </div>
+                    </div>
+                </div>
+            </el-col>
+            <el-col :span="6">
+                <div class="right-container">
+                    <div class="right-title">
+                        <div></div>
+                        <div></div>
+                        <div>流程记录</div>
+                    </div>
 
-          <div class="process-record">
-            <el-steps :active="active" :space="120" direction="vertical">
-              <el-step v-for="step in auditingList" :key="step.id" :title="step.nodeName">
-                <template slot="description">
-                  <div class="custom-description">
-                    <!-- {{ step.description }} -->
-                    审核结果:
-                    <el-tag size="mini" type="primary" v-if="step.isAccept === 0">待审批</el-tag>
-                    <el-tag size="mini" type="success" v-if="step.isAccept === 1">已通过</el-tag>
-                    <el-tag size="mini" type="danger" v-if="step.isAccept === 2">已驳回</el-tag>
-                  </div>
+                    <div class="process-record">
+                        <el-steps :active="active" :space="120" direction="vertical">
+                            <el-step v-for="step in auditingList" :key="step.id" :title="step.nodeName">
+                                <template slot="description">
+                                    <div class="custom-description">
+                                        <!-- {{ step.description }} -->
+                                        审核结果:
+                                        <el-tag size="mini" type="primary" v-if="step.isAccept === 0">待审批</el-tag>
+                                        <el-tag size="mini" type="success" v-if="step.isAccept === 1">已通过</el-tag>
+                                        <el-tag size="mini" type="danger" v-if="step.isAccept === 2">已驳回</el-tag>
+                                    </div>
 
-                  <div class="node-info" v-if="step.createTime">
-                    审核时间:
-                    {{ step.createTime }}
-                  </div>
+                                    <div class="node-info" v-if="step.createTime">
+                                        审核时间:
+                                        {{ step.createTime }}
+                                    </div>
 
-                  <div class="node-info" v-if="step.remark">
-                    审核意见:
-                    {{ step.remark }}
-                  </div>
-                </template>
-              </el-step>
-            </el-steps>
-          </div>
+                                    <div class="node-info" v-if="step.remark">
+                                        审核意见:
+                                        {{ step.remark }}
+                                    </div>
+                                </template>
+                            </el-step>
+                        </el-steps>
+                    </div>
 
-          <div class="auditing-container" v-if="pagesType === 1">
-            <el-input
-              type="textarea"
-              v-model="auditingParams.remark"
-              placeholder="请输入审核意见"
-              :autosize="{ minRows: 2, maxRows: 6 }"
-            />
+                    <div class="auditing-container" v-if="pagesType === 1">
+                        <el-input
+                            type="textarea"
+                            v-model="auditingParams.remark"
+                            placeholder="请输入审核意见"
+                            :autosize="{ minRows: 2, maxRows: 6 }"
+                        />
 
-            <el-row class="btn-container">
-              <el-button type="success" size="mini" @click="onHandleAuditing(1)">通过</el-button>
-              <el-button type="danger" size="mini" @click="onHandleAuditing(2)">驳回</el-button>
-            </el-row>
-          </div>
-        </div>
-      </el-col>
-    </el-row>
-  </div>
+                        <el-row class="btn-container">
+                            <el-button type="success" size="mini" @click="onHandleAuditing(1)">通过</el-button>
+                            <el-button type="danger" size="mini" @click="onHandleAuditing(2)">驳回</el-button>
+                        </el-row>
+                    </div>
+                </div>
+            </el-col>
+        </el-row>
+    </div>
 </template>
 
 <script>
@@ -113,221 +137,218 @@ import TitleTip from './components/title-tip.vue'
 import { submitAuditingApi, getAuditingDetailsApi } from '@/api/reduction-apply/index.js'
 import { getDiscountViewList } from '@/api/cost/cost'
 export default {
-  components: {
-    TitleTip
-  },
-  data() {
-    return {
-      detailsInfo: {},
-      content: `<span style="color:red">测试996</span>`,
-      steps: [
-        { title: '步骤 1', description: '描述信息 1', color: 'red' },
-        { title: '步骤 2', description: '描述信息 2', color: 'blue' },
-        { title: '步骤 3', description: '描述信息 3', color: 'green' }
-      ],
-      active: 1,
-      detailsList: [],
-      auditingList: [],
-      fileList: [],
-      totalAmount: 0,
-      auditingParams: {
-        nodeId: '', // 当前审核记录的id
-        nextNodeId: '', // 下个流程节点ID
-        isAccept: '', // 审批结果 1. 通过 2. 驳回
-        remark: '', // 审核意见
-        typeId: '', // 当前审核记录中的 typeId
-        taskId: '' // 外层列表的taskId
-      },
-      pagesType: 1,
-      userId: ''
-    }
-  },
-  created() {
-    // 判断当前路由页面是否有查询参数
-    if (this.$route.query) {
-      const { id, taskId, type } = this.$route.query
-      this.pagesType = type
-      this.auditingParams.taskId = taskId
-      this.getLeaseTaskDetailFun(id, taskId)
-    }
-
-    this.userId = sessionStorage.getItem('userId')
-  },
-  methods: {
-    // 通过 或 驳回
-    async onHandleAuditing(type) {
-      // 组装参数
-      const currentAuditing = this.auditingList.filter(e => e.configValues.includes(this.userId)) // 获取当前审核的节点
-      const currentIndex = this.auditingList.findIndex(e => e.configValues.includes(this.userId)) // 获取当前的索引
-
-      const { recordId, id, typeId, isAccept } = currentAuditing[0]
-
-      if (isAccept != 0) {
-        this.$modal.msgError('当前已审核，不可重复审核')
-        return
-      }
-      Object.assign(this.auditingParams, {
-        typeId,
-        recordId,
-        nodeId: id
-      })
-      this.auditingParams.isAccept = type
-      if (currentIndex !== this.auditingList.length - 1) {
-        this.auditingParams.nextNodeId = this.auditingList[currentIndex + 1].id
-      }
-
-      const res = await submitAuditingApi(this.auditingParams)
-      console.log(res, '提交结果')
-
-      if (res.code === 200) {
-        this.$modal.msgSuccess('审核成功')
-        setTimeout(() => {
-          const obj = { path: '/business-examine/reduction-apply' }
-          this.$tab.closeOpenPage(obj)
-        }, 500)
-      }
-
-      console.log(this.auditingParams, ' this.auditingParams组装好的参数')
+    components: {
+        TitleTip
     },
-    // 获取数据详情 和 审核记录详情
-    async getLeaseTaskDetailFun(id, taskId) {
-      const { data: res } = await getDiscountViewList(id)
+    data() {
+        return {
+            detailsInfo: {},
+            active: 1,
+            detailsList: [],
+            auditingList: [],
+            fileList: [],
+            totalAmount: 0,
+            auditingParams: {
+                nodeId: '', // 当前审核记录的id
+                remark: '', // 审核意见
+                typeId: '', // 当前审核记录中的 typeId
+                taskId: '', // 外层列表的taskId
+                isAccept: '', // 审批结果 1. 通过 2. 驳回
+                recordId: '',
+                nextNodeId: '' // 下个流程节点ID
+            },
+            pagesType: 1,
+            userId: '',
+            currentNodeId: ''
+        }
+    },
+    created() {
+        // 判断当前路由页面是否有查询参数
+        if (this.$route.query) {
+            const { id, taskId, type, nodeId } = this.$route.query
+            this.auditingParams.taskId = taskId
+            this.pagesType = type
+            this.currentNodeId = nodeId
+            this.getLeaseTaskDetailFun(id, taskId)
+        }
 
-      this.detailsInfo = res
-      this.detailsList = res.detailList
-      this.fileList = res.bmFileInfos
+        this.userId = sessionStorage.getItem('userId')
+    },
+    methods: {
+        // 通过 或 驳回
+        async onHandleAuditing(type) {
+            // 组装参数
+            const currentAuditing = this.auditingList.filter(e => e.configValues.includes(this.userId)) // 获取当前审核的节点
+            const currentIndex = this.auditingList.findIndex(e => e.configValues.includes(this.userId)) // 获取当前的索引
 
-      this.detailsList.forEach(e => {
-        this.totalAmount += e.reduceLeaseMoney * 1
-      })
+            const { recordId, id, typeId, isAccept } = currentAuditing[0]
 
-      const { rows: result } = await getAuditingDetailsApi({ taskId })
-      this.auditingList = result
-      console.log('result审核记录详情', result)
+            // if (isAccept != 0) {
+            //     this.$modal.msgError('当前已审核，不可重复审核')
+            //     return
+            // }
+            Object.assign(this.auditingParams, {
+                typeId,
+                recordId,
+                nodeId: id
+            })
+            this.auditingParams.isAccept = type
+            if (currentIndex !== this.auditingList.length - 1) {
+                this.auditingParams.nextNodeId = this.auditingList[currentIndex + 1].id
+            }
+
+            const res = await submitAuditingApi(this.auditingParams)
+            console.log(res, '提交结果')
+
+            if (res.code === 200) {
+                this.$modal.msgSuccess('审核成功')
+                setTimeout(() => {
+                    const obj = { path: '/business-examine/reduction-apply' }
+                    this.$tab.closeOpenPage(obj)
+                }, 500)
+            }
+
+            console.log(this.auditingParams, ' this.auditingParams组装好的参数')
+        },
+        // 获取数据详情 和 审核记录详情
+        async getLeaseTaskDetailFun(id, taskId) {
+            const { data: res } = await getDiscountViewList(id)
+
+            this.detailsInfo = res
+            this.detailsList = res.detailList
+            this.fileList = res.bmFileInfos
+
+            this.detailsList.forEach(e => {
+                this.totalAmount += e.reduceLeaseMoney * 1
+            })
+
+            const { rows: result } = await getAuditingDetailsApi({ taskId })
+            this.auditingList = result
+            console.log('result审核记录详情', result)
+        }
     }
-  }
 }
 </script>
 
 <style scoped lang="scss">
 .business-details-container {
-  padding: 20px;
+    padding: 20px;
 }
 
 .pages-title {
-  padding: 10px 0 30px 0;
-  font-size: 20px;
-  font-weight: bold;
-  letter-spacing: 2px;
-  text-align: center;
-  color: #19a4a0;
+    padding: 10px 0 30px 0;
+    font-size: 20px;
+    font-weight: bold;
+    letter-spacing: 2px;
+    text-align: center;
+    color: #19a4a0;
 }
 
 .file-box {
-  padding: 10px;
-  display: flex;
-  flex-wrap: wrap;
-  box-sizing: border-box;
-  div {
-    width: calc((100% - 110px) / 12);
-    height: 60px;
-    margin-right: 10px;
-    margin-top: 10px;
-    text-align: center;
-    line-height: 60px;
-    background-color: #19a4a0;
-  }
+    padding: 10px;
+    display: flex;
+    flex-wrap: wrap;
+    box-sizing: border-box;
+    div {
+        width: calc((100% - 110px) / 12);
+        height: 60px;
+        margin-right: 10px;
+        margin-top: 10px;
+        text-align: center;
+        line-height: 60px;
+        background-color: #19a4a0;
+    }
 
-  & div:nth-child(12n) {
-    margin-right: 0;
-  }
+    & div:nth-child(12n) {
+        margin-right: 0;
+    }
 }
 
 .right-container {
-  padding: 0 20px;
+    padding: 0 20px;
 }
 
 .right-title {
-  display: flex;
-  align-items: center;
-  font-size: 14px;
-  & div:first-child {
-    width: 16px;
-    height: 16px;
-    border-radius: 50%;
-    background-color: #19a4a0;
-    z-index: 9;
-  }
-  & div:nth-child(2) {
-    width: 16px;
-    height: 16px;
-    border-radius: 50%;
-    background-color: #b2e1e0;
-    transform: translateX(-50%);
-  }
+    display: flex;
+    align-items: center;
+    font-size: 14px;
+    & div:first-child {
+        width: 16px;
+        height: 16px;
+        border-radius: 50%;
+        background-color: #19a4a0;
+        z-index: 9;
+    }
+    & div:nth-child(2) {
+        width: 16px;
+        height: 16px;
+        border-radius: 50%;
+        background-color: #b2e1e0;
+        transform: translateX(-50%);
+    }
 }
 
 .process-record {
-  margin-top: 20px;
-  //   height: 60vh;
+    margin-top: 20px;
+    //   height: 60vh;
 }
 
 .btn-container {
-  margin-top: 10px;
-  display: flex;
-  justify-content: space-around;
+    margin-top: 10px;
+    display: flex;
+    justify-content: space-around;
 }
 
 ::v-deep .el-step__icon.is-text {
-  background-color: #19a4a0;
-  color: #19a4a0;
-  border: none;
-  width: 16px;
-  height: 16px;
+    background-color: #19a4a0;
+    color: #19a4a0;
+    border: none;
+    width: 16px;
+    height: 16px;
 }
 
 ::v-deep .el-step.is-vertical .el-step__line {
-  width: 2px;
-  top: 26px;
-  bottom: 8px;
-  left: 7px;
+    width: 2px;
+    top: 26px;
+    bottom: 8px;
+    left: 7px;
 }
 
 ::v-deep .el-step__title.is-finish {
-  font-weight: bold;
-  color: #303133;
-  font-size: 16px;
+    font-weight: bold;
+    color: #303133;
+    font-size: 16px;
 }
 
 ::v-deep .el-step__title.is-wait {
-  font-weight: bold;
-  color: #303133;
-  font-size: 16px;
+    font-weight: bold;
+    color: #303133;
+    font-size: 16px;
 }
 
 .total-amount {
-  margin-bottom: 10px;
-  display: flex;
-  justify-content: flex-end;
-  font-size: 14px;
-  align-items: center;
+    margin-bottom: 10px;
+    display: flex;
+    justify-content: flex-end;
+    font-size: 14px;
+    align-items: center;
 
-  & span:last-child {
-    margin: 0 6px;
-    color: red;
-    font-weight: bold;
-  }
+    & span:last-child {
+        margin: 0 6px;
+        color: red;
+        font-weight: bold;
+    }
 }
 
 .custom-description {
-  padding: 8px 0 8px 20px;
-  color: #666;
+    padding: 8px 0 8px 20px;
+    color: #666;
 }
 
 .node-info {
-  // padding: 2px 0;
-  padding-left: 20px;
-  color: #666;
-  letter-spacing: 1px;
+    // padding: 2px 0;
+    padding-left: 20px;
+    color: #666;
+    letter-spacing: 1px;
 }
 </style>
diff --git a/src/views/business-examine/reduction-apply/index.vue b/src/views/business-examine/reduction-apply/index.vue
index bae8cb97..0cbfd18d 100644
--- a/src/views/business-examine/reduction-apply/index.vue
+++ b/src/views/business-examine/reduction-apply/index.vue
@@ -1,41 +1,48 @@
 <template>
-  <!-- 业务办理审核  减免审核 -->
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" v-show="showSearch" :inline="true" label-width="80px">
-      <el-form-item 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>
-      <el-form-item prop="keyWord">
-        <el-input
-          maxlength="50"
-          v-model="queryParams.keyWord"
-          placeholder="请输入关键词"
-          clearable
-          style="width: 240px"
-        />
-      </el-form-item>
-      <el-form-item prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
-          <el-option label="待审核" value="0"></el-option>
-          <el-option label="审核中" value="1"></el-option>
-          <el-option label="已审核" value="2"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
+    <!-- 业务办理审核  减免审核 -->
+    <div class="app-container">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            v-show="showSearch"
+            :inline="true"
+            label-width="80px"
+        >
+            <el-form-item 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>
+            <el-form-item prop="keyWord">
+                <el-input
+                    maxlength="50"
+                    v-model="queryParams.keyWord"
+                    placeholder="请输入关键词"
+                    clearable
+                    style="width: 240px"
+                />
+            </el-form-item>
+            <el-form-item prop="status">
+                <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
+                    <el-option label="待审核" value="0"></el-option>
+                    <el-option label="审核中" value="1"></el-option>
+                    <el-option label="已审核" value="2"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <el-row :gutter="10" class="mb8">
+            <!-- <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">减免申请</el-button>
             </el-col>
             <el-col :span="1.5">
@@ -44,297 +51,317 @@
                 </el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
-    </el-row>
+        </el-row>
 
-    <el-table v-loading="loading" :data="formList" ref="multipleTable" row-key="id" border>
-      <el-table-column label="序号" align="center" width="80" type="index">
-        <template slot-scope="scope">
-          <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="申请时间" align="center" prop="createTime" show-overflow-tooltip width="200px" />
-      <el-table-column label="申请人" align="center" prop="createBy" show-overflow-tooltip />
-      <el-table-column label="租赁单位" align="center" prop="unitName" show-overflow-tooltip />
-      <el-table-column label="租赁工程" align="center" prop="projectName" :show-overflow-tooltip="true" />
-      <el-table-column label="租赁费用(元)" align="center" prop="leasePrice" :show-overflow-tooltip="true">
-        <!-- <template slot-scope="scope">
+        <el-table v-loading="loading" :data="formList" ref="multipleTable" row-key="id" border>
+            <el-table-column label="序号" align="center" width="80" type="index">
+                <template slot-scope="scope">
+                    <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="申请时间" align="center" prop="createTime" show-overflow-tooltip width="200px" />
+            <el-table-column label="申请人" align="center" prop="createBy" show-overflow-tooltip />
+            <el-table-column label="租赁单位" align="center" prop="unitName" show-overflow-tooltip />
+            <el-table-column label="租赁工程" align="center" prop="projectName" :show-overflow-tooltip="true" />
+            <el-table-column label="租赁费用(元)" align="center" prop="leasePrice" :show-overflow-tooltip="true">
+                <!-- <template slot-scope="scope">
               {{ scope.row.leasePrice.toFixed(2) }}
           </template> -->
-      </el-table-column>
-      <el-table-column
-        label="本次减免费用（元）"
-        align="center"
-        prop="leaseMoney"
-        :show-overflow-tooltip="true"
-        width="150px"
-      >
-        <!-- <template slot-scope="scope">
+            </el-table-column>
+            <el-table-column
+                label="本次减免费用（元）"
+                align="center"
+                prop="leaseMoney"
+                :show-overflow-tooltip="true"
+                width="150px"
+            >
+                <!-- <template slot-scope="scope">
               {{ scope.row.leaseMoney.toFixed(2) }}
           </template> -->
-      </el-table-column>
-      <el-table-column
-        label="累计减免费用（元） "
-        align="center"
-        prop="leaseMoneyAll"
-        :show-overflow-tooltip="true"
-        width="150px"
-      >
-        <!-- <template slot-scope="scope">
+            </el-table-column>
+            <el-table-column
+                label="累计减免费用（元） "
+                align="center"
+                prop="leaseMoneyAll"
+                :show-overflow-tooltip="true"
+                width="150px"
+            >
+                <!-- <template slot-scope="scope">
               {{ scope.row.leaseMoneyAll.toFixed(2) }}
           </template> -->
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span v-if="scope.row.status == '0'">待审核</span>
-          <!-- <span v-if="scope.row.status == '1'">审核中</span> -->
-          <span v-if="scope.row.status == '1'">已通过</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" width="180">
-        <template slot-scope="scope">
-          <!-- <el-button type="text" size="mini" icon="el-icon-search" @click="handleView(scope.row)">
+            </el-table-column>
+            <el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true">
+                <template slot-scope="{ row }">
+                    <!-- <span v-if="scope.row.status == '0'">待审核</span> -->
+                    <!-- <span v-if="scope.row.status == '1'">审核中</span> -->
+                    <!-- <span v-if="scope.row.status == '1'">已通过</span> -->
+
+                    <el-tag v-if="row.status == '1'" size="mini">审核中</el-tag>
+                    <el-tag v-if="row.status == '0'" type="warning" size="mini">待审核</el-tag>
+                    <el-tag v-if="row.status == '2'" type="success" size="mini">已完成</el-tag>
+                    <el-tag v-if="row.status == '3'" type="danger" size="mini">已驳回</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="180">
+                <template slot-scope="scope">
+                    <!-- <el-button type="text" size="mini" icon="el-icon-search" @click="handleView(scope.row)">
                         查看
                     </el-button> -->
-          <el-button
-            v-if="scope.row.status != '1'"
-            type="text"
-            size="mini"
-            icon="el-icon-edit"
-            @click="handleAuditing(scope.row, 1)"
-          >
-            审核
-          </el-button>
-          <el-button
-            v-if="scope.row.status == 1"
-            type="text"
-            size="mini"
-            icon="el-icon-search"
-            @click="handleAuditing(scope.row, 2)"
-          >
-            查看
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+                    <el-button
+                        v-if="auditingShow(scope.row)"
+                        type="text"
+                        size="mini"
+                        icon="el-icon-edit"
+                        @click="handleAuditing(scope.row, 1)"
+                    >
+                        审核
+                    </el-button>
+                    <el-button
+                        v-if="scope.row.status == 2 || scope.row.status == 3"
+                        type="text"
+                        size="mini"
+                        icon="el-icon-search"
+                        @click="handleAuditing(scope.row, 2)"
+                    >
+                        查看
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />
 
-    <!-- 减免费用弹窗-->
-    <el-dialog :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-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" />
+                <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>
-                    <span v-else class="el-upload-list__item-preview" @click="picturePreview(file)">
-                      <i class="el-icon-zoom-in" />
+                </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>
-                    <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-col>
+                <el-col :span="6">
+                    <el-button type="success" size="small" @click="handleClean" v-if="num2 > 0">一键去除</el-button>
+                </el-col>
+            </el-row>
 
-      <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" v-if="!isView">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
 
-      <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" v-if="!isView">确 定</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>
+        <!-- 图片查看弹窗 -->
+        <el-dialog :visible.sync="dialogVisible" width="600px" height="600px">
+            <img width="100%" height="500px" :src="dialogImageUrl" />
+        </el-dialog>
+    </div>
 </template>
 
 <script>
@@ -346,892 +373,915 @@ import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import { getReceiveApplyApi } from '@/api/reduction-apply/index.js'
 export default {
-  name: '',
-  data() {
-    return {
-      // 遮罩层
-      loading: false,
-      // 显示搜索条件
-      showSearch: true,
-
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-
-      // 总条数
-      total: 0,
-      // 表格数据
-      formList: [],
-      // 费用推送审核表格数据
-      pushReviewList: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-
-      //合计
-      moneyAll: 0,
-      //租赁合计
-      leaseAll: 0,
-
-      // 查询参数
-      queryParams: {
-        status: null,
-        keyWork: '',
-        time: null,
-        pageSize: 10,
-        pageNum: 1
-      },
-
-      // 多选框选中数据
-      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' }],
-        reason: [{ 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,
-      isView: false,
-      agreementId: '',
-      idTemp: null
-    }
-  },
-  created() {
-    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 ''
-    },
-
-    /** 查询列表 */
-    async getList() {
-      this.loading = true
-
-      const params = {
-        keyWord: this.queryParams.keyWord,
-        status: this.queryParams.status,
-        startTime: this.queryParams.time && this.queryParams.time[0],
-        endTime: this.queryParams.time && this.queryParams.time[1]
-      }
-
-      getReceiveApplyApi(params).then(response => {
-        this.total = response.total
-        this.formList = response.rows
-        // 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 = {
-        keyWord: null,
-        status: null,
-        time: null
-      }
-      this.resetForm('queryForm')
-      this.queryParams.pageNum = 1
-      this.handleQuery()
-    },
-
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.getList()
-    },
-
-    handleDelete(row) {
-      this.$modal
-        .confirm('是否确认删除所选择的数据项？')
-        .then(function () {
-          return deleteRedif(row.id)
-        })
-        .then(() => {
-          this.getList()
-          this.$modal.msgSuccess('删除成功')
-        })
-        .catch(() => {})
-    },
-
-    /** 减免申请按钮 */
-    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 = '减免申请'
-    },
-
-    //查看
-    handleView(row) {
-      this.isView = true
-      this.title = '查看'
-      this.uploadKey = Date.now()
-
-      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
-    },
-
-    //编辑
-    handleAuditing(row, type) {
-      this.$router.push({
-        name: 'reduction-apply',
-        query: {
-          id: row.id,
-          taskId: row.taskId,
-          type
-        }
-      }) // 跳转审核详情页面
-      // this.isView = false
-      // this.title = '修改'
-      // this.uploadKey = Date.now()
-
-      // 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 开始
-    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) {
+    name: '',
+    data() {
         return {
-          rowspan: 0,
-          colspan: 0
+            // 遮罩层
+            loading: false,
+            // 显示搜索条件
+            showSearch: true,
+
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+
+            // 总条数
+            total: 0,
+            // 表格数据
+            formList: [],
+            // 费用推送审核表格数据
+            pushReviewList: [],
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+
+            //合计
+            moneyAll: 0,
+            //租赁合计
+            leaseAll: 0,
+
+            // 查询参数
+            queryParams: {
+                status: null,
+                keyWork: '',
+                time: null,
+                pageSize: 10,
+                pageNum: 1
+            },
+
+            // 多选框选中数据
+            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' }],
+                reason: [{ 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,
+            isView: false,
+            agreementId: '',
+            idTemp: null,
+            userId: ''
         }
-      }
     },
-
-    //减免费用申请弹窗合并
-    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
+    created() {
+        this.userId = sessionStorage.getItem('userId')
+        this.getList()
+    },
+    computed: {
+        //图片上传1张后，隐藏上传框
+        uploadDisabled() {
+            return this.dialogAppy.decreaseFile && this.dialogAppy.decreaseFile.length == 3
         }
-      }
     },
-
-    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)
+    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 {
+                }
             }
-          } 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)
-          }
-          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
-      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
+            return ''
+        },
 
-          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()
-    },
+        /** 查询列表 */
+        async getList() {
+            this.loading = true
 
-    //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 = {
-              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)
+            const params = {
+                keyWord: this.queryParams.keyWord,
+                status: this.queryParams.status,
+                startTime: this.queryParams.time && this.queryParams.time[0],
+                endTime: this.queryParams.time && this.queryParams.time[1]
             }
-            console.log('xxxxxxxxxxxxxx', param.bmFileInfos)
-            editRelief(param).then(response => {
-              if (response.code == 200) {
-                this.$modal.msgSuccess('修改成功')
-                this.confirmShow = false
-                this.getList()
-                this.showApply = false
-              }
+
+            getReceiveApplyApi(params).then(response => {
+                this.total = response.total
+                this.formList = response.rows
+                // 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)
             })
-          }
-        } else {
-          return false
+
+            this.loading = false
+        },
+
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.queryParams = {
+                keyWord: null,
+                status: null,
+                time: null
+            }
+            this.resetForm('queryForm')
+            this.queryParams.pageNum = 1
+            this.handleQuery()
+        },
+
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.getList()
+        },
+
+        handleDelete(row) {
+            this.$modal
+                .confirm('是否确认删除所选择的数据项？')
+                .then(function () {
+                    return deleteRedif(row.id)
+                })
+                .then(() => {
+                    this.getList()
+                    this.$modal.msgSuccess('删除成功')
+                })
+                .catch(() => {})
+        },
+
+        /** 减免申请按钮 */
+        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 = '减免申请'
+        },
+
+        //查看
+        handleView(row) {
+            this.isView = true
+            this.title = '查看'
+            this.uploadKey = Date.now()
+
+            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
+        },
+
+        //编辑
+        handleAuditing(row, type) {
+            this.$router.push({
+                name: 'reduction-apply',
+                query: {
+                    id: row.id,
+                    taskId: row.taskId,
+                    type,
+                    nodeId: row.nodeId
+                }
+            }) // 跳转审核详情页面
+            // this.isView = false
+            // this.title = '修改'
+            // this.uploadKey = Date.now()
+
+            // 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 开始
+        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)
+                    }
+                    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
+            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 = {
+                            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)
+                        }
+                        console.log('xxxxxxxxxxxxxx', param.bmFileInfos)
+                        editRelief(param).then(response => {
+                            if (response.code == 200) {
+                                this.$modal.msgSuccess('修改成功')
+                                this.confirmShow = false
+                                this.getList()
+                                this.showApply = false
+                            }
+                        })
+                    }
+                } 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()
+        },
+
+        handleAdd() {
+            console.log('减免申请')
+            this.$router.push({ path: '/business/businessHandling/discountApply' })
+        },
+        handleExport() {},
+        // 判断审核按钮显示隐藏
+        auditingShow(row) {
+            if (row.configValue) {
+                return (row.status == 1 || row.status == 0) && row.configValue.includes(this.userId)
+            }
         }
-      })
-    },
-
-    //减免申请取消按钮
-    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()
-    },
-
-    handleAdd() {
-      console.log('减免申请')
-      this.$router.push({ path: '/business/businessHandling/discountApply' })
-    },
-    handleExport() {}
-  }
+    }
 }
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-table__body tr.highlight-row {
-  background-color: #c0e6fa;
+    background-color: #c0e6fa;
 }
 ::v-deep .el-table {
-  table-layout: auto;
+    table-layout: auto;
 }
 .uploadImg {
-  padding-top: 20px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
+    padding-top: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
 }
 .deviceCode {
-  margin-top: 10px;
-  padding-bottom: 20px;
-  font-size: 18px;
+    margin-top: 10px;
+    padding-bottom: 20px;
+    font-size: 18px;
 }
 ::v-deep.el-table .fixed-width .el-button--mini {
-  width: 60px !important;
-  margin-bottom: 10px;
+    width: 60px !important;
+    margin-bottom: 10px;
 }
 
 //文件上传样式
 //隐藏图片上传框的css
 ::v-deep.disabledFbs {
-  .el-upload--picture-card {
-    display: none;
-  }
+    .el-upload--picture-card {
+        display: none;
+    }
 }
 ::v-deep .el-upload-list__item {
-  margin-bottom: 20px;
-  overflow: unset !important;
+    margin-bottom: 20px;
+    overflow: unset !important;
 }
 ::v-deep .el-upload-list__item-actions {
-  overflow: unset !important;
+    overflow: unset !important;
 }
 
 .el-upload-list__item-thumbnail {
-  height: 145px !important;
+    height: 145px !important;
 }
 
 .picture-card-container {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  position: relative;
+    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;
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+    justify-content: center;
 
-  // border: 1px solid  #ddd;
-  // border-radius: 4px;
+    // 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;
+    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;
+    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>
diff --git a/src/views/material/lease/protocol/index.vue b/src/views/material/lease/protocol/index.vue
index c8a7ba7b..ec8d1285 100644
--- a/src/views/material/lease/protocol/index.vue
+++ b/src/views/material/lease/protocol/index.vue
@@ -1,147 +1,129 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item prop="keyWord">
-        <el-input
-          v-model="queryParams.keyWord"
-          placeholder="请输入关键字"
-          clearable
-          @keyup.enter.native="handleQuery"
-          maxlength="20"
-        />
-      </el-form-item>
+    <div class="app-container">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="68px"
+        >
+            <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>
-        <el-date-picker v-model="queryParams.time" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
-        ></el-date-picker>
-      </el-form-item>
+            <el-form-item>
+                <el-date-picker
+                    v-model="queryParams.time"
+                    style="width: 240px"
+                    value-format="yyyy-MM-dd"
+                    type="daterange"
+                    range-separator="-"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                ></el-date-picker>
+            </el-form-item>
 
-      <!-- <el-form-item label="状态">
+            <!-- <el-form-item label="状态">
         <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
           <el-option label="删除" value="0"></el-option>
           <el-option label="启用" value="1"></el-option>
         </el-select>
       </el-form-item> -->
 
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增
-        </el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出
-        </el-button>
-      </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
-    </el-row>
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">
+                    导出
+                </el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
 
+        <el-table v-loading="loading" border :data="houseList" ref="multipleTable" row-key="teamId">
+            <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="signTime" width="150" />
+            <el-table-column label="协议编号" align="center" prop="agreementCode" width="180" />
+            <el-table-column label="合同编号" align="center" prop="contractCode" width="120" />
+            <el-table-column label="租赁单位" align="center" prop="unitName" width="150" />
+            <el-table-column label="租赁工程" align="center" prop="projectName" width="150" />
+            <el-table-column label="开始日期" align="center" prop="planStartTime" width="120" />
+            <!--      <el-table-column label="租赁期限(天)" align="center" prop="leaseDay" width="100"/>-->
+            <el-table-column label="授权人" align="center" prop="authPerson" width="100" />
+            <el-table-column label="授权人电话" align="center" prop="phone" width="120" />
+            <el-table-column label="分部工程" align="center" prop="branchProject" />
+            <el-table-column label="租赁单位类型" align="center" width="100">
+                <template slot-scope="scope">
+                    <span v-if="scope.row.protocol == '1'">内部单位</span>
+                    <span v-if="scope.row.protocol == '2'">外部单位</span>
+                </template>
+            </el-table-column>
 
-    <el-table v-loading="loading" border :data="houseList" ref="multipleTable" row-key="teamId">
-      <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="signTime" width="150"/>
-      <el-table-column label="协议编号" align="center" prop="agreementCode" width="180"/>
-      <el-table-column label="合同编号" align="center" prop="contractCode" width="120"/>
-      <el-table-column label="租赁单位" align="center" prop="unitName" width="150"/>
-      <el-table-column label="租赁工程" align="center" prop="projectName" width="150"/>
-      <el-table-column label="开始日期" align="center" prop="planStartTime" width="120"/>
-<!--      <el-table-column label="租赁期限(天)" align="center" prop="leaseDay" width="100"/>-->
-      <el-table-column label="授权人" align="center" prop="authPerson" width="100"/>
-      <el-table-column label="授权人电话" align="center" prop="phone" width="120"/>
-      <el-table-column label="租赁单位类型" align="center" width="100">
-        <template slot-scope="scope">
-          <span v-if="scope.row.protocol == '1'">内部单位</span>
-          <span v-if="scope.row.protocol == '2'">外部单位</span>
-        </template>
-      </el-table-column>
+            <el-table-column label="附件图片" align="center" width="150">
+                <template slot-scope="scope">
+                    <el-button size="mini" type="text" icon="el-icon-zoom-in" @click="handleAllImg(scope.row)">
+                        查看
+                    </el-button>
+                </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center" prop="remark" width="100" />
+            <el-table-column label="操作" align="center" width="240" fixed="right">
+                <template slot-scope="scope">
+                    <el-button size="mini" @click="handleView(scope.row)">查看</el-button>
+                    <el-button size="mini" type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
+                    <el-button size="mini" type="danger" @click="handleDelete(scope.row)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
 
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />
 
-      <el-table-column label="附件图片" align="center" width="150">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-zoom-in"
-            @click="handleAllImg(scope.row)"
-          >
-            查看
-          </el-button>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" width="100"/>
-      <el-table-column label="操作" align="center" width="240" fixed="right">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            @click="handleView(scope.row)"
-          >
-            查看
-          </el-button>
-          <el-button
-            size="mini" type="primary"
-            @click="handleUpdate(scope.row)"
-          >
-            编辑
-          </el-button>
-          <el-button
-            size="mini"
-            type="danger"
-            @click="handleDelete(scope.row)"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 新增或修改弹窗 -->
-    <el-dialog :title="title" :visible.sync="showHouse" width="1000px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="租赁单位" prop="unitId" >
-              <treeselect
-                  v-model="form.unitId" :disabled="isEdits"
-                  :options="uniteList" :normalizer="normalizer"
-                  :show-count="true"  style="width: 100%;" :disable-branch-nodes="true"
-                  noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
-                  placeholder="请选择租赁单位" @select="unitSelect"
-              />
-              <!-- <el-cascader
+        <!-- 新增或修改弹窗 -->
+        <el-dialog :title="title" :visible.sync="showHouse" width="1000px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="租赁单位" prop="unitId">
+                            <treeselect
+                                v-model="form.unitId"
+                                :disabled="isEdits"
+                                :options="uniteList"
+                                :normalizer="normalizer"
+                                :show-count="true"
+                                style="width: 100%"
+                                :disable-branch-nodes="true"
+                                noChildrenText="没有数据了"
+                                noOptionsText="没有数据"
+                                noResultsText="没有搜索结果"
+                                placeholder="请选择租赁单位"
+                                @select="unitSelect"
+                            />
+                            <!-- <el-cascader
                 v-model="unitId"
                 :show-all-levels="false"
                 :options="uniteList"
@@ -154,31 +136,37 @@
                 style="width: 100%;"
                 :disabled="isEdits"
               ></el-cascader> -->
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="授权人" prop="authPerson">
-              <el-input
-                maxlength="50"
-                v-model="form.authPerson"
-                placeholder="请输入授权人"
-                :disabled="isEdits"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="授权人" prop="authPerson">
+                            <el-input
+                                maxlength="50"
+                                v-model="form.authPerson"
+                                placeholder="请输入授权人"
+                                :disabled="isEdits"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
 
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="租赁工程" prop="projectId">
-              <treeselect
-                  v-model="form.projectId" :disabled="isEdits"
-                  :options="projectList" :normalizer="normalizer"
-                  :show-count="true"  style="width: 100%;" :disable-branch-nodes="true"
-                  noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
-                  placeholder="请选择租赁工程"
-              />
-              <!-- <el-cascader
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="租赁工程" prop="projectId">
+                            <treeselect
+                                v-model="form.projectId"
+                                :disabled="isEdits"
+                                :options="projectList"
+                                :normalizer="normalizer"
+                                :show-count="true"
+                                style="width: 100%"
+                                :disable-branch-nodes="true"
+                                noChildrenText="没有数据了"
+                                noOptionsText="没有数据"
+                                noResultsText="没有搜索结果"
+                                placeholder="请选择租赁工程"
+                            />
+                            <!-- <el-cascader
                 v-model="projectId"
                 :show-all-levels="false"
                 :options="projectList"
@@ -191,48 +179,47 @@
                 style="width: 100%;"
                 :disabled="isEdits"
               ></el-cascader> -->
-            </el-form-item>
-          </el-col>
-          
+                        </el-form-item>
+                    </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="联系电话" prop="phone">
-              <el-input
-                v-model="form.phone"
-                placeholder="请输入联系电话"
-                maxlength="11"
-                :disabled="isEdits"
-                onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
+                    <el-col :span="12">
+                        <el-form-item label="联系电话" prop="phone">
+                            <el-input
+                                v-model="form.phone"
+                                placeholder="请输入联系电话"
+                                maxlength="11"
+                                :disabled="isEdits"
+                                onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
 
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="合同编号" prop="contractCode">
-              <el-input
-                maxlength="50"
-                v-model="form.contractCode"
-                placeholder="请输入合同编号"
-                :disabled="isEdits"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="开始日期" prop="planStartTime">
-              <el-date-picker
-                style="width: 100%"
-                v-model="form.planStartTime"
-                value-format="yyyy-MM-dd"
-                type="date"
-                placeholder="请选择开始日期"
-                :disabled="isEdits"
-              ></el-date-picker>
-            </el-form-item>
-          </el-col> 
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="合同编号" prop="contractCode">
+                            <el-input
+                                maxlength="50"
+                                v-model="form.contractCode"
+                                placeholder="请输入合同编号"
+                                :disabled="isEdits"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="开始日期" prop="planStartTime">
+                            <el-date-picker
+                                style="width: 100%"
+                                v-model="form.planStartTime"
+                                value-format="yyyy-MM-dd"
+                                type="date"
+                                placeholder="请选择开始日期"
+                                :disabled="isEdits"
+                            ></el-date-picker>
+                        </el-form-item>
+                    </el-col>
 
-<!--          <el-col :span="12">
+                    <!--          <el-col :span="12">
             <el-form-item label="租赁期限(天)" prop="leaseDay">
               <el-input-number
                 v-model="form.leaseDay"
@@ -245,970 +232,1004 @@
               />
             </el-form-item>
           </el-col>-->
-        </el-row> 
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="租赁单位类型">
-              <el-select style="width: 100%;" v-model="form.protocol" placeholder="请选择租赁单位类型" clearable :disabled="isEdits">
-                <el-option label="内部单位" value="1"></el-option>
-                <el-option label="外部单位" value="2"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> 
-          <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
-              <el-input
-                v-model="form.remark"
-                type="textarea"
-                placeholder="请输入备注"
-                maxlength="100"
-                :disabled="isEdits"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>  
-        <el-form-item label="附件">
-          <el-upload
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="租赁单位类型">
+                            <el-select
+                                style="width: 100%"
+                                v-model="form.protocol"
+                                placeholder="请选择租赁单位类型"
+                                clearable
+                                :disabled="isEdits"
+                            >
+                                <el-option label="内部单位" value="1"></el-option>
+                                <el-option label="外部单位" value="2"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
 
-            action="#"
-            :file-list="businessLicenseListTemp"
-            :show-file-list="true"
-            :auto-upload="false"
-            :key="uploadKey"
-            list-type="picture-card"
-            accept=".png, .jpg, .jpeg, .pdf"
-            :on-change="handleChangeBusinessList"
-            :class="{ disabled: uploadDisabled }"
-            :on-preview="picturePreview"
-            :on-remove="handleRemoveElectricianImgList"
-            :disabled="isEdits"
-          >
+                    <el-col :span="12">
+                        <el-form-item label="分部工程" prop="remark">
+                            <el-select
+                                clearable
+                                multiple
+                                filterable
+                                style="width: 100%"
+                                placeholder="请选择分部工程"
+                                v-model="form.branchProIds"
+                            >
+                                <el-option
+                                    :key="dict.value"
+                                    :label="dict.label"
+                                    :value="dict.value * 1"
+                                    v-for="dict in dict.type.branch_project"
+                                />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
 
-            <!-- 文件格式下载，图片格式预览 -->
-            <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>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="附件">
+                            <el-upload
+                                action="#"
+                                :file-list="businessLicenseListTemp"
+                                :show-file-list="true"
+                                :auto-upload="false"
+                                :key="uploadKey"
+                                list-type="picture-card"
+                                accept=".png, .jpg, .jpeg, .pdf"
+                                :on-change="handleChangeBusinessList"
+                                :class="{ disabled: uploadDisabled }"
+                                :on-preview="picturePreview"
+                                :on-remove="handleRemoveElectricianImgList"
+                                :disabled="isEdits"
+                            >
+                                <!-- 文件格式下载，图片格式预览 -->
+                                <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-col :span="12">
+                        <el-form-item label="备注" prop="remark">
+                            <el-input
+                                v-model="form.remark"
+                                type="textarea"
+                                placeholder="请输入备注"
+                                maxlength="100"
+                                :disabled="isEdits"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm" v-if="showConfirmButton">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
             </div>
-            <i class="el-icon-plus avatar-uploader-icon"></i>
-          </el-upload>
-        </el-form-item>
+        </el-dialog>
 
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-if="showConfirmButton">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 查看 -->
-    <el-dialog :title="title" :visible.sync="showSee" width="1000px" append-to-body>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item label="租赁单位">
-          {{ form.unitName }}
-        </el-descriptions-item>
-        <el-descriptions-item label="授权人">
-          {{ form.authPerson }}
-        </el-descriptions-item>
-        <el-descriptions-item label="租赁工程">
-          {{ form.projectName }}
-        </el-descriptions-item>
-        <el-descriptions-item label="联系电话">
-          {{ form.phone }}
-        </el-descriptions-item>
-        <el-descriptions-item label="合同编号">
-          {{ form.contractCode }}
-        </el-descriptions-item>
-<!--        <el-descriptions-item label="租赁期限(天)">
+        <!-- 查看 -->
+        <el-dialog :title="title" :visible.sync="showSee" width="1000px" append-to-body>
+            <el-descriptions :column="2" border>
+                <el-descriptions-item label="租赁单位">
+                    {{ form.unitName }}
+                </el-descriptions-item>
+                <el-descriptions-item label="授权人">
+                    {{ form.authPerson }}
+                </el-descriptions-item>
+                <el-descriptions-item label="租赁工程">
+                    {{ form.projectName }}
+                </el-descriptions-item>
+                <el-descriptions-item label="联系电话">
+                    {{ form.phone }}
+                </el-descriptions-item>
+                <el-descriptions-item label="合同编号">
+                    {{ form.contractCode }}
+                </el-descriptions-item>
+                <!--        <el-descriptions-item label="租赁期限(天)">
           {{ form.leaseDay }}
         </el-descriptions-item>-->
-        <el-descriptions-item label="开始日期">
-          {{ form.planStartTime }}
-        </el-descriptions-item>
-        <el-descriptions-item label="备注">
-          {{ form.remark }}
-        </el-descriptions-item>
-        <el-descriptions-item label="租赁单位类型">
-          {{ form.protocol === '1' ? '内部单位' : '外部单位' }}
-        </el-descriptions-item>
-      </el-descriptions>
+                <el-descriptions-item label="开始日期">
+                    {{ form.planStartTime }}
+                </el-descriptions-item>
+                <el-descriptions-item label="备注">
+                    {{ form.remark }}
+                </el-descriptions-item>
+                <el-descriptions-item label="租赁单位类型">
+                    {{ form.protocol === '1' ? '内部单位' : '外部单位' }}
+                </el-descriptions-item>
+            </el-descriptions>
 
-      <el-descriptions  :column="1" border style="width: 100%;">
-        <el-descriptions-item label="附件" >
-          <el-upload
-            class="upload-demo"
-            style="width: 197px;"
-            action="#"
-            :file-list="businessLicenseListTemp"
-            :show-file-list="true"
-            :auto-upload="false"
-            :key="uploadKey"
-            list-type="picture-card"
-            accept=".png, .jpg, .jpeg, .pdf"
-            :on-change="handleChangeBusinessList"
-            :class="{ disabled: true }"
-            :on-preview="picturePreview"
-            :on-remove="handleRemoveElectricianImgList"
-            :disabled="isEdits"
-          >
-            <!-- 文件格式下载，图片格式预览 -->
-            <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>
+            <el-descriptions :column="1" border style="width: 100%">
+                <el-descriptions-item label="附件">
+                    <el-upload
+                        class="upload-demo"
+                        style="width: 197px"
+                        action="#"
+                        :file-list="businessLicenseListTemp"
+                        :show-file-list="true"
+                        :auto-upload="false"
+                        :key="uploadKey"
+                        list-type="picture-card"
+                        accept=".png, .jpg, .jpeg, .pdf"
+                        :on-change="handleChangeBusinessList"
+                        :class="{ disabled: true }"
+                        :on-preview="picturePreview"
+                        :on-remove="handleRemoveElectricianImgList"
+                        :disabled="isEdits"
+                    >
+                        <!-- 文件格式下载，图片格式预览 -->
+                        <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-descriptions-item>
+            </el-descriptions>
+
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="cancel">取 消</el-button>
             </div>
-            <i class="el-icon-plus avatar-uploader-icon"></i>
-          </el-upload>
-        </el-descriptions-item>
-      </el-descriptions>
+        </el-dialog>
 
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 查看全部图片的弹窗 -->
-    <el-dialog :title="title" :visible.sync="showAllImg" width="800px" append-to-body>
-      <el-form ref="form" label-width="120px">
-        <el-form-item label="附件">
-          <el-upload
-            class="upload-demo"
-            action="#"
-            :file-list="businessLicenseListTemp"
-            :show-file-list="true"
-            :auto-upload="false"
-            :key="uploadKey"
-            list-type="picture-card"
-            accept=".png, .jpg, .jpeg, .pdf"
-            :on-change="handleChangeBusinessList"
-            :class="{ disabled: true }"
-            :on-preview="picturePreview"
-            :on-remove="handleRemoveElectricianImgList"
-            :disabled="isEdits"
-          >
-
-            <!-- 文件格式下载，图片格式预览 -->
-            <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>
+        <!-- 查看全部图片的弹窗 -->
+        <el-dialog :title="title" :visible.sync="showAllImg" width="800px" append-to-body>
+            <el-form ref="form" label-width="120px">
+                <el-form-item label="附件">
+                    <el-upload
+                        class="upload-demo"
+                        action="#"
+                        :file-list="businessLicenseListTemp"
+                        :show-file-list="true"
+                        :auto-upload="false"
+                        :key="uploadKey"
+                        list-type="picture-card"
+                        accept=".png, .jpg, .jpeg, .pdf"
+                        :on-change="handleChangeBusinessList"
+                        :class="{ disabled: true }"
+                        :on-preview="picturePreview"
+                        :on-remove="handleRemoveElectricianImgList"
+                        :disabled="isEdits"
+                    >
+                        <!-- 文件格式下载，图片格式预览 -->
+                        <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>
+                        </div>
+                        <i class="el-icon-plus avatar-uploader-icon"></i>
+                    </el-upload>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm" v-if="showConfirmButton">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
             </div>
-            <i class="el-icon-plus avatar-uploader-icon"></i>
-          </el-upload>
-        </el-form-item>
+        </el-dialog>
 
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-if="showConfirmButton">确 定</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>
+        <!-- 图片查看弹窗 -->
+        <el-dialog :visible.sync="dialogVisible" width="600px" height="600px">
+            <img width="100%" height="500px" :src="dialogImageUrl" />
+        </el-dialog>
+    </div>
 </template>
 
 <script>
 import {
-  getListAgreement,
-  getAgreementDetail,
-  editAgreement,
-  addAgreement,
-  delAgreement,
-  deleteFile,
-  getUnitList,
-  getProjectList,
-} from "@/api/lease/protocol";
-import {imgUpLoadThree, fileUpLoad} from '@/api/system/upload'
-import {downloadFile, downloadFileData} from '@/utils/download'
-import {getToken} from '@/utils/auth'
-import {Base64} from 'js-base64'
-import {forEach} from 'jszip';
-import {listUser} from "@/api/system/user";
-import {getListProject, getListUnite} from "@/api/lease/apply";
+    getListAgreement,
+    getAgreementDetail,
+    editAgreement,
+    addAgreement,
+    delAgreement,
+    deleteFile,
+    getUnitList,
+    getProjectList
+} from '@/api/lease/protocol'
+import { imgUpLoadThree, fileUpLoad } from '@/api/system/upload'
+import { downloadFile, downloadFileData } from '@/utils/download'
+import { getToken } from '@/utils/auth'
+import { Base64 } from 'js-base64'
+import { forEach } from 'jszip'
+import { listUser } from '@/api/system/user'
+import { getListProject, getListUnite } from '@/api/lease/apply'
 
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
 export default {
-  name: "supplier",
-  components: { Treeselect },
-  data() {
-    return {
-      uploadKey: Date.now(),
-      // 遮罩层
-      loading: false, 
-      loadingTwo: false, 
-      // 是否显示项目部Id
-      showName: false, 
-      // 是否显示施工预警信息
-      showWarn: false, 
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true, 
-      // 日期范围
-      dateRange: [], 
-      // 显示搜索条件
-      showSearch: true,
-      showHouse: false,
-      showSee: false,
-      showAllImg: false, 
-      // 总条数
-      total: 0,
-      totalTwo: 0,
-      // 租赁单位数据
-      unitList: [],
-      //租赁单位
-      uniteList: [],
-      selectTreeProps: {
-        children: "children",
-        label: "name",
-        // multiple: false,
-        value: "id",
-        // multiple: true,
-      },
-      unitId: null,
-      projectId: null,
-      maForm: {
-        unitId: undefined,
-        projectId: undefined
-      }, 
-      // 工程数据
-      projectList: [],
-      // 施工记录表格数据
-      houseList: [],
-      maxLength: 100,//已选列表上限，防止数据过多请求报错
-      keeperDataRange: [],
-      // 班组人员表格数据
-      teamList: [],
-      teamTempList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      showConfirmButton: true,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        keyWord: undefined,
-        status: undefined,
-        time: null, //申请时间
-      },
-      fileList: [],
-      businessLicenseFileList: [],
-      businessLicenseListTemp: [],
-      delBusinessFileIdList: [],
-      base64Data: undefined,
-      //图片查看弹窗
-      dialogImageUrl: '',
-      dialogVisible: false,
-      // 表单参数
-      form: {
-        unitId:null,
-        projectId:null,
-        protocol:'1'
-      }, 
-      // 表单校验
-      rules: {
-        unitId: [
-          {
-            required: true,
-            message: "请选择租赁单位",
-            trigger: "blur",
-          },
-        ],
-        projectId: [
-          {
-            required: true,
-            message: "请选择租赁工程",
-            trigger: "blur",
-          },
-        ],
-        contractCode: [
-          {
-            required: false,//是否分包商(是：合同编号必填)
-            message: '请填写合同编号',
-            trigger: 'change'
-          }
-        ],
-        authPerson: [
-          {
-            required: true,
-            message: '授权人不能为空',
-            trigger: 'blur',
-          },
-        ],
-        phone: [
-          {required: true, message: "联系电话不能为空", trigger: "blur"},
-          {
-            required: false,
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的联系电话",
-            trigger: "blur"
-          }
-        ],
-      },
-
-      //上传
-      upload: {
-        // 设置上传的请求头部
-        headers: {Authorization: 'Bearer ' + getToken()},
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + '/file/upload'
-      },
-
-      isEdit: false,
-      isEdits: false,
-    };
-  },
-  computed: {
-
-    //图片上传1张后，隐藏上传框
-    uploadDisabled() {
-      return this.businessLicenseListTemp.length > 9
-    },
-  },
-  created() {
-    this.getList();
-    this.getUnitList();
-    this.getProjectList();
-  },
-  methods: {
-
-    //提交时循环fileList 获取raw文件
-    async getFileData() {
-      const fileTwo = []
-      this.businessLicenseListTemp.forEach(item => {
-        if (item?.hasOwnProperty('raw')) {
-          fileTwo.push(item.raw)
-        }
-      })
-      return {fileTwo}
-    },
-
-    // 图片上传
-    async imgUpLoadTwoAll(param) {
-      param.type = 'ma'
-      imgUpLoadThree(param)
-        .then((res) => {
-          if (res.code == 200) {
-            let obj = {'name': res.data.name, 'url': res.data.url}
-            console.log('obj', obj)
-            this.businessLicenseFileList.push(obj);
-          } else {
-            // this.$msgError(res.msg)
-            this.$modal.msgError(res.msg)
-          }
-        })
-        .catch((error) => {
-          // this.$msgError(error)
-          this.$modal.msgError(error)
-        })
-    },
-
-    //上传组件-图片查看
-    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.businessLicenseListTemp.forEach((item, index) => {
-        if (item.uid == file.uid) {
-          sum = index
-        }
-      })
-      this.businessLicenseListTemp.splice(sum, 1)
-      if (file.status == 'success') {
-        this.delBusinessFileIdList.push(file.url);
-      }
-      console.log('delBusinessFileIdList', this.delBusinessFileIdList)
-    },
-    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
-        }
-      }
-    },
-    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 })
-      }
-    },
-    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 > 10) {
-        this.$message.warning('最多上传10张附件')
-        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.businessLicenseListTemp = fileList;
-    },
-
-
-
-    //查询列表
-    getList() {
-      this.loading = true;
-      const params = {
-        keyWord: this.queryParams.keyWord,
-        startTime: this.queryParams.time && this.queryParams.time[0],
-        endTime: this.queryParams.time && this.queryParams.time[1],
-        pageSize: this.queryParams.pageSize,
-        pageNum: this.queryParams.pageNum,
-        status: this.queryParams.status
-      };
-      getListAgreement(this.addDateRange(params)).then(response => {
-        this.houseList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    /** 转换菜单数据结构 */
-    normalizer(node) {
-        if (node.children && !node.children.length) {
-            delete node.children;
-        }
+    name: 'supplier',
+    dicts: ['branch_project'],
+    components: { Treeselect },
+    data() {
         return {
-            id: node.id,
-            label: node.name,
-            children: node.children,
-        };
-    },
-    //获取单位类型 ,getUnitList, getProjectList
-    getUnitList() {
-      getListUnite({projectId: null}).then((response) => {
-        this.uniteList = response.data;
-      });
-    },
-    getProjectList() {
-      getListProject({unitId: null}).then((response) => {
-        this.projectList = response.data;
-      });
-    },
-    unitSelect(e){
-      console.log(e)
-      if(e.typeKey=='fbs'){ 
-        this.rules['contractCode'][0].required=true; 
-      }else{ 
-        this.rules['contractCode'][0].required=false;
-      } 
-    },
-    uniteChange(val) {
-      if (val && val.length > 0) {
-        this.maForm.unitId = this.unitId[this.unitId.length - 1];
-      } else if (val && val.length == 0) {
-        this.maForm.unitId = "";
-      }
+            uploadKey: Date.now(),
+            // 遮罩层
+            loading: false,
+            loadingTwo: false,
+            // 是否显示项目部Id
+            showName: false,
+            // 是否显示施工预警信息
+            showWarn: false,
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 日期范围
+            dateRange: [],
+            // 显示搜索条件
+            showSearch: true,
+            showHouse: false,
+            showSee: false,
+            showAllImg: false,
+            // 总条数
+            total: 0,
+            totalTwo: 0,
+            // 租赁单位数据
+            unitList: [],
+            //租赁单位
+            uniteList: [],
+            selectTreeProps: {
+                children: 'children',
+                label: 'name',
+                // multiple: false,
+                value: 'id'
+                // multiple: true,
+            },
+            unitId: null,
+            projectId: null,
+            maForm: {
+                unitId: undefined,
+                projectId: undefined
+            },
+            // 工程数据
+            projectList: [],
+            // 施工记录表格数据
+            houseList: [],
+            maxLength: 100, //已选列表上限，防止数据过多请求报错
+            keeperDataRange: [],
+            // 班组人员表格数据
+            teamList: [],
+            teamTempList: [],
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            showConfirmButton: true,
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                keyWord: undefined,
+                status: undefined,
+                time: null //申请时间
+            },
+            fileList: [],
+            businessLicenseFileList: [],
+            businessLicenseListTemp: [],
+            delBusinessFileIdList: [],
+            base64Data: undefined,
+            //图片查看弹窗
+            dialogImageUrl: '',
+            dialogVisible: false,
+            // 表单参数
+            form: {
+                unitId: null,
+                projectId: null,
+                protocol: '1',
+                branchProIds: []
+            },
+            // 表单校验
+            rules: {
+                unitId: [
+                    {
+                        required: true,
+                        message: '请选择租赁单位',
+                        trigger: 'blur'
+                    }
+                ],
+                projectId: [
+                    {
+                        required: true,
+                        message: '请选择租赁工程',
+                        trigger: 'blur'
+                    }
+                ],
+                contractCode: [
+                    {
+                        required: false, //是否分包商(是：合同编号必填)
+                        message: '请填写合同编号',
+                        trigger: 'change'
+                    }
+                ],
+                authPerson: [
+                    {
+                        required: true,
+                        message: '授权人不能为空',
+                        trigger: 'blur'
+                    }
+                ],
+                phone: [
+                    { required: true, message: '联系电话不能为空', trigger: 'blur' },
+                    {
+                        required: false,
+                        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                        message: '请输入正确的联系电话',
+                        trigger: 'blur'
+                    }
+                ]
+            },
 
-    },
+            //上传
+            upload: {
+                // 设置上传的请求头部
+                headers: { Authorization: 'Bearer ' + getToken() },
+                // 上传的地址
+                url: process.env.VUE_APP_BASE_API + '/file/upload'
+            },
 
-    projectChange(val) {
-      if (val && val.length > 0) {
-        this.maForm.projectId = this.projectId[this.projectId.length - 1];
-      } else if (val && val.length == 0) {
-        this.maForm.projectId = "";
-      }
-    },
-
-
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset()
-      this.uploadKey = Date.now();
-      this.delBusinessFileIdList = [];
-      this.businessLicenseListTemp = [];
-      this.businessLicenseFileList = [];
-      this.showHouse = true
-      this.showConfirmButton = true
-      this.showSee = false
-      this.isEdit = false;
-      this.isEdits = false;
-      this.title = '新增'
-    },
-
-    handleUpdate(row) {
-      this.reset()
-      this.uploadKey = Date.now();
-      this.delBusinessFileIdList = [];
-      this.businessLicenseListTemp = [];
-      this.businessLicenseFileList = [];
-      var id = row.agreementId;
-
-      getAgreementDetail(id).then((response) => {
-        this.form = response.data;
-        this.maForm.unitId = response.data.unitId;
-        this.maForm.projectId = response.data.projectId;
-        this.unitId = this.treeParentsById(this.uniteList, this.maForm.unitId);
-        this.projectId = this.treeParentsById(this.projectList,this.maForm.projectId);
-
-        var taskId = this.form.taskId
-        console.log(taskId)
-        if(taskId){
-          this.isEdit = true;
-
-        }else{
-          this.isEdit = false;
+            isEdit: false,
+            isEdits: false
         }
-        this.isEdits = false;
-        console.log(this.isEdit)
-
-        if (response.data.bmFileInfos != null) {
-          this.businessLicenseListTemp = response.data.bmFileInfos;
-          this.businessLicenseListTemp.forEach(item => {
-            if (item.name.includes('/')) {
-              const fileNameWithTimestamp = item.name.split('/').pop();
-              const parts = fileNameWithTimestamp.split('_');
-              const fileType = item.name.split('.').pop();
-              const mainFileName = parts.slice(0, parts.length - 1).join('_');
-              item.name = mainFileName + '.' + fileType;
-            }
-          })
-        } else {
-          this.businessLicenseListTemp = [];
+    },
+    computed: {
+        //图片上传1张后，隐藏上传框
+        uploadDisabled() {
+            return this.businessLicenseListTemp.length > 9
         }
-        this.showHouse = true
-        this.showConfirmButton = true
-        this.showSee = false
-        this.title = '修改'
-      })
     },
-
-    handleAllImg(row) {
-      this.reset()
-      this.uploadKey = Date.now();
-      this.delBusinessFileIdList = [];
-      this.businessLicenseListTemp = [];
-      this.businessLicenseFileList = [];
-
-      var id = row.agreementId;
-      getAgreementDetail(id).then((response) => {
-        if (response.data.bmFileInfos != null) {
-          this.businessLicenseListTemp = response.data.bmFileInfos;
-          this.businessLicenseListTemp.forEach(item => {
-            if (item.name.includes('/')) {
-              const fileNameWithTimestamp = item.name.split('/').pop();
-              const parts = fileNameWithTimestamp.split('_');
-              const fileType = item.name.split('.').pop();
-              const mainFileName = parts.slice(0, parts.length - 1).join('_');
-              item.name = mainFileName + '.' + fileType;
-            }
-          })
-        } else {
-          this.businessLicenseListTemp = [];
-        }
-        this.isEdits = true;
-
-        this.showHouse = false
-        this.showConfirmButton = false
-        this.showAllImg = true
-        this.title = '查看'
-      })
+    created() {
+        this.getList()
+        this.getUnitList()
+        this.getProjectList()
     },
+    methods: {
+        //提交时循环fileList 获取raw文件
+        async getFileData() {
+            const fileTwo = []
+            this.businessLicenseListTemp.forEach(item => {
+                if (item?.hasOwnProperty('raw')) {
+                    fileTwo.push(item.raw)
+                }
+            })
+            return { fileTwo }
+        },
 
-    handleView(row) {
-      this.reset()
-      this.uploadKey = Date.now();
-      this.delBusinessFileIdList = [];
-      this.businessLicenseListTemp = [];
-      this.businessLicenseFileList = [];
+        // 图片上传
+        async imgUpLoadTwoAll(param) {
+            param.type = 'ma'
+            imgUpLoadThree(param)
+                .then(res => {
+                    if (res.code == 200) {
+                        let obj = { name: res.data.name, url: res.data.url }
+                        console.log('obj', obj)
+                        this.businessLicenseFileList.push(obj)
+                    } else {
+                        // this.$msgError(res.msg)
+                        this.$modal.msgError(res.msg)
+                    }
+                })
+                .catch(error => {
+                    // this.$msgError(error)
+                    this.$modal.msgError(error)
+                })
+        },
 
-      var id = row.agreementId;
-      getAgreementDetail(id).then((response) => {
-        this.form = response.data;
-        this.maForm.unitId = response.data.unitId;
-        this.maForm.projectId = response.data.projectId;
-
-        this.unitId = this.treeParentsById(this.uniteList, this.maForm.unitId);
-        this.projectId = this.treeParentsById(
-          this.projectList,
-          this.maForm.projectId
-        );
-        if (response.data.bmFileInfos != null) {
-          this.businessLicenseListTemp = response.data.bmFileInfos;
-          this.businessLicenseListTemp.forEach(item => {
-            if (item.name.includes('/')) {
-              const fileNameWithTimestamp = item.name.split('/').pop();
-              const parts = fileNameWithTimestamp.split('_');
-              const fileType = item.name.split('.').pop();
-              const mainFileName = parts.slice(0, parts.length - 1).join('_');
-              item.name = mainFileName + '.' + fileType;
-            }
-          })
-        } else {
-          this.businessLicenseListTemp = [];
-        }
-        this.isEdit = true;
-        this.isEdits = true;
-        this.showHouse = false
-        this.showSee = true
-        this.showConfirmButton = false
-        this.title = '查看'
-      })
-    },
-
-
-    // 表单重置
-    reset() {
-      this.form = {
-        unitId:null,
-        projectId:null,
-        authPerson:"",
-        phone:'',
-        contractCode:'',
-        planStartTime:'',
-        protocol:"1",
-        remark:'',
-      };
-      this.unitId = null;
-      this.projectId = null;
-      this.maForm = {
-        unitId: undefined,
-        projectId: undefined
-      };
-      this.resetForm("form");
-    },
-
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.queryParams.keyWord = null;
-      this.queryParams.status = null;
-      this.queryParams.time = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-
-    //** 提交按钮 */
-    submitForm() {
-      // this.form.unitId = this.maForm.unitId;
-      // this.form.projectId = this.maForm.projectId;
-
-      this.$refs["form"].validate(async valid => {
-        console.log("this.maForm", this.maForm)
-        console.log("this.form", this.form)
-        // this.form.projectId = this.form.proId;
-        if (valid) {
-          if (this.form.agreementId != undefined) {
-            this.form.projectName =null;
-            this.form.unitName =null;
-            // this.form.fileName =null;
-            const reqData = new FormData();
-            if (this.businessLicenseListTemp.length != 0) {
-              await this.getImaUploadEdit(),
-                await this.editAgreementTemp(this.form);
-              await this.deleteFile();
+        //上传组件-图片查看
+        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 {
-              await this.editAgreementTemp(this.form);
-              await this.deleteFile();
+                this.dialogVisible = true
             }
-          } else {
-            console.log(1)
-            if (this.businessLicenseListTemp.length != 0) {
-              // console.log(2)
-              await this.getImaUpload(),
-                await this.addAgreementTemp(this.form);
+        },
+        //上传组件-图片删除
+        handleRemoveElectricianImgList(file, fileList) {
+            let sum = 0
+            this.businessLicenseListTemp.forEach((item, index) => {
+                if (item.uid == file.uid) {
+                    sum = index
+                }
+            })
+            this.businessLicenseListTemp.splice(sum, 1)
+            if (file.status == 'success') {
+                this.delBusinessFileIdList.push(file.url)
+            }
+            console.log('delBusinessFileIdList', this.delBusinessFileIdList)
+        },
+        isImage(file) {
+            this.urlTemp = require('@/assets/file.png')
+            if (this.updataIf(file)) {
+                return false
             } else {
-              // console.log(3)
-              await this.addAgreementTemp(this.form);
+                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
+                }
+            }
+        },
+        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 })
+            }
+        },
+        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 > 10) {
+                this.$message.warning('最多上传10张附件')
+                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.businessLicenseListTemp = fileList
+        },
 
-          }
+        //查询列表
+        getList() {
+            this.loading = true
+            const params = {
+                keyWord: this.queryParams.keyWord,
+                startTime: this.queryParams.time && this.queryParams.time[0],
+                endTime: this.queryParams.time && this.queryParams.time[1],
+                pageSize: this.queryParams.pageSize,
+                pageNum: this.queryParams.pageNum,
+                status: this.queryParams.status
+            }
+            getListAgreement(this.addDateRange(params)).then(response => {
+                this.houseList = response.rows
+                this.total = response.total
+                this.loading = false
+            })
+        },
+        /** 转换菜单数据结构 */
+        normalizer(node) {
+            if (node.children && !node.children.length) {
+                delete node.children
+            }
+            return {
+                id: node.id,
+                label: node.name,
+                children: node.children
+            }
+        },
+        //获取单位类型 ,getUnitList, getProjectList
+        getUnitList() {
+            getListUnite({ projectId: null }).then(response => {
+                this.uniteList = response.data
+            })
+        },
+        getProjectList() {
+            getListProject({ unitId: null }).then(response => {
+                this.projectList = response.data
+            })
+        },
+        unitSelect(e) {
+            console.log(e)
+            if (e.typeKey == 'fbs') {
+                this.rules['contractCode'][0].required = true
+            } else {
+                this.rules['contractCode'][0].required = false
+            }
+        },
+        uniteChange(val) {
+            if (val && val.length > 0) {
+                this.maForm.unitId = this.unitId[this.unitId.length - 1]
+            } else if (val && val.length == 0) {
+                this.maForm.unitId = ''
+            }
+        },
+
+        projectChange(val) {
+            if (val && val.length > 0) {
+                this.maForm.projectId = this.projectId[this.projectId.length - 1]
+            } else if (val && val.length == 0) {
+                this.maForm.projectId = ''
+            }
+        },
+
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset()
+            this.uploadKey = Date.now()
+            this.delBusinessFileIdList = []
+            this.businessLicenseListTemp = []
+            this.businessLicenseFileList = []
+            this.showHouse = true
+            this.showConfirmButton = true
+            this.showSee = false
+            this.isEdit = false
+            this.isEdits = false
+            this.title = '新增'
+        },
+
+        handleUpdate(row) {
+            this.reset()
+            this.uploadKey = Date.now()
+            this.delBusinessFileIdList = []
+            this.businessLicenseListTemp = []
+            this.businessLicenseFileList = []
+            var id = row.agreementId
+
+            getAgreementDetail(id).then(response => {
+                this.form = response.data
+                this.maForm.unitId = response.data.unitId
+                this.maForm.projectId = response.data.projectId
+                this.unitId = this.treeParentsById(this.uniteList, this.maForm.unitId)
+                this.projectId = this.treeParentsById(this.projectList, this.maForm.projectId)
+
+                var taskId = this.form.taskId
+                console.log(taskId)
+                if (taskId) {
+                    this.isEdit = true
+                } else {
+                    this.isEdit = false
+                }
+                this.isEdits = false
+                console.log(this.isEdit)
+
+                if (response.data.bmFileInfos != null) {
+                    this.businessLicenseListTemp = response.data.bmFileInfos
+                    this.businessLicenseListTemp.forEach(item => {
+                        if (item.name.includes('/')) {
+                            const fileNameWithTimestamp = item.name.split('/').pop()
+                            const parts = fileNameWithTimestamp.split('_')
+                            const fileType = item.name.split('.').pop()
+                            const mainFileName = parts.slice(0, parts.length - 1).join('_')
+                            item.name = mainFileName + '.' + fileType
+                        }
+                    })
+                } else {
+                    this.businessLicenseListTemp = []
+                }
+                this.showHouse = true
+                this.showConfirmButton = true
+                this.showSee = false
+                this.title = '修改'
+            })
+        },
+
+        handleAllImg(row) {
+            this.reset()
+            this.uploadKey = Date.now()
+            this.delBusinessFileIdList = []
+            this.businessLicenseListTemp = []
+            this.businessLicenseFileList = []
+
+            var id = row.agreementId
+            getAgreementDetail(id).then(response => {
+                if (response.data.bmFileInfos != null) {
+                    this.businessLicenseListTemp = response.data.bmFileInfos
+                    this.businessLicenseListTemp.forEach(item => {
+                        if (item.name.includes('/')) {
+                            const fileNameWithTimestamp = item.name.split('/').pop()
+                            const parts = fileNameWithTimestamp.split('_')
+                            const fileType = item.name.split('.').pop()
+                            const mainFileName = parts.slice(0, parts.length - 1).join('_')
+                            item.name = mainFileName + '.' + fileType
+                        }
+                    })
+                } else {
+                    this.businessLicenseListTemp = []
+                }
+                this.isEdits = true
+
+                this.showHouse = false
+                this.showConfirmButton = false
+                this.showAllImg = true
+                this.title = '查看'
+            })
+        },
+
+        handleView(row) {
+            this.reset()
+            this.uploadKey = Date.now()
+            this.delBusinessFileIdList = []
+            this.businessLicenseListTemp = []
+            this.businessLicenseFileList = []
+
+            var id = row.agreementId
+            getAgreementDetail(id).then(response => {
+                this.form = response.data
+                this.maForm.unitId = response.data.unitId
+                this.maForm.projectId = response.data.projectId
+
+                this.unitId = this.treeParentsById(this.uniteList, this.maForm.unitId)
+                this.projectId = this.treeParentsById(this.projectList, this.maForm.projectId)
+                if (response.data.bmFileInfos != null) {
+                    this.businessLicenseListTemp = response.data.bmFileInfos
+                    this.businessLicenseListTemp.forEach(item => {
+                        if (item.name.includes('/')) {
+                            const fileNameWithTimestamp = item.name.split('/').pop()
+                            const parts = fileNameWithTimestamp.split('_')
+                            const fileType = item.name.split('.').pop()
+                            const mainFileName = parts.slice(0, parts.length - 1).join('_')
+                            item.name = mainFileName + '.' + fileType
+                        }
+                    })
+                } else {
+                    this.businessLicenseListTemp = []
+                }
+                this.isEdit = true
+                this.isEdits = true
+                this.showHouse = false
+                this.showSee = true
+                this.showConfirmButton = false
+                this.title = '查看'
+            })
+        },
+
+        // 表单重置
+        reset() {
+            this.form = {
+                unitId: null,
+                projectId: null,
+                authPerson: '',
+                phone: '',
+                contractCode: '',
+                planStartTime: '',
+                protocol: '1',
+                remark: '',
+                branchProIds: []
+            }
+            this.unitId = null
+            this.projectId = null
+            this.maForm = {
+                unitId: undefined,
+                projectId: undefined
+            }
+            this.resetForm('form')
+        },
+
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.queryParams.keyWord = null
+            this.queryParams.status = null
+            this.queryParams.time = []
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+
+        //** 提交按钮 */
+        submitForm() {
+            // this.form.unitId = this.maForm.unitId;
+            // this.form.projectId = this.maForm.projectId;
+
+            this.$refs['form'].validate(async valid => {
+                console.log('this.maForm', this.maForm)
+                console.log('this.form', this.form)
+                // this.form.projectId = this.form.proId;
+                if (valid) {
+                    if (this.form.agreementId != undefined) {
+                        this.form.projectName = null
+                        this.form.unitName = null
+                        // this.form.fileName =null;
+                        const reqData = new FormData()
+                        if (this.businessLicenseListTemp.length != 0) {
+                            await this.getImaUploadEdit(), await this.editAgreementTemp(this.form)
+                            await this.deleteFile()
+                        } else {
+                            await this.editAgreementTemp(this.form)
+                            await this.deleteFile()
+                        }
+                    } else {
+                        console.log(1)
+                        if (this.businessLicenseListTemp.length != 0) {
+                            // console.log(2)
+                            await this.getImaUpload(), await this.addAgreementTemp(this.form)
+                        } else {
+                            // console.log(3)
+                            await this.addAgreementTemp(this.form)
+                        }
+                    }
+                }
+            })
+            this.uploadKey = Date.now()
+        },
+
+        async getImaUpload() {
+            this.businessLicenseFileList = []
+            const reqData = new FormData()
+            const { fileTwo } = await this.getFileData()
+            let res = await imgUpLoadThree(fileTwo)
+            console.log('res', res)
+            if (res.code === 200) {
+                res.data.forEach(item => {
+                    let objTwo = { name: item.name, url: item.url, taskType: 10 }
+                    this.businessLicenseFileList.push(objTwo)
+                })
+            } else {
+                this.$modal.msgError(res.msg)
+            }
+        },
+
+        async getImaUploadEdit() {
+            this.businessLicenseFileList = []
+            const { fileTwo } = await this.getFileData()
+            console.log('fileTwo', fileTwo)
+            this.businessLicenseListTemp.forEach(item => {
+                if (item.status == 'success') {
+                    let objThree = { name: item.name, url: item.url, taskType: 10 }
+                    this.businessLicenseFileList.push(objThree)
+                }
+            })
+            if (fileTwo.length != 0) {
+                let res = await imgUpLoadThree(fileTwo)
+                if (res.code === 200) {
+                    res.data.forEach(item => {
+                        let objTwo = { name: item.name, url: item.url, taskType: 10 }
+                        this.businessLicenseFileList.push(objTwo)
+                    })
+                } else {
+                    this.$modal.msgError(res.msg)
+                }
+            }
+        },
+
+        async addAgreementTemp(form) {
+            this.form.bmFileInfos = this.businessLicenseFileList
+            addAgreement(form).then(response => {
+                this.$modal.msgSuccess('新增成功')
+                this.showHouse = false
+                this.getList()
+                this.delBusinessFileIdList = []
+                this.businessLicenseListTemp = []
+                this.businessLicenseFileList = []
+            })
+        },
+
+        async editAgreementTemp(form) {
+            this.form.bmFileInfos = this.businessLicenseFileList
+            editAgreement(form).then(response => {
+                this.$modal.msgSuccess('修改成功')
+                this.showHouse = false
+                this.getList()
+                this.delBusinessFileIdList = []
+                this.businessLicenseListTemp = []
+                this.businessLicenseFileList = []
+            })
+        },
+
+        async deleteFile() {
+            if (this.delBusinessFileIdList.length > 0) {
+                this.delBusinessFileIdList.forEach(async item => {
+                    const urlcode = Base64.encode(item)
+                    const urlen = encodeURIComponent(urlcode)
+                    await deleteFile(urlen)
+                })
+            }
+        },
+
+        async convertToBase64(data) {
+            const url = data
+
+            try {
+                const response = await fetch(url)
+                if (!response.ok) {
+                    throw new Error('网络响应不正常')
+                }
+                const blob = await response.blob()
+                const reader = new FileReader()
+
+                reader.onloadend = () => {
+                    this.base64Data = reader.result // 获取 Base64 数据并存储
+                }
+
+                reader.readAsDataURL(blob) // 将 Blob 读取为 Data URL
+            } catch (error) {
+                console.error('获取文件失败:', error)
+            }
+        },
+
+        // 取消按钮
+        cancel() {
+            this.showHouse = false
+            this.showSee = false
+            this.showAllImg = false
+            this.delBusinessFileIdList = []
+            this.businessLicenseListTemp = []
+            this.businessLicenseFileList = []
+            this.uploadKey = Date.now()
+            this.reset()
+        },
+
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            var id = row.agreementId
+            this.$modal
+                .confirm('是否确认删除数据项？')
+                .then(function () {
+                    return delAgreement(id)
+                })
+                .then(() => {
+                    this.$modal.msgSuccess('删除成功')
+                    this.getList()
+                })
+                .catch(() => {})
+        },
+
+        handleExport() {
+            this.download(
+                '/material/bm_agreement_info/export',
+                {
+                    ...this.queryParams
+                },
+                `协议管理 _${new Date().getTime()}.xlsx`
+            )
+        },
+
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
+
+        //单位，工程树结构数据获取父
+        treeParentsById(list, id) {
+            for (let i in list) {
+                if (list[i].id == id) {
+                    //查询到就返回该数组对象的value
+                    return [list[i].id]
+                }
+                if (list[i].children) {
+                    let node = this.treeParentsById(list[i].children, id)
+                    if (node !== undefined) {
+                        //查询到把父节把父节点加到数组前面
+                        node.unshift(list[i].id)
+                        return node
+                    }
+                }
+            }
         }
-      });
-      this.uploadKey = Date.now();
-    },
-
-    async getImaUpload() {
-      this.businessLicenseFileList = []
-      const reqData = new FormData()
-      const {fileTwo} = await this.getFileData()
-      let res = await imgUpLoadThree(fileTwo);
-      console.log('res', res)
-      if (res.code === 200) {
-        res.data.forEach(item => {
-          let objTwo = {'name': item.name, 'url': item.url, 'taskType': 10};
-          this.businessLicenseFileList.push(objTwo);
-        })
-      } else {
-        this.$modal.msgError(res.msg);
-      }
-    },
-
-    async getImaUploadEdit() {
-      this.businessLicenseFileList = []
-      const {fileTwo} = await this.getFileData()
-      console.log('fileTwo', fileTwo)
-      this.businessLicenseListTemp.forEach(item => {
-        if (item.status == 'success') {
-          let objThree = {'name': item.name, 'url': item.url, 'taskType': 10};
-          this.businessLicenseFileList.push(objThree);
-        }
-      })
-      if (fileTwo.length != 0) {
-        let res = await imgUpLoadThree(fileTwo);
-        if (res.code === 200) {
-          res.data.forEach(item => {
-            let objTwo = {'name': item.name, 'url': item.url, 'taskType': 10};
-            this.businessLicenseFileList.push(objTwo);
-          })
-        } else {
-          this.$modal.msgError(res.msg);
-        }
-      }
-    },
-
-    async addAgreementTemp(form) {
-      this.form.bmFileInfos = this.businessLicenseFileList
-      addAgreement(form).then(response => {
-        this.$modal.msgSuccess("新增成功");
-        this.showHouse = false;
-        this.getList();
-        this.delBusinessFileIdList = [];
-        this.businessLicenseListTemp = [];
-        this.businessLicenseFileList = [];
-
-      });
-    },
-
-    async editAgreementTemp(form) {
-      this.form.bmFileInfos = this.businessLicenseFileList
-      editAgreement(form).then(response => {
-        this.$modal.msgSuccess("修改成功");
-        this.showHouse = false;
-        this.getList();
-        this.delBusinessFileIdList = [];
-        this.businessLicenseListTemp = [];
-        this.businessLicenseFileList = [];
-      });
-    },
-
-    async deleteFile() {
-      if (this.delBusinessFileIdList.length > 0) {
-        this.delBusinessFileIdList.forEach(async item => {
-          const urlcode = Base64.encode(item)
-          const urlen = encodeURIComponent(urlcode)
-          await deleteFile(urlen);
-        })
-      }
-    },
-
-
-    async convertToBase64(data) {
-      const url = data;
-
-      try {
-        const response = await fetch(url);
-        if (!response.ok) {
-          throw new Error('网络响应不正常');
-        }
-        const blob = await response.blob();
-        const reader = new FileReader();
-
-        reader.onloadend = () => {
-          this.base64Data = reader.result; // 获取 Base64 数据并存储
-        };
-
-        reader.readAsDataURL(blob); // 将 Blob 读取为 Data URL
-      } catch (error) {
-        console.error('获取文件失败:', error);
-      }
-    },
-
-    // 取消按钮
-    cancel() {
-      this.showHouse = false;
-      this.showSee = false;
-      this.showAllImg = false;
-      this.delBusinessFileIdList = [];
-      this.businessLicenseListTemp = []
-      this.businessLicenseFileList = [];
-      this.uploadKey = Date.now();
-      this.reset();
-    },
-
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      var id = row.agreementId
-      this.$modal
-        .confirm('是否确认删除数据项？')
-        .then(function () {
-          return delAgreement(id)
-        })
-        .then(() => {
-          this.$modal.msgSuccess('删除成功')
-          this.getList()
-        })
-        .catch(() => {
-        })
-    },
-
-    handleExport() {
-      this.download('/material/bm_agreement_info/export', {
-        ...this.queryParams
-      }, `协议管理 _${new Date().getTime()}.xlsx`)
-    },
-
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-
-    //单位，工程树结构数据获取父
-    treeParentsById(list, id) {
-      for (let i in list) {
-        if (list[i].id == id) {
-          //查询到就返回该数组对象的value
-          return [list[i].id];
-        }
-        if (list[i].children) {
-          let node = this.treeParentsById(list[i].children, id);
-          if (node !== undefined) {
-            //查询到把父节把父节点加到数组前面
-            node.unshift(list[i].id);
-            return node;
-          }
-        }
-      }
-    },
-
-  }
-};
+    }
+}
 </script>
 <style lang="scss" scoped>
 .uploadImg {
-  padding-top: 20px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
+    padding-top: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
 }
 
 .deviceCode {
-  margin-top: 10px;
-  padding-bottom: 20px;
-  font-size: 18px;
+    margin-top: 10px;
+    padding-bottom: 20px;
+    font-size: 18px;
 }
 
 ::v-deep.el-table .fixed-width .el-button--mini {
-  width: 60px !important;
-  margin-bottom: 10px;
+    width: 60px !important;
+    margin-bottom: 10px;
 }
 
 //隐藏图片上传框的css
 ::v-deep.disabled {
-  .el-upload--picture-card {
-    display: none;
-  }
+    .el-upload--picture-card {
+        display: none;
+    }
 }
 
 // ::v-deep .el-upload-list--picture-card {
@@ -1217,70 +1238,70 @@ export default {
 // }
 
 ::v-deep .el-upload-list__item {
-  margin-bottom: 20px;
-  overflow: revert;
+    margin-bottom: 20px;
+    overflow: revert;
 }
 
 ::v-deep .el-upload-list__item-actions {
-  overflow: hidden;
+    overflow: hidden;
 }
 .el-upload--picture-card {
-  display: flex;
-  flex-wrap: wrap;
+    display: flex;
+    flex-wrap: wrap;
 }
 
 .upload-demo {
-  display: flex;
-  flex-wrap: wrap;
+    display: flex;
+    flex-wrap: wrap;
 }
 
 .el-upload-list__item-thumbnail {
-  height: 145px !important;
+    height: 145px !important;
 }
 
 .picture-card-container {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  position: relative;
+    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;
+    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;
+    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;
+    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>
diff --git a/src/views/warning-analysis/engineering-in-use/index.vue b/src/views/warning-analysis/engineering-in-use/index.vue
index 4ce3b40b..e38f63c6 100644
--- a/src/views/warning-analysis/engineering-in-use/index.vue
+++ b/src/views/warning-analysis/engineering-in-use/index.vue
@@ -4,25 +4,27 @@
         <el-form v-show="showSearch" :model="queryParams" ref="queryForm" size="small" inline>
             <el-form-item label="时间范围" prop="timeRange">
                 <el-date-picker
-                    v-model="queryParams.timeRange"
-                    type="daterange"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
                     clearable
-                    value-format="yyyy-MM-dd"
+                    type="daterange"
                     format="yyyy-MM-dd"
+                    style="width: 240px"
+                    range-separator="至"
+                    value-format="yyyy-MM-dd"
+                    end-placeholder="结束日期"
+                    start-placeholder="开始日期"
+                    v-model="queryParams.timeRange"
                 />
             </el-form-item>
             <el-form-item label="关键字" prop="keyWord">
                 <el-input
-                    v-model="queryParams.keyWord"
-                    placeholder="请输入关键字"
                     clearable
+                    style="width: 240px"
+                    placeholder="请输入关键字"
+                    v-model="queryParams.keyWord"
                     @keyup.enter.native="handleQuery"
                 />
             </el-form-item>
-            <el-form-item label="状态" prop="taskStatus">
+            <!-- <el-form-item label="状态" prop="taskStatus">
                 <el-select v-model="queryParams.taskStatus" placeholder="请选择状态" clearable>
                     <el-option
                         v-for="item in statusOptions"
@@ -31,7 +33,7 @@
                         :value="item.value"
                     />
                 </el-select>
-            </el-form-item>
+            </el-form-item> -->
 
             <!-- 表单按钮 -->
             <el-form-item>
@@ -42,7 +44,9 @@
 
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">通知</el-button>
+                <el-button type="primary" plain icon="el-icon-chat-dot-round" size="mini" @click="onHandleNotice">
+                    通知
+                </el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">
@@ -86,6 +90,7 @@
 <script>
 import printJS from 'print-js'
 import { getLeaseTaskList, deleteLeaseTask, getLeaseTask, getCodePDF } from '@/api/business/index'
+import { getUseMaintenanceWarningApi } from '@/api/warning-analysis/engineering-in-use.js'
 
 export default {
     data() {
@@ -95,21 +100,20 @@ export default {
                 pageNum: 1,
                 pageSize: 10,
                 keyWord: '', // 关键字
-                taskStatus: '', // 审核状态
                 timeRange: [] // 日期范围
             },
 
             total: 0, // 总条数
             // 表头
             tableColumns: [
-                { label: '下次检修时间', prop: 'createTime' },
-                { label: '机具类型', prop: 'createBy' },
-                { label: '规格型号', prop: 'leaseUnit' },
-                { label: '设备编码', prop: 'leaseProject' },
-                { label: '单位名称', prop: 'maTypeNames' },
+                { label: '下次检修时间', prop: 'nextCheckTime' },
+                { label: '机具类型', prop: 'typeName' },
+                { label: '规格型号', prop: 'typeModelName' },
+                { label: '设备编码', prop: 'maCode' },
+                { label: '单位名称', prop: 'unitName' },
                 { label: '工程名称', prop: 'agreementCode' },
-                { label: '协议号', prop: 'code' },
-                { label: '超期时长', prop: 'leasePerson' }
+                { label: '协议号', prop: 'agreementCode' },
+                { label: '超期时长', prop: 'overDays' }
             ],
             // 表格数据
             tableList: [],
@@ -153,10 +157,10 @@ export default {
                     startTime: this.queryParams.timeRange[0] || '',
                     endTime: this.queryParams.timeRange[1] || ''
                 }
-                const res = await getLeaseTaskList(params)
+                const res = await getUseMaintenanceWarningApi(params)
                 console.log('🚀 ~ 获取列表 ~ res:', res)
-                this.tableList = res.data.rows
-                this.total = res.data.total || 0
+                this.tableList = res.rows
+                this.total = res.total
             } catch (error) {
                 console.log('🚀 ~ 获取列表 ~ error:', error)
                 this.tableList = []
@@ -202,11 +206,10 @@ export default {
         // 导出数据
         handleExport() {
             try {
-                let fileName = `数据_${new Date().getTime()}.xLsx`
-                let url = ''
+                let fileName = `工程在用检修预警数据_${new Date().getTime()}.xLsx`
+                let url = '/material/useMaintenanceWarning/export'
                 const params = { ...this.queryParams }
-                console.log('🚀 ~ 导出 ~ params:', params)
-                // this.derive(url, params, fileName)
+                this.download(url, params, fileName)
             } catch (error) {
                 console.log('导出数据失败', error)
             }
@@ -257,6 +260,10 @@ export default {
                 return time.replace(/-/g, '年').replace(/-/g, '月') + '日'
             }
             return ''
+        },
+        // 通知按钮
+        onHandleNotice() {
+            console.log('通知--')
         }
     }
 }
diff --git a/vue.config.js b/vue.config.js
index 9cc77185..7136c77f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,7 +2,7 @@
 const path = require('path')
 
 function resolve(dir) {
-  return path.join(__dirname, dir)
+    return path.join(__dirname, dir)
 }
 
 const CompressionPlugin = require('compression-webpack-plugin')
@@ -15,131 +15,131 @@ const port = process.env.port || process.env.npm_config_port || 80 // 端口
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
 // 这里只列一部分，具体配置参考文档
 module.exports = {
-  // 部署生产环境和开发环境下的URL。
-  // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
-  // 例如 https://www.bonus.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.bonus.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === 'production' ? '/' : '/',
-  // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
-  outputDir: 'dist',
-  // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
-  assetsDir: 'static',
-  // 是否开启eslint保存检测，有效值：ture | false | 'error'
-  lintOnSave: process.env.NODE_ENV === 'development',
-  // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
-  productionSourceMap: false,
-  // webpack-dev-server 相关配置
-  devServer: {
-    host: '0.0.0.0',
-    port: port,
-    open: true,
-    proxy: {
-      // detail: https://cli.vuejs.org/config/#devserver-proxy
-      [process.env.VUE_APP_BASE_API]: {
-        // target: `http://36.33.26.201:19988/prod-api`,
-        // target: `http://192.168.0.15:18080`,//马
-        // target: `http://192.168.0.244:18580`,//测试
-        // target: `http://192.168.2.223:18080`,//山
-        // target: `http://192.168.2.23:18080`,//洪
-        // target: `http://192.168.0.234:18080`, //阮
-        // target: `http://192.168.137.1:18080`,//
-        // target: `http://192.168.0.15:18080`,// 韩傲宇
-        target: `http://192.168.0.60:18080`, // 赵福海
-        changeOrigin: true,
-        pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_API]: ''
-        }
-      },
-      '/api': {
-        target: 'http://192.168.0.21:17861',
-        //设置允许跨域——此处我经过测试发现可有可无
-        changeOrigin: true,
-        pathRewrite: {
-          '^/api': ''
-        }
-      }
+    // 部署生产环境和开发环境下的URL。
+    // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
+    // 例如 https://www.bonus.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.bonus.vip/admin/，则设置 baseUrl 为 /admin/。
+    publicPath: process.env.NODE_ENV === 'production' ? '/' : '/',
+    // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
+    outputDir: 'dist',
+    // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
+    assetsDir: 'static',
+    // 是否开启eslint保存检测，有效值：ture | false | 'error'
+    lintOnSave: process.env.NODE_ENV === 'development',
+    // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
+    productionSourceMap: false,
+    // webpack-dev-server 相关配置
+    devServer: {
+        host: '0.0.0.0',
+        port: port,
+        open: true,
+        proxy: {
+            // detail: https://cli.vuejs.org/config/#devserver-proxy
+            [process.env.VUE_APP_BASE_API]: {
+                // target: `http://36.33.26.201:19988/prod-api`,
+                // target: `http://192.168.0.15:18080`,//马
+                // target: `http://192.168.0.244:18580`,//测试
+                // target: `http://192.168.2.223:18080`,//山
+                // target: `http://192.168.2.23:18080`,//洪
+                // target: `http://192.168.0.234:18080`, //阮
+                // target: `http://192.168.137.1:18080`,//
+                target: `http://192.168.0.15:18080`, // 韩傲宇
+                // target: `http://192.168.0.60:18080`, // 赵福海
+                changeOrigin: true,
+                pathRewrite: {
+                    ['^' + process.env.VUE_APP_BASE_API]: ''
+                }
+            },
+            '/api': {
+                target: 'http://192.168.0.21:17861',
+                //设置允许跨域——此处我经过测试发现可有可无
+                changeOrigin: true,
+                pathRewrite: {
+                    '^/api': ''
+                }
+            }
+        },
+        disableHostCheck: true
     },
-    disableHostCheck: true
-  },
-  css: {
-    loaderOptions: {
-      sass: {
-        sassOptions: { outputStyle: 'expanded' }
-      }
+    css: {
+        loaderOptions: {
+            sass: {
+                sassOptions: { outputStyle: 'expanded' }
+            }
+        }
+    },
+    configureWebpack: {
+        name: name,
+        resolve: {
+            alias: {
+                '@': resolve('src')
+            }
+        },
+        plugins: [
+            // http://doc.bonus.vip/bonus-vue/other/faq.html#使用gzip解压缩静态文件
+            new CompressionPlugin({
+                cache: false, // 不启用文件缓存
+                test: /\.(js|css|html|jpe?g|png|gif|svg)?$/i, // 压缩文件格式
+                filename: '[path][base].gz[query]', // 压缩后的文件名
+                algorithm: 'gzip', // 使用gzip压缩
+                minRatio: 0.8, // 压缩比例，小于 80% 的文件不会被压缩
+                deleteOriginalAssets: false // 压缩后删除原文件
+            })
+        ]
+    },
+    chainWebpack(config) {
+        config.plugins.delete('preload') // TODO: need test
+        config.plugins.delete('prefetch') // TODO: need test
+
+        // set svg-sprite-loader
+        config.module.rule('svg').exclude.add(resolve('src/assets/icons')).end()
+        config.module
+            .rule('icons')
+            .test(/\.svg$/)
+            .include.add(resolve('src/assets/icons'))
+            .end()
+            .use('svg-sprite-loader')
+            .loader('svg-sprite-loader')
+            .options({
+                symbolId: 'icon-[name]'
+            })
+            .end()
+
+        config.when(process.env.NODE_ENV !== 'development', config => {
+            config
+                .plugin('ScriptExtHtmlWebpackPlugin')
+                .after('html')
+                .use('script-ext-html-webpack-plugin', [
+                    {
+                        // `runtime` must same as runtimeChunk name. default is `runtime`
+                        inline: /runtime\..*\.js$/
+                    }
+                ])
+                .end()
+
+            config.optimization.splitChunks({
+                chunks: 'all',
+                cacheGroups: {
+                    libs: {
+                        name: 'chunk-libs',
+                        test: /[\\/]node_modules[\\/]/,
+                        priority: 10,
+                        chunks: 'initial' // only package third parties that are initially dependent
+                    },
+                    elementUI: {
+                        name: 'chunk-elementUI', // split elementUI into a single package
+                        test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
+                        priority: 20 // the weight needs to be larger than libs and app or it will be packaged into libs or app
+                    },
+                    commons: {
+                        name: 'chunk-commons',
+                        test: resolve('src/components'), // can customize your rules
+                        minChunks: 3, //  minimum common number
+                        priority: 5,
+                        reuseExistingChunk: true
+                    }
+                }
+            })
+            config.optimization.runtimeChunk('single')
+        })
     }
-  },
-  configureWebpack: {
-    name: name,
-    resolve: {
-      alias: {
-        '@': resolve('src')
-      }
-    },
-    plugins: [
-      // http://doc.bonus.vip/bonus-vue/other/faq.html#使用gzip解压缩静态文件
-      new CompressionPlugin({
-        cache: false, // 不启用文件缓存
-        test: /\.(js|css|html|jpe?g|png|gif|svg)?$/i, // 压缩文件格式
-        filename: '[path][base].gz[query]', // 压缩后的文件名
-        algorithm: 'gzip', // 使用gzip压缩
-        minRatio: 0.8, // 压缩比例，小于 80% 的文件不会被压缩
-        deleteOriginalAssets: false // 压缩后删除原文件
-      })
-    ]
-  },
-  chainWebpack(config) {
-    config.plugins.delete('preload') // TODO: need test
-    config.plugins.delete('prefetch') // TODO: need test
-
-    // set svg-sprite-loader
-    config.module.rule('svg').exclude.add(resolve('src/assets/icons')).end()
-    config.module
-      .rule('icons')
-      .test(/\.svg$/)
-      .include.add(resolve('src/assets/icons'))
-      .end()
-      .use('svg-sprite-loader')
-      .loader('svg-sprite-loader')
-      .options({
-        symbolId: 'icon-[name]'
-      })
-      .end()
-
-    config.when(process.env.NODE_ENV !== 'development', config => {
-      config
-        .plugin('ScriptExtHtmlWebpackPlugin')
-        .after('html')
-        .use('script-ext-html-webpack-plugin', [
-          {
-            // `runtime` must same as runtimeChunk name. default is `runtime`
-            inline: /runtime\..*\.js$/
-          }
-        ])
-        .end()
-
-      config.optimization.splitChunks({
-        chunks: 'all',
-        cacheGroups: {
-          libs: {
-            name: 'chunk-libs',
-            test: /[\\/]node_modules[\\/]/,
-            priority: 10,
-            chunks: 'initial' // only package third parties that are initially dependent
-          },
-          elementUI: {
-            name: 'chunk-elementUI', // split elementUI into a single package
-            test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
-            priority: 20 // the weight needs to be larger than libs and app or it will be packaged into libs or app
-          },
-          commons: {
-            name: 'chunk-commons',
-            test: resolve('src/components'), // can customize your rules
-            minChunks: 3, //  minimum common number
-            priority: 5,
-            reuseExistingChunk: true
-          }
-        }
-      })
-      config.optimization.runtimeChunk('single')
-    })
-  }
 }