diff --git a/sgzb-ui/src/api/claimAndRefund/receive.js b/sgzb-ui/src/api/claimAndRefund/receive.js
index 2aac9684..fc3ed841 100644
--- a/sgzb-ui/src/api/claimAndRefund/receive.js
+++ b/sgzb-ui/src/api/claimAndRefund/receive.js
@@ -60,7 +60,15 @@ export function removeAgreement(data) {
     })
   }
 
-// 机具领料-列表
+// 机具领料-申请列表
+export function getLeaseManageListAll(query) {
+  return request({
+    url: '/base/tm_task/getLeaseManageListAll',
+    method: 'get',
+    params: query
+  })
+}
+// 机具领料-管理列表
 export function getLeaseAuditListAll(query) {
   return request({
     url: '/base/tm_task/getLeaseAuditListAll',
diff --git a/sgzb-ui/src/api/repairTest/brokenExamine.js b/sgzb-ui/src/api/repairTest/brokenExamine.js
index 888fef0a..535aee58 100644
--- a/sgzb-ui/src/api/repairTest/brokenExamine.js
+++ b/sgzb-ui/src/api/repairTest/brokenExamine.js
@@ -24,4 +24,12 @@ export function addDetailsAuditApi(data) {
     // contentType: 'application/json',
     data: data
   })
+}
+
+export function getScrapRecord(query) {
+  return request({
+    url: '/material/scrap/getScrapRecord',
+    method: 'get',
+    params: query
+  })
 }
\ No newline at end of file
diff --git a/sgzb-ui/src/api/repairTest/testExamine.js b/sgzb-ui/src/api/repairTest/testExamine.js
index ee178d7a..4ea46121 100644
--- a/sgzb-ui/src/api/repairTest/testExamine.js
+++ b/sgzb-ui/src/api/repairTest/testExamine.js
@@ -24,4 +24,28 @@ export function addDetailsAuditApi(data) {
     // contentType: 'application/json',
     data: data
   })
