Merge branch 'master' of http://dev.ccwin-in.com:3000/eam/eam-ui

src/views/eam/basic/item/index.vue

@@ -1,40 +1,72 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Item.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="Item.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+  <TableHead
-    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="Item.allSchemas" />
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Item.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <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">
+      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 }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm ref="basicFormRef" @success="formsSuccess" :rules="ItemRules" :formAllSchemas="Item.allSchemas"
+  <BasicForm
-    :apiUpdate="ItemApi.updateItem" :apiCreate="ItemApi.createItem" @searchTableSuccess="searchTableSuccess"
+    ref="basicFormRef"
-    :isBusiness="false" />
+    @success="formsSuccess"
+    :rules="ItemRules"
+    :formAllSchemas="Item.allSchemas"
+    :apiUpdate="ItemApi.updateItem"
+    :apiCreate="ItemApi.createItem"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
 
   <SearchTable ref="searchTableRef" @searchTableSuccess="submitItem" />
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="true" :allSchemas="Item.allSchemas" />
-
+  <Dialog
+    ref="basicFormViewRef"
+    v-model="showView"
+    :key="viewKey"
+    :closeOnClickModal="true"
+    :title="viewTitle"
+  >
+    <el-image v-for="url in urls" :key="url" :src="url" lazy />
+  </Dialog>
 </template>
 
 <script setup lang="ts">
@@ -42,7 +74,10 @@
 import { Item, ItemRules } from './item.data'
 import * as ItemApi from '@/api/eam/basic/item'
 import { createDeviceItemBatch, getDeviceItemPage, getDeviceItemNoPage } from '@/api/eam/basic/rel'
-  import { DeviceAccounts, DeviceAccountsRules } from '@/views/eam/device/deviceAccounts/deviceAccounts.data'
+import {
+  DeviceAccounts,
+  DeviceAccountsRules
+} from '@/views/eam/device/deviceAccounts/deviceAccounts.data'
 import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
@@ -57,9 +92,14 @@
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-  const itemNumber = ref();
+const itemNumber = ref()
 const tableColumns = ref(Item.allSchemas.tableColumns)
 
+const showView = ref(false)
+const viewTitle = ref('图片预览')
+const urls = ref([])
+const viewKey = ref(0)
+
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
@@ -87,38 +127,55 @@
   defaultButtons.defaultExportBtn({ hasPermi: 'basic:item:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-    defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
 ]
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-    if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-    } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-    } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-    } else if (val == 'filtrate') { // 筛选
+  } else if (val == 'filtrate') {
-    } else { // 其他按钮
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
 // 列表-操作按钮
-  const butttondata = [
+const butttondataView = (row) => {
+  return [defaultButtons.viewBtn(null)]
+}
+// 列表-操作按钮
+const butttondata =(row)=>{
+  
+  return  [
   defaultButtons.mainListEditBtn({ hasPermi: 'basic:item:update' }), // 编辑
   defaultButtons.chooseDeviceBtn({ hasPermi: 'basic:item:choose' }), //备件
   defaultButtons.mainListDeleteBtn({ hasPermi: 'basic:item:delete' }), // 删除
-  ]
+  defaultButtons.viewBtn({hide: !(row.filePathList != null && row.filePathList.length != 0 )})
+]}
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-    if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     openForm('update', row)
   } else if (val == 'chooseDevice') {
     openItem(row.number)
-    } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
+  } else if (val == 'view') {
+    // 图片预览
+    openForm('view', row)
   }
 }
 
