From 5c1f97b67c9ea4a6069374b18881a66cb751440c Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Fri, 20 Jun 2025 15:08:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=8A=E7=9B=98=E7=82=B9=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=A1=A8=E3=80=8B=E6=96=B0=E5=A2=9E=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E9=80=89=E6=8B=A9=E7=9A=84=E5=93=81=E7=95=AA?=
 =?UTF-8?q?=E5=9C=A8=E3=80=8A=E5=8D=95=E4=BD=8D=E8=BD=AC=E6=8D=A2=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E3=80=8B=E4=B8=AD=EF=BC=8C=E7=BB=B4=E6=8A=A4=E4=BA=86?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E7=8E=87=EF=BC=8C=E5=88=99=E5=B8=A6=E5=87=BA?=
 =?UTF-8?q?=E8=AF=A5=E8=BD=AC=E6=8D=A2=E7=8E=87=EF=BC=9B=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E6=9C=AA=E7=BB=B4=E6=8A=A4=E8=BD=AC=E6=8D=A2=E7=8E=87=E5=88=99?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=BA1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stdcostprice/stdcostprice.data.ts         |  26 ++--
 .../count/countConfig/countConfig.data.ts     |   3 +-
 .../countManage/count/countConfig/index.vue   | 136 +++++++++++-------
 3 files changed, 97 insertions(+), 68 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts b/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts
index cc48f1781..861ca38fd 100644
--- a/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts
@@ -106,19 +106,19 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch : true,
     isTable : true
   },
-  // {
-  //   label: '价格',
-  //   field: 'price',
-  //   sort: 'custom',
-  //   isSearch: true,
-  //   form: {
-  //     component: 'InputNumber',
-  //     componentProps: {
-  //       min: 0,
-  //       precision: 6
-  //     }
-  //   }
-  // },
+  {
+    label: '价格',
+    field: 'price',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    }
+  },
   {
     label: '是否可用',
     field: 'available',
diff --git a/src/views/wms/countManage/count/countConfig/countConfig.data.ts b/src/views/wms/countManage/count/countConfig/countConfig.data.ts
index 654455e28..972acaae5 100644
--- a/src/views/wms/countManage/count/countConfig/countConfig.data.ts
+++ b/src/views/wms/countManage/count/countConfig/countConfig.data.ts
@@ -146,7 +146,8 @@ export const CountConfig = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       value: 0,
       componentProps: {
-        min:0,
+        disabled: true,
+        min:1,
         precision:2
       }
     },
diff --git a/src/views/wms/countManage/count/countConfig/index.vue b/src/views/wms/countManage/count/countConfig/index.vue
index 11a8f2d12..ae2f5480d 100644
--- a/src/views/wms/countManage/count/countConfig/index.vue
+++ b/src/views/wms/countManage/count/countConfig/index.vue
@@ -1,18 +1,22 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="CountConfig.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="CountConfig.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="CountConfig.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="CountConfig.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -27,13 +31,13 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <template #code="{ row }">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -47,6 +51,7 @@
     :apiUpdate="CountConfigApi.updateCountConfig"
     :apiCreate="CountConfigApi.createCountConfig"
     @searchTableSuccess="searchTableSuccess"
+    @clearSearchInput="clearSearchInput"
     :isBusiness="false"
   />
 
@@ -54,11 +59,12 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="CountConfig.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" 
-    url="/wms/count-config/import" 
-    :importTemplateData="importTemplateData" 
-    @success="importSuccess" 
-    :updateIsDisable="true" 
+  <ImportForm
+    ref="importFormRef"
+    url="/wms/count-config/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+    :updateIsDisable="true"
     :appendIsDisable="true"
     :mode="3"
   />
@@ -66,7 +72,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { CountConfig,CountConfigRules } from './countConfig.data'
+import { CountConfig, CountConfigRules } from './countConfig.data'
 import * as CountConfigApi from '@/api/wms/countConfig'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
