From 8a7282b812da28d11beadbd69575a4d02aab0fd2 Mon Sep 17 00:00:00 2001
From: HanLong <404402223@qq.com>
Date: Wed, 4 Feb 2026 10:30:58 +0800
Subject: [PATCH] =?UTF-8?q?feat:[=E8=B5=84=E6=BA=90=E5=BA=93=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86][=E4=BB=AA=E5=99=A8=E7=AE=A1=E7=90=86]=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/business/public/public.js                  |  6 +-
 src/lang/en/business/resource/yq.js                |  3 +-
 src/lang/zh/business/resource/yq.js                |  3 +-
 src/views/business/comps/select/SelectFridge.vue   | 96 ----------------------
 .../comps/select/SelectStorageLocation.vue         | 96 ++++++++++++++++++++++
 src/views/business/resource/yq/comps/detail.vue    | 17 +++-
 src/views/business/resource/yq/list.vue            | 41 +++++----
 7 files changed, 143 insertions(+), 119 deletions(-)
 delete mode 100644 src/views/business/comps/select/SelectFridge.vue
 create mode 100644 src/views/business/comps/select/SelectStorageLocation.vue

diff --git a/src/api/business/public/public.js b/src/api/business/public/public.js
index 12642a9..72caf9f 100644
--- a/src/api/business/public/public.js
+++ b/src/api/business/public/public.js
@@ -115,10 +115,10 @@ export function public_templateStepList(query) {
     params: query
   })
 }
