20240807需求修改

src/api/lab/hardness/hardnessFour/index.ts

@@ -0,0 +1,53 @@
+import request from '@/config/axios'
+
+export interface HardnessFourVO {
+  sydw: string
+  standard: string
+  cz: string
+  guig: string
+  testUser: string
+  testDate: string
+  testYd: string
+  auditStatus: string
+}
+
+// 查询实验室-洛氏硬度列表
+export const getHardnessFourPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/lab/hardness-four/senior', data })
+  } else {
+    return await request.get({ url: `/lab/hardness-four/page`, params })
+  }
+}
+
+// 查询实验室-洛氏硬度详情
+export const getHardnessFour = async (id: number) => {
+  return await request.get({ url: `/lab/hardness-four/get?id=` + id })
+}
+
+// 新增实验室-洛氏硬度
+export const createHardnessFour = async (data: HardnessFourVO) => {
+  return await request.post({ url: `/lab/hardness-four/create`, data })
+}
+
+// 修改实验室-洛氏硬度
+export const updateHardnessFour = async (data: HardnessFourVO) => {
+  return await request.put({ url: `/lab/hardness-four/update`, data })
+}
+
+// 删除实验室-洛氏硬度
+export const deleteHardnessFour = async (id: number) => {
+  return await request.delete({ url: `/lab/hardness-four/delete?id=` + id })
+}
+
+// 导出实验室-洛氏硬度 Excel
+export const exportHardnessFour = async (params) => {
+  return await request.download({ url: `/lab/hardness-four/export-excel`, params })
+}
+
+// 下载导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/lab/hardness-four/get-import-template' })
+}

src/views/lab/hardness/hardnessFour/hardnessFour.data.ts

@@ -0,0 +1,120 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const HardnessFourRules = reactive({
+})
+
+export const HardnessFour = useCrudSchemas(reactive<CrudSchema[]>([
+  // {
+  //   label: '主键、自增',
+  //   field: 'id',
+  //   sort: 'custom',
+  //   isForm: false,
+  // },
+  {
+    label: '批次号',
+    field: 'batchNo',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '送样单位',
+    field: 'sydw',
+    sort: 'custom',
+    isSearch: false,
+    isTable:true,
+
+  },
+  {
+    label: '标准',
+    field: 'standard',
+    sort: 'false',
+    isSearch: false,
+  },
+  {
+    label: '材质',
+    field: 'cz',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '规格',
+    field: 'guig',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '实验人',
+    field: 'testUser',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.LAB_USER_TEST_TYPE,
+    dictClass: 'number'
+  },
+  {
+    label: '硬度',
+    field: 'testYd',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '实验日期',
+    field: 'testDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'date',
+        valueFormat: 'YYYY-MM-DD'
+      }
+    },
+  },
+
+  {
+    label: '审核状态',
+    field: 'auditStatus',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      fixed: 'right'
+    },
+    isForm:false,
+    dictType: DICT_TYPE.LAB_AUDIT_STATUS,
+    dictClass: 'number'
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      fixed: 'right'
+    }
+  }
+]))

src/views/lab/hardness/hardnessFour/index.vue