@@ -90,13 +96,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
     const setV = {}
     setV[formField] = val[0][searchField]
     if (formField == 'itemCode') {
-        setV['itemName'] = val[0].name
-        setV['desc1'] = val[0].backNumber
-        setV['uom'] = val[0].uom
-        setV['packUnit'] = val[0].defaultPackUnit
-        setV['packQty'] = val[0].defaultPackQty
-
-      }
+      setV['itemName'] = val[0].name
+      setV['desc1'] = val[0].backNumber
+      setV['uom'] = val[0].uom
+      setV['packUnit'] = val[0].defaultPackUnit
+      setV['packQty'] = val[0].defaultPackQty
+      setV['conversionRate'] = val[0].convertRate
+    }
     formRef.setValues(setV)
   })
 }
@@ -115,12 +121,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:count-config:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:count-config:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:count-config:export'}), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'wms:count-config:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'wms:count-config:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:count-config:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -133,16 +139,22 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
@@ -150,14 +162,16 @@ const buttonBaseClick = (val, item) => {
 // 列表-操作按钮
 const butttondata = [
   defaultButtons.mainListEditBtn(), // 编辑
-  defaultButtons.mainListDeleteBtn(), // 删除
+  defaultButtons.mainListDeleteBtn() // 删除
 ]
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
   }
 }
@@ -165,16 +179,16 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
-  if(type=='create'){
-    CountConfig.allSchemas.formSchema.forEach(item =>{
-      if(item.field == "itemCode"){
+  if (type == 'create') {
+    CountConfig.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'itemCode') {
         item.componentProps.isSearchList = true
         item.componentProps.disabled = false
       }
     })
-  } else if(type=='update'){
-    CountConfig.allSchemas.formSchema.forEach(item =>{
-      if(item.field == "itemCode"){
+  } else if (type == 'update') {
+    CountConfig.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'itemCode') {
         item.componentProps.isSearchList = false
         item.componentProps.disabled = true
       }
@@ -184,18 +198,18 @@ const openForm = (type: string, row?: any) => {
 }
 
 // form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =CountConfig.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+const formsSuccess = async (formType, data) => {
+  var isHave = CountConfig.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime'
+  })
+  if (isHave) {
+    if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
       message.error('失效时间要大于生效时间')
-      return;
+      return
     }
   }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
+  if (data.activeTime == 0) data.activeTime = null
+  if (data.expireTime == 0) data.expireTime = null
   if (formType === 'create') {
     await CountConfigApi.createCountConfig(data)
     message.success(t('common.createSuccess'))
@@ -257,6 +271,21 @@ const importSuccess = () => {
   getList()
 }
 
+const clearSearchInput = (formField) => {
+  if (formField == 'itemCode') {
+    //车间
+    basicFormRef.value.formRef.setValues({
+      itemName: '',
+      desc1: '',
+      uom: '',
+      packUnit: '',
+      packQty: '',
+      conversionRate: 1
+    })
+    // tableData.value = []
+  }
+}
+
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {
@@ -271,5 +300,4 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await CountConfigApi.importTemplate()
 })
-
 </script>

From 3c9623621e0d2524974da7015b31cd31cbe3bf27 Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Fri, 20 Jun 2025 15:51:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=9B=98=E7=82=B9=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/countManage/count/countConfig/index.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/countManage/count/countConfig/index.vue b/src/views/wms/countManage/count/countConfig/index.vue
index ae2f5480d..e786ca77f 100644
--- a/src/views/wms/countManage/count/countConfig/index.vue
+++ b/src/views/wms/countManage/count/countConfig/index.vue
@@ -101,7 +101,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       setV['uom'] = val[0].uom
       setV['packUnit'] = val[0].defaultPackUnit
       setV['packQty'] = val[0].defaultPackQty
-      setV['conversionRate'] = val[0].convertRate
+      if (val[0].convertRate == null) {
+        setV['conversionRate'] = 1.0
+      } else {
+        setV['conversionRate'] = val[0].convertRate
+      }
     }
     formRef.setValues(setV)
   })