feat:[资源库管理][仪器管理]存储位置

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
   })

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',
 }

src/lang/zh/business/resource/yq.js

@@ -11,7 +11,8 @@ export default {
     xgnr: '修改内容',
     xzyq: '新增仪器',
     bjyq: '编辑仪器',
-    sfbx: '是否是冰箱',
+    sfccwz: '是否是存储位置',
+    fzdd: '放置地点',
     yes: '是',
     no: '否',
 }

src/views/business/comps/select/SelectFridge.vue → src/views/business/comps/select/SelectStorageLocation.vue

@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import { public_fridgeList } from "@/api/business/public/public";
+import { public_storageLocation } from "@/api/business/public/public";
 export default {
   name: "SelectFridge",
   components: {},
@@ -74,7 +74,7 @@ export default {
   methods: {
     getList() {
       this.list = []
-      public_fridgeList().then(response => {
+      public_storageLocation().then(response => {
         this.list = response.data || []
       })
     },

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>

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')