@@ -0,0 +1,225 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="HardnessFour.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="HardnessFour.allSchemas"
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <el-button  v-if="row.auditStatus!='1'" type="text" @click="auditStatus(row)">确认</el-button>
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="getList"
+    :rules="HardnessFourRules"
+    :formAllSchemas="HardnessFour.allSchemas"
+    :searchTableParams="searchTableParams"
+    :apiUpdate="HardnessFourApi.updateHardnessFour"
+    :apiCreate="HardnessFourApi.createHardnessFour"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { HardnessFour,HardnessFourRules } from './hardnessFour.data'
+import * as HardnessFourApi from '@/api/lab/hardness/hardnessFour'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+defineOptions({ name: 'HardnessFour' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(HardnessFour.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: HardnessFourApi.getHardnessFourPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn(null), // 编辑
+  defaultButtons.mainListDeleteBtn(null), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 确认审核操作事件
+const auditStatus = async (row) => {
+  let data = {id: row.id , auditStatus: '1'}
+  // 确认
+  await message.confirm('确认?')
+  // 修改
+  await HardnessFourApi.updateHardnessFour(data)
+  message.success('操作成功')
+  // 刷新列表
+  await getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicHardnessFour')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await HardnessFourApi.deleteHardnessFour(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await HardnessFourApi.exportHardnessFour(setSearchParams)
+    download.excel(data, '实验室-洛氏硬度.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '实验室洛氏硬度导入模版.xls'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await HardnessFourApi.importTemplate()
+})
+
+</script>

src/views/lab/hardness/three/hardnessThree.data.ts

@@ -138,6 +138,7 @@ export const HardnessThree = useCrudSchemas(reactive<CrudSchema[]>([
       width: 120,
       fixed: 'right'
     },
+    isForm:false,
     dictType: DICT_TYPE.LAB_AUDIT_STATUS,
     dictClass: 'number'
   },

src/views/lab/hardness/three/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <el-button type="text" @click="auditStatus(row)">确认</el-button>
+        <el-button v-if="row.auditStatus!='1'" type="text" @click="auditStatus(row)">确认</el-button>
         <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>

src/views/lab/hardness/two/hardnessTwo.data.ts

@@ -147,6 +147,7 @@ export const HardnessTwo = useCrudSchemas(reactive<CrudSchema[]>([
       width: 120,
       fixed: 'right'
     },
+    isForm:false,
     dictType: DICT_TYPE.LAB_AUDIT_STATUS,
     dictClass: 'number'
   },

src/views/lab/hardness/two/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <el-button type="text" @click="auditStatus(row)">确认</el-button>
+        <el-button  v-if="row.auditStatus!='1'" type="text" @click="auditStatus(row)">确认</el-button>
         <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>

src/views/lab/platscale/platscale.data.ts

@@ -90,25 +90,25 @@ export const Platscale = useCrudSchemas(reactive<CrudSchema[]>([
     label: '品种',
     field: 'pz',
     sort: 'custom',
-    isSearch: false,
+    isSearch: true,
     table: {
       width: 150
     }
   },
   {
-    label: '供货单位',
+    label: '使用单位',
     field: 'ghdw',
     sort: 'custom',
-    isSearch: false,
+    isSearch: true,
     table: {
       width: 150
     }
   },
   {
-    label: '运输单位',
+    label: '发货单位',
     field: 'ysdw',
     sort: 'custom',
-    isSearch: false,
+    isSearch: true,
     table: {
       width: 150
     }

src/views/lab/platscaledata/platscale.data.ts

@@ -90,25 +90,25 @@ export const Platscale = useCrudSchemas(reactive<CrudSchema[]>([
     label: '品种',
     field: 'pz',
     sort: 'custom',
-    isSearch: false,
+    isSearch: true,
     table: {
       width: 150
     }
   },
   {
-    label: '供货单位',
+    label: '使用单位',
     field: 'ghdw',
     sort: 'custom',
-    isSearch: false,
+    isSearch: true,
     table: {
       width: 150
     }
   },
   {
-    label: '运输单位',
+    label: '发货单位',
     field: 'ysdw',
     sort: 'custom',
-    isSearch: false,
+    isSearch: true,
     table: {
       width: 150
     }

src/views/lab/stretch/stretchthousandnew/stretchThousandnew.data.ts

@@ -34,7 +34,7 @@ export const StretchThousandnew = useCrudSchemas(reactive<CrudSchema[]>([
     label: '编号',
     field: 'bhNo',
     sort: 'custom',
-    isSearch: false,
+    isSearch: true,
     table: {
       width: 150
     }
@@ -124,7 +124,7 @@ export const StretchThousandnew = useCrudSchemas(reactive<CrudSchema[]>([
     label: '尺寸',
     field: 'deviceCc',
     sort: 'custom',
-    isSearch: false,
+    isSearch: true,
     table: {
       width: 150
     }

src/views/lab/stretch/stretchthreehundred/stretchthreehundred.data.ts

@@ -52,7 +52,7 @@ export const Stretch300 = useCrudSchemas(reactive<CrudSchema[]>([
     label: '材质',
     field: 'cz',
     sort: 'custom',
-    isSearch: false,
+    isSearch: true,
     table: {
       width: 150
     }
@@ -61,7 +61,7 @@ export const Stretch300 = useCrudSchemas(reactive<CrudSchema[]>([
     label: '规格',
     field: 'guig',
     sort: 'custom',
-    isSearch: false,
+    isSearch: true,
     table: {
       width: 150
     }

src/views/tjanalysis/platscale/index.vue

@@ -9,6 +9,20 @@
           clearable
         />
       </el-form-item>
+      <el-form-item label="发货单位" prop="ysdw">
+        <el-input
+          v-model="queryParams.ysdw"
+          placeholder="请输入发货单位"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item label="品种" prop="pz">
+        <el-input
+          v-model="queryParams.pz"
+          placeholder="请输入品种"
+          clearable
+        />
+      </el-form-item>
       <el-form-item label="日期" prop="dateRange">
         <el-date-picker
           v-model="queryParams.dateRange"
@@ -31,8 +45,8 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="dataList.dList" border="true" highlight-current-row="true">
       <el-table-column label="序号" type="index" width="80" align="center" />
-      <el-table-column label="供货单位(使用单位)" prop="ghdw" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="使用单位" prop="ghdw" align="center" :show-overflow-tooltip="true" />
-      <el-table-column label="运输单位" prop="ysdw" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="发货单位" prop="ysdw" align="center" :show-overflow-tooltip="true" />
       <el-table-column label="品种" prop="pz" align="center" :show-overflow-tooltip="true" />
       <el-table-column label="总净重（t）" prop="jz" align="center" :show-overflow-tooltip="true" />
     </el-table>
@@ -66,7 +80,9 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   dateRange: [],
-  ghdw: ''
+  ghdw:'',
+  ysdw:'',
+  pz:''
 })
 
 const handleQuery = async () => {
@@ -76,6 +92,8 @@ const handleQuery = async () => {
 const resetQuery = async () => {
   queryParams.dateRange = []
   queryParams.ghdw =''
+  queryParams.ysdw =''
+  queryParams.pz =''
   getList()
 }
 
@@ -89,7 +107,6 @@ const getList = async (page) => {
     dataList.dList = res.list
     dataList.total = res.total
   }
-  console.log('23',dataList.total);
   loading.value = false
 }