改动

src/api/DeliveryWarehouse/DeliveryWarehouseSelect/interface/KqxxSaveReqVO.ts

@@ -4,6 +4,8 @@
 export interface KqxxSaveReqVO {
   index?: number;
   kqId?: number;
+  kqbm?: string;
+
   /**
    * 主键
    */

src/store/modules/user.ts

@@ -1,10 +1,10 @@
-import { store } from '@/store'
-import { defineStore } from 'pinia'
-import { getAccessToken, removeToken } from '@/utils/auth'
-import { CACHE_KEY, useCache, deleteUserCache } from '@/hooks/web/useCache'
-import { getInfo, loginOut } from '@/api/login'
+import {store} from '@/store'
+import {defineStore} from 'pinia'
+import {getAccessToken, removeToken} from '@/utils/auth'
+import {CACHE_KEY, deleteUserCache, useCache} from '@/hooks/web/useCache'
+import {getInfo, loginOut} from '@/api/login'
 
-const { wsCache } = useCache()
+const {wsCache} = useCache()
 
 interface UserVO {
   id: number
@@ -56,6 +56,21 @@ export const useUserStore = defineStore('admin-user', {
       let userInfo = wsCache.get(CACHE_KEY.USER)
       if (!userInfo) {
         userInfo = await getInfo()
+        //手动处理备选交收库   根据当前登录人不同身份显示不同的菜单名称
+        console.log(userInfo,'userInfo')
+        if(userInfo.roles.includes('grain_trading_center')){
+          userInfo.menus = replaceNameInJson(userInfo.menus, '备选交收库', '国家备选交收库')
+        }
+        else if(userInfo.roles.includes('provincial_trading_center')){
+          userInfo.menus = replaceNameInJson(userInfo.menus, '备选交收库', '省级备选交收库')
+        }
+        else if(userInfo.roles.includes('bank_users')){
+          userInfo.menus = replaceNameInJson(userInfo.menus, '备选交收库', '银行备选交收库')
+        }
+        else {
+
+        }
+
       }
       this.permissions = userInfo.permissions
       this.roles = userInfo.roles
@@ -98,6 +113,32 @@ export const useUserStore = defineStore('admin-user', {
   }
 })
 
+type JsonValue = string | number | boolean | null | JsonObject | JsonArray;
+interface JsonObject {
+  [key: string]: JsonValue;
+}
+interface JsonArray extends Array<JsonValue> {}
+
+function replaceNameInJson(data: JsonValue, oldName: string, newName: string): JsonValue {
+  if (typeof data === 'object' && data !== null) {
+    if (Array.isArray(data)) {
+      // Handle array
+      return data.map(item => replaceNameInJson(item, oldName, newName));
+    } else {
+      // Handle object
+      const newData: JsonObject = {};
+      for (const key in data) {
+        if (data.hasOwnProperty(key)) {
+          newData[key] = key === 'name' && data[key] === oldName ? newName : replaceNameInJson(data[key], oldName, newName);
+        }
+      }
+      return newData;
+    }
+  } else {
+    // Return primitive types as is
+    return data;
+  }
+}
 export const useUserStoreWithOut = () => {
   return useUserStore(store)
 }

src/utils/dict.ts

@@ -241,6 +241,8 @@ export enum DICT_TYPE {
   IOT_UNIT_TYPE = 'iot_unit_type', // IOT 单位类型
   SYSTEM_CAZT = 'system_cazt', // 仓廒状态
   SYSTEM_CFLX = 'system_cflx', // 仓廒类型
+  SYSTEM_CCZT = 'system_cczt', // 储存状态
+
   BANK_TYPE = 'bank_type', // 银行类型
   HY_STATE = 'hy_state', // 银行类型
   SYSTEM_QYXZ = 'system_qyxz', // 银行类型

src/views/DeliveryWarehouse/LibraryManagement/Dwxx.vue

@@ -8,16 +8,16 @@ import {getIntDictOptions, getStrDictOptions} from "@/utils/dict";
 const formRef1 = ref();
 const dwxxReqVO = ref<DwxxSaveReqVO>({});
 const formRules1 = ref({
-  dwmc: [{required: true, message: '单位名称不能为空'}],
-  tyxydm: [{required: true, message: '统一信用代码不能为空'}],
-  fddbr: [{required: true, message: '法定代表人不能为空'}],
-  sfzh: [{required: true, message: '身份证号不能为空'}],
+  dwmc: [{required: false, message: '单位名称不能为空'}],
+  tyxydm: [{required: false, message: '统一信用代码不能为空'}],
+  fddbr: [{required: false, message: '法定代表人不能为空'}],
+  sfzh: [{required: false, message: '身份证号不能为空'}],
   lxfs: [{required: true, message: '联系方式不能为空'}],
-  zcrq: [{required: true, message: '注册日期不能为空'}],
-  zcdz: [{required: true, message: '注册地址不能为空'}],
-  yzbm: [{required: true, message: '邮政编码不能为空'}],
-  qyxz: [{required: true, message: '企业性质不能为空'}],
-  resid: [{required: true, message: '请上传营业执照'}]
+  zcrq: [{required: false, message: '注册日期不能为空'}],
+  zcdz: [{required: false, message: '注册地址不能为空'}],
+  yzbm: [{required: false, message: '邮政编码不能为空'}],
+  qyxz: [{required: false, message: '企业性质不能为空'}],
+  resid: [{required: false, message: '请上传营业执照'}]
 });
 const loading = ref(false);
 const getData = async () => {
@@ -56,65 +56,66 @@ onMounted(() => {
   <ElCard>
     <template #header>
       <div class="header">
-        <div class="title text-2xl font-['黑体'] font-700">单位信息</div>
+        <Title title="单位信息" />
       </div>
     </template>
-    <div v-loading="loading">
+    <div class="mt-30px" v-loading="loading">
       <el-form
+        label-position="top"
         ref="formRef1" :model="dwxxReqVO" :rules="formRules1"
         label-width="150">
-        <el-row>
-          <el-col :span="12">
+        <el-row class="w-[80%]" style="margin: 0 auto">
+          <el-col :span="8">
             <el-form-item label="单位名称" prop="dwmc">
-              <el-input v-model="dwxxReqVO.dwmc" disabled placeholder="请输入单位名称"/>
+              <el-input class="w-[90%]! max-w-380px! min-w-240px!" v-model="dwxxReqVO.dwmc" disabled placeholder="单位名称"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="统一信用代码" prop="tyxydm">
-              <el-input v-model="dwxxReqVO.tyxydm" disabled placeholder="请输入统一信用代码"/>
+              <el-input class="w-[90%]! max-w-380px! min-w-240px!" v-model="dwxxReqVO.tyxydm" disabled placeholder="统一信用代码"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="法定代表人" prop="fddbr">
-              <el-input v-model="dwxxReqVO.fddbr" disabled placeholder="请输入法定代表人"/>
+              <el-input class="w-[90%]! max-w-380px! min-w-240px!" v-model="dwxxReqVO.fddbr" disabled placeholder="法定代表人"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="身份证号" prop="sfzh">
-              <el-input v-model="dwxxReqVO.sfzh" disabled placeholder="请输入身份证号"/>
+              <el-input class="w-[90%]! max-w-380px! min-w-240px!" v-model="dwxxReqVO.sfzh" disabled placeholder="身份证号"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="联系方式" prop="lxfs">
-              <el-input v-model="dwxxReqVO.lxfs" placeholder="请输入联系方式"/>
+              <el-input class="w-[90%]! max-w-380px! min-w-240px!" v-model="dwxxReqVO.lxfs" placeholder="联系方式"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item disabled label="注册日期" prop="zcrq">
               <el-date-picker
                 v-model="dwxxReqVO.zcrq"
                 :default-time="new Date('1 24:00:00')"
-                class="w-full!"
+                class="w-[90%]! max-w-380px! min-w-240px!"
                 disabled
-                placeholder="请选择注册日期"
+                placeholder="注册日期"
                 type="date"
                 value-format="x"
               />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="注册地址" prop="zcdz">
-              <el-input v-model="dwxxReqVO.zcdz" disabled placeholder="请输入注册地址"/>
+              <el-input class="w-[90%]! max-w-380px! min-w-240px!" v-model="dwxxReqVO.zcdz" disabled placeholder="注册地址"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="邮政编码" prop="yzbm">
-              <el-input v-model="dwxxReqVO.yzbm" disabled placeholder="请输入邮政编码"/>
+              <el-input class="w-[90%]! max-w-380px! min-w-240px!" v-model="dwxxReqVO.yzbm" disabled placeholder="邮政编码"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="企业性质" prop="qyxz">
-              <el-select disabled v-model="dwxxReqVO.qyxz" placeholder="请选择企业性质">
+              <el-select class="w-[90%]! max-w-380px! min-w-240px!" disabled v-model="dwxxReqVO.qyxz" placeholder="企业性质">
                 <el-option
                   v-for="item in getStrDictOptions('system_qyxz')" :key="item.value"
                   :label="item.label" :value="item.value"/>
@@ -137,5 +138,12 @@ onMounted(() => {
 </template>
 
 <style lang="scss" scoped>
+:deep(.el-col) {
+  margin-top: 10px;
+}
+
+:deep(.el-form-item__label) {
+  color: black;
+}
 
 </style>

src/views/DeliveryWarehouse/LibraryManagement/Kqxx.vue

@@ -3,8 +3,6 @@ import {LibraryManagementApi} from "@/api/DeliveryWarehouse/LibraryManagement";
 import {
   KqxxSaveReqVO
 } from "@/api/DeliveryWarehouse/DeliveryWarehouseSelect/interface/KqxxSaveReqVO";
-import {AdministrativeDivisionApi} from "@/api/system/administrativeDivision";
-
 // 表单引用
 const formRef2 = ref();
 // 库区信息请求对象
@@ -41,13 +39,6 @@ const getData = async () => {
       // 处理上传的库区图
       data.resid = data.resid ? data.resid.split(',') : [];
       kqxxReqVO.value = data;
-      shengList.value = await getDivision()
-      if (kqxxReqVO.value.shi) {
-        shiList.value = await getDivision(kqxxReqVO.value.sheng)
-      }
-      if (kqxxReqVO.value.xian) {
-        xianList.value = await getDivision(kqxxReqVO.value.shi)
-      }
     } else {
       console.warn('获取到的数据为空');
     }
@@ -64,56 +55,18 @@ const edit = async () => {
     await LibraryManagementApi.updateKqxx(kqxxReqVO.value)
     Message.success('修改成功')
     await getData();
-  }catch (err){
+  } catch (err) {
 
   }
 
 }
-// 行政区划数据
-const shengList = ref<AreaOption[]>([])
-const shiList = ref<AreaOption[]>([])
-const xianList = ref<AreaOption[]>([])
 
-/**
- * 获取行政区划数据
- */
-const getDivision = async (areaCode?: string): Promise<AreaOption[]> => {
-  try {
-    return await AdministrativeDivisionApi.getList({areaCode})
-  } catch (err) {
-    throw err
-  }
-}
 const stopWactches: (() => void)[] = []
 
 
 // 组件挂载时获取库区信息
 onMounted(async () => {
   await getData();
-  setTimeout(() => {
-    stopWactches.push(
-      watch(() => kqxxReqVO.value.sheng, async (newValue) => {
-        kqxxReqVO.value.shi = ''
-        kqxxReqVO.value.xian = ''
-        if (newValue) {
-          shiList.value = await getDivision(newValue)
-        } else {
-          shiList.value = []
-        }
-      })
-    )
-// 监听器设置
-    stopWactches.push(
-      watch(() => kqxxReqVO.value.shi, async (newValue) => {
-        kqxxReqVO.value.xian = ''
-        if (newValue) {
-          xianList.value = await getDivision(newValue)
-        } else {
-          xianList.value = []
-        }
-      })
-    )
-  }, 1000)
 })
 
 onBeforeUnmount(() => {
@@ -125,72 +78,76 @@ onBeforeUnmount(() => {
   <ElCard v-loading="loading">
     <template #header>
       <div class="header">
-        <div class="title text-2xl font-['黑体'] font-700">库区信息</div>
+        <Title title="库区信息"/>
+
       </div>
     </template>
     <el-form
+      class="mt-30px"
       ref="formRef2" :model="kqxxReqVO" :rules="formRules2"
       label-width="180">
       <el-row>
         <el-col :span="8">
           <el-form-item label="库区名称" prop="kqmc">
-            <el-input disabled v-model="kqxxReqVO.kqmc" placeholder="请输入库区名称"/>
+            <el-input
+              v-model="kqxxReqVO.kqmc" class="w-[90%]! max-w-380px! min-w-240px!" disabled
+              placeholder="库区名称"/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="库区编码" prop="kqbm">
-            <el-input v-model="kqxxReqVO.kqbm" disabled placeholder="请输入库区编码"/>
+            <el-input
+              v-model="kqxxReqVO.kqbm" class="w-[90%]! max-w-380px! min-w-240px!" disabled
+              placeholder="库区编码"/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="邮政编码" prop="yzbm">
-            <el-input disabled v-model="kqxxReqVO.yzbm" placeholder="请输入邮政编码"/>
+            <el-input
+              v-model="kqxxReqVO.yzbm" class="w-[90%]! max-w-380px! min-w-240px!" disabled
+              placeholder="邮政编码"/>
           </el-form-item>
         </el-col>
         <el-col :span="16">
           <el-form-item label="行政区划">
-            <div style="width:100%;display: flex;justify-content: space-around">
-              <el-select disabled v-model="kqxxReqVO.sheng" placeholder="省">
-                <el-option
-                  v-for="item in shengList" :key="item.areaCode" :label="item.areaName"
-                  :value="item.areaCode"/>
-              </el-select>
-              <el-select disabled v-model="kqxxReqVO.shi" placeholder="市区">
-                <el-option
-                  v-for="item in shiList" :key="item.areaCode" :label="item.areaName"
-                  :value="item.areaCode"/>
-              </el-select>
-              <el-select disabled v-model="kqxxReqVO.xian" placeholder="区县">
-                <el-option
-                  v-for="item in xianList" :key="item.areaCode" :label="item.areaName"
-                  :value="item.areaCode"/>
-              </el-select>
-            </div>
+            <el-input
+              v-model="kqxxReqVO.areaCode" class="w-[90%]! max-w-380px! min-w-240px!"
+              disabled placeholder="邮政编码"/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="具体地址" prop="jtdz">
-            <el-input disabled v-model="kqxxReqVO.jtdz" placeholder="请输入具体地址"/>
+            <el-input
+              v-model="kqxxReqVO.jtdz" class="w-[90%]! max-w-380px! min-w-240px!" disabled
+              placeholder="具体地址"/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="库区负责人(实际产权人)" prop="kqfzr">
-            <el-input disabled v-model="kqxxReqVO.kqfzr" placeholder="请输入库区负责人"/>
+            <el-input
+              v-model="kqxxReqVO.kqfzr" class="w-[90%]! max-w-380px! min-w-240px!" disabled
+              placeholder="库区负责人"/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="联系电话" prop="lxdh">
-            <el-input  v-model="kqxxReqVO.lxdh" placeholder="请输入联系电话"/>
+            <el-input
+              v-model="kqxxReqVO.lxdh" class="w-[90%]! max-w-380px! min-w-240px!"
+              placeholder="联系电话"/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占地面积(m²)" prop="zdmj">
-            <el-input disabled v-model="kqxxReqVO.zdmj" placeholder="请输入占地面积"/>
+            <el-input
+              v-model="kqxxReqVO.zdmj" class="w-[90%]! max-w-380px! min-w-240px!" disabled
+              placeholder="占地面积"/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="库区状态" prop="kqzt">
-            <el-select disabled v-model="kqxxReqVO.kqzt" placeholder="请输入库区状态">
+            <el-select
+              v-model="kqxxReqVO.kqzt" class="w-[90%]! max-w-380px! min-w-240px!" disabled
+              placeholder="库区状态">
               <el-option label="正常" value="1"/>
               <el-option label="退出储备粮承储" value="2"/>
             </el-select>
@@ -198,28 +155,34 @@ onBeforeUnmount(() => {
         </el-col>
         <el-col :span="8">
           <el-form-item label="租仓参考价(元)" prop="zcckj">
-            <el-input v-model="kqxxReqVO.zcckj" placeholder="租仓参考价"/>
+            <el-input
+              v-model="kqxxReqVO.zcckj" class="w-[90%]! max-w-380px! min-w-240px!"
+              placeholder="租仓参考价"/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="委托保管参考价" prop="wtbgckj">
-            <el-input v-model="kqxxReqVO.wtbgckj" placeholder="委托保管参考价"/>
+            <el-input
+              v-model="kqxxReqVO.wtbgckj" class="w-[90%]! max-w-380px! min-w-240px!"
+              placeholder="委托保管参考价"/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="经纬度" prop="jd">
-            <div style="display: flex;justify-content: space-around">
-              <el-input disabled v-model="kqxxReqVO.jd" placeholder="经度"/>
+            <div
+              class="w-[90%]! max-w-380px! min-w-240px!"
+              style="display: flex;justify-content: space-around">
+              <el-input v-model="kqxxReqVO.jd" disabled placeholder="经度"/>
               <div>
                 -
               </div>
-              <el-input disabled v-model="kqxxReqVO.wd" placeholder="纬度"/>
+              <el-input v-model="kqxxReqVO.wd" disabled placeholder="纬度"/>
             </div>
           </el-form-item>
         </el-col>
         <el-col :span="16">
           <el-form-item label="上传库区图" prop="resid">
-            <UploadImgs :disabled="true" v-model="kqxxReqVO.resid" :limit="3"/>
+            <UploadImgs v-model="kqxxReqVO.resid" :disabled="true" :limit="3"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -231,5 +194,12 @@ onBeforeUnmount(() => {
 </template>
 
 <style lang="scss" scoped>
+:deep(.el-col) {
+  margin-top: 10px;
+}
+
+:deep(.el-form-item__label) {
+  color: black;
+}
 
 </style>

src/views/DeliveryWarehouse/LibraryManagement/compontents/CreatZjxxForm.vue

@@ -110,7 +110,8 @@ defineExpose({open})
               :default-time="new Date('1 24:00:00')"
               class="w-full!"
               type="datetime"
-              value-format="x"/>
+              value-format="x"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="24">

src/views/DeliveryWarehouse/compontents/Form.vue

@@ -38,6 +38,9 @@
         <template #cazt="{record }">
           <dict-tag :type="DICT_TYPE.SYSTEM_CAZT" :value="record.cazt"/>
         </template>
+        <template #cczt="{record }">
+          <dict-tag :type="DICT_TYPE.SYSTEM_CCZT" :value="record.cczt"/>
+        </template>
         <template #edit="{record }">
           <el-button size="small" type="danger" @click="backRow(record)">
             退回
@@ -155,6 +158,7 @@ const tableColumnsTemp: TableColumnData[] = [
     title: '库区名称',
     dataIndex: 'kqmc',
     align: 'center',
+    minWidth: 300,
     filterable: {
       filter: (value, record) => record.kqmc.includes(value),
       slotName: 'kqmc-filter',
@@ -165,6 +169,7 @@ const tableColumnsTemp: TableColumnData[] = [
     title: '仓房名称',
     dataIndex: 'cfmc',
     align: 'center',
+    minWidth: 150,
     filterable: {
       filter: (value, record) => record.cfmc.includes(value),
       slotName: 'cfmc-filter',
@@ -175,18 +180,21 @@ const tableColumnsTemp: TableColumnData[] = [
     title: '仓房类型',
     dataIndex: 'cflx',
     slotName: 'cflx',
+    minWidth: 300,
     align: 'center'
   },
   {
     title: '仓房状态',
     dataIndex: 'cazt',
     slotName: 'cazt',
-    align: 'center'
+    align: 'center',
+    minWidth: 150,
   },
   {
     title: '设计仓容（吨）',
     dataIndex: 'sjcr',
-    align: 'center'
+    align: 'center',
+    minWidth: 150,
   }]
 // 表格选择
 const rowSelection = reactive<TableRowSelection>({
@@ -214,7 +222,8 @@ const open = async (type: string, row?: any) => {
         title: '认定银行',
         dataIndex: 'rdyhName',
         slotName: 'rdyhName',
-        align: 'center'
+        align: 'center',
+        minWidth: 150,
       }
     ]
   } else if (row.yxcf == YxcfEnum.XdjskCfxx) {
@@ -223,25 +232,29 @@ const open = async (type: string, row?: any) => {
         title: '认定银行',
         dataIndex: 'rdyhName',
         slotName: 'rdyhName',
-        align: 'center'
+        align: 'center',
+        minWidth: 150,
       },
       {
         title: '选定单位名称',
         dataIndex: 'nickname',
         slotName: 'nickname',
-        align: 'center'
+        align: 'center',
+        minWidth: 280,
       },
       {
         title: '选定人联系方式',
         dataIndex: 'mobile',
         slotName: 'mobile',
-        align: 'center'
+        align: 'center',
+        minWidth: 280,
       },
       {
         title: '储存状态',
         dataIndex: 'cczt',
         slotName: 'cczt',
-        align: 'center'
+        align: 'center',
+        minWidth: 150,
       }
     ]
   } else {