From 3da3083c5ca6293604534694da06ca94b32a3055 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 21 Mar 2024 10:55:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=99=BB=E8=AE=B0-=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=AD=90=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dev/DeptDeviceDetail.vue            |  12 +-
 src/views/dev/DeviceTemperamentDialog.vue     |  10 +-
 .../dev/DialogDeviceSelectInvProduct.vue      | 426 ++++++++++++++++++
 src/views/dev/deviceChangeOrder.vue           |  22 +-
 src/views/dev/deviceInfoFull.vue              |  23 +-
 src/views/dev/invTechniclDialog.vue           |  10 +-
 src/views/dev/js/deviceChangeOrder.js         |  32 +-
 src/views/dev/js/deviceInfoFull.js            |  18 +-
 8 files changed, 532 insertions(+), 21 deletions(-)
 create mode 100644 src/views/dev/DialogDeviceSelectInvProduct.vue

diff --git a/src/views/dev/DeptDeviceDetail.vue b/src/views/dev/DeptDeviceDetail.vue
index 9f24ce38..56ff76ba 100644
--- a/src/views/dev/DeptDeviceDetail.vue
+++ b/src/views/dev/DeptDeviceDetail.vue
@@ -193,12 +193,14 @@
           :rowData="this.rowData">
         </invDeviceUserEditDialog>
       </el-tab-pane>
-      <el-tab-pane label="维修记录">
+
+      <el-tab-pane label="维修记录" v-if="this.visible">
       </el-tab-pane>
-      <el-tab-pane label="巡检记录">
+      <el-tab-pane label="巡检记录" v-if="this.visible">
       </el-tab-pane>
-      <el-tab-pane label="使用记录">
+      <el-tab-pane label="使用记录" v-if="this.visible">
       </el-tab-pane>
+
     </el-tabs>
     <el-dialog
         :title="formMap[formName]"
@@ -267,6 +269,10 @@ export default {
     editSaveDev: {
       type: Function,
       required: true
+    },
+    visible: {
+      type: Boolean,
+      required: true
     }
   },
   name: "DeptDeviceDetail",
