部门调整

node_modules/.vite/deps/_metadata.json

@@ -1,107 +1,107 @@
 {
-  "hash": "11bf1907",
-  "browserHash": "396afcaf",
+  "hash": "0a0a04ca",
+  "browserHash": "9691a56e",
   "optimized": {
     "@ant-design/icons-vue": {
       "src": "../../@ant-design/icons-vue/es/index.js",
       "file": "@ant-design_icons-vue.js",
-      "fileHash": "9225396b",
+      "fileHash": "ab9e9849",
       "needsInterop": false
     },
     "@antv/g2plot": {
       "src": "../../@antv/g2plot/esm/index.js",
       "file": "@antv_g2plot.js",
-      "fileHash": "7492e894",
+      "fileHash": "b0c0178e",
       "needsInterop": false
     },
     "@antv/g2plot/lib/utils": {
       "src": "../../@antv/g2plot/lib/utils/index.js",
       "file": "@antv_g2plot_lib_utils.js",
-      "fileHash": "63a3dca9",
+      "fileHash": "5e48d5fe",
       "needsInterop": true
     },
     "ant-design-vue": {
       "src": "../../ant-design-vue/es/index.js",
       "file": "ant-design-vue.js",
-      "fileHash": "eaacbfbb",
+      "fileHash": "fc375cdc",
       "needsInterop": false
     },
     "ant-design-vue/es/locale/zh_CN": {
       "src": "../../ant-design-vue/es/locale/zh_CN.js",
       "file": "ant-design-vue_es_locale_zh_CN.js",
-      "fileHash": "b1588dbd",
+      "fileHash": "fa37e74b",
       "needsInterop": false
     },
     "axios": {
       "src": "../../axios/index.js",
       "file": "axios.js",
-      "fileHash": "440d5af2",
+      "fileHash": "cb31d337",
       "needsInterop": false
     },
     "countup.js": {
       "src": "../../countup.js/dist/countUp.min.js",
       "file": "countup__js.js",
-      "fileHash": "29a8f745",
+      "fileHash": "dd20aa32",
       "needsInterop": false
     },
     "dayjs": {
       "src": "../../dayjs/dayjs.min.js",
       "file": "dayjs.js",
-      "fileHash": "303fcbd6",
+      "fileHash": "b2bcc65a",
       "needsInterop": true
     },
     "dayjs/locale/zh-cn": {
       "src": "../../dayjs/locale/zh-cn.js",
       "file": "dayjs_locale_zh-cn.js",
-      "fileHash": "9c489314",
+      "fileHash": "22d59101",
       "needsInterop": true
     },
     "js-md5": {
       "src": "../../js-md5/src/md5.js",
       "file": "js-md5.js",
-      "fileHash": "03c44a9d",
+      "fileHash": "eb06532a",
       "needsInterop": true
     },
     "less": {
       "src": "../../less/dist/less.js",
       "file": "less.js",
-      "fileHash": "b150d620",
+      "fileHash": "874ef970",
       "needsInterop": true
     },
     "mathjs": {
       "src": "../../mathjs/lib/esm/index.js",
       "file": "mathjs.js",
-      "fileHash": "0e4d6bf5",
+      "fileHash": "2cce35ca",
       "needsInterop": false
     },
     "pinia": {
       "src": "../../pinia/dist/pinia.mjs",
       "file": "pinia.js",
-      "fileHash": "5a79798f",
+      "fileHash": "204777bd",
       "needsInterop": false
     },
     "pinia-plugin-persist": {
       "src": "../../pinia-plugin-persist/dist/pinia-persist.es.js",
       "file": "pinia-plugin-persist.js",
-      "fileHash": "7f3ffc76",
+      "fileHash": "b205b56c",
       "needsInterop": false
     },
     "vue": {
       "src": "../../vue/dist/vue.runtime.esm-bundler.js",
       "file": "vue.js",
-      "fileHash": "20be2db0",
+      "fileHash": "e550d25b",
       "needsInterop": false
     },
     "vue-baidu-map-3x": {
       "src": "../../vue-baidu-map-3x/dist/vue-baidu-map-3x.es.js",
       "file": "vue-baidu-map-3x.js",
-      "fileHash": "6a989091",
+      "fileHash": "261a8293",
       "needsInterop": false
     },
     "vue-router": {
       "src": "../../vue-router/dist/vue-router.mjs",
       "file": "vue-router.js",
-      "fileHash": "fedaa6ef",
+      "fileHash": "85f5442e",
       "needsInterop": false
     }
   },
@@ -137,4 +137,4 @@
       "file": "chunk-AC2VUBZ6.js"
     }
   }
-}
+}

src/operation/moduleNormal/depManage/detail/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <detail-template :headData="mainAreaData" :title="userData.name" :tabs="['详细信息','负责区域','负责产品']" ownertable="sys_hr" :delParam="{id:'20221102090403',content:{hrids:[router.currentRoute.value.query.id]}}">
+    <detail-template :headData="mainAreaData" :title="userData.name" :tabs="['详细信息','负责区域','负责产品','负责设备']" ownertable="sys_hr" :delParam="{id:'20221102090403',content:{hrids:[router.currentRoute.value.query.id]}}">
       <template #operation>
         <edit :data="userData" @onSuccess="mianData"></edit>
         <bindUserToAccount :data="userData" @onSuccess="mianData"/>
