From a1f617e3246882640db2cb6c70c4ade3f1e5752a Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 14 Nov 2023 17:40:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts                                         | 1 +
 .../strategySetting/configurationsetting/index.vue        | 8 ++++++--
 .../strategySetting/paramsetting/index.vue                | 8 ++++++--
 .../strategy/arrivalInspectionStrategy/index.vue          | 3 +--
 .../strategySetting/strategy/batchStrategy/index.vue      | 3 +--
 .../strategySetting/strategy/downShelfStrategy/index.vue  | 3 +--
 .../strategySetting/strategy/inspectStrategy/index.vue    | 3 +--
 .../strategy/manageAccuracyStrategy/index.vue             | 3 +--
 .../strategy/purchaseReceiptStrategy/index.vue            | 3 +--
 .../strategy/repairMaterialStrategy/index.vue             | 3 +--
 .../strategy/storageCapacityStrategy/index.vue            | 3 +--
 .../strategy/supplieDeliveryStrategy/index.vue            | 3 +--
 .../strategySetting/strategy/upShelfStrategy/index.vue    | 3 +--
 .../strategy/utensilCapacityStrategy/index.vue            | 3 +--
 .../strategy/warehouseStorageStrategy/index.vue           | 3 +--
 .../currencyexchange/currencyexchange.data.ts             | 5 +++--
 .../systemSetting/currencyexchange/index.vue              | 7 +++----
 17 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 9ce197e82..94444b9f5 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -194,6 +194,7 @@ export enum DICT_TYPE {
   ITEM_CONFIGURATION = 'item_configuration', // 物品配置
   EQ_LEVEL = 'eq_level', // 质量等级
   CURRENCY = 'currency', // 货币
+  BASIC_CURRENCY = 'basic_currency', // 货币
   SUPPLIER_TYPE = 'supplier_type', // 供应商类型
   CUSTOMER_TYPE = 'customer_type', // 客户类型
   OWNER_TYPE = 'owner_type', // 货主类型
diff --git a/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
index 08a960871..1892c5bc5 100644
--- a/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
@@ -29,7 +29,7 @@
     >
       <template #strategyType="{row}">
         <el-button type="primary" link @click="openDetail(row, '策略类型', row.strategyType)">
-          <span>{{ row.strategyType }}</span>
+          <span>{{ formatter(row.strategyType) }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 
 defineOptions({ name: 'Configurationsetting' })
 
@@ -202,7 +203,10 @@ const searchFormClick = (searchData) => {
   }
   getList() // 刷新当前列表
 }
-
+const formatter = (type)=>{
+ let str =  getStrDictOptions(DICT_TYPE.STRATEGY_TYPE).filter(item=>type==item.value)[0].label;
+ return str
+}
 /** 初始化 **/
 onMounted(async() => {
   getList()
diff --git a/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue b/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue
index 68f074d31..a098fae59 100644
--- a/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue
@@ -29,7 +29,7 @@
     >
       <template #strategyType="{row}">
         <el-button type="primary" link @click="openDetail(row, '策略类型', row.strategyType)">
-          <span>{{ row.strategyType }}</span>
+          <span>{{ formatter(row.strategyType) }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 
 defineOptions({ name: 'Paramsetting' })
 
@@ -202,7 +203,10 @@ const searchFormClick = (searchData) => {
   }
   getList() // 刷新当前列表
 }
-
+const formatter = (type)=>{
+ let str =  getStrDictOptions(DICT_TYPE.STRATEGY_TYPE).filter(item=>type==item.value)[0].label;
+ return str
+}
 /** 初始化 **/
 onMounted(async() => {
   getList()
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue
index 99f62a372..639e9593f 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue
@@ -8,8 +8,7 @@
           class="!w-240px" />
       </el-form-item>
       <el-form-item label="优先级" prop="priority">
-        <el-input v-model="queryParams.priority" placeholder="请输入优先级" clearable @keyup.enter="handleQuery"
-          class="!w-240px" />
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
       <el-form-item>
         <el-button type="info" plain @click="handleQuery">
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue
index 26d946ac8..937394b63 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue
@@ -8,8 +8,7 @@
           class="!w-240px" />
       </el-form-item>
       <el-form-item label="优先级" prop="priority">
-        <el-input v-model="queryParams.priority" placeholder="请输入优先级" clearable @keyup.enter="handleQuery"
-          class="!w-240px" />
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
       <el-form-item>
         <el-button type="info" plain @click="handleQuery">
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue
index 037a71e78..7e7e3431e 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue
@@ -8,8 +8,7 @@
           class="!w-240px" />
       </el-form-item>
       <el-form-item label="优先级" prop="priority">
-        <el-input v-model="queryParams.priority" placeholder="请输入优先级" clearable @keyup.enter="handleQuery"
-          class="!w-240px" />
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
       <el-form-item>
         <el-button type="info" plain @click="handleQuery">
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue
index c4881ed4b..ca8a89b3d 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue
@@ -8,8 +8,7 @@
           class="!w-240px" />
       </el-form-item>
       <el-form-item label="优先级" prop="priority">
-        <el-input v-model="queryParams.priority" placeholder="请输入优先级" clearable @keyup.enter="handleQuery"
-          class="!w-240px" />
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
       <el-form-item>
         <el-button type="info" plain @click="handleQuery">
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue
index 23c1464be..5dbb91f7d 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue
@@ -8,8 +8,7 @@
           class="!w-240px" />
       </el-form-item>
       <el-form-item label="优先级" prop="priority">
-        <el-input v-model="queryParams.priority" placeholder="请输入优先级" clearable @keyup.enter="handleQuery"
-          class="!w-240px" />
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
       <el-form-item>
         <el-button type="info" plain @click="handleQuery">
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue
index 358f0f0e8..3e9401b00 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue
@@ -9,8 +9,7 @@
           class="!w-240px" />
       </el-form-item>
       <el-form-item label="优先级" prop="priority">
-        <el-input v-model="queryParams.priority" placeholder="请输入优先级" clearable @keyup.enter="handleQuery"
-          class="!w-240px" />
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
       <el-form-item>
         <el-button type="info" plain @click="handleQuery">
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/index.vue
index cdfb11d40..039ee0989 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/index.vue
@@ -8,8 +8,7 @@
           class="!w-240px" />
       </el-form-item>
       <el-form-item label="优先级" prop="priority">
-        <el-input v-model="queryParams.priority" placeholder="请输入优先级" clearable @keyup.enter="handleQuery"
-          class="!w-240px" />
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
       <el-form-item>
         <el-button type="info" plain @click="handleQuery">
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue
index d8ff76860..e1eea8c30 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue
@@ -8,8 +8,7 @@
           class="!w-240px" />
       </el-form-item>
       <el-form-item label="优先级" prop="priority">
-        <el-input v-model="queryParams.priority" placeholder="请输入优先级" clearable @keyup.enter="handleQuery"
-          class="!w-240px" />
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
       <el-form-item>
         <el-button type="info" plain @click="handleQuery">
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
index 31d6fa974..b9480d824 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
@@ -9,8 +9,7 @@
           class="!w-240px" />
       </el-form-item>
       <el-form-item label="优先级" prop="priority">
-        <el-input v-model="queryParams.priority" placeholder="请输入优先级" clearable @keyup.enter="handleQuery"
-          class="!w-240px" />
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
       <el-form-item>
         <el-button type="info" plain @click="handleQuery">
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
index d3502ba54..f7b39fd6f 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
@@ -9,8 +9,7 @@
           class="!w-240px" />
       </el-form-item>
       <el-form-item label="优先级" prop="priority">
-        <el-input v-model="queryParams.priority" placeholder="请输入优先级" clearable @keyup.enter="handleQuery"
-          class="!w-240px" />
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
       <el-form-item>
         <el-button type="info" plain @click="handleQuery">
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue
index f645fdc20..f94f16352 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue
@@ -8,8 +8,7 @@
           class="!w-240px" />
       </el-form-item>
       <el-form-item label="优先级" prop="priority">
-        <el-input v-model="queryParams.priority" placeholder="请输入优先级" clearable @keyup.enter="handleQuery"
-          class="!w-240px" />
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
       <el-form-item>
         <el-button type="info" plain @click="handleQuery">
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue
index a930c2d99..0c45d13b3 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue
@@ -9,8 +9,7 @@
           class="!w-240px" />
       </el-form-item>
       <el-form-item label="优先级" prop="priority">
-        <el-input v-model="queryParams.priority" placeholder="请输入优先级" clearable @keyup.enter="handleQuery"
-          class="!w-240px" />
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
       <el-form-item>
         <el-button type="info" plain @click="handleQuery">
diff --git a/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts b/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts
index 1783cdc0c..2db86fdb9 100644
--- a/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts
+++ b/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts
@@ -22,7 +22,7 @@ export const Currencyexchange = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '基础货币',
     field: 'basiccurrency',
-    dictType: DICT_TYPE.CURRENCY,
+    dictType: DICT_TYPE.BASIC_CURRENCY,
     dictClass: 'string',
     isSearch: true,
     isTable: true,
@@ -41,7 +41,8 @@ export const Currencyexchange = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 0
+        min: 0,
+        precision:6
       }
     },
   },
diff --git a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
index a230e9238..12a04ec52 100644
--- a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
@@ -203,10 +203,9 @@ const searchFormClick = (searchData) => {
   }
   getList() // 刷新当前列表
 }
-const formatter = (currency)=>{
-  console.log(getStrDictOptions(DICT_TYPE.CURRENCY))
- let currencyStr =  getStrDictOptions(DICT_TYPE.CURRENCY).filter(item=>currency==item.value)[0].label;
- return currencyStr
+const formatter = (type)=>{
+ let str =  getStrDictOptions(DICT_TYPE.CURRENCY).filter(item=>type==item.value)[0].label;
+ return str
 }
 /** 初始化 **/
 onMounted(async() => {