diff --git a/src/views/dev/DeviceTemperamentDialog.vue b/src/views/dev/DeviceTemperamentDialog.vue
index 64894108..90ecc5cd 100644
--- a/src/views/dev/DeviceTemperamentDialog.vue
+++ b/src/views/dev/DeviceTemperamentDialog.vue
@@ -384,15 +384,15 @@ export default {
       this.certLoading = true;
       // let certRuery = {}
       // this.certQuery.customerId = this.inputEdit.customerId;
-      console.log("获取idQuery：")
-      console.log(this.idQuery)
+      // console.log("获取idQuery：")
+      // console.log(this.idQuery)
       this.certQuery.devCodeFk = this.idQuery.code;
       this.certQuery.type=1;
       this.inputQuery={...this.idQuery};
       this.inputQuery.devCodeFk=this.idQuery.code;
-      console.log(this.inputQuery);
-      console.log("获取this.certQuery:")
-      console.log(this.certQuery)
+      // console.log(this.inputQuery);
+      // console.log("获取this.certQuery:")
+      // console.log(this.certQuery)
       filterDeviceCert(this.certQuery)
         .then((response) => {
           this.certLoading = false;
diff --git a/src/views/dev/DialogDeviceSelectInvProduct.vue b/src/views/dev/DialogDeviceSelectInvProduct.vue
new file mode 100644
index 00000000..5a999174
--- /dev/null
+++ b/src/views/dev/DialogDeviceSelectInvProduct.vue
@@ -0,0 +1,426 @@
+<template>
+  <div>
+    <el-card>
+      <el-form :model="filterQuery" size="mini" label-width="100px" v-if="showSearch">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="DI/物资编码:">
+              <el-input v-model="filterQuery.nameCode" style="width: 90%" placeholder="请输入DI/物资编码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="物资名称:">
+              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格型号:">
+              <el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="批次号:">
+              <el-input v-model="filterQuery.batchNo" style="width: 90%" placeholder="请输入批次号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产企业:" class="query-form-item">
+              <el-input v-model="filterQuery.manufactory" style="width: 100%" placeholder="请输入生产企业/注册备案人"
+                        clearable="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="物资分类:" class="query-form-item">
+              <el-input v-model="filterQuery.category" style="width: 100%" placeholder="请输入物资分类名称"
+                        clearable="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6" v-if="productRemarkSet.remarkEnable1">
+            <el-form-item :label="productRemarkSet.remarkTitle1+':'" class="query-form-item">
+              <el-input v-model="filterQuery.basicPrductRemak1" style="width: 100%"
+                        :placeholder="productRemarkSet.remarkTitle1"
+                        clearable="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" v-if="productRemarkSet.remarkEnable2">
+            <el-form-item :label="productRemarkSet.remarkTitle2 +':'" class="query-form-item">
+              <el-input v-model="filterQuery.basicPrductRemak2" style="width: 100%"
+                        :placeholder="productRemarkSet.remarkTitle2"
+                        clearable="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="confirmSelect">确定</el-button>
+        </el-button-group>
+      </div>
+
+      <el-divider style="margin: 15px"></el-divider>
+
+
+      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="false" border
+                @current-change="handleChange" @selection-change="handleSelectionChange"
+                ref="multipleTable"
+      >
+        <el-table-column label width="45" v-if="type==3 ">
+          <template slot-scope="scope">
+            <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+          </template>
+        </el-table-column>
+        <el-table-column type="selection" width="55" v-if="type!=3"></el-table-column>
+        <el-table-column label="序号" type="index" width="55"></el-table-column>
+        <el-table-column label="DI/物资编码" prop="nameCode" width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" width="160"></el-table-column>
+        <el-table-column label="计量单位" prop="measname" width="90"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" width="90"></el-table-column>
+        <el-table-column label="价格" prop="price"></el-table-column>
+        <el-table-column label="生产日期" prop="productionDate" width="90"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate" width="90"></el-table-column>
+        <el-table-column label="入库数量" prop="inCount" width="90"></el-table-column>
+        <el-table-column label="出库数量" prop="outCount" width="90"></el-table-column>
+        <el-table-column label="结余数量" prop="reCount" width="90"></el-table-column>
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc" width="180"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"></el-table-column>
+        <el-table-column label="供应商" prop="supName" width="180"></el-table-column>
+      </el-table>
+    </el-card>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :limit.sync="filterQuery.limit"
+      :page.sync="filterQuery.page"
+      @pagination="handleCurrentChange"
+    ></pagination>
+  </div>
+</template>
+
+<script>
+import {
+  getInvProduct, getInvProductStock, getProduct
+} from '@/api/inventory/invPorduct'
+import { addDetail } from '@/api/inout/receiveOrder'
+import { addBizProduct } from '@/api/inout/orderDetailCode'
+import { getInvPreInProduct, getInvPreInProductStock } from '@/api/inventory/invPreInSearch'
+import { getInvPreProduct, getInvPreProductStock } from '@/api/inventory/invPreProduct'
+import { finProductSet } from '@/api/param/systemParamConfig'
+
+export default {
+  name: 'DialogDeviceInvProduct',
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true
+    },
+    invQueryData: {
+      type: Object,
+      required: true
+    },
+    codeArray: {
+      type: Object,
+      required: true
+    },
+    orderQuery: {},
+    type: {     //1.领用选入，2：业务单据选入
+      type: Object,
+      required: true
+    },
+    listType: {     //null:申购单产品选入；1：定量设置产品选入；2：设备入库产品选入
+      type: Object,
+      required: true,
+    },
+    chooseFunc: {
+      required: false, type: Function
+    }
+  },
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        cpmctymc: null,
+        nameCode: null,
+        relIdFk: null,
+        batchNo: null,
+        page: 1,
+        limit: 10,
+        customerId: null,
+        supId: null,
+        unitFk: null,
+        invCode: this.invQueryData.invCode,
+        attributeType: 1
+      },
+      detailQuery: {
+        code: null,
+        productIdFk: null,
+        page: 1,
+        limit: 20
+      },
+      list: [],
+      lists: [],
+      total: 0,
+      loading: true,
+      index: null,
+      dialogTableVisible: false,
+      formLoading: false,
+      dialogVisible: false,
+      deleteLoading: false,
+      busTypes: [],
+      idQuery: null,
+      showSup: false,
+      fromOptions: [],
+      productRemarkSet: {},
+      tQuery: {},
+      currentRow: null,
+      radioCheck: null
+
+    }
+  },
+  components: {},
+  methods: {
+    deviceAdd() {
+      this.chooseFunc(this.lists)
+    },
+    confirmSelect() {
+      if (this.lists == null) {
+        this.$message.error('未选择产品')
+        return
+      }
+      if (this.listType == null) {
+        this.puApplayAdd()
+      } else if (this.listType == 1) {
+        this.invRationAdd()
+      } else if (this.listType == 2) {
+        this.deviceAdd()
+      }
+    },
+    handleSelectionChange(val) {
+
+      if (this.listType != 2) {
+        this.lists = []
+        for (var i = 0; i < val.length; i++) {
+          this.tQuery = {}
+          this.tQuery.productId = val[i].id
+          this.tQuery.supId = val[i].customerId
+          this.tQuery.productName = val[i].cpmctymc
+          this.tQuery.count = 1
+          this.tQuery.orderIdFk = this.pId
+          this.tQuery.zczbhhzbapzbh = val[i].zczbhhzbapzbh
+          this.tQuery.manufactory = val[i].ylqxzcrbarmc
+          this.tQuery.serialNo = val[i].serialNo
+          this.tQuery.udi = val[i].udi
+          this.lists.push(this.tQuery)
+        }
+      } else {
+        for (var i = 0; i < val.length; i++) {
+          this.tQuery = val[i]
+          this.tQuery.manufactory = val[i].ylqxzcrbarmc
+          this.lists.push(this.tQuery)
+        }
+      }
+
+      console.log(this.lists)
+    },
+    onReset() {
+
+      this.$router.push({
+        path: ''
+      })
+      this.filterQuery = {
+        cpmctymc: null,
+        invCode: null,
+        nameCode: null,
+        relIdFk: null,
+        batchNo: null,
+        customerId: null,
+        unitFk: null,
+        supId: null,
+        attributeType: 1,
+        page: 1,
+        limit: 10
+      }
+      this.getList()
+    },
+    onSubmit() {
+      this.loading = true
+      this.filterQuery.page = 1
+      this.getList()
+    },
+    handleSizeChange(val) {
+      this.filterQuery.limit = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page
+      this.getList()
+    },
+    closeDetailDialog(val) {
+      this.codeDetailVisible = false
+    },
+
+    getList() {
+      this.loading = true
+      if (this.type == 1) {
+        this.filterQuery.invCode = this.invQueryData.targetInvCode
+      } else {
+        this.filterQuery.invCode = this.invQueryData.invCode
+      }
+      this.filterQuery.filterNoInv = 1
+      this.filterQuery.attributeType = 1
+      //寄售
+      if (this.invQueryData.advanceType == 3) {
+        getInvPreProductStock(this.filterQuery)
+          .then((response) => {
+            this.showSup = response.data.showSup
+            this.loading = false
+            this.list = response.data.list || []
+            this.total = response.data.total || 0
+          })
+          .catch(() => {
+            this.loading = false
+            this.list = []
+            this.total = 0
+          })
+        //预验收
+      } else if (this.invQueryData.advanceType == 2) {
+        getInvPreInProductStock(this.filterQuery)
+          .then((response) => {
+            this.showSup = response.data.showSup
+            this.loading = false
+            this.list = response.data.list || []
+            this.total = response.data.total || 0
+          })
+          .catch(() => {
+            this.loading = false
+            this.list = []
+            this.total = 0
+          })
+
+      } else {
+        getProduct(this.filterQuery)
+          .then((response) => {
+            this.showSup = response.data.showSup
+            this.loading = false
+            this.list = response.data.list || []
+            this.total = response.data.total || 0
+          })
+          .catch(() => {
+            this.loading = false
+            this.list = []
+            this.total = 0
+          })
+      }
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch
+    },
+    combine() {
+
+      if (this.type == 3) {
+        let nameCode = this.currentRow.nameCode ?? ''
+        let productionDate = this.currentRow.productionDate ?? ''
+        let expireDate = this.currentRow.expireDate ?? ''
+        let batchNo = this.currentRow.batchNo ?? ''
+        let udiCode = '#' + nameCode
+          + '#' + productionDate
+          + '#' + expireDate +
+          '#' + batchNo + '#' + '#' + '#'
+        this.closeDialog(udiCode)
+      } else {
+        let selection = this.$refs.multipleTable.selection
+        if (selection.length < 1) {
+          this.$message.error('未选择产品')
+          return
+        }
+        var idster = []
+        if (this.codeArray != null || this.codeArray != undefined) {
+          if (this.codeArray.length > 0) {
+            for (var i = 0; i < this.codeArray.length; i++) {
+              idster.push(this.codeArray[i].relIdFk)
+            }
+          }
+          if (idster.length > 0) {
+            for (var i = 0; i < idster.length; i++) {
+              for (var j = 0; j < selection.length; j++) {
+                if (idster[i] == selection[j].relIdFk) {
+                  this.$message.error('该产品已录入！')
+                  return
+                }
+              }
+            }
+          }
+        }
+
+        var ids = []
+        selection.forEach((obj, index) => {
+          let data = {
+            relId: obj.relIdFk,
+            batchNo: obj.batchNo,
+            productDate: obj.productionDate,
+            expireDate: obj.expireDate,
+            supId: obj.supId,
+            price: obj.price,
+            nameCode: obj.nameCode
+          }
+          ids.push(data)
+        })
+
+        this.chooseFunc(this.lists)
+
+      }
+    },
+
+    findBasicProductSet() {
+      finProductSet().then((response) => {
+        if (response.code == 20000) {
+          this.productRemarkSet = response.data
+        }
+      })
+    },
+
+    handleChange(val) {
+      this.currentRow = val
+      this.radioCheck = val.id
+    }
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        false: 'success',
+        true: 'danger'
+      }
+      return statusMap[status]
+    }
+
+  }
+  ,
+  mounted() {
+    document.body.ondrop = function(event) {
+      event.preventDefault()
+      event.stopPropagation()
+    }
+  }
+  ,
+  created() {
+    this.findBasicProductSet()
+    // 加载表格数据
+    this.getList()
+  }
+
+}
+
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
diff --git a/src/views/dev/deviceChangeOrder.vue b/src/views/dev/deviceChangeOrder.vue
index e6c8c005..83c56255 100644
--- a/src/views/dev/deviceChangeOrder.vue
+++ b/src/views/dev/deviceChangeOrder.vue
@@ -207,7 +207,7 @@
 <!--              </el-form-item>-->
               <el-form-item label="设备来源:">
                 <el-select v-model="createData.sourceType" style="width: 14%" placeholder="请选择设备来源"