-}
\ No newline at end of file
+}
+
+//
+export function getRepairRecord(query) {
+  return request({
+    url: '/material/details/getRepairRecord',
+    method: 'get',
+    params: query
+  })
+}
+
+//
+export function getPartRecord(query) {
+  return request({
+    url: '/material/details/getPartRecord',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
+
+
+
diff --git a/sgzb-ui/src/api/store/newBuy.js b/sgzb-ui/src/api/store/newBuy.js
index 2fe5ca66..5f9c6c81 100644
--- a/sgzb-ui/src/api/store/newBuy.js
+++ b/sgzb-ui/src/api/store/newBuy.js
@@ -191,7 +191,18 @@ export function changePutinStatus(data) {
     data: data
   })
 }
-//入库单
+
+
+//新购工机具验收单
+export function getAcceptanceForm(query) {
+  return request({
+    url: '/material/purchaseCheckInfo/getAcceptanceForm',
+    method: 'get',
+    params: query
+  })
+}
+
+//新购工机具入库单
 export function warehousingEntry(query) {
   return request({
     url: '/material/purchaseMacode/warehousingEntry',
@@ -296,4 +307,20 @@ export function checkInputAccessory(data) {
   })
 }
 
+//新购配件验收单
+export function getAccessoryAcceptanceForm(query) {
+  return request({
+    url: '/material/purchaseAccessory/getAcceptanceForm',
+    method: 'get',
+    params: query
+  })
+}
 
+//新购配件入库单
+export function accessoryWarehousingEntry(query) {
+  return request({
+    url: '/material/purchaseAccessory/warehousingEntry',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/sgzb-ui/src/views/base/comeAndGo/index.vue b/sgzb-ui/src/views/base/comeAndGo/index.vue
index 21e143b6..716f85c5 100644
--- a/sgzb-ui/src/views/base/comeAndGo/index.vue
+++ b/sgzb-ui/src/views/base/comeAndGo/index.vue
@@ -8,10 +8,10 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="名称" prop="unitName">
+      <el-form-item label="单位名称" prop="unitName">
         <el-input
           v-model="queryParams.unitName"
-          placeholder="请输入名称"
+          placeholder="请输入单位名称"
           clearable
           style="width: 240px"
           @keyup.enter.native="handleQuery"
diff --git a/sgzb-ui/src/views/base/project/index.vue b/sgzb-ui/src/views/base/project/index.vue
index 15680758..83ecac14 100644
--- a/sgzb-ui/src/views/base/project/index.vue
+++ b/sgzb-ui/src/views/base/project/index.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="app-container" id="project">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="名称" prop="proName">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="工程项目名称" prop="proName">
         <el-input
           v-model="queryParams.proName"
-          placeholder="请输入名称"
+          placeholder="请输入工程项目名称"
           clearable
           style="width: 240px"
           @keyup.enter.native="handleQuery"
diff --git a/sgzb-ui/src/views/base/section/index.vue b/sgzb-ui/src/views/base/section/index.vue
index 9ad8116f..946c0eb1 100644
--- a/sgzb-ui/src/views/base/section/index.vue
+++ b/sgzb-ui/src/views/base/section/index.vue
@@ -6,12 +6,12 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      label-width="100px"
     >
-      <el-form-item label="名称" prop="lotName">
+      <el-form-item label="标段工程名称" prop="lotName">
         <el-input
           v-model="queryParams.lotName"
-          placeholder="请输入名称"
+          placeholder="请输入标段工程名称"
           clearable
           style="width: 240px"
           @keyup.enter.native="handleQuery"
diff --git a/sgzb-ui/src/views/base/unit/index.vue b/sgzb-ui/src/views/base/unit/index.vue
index a7150b8c..2f856afa 100644
--- a/sgzb-ui/src/views/base/unit/index.vue
+++ b/sgzb-ui/src/views/base/unit/index.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="app-container" id="unit">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="名称" prop="name">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="单位类型名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入名称"
+          placeholder="请输入单位类型名称"
           clearable
           style="width: 240px"
           @keyup.enter.native="handleQuery"
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
index 7802c9c0..b63ae302 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
@@ -267,11 +267,22 @@ export default {
     //审核  同意
     async subAuditLeaseByCompany(){
       const params = JSON.parse(JSON.stringify(this.queryParams))
-      params.taskStatus = params.taskStatus+1
+      if(params.taskStatus<32){
+         params.taskStatus = params.taskStatus+1
+      }
       params.leaseApplyInfoList.forEach(v => {
         this.$set(v,'companyAuditRemark',params.companyAuditRemarks)
         this.$set(v,'companyAuditBy',this.user.id)
         this.$set(v,'examineStatusId',params.examineStatusId)
+        if(params.examineStatusId=='32'){
+          if(v.companyId==101){
+            this.$set(v,'status',1)
+          }
+          if(v.companyId==102){
+            this.$set(v,'status',3)
+          }
+        }
+        
       })
       params.updateTime = params.updateTimes
       params.createTime = params.createTimes
@@ -322,6 +333,14 @@ export default {
         this.$set(v,'companyAuditRemark',params.companyAuditRemarks)
         this.$set(v,'companyAuditBy',this.user.id)
         this.$set(v,'examineStatusId',params.examineStatusId)
+        if(params.examineStatusId=='32'){
+          if(v.companyId==101){
+            this.$set(v,'status',2)
+          }
+          if(v.companyId==102){
+            this.$set(v,'status',4)
+          }
+        }
       })
       console.log(params)
       const res = await rejectLeaseByCompany(params)
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
index 0a32160f..513ce113 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
@@ -122,9 +122,17 @@
             type="primary" 
             icon="el-icon-edit"
             @click="handleExamine(scope.row)"
-            v-hasPermi="['receive:examine:nbry']"
+            v-hasPermi="['receive:examine:nbry-jjfgs']"
             v-if="Number(scope.row.examineStatusId)==32"
-          >审批</el-button>
+          >机具审批</el-button>
+          <el-button
+            size="mini"
+            type="primary" 
+            icon="el-icon-edit"
+            @click="handleExamine(scope.row)"
+            v-hasPermi="['receive:examine:nbry-sbfgs']"
+            v-if="Number(scope.row.examineStatusId)==32"
+          >调试审批</el-button>
           <el-button
             size="mini"
             type="info" 
@@ -206,7 +214,7 @@
 
 <script>
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-import { getLeaseAuditListAll, getUnitData, getProData, getTaskDetail } from '@/api/claimAndRefund/receive'
+import { getLeaseManageListAll, getUnitData, getProData, getTaskDetail } from '@/api/claimAndRefund/receive'
 import { getInfo } from '@/api/login'
 import vueEasyPrint from 'vue-easy-print';
 export default {
@@ -313,7 +321,7 @@ export default {
         pageNum: this.queryParams.pageNum
       }
 
-      const res = await getLeaseAuditListAll(params)
+      const res = await getLeaseManageListAll(params)
       this.loading = false;
       console.log('getList ============',res)
       this.leaseAuditList = res.data.rows;
diff --git a/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue b/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue
index e69de29b..6814de8d 100644
--- a/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue
+++ b/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue
@@ -0,0 +1,280 @@
+<template>
+    <div class="app-container" id="agreement">
+     
+            <el-row style="width: 100%;">
+                <el-col :span="18">
+                    <el-button type="primary" size="mini" >租赁明细导出</el-button>
+                    <el-button type="primary" size="mini" >丢失明细导出</el-button>
+                    <el-button type="primary" size="mini" >维修明细导出</el-button>
+                    <el-button type="primary" size="mini" >报废明细导出</el-button>
+                    <el-button type="warning" size="mini" >全部明细导出</el-button>
+                    <el-button type="success" size="mini" >提交</el-button>
+                </el-col>
+                <el-col :span="4">
+                    <el-button type="danger" size="mini" style="float: right;" @click="handleBack">返回</el-button>
+                </el-col>
+            </el-row>
+      <div style="color: rgb(217, 0, 27);font-weight: 700;padding: 20px 0;">
+        结算费用合计：¥230020，租赁费用¥123456，维修费用¥1234，报废费用¥123，丢失费用0
+      </div>
+
+
+      <div>
+        <el-table v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange">
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column label="租赁费用明细" align="center">
+                <el-table-column label="序号" align="center" type="index"  width="60"/>
+                <el-table-column label="结算单位名称" align="center" prop="agreementCode" :show-overflow-tooltip="true" />
+                <el-table-column label="结算工程名称" align="center" prop="contractCode" :show-overflow-tooltip="true" />
+                <el-table-column label="设备名称" align="center" prop="fileName" :show-overflow-tooltip="true" />
+                <el-table-column label="规格型号" align="center" prop="signTime" :show-overflow-tooltip="true" />
+                <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
+                <el-table-column label="租赁单价" align="center" prop="projectName" :show-overflow-tooltip="true" />
+                <el-table-column label="租赁数量" align="center" prop="planStartTime" :show-overflow-tooltip="true" />
+                <el-table-column label="租赁日期" align="center" prop="leaseDay" :show-overflow-tooltip="true" />
+                <el-table-column label="归还数量" align="center" prop="authPerson" :show-overflow-tooltip="true" />
+                <el-table-column label="归还日期 " align="center" prop="phone" :show-overflow-tooltip="true" />
+                <el-table-column label="租赁天数" align="center" prop="remark" :show-overflow-tooltip="true" />
+                <el-table-column label="外部租赁费用" align="center" prop="remark" :show-overflow-tooltip="true" />
+            </el-table-column>
+        </el-table>
+        <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />        
+        <div style="width: 100%;text-align: right;padding: 20px 20px;">租赁费用小计：97010.08</div>
+      </div>
+
+      <div>
+        <el-table v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange">
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column label="维修费用明细" align="center">
+                <el-table-column label="序号" align="center" type="index"  width="60"/>
+                <el-table-column label="结算单位名称" align="center" prop="agreementCode" :show-overflow-tooltip="true" />
+                <el-table-column label="结算工程名称" align="center" prop="contractCode" :show-overflow-tooltip="true" />
+                <el-table-column label="设备名称" align="center" prop="fileName" :show-overflow-tooltip="true" />
+                <el-table-column label="规格型号" align="center" prop="signTime" :show-overflow-tooltip="true" />
+                <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
+                <el-table-column label="维修数量" align="center" prop="projectName" :show-overflow-tooltip="true" />
+                <el-table-column label="维修费用" align="center" prop="planStartTime" :show-overflow-tooltip="true" />
+                 
+            </el-table-column>
+        </el-table>
+        <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />        
+        <div style="width: 100%;text-align: right;padding: 20px 20px;">维修费用小计：230</div>
+      </div>
+
+      <div>
+        <el-table v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange">
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column label="报废费用明细" align="center">
+                <el-table-column label="序号" align="center" type="index"  width="60"/>
+                <el-table-column label="结算单位名称" align="center" prop="agreementCode" :show-overflow-tooltip="true" />
+                <el-table-column label="结算工程名称" align="center" prop="contractCode" :show-overflow-tooltip="true" />
+                <el-table-column label="设备名称" align="center" prop="fileName" :show-overflow-tooltip="true" />
+                <el-table-column label="规格型号" align="center" prop="signTime" :show-overflow-tooltip="true" />
+                <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
+                <el-table-column label="报废数量" align="center" prop="projectName" :show-overflow-tooltip="true" />
+                <el-table-column label="报废原因" align="center" prop="planStartTime" :show-overflow-tooltip="true" />
+                <el-table-column label="维修费用" align="center" prop="planStartTime" :show-overflow-tooltip="true" />
+            </el-table-column>
+        </el-table>
+        <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />        
+        <div style="width: 100%;text-align: right;padding: 20px 20px;">报废费用小计：230</div>
+      </div>
+
+      <div>
+        <el-table v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange">
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column label="丢失费用明细" align="center">
+                <el-table-column label="序号" align="center" type="index"  width="60"/>
+                <el-table-column label="结算单位名称" align="center" prop="agreementCode" :show-overflow-tooltip="true" />
+                <el-table-column label="结算工程名称" align="center" prop="contractCode" :show-overflow-tooltip="true" />
+                <el-table-column label="设备名称" align="center" prop="fileName" :show-overflow-tooltip="true" />
+                <el-table-column label="规格型号" align="center" prop="signTime" :show-overflow-tooltip="true" />
+                <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
+                <el-table-column label="丢失数量" align="center" prop="projectName" :show-overflow-tooltip="true" />
+                <el-table-column label="丢失费用" align="center" prop="planStartTime" :show-overflow-tooltip="true" />
+            </el-table-column>
+        </el-table>
+        <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />        
+        <div style="width: 100%;text-align: right;padding: 20px 20px;">丢失费用小计：230</div>
+      </div>
+  
+    </div>
+  </template>
+  
+  <script>
+  import { getAgreementList,getUnitList, getProjectList } from "@/api/claimAndRefund/receive";
+  export default {
+    name: "Agreement",
+    dicts: ['sys_normal_disable'],
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 往来单位数据
+        unitList: [],
+        // 工程数据
+         projectList: [],
+         statusList:[{id:'0',name:'请选择'},{id:'1',name:'已结算'},{id:'2',name:'未结算'},{id:'3',name:'待审核'}], //集合
+        // 表格数据
+        agreementList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 日期范围
+        dateRange: [],
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          keyWord: undefined,
+         
+        },
+        // 表单参数
+        form: {},
+        //图片上传
+        uploadHeader: process.env.VUE_APP_BASE_API,
+        imageUrl:'',
+        imageName:'',
+        fileList:[],
+        field101fileList:[],
+        dialogImageUrl: '',
+        dialogVisible: false,
+        //上传地址
+        // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
+        // uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system
+        uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址
+        // 表单校验
+        rules: {
+          contractCode: [
+            { required: true, message: "合同编号不能为空", trigger: "blur" }
+          ],
+          signTime: [
+            { required: true, message: "签订日期不能为空", trigger: "blur" }
+          ],
+          unitName: [
+            { required: true, message: "往来单位不能为空", trigger: "blur" }
+          ],
+          projectName: [
+            { required: true, message: "工程名称不能为空", trigger: "blur" }
+          ]
+        },
+        peopleOpen:false,
+        noticeOpen:false,
+        nform:{
+          notice:''
+        },
+        nrules: {
+          notice: [
+            { required: true, message: "通知内容不能为空", trigger: "blur" }
+          ]
+        },
+        deptName: undefined,
+      };
+    },
+    created() {
+      this.getList();
+    //   this.getUnitList();
+    //   this.getProjectList();
+  
+    },
+    methods: {
+      //获取单位类型 ,getUnitList, getProjectList
+      getUnitList(){
+        getUnitList().then(response => {
+          this.unitList =  response.data;
+          })
+      },
+      getProjectList(){
+        getProjectList().then(response => {
+          this.projectList =  response.data;
+          })
+      },
+      
+      /** 查询字典类型列表 */
+      getList() {
+        this.loading = true;
+        getAgreementList(this.queryParams).then(response => {
+            this.agreementList = response.rows;
+            this.total = response.total;
+            this.loading = false;
+          }
+        );
+      },
+      handleBack(){
+        this.$tab.closeOpenPage({
+            path:'/cost/cost/costApplyList',
+            query:{
+                isEdit:true
+            }
+        }) 
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.agreementId)
+        this.single = selection.length!=1
+        this.multiple = !selection.length
+      },
+ 
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        // const agreementId = row.agreementId;
+        // let param = {
+        //   agreementId:row.agreementId+''
+        // }
+        // this.$modal.confirm('是否确认删除该数据项？').then(function() {
+        //   return removeAgreement(param);
+        // }).then(() => {
+        //   this.getList();
+        //   this.$modal.msgSuccess("删除成功");
+        // }).catch(() => {});
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        // this.download('material/agreementInfo/export', {
+        //   ...this.queryParams
+        // }, `协议_${new Date().getTime()}.xlsx`)
+      },
+    }
+  };
+  </script>
+  <style lang="scss" scoped>
+  ::v-deep.el-table .fixed-width .el-button--mini {
+    width: 80px !important;
+    margin-bottom: 10px;
+  }
+  </style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue b/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
index 67fad671..67bacc21 100644
--- a/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
+++ b/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
@@ -1,24 +1,6 @@
 <template>
     <div class="app-container" id="agreement">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-        <!-- <el-form-item label="关键字" prop="keyWord">
-          <el-input
-            v-model="queryParams.keyWord"
-            placeholder="请输入关键字"
-            clearable
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item> -->
-        <!-- <el-form-item label="协议编号" prop="agreementCode">
-          <el-input
-            v-model="queryParams.agreementCode"
-            placeholder="请输入协议编号"
-            clearable
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item> -->
         <el-form-item label="结算单位" prop="unitId">
           <el-select v-model="queryParams.unitId" placeholder="请选择往来单位"  clearable>
               <el-option
@@ -39,8 +21,8 @@
               ></el-option>
             </el-select>
         </el-form-item>
-        <el-form-item label="结算工程" prop="projectId">
-           <el-select v-model="queryParams.projectId" placeholder="请选择工程名称"  clearable>
+        <el-form-item label="结算状态" prop="projectId">
+           <el-select v-model="queryParams.projectId" placeholder="请选择结算状态"  clearable>
               <el-option
                 v-for="item in statusList"
                 :key="item.id"
@@ -60,26 +42,6 @@
         </el-form-item>
       </el-form>
   
-      <!-- <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button
-            type="primary"
-            plain
-            size="mini"
-          >批量结算</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" :data="agreementList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" align="center" type="index"  width="60"/>
@@ -124,12 +86,7 @@
   </template>
   
   <script>
-  import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
-  import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-  import { getAgreementList, getAgreementInfoId,addAgreement, updateAgreement, removeAgreement,getUnitList, getProjectList } from "@/api/claimAndRefund/receive";
-  import { imgUpLoad,fileUpLoad } from "@/api/system/upload";
-  
-  
+  import { getAgreementList,getUnitList, getProjectList } from "@/api/claimAndRefund/receive";
   export default {
     name: "Agreement",
     dicts: ['sys_normal_disable'],
diff --git a/sgzb-ui/src/views/cost/csotSettlement/costExame.vue b/sgzb-ui/src/views/cost/csotSettlement/costExame.vue
index e69de29b..766db764 100644
--- a/sgzb-ui/src/views/cost/csotSettlement/costExame.vue
+++ b/sgzb-ui/src/views/cost/csotSettlement/costExame.vue
@@ -0,0 +1,281 @@
+<template>
+    <div class="app-container" id="agreement">
+     
+            <el-row style="width: 100%;">
+                <el-col :span="18">
+                    <el-button type="primary" size="mini" >租赁明细导出</el-button>
+                    <el-button type="primary" size="mini" >丢失明细导出</el-button>
+                    <el-button type="primary" size="mini" >维修明细导出</el-button>
+                    <el-button type="primary" size="mini" >报废明细导出</el-button>
+                    <el-button type="warning" size="mini" >全部明细导出</el-button>
+                    <el-button type="success" size="mini" >提交</el-button>
+                </el-col>
+                <el-col :span="4">
+                    <el-button type="danger" size="mini" style="float: right;" @click="handleBack">返回</el-button>
+                </el-col>
+            </el-row>
+      <div style="color: rgb(217, 0, 27);font-weight: 700;padding: 20px 0;">
+        结算费用合计：¥230020，租赁费用¥123456，维修费用¥1234，报废费用¥123，丢失费用0
+      </div>
+
+
+      <div>
+        <el-table v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange">
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column label="租赁费用明细" align="center">
+                <el-table-column label="序号" align="center" type="index"  width="60"/>
+                <el-table-column label="结算单位名称" align="center" prop="agreementCode" :show-overflow-tooltip="true" />
+                <el-table-column label="结算工程名称" align="center" prop="contractCode" :show-overflow-tooltip="true" />
+                <el-table-column label="设备名称" align="center" prop="fileName" :show-overflow-tooltip="true" />
+                <el-table-column label="规格型号" align="center" prop="signTime" :show-overflow-tooltip="true" />
+                <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
+                <el-table-column label="租赁单价" align="center" prop="projectName" :show-overflow-tooltip="true" />
+                <el-table-column label="租赁数量" align="center" prop="planStartTime" :show-overflow-tooltip="true" />
+                <el-table-column label="租赁日期" align="center" prop="leaseDay" :show-overflow-tooltip="true" />
+                <el-table-column label="归还数量" align="center" prop="authPerson" :show-overflow-tooltip="true" />
+                <el-table-column label="归还日期 " align="center" prop="phone" :show-overflow-tooltip="true" />
+                <el-table-column label="租赁天数" align="center" prop="remark" :show-overflow-tooltip="true" />
+                <el-table-column label="外部租赁费用" align="center" prop="remark" :show-overflow-tooltip="true" />
+            </el-table-column>
+        </el-table>
+        <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />        
+        <div style="width: 100%;text-align: right;padding: 20px 20px;">租赁费用小计：97010.08</div>
+      </div>
+
+      <div>
+        <el-table v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange">
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column label="维修费用明细" align="center">
+                <el-table-column label="序号" align="center" type="index"  width="60"/>
+                <el-table-column label="结算单位名称" align="center" prop="agreementCode" :show-overflow-tooltip="true" />
+                <el-table-column label="结算工程名称" align="center" prop="contractCode" :show-overflow-tooltip="true" />
+                <el-table-column label="设备名称" align="center" prop="fileName" :show-overflow-tooltip="true" />
+                <el-table-column label="规格型号" align="center" prop="signTime" :show-overflow-tooltip="true" />
+                <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
+                <el-table-column label="维修数量" align="center" prop="projectName" :show-overflow-tooltip="true" />
+                <el-table-column label="维修费用" align="center" prop="planStartTime" :show-overflow-tooltip="true" />
+                 
+            </el-table-column>
+        </el-table>
+        <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />        
+        <div style="width: 100%;text-align: right;padding: 20px 20px;">维修费用小计：230</div>
+      </div>
+
+      <div>
+        <el-table v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange">
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column label="报废费用明细" align="center">
+                <el-table-column label="序号" align="center" type="index"  width="60"/>
+                <el-table-column label="结算单位名称" align="center" prop="agreementCode" :show-overflow-tooltip="true" />
+                <el-table-column label="结算工程名称" align="center" prop="contractCode" :show-overflow-tooltip="true" />
+                <el-table-column label="设备名称" align="center" prop="fileName" :show-overflow-tooltip="true" />
+                <el-table-column label="规格型号" align="center" prop="signTime" :show-overflow-tooltip="true" />
+                <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
+                <el-table-column label="报废数量" align="center" prop="projectName" :show-overflow-tooltip="true" />
+                <el-table-column label="报废原因" align="center" prop="planStartTime" :show-overflow-tooltip="true" />
+                <el-table-column label="维修费用" align="center" prop="planStartTime" :show-overflow-tooltip="true" />
+            </el-table-column>
+        </el-table>
+        <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />        
+        <div style="width: 100%;text-align: right;padding: 20px 20px;">报废费用小计：230</div>
+      </div>
+
+      <div>
+        <el-table v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange">
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column label="丢失费用明细" align="center">
+                <el-table-column label="序号" align="center" type="index"  width="60"/>
+                <el-table-column label="结算单位名称" align="center" prop="agreementCode" :show-overflow-tooltip="true" />
+                <el-table-column label="结算工程名称" align="center" prop="contractCode" :show-overflow-tooltip="true" />
+                <el-table-column label="设备名称" align="center" prop="fileName" :show-overflow-tooltip="true" />
+                <el-table-column label="规格型号" align="center" prop="signTime" :show-overflow-tooltip="true" />
+                <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
+                <el-table-column label="丢失数量" align="center" prop="projectName" :show-overflow-tooltip="true" />
+                <el-table-column label="丢失费用" align="center" prop="planStartTime" :show-overflow-tooltip="true" />
+            </el-table-column>
+        </el-table>
+        <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />        
+        <div style="width: 100%;text-align: right;padding: 20px 20px;">丢失费用小计：230</div>
+      </div>
+  
+    </div>
+  </template>
+  
+  <script>
+  import { getAgreementList,getUnitList, getProjectList } from "@/api/claimAndRefund/receive";
+  export default {
+    name: "Agreement",
+    dicts: ['sys_normal_disable'],
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 往来单位数据
+        unitList: [],
+        // 工程数据
+         projectList: [],
+         statusList:[{id:'0',name:'请选择'},{id:'1',name:'已结算'},{id:'2',name:'未结算'},{id:'3',name:'待审核'}], //集合
+        // 表格数据
+        agreementList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 日期范围
+        dateRange: [],
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          keyWord: undefined,
+         
+        },
+        // 表单参数
+        form: {},
+        //图片上传
+        uploadHeader: process.env.VUE_APP_BASE_API,
+        imageUrl:'',
+        imageName:'',
+        fileList:[],
+        field101fileList:[],
+        dialogImageUrl: '',
+        dialogVisible: false,
+        //上传地址
+        // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
+        // uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system
+        uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址
+        // 表单校验
+        rules: {
+          contractCode: [
+            { required: true, message: "合同编号不能为空", trigger: "blur" }
+          ],
+          signTime: [
+            { required: true, message: "签订日期不能为空", trigger: "blur" }
+          ],
+          unitName: [
+            { required: true, message: "往来单位不能为空", trigger: "blur" }
+          ],
+          projectName: [
+            { required: true, message: "工程名称不能为空", trigger: "blur" }
+          ]
+        },
+        peopleOpen:false,
+        noticeOpen:false,
+        nform:{
+          notice:''
+        },
+        nrules: {
+          notice: [
+            { required: true, message: "通知内容不能为空", trigger: "blur" }
+          ]
+        },
+        deptName: undefined,
+      };
+    },
+    created() {
+      this.getList();
+    //   this.getUnitList();
+    //   this.getProjectList();
+  
+    },
+    methods: {
+      //获取单位类型 ,getUnitList, getProjectList
+      getUnitList(){
+        getUnitList().then(response => {
+          this.unitList =  response.data;
+          })
+      },
+      getProjectList(){
+        getProjectList().then(response => {
+          this.projectList =  response.data;
+          })
+      },
+      
+      /** 查询字典类型列表 */
+      getList() {
+        this.loading = true;
+        getAgreementList(this.queryParams).then(response => {
+            this.agreementList = response.rows;
+            this.total = response.total;
+            this.loading = false;
+          }
+        );
+      },
+      handleBack(){
+        this.$tab.closeOpenPage({
+            path:'/cost/cost/costList',
+            query:{
+                isEdit:true
+            }
+        }) 
+      },
+ 
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.agreementId)
+        this.single = selection.length!=1
+        this.multiple = !selection.length
+      },
+ 
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        // const agreementId = row.agreementId;
+        // let param = {
+        //   agreementId:row.agreementId+''
+        // }
+        // this.$modal.confirm('是否确认删除该数据项？').then(function() {
+        //   return removeAgreement(param);
+        // }).then(() => {
+        //   this.getList();
+        //   this.$modal.msgSuccess("删除成功");
+        // }).catch(() => {});
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        // this.download('material/agreementInfo/export', {
+        //   ...this.queryParams
+        // }, `协议_${new Date().getTime()}.xlsx`)
+      },
+    }
+  };
+  </script>
+  <style lang="scss" scoped>
+  ::v-deep.el-table .fixed-width .el-button--mini {
+    width: 80px !important;
+    margin-bottom: 10px;
+  }
+  </style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/cost/csotSettlement/costList.vue b/sgzb-ui/src/views/cost/csotSettlement/costList.vue
index e69de29b..52af9784 100644
--- a/sgzb-ui/src/views/cost/csotSettlement/costList.vue
+++ b/sgzb-ui/src/views/cost/csotSettlement/costList.vue
@@ -0,0 +1,250 @@
+<template>
+    <div class="app-container" id="agreement">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+        <el-form-item label="结算单位" prop="unitId">
+          <el-select v-model="queryParams.unitId" placeholder="请选择往来单位"  clearable>
+              <el-option
+                v-for="item in unitList"
+                :key="item.unitId"
+                :label="item.unitName"
+                :value="item.unitId"
+              ></el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="结算工程" prop="projectId">
+           <el-select v-model="queryParams.projectId" placeholder="请选择工程名称"  clearable>
+              <el-option
+                v-for="item in projectList"
+                :key="item.projectId"
+                :label="item.projectName"
+                :value="item.projectId"
+              ></el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="结算状态" prop="projectId">
+           <el-select v-model="queryParams.projectId" placeholder="请选择结算状态"  clearable>
+              <el-option
+                v-for="item in statusList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></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-button
+            type="primary"
+            plain
+            size="mini"
+            @click="handleExame"
+          >审核</el-button>
+        </el-form-item>
+      </el-form>
+  
+      <el-table v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="序号" align="center" type="index"  width="60"/>
+        <el-table-column label="协议编号" align="center" prop="agreementCode" :show-overflow-tooltip="true" />
+        <!-- <el-table-column label="合同编号" align="center" prop="contractCode" :show-overflow-tooltip="true" />
+        <el-table-column label="附件图片" align="center" prop="fileName" :show-overflow-tooltip="true" />
+        <el-table-column label="签订日期" align="center" prop="signTime" :show-overflow-tooltip="true" /> -->
+        <el-table-column label="结算单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
+        <el-table-column label="结算工程" align="center" prop="projectName" :show-overflow-tooltip="true" />
+        <el-table-column label="合计费用" align="center" prop="planStartTime" :show-overflow-tooltip="true" />
+        <el-table-column label="状态" align="center" prop="leaseDay" :show-overflow-tooltip="true" />
+        
+        <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button 
+                size="mini"
+                type="primary"
+            >通过</el-button>
+            <el-button
+              size="mini"
+              type="danger"
+            >不通过</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"
+      />
+  
+    </div>
+  </template>
+  
+  <script>
+  import { getAgreementList,getUnitList, getProjectList } from "@/api/claimAndRefund/receive";
+  export default {
+    name: "Agreement",
+    dicts: ['sys_normal_disable'],
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 往来单位数据
+        unitList: [],
+        // 工程数据
+         projectList: [],
+         statusList:[{id:'0',name:'请选择'},{id:'1',name:'已结算'},{id:'2',name:'未结算'},{id:'3',name:'待审核'}], //集合
+        // 表格数据
+        agreementList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 日期范围
+        dateRange: [],
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          keyWord: undefined,
+         
+        },
+        // 表单参数
+        form: {},
+        //图片上传
+        uploadHeader: process.env.VUE_APP_BASE_API,
+        imageUrl:'',
+        imageName:'',
+        fileList:[],
+        field101fileList:[],
+        dialogImageUrl: '',
+        dialogVisible: false,
+        //上传地址
+        // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
+        // uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system
+        uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址
+        // 表单校验
+        rules: {
+          contractCode: [
+            { required: true, message: "合同编号不能为空", trigger: "blur" }
+          ],
+          signTime: [
+            { required: true, message: "签订日期不能为空", trigger: "blur" }
+          ],
+          unitName: [
+            { required: true, message: "往来单位不能为空", trigger: "blur" }
+          ],
+          projectName: [
+            { required: true, message: "工程名称不能为空", trigger: "blur" }
+          ]
+        },
+        peopleOpen:false,
+        noticeOpen:false,
+        nform:{
+          notice:''
+        },
+        nrules: {
+          notice: [
+            { required: true, message: "通知内容不能为空", trigger: "blur" }
+          ]
+        },
+        deptName: undefined,
+      };
+    },
+    created() {
+      this.getList();
+      this.getUnitList();
+      this.getProjectList();
+  
+    },
+    methods: {
+      //获取单位类型 ,getUnitList, getProjectList
+      getUnitList(){
+        getUnitList().then(response => {
+          this.unitList =  response.data;
+          })
+      },
+      getProjectList(){
+        getProjectList().then(response => {
+          this.projectList =  response.data;
+          })
+      },
+      
+      /** 查询字典类型列表 */
+      getList() {
+        this.loading = true;
+        getAgreementList(this.queryParams).then(response => {
+            this.agreementList = response.rows;
+            this.total = response.total;
+            this.loading = false;
+          }
+        );
+      },
+ 
+      
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.dateRange = [];
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      //结算申请
+      handleExame(){
+        this.$tab.closeOpenPage({
+            path:'/cost/cost/costExame',
+            query:{
+                isEdit:true
+            }
+        }) 
+      },
+ 
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.agreementId)
+        this.single = selection.length!=1
+        this.multiple = !selection.length
+      },
+ 
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        // const agreementId = row.agreementId;
+        // let param = {
+        //   agreementId:row.agreementId+''
+        // }
+        // this.$modal.confirm('是否确认删除该数据项？').then(function() {
+        //   return removeAgreement(param);
+        // }).then(() => {
+        //   this.getList();
+        //   this.$modal.msgSuccess("删除成功");
+        // }).catch(() => {});
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        // this.download('material/agreementInfo/export', {
+        //   ...this.queryParams
+        // }, `协议_${new Date().getTime()}.xlsx`)
+      },
+    }
+  };
+  </script>
+  <style lang="scss" scoped>
+  ::v-deep.el-table .fixed-width .el-button--mini {
+    width: 80px !important;
+    margin-bottom: 10px;
+  }
+  </style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/repairTest/brokenExamine/index.vue b/sgzb-ui/src/views/repairTest/brokenExamine/index.vue
index e80fd8fc..c6c44ab0 100644
--- a/sgzb-ui/src/views/repairTest/brokenExamine/index.vue
+++ b/sgzb-ui/src/views/repairTest/brokenExamine/index.vue
@@ -398,6 +398,22 @@
             <span v-if="scope.row.scrapSource=='3'">盘点</span>
           </template>
         </el-table-column>
