diff --git a/sgzb-ui/package.json b/sgzb-ui/package.json
index 680f403b..983fed2a 100644
--- a/sgzb-ui/package.json
+++ b/sgzb-ui/package.json
@@ -5,7 +5,7 @@
   "author": "机具",
   "license": "MIT",
   "scripts": {
-    "dev": "vue-cli-service serve",
+    "dev": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
     "build": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
index ab8a9af3..72cc5164 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
@@ -157,6 +157,17 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="协议类型" prop="protocol">
+          <el-select v-model="form.protocol" placeholder="请选择协议类型" style="width: 100%;" >
+            <el-option
+              v-for="item in protocolList"
+              :key="item.protocolId"
+              :label="item.protocolName"
+              :value="item.protocolId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        
         <el-form-item label="开始日期" prop="planStartTime">
           <el-date-picker
               style="width:100%;"
@@ -248,6 +259,8 @@ export default {
        projectList: [],
       // 表格数据
       agreementList: [],
+
+      protocolList: [{protocolId:1,protocolName:'内部单位'},{protocolId:2,protocolName:'外部单位' }],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -316,22 +329,12 @@ export default {
         this.unitList =  response.data;
         })
     },
-    // selecUnit(id){
-    //   this.agreementList.forEach(item => {
-    //     if(item.id == id){
-    //       this.form.typeName = item.name
-    //     }
-    //   });
-    // },
     getProjectList(){
       getProjectList().then(response => {
         this.projectList =  response.data;
         })
     },
     
-
-
-
     /** 查询字典类型列表 */
     getList() {
       this.loading = true;
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
index fabd12a4..47976883 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container" id="receiveApply">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="申请日期" prop="dictName">
+      <el-form-item label="申请日期">
         <el-date-picker
           v-model="queryParams.time"
           type="daterange"
@@ -11,7 +11,7 @@
           end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="往来单位" prop="dictName">
+      <el-form-item label="往来单位">
         <el-select  v-model="queryParams.unitId" clearable @change="GetProData" style="width: 240px" placeholder="请选择">
           <el-option
             v-for="item in unitList"
@@ -21,7 +21,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="工程名称" prop="dictName">
+      <el-form-item label="工程名称">
         <el-select  v-model="queryParams.proId" clearable @change="GetUnitData" style="width: 240px" placeholder="请选择">
           <el-option
             v-for="item in proList"
@@ -31,9 +31,9 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="关键字" prop="dictName">
+      <el-form-item label="关键字" prop="keyWord">
         <el-input
-          v-model="queryParams.dictName"
+          v-model="queryParams.keyWord"
           placeholder="请输入关键字"
           clearable
           :maxlength="20"
@@ -150,45 +150,7 @@
       :page-sizes="[5,10,15,20,30]"
       @pagination="getList"
     />
-
-    <!-- 新增编辑弹窗 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="往来单位:" prop="dictName">
-          <el-input v-model="form.dictName" placeholder="请输入往来单位" />
-        </el-form-item>
-        <el-form-item label="工程名称" prop="dictName">
-          <el-input v-model="form.dictName" placeholder="请输入工程名称" />
-        </el-form-item>
-        <el-form-item label="开始日期" prop="dictName">
-          <el-input v-model="form.dictName" placeholder="请输入开始日期" />
-        </el-form-item>
-        <el-form-item label="租赁期限" prop="dictName">
-          <el-input-number v-model="form.dictName" style="width:100%;" controls-position="right" :min="0" />
-        </el-form-item>
-        <el-form-item label="授权人" prop="dictName">
-          <el-input v-model="form.dictName" placeholder="请输入授权人" />
-        </el-form-item>
-        <el-form-item label="授权人" prop="dictName">
-          <el-input v-model="form.dictName" placeholder="请输入授权人" />
-        </el-form-item>
-        <el-form-item label=" 联系方式" prop="dictName">
-          <el-input v-model="form.dictName" placeholder="请输入联系方式" />
-        </el-form-item>
-
-        <el-form-item label="合同照片" prop="dictName">
-          <el-input v-model="form.dictName" placeholder="图片上传" />
-        </el-form-item>
-        <el-form-item label="备注" prop="dictName">
-          <el-input v-model="form.dictName" type="textarea" placeholder="图片上传" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
+ 
 
 
   </div>
@@ -218,10 +180,6 @@ export default {
       total: 0,
       // 字典表格数据
       leaseAuditList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 日期范围
       dateRange: [],
       // 查询参数
@@ -237,31 +195,7 @@ export default {
         proId:null, //工程id
 
         types: 1, // 1申请列表 2审核列表
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        dictName: [
-          { required: true, message: "字典名称不能为空", trigger: "blur" }
-        ],
-        dictType: [
-          { required: true, message: "字典类型不能为空", trigger: "blur" }
-        ]
-      },
-      peopleOpen:false,
-      noticeOpen:false,
-      nform:{
-        notice:''
-      },
-      nrules: {
-        notice: [
-          { required: true, message: "通知内容不能为空", trigger: "blur" }
-        ]
-      },
-      deptName: undefined,
-
-
+      }, 
       unitList:[], //来往单位集合
       proList:[], //工程集合
     };
