Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	sgzb-ui/vue.config.js

sgzb-ui/src/api/store/newBuy.js

@@ -1,357 +1,365 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 // 查询新购任务列表
 export function listPurchaseCheckInfo(query) {
   return request({
-    url: "/material/purchaseCheckInfo/list",
+    url: '/material/purchaseCheckInfo/list',
-    method: "get",
+    method: 'get',
     params: query,
-  });
+  })
 }
 //新增新购任务
 export function addPurchaseCheckInfo(data) {
   return request({
-    url: "/material/purchaseCheckInfo",
+    url: '/material/purchaseCheckInfo',
-    method: "post",
+    method: 'post',
     data: data,
-  });
+  })
 }
 //编辑新购任务
 export function updatePurchaseCheckInfo(data) {
   return request({
-    url: "/material/purchaseCheckInfo",
+    url: '/material/purchaseCheckInfo',
-    method: "put",
+    method: 'put',
     data: data,
-  });
+  })
 }
 //任务 详情
 export function getPurchaseCheckInfo(query) {
   return request({
-    url: "/material/purchaseCheckInfo/getDetails",
+    url: '/material/purchaseCheckInfo/getDetails',
-    method: "get",
+    method: 'get',
     params: query,
-  });
+  })
 }
 //消息通知
 export function bmNoticeInfo(data) {
   return request({
-    url: "/material/purchaseCheckInfo/bmNoticeInfo",
+    url: '/material/purchaseCheckInfo/bmNoticeInfo',
-    method: "post",
+    method: 'post',
     data: data,
-  });
+  })
 }
 
 // 新购验收--验收弹窗-确认验收
 export function updatePurchaseCheckDetails(data) {
   return request({
-    url: "/material/purchaseCheckDetails",
+    url: '/material/purchaseCheckDetails',
-    method: "put",
+    method: 'put',
     data: data,
-  });
+  })
 }
 
 // 新购验收-编号管理列表
 export function listPurchaseMacodeInfo(query) {
   return request({
-    url: "/material/purchaseMacode/list",
+    url: '/material/purchaseMacode/list',
-    method: "get",
+    method: 'get',
     params: query,
-  });
+  })
 }
 
 export function getMacodeInfo(taskId) {
   return request({
-    url: "/material/purchaseMacode/" + taskId,
+    url: '/material/purchaseMacode/' + taskId,
-    method: "get",
+    method: 'get',
-  });
+  })
 }
 // 新购验收-编号管理-新增
 export function addPurchaseMacode(data) {
   return request({
-    url: "/material/purchaseMacode",
+    url: '/material/purchaseMacode',
-    method: "post",
+    method: 'post',
     data: data,
-  });
+  })
 }
 // 修改
 export function updateMacode(data) {
   return request({
-    url: "/material/purchaseMacode",
+    url: '/material/purchaseMacode',
-    method: "put",
+    method: 'put',
     data: data,
-  });
+  })
 }
 
 // 删除
 export function delMacode(taskIds) {
   return request({
-    url: "/material/purchaseMacode/" + taskIds,
+    url: '/material/purchaseMacode/' + taskIds,
-    method: "delete",
+    method: 'delete',
-  });
+  })
 }
 
 //新购验收-编号管理-绑定弹窗详情列表
 export function getMacodeList(query) {
   return request({
-    url: "/material/purchaseMacode/list",
+    url: '/material/purchaseMacode/list',
-    method: "get",
+    method: 'get',
     params: query,
-  });
+  })
 }
 
 //新购验收-编号管理-绑定弹窗详情列表
 export function getMacodeDetailList(query) {
   return request({
-    url: "/material/purchaseMacode/getInfo",
+    url: '/material/purchaseMacode/getInfo',
-    method: "get",
+    method: 'get',
     params: query,
-  });
+  })
 }
 //新购验收-编号管理-生成编码
 export function makeEquipmentNumber(data) {
   return request({
-    url: "/material/purchaseMacode/equipmentNumber",
+    url: '/material/purchaseMacode/equipmentNumber',
-    method: "post",
+    method: 'post',
     data: data,
-  });
+  })
 }
 //新购验收-编号管理-保存
 export function editPurchaseMacode(data) {
   return request({
-    url: "/material/purchaseMacode",
+    url: '/material/purchaseMacode',
-    method: "post",
+    method: 'post',
     data: data,
-  });
+  })
 }
 
 // 删除
 export function delMacodeList(maCode) {
   return request({
-    url: "/material/purchaseMacode/" + maCode,
+    url: '/material/purchaseMacode/' + maCode,
-    method: "delete",
+    method: 'delete',
-  });
+  })
 }
 
 //新购验收-验收-通知-常用人员
 export function getNoticeUserList(query) {
   return request({
-    url: "/system/person/list",
+    url: '/system/person/list',
-    method: "get",
+    method: 'get',
     params: query,
-  });
+  })
 }
 //新购验收-验收-通知-所有人员
 export function getAllNotificationList(query) {
   return request({
-    url: "/system/person/notification",
+    url: '/system/person/notification',
-    method: "get",
+    method: 'get',
     params: query,
-  });
+  })
 }
 //新购验收-验收-通知-常用人员-添加
 export function addNoticeUser(data) {
   return request({
-    url: "/system/person",
+    url: '/system/person',
-    method: "post",
+    method: 'post',
     data: data,
-  });
+  })
 }
 // 删除
 export function delNoticeUser(id) {
   return request({
-    url: "/system/person/" + id,
+    url: '/system/person/' + id,
-    method: "delete",
+    method: 'delete',
-  });
+  })
 }
 
 //新购验收-入库列表
 export function getPutInList(query) {
   return request({
-    url: "/material/purchaseCheckInfo/putInList",
+    url: '/material/purchaseCheckInfo/putInList',
-    method: "get",
+    method: 'get',
     params: query,
-  });
+  })
 }
 export function getPutinDetailsList(query) {
   return request({
-    url: "/material/purchaseMacode/putinDetails",
+    url: '/material/purchaseMacode/putinDetails',
-    method: "get",
+    method: 'get',
     params: query,
-  });
+  })
 }
 
 // 修改状态-审核
 export function changePutinStatus(data) {
   return request({
-    url: "/material/purchaseMacode/manageStatus",
+    url: '/material/purchaseMacode/manageStatus',
-    method: "put",
+    method: 'put',
     data: data,
-  });
+  })
 }
 
 //新购工机具验收单
 export function getAcceptanceForm(query) {
   return request({
-    url: "/material/purchaseCheckInfo/getAcceptanceForm",
+    url: '/material/purchaseCheckInfo/getAcceptanceForm',
-    method: "get",
+    method: 'get',
     params: query,
-  });
+  })
 }
 
 //新购工机具入库单
 export function warehousingEntry(query) {
   return request({
-    url: "/material/purchaseMacode/warehousingEntry",
+    url: '/material/purchaseMacode/warehousingEntry',
-    method: "get",
+    method: 'get',
     params: query,
-  });
+  })
 }
 
 // 配件所属上级树
 export function getAccessoryTree(data) {
   return request({
-    url: "/system/select/getAccessoryTree",
+    url: '/system/select/getAccessoryTree',
-    method: "post",
+    method: 'post',
     data: data,
-  });
+  })
 }
 // 查询新购配件列表
 export function listPurchaseAccessory(query) {
   return request({
-    url: "/material/purchaseAccessory/list",
+    url: '/material/purchaseAccessory/list',
-    method: "get",
+    method: 'get',
     params: query,
-  });
+  })
 }
 //新增新购配件任务
 export function addPurchaseAccessory(data) {
   return request({
-    url: "/material/purchaseAccessory",
+    url: '/material/purchaseAccessory',
-    method: "post",
+    method: 'post',
     data: data,
-  });
+  })
 }
 //配件任务 详情
 export function getPurchaseAccessoryDetails(query) {
   return request({
-    url: "/material/purchaseAccessory/getDetails",
+    url: '/material/purchaseAccessory/getDetails',
-    method: "get",
+    method: 'get',
     params: query,
-  });
+  })
 }
 //编辑新购配件任务
 export function updatePurchaseAccessory(data) {
   return request({
-    url: "/material/purchaseAccessory/edit",
+    url: '/material/purchaseAccessory/edit',
-    method: "post",
+    method: 'post',
     data: data,
-  });
+  })
 }
 //验收新购配件任务
 export function checkPurchaseAccessory(data) {
   return request({
-    url: "/material/purchaseAccessory/check",
+    url: '/material/purchaseAccessory/check',
-    method: "post",
+    method: 'post',
     data: data,
-  });
+  })
 }
 
 //删除新购配件任务
 export function delPurchaseAccessory(taskIds) {
   return request({
-    url: "/material/purchaseAccessory/" + taskIds,
+    url: '/material/purchaseAccessory/' + taskIds,
-    method: "delete",
+    method: 'delete',
-  });
+  })
 }
 
 //配件入库 列表
 export function getPurchaseAccessoryPutInList(query) {
   return request({
-    url: "/material/purchaseAccessory/putInList",
+    url: '/material/purchaseAccessory/putInList',
-    method: "get",
+    method: 'get',
     params: query,
-  });
+  })
 }
 
 //配件入库 配件类型下拉数据
 export function getPartList(query) {
   return request({
-    url: "/material/purchaseAccessory/getPartList",
+    url: '/material/purchaseAccessory/getPartList',
-    method: "get",
+    method: 'get',
     params: query,
-  });
+  })
 }
 //配件入库 配件类型下拉数据
 export function getAccessoryPutInDetailList(query) {
   return request({
-    url: "/material/purchaseAccessory/putinDetails",
+    url: '/material/purchaseAccessory/putinDetails',
-    method: "get",
+    method: 'get',
     params: query,
-  });
+  })
 }
 
 //配件入库 审批操作
 export function checkInputAccessory(data) {
   return request({
-    url: "/material/purchaseAccessory/checkInput",
+    url: '/material/purchaseAccessory/checkInput',
-    method: "post",
+    method: 'post',
     data: data,
-  });
+  })
 }
 
 //新购配件验收单
 export function getAccessoryAcceptanceForm(query) {
   return request({
-    url: "/material/purchaseAccessory/getAcceptanceForm",
+    url: '/material/purchaseAccessory/getAcceptanceForm',
-    method: "get",
+    method: 'get',
     params: query,
-  });
+  })
 }
 
 //新购配件入库单
 export function accessoryWarehousingEntry(query) {
   return request({
-    url: "/material/purchaseAccessory/warehousingEntry",
+    url: '/material/purchaseAccessory/warehousingEntry',
-    method: "get",
+    method: 'get',
     params: query,
-  });
+  })
 }
 
 // 删除
 export function purchaseCheckInfoRemove(maCode) {
   return request({
-    url: "/material/purchaseCheckInfo/" + maCode,
+    url: '/material/purchaseCheckInfo/' + maCode,
-    method: "delete",
+    method: 'delete',
-  });
+  })
 }
 //新增计划管理
 export function addPlanManagement(data) {
   return request({
-    url: "/material/planManagement/addOrUpdate",
+    url: '/material/planManagement/addOrUpdate',
-    method: "post",
+    method: 'post',
     data: data,
-  });
+  })
 }
 //配件入库 配件类型下拉数据
 export function getPlanList(query) {
   return request({
-    url: "/material/planManagement/getList",
+    url: '/material/planManagement/getList',
-    method: "get",
+    method: 'get',
     params: query,
-  });
+  })
 }
 //借调操作
 export function addOrUpdateMange(data) {
   return request({
-    url: "/material/planManagement/addOrUpdateMange",
+    url: '/material/planManagement/addOrUpdateMange',
-    method: "post",
+    method: 'post',
     data: data,
-  });
+  })
 }
 //计划借调列表
 export function getManageList(query) {
   return request({
-    url: "/material/planManagement/getManageList",
+    url: '/material/planManagement/getManageList',
-    method: "get",
+    method: 'get',
     params: query,
-  });
+  })
+}
+//抱杆成套数据明细
+export function getWholeSetDetails(query) {
+  return request({
+    url: '/material/purchaseCheckInfo/wholeSetDetails',
+    method: 'get',
+    params: query,
+  })
 }

