From 1bacd26f51d1bfd30da1a83943bb583083d9d9b5 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 26 Apr 2024 09:52:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dev/deviceInfoApi.js            |   9 +
 src/utils/enum.js                       |   2 +-
 src/views/dev/DialogDeviceSelectAdd.vue | 361 ++++++++++++++++++++++++
 src/views/dev/deviceChangeOrder.vue     | 119 ++++----
 src/views/dev/js/deviceChangeOrder.js   |  32 ++-
 5 files changed, 467 insertions(+), 56 deletions(-)
 create mode 100644 src/views/dev/DialogDeviceSelectAdd.vue

diff --git a/src/api/dev/deviceInfoApi.js b/src/api/dev/deviceInfoApi.js
index 7d6bdf2e..6556e06c 100644
--- a/src/api/dev/deviceInfoApi.js
+++ b/src/api/dev/deviceInfoApi.js
@@ -19,6 +19,15 @@ export function detailByUserPage(query) {
     }
   )
 }
+export function detailByDeptCodePage(query) {
+  return axios(
+    {
+      url: "/udi/device/info/detailByDeptCode/page",
+      method: "POST",
+      data: query
+    }
+  )
+}
 
 export function deviceAllPage(query) {
   return axios(
diff --git a/src/utils/enum.js b/src/utils/enum.js
index 93029e6c..073cd7a7 100644
--- a/src/utils/enum.js
+++ b/src/utils/enum.js
@@ -1,5 +1,5 @@
 export const deviceChangeType = {
-  ADD: {key: "ADD", tagType: "primary", desc: "新增入库"},
+  ADD: {key: "ADD", tagType: "primary", desc: "设备登记"},
   CHANGE: {key: "CHANGE", tagType: "warning", desc: "变更归属"},
   DESTROY: {key: "DESTROY", tagType: "danger", desc: "销毁/报废"},
 }
diff --git a/src/views/dev/DialogDeviceSelectAdd.vue b/src/views/dev/DialogDeviceSelectAdd.vue
new file mode 100644
index 00000000..e6857185
--- /dev/null
+++ b/src/views/dev/DialogDeviceSelectAdd.vue
@@ -0,0 +1,361 @@
+<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'
+import { detailByDeptCodePage } from '@/api/dev/deviceInfoApi'
+
+export default {
+  name: 'DialogDeviceInvProduct',
+  props: {
+    deptCode: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        page: 1,
+        limit: 10,
+        deptCode: this.deptCode,
+      },
+      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
+      detailByDeptCodePage(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 83c56255..8d10f519 100644
--- a/src/views/dev/deviceChangeOrder.vue
+++ b/src/views/dev/deviceChangeOrder.vue
@@ -110,24 +110,24 @@
     </el-card>
 
     <el-card>
-      <div slot="header" class="clearfix">
-        <div class="fl">
-          {{ `变更详情 ${clickRow ? '——' + clickRow.name + '(' + clickRow.orderId + ')' : ''}` }}
-        </div>
-        <div v-if="clickRow" class="fr">
-          <el-button @click="getDetailList">刷新</el-button>
-        </div>
-      </div>
-      <div v-if="clickRow">
-        <div class="mt20 mb20">
-          <el-steps align-center :active="stepActive" finish-status="success" :process-status="processStatus">
-            <el-step :title="deviceChangeStatus.WAIT_CONFIRM.desc" :description="`备注说明：${clickRow.remark||''}`"/>
-            <el-step v-if="!stepActive"
-                     :title="`${deviceChangeStatus.FINISH.desc}/${deviceChangeStatus.CANCEL.desc}/${deviceChangeStatus.REJECT_CONFIRM.desc}`"/>
-            <el-step v-else :title="clickRow.statusName" :description="`确认备注：${clickRow.confirmRemark||''}`"/>
-          </el-steps>
-        </div>
-      </div>
+<!--      <div slot="header" class="clearfix">-->
+<!--        <div class="fl">-->
+<!--          {{ `变更详情 ${clickRow ? '——' + clickRow.name + '(' + clickRow.orderId + ')' : ''}` }}-->
+<!--        </div>-->
+<!--        <div v-if="clickRow" class="fr">-->
+<!--          <el-button @click="getDetailList">刷新</el-button>-->
+<!--        </div>-->
+<!--      </div>-->
+<!--      <div v-if="clickRow">-->
+<!--        <div class="mt20 mb20">-->
+<!--          <el-steps align-center :active="stepActive" finish-status="success" :process-status="processStatus">-->
+<!--            <el-step :title="deviceChangeStatus.WAIT_CONFIRM.desc" :description="`备注说明：${clickRow.remark||''}`"/>-->
+<!--            <el-step v-if="!stepActive"-->
+<!--                     :title="`${deviceChangeStatus.FINISH.desc}/${deviceChangeStatus.CANCEL.desc}/${deviceChangeStatus.REJECT_CONFIRM.desc}`"/>-->
+<!--            <el-step v-else :title="clickRow.statusName" :description="`确认备注：${clickRow.confirmRemark||''}`"/>-->
+<!--          </el-steps>-->
+<!--        </div>-->
+<!--      </div>-->
       <el-table :data="detailList" v-loading="detailLoading">
         <el-table-column label="序号" width="50" type="index"/>
         <el-table-column label="设备编码" width="150" prop="deviceCode"/>
@@ -164,12 +164,13 @@
 
       <el-card class="dialogCard" style="margin-top: -30px;">
         <div slot="header" class="clearfix">
-          <div class="fl">
-            <!--            <span>-->
-            <!--              类型：<el-tag :type="this.type.tagType">{{ this.type.desc }}</el-tag>-->
-            <!--            </span>-->
-            <span class="ml10">当前部门：{{ locDeptName }}</span>
-          </div>
+<!--          <div class="fl">-->
+<!--            &lt;!&ndash;            <span>&ndash;&gt;-->
+<!--            &lt;!&ndash;              类型：<el-tag :type="this.type.tagType">{{ this.type.desc }}</el-tag>&ndash;&gt;-->
+<!--            &lt;!&ndash;            </span>&ndash;&gt;-->
+<!--&lt;!&ndash;            <span class="ml10">当前部门：{{ locDeptName }}</span>&ndash;&gt;-->
+
+<!--          </div>-->
           <div class="fr">
             <!--            <el-button @click="showCreateDialog = false">关闭</el-button>-->
             <!--            <el-button v-if="createActive==0" @click="changeActive(true)" type="primary">下一步</el-button>-->
@@ -189,8 +190,15 @@
         <el-form :disabled="createActive==1" :model="createData" :rules="createRule" ref="createForm"
                  label-width="auto">
           <el-row>
-            <el-col>
-              <el-form-item label="目标部门" prop="toDeptCode" v-if="createData.type==deviceChangeType.CHANGE.key">
+            <el-col :span="6">
+            <el-form-item label="操作部门: " prop="locDeptCode">
+              <deptSelect class="width-full" :value.sync="createData.deptCode"/>
+            </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="目标部门: " prop="toDeptCode" v-if="createData.type==deviceChangeType.CHANGE.key">
                 <deptSelect class="width-full" :notCode="locDeptCode" :value.sync="createData.toDeptCode"></deptSelect>
               </el-form-item>
             </el-col>
@@ -205,18 +213,18 @@
 <!--                          maxlength="300"-->
 <!--                          v-model="createData.remark"/>-->
 <!--              </el-form-item>-->
-              <el-form-item label="设备来源:">
-                <el-select v-model="createData.sourceType" style="width: 14%" placeholder="请选择设备来源"
-                           clearable="true" @change="updateItem()" >
-                  <el-option
-                    v-for="item in dict.type.device_source_type"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    <span style="float: left;font-size: 13px">{{ item.label }}</span>
-                  </el-option>
-                </el-select>
-              </el-form-item>
+<!--              <el-form-item label="设备来源:">-->
+<!--                <el-select v-model="createData.sourceType" style="width: 14%" placeholder="请选择设备来源"-->
+<!--                           clearable="true" @change="updateItem()" >-->
+<!--                  <el-option-->
+<!--                    v-for="item in dict.type.device_source_type"-->
+<!--                    :key="item.value"-->
+<!--                    :label="item.label"-->
+<!--                    :value="item.value">-->
+<!--                    <span style="float: left;font-size: 13px">{{ item.label }}</span>-->
+<!--                  </el-option>-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
             </el-col>
           </el-row>
         </el-form>
@@ -225,17 +233,19 @@
                style="margin-top: 10px;">
         <div slot="header" class="clearfix">
           <div class="fr">
-            <el-button type="primary" @click="openChoose" :disabled="createData.sourceType == null">添加设备</el-button>
-            <el-switch
-              class="ml10"
-              v-model="fullScreenFlag"
-              active-text="全屏">
-            </el-switch>
+            <el-button type="primary" @click="openChoose(1)" v-if="createData.type==deviceChangeType.ADD.key">产品录入</el-button>
+            <el-button type="primary" @click="openChoose(2)" v-if="createData.type==deviceChangeType.ADD.key">库存物资录入</el-button>
+            <el-button type="primary" @click="openChoose(3)" v-if="createData.type==deviceChangeType.CHANGE.key" :disabled="!this.createData.deptCode">添加设备</el-button>
+<!--            <el-switch-->
+<!--              class="ml10"-->
+<!--              v-model="fullScreenFlag"-->
+<!--              active-text="全屏">-->
+<!--            </el-switch>-->
           </div>
         </div>
-        <div class="mb10">
-          <el-tag class="ml5 mb5" type="info" color="#00a1ff" v-for="(v,i) in itemMap"  :key="v[0]">{{ v[0] }} * {{ v[1] }}条</el-tag>
-        </div>
+<!--        <div class="mb10">-->
+<!--          <el-tag class="ml5 mb5" type="info" color="#00a1ff" v-for="(v,i) in itemMap"  :key="v[0]">{{ v[0] }} * {{ v[1] }}条</el-tag>-->
+<!--        </div>-->
         <el-table :data="itemList" width="100%" :height="fullScreenFlag?'93vh':'40vh'">
           <el-table-column label="序号" type="index" width="50"/>
           <!--          <el-table-column v-if="createData.type==deviceChangeType.ADD.key" label="设备号" prop="deviceCode"-->
@@ -332,7 +342,7 @@
 
     </el-dialog>
 
-    <el-dialog width="80%" title="选择产品"
+    <el-dialog width="80%" title="产品录入"
                :visible="true"
                v-if="chooseProductFlag"
                @close="chooseProductFlag = false"
@@ -363,6 +373,19 @@
       ></dialogDeviceInvProduct>
     </el-dialog>
 
+    <el-dialog
+      title="设备添加"
+      :visible.sync="selectDeviceAddVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      v-if="selectDeviceAddVisible"
+      :append-to-body='true'
+    >
+      <dialogDeviceSelectAdd
+        :deptCode="this.createData.deptCode"
+      ></dialogDeviceSelectAdd>
+    </el-dialog>
 
     <el-dialog
       width="65%"
diff --git a/src/views/dev/js/deviceChangeOrder.js b/src/views/dev/js/deviceChangeOrder.js
index 2aeb9d15..83aa4be1 100644
--- a/src/views/dev/js/deviceChangeOrder.js
+++ b/src/views/dev/js/deviceChangeOrder.js
@@ -13,6 +13,7 @@ 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 dialogDeviceSelectAdd from "@/views/dev/DialogDeviceSelectAdd.vue";
 import fa from "element-ui/src/locale/lang/fa";
 
 let query = {
@@ -33,6 +34,7 @@ let detailQuery = {
 let createData = {
   type: deviceChangeType.CHANGE.key,
   toDeptCode: null,
+  deptCode: null,
   name: null,
   remark: null,
   items: []
@@ -58,13 +60,13 @@ let item = {
 }
 export default {
   name: "deviceChangeOrder",
-  dicts: ['device_source_type'],
+  // dicts: ['device_source_type'],
   props: {
     type: {
       required: true,
     }
   },
-  components: {deviceInfo, product, deviceModifyDialog,deptDeviceDetail,dialogDeviceInvProduct},
+  components: {deviceInfo, product, deviceModifyDialog,deptDeviceDetail,dialogDeviceInvProduct,dialogDeviceSelectAdd},
   computed: {
     deviceChangeStatus() {
       return deviceChangeStatus
@@ -108,10 +110,17 @@ export default {
           tigger: 'change',
           message: "目标部门不能为空"
         }],
+        locDeptCode: [{
+          required: true,
+          validator: this.validDeptCode,
+          tigger: 'change',
+          message: "操作部门不能为空"
+        }],
       },
       chooseDeviceFlag: false,
       chooseProductFlag: false,
       selectInvProductVisible: false,
+      selectDeviceAddVisible: false,
       deviceInfoFlag: false,
       createTitle: "设备登记",
       curDevRow: null,
@@ -382,12 +391,14 @@ export default {
       // this.refreshCodesPanel()
     },
     openChoose(index) {
-
-      if (this.createData.type == deviceChangeType.ADD.key) {
-        this[this.flagRemark] = true
-      } else {
-        this[this.flagRemark] = true
+      if (index == 1) {
+        this.chooseProductFlag = true
+      }else if (index == 2) {
+        this.selectInvProductVisible = true
+      }else if (index == 3) {
+        this.selectDeviceAddVisible = true
       }
+
     },
     chooseDevice(row) {
       let data = copyProperties(row, item)
@@ -480,6 +491,12 @@ export default {
       }
       callback()
     },
+    validDeptCode(rule, value, callback) {
+      if (!value){
+        callback(new Error("操作部门不能为空"))
+      }
+      callback()
+    },
     openCacheOrder() {
       let data = window.localStorage.getItem(this.cacheKey)
       if (data != null) {
@@ -499,6 +516,7 @@ export default {
     openCreate() {
       this.fullScreenFlag = false
       this.createData = {...createData, type: this.type.key}
+      this.createData.deptCode = this.$store.getters.locDeptCode
       this.createActive = 0
       this.oldType = null
       this.itemList = []