@@ -145,49 +202,68 @@
 const searchTableSelections = ref([])
 const CallBack1 = async () => {
   await getDeviceItemNoPage({ itemNumber: itemNumber.value }).then(async (res) => {
-      await DeviceAccountsApi.getDeviceAccountsAllNoPage({}).then(response => {
+    await DeviceAccountsApi.getDeviceAccountsAllNoPage({}).then((response) => {
-        searchTableSelections.value = response.filter(element => {
+      searchTableSelections.value = response.filter((element) => {
-          let flag = false;
+        let flag = false
-          res.forEach(item => {
+        res.forEach((item) => {
           if (element.number == item.deviceNumber) {
-              flag = true;
+            flag = true
+          }
+        })
+        return flag
+      })
+    })
+  })
 }
-          });
-          return flag;
-        });
-      });
-    });
-  };
 
 const submitItem = async (formFieldRef, searchFieldRef, selections, typeRef, rowRef) => {
-    const deviceItemRelList = selections.map(element => ({
+  const deviceItemRelList = selections.map((element) => ({
     itemNumber: itemNumber.value,
-      deviceNumber: element.number,
+    deviceNumber: element.number
-    }));
+  }))
-    createDeviceItemBatch(deviceItemRelList).then(res => {
+  createDeviceItemBatch(deviceItemRelList).then((res) => {
     message.success(t('common.createSuccess'))
   })
-  };
+}
 
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  console.log(row)
+  if (type == 'view') {
+    showView.value = true
+    urls.value = row.filePathList
+    viewKey.value += 1
+  } else {
+    if (row && row.filePathList && row.filePathList.length > 0) {
+      row.filePathListView = row.filePathList.map((item) => {
+        return {
+          name: item,
+          url: item
+        }
+      })
+    }
     basicFormRef.value.open(type, row)
   }
+}
 
 // form表单提交
 const formsSuccess = async (formType, data) => {
   var isHave = Item.allSchemas.formSchema.some(function (item) {
-      return item.field === 'activeTime' || item.field === 'expireTime';
+    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
+  data.filePathList = []
+  for (let i = 0; i < data.filePathListView.length; i++) {
+    data.filePathList.push(data.filePathListView[i].url)
   }
-    if (data.activeTime == 0) data.activeTime = null;
-    if (data.expireTime == 0) data.expireTime = null;
   if (formType === 'create') {
     await ItemApi.createItem(data)
     message.success(t('common.createSuccess'))

src/views/eam/basic/item/item.data.ts

@@ -274,6 +274,39 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'describes',
     sort: 'custom',
   },
+  {
+    label: '图片',
+    field: 'upload',
+    isTable: true,
+  },
+  {
+    label: '文件',
+    field: 'filePathListView',
+    sort: 'custom',
+    isTable: false,
+    table: {
+    },
+    form: {
+      component: 'UploadFile',
+      componentProps: {
+      }
+    }
+  },
+  {
+    label: '文件',
+    field: 'filePathList',
+    sort: 'custom',
+    isTable: false,
+    isForm: false,
+    table: {
+    },
+    form: {
+      component: 'UploadFile',
+      componentProps: {
+        
+      }
+    }
+  },
   {
     label: '操作',
     field: 'action',

src/views/eam/item/itemAccounts/index.vue

@@ -1,34 +1,65 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ItemAccounts.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="ItemAccounts.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+  <TableHead
-    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="ItemAccounts.allSchemas" />
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="ItemAccounts.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <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">
+      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 }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event, row)" />
       </template>
+      <!-- <template #upload="{ row }">
+        <ButtonBase
+          v-if="row.filePathList != null && row.filePathList.length != 0"
+          :Butttondata="butttondataView(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
+      </template> -->
     </Table>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm ref="basicFormRef" @success="formsSuccess" :rules="ItemAccountsRules"
+  <BasicForm
-    :formAllSchemas="ItemAccounts.allSchemas" :apiUpdate="ItemAccountsApi.updateItemAccounts"
+    ref="basicFormRef"
-    :apiCreate="ItemAccountsApi.createItemAccounts" @searchTableSuccess="searchTableSuccess" :isBusiness="false" />
+    @success="formsSuccess"
+    :rules="ItemAccountsRules"
+    :formAllSchemas="ItemAccounts.allSchemas"
+    :apiUpdate="ItemAccountsApi.updateItemAccounts"
+    :apiCreate="ItemAccountsApi.createItemAccounts"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
 
   <SearchTable ref="searchTableRef" @searchTableSuccess="submitItem" />
 
@@ -36,8 +67,22 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="ItemAccounts.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/eam/item-accounts/import" :importTemplateData="importTemplateData"
+  <ImportForm
-    @success="importSuccess" />
+    ref="importFormRef"
+    url="/eam/item-accounts/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
+
+  <Dialog
+    ref="basicFormViewRef"
+    v-model="showView"
+    :key="viewKey"
+    :closeOnClickModal="true"
+    :title="viewTitle"
+  >
+    <el-image v-for="url in urls" :key="url" :src="url" lazy />
+  </Dialog>
 </template>
 
 <script setup lang="ts">
@@ -62,6 +107,11 @@
 routeName.value = route.name
 const tableColumns = ref(ItemAccounts.allSchemas.tableColumns)
 
+const showView = ref(false)
+const viewTitle = ref('图片预览')
+const urls = ref([])
+const viewKey = ref(0)
+
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
@@ -90,7 +140,7 @@
   defaultButtons.defaultExportBtn({ hasPermi: 'item:itemAccounts:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-    defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -103,35 +153,63 @@
 
 // 头部按钮事件
 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 if (val == 'filtrate') {
-    } else { // 其他按钮
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
 // 列表-操作按钮
-  const butttondata = [
+// const butttondata = [
+//   defaultButtons.mainListEditBtn({ hasPermi: 'item:itemAccounts:update' }), // 编辑
+//   defaultButtons.replaceLocation({ hasPermi: 'item:itemAccounts:replaceLocation' }), //更换库位
+//   defaultButtons.mainListDeleteBtn({ hasPermi: 'item:itemAccounts:delete' }) // 删除
+// ]
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
   defaultButtons.mainListEditBtn({ hasPermi: 'item:itemAccounts:update' }), // 编辑
   defaultButtons.replaceLocation({ hasPermi: 'item:itemAccounts:replaceLocation' }), //更换库位
   defaultButtons.mainListDeleteBtn({ hasPermi: 'item:itemAccounts:delete' }), // 删除
+  defaultButtons.viewBtn({hide: !(row.filePathList != null && row.filePathList.length != 0 )})
+    //defaultButtons.backoutBtn({hasPermi:'eam:device-repair-request:cancel', hide: !(row.result == 'PENDING' && row.declarer == userStore.getUser.id )}), // 撤销
+
   ]
+}
+
+// 列表-操作按钮
+const butttondataView = (row) => {
+  return [defaultButtons.viewBtn(null)]
+}
 
 // 列表-操作按钮事件
 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)
   } else if (val == 'replaceLocation') {
     openItem(row.locationNumber, row.id)
+  } else if (val == 'view') {
+    // 图片预览
+    openForm('view', row)
   }
 }
 
@@ -157,7 +235,7 @@
   const deviceItemRelList = selections.map((element) => ({
     id: wantId1.value,
     locationNumber: locationNumber.value,
-     itemNumber: element.number,
+    itemNumber: element.number
   }))
   ItemAccountsApi.replaceLocation(deviceItemRelList).then((res) => {
     message.success(t('更换成功'))
@@ -170,8 +248,7 @@
   try {
     const res = await ItemApi.getItemPage({
       ...Item.allSchemas.searchSchema,
-        available: "TRUE"
+      available: 'TRUE'
-
     })
     if (res.list?.length > 0) {
       // const response = await getDeviceItemPage(DeviceAccounts.allSchemas.searchSchema);
@@ -194,22 +271,28 @@
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  if (type == 'view') {
+    showView.value = true
+    urls.value = row.filePathList
+    viewKey.value += 1
+  } else {
     basicFormRef.value.open(type, row)
   }
+}
 
 // form表单提交
 const formsSuccess = async (formType, data) => {
   var isHave = ItemAccounts.allSchemas.formSchema.some(function (item) {
-      return item.field === 'activeTime' || item.field === 'expireTime';
+    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.activeTime == 0) data.activeTime = null
-    if (data.expireTime == 0) data.expireTime = null;
+  if (data.expireTime == 0) data.expireTime = null
   if (formType === 'create') {
     await ItemAccountsApi.createItemAccounts(data)
     message.success(t('common.createSuccess'))