af-mobile-client-vue3 1.4.26 → 1.4.28

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.4.26",
+  "version": "1.4.28",
   "packageManager": "pnpm@10.13.1",
   "description": "Vue + Vite component lib",
   "engines": {

package/src/components/data/OtherCharge/OtherChargeForm.vue

@@ -111,6 +111,7 @@ const props = defineProps<{
   isWorkOrder?: boolean
   workOrderData?: any
   serviceName?: string
+  showGroup?: boolean
 }>()
 
 const emit = defineEmits<{
@@ -131,7 +132,6 @@ const showAddItemModal = ref(false)
 const showQrCodePayment = ref(false)
 // 材料组相关状态
 const showAddGroupModal = ref(false)
-const GroupShow = ref(false)
 // 子组件的响应组件引用
 const printRef = ref()
 // 收费类型数据
@@ -154,14 +154,13 @@ const useGridUploader = computed(() => {
   return config.fileTypes && config.fileTypes.length > 0
 })
 
+// 是否显示添加材料组按钮
+const showAddGroupButton = computed(() => {
+  return props.showGroup ?? false
+})
 // 初始化获取配置
 async function initConfig() {
   try {
-    // 获取其他收费类型配置
-    const webMobileConfig = await getConfigByNameAsync('webMobileConfig', props.serviceName || import.meta.env.VITE_APP_SYSTEM_NAME)
-    if (webMobileConfig) {
-      GroupShow.value = webMobileConfig.setting.materialGroup
-    }
     // 新的收费类型数据
     await runLogic('getMaterialInfo', {
       f_org_id: currUser.resources.orgid,
@@ -270,6 +269,14 @@ function removeChargeItem(itemId: number) {
   chargeItems.value = chargeItems.value.filter(item => item.id !== itemId)
 }
 
+// 更新费用项
+function updateChargeItem(updatedItem: ChargeItem) {
+  const index = chargeItems.value.findIndex(item => item.id === updatedItem.id)
+  if (index !== -1) {
+    chargeItems.value[index] = updatedItem
+  }
+}
+
 // 生成收据
 function generateReceipt() {
   // 验证是否有费用项
@@ -436,7 +443,7 @@ function onFileRemoved(): void {
         <CardHeader title="费用项目">
           <template #extra>
             <VanButton
-              v-if="GroupShow"
+              v-if="showAddGroupButton"
               type="primary"
               size="small"
               icon="plus"
@@ -468,6 +475,7 @@ function onFileRemoved(): void {
               :is-work-order="props.isWorkOrder"
               :work-order-data="props.workOrderData"
               @remove="removeChargeItem"
+              @update="updateChargeItem"
             />
           </template>
           <p v-else class="text-gray-400 text-center">

package/src/components/data/OtherCharge/OtherChargeItem.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import { Icon as VanIcon } from 'vant'
+import { Field as VanField, Icon as VanIcon } from 'vant'
+import { computed, ref, watch } from 'vue'
 
 interface ChargeItem {
   id: number
@@ -7,24 +8,101 @@ interface ChargeItem {
   workOrderId?: string
   type: string
   item: string
+  model?: string
   unitPrice: number
   quantity: number
   total: string
 }
 
-defineProps<{
+const props = defineProps<{
   item: ChargeItem
   index: number
   isWorkOrder?: boolean
   workOrderData?: any
 }>()
 
-defineEmits<{
+const emit = defineEmits<{
   (e: 'remove', id: number): void
+  (e: 'update', item: ChargeItem): void
 }>()
 
-function formatPrice(price: number): string {
-  return price.toFixed(2)
+// 本地状态，用于双向绑定
+const localUnitPrice = ref(props.item.unitPrice.toString())
+const localQuantity = ref(props.item.quantity.toString())
+const item = computed(() => props.item)
+
+// 监听 props 变化，同步本地状态
+watch(() => props.item.unitPrice, (newVal) => {
+  localUnitPrice.value = newVal.toString()
+})
+
+watch(() => props.item.quantity, (newVal) => {
+  localQuantity.value = newVal.toString()
+})
+
+// 计算小计
+const total = computed(() => {
+  const price = Number.parseFloat(localUnitPrice.value) || 0
+  const qty = Number.parseInt(localQuantity.value) || 0
+  return (price * qty).toFixed(2)
+})
+
+// 处理单价变化 - 限制9位整数2位小数
+function handleUnitPriceChange(value: string) {
+  // 移除非数字和小数点的字符
+  let cleaned = value.replace(/[^\d.]/g, '')
+
+  // 限制小数点后最多2位
+  const parts = cleaned.split('.')
+  if (parts.length > 2) {
+    cleaned = `${parts[0]}.${parts.slice(1).join('')}`
+  }
+  if (parts[1] && parts[1].length > 2) {
+    cleaned = `${parts[0]}.${parts[1].slice(0, 2)}`
+  }
+
+  // 限制整数部分最多9位
+  if (parts[0] && parts[0].length > 9) {
+    cleaned = parts[0].slice(0, 9) + (parts[1] ? `.${parts[1]}` : '')
+  }
+
+  // 更新值
+  localUnitPrice.value = cleaned
+  updateItem()
+}
+
+// 处理数量变化 - 限制5位整数
+function handleQuantityChange(value: string) {
+  // 只允许数字，限制最多5位
+  let cleaned = value.replace(/\D/g, '')
+  if (cleaned.length > 5) {
+    cleaned = cleaned.slice(0, 5)
+  }
+
+  // 更新值
+  localQuantity.value = cleaned
+  updateItem()
+}
+
+// 更新费用项
+function updateItem() {
+  const price = Number.parseFloat(localUnitPrice.value) || 0
+  const qty = Number.parseInt(localQuantity.value) || 0
+
+  // 只有当价格和数量都大于0时才更新
+  if (price > 0 && qty > 0) {
+    const updatedItem: ChargeItem = {
+      ...props.item,
+      unitPrice: price,
+      quantity: qty,
+      total: total.value,
+    }
+    emit('update', updatedItem)
+  }
+  else if (localUnitPrice.value === '' || localQuantity.value === '') {
+    // 如果输入为空，不更新，保持原值
+
+  }
 }
 </script>
 
@@ -50,6 +128,14 @@ function formatPrice(price: number): string {
           {{ item.workOrderCode }}
         </p>
       </div>
+      <div class="other-charge-item__field">
+        <p class="other-charge-item__label">
+          小计
+        </p>
+        <p class="other-charge-item__value--info">
+          ￥{{ total }}
+        </p>
+      </div>
       <div class="other-charge-item__field">
         <p class="other-charge-item__label">
           收费类型
@@ -73,25 +159,27 @@ function formatPrice(price: number): string {
         <p class="other-charge-item__label">
           单价
         </p>
-        <p class="other-charge-item__value">
-          ¥{{ formatPrice(item.unitPrice) }}
-        </p>
+        <VanField
+          :model-value="localUnitPrice"
+          type="number"
+          placeholder="限制9位整数2位小数"
+          @update:model-value="handleUnitPriceChange"
+        >
+          <template #prefix>
+            <span class="other-charge-item__prefix">¥</span>
+          </template>
+        </VanField>
       </div>
       <div class="other-charge-item__field">
         <p class="other-charge-item__label">
           数量
         </p>
-        <p class="other-charge-item__value">
-          {{ item.quantity }}
-        </p>
-      </div>
-      <div class="other-charge-item__field">
-        <p class="other-charge-item__label">
-          小计
-        </p>
-        <p class="other-charge-item__value--highlight">
-          ¥{{ item.total }}
-        </p>
+        <VanField
+          :model-value="localQuantity"
+          type="number"
+          placeholder="限制5位整数"
+          @update:model-value="handleQuantityChange"
+        />
       </div>
     </div>
   </div>
@@ -108,8 +196,9 @@ function formatPrice(price: number): string {
   &__header {
     display: flex;
     justify-content: space-between;
-    align-items: flex-start;
+    align-items: center;
     margin-bottom: 8px;
+    gap: 8px;
   }
 
   &__title {
@@ -117,17 +206,40 @@ function formatPrice(price: number): string {
     font-weight: 500;
     color: #374151;
     margin: 0;
+    flex-shrink: 0;
+  }
+  &__value--info {
+    font-size: 14px;
+    font-weight: 500;
+    color: #2563eb;
   }
-
   &__delete {
     color: #ef4444;
     font-size: 16px;
+    flex-shrink: 0;
+    cursor: pointer;
 
     &:active {
       color: #b91c1c;
     }
   }
 
+  :deep(.van-field) {
+    background-color: #ffffff;
+    border-radius: 4px;
+    padding: 8px 12px;
+  }
+
+  :deep(.van-field__control) {
+    background-color: #ffffff;
+    color: #1f2937;
+    font-size: 14px;
+  }
+
+  :deep(.van-field__label) {
+    display: none;
+  }
+
   &__info {
     display: grid;
     grid-template-columns: 1fr 1fr;
@@ -137,18 +249,14 @@ function formatPrice(price: number): string {
 
   &__details {
     display: grid;
-    grid-template-columns: 1fr 1fr 1fr;
+    grid-template-columns: 1fr 1fr;
     gap: 12px;
   }
 
-  &__field {
-    margin-bottom: 0;
-  }
-
   &__label {
     font-size: 12px;
     color: #6b7280;
-    margin: 0 0 2px 0;
+    margin: 0 0 4px 0;
   }
 
   &__value {
@@ -156,13 +264,12 @@ function formatPrice(price: number): string {
     font-weight: 500;
     color: #1f2937;
     margin: 0;
+  }
 
-    &--highlight {
-      font-size: 14px;
-      font-weight: 500;
-      color: #2563eb;
-      margin: 0;
-    }
+  &__prefix {
+    color: #6b7280;
+    font-size: 14px;
+    margin-right: 4px;
   }
 }
 </style>

package/src/views/component/OtherCharge/index.vue

@@ -33,6 +33,7 @@ onMounted(() => {
     v-if="loading"
     :user="userinfo"
     :is-work-order="true"
+    :show-group="true"
     :service-name="serviceName"
     :work-order-data="workOrderData"
     @close-operation="backList"