-// 冰箱列表
-export function public_fridgeList(query) {
+// 存储位置列表
+export function public_storageLocation(query) {
   return request({
-    url: '/system/business/public/fridgeList',
+    url: '/system/business/public/storageLocation',
     method: 'get',
     params: query
   })
diff --git a/src/lang/en/business/resource/yq.js b/src/lang/en/business/resource/yq.js
index cd11baf..6f22d37 100644
--- a/src/lang/en/business/resource/yq.js
+++ b/src/lang/en/business/resource/yq.js
@@ -10,7 +10,8 @@ export default {
   wc: 'Compartment',
   xzyq: 'Add Instrument',
   bjyq: 'Edit Instrument Information',
-  sfbx: '是否是冰箱',
+  sfccwz: '是否是存储位置',
+  fzdd: '放置地点',
   yes: 'Yes',
   no: 'No',
 }
diff --git a/src/lang/zh/business/resource/yq.js b/src/lang/zh/business/resource/yq.js
index 0175734..f8ba1ec 100644
--- a/src/lang/zh/business/resource/yq.js
+++ b/src/lang/zh/business/resource/yq.js
@@ -11,7 +11,8 @@ export default {
     xgnr: '修改内容',
     xzyq: '新增仪器',
     bjyq: '编辑仪器',
-    sfbx: '是否是冰箱',
+    sfccwz: '是否是存储位置',
+    fzdd: '放置地点',
     yes: '是',
     no: '否',
 }
\ No newline at end of file
diff --git a/src/views/business/comps/select/SelectFridge.vue b/src/views/business/comps/select/SelectFridge.vue
deleted file mode 100644
index 4cac181..0000000
--- a/src/views/business/comps/select/SelectFridge.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-<!-- 冰箱选择器 -->
-<template>
-  <div>
-    <el-select style="width:100%" v-model="selected" :placeholder="$t('form.placeholderSelect')" :disabled="readonly"
-      :multiple="multiple" @change="handleChange" :filterable="filterable">
-      <el-option v-for="item in list" :key="item.id" :label="item.mc" :value="item.id" />
-    </el-select>
-  </div>
-</template>
-
-<script>
-import { public_fridgeList } from "@/api/business/public/public";
-export default {
-  name: "SelectFridge",
-  components: {},
-  props: {
-    value: {
-      type: [Number, String, Array],
-      default: '',
-    },
-
-    readonly: {
-      type: Boolean,
-      default: false
-    },
-    multiple: {
-      type: Boolean,
-      default: false
-    },
-    filterable: {
-      type: Boolean,
-      default: true
-    },
-    placeholder: {
-      type: String,
-      default: ''
-    }
-  },
-  watch: {
-    value: {
-      immediate: true,
-      handler(v) {
-        if (!this.multiple) {
-          this.selected = v ? v : ''
-        } else {
-          if (v) {
-            //默认传的,分割的字符串，有传数组再改造
-            let arr = v.split(',')
-            let s = []
-            _.forEach(arr, a => {
-              s.push(a)
-            })
-            this.selected = s
-          } else {
-            this.selected = []
-          }
-        }
-        this.getList();
-      }
-    }
-  },
-  data() {
-    return {
-      selected: '',
-      list: [],
-      queryParam: {
-
-      }
-    };
-  },
-  mounted() {
-    this.getList()
-  },
-  methods: {
-    getList() {
-      this.list = []
-      public_fridgeList().then(response => {
-        this.list = response.data || []
-      })
-    },
-    handleChange(val) {
-      this.$emit('input', this.multiple ? (val && val.length>0 ? val.join(','): ''):(val || ''))
-      //默认传的,分割的字符串，有传数组再改造
-      let res;
-      if(this.multiple){
-        res = this.list.filter(item=> {
-          return  val.includes(item.id)
-        })
-      }else {
-        res = this.list.find(item=> item.id === val)
-      }
-      this.$emit('change', res)
-    },
-  }
-};
-</script>
diff --git a/src/views/business/comps/select/SelectStorageLocation.vue b/src/views/business/comps/select/SelectStorageLocation.vue
new file mode 100644
index 0000000..e3ba5d3
--- /dev/null
+++ b/src/views/business/comps/select/SelectStorageLocation.vue
@@ -0,0 +1,96 @@
+<!-- 冰箱选择器 -->
+<template>
+  <div>
+    <el-select style="width:100%" v-model="selected" :placeholder="$t('form.placeholderSelect')" :disabled="readonly"
+      :multiple="multiple" @change="handleChange" :filterable="filterable">
+      <el-option v-for="item in list" :key="item.id" :label="item.mc" :value="item.id" />
+    </el-select>
+  </div>
+</template>
+
+<script>
+import { public_storageLocation } from "@/api/business/public/public";
+export default {
+  name: "SelectFridge",
+  components: {},
+  props: {
+    value: {
+      type: [Number, String, Array],
+      default: '',
+    },
+
+    readonly: {
+      type: Boolean,
+      default: false
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    filterable: {
+      type: Boolean,
+      default: true
+    },
+    placeholder: {
+      type: String,
+      default: ''
+    }
+  },
+  watch: {
+    value: {
+      immediate: true,
+      handler(v) {
+        if (!this.multiple) {
+          this.selected = v ? v : ''
+        } else {
+          if (v) {
+            //默认传的,分割的字符串，有传数组再改造
+            let arr = v.split(',')
+            let s = []
+            _.forEach(arr, a => {
+              s.push(a)
+            })
+            this.selected = s
+          } else {
+            this.selected = []
+          }
+        }
+        this.getList();
+      }
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      list: [],
+      queryParam: {
+
+      }
+    };
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.list = []
+      public_storageLocation().then(response => {
+        this.list = response.data || []
+      })
+    },
+    handleChange(val) {
+      this.$emit('input', this.multiple ? (val && val.length>0 ? val.join(','): ''):(val || ''))
+      //默认传的,分割的字符串，有传数组再改造
+      let res;
+      if(this.multiple){
+        res = this.list.filter(item=> {
+          return  val.includes(item.id)
+        })
+      }else {
+        res = this.list.find(item=> item.id === val)
+      }
+      this.$emit('change', res)
+    },
+  }
+};
+</script>
diff --git a/src/views/business/resource/yq/comps/detail.vue b/src/views/business/resource/yq/comps/detail.vue
index 270007d..24dfcee 100644
--- a/src/views/business/resource/yq/comps/detail.vue
+++ b/src/views/business/resource/yq/comps/detail.vue
@@ -44,8 +44,23 @@
         </el-row>
         <el-row>
           <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.yq.sfccwz')" prop="ccwz" >
+              <el-select v-model="form.ccwz" :placeholder="$t('form.placeholderSelect')" disabled style="width: 100%;">
+                <el-option key="1" :label="$t('page.business.resource.yq.no')" :value="1" />
+                <el-option key="10" :label="$t('page.business.resource.yq.yes')" :value="10" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="form.ccwz == 10">
             <el-form-item :label="$t('page.business.resource.yq.wc')" prop="wc">
-              <el-input v-model="form.wc" :placeholder="$t('form.placeholderSelect')" disabled />
+              <el-input v-model="form.wc" :placeholder="$t('form.placeholderInput')" maxlength="50" disabled/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12" v-if="form.ccwz == 10">
+            <el-form-item :label="$t('page.business.resource.yq.fzdd')" prop="fzdd">
+              <el-input v-model="form.fzdd" :placeholder="$t('form.placeholderInput')" maxlength="50" disabled/>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/yq/list.vue b/src/views/business/resource/yq/list.vue
index c077226..c86d9c1 100644
--- a/src/views/business/resource/yq/list.vue
+++ b/src/views/business/resource/yq/list.vue
@@ -17,13 +17,12 @@
       <el-form-item :label="$t('page.business.resource.yq.ssbm') + '：'" prop="bmMc">
         <el-input v-model="queryParams.bmMc" placeholder="" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('page.business.resource.yq.sfbx') + '：'" prop="fridge">
-        <el-select v-model="queryParams.fridge" :placeholder="$t('form.placeholderSelect')" clearable @change="handleQuery">
-          <el-option key="1" :label="$t('page.business.resource.yq.yes')" value="1" />
-          <el-option key="10" :label="$t('page.business.resource.yq.no')" value="10" />
+      <el-form-item :label="$t('page.business.resource.yq.sfccwz') + '：'" prop="ccwz">
+        <el-select v-model="queryParams.ccwz" :placeholder="$t('form.placeholderSelect')" clearable @change="handleQuery">
+          <el-option key="1" :label="$t('page.business.resource.yq.no')" value="1" />
+          <el-option key="10" :label="$t('page.business.resource.yq.yes')" value="10" />
         </el-select>
       </el-form-item>
-
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('form.search')
         }}</el-button>