-                           clearable="true" @change="thirdSysChange">
+                           clearable="true" @change="updateItem()" >
                   <el-option
                     v-for="item in dict.type.device_source_type"
                     :key="item.value"
@@ -344,6 +344,25 @@
                :chooseFunc="chooseProduct"/>
     </el-dialog>
 
+    <el-dialog
+       title="库存物资录入"
+      :visible.sync="selectInvProductVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      v-if="selectInvProductVisible"
+      :append-to-body='true'
+    >
+      <dialogDeviceInvProduct
+        :closeDialog="closeDialogC2"
+        :invQueryData="invQueryData"
+        :orderQuery="thisData"
+        :listType="2"
+        :type="2"
+        :chooseFunc="chooseProduct"
+      ></dialogDeviceInvProduct>
+    </el-dialog>
+
 
     <el-dialog
       width="65%"
@@ -360,6 +379,7 @@
       <deptDeviceDetail
         :rowData="this.curDevRow"
         :editSaveDev="editSaveDev"
+        :visible="false"
       >
       </deptDeviceDetail>
     </el-dialog>
diff --git a/src/views/dev/deviceInfoFull.vue b/src/views/dev/deviceInfoFull.vue
index 9a7ef4c6..a0d7f4a0 100644
--- a/src/views/dev/deviceInfoFull.vue
+++ b/src/views/dev/deviceInfoFull.vue
@@ -118,7 +118,7 @@
           </el-col>
         </el-row>
       </el-form>
