Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

hangtag-ui/hangtag-ui-admin/src/views/oms/customer/CustomerForm.vue

@@ -34,6 +34,7 @@
       <el-form-item label="跟单员" prop="gdperson">
         <el-input v-model="formData.gdperson" placeholder="请输入跟单员" />
       </el-form-item>
+
       <el-form-item label="销售员" prop="saleperson">
         <el-input v-model="formData.saleperson" placeholder="请输入销售员" />
       </el-form-item>
@@ -48,6 +49,19 @@
           placeholder="请选择城市"
         />
       </el-form-item>
+
+      <el-form-item label="发票抬头" prop="invoiceCode">
+        <el-input v-model="formData.invoiceCode" placeholder="请输入发票抬头" />
+      </el-form-item>
+
+      <el-form-item label="发票名称" prop="invoiceName">
+        <el-input v-model="formData.invoiceName" placeholder="请输入发票名称" />
+      </el-form-item>
+
+      <el-form-item label="发票地址" prop="invoiceAddress">
+        <el-input v-model="formData.invoiceAddress" placeholder="请输入发票地址" />
+      </el-form-item>
+
       <el-form-item label="数据状态" prop="status">
         <el-switch
           v-model="formData.status"
@@ -108,6 +122,9 @@ const formData = ref({
   status: undefined,
   type: undefined,
   remarks: undefined,
+  invoiceCode: undefined,
+  invoiceName: undefined,
+  invoiceAddress: undefined,
 })
 const formRules = reactive({
   name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],

hangtag-ui/hangtag-ui-front/src/views/Home/Index.vue

@@ -9,9 +9,9 @@
                 <div class="text-20px">
                   {{ t('workplace.welcome') }} {{ username }} {{ t('workplace.happyDay') }}
                 </div>
-                <div class="mt-10px text-14px text-gray-500">
+<!--                <div class="mt-10px text-14px text-gray-500">
                   {{ t('workplace.toady') }}，20℃ - 32℃！
-                </div>
+                </div>-->
               </div>
             </div>
           </el-col>
@@ -38,7 +38,8 @@ import { set } from 'lodash-es'
 import { EChartsOption } from 'echarts'
 import { formatTime } from '@/utils'
 import DraftDesign from '@/components/DraftDesign/index.vue'
-
+import ShortcutCard from './components/ShortcutCard.vue'
+import OperationDataCard from './components/OperationDataCard.vue'
 import { useUserStore } from '@/store/modules/user'
 import { useWatermark } from '@/hooks/web/useWatermark'
 import type { WorkplaceTotal, Project, Notice, Shortcut } from './types'