@@ -66,7 +65,7 @@
 
     <!-- 添加或修改仪器管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.yq.yqmc')" prop="mc">
@@ -101,23 +100,29 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.yq.ssbm')" prop="bmId">
-              <!-- <el-input v-model="form.bmMc" :placeholder="$t('form.placeholderSelect')" /> -->
               <SelectDept v-model="form.bmId" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.yq.sfccwz')" prop="ccwz">
+              <el-select v-model="form.ccwz" :placeholder="$t('form.placeholderSelect')" style="width: 100%;">
+                <el-option key="1" :label="$t('page.business.resource.yq.no')" :value="1" />
+                <el-option key="10" :label="$t('page.business.resource.yq.yes')" :value="10" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="form.ccwz == 10">
             <el-form-item :label="$t('page.business.resource.yq.wc')" prop="wc">
               <BusinessSelect v-model="form.wc" dictType="business_cctj"></BusinessSelect>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.yq.sfbx')" prop="fridge">
-              <el-select v-model="form.fridge" :placeholder="$t('form.placeholderSelect')">
-                <el-option key="1" :label="$t('page.business.resource.yq.yes')" value="1" />
-                <el-option key="10" :label="$t('page.business.resource.yq.no')" value="10" />
-              </el-select>
+        </el-row>
+        <el-row>
+          <el-col :span="12" v-if="form.ccwz == 10">
+            <el-form-item :label="$t('page.business.resource.yq.fzdd')" prop="fzdd">
+              <el-input v-model="form.fzdd" :placeholder="$t('form.placeholderInput')" maxlength="50" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -166,9 +171,10 @@ import YqDetail from './comps/detail'
 import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
 import SelectDept from '@/views/business/comps/select/SelectDept';
 import { mapGetters } from 'vuex'
+import SelectStorageLocation from '@/views/business/comps/select/SelectStorageLocation'
 export default {
   name: 'Yq',
-  components: { YqDetail, BusinessSelect, SelectDept },
+  components: { YqDetail, BusinessSelect, SelectDept, SelectStorageLocation },
 
   data() {
     return {
@@ -203,7 +209,7 @@ export default {
         jzrq: null,
         bmMc: null,
         wc: null,
-        fridge: null,
+        ccwz: null,
       },
       // 表单参数
       form: {
@@ -236,7 +242,7 @@ export default {
         wc: [
           { required: true, message: this.$t('page.business.resource.yq.wc') + this.$t('form.notEmpty'), trigger: "change" },
         ],
-        fridge: [
+        ccwz: [
           { required: true, message: '', trigger: "change" },
         ],
         qmrmm: [
@@ -282,7 +288,8 @@ export default {
         jzrq: null,
         bmId: null,
         wc: null,
-        fridge: null,
+        ccwz: null,
+        fzdd: null,
         qmyy: this.$t('page.business.resource.yq.xzyq'),
       }
       this.resetForm('form')