From 597c6cfc96ddbd4a8b78d54d065a6066ede8f402 Mon Sep 17 00:00:00 2001
From: zhouzy062 <zhouzy062@tydic.com>
Date: Sun, 7 Apr 2024 09:39:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/api/claimAndRefund/return.js      |  21 +-
 .../claimAndRefund/return/dialogForm.vue      |   2 +-
 .../claimAndRefund/return/dialogFormByCq.vue  | 220 ++++++++++++++++++
 .../claimAndRefund/return/returnApply.vue     |   5 +-
 .../claimAndRefund/return/returnApplyAdd.vue  |   4 +-
 .../claimAndRefund/return/returnApplyByCq.vue |  13 +-
 .../claimAndRefund/return/returnExamine.vue   |   1 +
 .../views/claimAndRefund/return/returnIn.vue  |  48 ++--
 .../claimAndRefund/return/returnInDetail.vue  |  35 ++-
 .../cost/csotSettlement/costApplyAdd.vue      |   1 -
 .../views/cost/csotSettlement/costExame.vue   |   1 -
 .../newBuy/newAccessory/newAccessoryList.vue  |   2 +-
 .../newBuy/newDevices/newDevicesAccept.vue    |   2 +-
 .../newBuy/newDevices/newDevicesArrival.vue   |   2 +-
 .../newBuy/newDevices/newDevicesCode.vue      |   2 +-
 .../newBuy/newDevices/newDevicesList.vue      |   2 +-
 .../newDevicesServiceCenterList.vue           |   2 +-
 .../newDevices/newDevicesWarehousing.vue      |   2 +-
 .../warehousing/accessoryWarehousing.vue      |   2 +-
 19 files changed, 311 insertions(+), 56 deletions(-)
 create mode 100644 sgzb-ui/src/views/claimAndRefund/return/dialogFormByCq.vue

diff --git a/sgzb-ui/src/api/claimAndRefund/return.js b/sgzb-ui/src/api/claimAndRefund/return.js
index c2011e62..80e07f15 100644
--- a/sgzb-ui/src/api/claimAndRefund/return.js
+++ b/sgzb-ui/src/api/claimAndRefund/return.js
@@ -138,4 +138,23 @@ export function materialReturnNoteByExamine(query) {
     method: 'get',
     params: query
   })
