Merge pull request 'ck' (#3) from ck into main

Reviewed-on: #3

src/locales/en.ts

@@ -1848,6 +1848,8 @@ export default {
       moduleName: 'Product Material Information',
       searchNameLabel: 'Name',
       searchNamePlaceholder: 'Please enter name',
+      searchCodeLabel: 'Code',
+      searchCodePlaceholder: 'Please enter code',
       searchButtonText: 'Search',
       resetButtonText: 'Reset',
       addButtonText: 'Add',

src/locales/zh-CN.ts

@@ -2680,6 +2680,8 @@ export default {
       moduleName: '产品物料信息',
       searchNameLabel: '名称',
       searchNamePlaceholder: '请输入名称',
+      searchCodeLabel: '编码',
+      searchCodePlaceholder: '请输入编码',
       searchButtonText: '搜索',
       resetButtonText: '重置',
       addButtonText: '新增',

src/views/erp/product/product/index.vue

@@ -2,41 +2,29 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="120px"
-      @submit.prevent
-    >
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="auto" @submit.prevent>
+      <el-form-item :label="t('FactoryModeling.ProductInformation.searchCodeLabel')" prop="barCode">
+        <el-input v-model="queryParams.barCode"
+          :placeholder="t('FactoryModeling.ProductInformation.searchCodePlaceholder')" clearable
+          @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
       <el-form-item :label="t('FactoryModeling.ProductInformation.searchNameLabel')" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          :placeholder="t('FactoryModeling.ProductInformation.searchNamePlaceholder')"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.name"
+          :placeholder="t('FactoryModeling.ProductInformation.searchNamePlaceholder')" clearable
+          @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> {{ t('FactoryModeling.ProductInformation.searchButtonText') }}</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> {{ t('FactoryModeling.ProductInformation.resetButtonText') }}</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['erp:product:create']"
-        >
+        <el-button @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> {{ t('FactoryModeling.ProductInformation.searchButtonText') }}
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> {{ t('FactoryModeling.ProductInformation.resetButtonText') }}
+        </el-button>
+        <el-button type="primary" plain @click="openForm('create')" v-hasPermi="['erp:product:create']">
           <Icon icon="ep:plus" class="mr-5px" /> {{ t('FactoryModeling.ProductInformation.addButtonText') }}
         </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['erp:product:export']"
-        >
+        <el-button type="success" plain @click="handleExport" :loading="exportLoading"
+          v-hasPermi="['erp:product:export']">
           <Icon icon="ep:download" class="mr-5px" /> {{ t('FactoryModeling.ProductInformation.exportButtonText') }}
         </el-button>
       </el-form-item>
@@ -47,12 +35,7 @@
   <ContentWrap>
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
       <!-- 使用 v-for 动态生成 el-tab-pane -->
-    <el-tab-pane
-      v-for="item in parentList"
-      :key="item.id"
-      :label="item.name"
-      :name="item.id.toString()"
-    />
+      <el-tab-pane v-for="item in parentList" :key="item.id" :label="item.name" :name="item.id.toString()" />
       <!-- <el-tab-pane label="产品" name="2" />
       <el-tab-pane label="原料" name="1" />
       <el-tab-pane label="备件" name="5" />
@@ -62,60 +45,46 @@
       <el-tab-pane label="其他" name="0" /> -->
     </el-tabs>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column :label="t('FactoryModeling.ProductInformation.tableBarCodeColumn')" align="center" prop="barCode" sortable/>
-      <el-table-column :label="t('FactoryModeling.ProductInformation.tableNameColumn')" align="left" prop="name"  width="220px" sortable/>
-      <el-table-column :label="t('FactoryModeling.ProductInformation.tableStandardColumn')" align="center" prop="standard" sortable/>
-      <el-table-column :label="t('FactoryModeling.ProductInformation.tableCategoryColumn')" align="center" prop="subCategoryName" sortable/>
-      <el-table-column :label="t('FactoryModeling.ProductInformation.tableUnitColumn')" align="center" prop="unitName" sortable/>
-      <el-table-column :label="t('FactoryModeling.ProductInformation.tableStatusColumn')" align="center" prop="status" sortable>
+      <el-table-column :label="t('FactoryModeling.ProductInformation.tableBarCodeColumn')" align="center" prop="barCode"
+        sortable />
+      <el-table-column :label="t('FactoryModeling.ProductInformation.tableNameColumn')" align="left" prop="name"
+        width="220px" sortable />
+      <el-table-column :label="t('FactoryModeling.ProductInformation.tableStandardColumn')" align="center"
+        prop="standard" sortable />
+      <el-table-column :label="t('FactoryModeling.ProductInformation.tableCategoryColumn')" align="center"
+        prop="subCategoryName" sortable />
+      <el-table-column :label="t('FactoryModeling.ProductInformation.tableUnitColumn')" align="center" prop="unitName"
+        sortable />
+      <el-table-column :label="t('FactoryModeling.ProductInformation.tableStatusColumn')" align="center" prop="status"
+        sortable>
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column
-        :label="t('FactoryModeling.ProductInformation.tableCreateTimeColumn')"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-        sortable
-      />
+      <el-table-column :label="t('FactoryModeling.ProductInformation.tableCreateTimeColumn')" align="center"
+        prop="createTime" :formatter="dateFormatter" width="180px" sortable />
       <el-table-column :label="t('FactoryModeling.ProductInformation.tableOperateColumn')" align="center" width="150px">
         <template #default="scope">
-<!--          <el-button-->
-<!--            v-if="scope.row.categoryId ===2"-->
-<!--            link-->
-<!--            type="primary"-->
-<!--            @click="openBomForm('detail', scope.row.id)"-->
-<!--          >-->
-<!--            BOM-->
-<!--          </el-button>-->
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['erp:product:update']"
-          >
+          <!--          <el-button-->
+          <!--            v-if="scope.row.categoryId ===2"-->
+          <!--            link-->
+          <!--            type="primary"-->
+          <!--            @click="openBomForm('detail', scope.row.id)"-->
+          <!--          >-->
+          <!--            BOM-->
+          <!--          </el-button>-->
+          <el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['erp:product:update']">
             {{ t('FactoryModeling.ProductInformation.tableEditAction') }}
           </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['erp:product:delete']"
-          >
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['erp:product:delete']">
             {{ t('FactoryModeling.ProductInformation.tableDeleteAction') }}
           </el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
@@ -148,6 +117,7 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   name: undefined,
+  barCode: undefined,
   categoryId: undefined
 })
 const queryFormRef = ref() // 搜索的表单
@@ -195,7 +165,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
-  } catch {}
+  } catch { }
 }
 
 /** 导出按钮操作 */