产品，表单标签宽度，标题

.env

@@ -1,5 +1,6 @@
 # 应用名称
 VITE_APP_NAME=再昇云
+VITE_APP_TITLE=再昇云
 
 # 当前应用基础地址
 VITE_APP_BASE_URL=/

.env.development

@@ -1,5 +1,7 @@
 # 应用名称
 VITE_APP_NAME=（开发环境）再昇云收运处平台
+VITE_APP_TITLE=再昇云
+
 # 后台服务地址
  VITE_HTTP_PROXY_TARGET=http://localhost:10086
 

.env.production

@@ -1,6 +1,8 @@
 # 应用名称
 VITE_APP_NAME=再昇云
 
+VITE_APP_TITLE=再昇云
+
 # 当前应用基础地址
 VITE_APP_BASE_URL=/
 

.env.test

@@ -1,5 +1,6 @@
 # 应用名称
 VITE_APP_NAME=（测试环境）再昇云收运处平台
+VITE_APP_TITLE=再昇云
 
 # 当前应用基础地址
 VITE_APP_BASE_URL=/

src/assets/stylus/dialog.styl

@@ -36,6 +36,15 @@
     width 100%
   }
 
+
+  .draggable-dialog > .el-dialog__header {
+    border-bottom: 1px solid #EAEBF1;
+  }
+
+  .draggable-dialog > .el-dialog__footer {
+    border-top: 1px solid #EAEBF1;
+  }
+
   .el-dialog__body {
     height calc(100% - 88px) !important
     box-sizing border-box !important

src/assets/stylus/index.styl

@@ -84,3 +84,12 @@
   display none !important;
   opacity 0 !important;
 }
+
+
+.el-radio-group {
+  gap 10px
+
+  .el-radio {
+    margin 0 !important
+  }
+}

src/common/index.ts

@@ -7,6 +7,7 @@ export const appBaseUrl = import.meta.env.VITE_APP_BASE_URL
  * 应用名称
  */
 export const appName = import.meta.env.VITE_APP_NAME