-}
\ No newline at end of file
+}
+
+
+// 退料接收列表
+export function getBackReceiveList(query) {
+  return request({
+    url: '/base/backReceive/getbackReceiveList',
+    method: 'get',
+    params: query
+  })
+}
+// 退料审核新增
+export function receiveView(data) {
+  return request({
+    url: '/base/backReceive/receiveViewWeb',
+    method: 'post',
+    data: data
+  })
+}
+
diff --git a/sgzb-ui/src/views/claimAndRefund/return/dialogForm.vue b/sgzb-ui/src/views/claimAndRefund/return/dialogForm.vue
index c2fd0558..b331825a 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/dialogForm.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/dialogForm.vue
@@ -150,7 +150,7 @@ export default {
     init() {
       let params = {
         id: this.rowObj.id,
-        agreementId: this.rowObj.agreementIdid
+        agreementId: this.rowObj.agreementId,
       }
       materialReturnNoteByApply(params).then(res => {
         this.tableData = res.data
diff --git a/sgzb-ui/src/views/claimAndRefund/return/dialogFormByCq.vue b/sgzb-ui/src/views/claimAndRefund/return/dialogFormByCq.vue
new file mode 100644
index 00000000..fbaccd78
--- /dev/null
+++ b/sgzb-ui/src/views/claimAndRefund/return/dialogFormByCq.vue
@@ -0,0 +1,220 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    v-loading.fullscreen.lock="fullscreenLoading"
+    :before-close="cancel"
+    :title="dialogTitle"
+    :visible.sync="dialogShowFlag"
+    append-to-body
+    width="800px"
+  >
+    <div id="printcontent" style="height: 500px;overflow-y: scroll;padding: 0 20px;">
+      <vue-easy-print tableShow ref="printRef">
+        <div class="order_box">
+          <div class="order_box_one">
+            <div>
+              <span>工程名称：</span><span>{{ rowObj.lotName }}</span>
+            </div>
+            <div>
+              <span>退料时间：</span><span>{{ rowObj.backTime }}</span>
+            </div>
+          </div>
+          <div class="order_box_one">
+            <div>
+              <span>退料单位：</span><span>{{ rowObj.unitName }}</span>
+            </div>
+            <div>
+              <span>编号：</span><span>{{ rowObj.code }}</span>
+            </div>
+          </div>
+        </div>
+        <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="类型名称"
+            align="center"
+            prop="typeName"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="规格型号"
+            align="center"
+            prop="typeCode"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="退料数量"
+            align="center"
+            class-name="small-padding fixed-width"
+            width="200"
+            prop="num"
+          >
+          </el-table-column>
+          <!-- <el-table-column prop="remarks" label="备注" align="center">
+            <template slot-scope="scope">
+              <span
+                @click="remarksClick"
+                style="color: #1890ff; cursor: pointer"
+                >{{ scope.row.remarks }}</span
+              >
+            </template>
+          </el-table-column> -->
+        </el-table>
+        <div class="order_footer">
+          <div>审核：</div>
+          <div>退料：</div>
+          <div>操作人：</div>
+        </div>
+      </vue-easy-print>
+      <div>
+        <el-button type="primary" @click="print">打印</el-button>
+      </div>
+    </div>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <div style="height: 500px;overflow-y: scroll;padding: 0 20px;">
+      <vue-easy-print tableShow ref="remarksPrintRef">
+        <div class="remarks_box">
+          <div class="remarks_box_title">退料编码明细</div>
+        </div>
+        <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>
+          <el-table-column prop="type" label="规格型号" align="center">
+          </el-table-column>
+          <el-table-column prop="unit" label="单位" align="center">
+          </el-table-column>
+          <el-table-column prop="number" label="数量" align="center">
+          </el-table-column>
+        </el-table>
+      </vue-easy-print>
+      </div>
+      <div style="margin-top: 10px">
+        <el-button type="primary" @click="remarksPrint">打印</el-button>
+      </div>
+    </el-dialog>
+  </el-dialog>
+</template>
+<script>
+import vueEasyPrint from 'vue-easy-print';
+import { getViewByApply,materialReturnNoteByApply } from "@/api/claimAndRefund/return.js"
+export default {
+  components: { vueEasyPrint, },
+  props: {
+    // 弹窗是否显示
+    isShowFlag: {
+      type: Boolean,
+      default: false
+    },
+    // 对应操作数据键值
+    priKey: {
+      type: [String, Number],
+      default: ""
+    },
+    //弹窗标题
+    dialogTitle: {
+      type: String,
+      default: ""
+    },
+    rowObj: {
+      type: Object,
+      default: {}
+    }
+  },
+  watch: {
+    isShowFlag(val) {
+      if (val) {
+        this.init();
+      }
+    }
+  },
+  computed: {
+    dialogShowFlag: {
+      get() {
+        return this.isShowFlag;
+      },
+      set(v) {
+        this.$emit("update:isShowFlag", v);
+      }
+    }
+  },
+  data() {
+    return {
+      fullscreenLoading: false,
+      tableData: [],
+      open: false,
+      title: ""
+    };
+  },
+  methods: {
+    init() {
+      let params = {
+        id: this.rowObj.id,
+        agreementId: this.rowObj.agreementId,
+        viewWeb:1,
+      }
+      getViewByApply(params).then(res => {
+        this.tableData = res.data
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.dialogShowFlag = false;
+    },
+    print() {
+      this.$refs.printRef.print();
+    },
+    remarksClick() {
+      this.title = '查看'
+      this.open = true
+    },
+    remarksPrint() {
+      this.$refs.remarksPrintRef.print();
+    }
+
+    // submit() {
+    //   this.$refs["dynamicValidateForm"].validate(valid => {
+    //     console.log("valid", valid);
+    //     if (valid) {
+    //       console.log("11111");
+    //       this.cancel();
+    //     } else {
+    //       return false;
+    //     }
+    //   });
+    // }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.order_box {
+  display: flex;
+  flex-direction: column;
+  .order_box_one {
+    width: 100%;
+    display: flex;
+    align-content: center;
+    justify-content: space-between;
+    margin-bottom: 10px;
+    :last-child {
+      margin-right: 20px;
+    }
+  }
+}
+.order_footer {
+  margin-top: 10px;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+}
+.remarks_box {
+  display: flex;
+  // align-items: center;
+  justify-content: center;
+  .remarks_box_title {
+    margin-bottom: 10px;
+
+    font-size: 18px;
+  }
+}
+</style>
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
index def63c4c..35e3ae35 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
@@ -483,6 +483,7 @@ export default {
       this.dateRange = [];
       // this.resetForm("queryForm");
       this.$refs.queryForm.resetFields()
+      this.initSelectData()
       this.handleQuery();
     },
     /** 新增按钮操作 */
@@ -629,8 +630,8 @@ export default {
       }
       getViewByApply(params).then(res => {
         console.log(res)
-        this.loadingList = res.rows
-        this.loadingTotal = res.total
+        this.loadingList = res.data.rows
+        this.loadingTotal = res.data.total
       })
     },
     /** 刷新缓存按钮操作 */
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
index 10eee007..e237fd6a 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
@@ -419,7 +419,7 @@ export default {
     this.isEdit = this.$route.query.isEdit;
     if (this.$route.query.Id) {
       this.rowId = this.$route.query.Id
-      this.GetViewByApply(this.$route.query.Id)
+      this.returnNoteByApply(this.$route.query.Id)
     }
     getInfo().then(res => {
       this.companyId = res.user.companyId
@@ -485,7 +485,7 @@ export default {
     },
 
     // 获取 任务详情数据
-    async GetViewByApply(Id) {
+    async returnNoteByApply(Id) {
       const res = await materialReturnNoteByApply({ id:Id })
       const data = res.data[0]
       // console.log(data)
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue
index 9fe7058c..bcf6bdcd 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue
@@ -305,7 +305,7 @@
       </div>
     </el-dialog>
     <!-- 退料单 -->
-    <dialogForm :dialogTitle="title" :isShowFlag.sync="isShowOneFlag" :priKey="priKey" :rowObj="rowObj" ></dialogForm>
+    <dialogFormByCq :dialogTitle="title" :isShowFlag.sync="isShowOneFlag" :priKey="priKey" :rowObj="rowObj" ></dialogFormByCq>
     <!-- 提交 -->
     <el-dialog v-loading.fullscreen.lock="fullscreenLoading" :title="title" :visible.sync="openOne" append-to-body width="400px">
       <div class="submit_box">
@@ -342,13 +342,13 @@ import {
   getInfo, h
 } from "@/api/login";
 import { getUnitData, getProData, getAgreementInfoById, } from "@/api/claimAndRefund/receive.js"
-import dialogForm from "./dialogForm.vue";
+import dialogFormByCq from "./dialogFormByCq.vue";
 // 10:42开始日期startTime,结束日期endTime     机具类型typeId
 // http://localhost/claimAndRefund/return/returnApply
 export default {
   name: "",
   dicts: ['sys_normal_disable'],
-  components: { dialogForm, },
+  components: { dialogFormByCq, },
   data() {
     return {
       fullscreenLoading: false,
@@ -483,6 +483,7 @@ export default {
       this.dateRange = [];
       // this.resetForm("queryForm");
       this.$refs.queryForm.resetFields()
+      this.initSelectData()
       this.handleQuery();
     },
     /** 新增按钮操作 */
@@ -625,9 +626,9 @@ export default {
         pageSize: this.dialogQueryParams.pageSize,
       }
       getViewByApply(params).then(res => {
-        console.log(res)
-        this.loadingList = res.rows
-        this.loadingTotal = res.total
+        // console.log(res)
+        this.loadingList = res.data.rows
+        this.loadingTotal = res.data.total
       })
     },
     /** 刷新缓存按钮操作 */
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
index ba292192..3892e9ff 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
@@ -667,6 +667,7 @@ export default {
       this.dateRange = [];
       // this.resetForm("queryForm");
       this.$refs.queryForm.resetFields()
+      this.initSelectData()
       this.handleQuery();
     },
 
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue b/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue
index a315047c..79126ca1 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue
@@ -33,9 +33,9 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="工程名称" prop="proId">
+        <el-form-item label="工程名称" prop="lotId">
           <el-select
-            v-model="queryParams.proId"
+            v-model="queryParams.lotId"
             clearable filterable
             @change="getAgreementByProId"
             style="width: 240px"
@@ -50,6 +50,14 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="协议号" prop="agreementCode">
+          <el-input
+            v-model="queryParams.agreementCode"
+            placeholder="请选择协议号"
+            clearable disabled
+            style="width: 240px"
+          />
+        </el-form-item>
         <el-form-item label="工机具类型" prop="typeId">
           <el-cascader
             v-model="queryParams.typeId"
@@ -65,14 +73,7 @@
           >
           </el-cascader>
         </el-form-item>
-        <el-form-item label="协议号" prop="agreementCode">
-          <el-input
-            v-model="queryParams.agreementCode"
-            placeholder="请选择协议号"
-            clearable
-            style="width: 240px"
-          />
-        </el-form-item>
+       
         <el-form-item label="退料状态" prop="taskStatus">
           <el-select
             v-model="queryParams.taskStatus"
@@ -90,9 +91,9 @@
           </el-select>
         </el-form-item>
   
-        <el-form-item label="退料申请时间" prop="time">
+        <el-form-item label="退料申请时间" prop="dateRange">
           <el-date-picker
-            v-model="queryParams.time"
+            v-model="dateRange"
             type="datetimerange"
             range-separator="至"
             start-placeholder="开始日期"
@@ -206,7 +207,7 @@
   </template>
   
   <script>
-  import { getBackAuditList, getViewByExamine, ApiBackApplyAudit,ApiBackApplyRefuse } from "@/api/claimAndRefund/return.js"
+  import { getBackAuditList, getViewByExamine, ApiBackApplyAudit,ApiBackApplyRefuse,getBackReceiveList } from "@/api/claimAndRefund/return.js"
   import { getInfo } from "@/api/login";
   import { getUnitData, getProData, getAgreementInfoById, } from "@/api/claimAndRefund/receive.js"
   import dialogForm from "./dialogFormExame.vue";
@@ -332,18 +333,19 @@
       getAgreementByUnit() {
         this.GetProData()
       },
-      /** 查询字典类型列表 startTime,结束日期endTime  */
+      /** 查询列表 startTime,结束日期endTime  */
       async getList() {
         this.loading = true;
-        this.queryParams.startTime = this.queryParams.time[0]
-        this.queryParams.endTime = this.queryParams.time[1]
+        this.queryParams.startTime = this.dateRange[0]
+        this.queryParams.endTime = this.dateRange[1]
         try {
           let params = {
+            flag:1,
             companyId: this.companyId,
             ...this.queryParams
           }
           console.log("paramsparamsparams", params)
-          const res = await getBackAuditList(params)
+          const res = await getBackReceiveList(params)
           this.typeList = res.data.rows;
           this.total = res.data.total;
           this.loading = false;
@@ -359,7 +361,9 @@
       resetQuery() {
         this.dateRange = [];
         // this.resetForm("queryForm");
+        
         this.$refs.queryForm.resetFields()
+        this.initSelectData()
         this.handleQuery();
       },
       //打开退料单
@@ -373,7 +377,7 @@
         this.$tab.closeOpenPage({
             path:'/claimAndRefund/returnInDetail',
             query:{
-                // Id:row.id,
+                Id:row.id,
                 isView:true,
             }
         })
@@ -382,10 +386,10 @@
       handleReturn(row) {
         this.$tab.closeOpenPage({
             path:'/claimAndRefund/returnInDetail',
-            // query:{
-            // Id:row.id,
-            // isEdit:true,
-            // }
+            query:{
+                Id:row.id,
+            }
+             
         })
       },
       /** 导出按钮操作 */
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
index 8c2fd276..bc82b735 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="app-container" id="returnInDetail">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-        <el-form-item label="关键字" prop="keyword">
+        <!-- <el-form-item label="关键字" prop="keyword">
           <el-input
             v-model="queryParams.keyword"
             placeholder="请输入关键字"
@@ -9,7 +9,7 @@
             style="width: 240px"
             @keyup.enter.native="handleQuery"
           />
-        </el-form-item>
+        </el-form-item> -->
          
         <el-form-item label="类型名称" prop="typeId">
           <el-select
@@ -67,21 +67,24 @@
         <el-table-column label="序号" align="center" type="index" />
        
         <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
-        <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true" />
-        <el-table-column label="退料数量" align="center" prop="" :show-overflow-tooltip="true"/>
+        <el-table-column label="规格型号" align="center" prop="typeCode" :show-overflow-tooltip="true" />
+        <el-table-column label="退料数量" align="center" prop="num" :show-overflow-tooltip="true"/>
         <el-table-column label="合格数量" align="center" prop="" :show-overflow-tooltip="true" />
         <el-table-column label="维修数量" align="center" prop="" :show-overflow-tooltip="true"/>
         <el-table-column label="预报废数量" align="center" prop="" :show-overflow-tooltip="true"/>
         <el-table-column label="状态" align="center" prop="" :show-overflow-tooltip="true" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300">
           <template slot-scope="scope">
-            <el-button size="mini" @click="handleView(scope.row)">
+            <el-button size="mini" @click="handleViewCode(scope.row)" v-if="scope.row.manageType=='0'">
                 查看
             </el-button>
-            <el-button size="mini" type="primary" @click="handleCodeReturn(scope.row)" v-if="!isView">
+            <el-button size="mini" @click="handleViewNum(scope.row)" v-if="scope.row.manageType=='1'">
+                查看
+            </el-button>
+            <el-button size="mini" type="primary" @click="handleCodeReturn(scope.row)" v-if="!isView&&scope.row.manageType=='0'">
                 编码退料
             </el-button>
-            <el-button size="mini" type="primary" @click="handleNumReturn(scope.row)" v-if="!isView">
+            <el-button size="mini" type="primary" @click="handleNumReturn(scope.row)" v-if="!isView&&scope.row.manageType=='1'">
                 数量退料
             </el-button>
             <!-- <el-button size="mini" icon="el-icon-zoom-in">
@@ -201,7 +204,7 @@
   </template>
   
   <script>
-  import { secondaryWarehouseList  } from "@/api/claimAndRefund/secondStore";
+  import { receiveView  } from "@/api/claimAndRefund/return";
   import { getTypeList } from "@/api/store/warehousing";
   import { equipmentTypeTree } from "@/api/store/tools";
   import Treeselect from "@riophae/vue-treeselect";
@@ -263,6 +266,9 @@
         }else{
             this.isView = false
         }
+        if (this.$route.query.Id) {
+            this.queryParams.id = this.$route.query.Id
+        }
         this.getTypeList();
 
         this.equipmentType();
@@ -304,9 +310,9 @@
         /** 查询列表 */
         getList() {
             this.loading = true;
-            secondaryWarehouseList(this.queryParams).then(response => {
-                this.deviceList = response.rows;
-                this.total = response.total;
+            receiveView(this.queryParams).then(response => {
+                this.deviceList = response.data.rows;
+                this.total = response.data.total;
                 this.loading = false;
                 }
             );
@@ -331,11 +337,16 @@
             this.multiple = !selection.length
         },
         //查看
-        handleView(row){
+        handleViewCode(row){
             this.title = '查看';
             this.openCode = true;
             this.dialogIsView = true;
         },
+        handleViewNum(row){
+            this.title = '查看';
+            this.openNum = true;
+            this.dialogIsView = true;
+        },
         //编码退料
         handleCodeReturn(row){
             this.title = '编码退料';
diff --git a/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue b/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue
index ea815005..5586376b 100644
--- a/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue
+++ b/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue
@@ -51,7 +51,6 @@
                 <el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
                 <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true" />
                 <el-table-column label="计量单位" align="center" prop="nuitName" :show-overflow-tooltip="true" />
-                <el-table-column label="计量单位" align="center" prop="nuitName" :show-overflow-tooltip="true" />
                 <el-table-column label="维修状态" align="center" prop="repairStatus" :show-overflow-tooltip="true">
                   <template slot-scope="scope">
                     <span v-if="scope.row.repairStatus==0">未审核</span>
diff --git a/sgzb-ui/src/views/cost/csotSettlement/costExame.vue b/sgzb-ui/src/views/cost/csotSettlement/costExame.vue
index 80459788..f6e5b620 100644
--- a/sgzb-ui/src/views/cost/csotSettlement/costExame.vue
+++ b/sgzb-ui/src/views/cost/csotSettlement/costExame.vue
@@ -55,7 +55,6 @@
               <el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
               <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true" />
               <el-table-column label="计量单位" align="center" prop="nuitName" :show-overflow-tooltip="true" />
-              <el-table-column label="计量单位" align="center" prop="nuitName" :show-overflow-tooltip="true" />
               <el-table-column label="维修状态" align="center" prop="repairStatus" :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                   <span v-if="scope.row.repairStatus==0">未审核</span>
diff --git a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue
index 2a881fd1..f6bf1c60 100644
--- a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue
@@ -146,7 +146,7 @@
           <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="unitName" />
           <el-table-column label="采购数量" align="center" prop="purchaseNum" />
 
           <el-table-column label="已验收数量" align="center" prop="" />
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
index c0125bcc..812bb3ca 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
@@ -360,7 +360,7 @@ export default {
       deptName: undefined,
     };
   },
-  created() {
+  mounted() {
     const taskId = this.$route.query && this.$route.query.taskId;
     this.taskId = taskId;
     console.log(this.taskId)
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
index 3f463279..607ebc15 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
@@ -333,7 +333,7 @@ export default {
       }
     }
   },
-  created() {
+  mounted() {
     const taskId = this.$route.query && this.$route.query.taskId;
     this.taskId = taskId;
     if(this.taskId=='' || !this.taskId){
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
index 930a72e5..833afe6c 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
@@ -77,7 +77,7 @@
               size="mini"
               type="primary"
               icon="el-icon-edit"
-              v-if="scope.row.bindNum<scope.row.purchaseNum"
+              v-if="scope.row.bindNum<scope.row.checkNum"
               @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 40bfe2ec..f561e1bc 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
@@ -208,7 +208,7 @@
           <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="unitName" />
           <el-table-column label="采购数量" align="center" prop="purchaseNum" />
 
           <el-table-column label="已验收数量" align="center" prop="" />
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue
index 2936e802..1020dece 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue
@@ -252,7 +252,7 @@
             <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="unitName" />
             <el-table-column label="数量" align="center" prop="checkNum" />
             <el-table-column label="备注" align="center" prop="remark" />
             <!-- <el-table-column label="出库方式" align="center" prop="manageTypeName"  /> -->
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
index 937e6312..27a08b39 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
@@ -217,7 +217,7 @@
             <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="unitName" />
             <el-table-column label="数量" align="center" prop="checkNum" />
             <el-table-column label="备注" align="center" prop="remark" />
             <!-- <el-table-column label="出库方式" align="center" prop="manageTypeName"  /> -->
diff --git a/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue b/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
index 1075fef1..9589a40d 100644
--- a/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
+++ b/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
@@ -325,7 +325,7 @@
           <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="unitName" />
           <el-table-column label="数量" align="center" prop="checkNum" />
           <el-table-column label="备注" align="center" prop="remark" />
           <!-- <el-table-column label="出库方式" align="center" prop="manageTypeName"  /> -->