sgzb-ui/src/components/HoldingpoleDialog/index.vue

@@ -0,0 +1,98 @@
+<!-- HoldingpoleDialog.vue -->
+<template>
+    <el-dialog title="明细" :visible.sync="dialogVisible" :close-on-click-modal="false" @close="handleClose"
+        @open="handleOpen" append-to-body>
+        <!-- 自定义弹窗内容 -->
+        <div class="dialog-content">
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="80px">
+                <el-form-item label="关键字" prop="keyWord">
+                    <el-input v-model="queryParams.keyWord" placeholder="请输入关键字" clearable maxlength="50"
+                        style="width: 240px" @keyup.enter.native.prevent="handleQuery" />
+                </el-form-item>
+
+                <el-form-item>
+                    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                    <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                </el-form-item>
+            </el-form>
+            <el-table :data="maTypeDetails" style="width: 100%">
+                <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="typeModelName" :show-overflow-tooltip="true" />
+                <el-table-column label="单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
+                <el-table-column label="预领数量" align="center" prop="partNum" :show-overflow-tooltip="true" />
+            </el-table>
+            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+                :limit.sync="queryParams.pageSize" @pagination="getList" />
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+import { getWholeSetDetails } from '@/api/store/newBuy'
+
+export default {
+    props: {
+        // 接收外部传入的参数
+        holdingpoleData: {
+            type: Object,
+            required: true
+        },
+        initialVisible: Boolean
+    },
+    data() {
+        return {
+            dialogVisible: this.initialVisible, // 控制弹窗显隐状态
+            maTypeDetails: [],
+            total: 0,
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                typeId: undefined,
+                keyWord: '',
+                purchaseNum: undefined,
+            },
+        };
+    },
+    watch: {
+        // 监听 initialVisible 属性的变化
+        initialVisible(newVal) {
+            this.dialogVisible = newVal;
+        }
+    },
+    methods: {
+        getList() {
+            getWholeSetDetails(this.queryParams).then(res => {
+                this.maTypeDetails = res.rows
+                this.total = res.total
+            })
+        },
+        handleClose() {
+            this.$emit('close');
+            this.maTypeDetails.splice(0, this.maTypeDetails.length);
+        },
+        handleOpen() {
+            this.queryParams.typeId = this.holdingpoleData.typeId
+            this.queryParams.purchaseNum = this.holdingpoleData.purchaseNum
+            this.getList()
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+    }
+};
+</script>
+
+<style scoped>
+/* 添加自定义样式 */
+.dialog-content {
+    /* ... */
+}
+</style>

sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue

@@ -5,48 +5,23 @@
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
         <el-col :span="6">
           <el-form-item label="机具类型" prop="equipmentId">
-            <treeselect
+            <treeselect v-model="queryParams.equipmentId" default-expand-all :options="equipmentTypeList"
-              v-model="queryParams.equipmentId"
+              placeholder="请选择机具类型" @select="select" :disable-branch-nodes="true" style="width: 240px;"
-              default-expand-all
+              noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果" />
-              :options="equipmentTypeList"
-              placeholder="请选择机具类型"
-              @select="select"
-              :disable-branch-nodes="true"
-              style="width: 240px;"
-              noChildrenText="没有数据了"
-              noOptionsText="没有数据"
-              noResultsText="没有搜索结果"
-            />
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="出厂日期">
-            <el-date-picker
+            <el-date-picker v-model="queryParams.productionTime" style="width: 240px" value-format="yyyy-MM-dd"
-              v-model="queryParams.productionTime"
+              type="date" placeholder="出厂日期" @change="changeTime"></el-date-picker>
-              style="width: 240px"
-              value-format="yyyy-MM-dd"
-              type="date"
-              placeholder="出厂日期"
-              @change="changeTime"
-            ></el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="机具厂家" prop="supplierId">
-            <el-select
+            <el-select v-model="queryParams.supplierId" placeholder="机具厂家" clearable filterable style="width: 240px"
-              v-model="queryParams.supplierId"
+              @change="changeSupplier">
-              placeholder="机具厂家"
+              <el-option v-for="item in supplierList" :key="item.supplierId" :label="item.supplier"
-              clearable
+                :value="item.supplierId" />
-              filterable
-              style="width: 240px"
-              @change="changeSupplier"
-            >
-              <el-option
-                v-for="item in supplierList"
-                :key="item.supplierId"
-                :label="item.supplier"
-                :value="item.supplierId"
-              />
             </el-select>
           </el-form-item>
         </el-col>