+export const appTitle = import.meta.env.VITE_APP_TITLE
 
 /**
  * 服务器基础地址

src/components/uploader/Uploader.vue

@@ -138,8 +138,12 @@ defineExpose({
 
   :deep(.el-upload) {
     background-color white
-    width: 100%;
+
-    height: 100%;
+    &.el-upload--picture-card {
+      width: 100% !important;
+      height: 100% !important;
+    }
+
 
     &.el-upload--text,
     &.el-upload--picture,

src/dts/components.d.ts

@@ -5,7 +5,6 @@
 // ------
 // Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
-import { GlobalComponents } from 'vue'
 
 export {}
 

src/dts/vite-env.d.ts

@@ -5,6 +5,7 @@
 
 interface ImportMetaEnv {
   readonly VITE_APP_NAME: string
+  readonly VITE_APP_TITLE: string
   readonly VITE_APP_BASE_URL: string
   readonly VITE_HTTP_SERVER_BASE_URL: string
   readonly VITE_HTTP_PROXY_TARGET: string

src/pages/a-frame/AAside.tsx

@@ -17,6 +17,7 @@ import { computed } from 'vue'
 import Nav from '@/common/router/nav.ts'
 import logo from '@/assets/images/zsy.png'
 import { useAppPageStore } from '@/common/app/app-page-store.ts'
+import { appTitle } from '@/common'
 
 export interface Menu extends G.TreeNode {
   // Id
@@ -119,7 +120,7 @@ export default defineComponent(
         <div class={[ styles.aAsideTop, {[styles.aAsideTopCollapse]: props.isCollapse} ]}
           onClick={() => Nav.open('home')}>
           <img alt="" src={logo}/>
-          <div>再昇云</div>
+          <div>{appTitle}</div>
         </div>
         <ElScrollbar class={styles.aScrollbar}>
           <ElMenu collapse={props.isCollapse} class={[ styles.aMenus ]} ref="menu">

src/pages/a-frame/PasswdPanel.vue

@@ -91,7 +91,6 @@ defineExpose({
     :model="pwdFormData"
     :rules="rules"
     class="pwd-form"
-    label-width="auto"
     status-icon
     @submit.prevent="submitHandler"
   >

src/pages/a-frame/UserInfoPanel.vue

@@ -78,7 +78,6 @@ defineExpose({
     :model="userInfoForm"
     :rules="rules"
     class="user-info-form"
-    label-width="auto"
     status-icon
     @submit.prevent="submitHandler"
   >

src/pages/gds/goods/GoodsForm.vue

@@ -23,15 +23,15 @@
         <ElFormItem label="产品名称" prop="goodsName">
           <ElInput v-model="formData.goodsName" placeholder="产品名称"/>
         </ElFormItem>
-        <ElFormItem label="规格" prop="specParams">
-          <ElInput v-model="formData.specParams" placeholder="规格"/>
-        </ElFormItem>
-
         <ElFormItem label="计费策略" prop="expenseStrategy">
           <ElRadioGroup v-model="formData.expenseStrategy">
             <ElRadio v-for="it in expenseStrategy" :key="'expenseStrategy'+it.val" :value="it.val" border>{{ it.txt }}</ElRadio>
           </ElRadioGroup>
         </ElFormItem>
+
+        <ElFormItem label="规格" prop="specParams">
+          <ElInput v-model="formData.specParams" placeholder="规格"/>
+        </ElFormItem>
         <ElFormItem label="计量单位" prop="unit">
           <ElSelect v-model="formData.unit">
             <ElOption
@@ -42,28 +42,32 @@
           </ElSelect>
         </ElFormItem>
 
+        <ElFormItem v-if="formData.expenseStrategy !== expenseStrategy.MianFei" label="税率" prop="taxRate">
+          <ElInputNumber v-model="formData.taxRate" :max="100" :min="0" :precision="2" :step="0.01" controls-position="right" placeholder="请输入税率">
+            <template #suffix>%</template>
+          </ElInputNumber>
+        </ElFormItem>
         <ElFormItem v-if="formData.expenseStrategy === expenseStrategy.TanXing" label="起步价" prop="initialPrice">
-          <ElInputNumber v-model="formData.initialPrice" :min="0" :precision="2" :step="1" controls-position="right">
+          <ElInputNumber v-model="formData.initialPrice" :min="0" :precision="2" :step="1" controls-position="right" placeholder="请输入起步价">
             <template #suffix>元/{{ unit.txt(formData.unit) }}</template>
           </ElInputNumber>
         </ElFormItem>
         <ElFormItem v-if="formData.expenseStrategy === expenseStrategy.TanXing" label="起步量" prop="initialQuantity">
-          <ElInputNumber v-model="formData.initialQuantity" :min="0" :step="1" controls-position="right"/>
+          <ElInputNumber v-model="formData.initialQuantity" :min="0" :step="1" controls-position="right" placeholder="请输入起步量">
+            <template #suffix>{{ unit.txt(formData.unit) }}</template>
+          </ElInputNumber>
         </ElFormItem>
         <ElFormItem
           v-if="formData.expenseStrategy !== expenseStrategy.MianFei"
           :label="formData.expenseStrategy === expenseStrategy.TanXing?'每档单价':(formData.expenseStrategy === expenseStrategy.DanJia?'单价':'价格')"
           prop="unitPrice">
-          <ElInputNumber v-model="formData.unitPrice" :min="0" :precision="2" :step="1" controls-position="right">
+          <ElInputNumber v-model="formData.unitPrice" :min="0" :placeholder="`请输入${formData.expenseStrategy === expenseStrategy.TanXing?'每档单价':(formData.expenseStrategy === expenseStrategy.DanJia?'单价':'价格')}`" :precision="2" :step="1" controls-position="right">
-            <template #suffix>元/{{ unit.txt(formData.unit) }}</template>
+            <template #suffix>{{ (formData.expenseStrategy === expenseStrategy.DanJia || formData.expenseStrategy === expenseStrategy.TanXing ? `元/${unit.txt(formData.unit)}` : `元`) }}</template>
           </ElInputNumber>
         </ElFormItem>
         <ElFormItem v-if="formData.expenseStrategy === expenseStrategy.TanXing" label="每档的量" prop="everyQuantity">
-          <ElInputNumber v-model="formData.everyQuantity" :min="0" :step="1" controls-position="right"/>
+          <ElInputNumber v-model="formData.everyQuantity" :min="0" :step="1" controls-position="right" placeholder="请输入每档的量">
-        </ElFormItem>
+            <template #suffix>{{ unit.txt(formData.unit) }}</template>
-        <ElFormItem v-if="formData.expenseStrategy !== expenseStrategy.MianFei" label="税率" prop="taxRate">
-          <ElInputNumber v-model="formData.taxRate" :max="100" :min="0" :precision="2" :step="0.01" controls-position="right">
-            <template #suffix>%</template>
           </ElInputNumber>
         </ElFormItem>
         <ElFormItem label="排序" prop="sort">
@@ -155,7 +159,6 @@ defineExpose({
 .form-items {
   grid-template-columns: 1fr 1fr;
   grid-template-areas: "picture ." \
-  "picture ." \
   "picture .";
 
   :deep(.el-form-item) {
@@ -169,7 +172,8 @@ defineExpose({
       }
     }
 
-    &:last-child:nth-child(2n+1) {
+
+    &:last-child:nth-child(2n) {
       grid-column: span 2;
       width: 100%;
     }

src/pages/login/Login.vue

@@ -1,5 +1,4 @@
 <script lang="ts" setup>
-
 import LoginApi from '@/pages/login/login-api.ts'
 import { useAppUserStore } from '@/common/app/app-user-store.ts'
 import Evt from '@/common/utils/evt.ts'
@@ -11,6 +10,7 @@ import {
 import Strings from '@/common/utils/strings.ts'
 import FormUtil from '@/common/utils/formUtil.ts'
 import { reloadUserInfo } from '@/common/app'
+import { appTitle } from '@/common'
 
 const loginFormIns = useTemplateRef<FormInstance>('loginFormRef')
 
@@ -101,7 +101,7 @@ function loginSubmitHandler() {
       <div class="login-content-right">
         <div class="login-content-right-center">
           <img alt="" src="@/assets/images/zsy.png"/>
-          <span>再昇云</span>
+          <span>{{ appTitle }}</span>
         </div>
       </div>
     </div>

src/pages/mfg/craft/CraftForm.vue

@@ -8,7 +8,7 @@
       :model="formData"
       :rules="rules"
       class="form-panel"
-      label-width="auto">
+    >
       <ElFormItem label="产品" prop="goodsId">
         <ADropTable v-model="formData.goodsId as string" :columns="dropTableColumns" :loader="dropTableLoader" display-field="goodsName"/>
       </ElFormItem>

src/pages/order/book/BookForm.vue

@@ -8,7 +8,7 @@
       :rules="rules"
       ref="orderForm"
       class="form-panel"
-      label-width="auto">
+    >
       <ElFormItem label="Id" prop="id">
         <ElInput
           v-model="formData.id"

src/pages/sys/dict/DictForm.vue

@@ -6,23 +6,20 @@
     width="25vw">
     <ElForm :model="dictFormData"
       class="sys_dict-form"
-      label-width="auto">
+    >
       <ElFormItem label="字典标识">
         <ElInput
           v-model="dictFormData.dictKey"
-
           placeholder="字典标识"/>
       </ElFormItem>
       <ElFormItem label="字典名称">
         <ElInput
           v-model="dictFormData.dictName"
-
           placeholder="字典名称"/>
       </ElFormItem>
       <ElFormItem label="备注">
         <ElInput
           v-model="dictFormData.memo"
-
           placeholder="备注"/>
       </ElFormItem>
     </ElForm>

src/pages/sys/dict/DictItemForm.vue

@@ -6,7 +6,7 @@
     width="25vw">
     <ElForm :model="dictItemFormData"
       class="sys_dict_item-form"
-      label-width="auto">
+    >
       <ElFormItem label="值">
         <ElInput
           v-model="dictItemFormData.val"

src/pages/sys/endpoint/EndpointForm.vue

@@ -9,7 +9,7 @@
       ref="endpointForm"
       :rules="rules"
       class="form-panel"
-      label-width="auto">
+    >
 
       <ElFormItem label="请求方式" prop="requestMethod">
         <ElSelect

src/pages/sys/gen/db-table/CodePreview.vue

@@ -10,7 +10,7 @@
         class="sys_user-form"
         ref="codeForm"
         :rules="rules"
-        label-width="auto">
+      >
         <ElFormItem label="表名称">
           <ElTooltip
             :content="currentTable.tableComment"

src/pages/sys/gen/tpl/TplForm.vue

@@ -6,7 +6,7 @@
     @close="dialogCloseHandler">
     <ElForm :model="tplFormData"
       class="sys_tpl-form"
-      label-width="auto">
+    >
       <ElFormItem label="模板名称">
         <ElInput
           v-model="tplFormData.tplName"

src/pages/sys/menus/MenuForm.vue

@@ -2,7 +2,7 @@
   <ElDialog v-model="showDialog"
     :close-on-click-modal="false"
     destroy-on-close width="25vw" @close="dialogCloseHandler">
-    <ElForm :model="menuForm" class="menu-form" label-width="auto">
+    <ElForm :model="menuForm" class="menu-form">
       <ElFormItem label="上级">
         <ElTreeSelect v-model="menuForm.pid" :data="menuTreeDataSource" :default-expanded-keys="['0']" :render-after-expand="false" check-strictly placeholder="选择上级菜单"/>
       </ElFormItem>

src/pages/sys/role/RoleForm.vue

@@ -6,7 +6,7 @@
     width="25vw">
     <ElForm :model="roleFormData"
       class="sys_role-form"
-      label-width="auto">
+    >
       <ElFormItem label="角色代码">
         <ElInput
           v-model="roleFormData.roleCode"

src/pages/sys/task/TaskForm.vue

@@ -2,7 +2,7 @@
   <ElDialog v-model="showDialog"
     :close-on-click-modal="false"
     destroy-on-close width="25vw" @close="dialogCloseHandler">
-    <ElForm :model="taskFormData" class="sys_task-form" label-width="auto">
+    <ElForm :model="taskFormData" class="sys_task-form">
       <ElFormItem label="任务名称">
         <ElInput v-model="taskFormData.taskName" placeholder="任务名称"/>
       </ElFormItem>

src/pages/sys/user/UserForm.vue

@@ -6,7 +6,7 @@
     width="25vw">
     <ElForm :model="userFormData"
       class="sys_user-form"
-      label-width="auto">
+    >
       <ElFormItem label="姓名">
         <ElInput
           :readonly="userFormData.id=='1'"