页面调整

src/utils/dict.ts

@@ -46,7 +46,6 @@ export const getIntDictOptions = (dictType: string): NumberDictDataType[] => {
   })
   return dictOption
 }
-
 export const getStrDictOptions = (dictType: string) => {
   // 获得通用的 DictDataType 列表
   const dictOptions: DictDataType[] = getDictOptions(dictType)

src/views/supplier/base/form/SupplierInfoForm.vue

@@ -18,7 +18,7 @@
           <el-form-item label="供应商分类" prop="classification">
             <el-select v-model="formData.classification" placeholder="请选择分类" class="w-80!">
               <el-option
-                v-for="dict in getIntDictOptions(DICT_TYPE.SUPPLIER_TYPE)"
+                v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_TYPE)"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
@@ -30,7 +30,7 @@
           <el-form-item label="公司类型" prop="type">
             <el-select v-model="formData.type" placeholder="请选择公司类型" class="w-80!">
               <el-option
-                v-for="dict in getIntDictOptions(DICT_TYPE.SUPPLIER_COMPANY_TYPE)"
+                v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_COMPANY_TYPE)"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
@@ -44,31 +44,40 @@
           <el-form-item label="供应商性质" prop="nature">
             <el-select v-model="formData.nature" placeholder="请选择供应商性质" class="w-80!">
               <el-option
-                v-for="dict in getIntDictOptions(DICT_TYPE.SUPPLIER_NATURE)"
-                :key="dict.value"
+                v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_NATURE)"
+                :key="dict.id"
                 :label="dict.label"
                 :value="dict.value"
               />
             </el-select>
           </el-form-item>
         </el-col>
+<!--        <el-col :span="8">-->
+<!--          <el-form-item label="状态" prop="status">-->
+<!--            <el-select v-model="formData.status" placeholder="请选择状态" class="w-80!">-->
+<!--              <el-option-->
+<!--                v-for="dict in getIntDictOptions(DICT_TYPE.SUPPLIER_STATUS)"-->
+<!--                :key="dict.value"-->
+<!--                :label="dict.label"-->
+<!--                :value="dict.value"-->
+<!--              />-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
         <el-col :span="8">
-          <el-form-item label="状态" prop="status">
-            <el-select v-model="formData.status" placeholder="请选择状态" class="w-80!">
-              <el-option
-                v-for="dict in getIntDictOptions(DICT_TYPE.SUPPLIER_STATUS)"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
+          <el-form-item label="社会信用代码" prop="creditCode">
+            <el-input
+              v-model="formData.creditCode"
+              class="w-80!"
+              placeholder="请输入社会信用代码"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="公司规模" prop="size">
             <el-select v-model="formData.size" placeholder="请选择公司规模" class="w-80!">
               <el-option
-                v-for="dict in getIntDictOptions(DICT_TYPE.SUPPLIER_SIZE)"
+                v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_SIZE)"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
@@ -78,15 +87,6 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="8">
-          <el-form-item label="社会信用代码" prop="creditCode">
-            <el-input
-              v-model="formData.creditCode"
-              class="w-80!"
-              placeholder="请输入社会信用代码"
-            />
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item label="纳税人识别号" prop="tin">
             <el-input v-model="formData.tin" class="w-80!" placeholder="请输入纳税人识别号" />
@@ -97,8 +97,6 @@
             <el-input v-model="formData.corporation" class="w-80!" placeholder="请输入法人" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
         <el-col :span="8">
           <el-form-item label="成立日期" prop="incorporationDate">
             <el-date-picker
@@ -110,6 +108,8 @@
             />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="8">
           <el-form-item label="公司地址" prop="address">
             <el-input v-model="formData.address" class="w-80!" placeholder="请输入公司地址" />
@@ -125,15 +125,17 @@
             />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="年营业额" prop="annualTurnove">
+            <el-input
+              v-model="formData.annualTurnove"
+              type="number"
+              class="w-80!"
+              placeholder="请输入年营业额"
+            />
+          </el-form-item>
+        </el-col>
       </el-row>
-      <el-form-item label="年营业额" prop="annualTurnove">
-        <el-input
-          v-model="formData.annualTurnove"
-          type="number"
-          class="w-80!"
-          placeholder="请输入年营业额"
-        />
-      </el-form-item>
       <el-form-item label="经营范围" prop="bizScope">
         <el-input type="textarea" v-model="formData.bizScope" placeholder="请输入经营范围" />
       </el-form-item>
@@ -173,7 +175,7 @@
 import { PropType } from 'vue'
 import { copyValueToTarget } from '@/utils'
 import { propTypes } from '@/utils/propTypes'
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import {DICT_TYPE, getIntDictOptions, getStrDictOptions} from '@/utils/dict'
 import { Api, SupplierVO } from '@/api/supplier/base'
 import {useTagsViewStore} from "@/store/modules/tagsView";
 import type { Supplier } from '@/api/supplier/base/index'
@@ -271,8 +273,11 @@ const submitForm = async () => {
       await Api.create(data).then(res => {
         const param = {id: res}
         emit('sendParam', param);
+        message.success(t('common.createSuccess'))
+      }).catch(()=>{
+        debugger
+        message.error(t('common.createFail'))
       })
-      message.success(t('common.createSuccess'))
     } else {
       await Api.update(data)
       message.success(t('common.updateSuccess'))

src/views/supplier/base/index.vue

@@ -139,7 +139,7 @@
       </el-table-column>
       <el-table-column label="社会信用代码" align="center" prop="creditCode" />
 <!--      <el-table-column label="纳税人识别号" align="center" prop="tin" />-->
-      <el-table-column label="法人" align="center" prop="corporation" />
+<!--      <el-table-column label="法人" align="center" prop="corporation" />-->
       <el-table-column
         label="成立日期"
         align="center"
@@ -151,11 +151,11 @@
 <!--      <el-table-column label="经营范围" align="center" prop="bizScope" />-->
 <!--      <el-table-column label="注册资金(万元)" align="center" prop="registeredCapital" />-->
 <!--      <el-table-column label="年营业额(万元)" align="center" prop="annualTurnove" />-->
-      <el-table-column label="公司规模" align="center" prop="size" >
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.SUPPLIER_SIZE" :value="scope.row.size" />
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="公司规模" align="center" prop="size" >-->
+<!--        <template #default="scope">-->
+<!--          <dict-tag :type="DICT_TYPE.SUPPLIER_SIZE" :value="scope.row.size" />-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="状态" align="center" prop="status" >
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.SUPPLIER_STATUS" :value="scope.row.status" />

src/views/supplier/certificate/CertificateForm.vue

@@ -10,7 +10,7 @@
       <el-form-item label="证件类型" prop="type">
         <el-select v-model="formData.type" placeholder="请选择">
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.SUPPLIER_CERT)"
+            v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_CERT)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -31,7 +31,7 @@
   </Dialog>
 </template>
 <script lang="ts" setup>
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import {DICT_TYPE, getIntDictOptions, getStrDictOptions} from '@/utils/dict'
 import { CertificateApi, CertificateVO } from '@/api/supplier/certificate'
 import * as SupplierBaseApi from '@/api/supplier/base'
 import { SupplierVO } from '@/api/supplier/base'