@@ -56,49 +31,23 @@
     <el-form :model="maForm" ref="maForm" :rules="rules" size="small" :inline="true">
       <el-row>
         <el-form-item label="采购日期" prop="purchaseTime">
-          <el-date-picker
+          <el-date-picker v-model="maForm.purchaseTime" style="width: 240px" value-format="yyyy-MM-dd" type="date"
-            v-model="maForm.purchaseTime"
+            placeholder="请选择采购日期"></el-date-picker>
-            style="width: 240px"
-            value-format="yyyy-MM-dd"
-            type="date"
-            placeholder="请选择采购日期"
-          ></el-date-picker>
         </el-form-item>
         <el-form-item label="到货日期" prop="arrivalTime">
-          <el-date-picker
+          <el-date-picker v-model="maForm.arrivalTime" style="width: 240px" value-format="yyyy-MM-dd"
-            v-model="maForm.arrivalTime"
+            :picker-options="pickerOptions" type="date" placeholder="请选择到货日期"></el-date-picker>
-            style="width: 240px"
-            value-format="yyyy-MM-dd"
-            :picker-options="pickerOptions"
-            type="date"
-            placeholder="请选择到货日期"
-          ></el-date-picker>
         </el-form-item>
         <el-form-item label="采购员" prop="purchaser">