+        <el-table-column
+          label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
+          width="200px" 
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="primary"
+              icon="el-icon-zoom-in" v-if="scope.row.scrapSource=='2'"
+              @click="scrapRecord(scope.row)" 
+              >报废明细</el-button
+            >
+          </template>
+        </el-table-column>
       </el-table>
       <pagination
         v-show="dialogTotal > 0"
@@ -417,6 +433,57 @@
         <el-button @click="returnSubmit(1)" :disabled="dialogMultiple">不通过</el-button>
       </div>
     </el-dialog>
+
+    <!-- 报废明细 -->
+    <el-dialog
+      v-loading.fullscreen.lock="fullscreenLoading"
+      :title="title"
+      :visible.sync="openScrapRecord"
+      append-to-body
+      width="1200px"
+    >
+      <el-table :data="scrapRecordList" height="450px">
+        <el-table-column label="序号" sortable align="center" type="index" />
+        <el-table-column
+          label="报废原因"
+          align="center"
+          prop="scrapReason"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="报废数量"
+          align="center"
+          prop="scrapNum"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="报废类型"
+          align="center"
+          prop="scrapType"
+          :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span v-if="scope.row.scrapType=='0'">自然报废</span>
+            <span v-if="scope.row.scrapType=='1'">任务报废</span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column
+          label="备注"
+          align="center"
+          prop="remark"
+          :show-overflow-tooltip="true"
+        /> -->
+
+      </el-table>
+      <pagination
+        v-show="scrapRecordTotal > 0"
+        :total="scrapRecordTotal"
+        :page.sync="scrapRecordParams.pageNum"
+        :limit.sync="scrapRecordParams.pageSize"
+        @pagination="getScrapRecordList"
+      />
+    </el-dialog>
+
+
     <el-dialog
       v-loading.fullscreen.lock="fullscreenLoading"
       :title="title"