-      <el-table :data="detailList" v-loading="detailLoading">
+      <el-table :data="detailList" v-loading="detailLoading" >
         <el-table-column label="序号" width="50" type="index"/>
         <el-table-column label="科室" width="150" prop="deptName"/>
         <el-table-column label="设备编码" width="150" prop="deviceCode"/>
@@ -147,9 +147,11 @@
         <el-table-column label="供应商" width="100" prop="supName"/>
         <el-table-column label="udi码" width="150" prop="udi"/>
         <el-table-column label="注册/备案号" width="150" prop="zczbhhzbapzbh"/>
-        <el-table-column label="操作" :width="150" fixed="right">
+        <el-table-column label="操作" :width="200" fixed="right">
           <template slot-scope="scope">
-            <el-button class="mr10" type="text" @click="getDeviceLogs(scope.row)"
+            <el-button class="mr10" type="text" @click="rowClickDetail(scope.row)"
+            >详情
+            </el-button><el-button class="mr10" type="text" @click="getDeviceLogs(scope.row)"
             >变更日志
             </el-button>
             <el-popover class="mr10"
@@ -184,6 +186,21 @@
 
     </el-card>
 
+    <el-dialog
+      width="65%"
+      title="设备信息-详情"
+      :visible="true"
+      v-if="deviceInfoFlag"
+      @close="deviceInfoFlag = false"
+    >
+      <deptDeviceDetail
+        :rowData="this.curDevRow"
+        :editSaveDev="editSaveDev"
+        :visible="true"
+      >
+      </deptDeviceDetail>
+    </el-dialog>
+
     <el-dialog
       :title="`设备变更日志——${productRow.productName}(${productRow.deviceCode})`"
       :visible="true"