-          <el-select
+          <el-select v-model="maForm.purchaser" filterable placeholder="请选择采购员" style="width: 100%;">
-            v-model="maForm.purchaser"
-            filterable
-            placeholder="请选择采购员"
-            style="width: 100%;"
-          >
             <el-option label="请选择" :value="0"></el-option>
-            <el-option
+            <el-option v-for="item in userList" :key="item.userId" :label="item.userName"
-              v-for="item in userList"
+              :value="item.userId"></el-option>
-              :key="item.userId"
-              :label="item.userName"
-              :value="item.userId"
-            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input
+          <el-input v-model="maForm.remark" placeholder="请输入备注" clearable maxlength="150" type="textarea"
-            v-model="maForm.remark"
+            style="width: 240px" />
-            placeholder="请输入备注"
-            clearable
-            maxlength="150"
-            type="textarea"
-            style="width: 240px"
-          />
         </el-form-item>
       </el-row>
     </el-form>
@@ -136,54 +85,26 @@
     <el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" width="55" />
-      <el-table-column
+      <el-table-column label="机具类型" prop="machineTypeName" :show-overflow-tooltip="true" width="200"></el-table-column>
-        label="机具类型"
+      <el-table-column label="规格型号" prop="specificationType" :show-overflow-tooltip="true" width="200" />
-        prop="machineTypeName"
-        :show-overflow-tooltip="true"
-        width="200"
-      ></el-table-column>
-      <el-table-column
-        label="规格型号"
-        prop="specificationType"
-        :show-overflow-tooltip="true"
-        width="200"
-      />
       <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
+          <el-input-number v-model="scope.row.purchasePrice" controls-position="right" style="width: 100%;"
-            v-model="scope.row.purchasePrice"
+            :min="0"></el-input-number>
-            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">
         <template slot-scope="scope">
-          <el-input-number
+          <el-input-number v-model="scope.row.purchaseNum" controls-position="right" style="width: 100%;"
-            v-model="scope.row.purchaseNum"
+            :min="1"></el-input-number>
-            controls-position="right"
-            style="width: 100%;"
-            :min="1"
-          ></el-input-number>
         </template>
       </el-table-column>
       <el-table-column label="机具厂家" prop="supplierId" width="200">
         <template slot-scope="scope">
-          <el-select
+          <el-select v-model="scope.row.supplierId" placeholder="机具厂家" filterable clearable style="width: 180px">
-            v-model="scope.row.supplierId"
+            <el-option v-for="item in supplierList" :key="item.supplierId" :label="item.supplier"
-            placeholder="机具厂家"
+              :value="item.supplierId" />
-            filterable
-            clearable
-            style="width: 180px"
-          >
-            <el-option
-              v-for="item in supplierList"
-              :key="item.supplierId"
-              :label="item.supplier"
-              :value="item.supplierId"
-            />
           </el-select>
 
           <!-- <el-input v-model="scope.row.supplierId"></el-input> -->