@@ -22,6 +22,9 @@
       <template #tab2>
         <productList></productList>
       </template>
+      <template #tab3>
+        <device></device>
+      </template>
     </detail-template>
   </div>
 </template>
@@ -36,6 +39,7 @@ import bindUserToAccount from './modules/bindUserToAccount.vue'
 import defaultInfo from '@/template/defaultInfo/index.vue'
 import areaList from './tabs/area/index.vue'
 import productList from './tabs/product/index.vue'
+import device from './tabs/device/index.vue'
 import { useRouter } from "vue-router";
 import { onMounted,ref } from "vue";
 import {im} from "mathjs";

src/operation/moduleNormal/depManage/detail/tabs/device/index.vue

@@ -0,0 +1,68 @@
+<template>
+  <div>
+    <tableTemplate ref="list" rowKey="w_area_hr" :columns="utils.TBLayout('deviceTable')" :param="param" >
+      <template #operation >
+        <a-input-search style="width: 300px;margin-bottom: 20px" v-model:value="param.content.where.condition" placeholder="请搜索" @pressEnter="onSearch"
+                        @search="onSearch" class="inline-16">
+        </a-input-search>
+        <label>设备类型：</label>
+        <a-select v-model:value="param.content.where.prodtype" style="width: 150px;margin-right: 10px" allowClear placeholder="请选择设备类型" @change="onSearch">
+          <a-select-option v-for="item in typeOptions" :key="item.index" :value="item.value"  >{{item.remarks}}</a-select-option>
+        </a-select>
+        <label>状态：</label>
+        <a-select v-model:value="param.content.where.status" style="width: 150px" allowClear placeholder="请选择状态" @change="onSearch">
+          <a-select-option v-for="item in statusOptions" :key="item.value" :value="item.value"  >{{item.value}}</a-select-option>
+        </a-select>
+      </template>
+      <template #tb_cell="{data}">
+      </template>
+    </tableTemplate>
+  </div>
+</template>
+
+<script setup>
+  import tableTemplate from '../../modules/tableTemplate.vue'
+  import utils from '@/utils/utils'
+  import Api from '@/api/api'
+  import { useRouter } from 'vue-router'
+  import {onMounted, ref} from "vue";
+  let router = useRouter()
+  const list = ref()
+  let param = ref({
+    "id": 20230617150002,
+    "content": {
+      "hrid": router.currentRoute.value.query.id,
+      "pageNumber": 1,
+      "pageSize": 20,
+      "where": {
+        "condition": "",
+        "prodtype":"",
+        "status":""
+      }
+    },
+  })
+  const typeOptions = ref([])
+  const statusOptions = ref([
+      {
+        value:'启用'
+      },
+    {
+      value:'禁用'
+    }
+  ])
+  const onSearch = async ()=>{
+    param.value.content.pageNumber = 1
+    list.value.listData()
+  }
+  const typeList = async()=>{
+    const res = await Api.optionstype('prodtype')
+    typeOptions.value = res.data
+  }
+  onMounted(()=>{
+    typeList()
+  })
+</script>
+
+<style scoped>
+
+</style>

src/operation/moduleNormal/depManage/detail/tabs/product/index.vue

@@ -4,8 +4,18 @@
       <template #operation >
         <add style="margin-bottom: 20px" @onSuccess="onSuccess" class="inline-16"></add>
         <a-input-search style="width: 300px" v-model:value="param.content.where.condition" placeholder="编码/名称/描述" @pressEnter="onSearch"
-                        @search="onSearch">
+                        @search="onSearch" class="inline-16">
         </a-input-search>
+        <label>设备类型：</label>
+        <a-select v-model:value="param.content.where.prodtype" style="width: 150px;margin-right: 10px" allowClear placeholder="请选择设备类型" @change="onSearch"
+                  :defaultActiveFirstOption="false">
+          <a-select-option v-for="item in typeOptions" :key="item.index" :value="item.value" >{{item.remarks}}</a-select-option>
+        </a-select>
+        <label>状态：</label>
+        <a-select v-model:value="param.content.where.isused" style="width: 150px" allowClear placeholder="请选择状态" @change="onSearch"
+                  :defaultActiveFirstOption="false">
+          <a-select-option v-for="item in statusOptions" :key="item.value" :value="item.value"  >{{item.label}}</a-select-option>
+        </a-select>
       </template>
       <template #tb_cell="{data}">
         <template v-if="data.column.dataIndex === 'operation'">
@@ -30,6 +40,17 @@
   import { useRouter } from 'vue-router'
   let router = useRouter()
   const list = ref()
+  const typeOptions = ref([])
+  const statusOptions = ref([
+    {
+      value:1,
+      label:'启用'
+    },
+    {
+      value:0,
+      label:'禁用'
+    }
+  ])
   let param = ref({
     "id": 20230617160402,
     "content": {
@@ -39,8 +60,8 @@
       "pageSize": 20,
       "where": {
         "condition": "",
-        "prodtype": "",
-        "isused": ""
+        "prodtype": '' ,
+        "isused": ''
       }
     },
   })
@@ -72,6 +93,13 @@
   const onSuccess = ()=>{
     list.value.listData()
   }
+  const typeList = async()=>{
+    const res = await Api.optionstype('prodtype')
+    typeOptions.value = res.data
+  }
+  onMounted(()=>{
+    typeList()
+  })
 </script>
 
 <style scoped>