@@ -279,7 +213,7 @@ export default {
       const params = {
         unitId:this.queryParams.unitId,
         projectId:this.queryParams.proId,
-        keyWord:this.queryParams.dictName,
+        keyWord:this.queryParams.keyWord,
         startTime:this.queryParams.time && this.queryParams.time[0],
         endTime:this.queryParams.time && this.queryParams.time[1],
         types:this.queryParams.types,
@@ -314,11 +248,7 @@ export default {
       console.log('GetProData ======================',res)
     },
 
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
+  
     // 表单重置
     reset() {
       this.form = {
@@ -341,9 +271,7 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    handleNotice(){
-      this.noticeOpen = true;
-    },
+ 
     /** 新增按钮操作 */
     handleAdd() {
       this.$tab.closeOpenPage({
@@ -379,26 +307,7 @@ export default {
         }
       })
     },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.dictId != undefined) {
-            updateType(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addType(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
+ 
     /** 删除按钮操作 */
     async handleDelete(row) {
 
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
index 278ee3b5..c9946453 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
@@ -67,6 +67,15 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-back"
+          size="mini"
+          @click="handleBack"
+        >领料申请</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -78,15 +87,7 @@
           @click="handleAdd"
         >保存</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-back"
-          size="mini"
-          @click="handleBack"
-        >领料申请</el-button>
-      </el-col>
+    
       <!-- <el-col :span="1.5">
         <el-button
           type="warning"
@@ -568,14 +569,14 @@ export default {
     },
    
     checkNum(row){
-      if(row.preNum>=1){
+      if(row.preNum>=0){
         if(row.preNum>=row.num){
           row.preNum = row.num
         }else{
           row.preNum = row.preNum
         }
       }else{
-        row.preNum = 1
+        row.preNum = 0
       }
     },
     /////// 设备类型树  切换
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
index fa6fd9f5..0a32160f 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
@@ -163,7 +163,7 @@
             <span>编号：</span>{{ leaseApplyData.code }}
           </div>
         </div>
-        <el-table :data="leaseApplyDetails" class="table" border style="margin-top: 20px;">
+        <el-table :data="leaseApplyDetails" class="table" border style="margin-top: 20px;padding: 1px">
           <!--          <el-table-column type="selection" width="55" align="center" />-->
           <el-table-column label="序号" align="center" type="index" />
           <el-table-column label="类型名称" align="center" prop="typeName"  />
diff --git a/sgzb-ui/src/views/claimAndRefund/return/dialogForm.vue b/sgzb-ui/src/views/claimAndRefund/return/dialogForm.vue
index 11a1755f..ca7529b3 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/dialogForm.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/dialogForm.vue
@@ -28,7 +28,7 @@
             </div>
           </div>
         </div>
-        <el-table :data="tableData" border style="width: 100%">
+        <el-table :data="tableData" border style="width: 100%;margin-bottom: 10px;padding: 2px;">
           <el-table-column label="编号" align="center" type="index" />
           <el-table-column
             label="类型名称"
@@ -76,7 +76,7 @@
         <div class="remarks_box">
           <div class="remarks_box_title">退料编码明细</div>
         </div>
-        <el-table :data="tableData" border style="width: 100%">
+        <el-table :data="tableData" border style="width: 100%;margin-bottom: 10px;padding: 2px;">
           <el-table-column label="序号" align="center" prop="dictId" />
           <el-table-column prop="name" label="名称" align="center">
           </el-table-column>
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
index 05601699..15296b09 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
@@ -99,16 +99,6 @@
     </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="success"
@@ -119,6 +109,17 @@
           >退料管理</el-button
         >
       </el-col>
+      <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"
@@ -771,10 +772,10 @@ export default {
     },
 
     checkNum(row){
-      if(row.num>=1){
+      if(row.num>=0){
         row.num = row.num
       }else{
-        row.num = 1
+        row.num = 0
       }
       // if(row.num>=0){
       //   if(row.num>=row.preNum){
diff --git a/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue b/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue b/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
new file mode 100644
index 00000000..67fad671
--- /dev/null
+++ b/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
@@ -0,0 +1,298 @@
+<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
+                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"
+          >批量结算</el-button>
+        </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"/>
+        <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" width="300" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button 
+                size="mini"
+                type="primary" 
+                icon="el-icon-edit"
+                @click="handleApply(scope.row)"
+            >结算申请</el-button>
+            <el-button
+              size="mini"
+              type="danger" 
+              icon="el-icon-delete"
+              @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"
+      />
+  
+    </div>
+  </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";
+  
+  
+  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();
+      },
+      //结算申请
+      handleApply(row){
+        this.$tab.closeOpenPage({
+            path:'/cost/cost/costApplyAdd',
+            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/costExame.vue b/sgzb-ui/src/views/cost/csotSettlement/costExame.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/sgzb-ui/src/views/cost/csotSettlement/costList.vue b/sgzb-ui/src/views/cost/csotSettlement/costList.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/sgzb-ui/src/views/index.vue b/sgzb-ui/src/views/index.vue
index 0f569fae..030eaa79 100644
--- a/sgzb-ui/src/views/index.vue
+++ b/sgzb-ui/src/views/index.vue
@@ -115,7 +115,7 @@
       <el-table-column label="待办事件" align="center" prop="taskEvent">
        
       </el-table-column>
-      <el-table-column label="任务创建人" align="center" prop="createBy" :show-overflow-tooltip="true" />
+      <el-table-column label="任务创建人" align="center" prop="createName" :show-overflow-tooltip="true" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
diff --git a/sgzb-ui/src/views/repairTest/brokenExamine/index.vue b/sgzb-ui/src/views/repairTest/brokenExamine/index.vue
index 9e46dc42..e80fd8fc 100644
--- a/sgzb-ui/src/views/repairTest/brokenExamine/index.vue
+++ b/sgzb-ui/src/views/repairTest/brokenExamine/index.vue
@@ -337,7 +337,8 @@
         </el-row>
       </el-form>
 
-      <el-table v-loading="loading" :data="dialogList" height="500px">
+      <el-table v-loading="loading" :data="dialogList" height="500px" @selection-change="handleDialogSelectionChange">
+        <el-table-column type="selection" width="55" align="center" :selectable="selectableDialog"/>
         <el-table-column label="序号" sortable align="center" type="index" />
         <el-table-column
           label="类型名称"
@@ -354,7 +355,7 @@
         <el-table-column
           label="编码"
           align="center"
-          prop="dictName"
+          prop="maCode" width="200"
           :show-overflow-tooltip="true"
         />
         <!-- <el-table-column
@@ -375,6 +376,28 @@
           prop="scrapNum"
           :show-overflow-tooltip="true"
         />
+        <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=='2'">驳回</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="上级"
+          align="center"
+          prop="scrapSource"
+          :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span v-if="scope.row.scrapSource=='1'">退料</span>
+            <span v-if="scope.row.scrapSource=='2'">维修审核</span>
+            <span v-if="scope.row.scrapSource=='3'">盘点</span>
+          </template>
+        </el-table-column>
       </el-table>
       <pagination
         v-show="dialogTotal > 0"
@@ -390,8 +413,8 @@
         style="text-align: center"
         v-if="type == 'update' && dialogList.length !== 0"
       >
-        <el-button type="primary" @click="submitForm(1)">通过</el-button>
-        <el-button @click="returnSubmit(1)">不通过</el-button>
+        <el-button type="primary" @click="submitForm(1)" :disabled="dialogMultiple">通过</el-button>
+        <el-button @click="returnSubmit(1)" :disabled="dialogMultiple">不通过</el-button>
       </div>
     </el-dialog>
     <el-dialog
@@ -517,10 +540,15 @@ export default {
       loading: false,
       // 选中数组
       ids: [],
+      dialogIds: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
       multiple: true,
+      // 非单个禁用
+      dialogSingle: true,
+      // 非多个禁用
+      dialogMultiple: true,
       // 显示搜索条件
       showSearch: true,
       // 总条数
@@ -679,6 +707,13 @@ export default {
         return false
       }
     },
+    selectableDialog(row){
+      if(row.status=='0'){
+        return true
+      }else{
+        return false
+      }
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.selectionList = selection
@@ -687,6 +722,12 @@ export default {
       this.single = selection.length != 1
       this.multiple = !selection.length
     },
+    handleDialogSelectionChange(selection) {
+      this.dialogIds = selection.map(item => item)
+      this.dialogSingle = selection.length != 1
+      this.dialogMultiple = !selection.length
+      console.log(this.checkResultOne)
+    },
     handleSee(row, type) {
       this.dialogTitle = '查看'
       this.rowObj = row
@@ -720,7 +761,8 @@ export default {
         taskIdList.push(this.rowObj.taskId)
         let params = {
           checkResult: '通过',
-          taskIdList: taskIdList
+          taskIdList: taskIdList,
+          scrapDetailList: this.dialogIds 
         }
         addDetailsAuditApi(params).then(res => {
           this.openTwo = true
@@ -776,6 +818,7 @@ export default {
             let params = {
               checkResult: '不通过',
               taskIdList: taskIdList,
+              scrapDetailList: this.dialogIds,
               remark: this.form.remark
             }
             addDetailsAuditApi(params).then(res => {
diff --git a/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue b/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue
index bf8de89e..981dbb14 100644
--- a/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue
+++ b/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue
@@ -74,7 +74,7 @@
         ref="dynamicValidateFormTwo"
         :model="dynamicValidateFormTwo"
         class="demo-dynamic"
-        label-width="90px"
+        label-width="100px"
       >
         <p class="form_box_title">数量管理设备</p>
         <div class="form_box_line"></div>
diff --git a/sgzb-ui/src/views/repairTest/repair/index.vue b/sgzb-ui/src/views/repairTest/repair/index.vue
index 25dfff5d..9f00acf9 100644
--- a/sgzb-ui/src/views/repairTest/repair/index.vue
+++ b/sgzb-ui/src/views/repairTest/repair/index.vue
@@ -391,7 +391,7 @@
           label="编码"
           sortable
           align="center"
-          prop="code"
+          prop="code" width="200"
           :show-overflow-tooltip="true"
         />
         <el-table-column
diff --git a/sgzb-ui/src/views/repairTest/testExamine/index.vue b/sgzb-ui/src/views/repairTest/testExamine/index.vue
index c31d53fa..71faaedf 100644
--- a/sgzb-ui/src/views/repairTest/testExamine/index.vue
+++ b/sgzb-ui/src/views/repairTest/testExamine/index.vue
@@ -337,7 +337,8 @@
         </el-row>
       </el-form>
 
-      <el-table v-loading="loading" :data="dialogList" height="500px">
+      <el-table v-loading="loading" :data="dialogList" height="500px" @selection-change="handleDialogSelectionChange">
+        <el-table-column type="selection" width="55" align="center" :selectable="selectableDialog"/>
         <el-table-column label="序号" sortable align="center" type="index" />
         <el-table-column
           label="类型名称"
@@ -354,7 +355,7 @@
         <el-table-column
           label="编码"
           align="center"
-          prop="maCode"
+          prop="maCode" width="200"
           :show-overflow-tooltip="true"
         />
         <el-table-column
@@ -375,6 +376,17 @@
           prop="scrapNum"
           :show-overflow-tooltip="true"
         />
+        <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=='2'">驳回</span>
+          </template>
+        </el-table-column>
       </el-table>
       <pagination
         v-show="dialogTotal > 0"
@@ -390,8 +402,8 @@
         style="text-align: center"
         v-if="type == 'update' && dialogList.length !== 0"
       >
-        <el-button type="primary" @click="submitForm(1)">通过</el-button>
-        <el-button @click="returnSubmit(1)">不通过</el-button>
+        <el-button type="primary" @click="submitForm(1)" :disabled="dialogMultiple">通过</el-button>
+        <el-button @click="returnSubmit(1)" :disabled="dialogMultiple">不通过</el-button>
       </div>
     </el-dialog>
     <el-dialog
@@ -517,10 +529,15 @@ export default {
       loading: false,
       // 选中数组
       ids: [],
+      dialogIds: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
       multiple: true,
+       // 非单个禁用
+      dialogSingle: true,
+      // 非多个禁用
+      dialogMultiple: true,
       // 显示搜索条件
       showSearch: true,
       // 总条数
@@ -678,6 +695,13 @@ export default {
         return false
       }
     },
+    selectableDialog(row){
+      if(row.status=='0'){
+        return true
+      }else{
+        return false
+      }
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.selectionList = selection
@@ -688,6 +712,12 @@ export default {
       // console.log(this.checkResultOne)
       console.log(this.checkResultOne)
     },
+    handleDialogSelectionChange(selection) {
+      this.dialogIds = selection.map(item => item)
+      this.dialogSingle = selection.length != 1
+      this.dialogMultiple = !selection.length
+      console.log(this.checkResultOne)
+    },
     handleSee(row, type) {
       this.dialogTitle = '查看'
       this.rowObj = row
@@ -721,8 +751,10 @@ export default {
         taskIdList.push(this.rowObj.taskId)
         let params = {
           checkResult: '通过',
-          taskIdList: taskIdList
+          taskIdList: taskIdList,
+          auditDetailList : this.dialogIds
         }
+        // console.log(params)
         addDetailsAuditApi(params).then(res => {
           this.openTwo = true
           this.open = false
@@ -777,6 +809,7 @@ export default {
             let params = {
               checkResult: '不通过',
               taskIdList: taskIdList,
+              auditDetailList: this.dialogIds,
               remark: this.form.remark
             }
             addDetailsAuditApi(params).then(res => {
diff --git a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue
index 07c76133..a58de543 100644
--- a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue
+++ b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue
@@ -8,6 +8,7 @@
                 style="width: 240px"
                 value-format="yyyy-MM-dd"
                 type="date"
+                :disabled="isCheck||isView"
                 range-separator="-"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
@@ -19,13 +20,14 @@
                 style="width: 240px"
                 value-format="yyyy-MM-dd"
                 type="date"
+                :disabled="isCheck||isView"
                 range-separator="-"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
             ></el-date-picker>
           </el-form-item>
           <el-form-item label="采购员" prop="purchaser">
-            <el-select v-model="maForm.purchaser" placeholder="请选择采购员" style="width: 100%;">
+            <el-select v-model="maForm.purchaser" placeholder="请选择采购员" style="width: 100%;" :disabled="isCheck||isView">
               <el-option label="请选择" :value="0" ></el-option>
               <el-option
                 v-for="item in userList"
@@ -39,7 +41,7 @@
             <el-input
                 v-model="maForm.remark"
                 placeholder="请输入备注"
-                clearable
+                clearable :disabled="isCheck||isView"
                 type="textarea"
                 style="width: 240px"
             />
@@ -50,14 +52,14 @@
     <el-form :model="addForm" ref="addForm" size="small" :inline="true" v-show="showSearch">
       <el-row>
         <el-form-item label="配件类型" prop="equipmentId">
-          <treeselect v-model="addForm.equipmentId" default-expand-all :options="equipmentTypeList" :disable-branch-nodes="true" placeholder="请选择机具类型" @select="select" style="width: 240px;"/>
+          <treeselect v-model="addForm.equipmentId" default-expand-all :options="equipmentTypeList" :disable-branch-nodes="true" placeholder="请选择机具类型" @select="select" :disabled="isCheck||isView" style="width: 240px;"/>
            
         </el-form-item>
         <el-form-item label="配件厂家" prop="supplierId">
           <el-select
             v-model="addForm.supplierId"
             placeholder="配件厂家"
-            clearable
+            clearable :disabled="isCheck||isView"
             style="width: 240px"
             @change="changeSupplier"
           >
@@ -73,6 +75,15 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-back"
+          size="mini"
+          @click="jumpList" 
+        >新购配件管理</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -85,12 +96,14 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
+          type="primary"
           plain
-          icon="el-icon-back"
+          icon="el-icon-plus"
           size="mini"
-          @click="jumpList" 
-        >新购配件管理</el-button>
+          v-if="isCheck"
+          :disabled="multiple"
+          @click="handleListCheck" 
+        >批量验收</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -115,14 +128,14 @@
     </el-row>
 
     <el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center" :selectable="selectable"/>
       <el-table-column label="序号" align="center" width="100" type="index"/>
       <el-table-column label="配件名称" align="center" prop="machineTypeName" :show-overflow-tooltip="true"   />
       <el-table-column label="配件规格" align="center" prop="specificationType" :show-overflow-tooltip="true" />
       <el-table-column label="计量单位" align="center" prop="unitName"  />
-      <el-table-column label="购置单位（元)" align="center" prop="purchasePrice">
+      <el-table-column label="购置单价（元)" align="center" prop="purchasePrice">
         <template slot-scope="scope">
-          <el-input-number  v-model="scope.row.purchasePrice" controls-position="right" :disabled="isCheck||isView" style="width: 100%;" :min="1"></el-input-number>
+          <el-input-number  v-model="scope.row.purchasePrice" controls-position="right" :disabled="isCheck||isView" style="width: 100%;" :min="0"></el-input-number>
         </template>
       </el-table-column>
 
@@ -188,7 +201,38 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
- 
+    
+
+    <!-- 批量验收弹窗 -->
+    <el-dialog :title="title" :visible.sync="openAll" width="650px" append-to-body>
+      <el-form ref="aform" :model="aform" :rules="arules" label-width="120px">
+      
+        <el-form-item label="验收结论" prop="checkResult">
+          <el-radio v-model="aform.checkResult" label="通过">通过</el-radio>
+          <el-radio v-model="aform.checkResult" label="不通过">不通过</el-radio>
+        </el-form-item>
+        <!-- <el-form-item label="验收图片" prop="checkUrl">
+          <el-upload 
+                :http-request="(obj) => imgUpLoad(obj,'fileUrl')"
+                action="#" 
+                :file-list="fileList"
+                :show-file-list="false"
+                list-type="picture-card"
+                accept=".png,.jpg,.jpeg"
+                :on-success="handleAvatarSuccess"
+                :on-preview="handlePictureCardPreview"
+                :on-remove="handleRemove">
+                <img v-if="imageUrl" :src="uploadUrl+imageUrl" style="width: 140px;height: 140px;" class="avatar">
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
+        </el-form-item> -->
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button type="primary" @click="submitListForm">确 定</el-button>
+        <el-button @click="openAll=false">取 消</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -252,6 +296,20 @@ export default {
         purchaser:'',
         remark:'',
       },
+      openAll: false,
+      // 表单参数
+      aform: {},
+      // 表单校验
+      arules: {
+        checkResult: [
+          { required: true, message: "验收结论不能为空", trigger: "blur" }
+        ],
+        checkUrl: [
+          { required: true, message: "验收图片不能为空", trigger: "blur" }
+        ],
+      },
+
+
       rules: {
         checkResult: [
           { required: true, message: "验收结论不能为空", trigger: "blur" }
@@ -331,8 +389,10 @@ export default {
                       item3.machineTypeName = item2.label
                       item3.specificationType = item3.label
                       item3.partId = item3.id
-                      item3.purchasePrice = 1
-                      item3.purchaseNum = 1
+                      // item3.purchasePrice = 1
+                      // item3.purchaseNum = 1
+                      this.$set(item3, 'purchasePrice', 0);
+                      this.$set(item3, 'purchaseNum', 1);
                 })
               }
             })
@@ -351,7 +411,9 @@ export default {
                 break;
             }
         } 
-        this.$set(row, 'supplierId', this.addForm.supplierId);
+        this.$set(row, 'supplierId', '');
+        this.$set(row, 'purchasePrice', 0);
+        this.$set(row, 'purchaseNum', 1);
         this.equipmentList.unshift(row)
       }
     },
@@ -478,10 +540,18 @@ export default {
      
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.roleId)
+      this.ids = selection.map(item => item)
       this.single = selection.length!=1
       this.multiple = !selection.length
     },
+    //验收后禁止勾选
+    selectable(row,index) {
+      if(row.status==0){
+        return true
+      }else{
+        return false 
+      }
+    },
     /** 验收按钮操作 */
     handleCheck(row) {
       console.log(row)
@@ -512,9 +582,47 @@ export default {
         }
       });
     }, 
+    /** 批量验收按钮操作 */
+    handleListCheck() {
+      // console.log(this.ids)
+
+      this.aform = {
+        checkResult:'通过',
+        checkUrl:'',
+        checkUrlName:'',
+      };
+      this.imageUrl = ''
+      this.openAll = true;
+      this.title = "批量验收";
+    },
+    submitListForm: function() {
+      console.log(this.aform)
+      this.ids.forEach(item=>{
+        item.checkNum = item.purchaseNum
+        item.checkResult = this.aform.checkResult
+      })
+      console.log(this.ids)
+      let equipments = this.ids
+      console.log(equipments)
+      this.$refs["aform"].validate(valid => {
+        if (valid) {
+          checkPurchaseAccessory(equipments).then(response => {
+              if(response.code == 200){
+                this.$message({
+                  message: '验收成功',
+                  type: 'success'
+                })
+                this.openAll = false;
+                this.getTaskInfo();
+              }
+          });
+        }
+      });
+    },
+
     /** 导出按钮操作 */
     handleExport() {
-      // this.download('system/role/export', {
+      // this.download('material/purchaseAccessory/export', {
       //   ...this.addForm
       // }, `role_${new Date().getTime()}.xlsx`)
     }
diff --git a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue
index 14a30f5f..0ca6521c 100644
--- a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="app-container" id="newAccessoryList">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="名称" prop="dictName">
+      <el-form-item label="关键字" prop="keyWord">
         <el-input
-          v-model="queryParams.dictName"
-          placeholder="请输入名称"
+          v-model="queryParams.keyWord"
+          placeholder="请输入关键字"
           clearable
           style="width: 240px"
           @keyup.enter.native="handleQuery"
@@ -300,9 +300,9 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      // this.download('system/dict/type/export', {
-      //   ...this.queryParams
-      // }, `type_${new Date().getTime()}.xlsx`)
+      this.download('material/purchaseAccessory/export', {
+        ...this.queryParams
+      }, `新购配件_${new Date().getTime()}.xlsx`)
     },
     /** 刷新缓存按钮操作 */
     handleRefreshCache() {
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
index b4f015bb..977795a4 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
@@ -23,18 +23,19 @@
             type="success"
             plain
             size="mini"
-            @click="handleNotice"
-        >通知</el-button>
+            icon="el-icon-back"
+            @click="jumpList"
+        >新购验收管理</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
             type="success"
             plain
             size="mini"
-            icon="el-icon-back"
-            @click="jumpList"
-        >新购验收管理</el-button>
+            @click="handleNotice"
+        >通知</el-button>
       </el-col>
+     
       <el-col :span="1.5">
         <el-button
             type="primary"
@@ -635,7 +636,6 @@ export default {
     },
     //验收后禁止勾选
     selectable(row,index) {
-      console.log(row)
       if(row.status==0){
         return true
       }else{
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
index 2416af1d..401f61e5 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
@@ -97,6 +97,15 @@
       </el-row>
     </el-form>
     <el-row :gutter="10" class="mb8">
+      <el-col :span="2">
+        <el-button
+            type="success"
+            plain
+            icon="el-icon-back"
+            size="mini"
+            @click="jumpList"
+        >新购验收管理</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
             type="primary"
@@ -106,15 +115,7 @@
             @click="handleSave"
         >保存</el-button>
       </el-col>
-      <el-col :span="3">
-        <el-button
-            type="success"
-            plain
-            icon="el-icon-back"
-            size="mini"
-            @click="jumpList"
-        >新购验收管理</el-button>
-      </el-col>
+     
 
 
       
@@ -151,7 +152,7 @@
       <el-table-column label="单位" prop="unitName" width="100" />
       <el-table-column label="购置单价(元)" prop="purchasePrice" align="center"  width="150">
         <template slot-scope="scope">
-          <el-input-number  v-model="scope.row.purchasePrice" controls-position="right" style="width: 100%;" :min="1"></el-input-number>
+          <el-input-number  v-model="scope.row.purchasePrice" controls-position="right" style="width: 100%;" :min="0"></el-input-number>
         </template>
       </el-table-column>
       <el-table-column label="采购数量" prop="purchaseNum" width="150" type="number" maxlength="10">
@@ -356,8 +357,10 @@ export default {
                     item3.children.forEach(item4=>{ 
                       item4.machineTypeName = item3.typeName
                       item4.specificationType = item4.typeName
-                      item4.purchasePrice = 1
-                      item4.purchaseNum = 1
+                      // item4.purchasePrice = 1
+                      // item4.purchaseNum = 1
+                      this.$set(item4, 'purchasePrice', 0);
+                      this.$set(item4, 'purchaseNum', 1);
                     })
                   }
                   
@@ -379,9 +382,10 @@ export default {
                 break;
             }
         }
-        this.$set(row, 'productionTime', this.queryParams.productionTime);
-        this.$set(row, 'supplierId', this.queryParams.supplierId);
-        
+        this.$set(row, 'productionTime', '');
+        this.$set(row, 'supplierId', '');
+        this.$set(row, 'purchasePrice', 0);
+        this.$set(row, 'purchaseNum', 1);
         this.equipmentList.unshift(row)
       }
     },
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
index 6a5d3c7c..517c44d4 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
@@ -193,7 +193,7 @@
             <span>供应商：</span><span v-if="printTableData.length>0">{{ printTableData[0].supplier }}</span> 
           </div>
         </div>
-        <el-table :data="printTableData" class="table" style="margin-top: 20px" border>
+        <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"  />
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
index 08e95529..47572d4c 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
@@ -260,7 +260,7 @@
         <el-table-column label="机具类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
         <el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" />
         <el-table-column label="数量" align="center" prop="checkNum" :show-overflow-tooltip="true" />
-        <el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" />
+        <el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" width="200"/>
  
         <el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" />
         <el-table-column label="状态" align="center" prop="status">
@@ -309,7 +309,7 @@
     </el-dialog>
 
     <!-- 入库单弹窗 -->
-    <el-dialog  :visible.sync="openPrint" width="800px" append-to-body>
+    <el-dialog  :visible.sync="openPrint" width="900px" append-to-body>
       
         <div style="height: 600px;overflow-y: scroll;">
           <vue-easy-print tableShow ref="remarksPrintRef" class="print">
@@ -331,7 +331,7 @@
               <span>车辆信息：</span>{{ printData.agreementCode }}
             </div>
           </div>
-          <el-table :data="printTableData" class="table" style="margin-top: 20px" border>
+          <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"  />
@@ -354,6 +354,9 @@
             <div class="item" style="width: 25%;">
               <span>经办人：</span>
             </div>
+            <div class="item" style="width: 25%;">
+              <!-- <span>经办人：</span> -->
+            </div>
           </div>
 
         </vue-easy-print>
@@ -705,6 +708,10 @@ export default {
 </script>
 <style lang="scss" scoped>
   .print{
+    width: 90%;
+    padding-left: 5%;
+    padding-right:1%;
+
     .title{
       text-align: center;
       font-weight: 600;
diff --git a/sgzb-ui/src/views/store/tools/toolsType.vue b/sgzb-ui/src/views/store/tools/toolsType.vue
index 1eef6ab0..8f4883f1 100644
--- a/sgzb-ui/src/views/store/tools/toolsType.vue
+++ b/sgzb-ui/src/views/store/tools/toolsType.vue
@@ -88,7 +88,7 @@
           <el-table-column label="名称" align="center" key="typeName" prop="typeName" />
           <el-table-column label="计量单位" align="center" key="unitName" prop="unitName"
                            :show-overflow-tooltip="true"/>
-          <el-table-column label="租赁价格" align="center" key="leasePrice" prop="leasePrice"
+          <el-table-column label="内部租赁价" align="center" key="leasePrice" prop="leasePrice"
                            :show-overflow-tooltip="true"/>
           <el-table-column label="原值" align="center" key="buyPrice" prop="buyPrice"
                            :show-overflow-tooltip="true"/>
@@ -208,23 +208,33 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="租赁价格" prop="leasePrice">
+            <el-form-item label="内部租赁价" prop="leasePrice">
               <el-input v-model="form.leasePrice" type="number" placeholder="请输入租赁价格" maxlength="10"/>
             </el-form-item>
           </el-col>
+          
           <el-col :span="12">
-            <el-form-item label="原值" prop="buyPrice">
-              <el-input v-model="form.buyPrice" type="number"  placeholder="请输入用户名称" maxlength="30"/>
+            <el-form-item label="外部租赁价" prop="rentPrice">
+              <el-input  v-model="form.rentPrice" type="number"  placeholder="请输入外部租赁价" maxlength="30"/>
             </el-form-item>
           </el-col>
+          
         </el-row>
 
         <el-row>
+          <el-col :span="12">
+            <el-form-item label="原值" prop="buyPrice">
+              <el-input v-model="form.buyPrice" type="number"  placeholder="请输入原值" maxlength="30"/>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="计量单位" prop="unitName">
               <el-input v-model="form.unitName" placeholder="请输入计量单位" maxlength="11"/>
             </el-form-item>
           </el-col>
+         
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="资产属性" prop="propId">
               <el-select v-model="form.propId" placeholder="请选择资产属性">
@@ -237,13 +247,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="丢失赔偿价" prop="payPrice">
-              <el-input v-model="form.payPrice" type="number" placeholder="请输入丢失赔偿价" maxlength="10"/>
-            </el-form-item>
-          </el-col>
+        
           <el-col :span="12">
             <el-form-item label="库管员" prop="keeperUserId">
               <el-select v-model="form.keeperUserId" placeholder="请选择库管员" filterable>
diff --git a/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue b/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
index 2c6ebf6a..b2222d8c 100644
--- a/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
+++ b/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
@@ -113,8 +113,8 @@
       <el-table-column label="采购员" align="center" prop="purchaserName" :show-overflow-tooltip="true" />
     
 
-      <el-table-column label="提交入库人员" align="center" prop="submitToStoragePersonnel" :show-overflow-tooltip="true" />
-      <el-table-column label="提交入库时间" align="center" prop="submitStorageTime" :show-overflow-tooltip="true" />
+      <el-table-column label="提交入库人员" align="center" prop="createBy" :show-overflow-tooltip="true" />
+      <el-table-column label="提交入库时间" align="center" prop="createTime" :show-overflow-tooltip="true" />
       <el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" />
       <el-table-column label="状态" align="center" prop="taskStatusResult" :show-overflow-tooltip="true" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -212,7 +212,7 @@
           <!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> -->
         </el-form-item>
       </el-form>
-      <el-row :gutter="10" class="mb8">
+      <el-row :gutter="10" class="mb8" v-if="showHandle">
         <el-col :span="1.5">
           <el-button
             type="primary"
@@ -585,9 +585,9 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('material/RepairTestInput/export', {
+      this.download('material/purchaseAccessory/inputExport', {
         ...this.queryParams
-      }, `修试入库_${new Date().getTime()}.xlsx`)
+      }, `配件入库_${new Date().getTime()}.xlsx`)
     },
     /** 刷新缓存按钮操作 */
     handleRefreshCache() {
diff --git a/sgzb-ui/src/views/system/logininfor/index.vue b/sgzb-ui/src/views/system/logininfor/index.vue
index a4967928..d7a6b0e3 100644
--- a/sgzb-ui/src/views/system/logininfor/index.vue
+++ b/sgzb-ui/src/views/system/logininfor/index.vue
@@ -102,6 +102,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="访问编号" align="center" prop="infoId" />
       <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="用户昵称" align="center" prop="nickName" />
       <el-table-column label="地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
       <el-table-column label="登录状态" align="center" prop="status">
         <template slot-scope="scope">
diff --git a/sgzb-ui/src/views/system/notice/index.vue b/sgzb-ui/src/views/system/notice/index.vue
index 19e25a00..59e77ce4 100644
--- a/sgzb-ui/src/views/system/notice/index.vue
+++ b/sgzb-ui/src/views/system/notice/index.vue
@@ -88,7 +88,7 @@
           <dict-tag :options="dict.type.sys_notice_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="创建者" align="center" prop="createBy" width="100" />
+      <el-table-column label="创建者" align="center" prop="nickName" width="100" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
@@ -123,7 +123,7 @@
     />
 
     <!-- 添加或修改公告对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
diff --git a/sgzb-ui/src/views/system/operlog/index.vue b/sgzb-ui/src/views/system/operlog/index.vue
index a6fdb58b..ead4d2dd 100644
--- a/sgzb-ui/src/views/system/operlog/index.vue
+++ b/sgzb-ui/src/views/system/operlog/index.vue
@@ -122,6 +122,7 @@
       </el-table-column>
       <el-table-column label="请求方式" align="center" prop="requestMethod" />
       <el-table-column label="操作人员" align="center" prop="operName" width="110" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']"/>
+      <el-table-column label="用户昵称" align="center" prop="nickName" />
       <el-table-column label="操作地址" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />
       <el-table-column label="操作状态" align="center" prop="status">
         <template slot-scope="scope">
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index fd27ee04..cf7148c7 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -38,13 +38,9 @@ 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://192.168.5.12:8080`,//丁
         // target: `http://10.40.92.21:8080`,
-
-        // target: `http://10.40.92.126:8080`,//高
-        // target: `http://10.40.92.104:8080`,//亮
-        // target: `http://192.168.0.166:8080`,//刘川
-         target: `http://10.40.92.21:8080`,//梁超
+        // target: `http://10.40.92.13:8080`,
+        target: `http://10.40.92.219:8080`,
 
         changeOrigin: true,
         pathRewrite: {