@@ -191,17 +112,11 @@
       </el-table-column>
       <el-table-column label="出厂日期" align="center" prop="productionTime" width="200">
         <template slot-scope="scope">
-          <el-date-picker
+          <el-date-picker v-model="scope.row.productionTime" style="width: 180px" value-format="yyyy-MM-dd" type="date"
-            v-model="scope.row.productionTime"
+            range-separator="-" placeholder="出厂日期"></el-date-picker>
-            style="width: 180px"
-            value-format="yyyy-MM-dd"
-            type="date"
-            range-separator="-"
-            placeholder="出厂日期"
-          ></el-date-picker>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="150">
         <template slot-scope="scope" v-if="scope.row.roleId !== 1">
           <!-- <el-button
               size="mini"
@@ -210,15 +125,16 @@
               @click="handleUpdate(scope.row)"
               v-hasPermi="['system:role:edit']"
           >修改</el-button>-->
-          <el-button
+          <el-button size="mini" type="text" icon="el-icon-document" v-if="scope.row.manageType == 2"
-            size="mini"
+            @click="handleDetail(scope.row)">明细</el-button>
-            type="danger"
+          <el-button size="mini" type="text" icon="el-icon-delete" style="color: red;"
-            icon="el-icon-delete"
+            @click="handleDelete(scope.row)">删除</el-button>
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
+
+    <holdingpole-dialog :dialog-class="'my-custom-dialog'" :initial-visible="showDialog"
+      :holdingpoleData="holdingpoleData" @close="onDialogClose"></holdingpole-dialog>
   </div>
 </template>
 
@@ -228,13 +144,14 @@ import { getUserByRoleList } from '@/api/system/user'
 import { equipmentTypeTree, supplierInfoList } from '@/api/store/tools'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import HoldingpoleDialog from '@/components/HoldingpoleDialog/index.vue';
 
-import {} from '@/api/store/newBuy'
+import { } from '@/api/store/newBuy'
 
 export default {
   name: 'NewDevicesArrival',
   dicts: ['sys_normal_disable'],
-  components: { Treeselect },
+  components: { Treeselect, HoldingpoleDialog },
   data() {
     return {
       taskId: '',
@@ -269,6 +186,8 @@ export default {
       menuNodeAll: false,
       deptExpand: true,
       deptNodeAll: false,
+      showDialog: false,
+      holdingpoleData: {},
       // 日期范围
       dateRange: [],
       // 数据范围选项
@@ -467,7 +386,7 @@ export default {
       if (this.$refs.menu != undefined) {
         this.$refs.menu.setCheckedKeys([])
       }
-      ;(this.menuExpand = false),
+      ; (this.menuExpand = false),
         (this.menuNodeAll = false),
         (this.deptExpand = true),
         (this.deptNodeAll = false),
@@ -514,7 +433,7 @@ export default {
               if (this.equipmentList.length > 0) {
                 this.$modal
                   .confirm('是否确认保存当前页面')
-                  .then(function() {})
+                  .then(function () { })
                   .then(() => {
                     if (this.isEdit) {
                       console.log('编辑')
@@ -538,7 +457,7 @@ export default {
                       })
                     }
                   })
-                  .catch(() => {})
+                  .catch(() => { })
               } else {
                 this.$modal.msgError('请先选择并添加机具类型！！！')
               }
@@ -561,6 +480,16 @@ export default {
       //   this.form = response.data;
       //   this.open = true;
     },
+    /** 明细按钮操作 */
+    handleDetail(row) {
+      this.holdingpoleData = row
+      this.showDialog = true
+    },
+    onDialogClose() {
+      console.log('弹窗已关闭');
+      this.showDialog = false
+      // 在这里执行关闭后的相关操作
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       console.log(row.id)
@@ -573,7 +502,7 @@ export default {
             }
           })
         })
-        .catch(() => {})
+        .catch(() => { })
 
       // const roleIds = row.roleId || this.ids;
       // this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function() {
@@ -601,6 +530,7 @@ export default {
 ::v-deep input::-webkit-inner-spin-button {
   -webkit-appearance: none !important;
 }
+
 ::v-deep input[type='number'] {
   -moz-appearance: textfield !important;
 }