diff --git a/src/views/dev/invTechniclDialog.vue b/src/views/dev/invTechniclDialog.vue
index 53818437..de748b27 100644
--- a/src/views/dev/invTechniclDialog.vue
+++ b/src/views/dev/invTechniclDialog.vue
@@ -371,15 +371,15 @@ export default {
       this.certLoading = true;
       // let certRuery = {}
       // this.certQuery.customerId = this.inputEdit.customerId;
-      console.log("获取idQuery：")
-      console.log(this.idQuery)
+      // console.log("获取idQuery：")
+      // console.log(this.idQuery)
       this.certQuery.devCodeFk = this.idQuery.devCodeFk;
       this.certQuery.type = 2;
       this.inputQuery={...this.idQuery};
       this.inputQuery.devCodeFk=this.idQuery.devCodeFk;
-      console.log(this.inputQuery);
-      console.log("获取this.certQuery:")
-      console.log(this.certQuery)
+      // console.log(this.inputQuery);
+      // console.log("获取this.certQuery:")
+      // console.log(this.certQuery)
       filterDeviceCert(this.certQuery)
         .then((response) => {
           this.certLoading = false;
diff --git a/src/views/dev/js/deviceChangeOrder.js b/src/views/dev/js/deviceChangeOrder.js
index f7860fe3..2aeb9d15 100644
--- a/src/views/dev/js/deviceChangeOrder.js
+++ b/src/views/dev/js/deviceChangeOrder.js
@@ -12,6 +12,7 @@ import product from "@/views/purchase/purApply/purOrderSelectProduct";
 import {copyProperties} from "@/utils";
 import deviceModifyDialog from "@/views/dev/devInfoEdit.vue";
 import deptDeviceDetail from "@/views/dev/DeptDeviceDetail.vue";
+import dialogDeviceInvProduct from "@/views/dev/DialogDeviceSelectInvProduct.vue";
 import fa from "element-ui/src/locale/lang/fa";
 
 let query = {
@@ -63,7 +64,7 @@ export default {
       required: true,
     }
   },
-  components: {deviceInfo, product, deviceModifyDialog,deptDeviceDetail},
+  components: {deviceInfo, product, deviceModifyDialog,deptDeviceDetail,dialogDeviceInvProduct},
   computed: {
     deviceChangeStatus() {
       return deviceChangeStatus
@@ -110,9 +111,15 @@ export default {
       },
       chooseDeviceFlag: false,
       chooseProductFlag: false,
+      selectInvProductVisible: false,
       deviceInfoFlag: false,
       createTitle: "设备登记",
       curDevRow: null,
+      flagRemark: null,
+      invQueryData: {
+        invCode: null,
+      },
+      thisData: {},
       //==================================================
 
     }
@@ -155,6 +162,14 @@ export default {
     }
   },
   methods: {
+    updateItem() {
+      this.dict.type.device_source_type.forEach((item, index) => {
+        if (this.createData.sourceType == item.value) {
+          console.log(item)
+          this.flagRemark = item.raw.remark
+        }
+      });
+    },
     saveCache() {
       // let data = window.localStorage.getItem(this.cacheKey)
       // if (data == null) {
@@ -356,12 +371,22 @@ export default {
         loading.close()
       })
     },
+    closeDialogC2(rData) {
+      this.selectInvProductVisible = false;
+      if (this.$isNotBlank(rData)) {
+        this.codeFormData.code = rData;
+        this.addCode();
+        // this.codeFormData.code = null;
+      }
+
+      // this.refreshCodesPanel()
+    },
     openChoose(index) {
 
       if (this.createData.type == deviceChangeType.ADD.key) {
-        this.chooseProductFlag = true
+        this[this.flagRemark] = true
       } else {
-        this.chooseDeviceFlag = true
+        this[this.flagRemark] = true
       }
     },
     chooseDevice(row) {
@@ -405,6 +430,7 @@ export default {
 
       }
       this.chooseProductFlag = false
+      this.selectInvProductVisible = false
     },
     parseItemMap() {
       this.$nextTick(() => {
diff --git a/src/views/dev/js/deviceInfoFull.js b/src/views/dev/js/deviceInfoFull.js
index 7a2a4fdc..2a1e0c88 100644
--- a/src/views/dev/js/deviceInfoFull.js
+++ b/src/views/dev/js/deviceInfoFull.js
@@ -1,6 +1,7 @@
 import {deviceAllPage, deviceLogs, detailPage, genDeviceQR} from "@/api/dev/deviceInfoApi";
 import {deviceChangeStatus, deviceChangeType, deviceStatus} from "@/utils/enum";
 import {downloadBase64Image} from "@/utils";
+import deptDeviceDetail from "@/views/dev/DeptDeviceDetail.vue";
 
 let query = {
     page: 1,
@@ -35,6 +36,7 @@ export default {
     props: {isChoose: {required: false, default: false, type: Boolean}, chooseFunc: {required: false, type: Function}},
     data() {
         return {
+          deviceInfoFlag: false,
             locDeptCode: null,
             clickRow: null,
             showSearch: true,
@@ -58,6 +60,12 @@ export default {
         this.getList()
     },
     methods: {
+
+      //设备编辑保存
+      editSaveDev(row) {
+        this.curDevRow = row;
+        this.deviceInfoFlag = false;
+      },
         downloadBase64Image,
         genQR(row) {
             genDeviceQR(row.deviceCode).then(res => {
@@ -88,6 +96,11 @@ export default {
             this.detailQuery = {...detailQuery, deptCode: row.deptCode, productId: row.productId, status: row.status,checkLock:row.checkLock}
             this.getDetailList()
         },
+      rowClickDetail(row){
+        this.curDevRow = row;
+        this.curDevRow.status = null;
+        this.deviceInfoFlag = true;
+      },
         getDetailList() {
             this.detailLoading = true
             detailPage(this.detailQuery).then(res => {
@@ -125,5 +138,8 @@ export default {
                 this.loading = false
             })
         }
-    }
+    },
+  components:{
+    deptDeviceDetail
+  }
 }