@@ -504,7 +571,7 @@
 </template>
 
 <script>
-import { getQuestListApi, getRepairAuditListApi, addDetailsAuditApi } from "@/api/repairTest/brokenExamine";
+import { getQuestListApi, getRepairAuditListApi, addDetailsAuditApi,getScrapRecord } from "@/api/repairTest/brokenExamine";
 import { getProjectList } from "@/api/claimAndRefund/receive";
 import {
   getUnitInfoSelectApi, getProjectSelectApi, getDicSelectApi, listPartTypeApi, getMaTypeSelectApi
@@ -579,7 +646,15 @@ export default {
         remark: [
           { required: true, message: "原因不能为空", trigger: "blur" }
         ],
-      }
+      },
+      parentId:'',
+      openScrapRecord:false,
+      scrapRecordList:[],
+      scrapRecordParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      scrapRecordTotal: 0,
     };
   },
   created() {
@@ -627,6 +702,27 @@ export default {
         }
       }).catch(() => { });
     },
+    //报废明细
+    scrapRecord(row){
+      this.scrapRecordParams.pageNum = 1
+      this.scrapRecordParams.pageSize = 10
+      this.parentId = row.parentId
+      this.getScrapRecordList()
+    },
+    getScrapRecordList(){
+      let params = {
+        parentId: this.parentId,
+        pageNum: this.scrapRecordParams.pageNum,
+        pageSize: this.scrapRecordParams.pageSize,
+      }
+      getScrapRecord(params).then(res => {
+        this.scrapRecordList = res.rows;
+        this.scrapRecordTotal = res.total;
+        this.openScrapRecord = true
+        this.title = '报废明细'
+      }).catch(() => { })
+    },
+
     checkClick() {
       this.title = '审批';
       this.openFour = true
diff --git a/sgzb-ui/src/views/repairTest/testExamine/index.vue b/sgzb-ui/src/views/repairTest/testExamine/index.vue
index 71faaedf..f6425495 100644
--- a/sgzb-ui/src/views/repairTest/testExamine/index.vue
+++ b/sgzb-ui/src/views/repairTest/testExamine/index.vue
@@ -387,13 +387,36 @@
             <span v-if="scope.row.status=='2'">驳回</span>
           </template>
         </el-table-column>
+        <el-table-column
+          label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
+          width="200px"
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="primary"
+              icon="el-icon-zoom-in"
+              @click="repairRecord(scope.row)"
+              >维修记录</el-button>
+            <el-button
+              size="mini"
+              type="warning"
+              icon="el-icon-circle-check"
+              @click="partRecord(scope.row)"
+              >配件详情</el-button>
+          </template>
+        </el-table-column>
+
+
       </el-table>
       <pagination
         v-show="dialogTotal > 0"
         :total="dialogTotal"
         :page.sync="dialogQueryParams.pageNum"
         :limit.sync="dialogQueryParams.pageSize"
-        @pagination="getList"
+        @pagination="getdialogList"
       />
 
       <div
@@ -406,6 +429,167 @@
         <el-button @click="returnSubmit(1)" :disabled="dialogMultiple">不通过</el-button>
       </div>
     </el-dialog>
+
+    <!-- 维修记录 -->
+    <el-dialog
+      v-loading.fullscreen.lock="fullscreenLoading"
+      :title="title"
+      :visible.sync="openRepairRecord"
+      append-to-body
+      width="1200px"
+    >
+      <el-table :data="repairRecordList" height="450px">
+        <el-table-column label="序号" sortable align="center" type="index" />
+        <el-table-column
+          label="维修内容"
+          align="center"
+          prop="repairContent"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="维修数量"
+          align="center"
+          prop="repairNum"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="维修人"
+          align="center"
+          prop="repairer"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="维修方式"
+          align="center"
+          prop="repairType"
+          :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span v-if="scope.row.repairType=='1'">内部</span>
+            <span v-if="scope.row.repairType=='2'">返厂</span>
+            <span v-if="scope.row.repairType=='3'">报废</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="返厂名称"
+          align="center"
+          prop="supplier"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="报废原因"
+          align="center"
+          prop="scrapReason"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="报废数量"
+          align="center"
+          prop="scrapNum"
+          :show-overflow-tooltip="true"
+        />
+       <el-table-column
+          label="报废类型"
+          align="center"
+          prop="scrapType"
+          :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span v-if="scope.row.scrapType=='0'">自然报废</span>
+            <span v-if="scope.row.scrapType=='1'">任务报废</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="配件名称"
+          align="center"
+          prop="partName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="配件数量"
+          align="center"
+          prop="partNum"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="配件单价"
+          align="center"
+          prop="partPrice"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="类型"
+          align="center"
+          prop="partType"
+          :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span v-if="scope.row.partType=='0'">不收费</span>
+            <span v-if="scope.row.partType=='1'">收费</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="repairRecordTotal > 0"
+        :total="repairRecordTotal"
+        :page.sync="repairRecordParams.pageNum"
+        :limit.sync="repairRecordParams.pageSize"
+        @pagination="getRepairRecordList"
+      />
+    </el-dialog>
+
+    <!-- 维修记录 -->
+    <el-dialog
+      v-loading.fullscreen.lock="fullscreenLoading"
+      :title="title"
+      :visible.sync="openPartRecord"
+      append-to-body
+      width="1200px"
+    >
+      <el-table :data="partRecordList" height="450px">
+        <el-table-column label="序号" sortable align="center" type="index" />
+        <el-table-column
+          label="配件名称"
+          align="center"
+          prop="partName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="配件数量"
+          align="center"
+          prop="partNum"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="配件费用"
+          align="center"
+          prop="partCost"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="类型"
+          align="center"
+          prop="partType"
+          :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span v-if="scope.row.partType=='0'">不收费</span>
+            <span v-if="scope.row.partType=='1'">收费</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="备注"
+          align="center"
+          prop="remark"
+          :show-overflow-tooltip="true"
+        />
+
+      </el-table>
+      <pagination
+        v-show="partRecordTotal > 0"
+        :total="partRecordTotal"
+        :page.sync="partRecordParams.pageNum"
+        :limit.sync="partRecordParams.pageSize"
+        @pagination="getPartRecordList"
+      />
+    </el-dialog>
+
     <el-dialog
       v-loading.fullscreen.lock="fullscreenLoading"
       :title="title"
@@ -493,7 +677,7 @@
 </template>
 
 <script>
-import { getQuestListApi, getRepairAuditListApi, addDetailsAuditApi, } from "@/api/repairTest/testExamine";
+import { getQuestListApi, getRepairAuditListApi, addDetailsAuditApi,getRepairRecord,getPartRecord } from "@/api/repairTest/testExamine";
 import { getProjectList } from "@/api/claimAndRefund/receive";
 import {
   getUnitInfoSelectApi, getProjectSelectApi, getDicSelectApi, listPartTypeApi, getMaTypeSelectApi
@@ -568,7 +752,22 @@ export default {
         remark: [
           { required: true, message: "原因不能为空", trigger: "blur" }
         ],
-      }
+      },
+      repairId:'',
+      openRepairRecord:false,
+      repairRecordList:[],
+      repairRecordParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      repairRecordTotal: 0,
+      openPartRecord:false,
+      partRecordList:[],
+      partRecordParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      partRecordTotal: 0,
     };
   },
   created() {
@@ -791,6 +990,48 @@ export default {
     submitOpenOneFeturn() {
       this.openOne = false
     },
+    //维修记录
+    repairRecord(row){
+      this.repairRecordParams.pageNum = 1
+      this.repairRecordParams.pageSize = 10
+      this.repairId = row.repairId
+      this.getRepairRecordList()
+    },
+    getRepairRecordList(){
+      let params = {
+        repairId: this.repairId,
+        pageNum: this.repairRecordParams.pageNum,
+        pageSize: this.repairRecordParams.pageSize,
+      }
+      getRepairRecord(params).then(res => {
+        this.repairRecordList = res.rows;
+        this.repairRecordTotal = res.total;
+        this.openRepairRecord = true
+        this.title = '维修记录'
+      }).catch(() => { })
+    },
+    //配件详情
+    partRecord(row){
+      this.partRecordParams.pageNum = 1
+      this.partRecordParams.pageSize = 10
+      this.repairId = row.repairId
+      this.getPartRecordList()
+    },
+    getPartRecordList(){
+      let params = {
+        repairId: this.repairId,
+        pageNum: this.partRecordParams.pageNum,
+        pageSize: this.partRecordParams.pageSize,
+      }
+      getPartRecord(params).then(res => {
+        this.partRecordList = res.rows;
+        this.partRecordTotal = res.total;
+        this.openPartRecord = true
+        this.title = '配件详情'
+      }).catch(() => { })
+    },
+
+
     returnSubmit(val) {
       this.checkResult = val
       this.title = '驳回原因'
diff --git a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue
index a58de543..d27efd0a 100644
--- a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue
+++ b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue
@@ -166,7 +166,7 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="!isCheck"
+            v-if="!isCheck && scope.row.status==0"
             @click="handleDelete(scope.row)" 
           >删除</el-button> 
         </template>
diff --git a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue
index 0ca6521c..64e9de27 100644
--- a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue
@@ -94,7 +94,7 @@
             icon="el-icon-edit"
             v-if="scope.row.taskStatus!=68"
             @click="handleBuy(scope.row)" 
-          >采购单</el-button>
+          >验收单</el-button>
           <el-button
             size="mini"
             type="danger"
@@ -138,15 +138,104 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 验收单弹窗 -->
+    <el-dialog :title="title" :visible.sync="openPrint" width="1100px" append-to-body>
+      <div style="height: 400px;overflow-y: scroll;">
+      <vue-easy-print tableShow ref="remarksPrintRef" class="print">
+        <div class="title" style="text-align: center;font-weight: 600;font-size: 16px;">
+          到货验收单
+        </div>
+        <div class="info" style="margin-top: 10px;display: flex;flex-wrap: wrap;">
+          <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
+            <span>工程名称：</span> 
+          </div>
+          <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
+            <span>验收单编号：</span>{{ printData.code }}
+          </div>
+          <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
+            <span>合同名称：</span> 
+          </div>
+          <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
+            <span>合同编号：</span> 
+          </div>
+          <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
+            <span>验收地点：</span> 
+          </div>
+          <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
+            <span>供应商：</span><span v-if="printTableData.length>0">{{ printTableData[0].supplier }}</span> 
+          </div>
+        </div>
+        <el-table :data="printTableData" class="table" style="margin-top: 20px;width: 1000px;padding-bottom: 1px;" border>
+          <!--          <el-table-column type="selection" width="55" align="center" />-->
+          <el-table-column label="序号" align="center" type="index" />
+          <el-table-column label="类型名称" align="center" prop="machineTypeName"  />
+          <el-table-column label="规格型号" align="center" prop="specificationType"  />
+          <el-table-column label="计量单位" align="center" prop="" />
+          <el-table-column label="采购数量" align="center" prop="purchaseNum" />
+
+          <el-table-column label="已验收数量" align="center" prop="" />
+          <el-table-column label="本次验收数量" align="center" prop="checkNum" />
+          <el-table-column label="累积验收数量" align="center" prop="" />
+          <el-table-column label="验收日期" align="center" prop="" />
+          <el-table-column label="合格证及技术资料" align="center" prop="" />
+          <el-table-column label="包装" align="center" prop="" />
+
+        </el-table>
+
+        <div class="fillIn" style="margin-top: 20px;display: flex;justify-content: space-between;">
+          <div class="item" style="width: 50%;">
+            <div>
+              <span>接收单位验收意见：</span>
+            </div>
+            <div>
+              <span>验收人：</span>
+            </div>
+            <div>
+              <span>接收单位（章）：</span>
+            </div>
+            <div>
+              <span>验收负责人：           年   月   日</span>
+            </div>
+          </div>
+          
+          <div class="item" style="width: 50%;">
+            <div>
+              <span>供应商：</span>
+            </div>
+            <div>
+              <span>供应商（章）：</span>
+            </div>
+            <div>
+              <span>验收负责人：           年   月   日</span>
+            </div>
+          </div>
+          <!-- <div class="item" style="width: 25%;">
+            <span>经办人：</span>
+          </div> -->
+        </div>
+
+      </vue-easy-print>
+      </div>
+
+      <div slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button type="primary" @click="print">打 印</el-button>
+        <el-button @click="openPrint = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+
+
   </div>
 </template>
 
 <script>
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-import { listPurchaseAccessory,getPurchaseCheckInfo,delPurchaseAccessory } from "@/api/store/newBuy";
+import { listPurchaseAccessory,getPurchaseCheckInfo,delPurchaseAccessory,getAccessoryAcceptanceForm } from "@/api/store/newBuy";
+import vueEasyPrint from 'vue-easy-print';
 export default {
-  name: "NewAccessoryList",
+  // name: "NewAccessoryList",
   dicts: ['sys_normal_disable'],
+  components:{vueEasyPrint},
   data() {
     return {
       // 遮罩层
@@ -179,6 +268,9 @@ export default {
       },
       // 表单参数
       form: {},
+      openPrint: false,
+      printData:{},
+      printTableData:[],
       // 表单校验
       rules: {
         dictName: [
@@ -194,7 +286,7 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询字典类型列表 */
+    /** 查询列表 */
     getList() {
       this.loading = true;
       listPurchaseAccessory(this.queryParams).then(response => {
@@ -279,10 +371,24 @@ export default {
         }
       });
     },
-
-    /** 采购单按钮 */
+    //获取验收单数据
+    getPrintTable(taskId){ 
+      getAccessoryAcceptanceForm({taskId:taskId}).then(response => {
+          this.printData = response.data;
+          this.printTableData = response.data.partDetailsList;
+        }
+      );
+    },
+    //查看验收单
     handleBuy(row) {
-
+      // this.query.taskId = row.taskId
+      this.getPrintTable(row.taskId)
+      this.openPrint = true
+      this.title = "新购工机具验收单"; 
+    },
+     //打印
+    print(){
+      this.$refs.remarksPrintRef.print();
     },
     /** 新增 */
     handleAccept() {
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
index 88c688af..77dc4bfc 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
@@ -32,6 +32,7 @@
             type="success"
             plain
             size="mini"
+            v-if="!isView"
             @click="handleNotice"
         >通知</el-button>
       </el-col>
@@ -41,6 +42,7 @@
             type="primary"
             plain
             size="mini"
+            v-if="!isView"
             :disabled="multiple"
             @click="handleListCheck"
         >批量验收</el-button>
@@ -82,17 +84,17 @@
           <span v-if="scope.row.status==0">未验收</span>
           <span v-if="scope.row.status==1">已验收</span>
           <span v-if="scope.row.status==2">待通知</span>
-          <span v-if="scope.row.status==3">不通过</span>
+          <span v-if="scope.row.status==3">验收不通过</span>
           <span v-if="scope.row.status==4">已入库</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" v-if="!isView">
         <template slot-scope="scope">
           <el-button
               size="mini"
               type="primary"
               icon="el-icon-edit"
-              v-show="scope.row.status==0 || scope.row.status==3"
+              v-show="scope.row.status==0"
               @click="handleCheck(scope.row)"
           >验收</el-button>
           <!-- <el-button
@@ -295,6 +297,7 @@ export default {
       // 是否显示弹出层
       open: false,
       openAll: false,
+      isView: false,
       // 日期范围
       dateRange: [],
       // 查询参数
@@ -357,6 +360,12 @@ export default {
     const taskId = this.$route.query && this.$route.query.taskId;
     this.taskId = taskId;
     console.log(this.taskId)
+    const isView = this.$route.query && this.$route.query.isView;
+    if(isView && isView=='true'){
+      this.isView = true
+    }else{
+      this.isView = false
+    }
     this.getTaskInfo();
     this.getAllUserList()
     this.getNoticeUserList()
@@ -547,7 +556,7 @@ export default {
           updatePurchaseCheckDetails(equipments).then(response => {
               if(response.code == 200){
                 this.$message({
-                  message: '验收成功',
+                  message: '操作成功',
                   type: 'success'
                 })
                 this.open = false;
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
index 6784c8a2..1a0eeed3 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
@@ -77,6 +77,7 @@
               size="mini"
               type="primary"
               icon="el-icon-edit"
+              v-if="scope.row.bindNum<scope.row.purchaseNum"
               @click="handleCode(scope.row)"
           >绑定编码</el-button>
           <!-- <el-button
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
index 517c44d4..3d09e1ff 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
@@ -93,6 +93,13 @@
       
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
         <template slot-scope="scope">
+          <el-button
+              size="mini"
+              plain
+              icon="el-icon-zoom-in"
+              @click="handleView(scope.row)"
+              v-if="scope.row.taskStatus!=24"
+          >查看</el-button>
           <el-button
               size="mini"
               type="primary"
@@ -257,11 +264,11 @@
 
 <script>
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-import { listPurchaseCheckInfo,getPurchaseCheckInfo } from "@/api/store/newBuy";
+import { listPurchaseCheckInfo,getPurchaseCheckInfo,getAcceptanceForm } from "@/api/store/newBuy";
 import vueEasyPrint from 'vue-easy-print';
 
 export default {
-  name: "NewDevicesList",
+  // name: "NewDevicesList",
   dicts: ['sys_normal_disable'],
   components:{vueEasyPrint},
   data() {
@@ -359,6 +366,11 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.$tab.closeOpenPage({ path: "/store/newBuy/newDevicesArrival"});
+    },
+    /** 查看按钮操作 */
+    handleView(row) {
+      let query = { taskId:row.taskId,isView:true }
+      this.$tab.closeOpenPage({ path: "/store/newBuy/newDevicesAccept", query });
     },
      /** 修改按钮操作 */
      handleUpdate(row) {
@@ -416,7 +428,7 @@ export default {
 
     //获取验收单数据
     getPrintTable(taskId){ 
-      getPurchaseCheckInfo({taskId:taskId}).then(response => {
+      getAcceptanceForm({taskId:taskId}).then(response => {
           this.printData = response.data;
           this.printTableData = response.data.checkDetailsList;
         }
@@ -427,7 +439,7 @@ export default {
       // this.query.taskId = row.taskId
       this.getPrintTable(row.taskId)
       this.openPrint = true
-      this.title = "宁夏送变电工程有限公司"; 
+      this.title = "新购工机具验收单"; 
     },
      //打印
     print(){
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
index 00ed316f..acb72eb3 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
@@ -267,10 +267,11 @@
           <template slot-scope="scope">
             <span v-if="scope.row.status=='0'">未入库</span>
             <span v-if="scope.row.status=='1'">已入库</span>
+            <span v-if="scope.row.status=='2'">已驳回</span>
           </template>
         </el-table-column>
 
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="showHandle">
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="showHandle" width="150">
           <template slot-scope="scope">
             <el-button
               size="mini"
@@ -319,16 +320,16 @@
           </div>
           <div class="info" style="margin-top: 10px;display: flex;flex-wrap: wrap;">
             <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
-              <span>工程名称：</span>{{ printData.unitName }}
+              <span>工程名称：</span>
             </div>
             <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
-              <span>日期：</span>{{ printData.proName }}
+              <span>日期：</span>
             </div>
             <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
-              <span>领料单号</span>{{ printData.updateTimes }}
+              <span>领料单号</span>
             </div>
             <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
-              <span>车辆信息：</span>{{ printData.agreementCode }}
+              <span>车辆信息：</span>
             </div>
           </div>
           <el-table :data="printTableData" class="table" style="margin-top: 20px;;padding-bottom: 1px;padding-right:1px;" border>
@@ -383,7 +384,7 @@ import { getRepairedDetailList, inputByType } from "@/api/store/warehousing";
 import { getPutInList,getPutinDetailsList ,changePutinStatus,warehousingEntry} from "@/api/store/newBuy";
 import vueEasyPrint from 'vue-easy-print';
 export default {
-  name: "NewDevicesWarehousing",
+  // name: "NewDevicesWarehousing",
   dicts: ['sys_normal_disable'],
   components:{vueEasyPrint},
   data() {
diff --git a/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue b/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
index b2222d8c..99eec688 100644
--- a/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
+++ b/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
@@ -131,6 +131,13 @@
             @click="handleUpdate(scope.row)"
             v-if="scope.row.taskStatus==69"
           >审核</el-button>
+          <el-button
+            size="mini"
+            type="info"
+            icon="el-icon-edit"
+            v-if="scope.row.taskStatus==70"
+            @click="handlePrint(scope.row)"
+          >入库单</el-button>
           <!--          <el-button-->
           <!--            size="mini"-->
           <!--            type="text"-->
@@ -257,7 +264,7 @@
           </template> -->
         </el-table-column>
 
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="showHandle">
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="showHandle" width="150">
           <template slot-scope="scope">
             <el-button
               size="mini"
@@ -289,23 +296,86 @@
         :limit.sync="query.pageSize"
         @pagination="getDialogTable"
       />
-
-
-
-     
     </el-dialog>
+
+    <!-- 入库单弹窗 -->
+    <el-dialog  :visible.sync="openPrint" width="900px" append-to-body>
+      <div style="height: 400px;overflow-y: scroll;">
+        <vue-easy-print tableShow ref="remarksPrintRef" class="print">
+
+        <div class="title" style="text-align: center;font-weight: 600;font-size: 16px;">
+        入库单
+        </div>
+        <div class="info" style="margin-top: 10px;display: flex;flex-wrap: wrap;">
+          <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
+            <span>工程名称：</span>
+          </div>
+          <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
+            <span>日期：</span>
+          </div>
+          <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
+            <span>领料单号</span>
+          </div>
+          <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
+            <span>车辆信息：</span>
+          </div>
+        </div>
+        <el-table :data="printTableData" class="table" style="margin-top: 20px;;padding-bottom: 1px;padding-right:1px;" border>
+          <!--          <el-table-column type="selection" width="55" align="center" />-->
+          <el-table-column label="序号" align="center" type="index" />
+          <el-table-column label="类型名称" align="center" prop="typeName"  />
+          <el-table-column label="规格型号" align="center" prop="specificationType"  />
+          <el-table-column label="计量单位" align="center" prop="" />
+          <el-table-column label="数量" align="center" prop="checkNum" />
+          <el-table-column label="备注" align="center" prop="remark" />
+          <!-- <el-table-column label="出库方式" align="center" prop="manageTypeName"  /> -->
+
+        </el-table>
+
+        <div class="fillIn" style="margin-top: 20px;display: flex;justify-content: space-between;">
+          <div class="item" style="width: 25%;">
+            <span>审核：</span>
+          </div>
+          
+          <div class="item" style="width: 25%;">
+            <span>库管员：</span>
+          </div>
+          <div class="item" style="width: 25%;">
+            <span>经办人：</span>
+          </div>
+          <div class="item" style="width: 25%;">
+            <!-- <span>经办人：</span> -->
+          </div>
+        </div>
+
+      </vue-easy-print>
+      </div>
+     
+
+    
+
+
+    <div slot="footer" class="dialog-footer" style="text-align: center">
+      <el-button type="primary" @click="print">打 印</el-button>
+      <el-button @click="openPrint = false">关 闭</el-button>
+    </div>
+  </el-dialog>
+
+
+
   </div>
 </template>
 
 <script>
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
 import { getRepairedList, getRepairedDetailList, inputByType,getTypeList } from "@/api/store/warehousing";
-import { getPurchaseAccessoryPutInList,getPartList,getAccessoryPutInDetailList,checkInputAccessory } from "@/api/store/newBuy";
-
+import { getPurchaseAccessoryPutInList,getPartList,getAccessoryPutInDetailList,checkInputAccessory,accessoryWarehousingEntry } from "@/api/store/newBuy";
+import vueEasyPrint from 'vue-easy-print';
 
 export default {
-  name: "AccessoryWarehousing",
+  // name: "AccessoryWarehousing",
   dicts: ['sys_normal_disable'],
+  components:{vueEasyPrint},
   data() {
     return {
       // 遮罩层
@@ -350,6 +420,9 @@ export default {
       },
       // 表单参数
       form: {},
+      openPrint: false,
+      printData:{},
+      printTableData:[],
       // 表单校验
       rules: {
         dictName: [
@@ -573,6 +646,27 @@ export default {
         }
       });
     },
+
+
+    //获取入库单数据
+    getPrintTable(taskId){ 
+      accessoryWarehousingEntry({taskId:taskId}).then(response => {
+          this.printTableData = response.data;
+          // this.dialogTotal = response.total; 
+        }
+      );
+    },
+    //查看入库单
+    handlePrint(row) {
+      this.query.taskId = row.taskId
+      this.getPrintTable(row.taskId)
+      this.openPrint = true
+      this.title = "入库单"; 
+    },
+     //打印
+    print(){
+      this.$refs.remarksPrintRef.print();
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       // const dictIds = row.dictId || this.ids;
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index c71e96bf..72cdd453 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -38,9 +38,11 @@ module.exports = {
         //  target:  `http://112.29.103.165:21626`,//线上环境-重庆
         // target: `http://112.29.103.165:21624`,//线上环境-宁夏
         // target: `http://192.168.0.14:21624`,//线上环境
-        // target: `http://10.40.92.21:8080`,//超
-        target: `http://10.40.92.12:8080`,//韩
-        // target: `http://10.40.92.220:8080`,//川
+        // target: `http://1.12.248.179:23028`,//线上环境-南网
+        // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
+        target: `http://10.40.92.14:8080`,//超
+        // target: `http://10.40.92.4:8080`,//韩
+        // target: `http://10.40.92.222:8080`,//川
 
         changeOrigin: true,
         pathRewrite: {