Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

master_hella_20240701
陈宜阳 7 months ago
parent
commit
63f8c4feca
  1. 26
      src/api/qms/inspectionTemplate/index.ts
  2. 109
      src/layout/components/CategoryHeader.vue
  3. 22
      src/layout/components/Menu/src/Menu.vue
  4. 7
      src/layout/components/useRenderLayout.tsx
  5. 17
      src/store/modules/app.ts
  6. 712
      src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
  7. 95
      src/views/qms/basicDataManage/inspectionTemplate/index.vue
  8. 207
      src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts

26
src/api/qms/inspectionTemplate/index.ts

@ -3,6 +3,28 @@ import request from '@/config/axios'
// 查询采样过程列表 // 查询采样过程列表
export const getInspectionProcessPage = async (params) => { export const getListByTempleteCode = async (code) => {
return await request.get({ url: `/qms/inspection-process/page`}) return await request.get({ url: `/qms/inspection-process/getListByTempleteCode?code=`+code})
}
// 新增
export const inspectionTemplateCreat = async (data) => {
return await request.post({ url: `/qms/programme-template/create`,data})
}
// 编辑
export const inspectionTemplateUpdate = async (data) => {
return await request.put({ url: `/qms/programme-template/update`,data})
}
// 删除
export const inspectionTemplateDelete = async (id) => {
return await request.delete({ url: `/qms/programme-template/delete?id=`+id})
}
// 列表
export const inspectionTemplatePage = async (params) => {
if (params.isSearch) {
delete params.isSearch
const data = {...params}
return request.post({ url: '/wms/accountcalendar/senior', data })
} else {
return await request.get({ url: `/qms/programme-template/page`, params })
}
} }

109
src/layout/components/CategoryHeader.vue

@ -0,0 +1,109 @@
<script lang="tsx">
import { defineComponent, computed } from 'vue'
import { useRouter } from 'vue-router'
import { useAppStore } from '@/store/modules/app'
import { isUrl } from '@/utils/is'
import { pathResolve } from '@/utils/routerHelper'
import type { RouteMeta } from 'vue-router'
import { ElMenu, ElMenuItem } from 'element-plus'
import { usePermissionStore } from '@/store/modules/permission'
import { hasOneShowingChild } from '@/layout/components/Menu/src/helper'
import { useRenderMenuTitle } from '@/layout/components/Menu/src/components/useRenderMenuTitle'
//
import { useDesign } from '@/hooks/web/useDesign'
const { getPrefixCls, variables } = useDesign()
const appStore = useAppStore()
const layout = computed(() => appStore.getLayout)
const prefixCls = getPrefixCls('tool-header')
const permissionStore = usePermissionStore()
const routers = computed(() =>
unref(layout) === 'cutMenu' ? permissionStore.getMenuTabRouters : permissionStore.getRouters
)
const getPath = (route) => {
let routePath = route.path
if(routePath.startsWith('/')){
routePath = route.path
}else{
routePath = '/'+route.path
}
if(route.redirect){
return route.redirect
}else if(route.children){
return routePath+getPath(route.children[0])
}else{
return routePath
}
}
export default defineComponent({
name: 'CategoryHeader',
setup() {
console.log('useRouter()',useRouter())
const { push } = useRouter()
// backgroundColor="var(--left-menu-bg-color)"
// textColor="var(--left-menu-text-color)"
return () => (
<div
id={`${variables.namespace}-tool-header`}
class={[
prefixCls,
'h-[var(--top-tool-height)] relative px-[var(--top-tool-p-x)] flex items-center justify-between',
'dark:bg-[var(--el-bg-color)]'
]}
>
<ElMenu style="width:100%"
mode="horizontal"
backgroundColor="white"
textColor="var(--left-menu-bg-color)"
activeTextColor="var(--left-menu-text-active-color)"
>
{{
default: () => {
const { renderMenuTitle } = useRenderMenuTitle()
const categoryRouters = unref(routers).filter(item=>item.meta.hidden!=true&&item.path!='/')
console.log('categoryRouters==',categoryRouters)
{/* default: () => renderMenuTitle(onlyOneChild ? onlyOneChild?.meta : meta) */}
return categoryRouters.map((v) => {
const meta = (v.meta ?? {}) as RouteMeta
const { onlyOneChild } = hasOneShowingChild(v.children, v)
const fullPath = isUrl(v.path) ? v.path : pathResolve('/', v.path) // getAllParentPath<AppRouteRecordRaw>(allRouters, v.path).join('/')
return (
<ElMenuItem index={fullPath} onClick={()=>{
console.log(v)
appStore.setCategoryRoutePath(v.path)
}}>
{{
default: () => renderMenuTitle(meta.title?meta:onlyOneChild?.meta)
}}
</ElMenuItem>
)
})
}
}}
</ElMenu>
</div>
)
}
})
</script>
<style lang="scss" scoped>
$prefix-cls: #{$namespace}-tool-header;
.#{$prefix-cls} {
transition: left var(--transition-time-02);
}
::v-deep(.el-menu--horizontal>.el-menu-item){
border-radius: 5px;
height: 40px;
margin-right: 10px;
background: linear-gradient(to top left,var(--left-menu-bg-color),var(--left-menu-text-color));
}
</style>

22
src/layout/components/Menu/src/Menu.vue

@ -45,6 +45,26 @@ export default defineComponent({
unref(layout) === 'cutMenu' ? permissionStore.getMenuTabRouters : permissionStore.getRouters unref(layout) === 'cutMenu' ? permissionStore.getMenuTabRouters : permissionStore.getRouters
) )
const categoryRoutes = computed(() => {
const allRoutes = unref(layout) === 'cutMenu' ? permissionStore.getMenuTabRouters : permissionStore.getRouters
const categoryPath = appStore.getCategoryRoutePath
let findRoutes = allRoutes.find(item=>!item.meta.hidden&&item.path === categoryPath)
if(findRoutes){
findRoutes = JSON.parse(JSON.stringify(findRoutes))
findRoutes?.children?.forEach(item => {
item.path = findRoutes?.path+'/'+item.path
});
}
let homeRoute = allRoutes.find(item=>!item.meta.hidden&&item.path === '/')
if(categoryPath!=homeRoute?.path&&homeRoute){
homeRoute = JSON.parse(JSON.stringify(homeRoute))
homeRoute?.children?.forEach(item => {
item.path = homeRoute?.path+item.path
});
}
return categoryPath!=homeRoute?.path?[...homeRoute?.children||[],...findRoutes?.children||[]]:[...findRoutes?.children||[]]||homeRoute||[]
})
const collapse = computed(() => appStore.getCollapse) const collapse = computed(() => appStore.getCollapse)
const uniqueOpened = computed(() => appStore.getUniqueOpened) const uniqueOpened = computed(() => appStore.getUniqueOpened)
@ -95,7 +115,7 @@ export default defineComponent({
{{ {{
default: () => { default: () => {
const { renderMenuItem } = useRenderMenuItem(unref(menuMode)) const { renderMenuItem } = useRenderMenuItem(unref(menuMode))
return renderMenuItem(unref(routers)) return appStore.getShowCategoryMenu?renderMenuItem(unref(categoryRoutes)):renderMenuItem(unref(routers))
} }
}} }}
</ElMenu> </ElMenu>

7
src/layout/components/useRenderLayout.tsx

@ -6,6 +6,7 @@ import { TagsView } from '@/layout/components/TagsView'
import { Logo } from '@/layout/components/Logo' import { Logo } from '@/layout/components/Logo'
import AppView from './AppView.vue' import AppView from './AppView.vue'
import ToolHeader from './ToolHeader.vue' import ToolHeader from './ToolHeader.vue'
import CategoryHeader from './CategoryHeader.vue'
import { ElScrollbar } from 'element-plus' import { ElScrollbar } from 'element-plus'
import { useDesign } from '@/hooks/web/useDesign' import { useDesign } from '@/hooks/web/useDesign'
import RouterSearch from '@/components/RouterSearch/index.vue' import RouterSearch from '@/components/RouterSearch/index.vue'
@ -111,6 +112,12 @@ export const useRenderLayout = () => {
]} ]}
style="transition: all var(--transition-time-02);" style="transition: all var(--transition-time-02);"
> >
{appStore.getShowCategoryMenu?(<CategoryHeader class={[
'bg-[var(--top-header-bg-color)]',
{
'layout-border__bottom': !tagsView.value
}
]}></CategoryHeader>):undefined}
<ToolHeader <ToolHeader
class={[ class={[
'bg-[var(--top-header-bg-color)]', 'bg-[var(--top-header-bg-color)]',

17
src/store/modules/app.ts

@ -36,6 +36,8 @@ interface AppState {
footer: boolean footer: boolean
theme: ThemeTypes theme: ThemeTypes
fixedMenu: boolean fixedMenu: boolean
categoryRoutePath:string
showCategoryMenu: boolean
} }
export const useAppStore = defineStore('app', { export const useAppStore = defineStore('app', {
@ -97,7 +99,9 @@ export const useAppStore = defineStore('app', {
topHeaderHoverColor: '#f6f6f6', topHeaderHoverColor: '#f6f6f6',
// 头部边框颜色 // 头部边框颜色
topToolBorderColor: '#eee' topToolBorderColor: '#eee'
} },
categoryRoutePath:'',
showCategoryMenu:false // true:顶部展示一级菜单栏 false:只有左侧菜单栏
} }
}, },
getters: { getters: {
@ -175,7 +179,13 @@ export const useAppStore = defineStore('app', {
}, },
getFooter(): boolean { getFooter(): boolean {
return this.footer return this.footer
} },
getCategoryRoutePath():string{
return this.categoryRoutePath
},
getShowCategoryMenu():boolean {
return this.showCategoryMenu
},
}, },
actions: { actions: {
setBreadcrumb(breadcrumb: boolean) { setBreadcrumb(breadcrumb: boolean) {
@ -267,6 +277,9 @@ export const useAppStore = defineStore('app', {
}, },
setFooter(footer: boolean) { setFooter(footer: boolean) {
this.footer = footer this.footer = footer
},
setCategoryRoutePath(path:string){
this.categoryRoutePath = path
} }
} }
}) })

712
src/views/qms/basicDataManage/inspectionTemplate/addForm.vue

@ -8,25 +8,25 @@
> >
<div style="max-height: 60vh; overflow-y: auto; padding: 0px 20px"> <div style="max-height: 60vh; overflow-y: auto; padding: 0px 20px">
<!-- <Form ref="formRefMain" :schema="formAllSchemasMain" :is-col="true" :rules="rules" /> --> <!-- <Form ref="formRefMain" :schema="formAllSchemasMain" :is-col="true" :rules="rules" /> -->
<el-form :model="data" label-width="auto"> <el-form :model="data" label-width="auto" :rules="rules" ref="formMainRef">
<el-row> <el-row>
<el-col :span="12">
<el-form-item label="编码">
<el-input v-model="data.code" placeholder="根据系统生成" :disabled="true"/>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="描述"> <el-form-item label="编码" prop="code">
<el-input v-model="data.description" placeholder="请填写描述"/> <el-input v-model="data.code" placeholder="根据系统生成" :disabled="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="版本"> <el-form-item label="描述" prop="description">
<el-input v-model="data.version" placeholder="请填写版本"/> <el-input v-model="data.description" placeholder="请填写描述" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="12">
</el-form> <el-form-item label="版本" prop="version">
<el-input v-model="data.version" placeholder="请填写版本" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-tabs <el-tabs
v-model="editableTabsValue" v-model="editableTabsValue"
editable editable
@ -50,89 +50,168 @@
labelWidth="150px" labelWidth="150px"
:rules="rules" :rules="rules"
/> --> /> -->
<el-form :model="item" label-width="auto"> <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="编码"> <el-form-item label="编码" prop="code">
<el-input v-model="item.code" placeholder="根据系统生成" :disabled="true"/> <el-input v-model="item.code" placeholder="根据系统生成" :disabled="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="检验方案模板编码"> <el-form-item label="检验方案模板编码">
<el-input v-model="item.inspectionCode" placeholder="根据系统生成" :disabled="true"/> <el-input
v-model="item.inspectionCode"
placeholder="根据系统生成"
:disabled="true"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="描述"> <el-form-item label="描述" prop="description">
<el-input v-model="item.description" /> <el-input v-model="item.description" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="顺序号"> <el-form-item label="顺序号" prop="sequenceCode">
<el-input v-model="item.sequenceCode" /> <el-input v-model="item.sequenceCode" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="检验特性编码"> <el-form-item label="检验特性编码">
<el-input v-model="item.inspectionCharCode" placeholder="根据系统生成" :disabled="true"/> <el-input
v-model="item.inspectionCharCode"
placeholder="根据系统生成"
:disabled="true"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div class="small-title">检验特性</div> <div class="small-title">检验特性</div>
<el-form :model="item" label-width="auto"> <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="编码"> <el-form-item label="编码">
<el-input v-model="item.inspectionCharacteristicsBaseVO.code" placeholder="根据系统生成" :disabled="true"/> <el-input
v-model="item.inspectionCharacteristicsBaseVO.code"
placeholder="根据系统生成"
:disabled="true"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="描述"> <el-form-item label="描述" prop="inspectionCharacteristicsBaseVO.description">
<el-input v-model="item.inspectionCharacteristicsBaseVO.description" /> <el-input v-model="item.inspectionCharacteristicsBaseVO.description" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="检验方法编码"> <el-form-item
<el-select v-model="item.inspectionCharacteristicsBaseVO.inspectionMethodCode" placeholder="请选择检验方法编码"> label="检验方法编码"
<el-option prop="inspectionCharacteristicsBaseVO.inspectionMethodCode"
v-for="item in inspectionProcessList" >
:key="item.id" <div style="display: flex; width: 100%">
:label="item.description" <el-input
:value="item.id" v-model="item.inspectionCharacteristicsBaseVO.inspectionMethodCode"
disabled
placeholder="请选择检验方法编码"
/> />
</el-select> <el-button
type="info"
plain
style="width: 40px"
@click="
opensearchTable(
'inspectionMethodCode',
null,
'检验方法',
SamplingProcess.allSchemas,
SamplingProcessApi.getSamplingProcessPage,
null,
false,
null,
item
)
"
><Icon icon="ep:search"
/></el-button>
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="采样过程编码"> <el-form-item
<el-select v-model="item.inspectionCharacteristicsBaseVO.inspectionProcessPage" placeholder="请选择采样过程编码"> label="采样过程编码"
<el-option prop="inspectionCharacteristicsBaseVO.dynamicUpdateCode"
v-for="item in inspectionProcessList" >
:key="item.id" <div style="display: flex; width: 100%">
:label="item.description" <el-input
:value="item.id" v-model="item.inspectionCharacteristicsBaseVO.dynamicUpdateCode"
disabled
placeholder="请选择采样过程编码"
/> />
</el-select> <el-button
type="info"
plain
style="width: 40px"
@click="
opensearchTable(
'dynamicUpdateCode',
null,
'采样过程编码',
SamplingProcess.allSchemas,
SamplingProcessApi.getSamplingProcessPage,
null,
false,
null,
item
)
"
><Icon icon="ep:search"
/></el-button>
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="动态修改规则编码"> <el-form-item
<el-select v-model="item.inspectionCharacteristicsBaseVO.inspectionMethod" placeholder="请选择动态修改规则编码"> label="动态修改规则编码"
<el-option prop="inspectionCharacteristicsBaseVO.inspectionMethod"
v-for="item in inspectionProcessList" >
:key="item.id" <div style="display: flex; width: 100%">
:label="item.description" <el-input
:value="item.id" v-model="item.inspectionCharacteristicsBaseVO.inspectionMethod"
disabled
placeholder="请选择动态修改规则编码"
/> />
</el-select> <el-button
type="info"
plain
style="width: 40px"
@click="
opensearchTable(
'inspectionMethod',
null,
'动态修改规则编码',
SamplingProcess.allSchemas,
SamplingProcessApi.getSamplingProcessPage,
null,
false,
null,
item
)
"
><Icon icon="ep:search"
/></el-button>
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否允许修改特征值"> <el-form-item
<el-select v-model="item.inspectionCharacteristicsBaseVO.isCanUpdate" placeholder="请选择是否允许修改特征值"> label="是否允许修改特征值"
prop="inspectionCharacteristicsBaseVO.isCanUpdate"
>
<el-select
v-model="item.inspectionCharacteristicsBaseVO.isCanUpdate"
placeholder="请选择是否允许修改特征值"
>
<el-option <el-option
v-for="item in isYesList" v-for="item in isYesList"
:key="item.value" :key="item.value"
@ -143,10 +222,18 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="结果录入方式"> <el-form-item
<el-select v-model="item.inspectionCharacteristicsBaseVO.resultEntryMethod" placeholder="请选择结果录入方式"> label="结果录入方式"
prop="inspectionCharacteristicsBaseVO.resultEntryMethod"
>
<el-select
v-model="item.inspectionCharacteristicsBaseVO.resultEntryMethod"
placeholder="请选择结果录入方式"
>
<el-option <el-option
v-for="dict in getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY)" v-for="dict in getStrDictOptions(
DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
)"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
@ -155,11 +242,17 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="特征类型"> <el-form-item label="特征类型" prop="inspectionCharacteristicsBaseVO.featureType">
<!-- <el-input v-model="item.featureType" /> --> <!-- <el-input v-model="item.featureType" /> -->
<el-select v-model="item.inspectionCharacteristicsBaseVO.featureType" placeholder="请选择特征类型"> <el-select
v-model="item.inspectionCharacteristicsBaseVO.featureType"
placeholder="请选择特征类型"
@change="changeFeatureType"
>
<el-option <el-option
v-for="dict in getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE)" v-for="dict in getStrDictOptions(
DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
)"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
@ -168,9 +261,16 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 0">
<el-form-item label="是否设定上限"> <el-form-item
<el-select v-model="item.inspectionCharacteristicsBaseVO.quantifyIsCapping" placeholder="请选择是否设定上限"> label="是否设定上限"
prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
>
<el-select
v-model="item.inspectionCharacteristicsBaseVO.quantifyIsCapping"
placeholder="请选择是否设定上限"
@change="changeIsCapping"
>
<el-option <el-option
v-for="item in isYesList" v-for="item in isYesList"
:key="item.value" :key="item.value"
@ -181,8 +281,25 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否设定下限"> <el-form-item
<el-select v-model="item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit" placeholder="请选择是否设定下限"> label="上限值"
prop="inspectionCharacteristicsBaseVO.quantifyCapping"
v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
>
<el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyCapping" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
prop="inspectionCharacteristicsBaseVO.quantifyIsLowlimit"
label="是否设定下限"
v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
>
<el-select
v-model="item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit"
placeholder="请选择是否设定下限"
@change="changeLowlimit"
>
<el-option <el-option
v-for="item in isYesList" v-for="item in isYesList"
:key="item.value" :key="item.value"
@ -193,40 +310,94 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="目标值"> <el-form-item
<el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyTarget" /> label="下限值"
prop="inspectionCharacteristicsBaseVO.quantifyLowlimit"
v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
>
<el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyLowlimit" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="上限值"> <el-form-item
<el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyCapping" /> prop="inspectionCharacteristicsBaseVO.quantifyIsTarget"
label="是否设定目标值"
v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
>
<el-select
v-model="item.inspectionCharacteristicsBaseVO.quantifyIsTarget"
placeholder="请选择是否设定目标值"
@change="changeIsTarget"
>
<el-option
v-for="item in isYesList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="下限值"> <el-form-item
<el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyLowlimit" /> label="目标值"
prop="inspectionCharacteristicsBaseVO.quantifyTarget"
v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
>
<el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyTarget" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="计量单位"> <el-form-item
label="计量单位"
prop="inspectionCharacteristicsBaseVO.quantifyUom"
v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
>
<el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyUom" /> <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyUom" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="小数位"> <el-form-item
label="小数位"
prop="inspectionCharacteristicsBaseVO.quantifyDecimal"
v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
>
<el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyDecimal" /> <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyDecimal" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="选择集编码"> <el-form-item
<el-select v-model="item.inspectionCharacteristicsBaseVO.quantifyQuantifyCode" placeholder="请选择集编码"> label="选择集编码"
<el-option prop="inspectionCharacteristicsBaseVO.quantifyQuantifyCode"
v-for="item in inspectionProcessList" v-if="item.inspectionCharacteristicsBaseVO.featureType == 1"
:key="item.id" >
:label="item.description" <div style="display: flex; width: 100%">
:value="item.id" <el-input
v-model="item.inspectionCharacteristicsBaseVO.quantifyQuantifyCode"
disabled
placeholder="请选择选择集编码"
/> />
</el-select> <el-button
type="info"
plain
style="width: 40px"
@click="
opensearchTable(
'quantifyQuantifyCode',
null,
'选择集编码',
SamplingProcess.allSchemas,
SamplingProcessApi.getSamplingProcessPage,
null,
false,
null,
item
)
"
><Icon icon="ep:search"
/></el-button>
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -240,12 +411,20 @@
</Dialog> </Dialog>
<Dialog title="修改名称" v-model="dialogVisibleName" width="500px" :close-on-click-modal="false"> <Dialog title="修改名称" v-model="dialogVisibleName" width="500px" :close-on-click-modal="false">
<div style="padding: 0px 20px"> <div style="padding: 0px 20px">
<el-input v-model="name" style="width: 240px" placeholder="请输入名称" /> <el-form ref="nameRef" :model="nameForm">
<el-form-item
:rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]"
prop="name"
>
<el-input v-model="nameForm.name" style="width: 240px" placeholder="请输入名称" />
</el-form-item>
</el-form>
</div> </div>
<template #footer> <template #footer>
<ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick1" /> <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick1" />
</template> </template>
</Dialog> </Dialog>
<SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -253,21 +432,11 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { getCurrentInstance } from 'vue' import { getCurrentInstance } from 'vue'
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
import * as InspectionProcessPageApi from '@/api/qms/inspectionTemplate' import * as InspectionProcessPageApi from '@/api/qms/inspectionTemplate'
const inspectionProcessList = ref([]) import { SearchTable } from '@/components/SearchTable'
const isYesList = ref([]) import { SamplingProcess } from '@/views/qms/samplingProcess/samplingProcess.data'
onMounted(async()=>{ import * as SamplingProcessApi from '@/api/qms/samplingProcess'
let inspectionProcessPage = await InspectionProcessPageApi.getInspectionProcessPage() const message = useMessage() //
inspectionProcessList.value = inspectionProcessPage.list
console.log(inspectionProcessList)
isYesList.value =[{
value:0,
label:'是'
},{
value:1,
label:'否'
}]
})
const props = defineProps({ const props = defineProps({
// //
basicFormWidth: { basicFormWidth: {
@ -297,40 +466,106 @@ const props = defineProps({
type: Array, type: Array,
required: false, required: false,
default: null default: null
},
// rules
rules: {
type: Object,
required: true,
default: null
} }
}) })
const { t } = useI18n() // const { t } = useI18n() //
const dialogVisible = ref(true) // const dialogVisible = ref(false) //
const dialogTitle = ref('') // const dialogTitle = ref('') //
const formLoading = ref(false) // 12 const formLoading = ref(false) // 12
const formType = ref('') // create - update - const formType = ref('') // create - update -
const dialogWidth = ref() const dialogWidth = ref()
const formMainRef = ref()
const formFeaturesRef = ref()
const formProcessRef = ref()
const data = ref({ const data = ref({
code: '', code: '',
description:'', description: '',
version:'', version: '',
process:[] process: []
}) })
const isYesList = [
{
value: true,
label: '是'
},
{
value: false,
label: '否'
}
]
const dialogVisibleName = ref(false) const dialogVisibleName = ref(false)
const name = ref('') const nameForm = ref({
const onSubmit = () => { name: ''
console.log('submit!') })
} const nameRef = ref()
if (props.basicFormWidth) { if (props.basicFormWidth) {
dialogWidth.value = props.basicFormWidth + '%' dialogWidth.value = props.basicFormWidth + '%'
} else { } else {
dialogWidth.value = props.isBusiness ? '60%' : '40%' dialogWidth.value = props.isBusiness ? '60%' : '40%'
} }
const rules = ref({
description: [{ required: true, message: '请填写描述', trigger: 'blur' }],
version: [{ required: true, message: '请填写版本', trigger: 'blur' }],
inspectionCode: [{ required: true, message: '请选择检验方案模板编码', trigger: 'blur' }],
sequenceCode: [{ required: true, message: '请填写顺序号', trigger: 'blur' }],
inspectionCharCode: [{ required: true, message: '请选择检验特性编码', trigger: 'blur' }],
'inspectionCharacteristicsBaseVO.description': [
{ required: true, message: '请填写描述', trigger: ['blur', 'change'] }
],
'inspectionCharacteristicsBaseVO.inspectionMethodCode': [
{ required: true, message: '请选择检验方法编码', trigger: 'blur' }
],
'inspectionCharacteristicsBaseVO.dynamicUpdateCode': [
{ required: true, message: '请选择采样过程编码', trigger: ['blur', 'change'] }
],
'inspectionCharacteristicsBaseVO.inspectionMethod': [
{ required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] }
],
'inspectionCharacteristicsBaseVO.isCanUpdate': [
{ required: true, message: '请选择是否允许修改特征值', trigger: ['blur', 'change'] }
],
'inspectionCharacteristicsBaseVO.isDestructionInspection': [
{ required: true, message: '请选择是否破坏性检验', trigger: ['blur', 'change'] }
],
'inspectionCharacteristicsBaseVO.resultEntryMethod': [
{ required: true, message: '请选择结果录入方式', trigger: ['blur', 'change'] }
],
'inspectionCharacteristicsBaseVO.featureType': [
{ required: true, message: '请选择特征类型', trigger: ['blur', 'change'] }
],
'inspectionCharacteristicsBaseVO.quantifyIsCapping': [
{ required: true, message: '请选择是否设定上限', trigger: ['blur', 'change'] }
],
'inspectionCharacteristicsBaseVO.quantifyIsLowlimit': [
{ required: true, message: '请选择是否设定下限', trigger: ['blur', 'change'] }
],
'inspectionCharacteristicsBaseVO.quantifyIsTarget': [
{ required: true, message: '请选择是否设定目标值', trigger: ['blur', 'change'] }
],
'inspectionCharacteristicsBaseVO.quantifyTarget': [
{ required: true, message: '请输入目标值', trigger: 'blur' }
],
'inspectionCharacteristicsBaseVO.quantifyCapping': [
{ required: true, message: '请输入上限值', trigger: 'blur' }
],
'inspectionCharacteristicsBaseVO.quantifyLowlimit': [
{ required: true, message: '请输入下限值', trigger: 'blur' }
],
'inspectionCharacteristicsBaseVO.quantifyUom': [
{ required: true, message: '请选择计量单位', trigger: 'blur' }
],
'inspectionCharacteristicsBaseVO.quantifyDecimal': [
{ required: true, message: '请输入小数位', trigger: 'blur' }
],
'inspectionCharacteristicsBaseVO.quantifyQuantifyCode': [
{ required: true, message: '请输入选择集编码', trigger: 'blur' }
]
})
/** 打开弹窗 */ /** 打开弹窗 */
let tabIndex = 1
const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => { const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => {
dialogVisible.value = true dialogVisible.value = true
if (titleName) { if (titleName) {
@ -338,17 +573,35 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
} else { } else {
dialogTitle.value = t('action.' + type) dialogTitle.value = t('action.' + type)
} }
formType.value = type
if (row) {
data.value = row
let list = await InspectionProcessPageApi.getListByTempleteCode(row.code)
list.forEach((item, index) => {
editableTabsValue.value = index + 1
item.name = index + 1
})
data.value.process = list
} else {
data.value = {
code: '',
description: '',
version: '',
process: []
}
}
tabIndex = data.value.process.length + 1
} }
defineExpose({ open, dialogVisible, formLoading }) // open defineExpose({ open, dialogVisible, formLoading }) // open
import type { TabPaneName } from 'element-plus' import type { TabPaneName } from 'element-plus'
let tabIndex = 1
const editableTabsValue = ref('1') const editableTabsValue = ref('1')
// const editableTabs = ref([]) // const editableTabs = ref([])
const handleTabsEdit = (targetName: TabPaneName | undefined, action: 'remove' | 'add') => { const handleTabsEdit = (targetName: TabPaneName | undefined, action: 'remove' | 'add') => {
if (action === 'add') { if (action === 'add') {
name.value = '' nameForm.value.name = ''
dialogVisibleName.value = true dialogVisibleName.value = true
} else if (action === 'remove') { } else if (action === 'remove') {
const tabs = data.value.process const tabs = data.value.process
@ -370,39 +623,45 @@ const handleTabsEdit = (targetName: TabPaneName | undefined, action: 'remove' |
/** 修改名称时间 */ /** 修改名称时间 */
const buttonBaseClick1 = (val) => { const buttonBaseClick1 = (val) => {
// //
console.log(val)
if (val == 'save') { if (val == 'save') {
const newTabName = `${++tabIndex}` if (!nameRef.value) return
data.value.process.push({ nameRef.value.validate((valid, fields) => {
description: name.value, if (valid) {
name: newTabName, const newTabName = `${++tabIndex}`
inspectionCode: '', data.value.process.push({
sequenceCode: '', description: nameForm.value.name,
inspectionCharCode: '', name: newTabName,
inspectionCharacteristicsBaseVO:{ inspectionCode: '',
describe: '', sequenceCode: '',
inspectionMethodCode: '', inspectionCharCode: '',
dynamicUpdateCode: '', inspectionCharacteristicsBaseVO: {
inspectionMethod: '', describe: '',
isCanUpdate: '', inspectionMethodCode: '',
isDestructionInspection: '', dynamicUpdateCode: '',
resultEntryMethod: '', inspectionMethod: '',
featureType: '', isCanUpdate: '',
quantifyIsCapping: '', isDestructionInspection: '',
quantifyIsLowlimit: '', resultEntryMethod: '',
quantifyTarget: '', featureType: '',
quantifyCapping: '', quantifyIsCapping: '',
quantifyLowlimit: '', quantifyIsLowlimit: '',
quantifyUom: '', quantifyTarget: '',
quantifyDecimal: '', quantifyCapping: '',
quantifyQuantifyCode: '' quantifyLowlimit: '',
quantifyUom: '',
quantifyDecimal: '',
quantifyQuantifyCode: ''
}
})
console.log(data.value.process)
editableTabsValue.value = newTabName
dialogVisibleName.value = false
} else {
console.log('error submit!')
return false
} }
}) })
console.log( data.value.process)
editableTabsValue.value = newTabName
dialogVisibleName.value = false
} }
// //
else if (val == 'close') { else if (val == 'close') {
@ -419,14 +678,44 @@ const buttonBaseClick = (val) => {
dialogVisible.value = false dialogVisible.value = false
} }
} }
//
const emit = defineEmits(['submitForm', 'searchTableSuccess'])
const validateForm = (formRef) => {
// console.log(TableBaseForm_Ref.value)
let _lists = formRef?.map((v) => v.validate())
return Promise.all(_lists)
.then(() => {
return true
})
.catch(() => {
return false
})
}
const submitForm = async () => { const submitForm = async () => {
// const data1= unref(formRefMain)?.formModel try {
// const data2= unref(formRefProcess)?.formModel const validateForm1 = await validateForm(formProcessRef.value)
// const data3= unref(formRefFeatures)?.formModel console.log(validateForm1)
// console.log(data1) await formMainRef.value.validate()
// console.log(data2) if (!data.value.process || data.value.process.length == 0) {
console.log(data.list) message.error(`请添加工序`)
emit('submitForm', formType.value, data) return;
}
const bol1 = await validateForm(formProcessRef.value)
const bol2 = await validateForm(formFeaturesRef.value)
if (!bol1 || !bol2) {
message.error(`模板中有检验工序和检验特性未填写完全`)
return;
}
if (formType.value == 'create') {
//
emit('submitForm', formType.value, data)
} else {
//
emit('submitForm', formType.value, data)
}
} catch {
console.log(111)
}
} }
/** 弹窗按钮 */ /** 弹窗按钮 */
let Butttondata: any = [] let Butttondata: any = []
@ -438,6 +727,123 @@ if (props.footButttondata) {
defaultButtons.formCloseBtn(null) // defaultButtons.formCloseBtn(null) //
] ]
} }
//
const changeFeatureType = (e) => {
console.log(e)
}
const searchTableRef = ref()
const opensearchTable = (
formField,
searchField,
searchTitle,
searchAllSchemas,
searchPage,
searchCondition,
multiple,
type,
row
) => {
console.log(988, row)
const _searchCondition = {}
//
if (searchCondition && searchCondition.length > 0) {
//
let filters: any[] = []
for (var i = 0; i < searchCondition.length; i++) {
// searchCondition.forEach((item) => {
// row
if (searchCondition[i].isMainValue) {
_searchCondition[searchCondition[i].key] = formRef.value.formModel[searchCondition[i].value]
? formRef.value.formModel[searchCondition[i].value]
: props.detailData
? props.detailData[searchCondition[i].value]
: row
? row[searchCondition[i].value]
: ''
//
let isNull = false
if (
_searchCondition[searchCondition[i].key] == '' ||
_searchCondition[searchCondition[i].key] == undefined
) {
isNull = true
}
if (isNull) {
message.warning(
searchCondition[i].message ? searchCondition[i].message : '前置条件未选择!'
)
return
}
} else {
//
if (searchCondition[i].isSearch) {
filters.push({
action: searchCondition[i].action,
column: searchCondition[i].key,
value: searchCondition[i].value
})
} else {
_searchCondition[searchCondition[i].key] = searchCondition[i].value
}
}
}
if (filters.length > 0) {
_searchCondition.isSearch = true
_searchCondition.filters = filters
}
}
const _searchTableTitle = searchTitle
const _searchTableAllSchemas = searchAllSchemas
const _searchTablePage = searchPage
searchTableRef.value.open(
_searchTableTitle,
_searchTableAllSchemas,
_searchTablePage,
formField,
searchField,
multiple,
type,
row,
_searchCondition
)
}
//
// val row
const searchTableSuccess = (formField, searchField, val, type, row) => {
console.log(row)
data.value.process.forEach((item) => {
if (item.description == row.description) {
item.inspectionCharacteristicsBaseVO[formField] = val[0].code
}
})
// row.inspectionCharacteristicsBaseVO.inspectionMethodCode = val[0].code
// emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
}
//
const changeIsCapping = (e) => {
if (e) {
rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
} else {
rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
}
}
//
const changeLowlimit = (e) => {
if (e) {
rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
} else {
rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
}
}
//
const changeIsTarget = (e) => {
if (e) {
rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
} else {
rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
}
}
</script> </script>
<style scoped> <style scoped>
.small-title { .small-title {

95
src/views/qms/basicDataManage/inspectionTemplate/index.vue

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="AgvLocationrelation.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="InspectionTemplateMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -11,7 +11,7 @@
:routeName="routeName" :routeName="routeName"
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="AgvLocationrelation.allSchemas" :allSchemas="InspectionTemplateMain.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -39,16 +39,6 @@
</ContentWrap> </ContentWrap>
<!-- 表单弹窗添加/修改 --> <!-- 表单弹窗添加/修改 -->
<!-- <BasicForm
ref="basicFormRef"
@success="formsSuccess"
:rules="AgvLocationrelationRules"
:formAllSchemas="AgvLocationrelation.allSchemas"
:apiUpdate="AgvLocationrelationApi.updateAgvLocationrelation"
:apiCreate="AgvLocationrelationApi.createAgvLocationrelation"
@searchTableSuccess="searchTableSuccess"
:isBusiness="false"
/> -->
<AddForm <AddForm
ref="basicFormRef" ref="basicFormRef"
basicFormWidth="80" basicFormWidth="80"
@ -56,12 +46,13 @@
:formAllSchemasProcess="InspectionTemplateProcess.allSchemas" :formAllSchemasProcess="InspectionTemplateProcess.allSchemas"
:formAllSchemasMain="InspectionTemplateMain.allSchemas" :formAllSchemasMain="InspectionTemplateMain.allSchemas"
:rules="InspectionTemplateRules" :rules="InspectionTemplateRules"
@submitForm="submitForm"
/> />
<!-- 详情 --> <!-- 详情 -->
<Detail <Detail
ref="detailRef" ref="detailRef"
:isBasic="true" :isBasic="true"
:allSchemas="AgvLocationrelation.allSchemas" :allSchemas="InspectionTemplateMain.allSchemas"
/> />
<!-- 导入 --> <!-- 导入 -->
@ -70,13 +61,13 @@
<script setup lang="ts"> <script setup lang="ts">
import download from '@/utils/download' import download from '@/utils/download'
import { AgvLocationrelation,AgvLocationrelationRules,InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeatures,InspectionTemplateRules } from './agvLocationrelation.data' import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeatures,InspectionTemplateRules } from './inspectionTemplate.data'
import * as AgvLocationrelationApi from '@/api/wms/agvLocationrelation'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue' 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 Detail from '@/components/Detail/src/Detail.vue'
import AddForm from './addForm.vue' import AddForm from './addForm.vue'
import * as InspectionProcessPageApi from '@/api/qms/inspectionTemplate'
defineOptions({ name: 'AgvLocationrelation' }) defineOptions({ name: 'AgvLocationrelation' })
@ -86,16 +77,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() // const route = useRoute() //
const routeName = ref() const routeName = ref()
routeName.value = route.name routeName.value = route.name
const tableColumns = ref(AgvLocationrelation.allSchemas.tableColumns) const tableColumns = ref(InspectionTemplateMain.allSchemas.tableColumns)
//
const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => {
const setV = {}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
})
}
// //
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -103,7 +85,7 @@ const updataTableColumns = (val) => {
} }
const { tableObject, tableMethods } = useTable({ const { tableObject, tableMethods } = useTable({
getListApi: AgvLocationrelationApi.getAgvLocationrelationPage // getListApi: InspectionProcessPageApi.inspectionTemplatePage //
}) })
// //
@ -112,8 +94,8 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:agv-locationrelation:create'}), // defaultButtons.defaultAddBtn({hasPermi:'wms:agv-locationrelation:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:agv-locationrelation:import'}), // // defaultButtons.defaultImportBtn({hasPermi:'wms:agv-locationrelation:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:agv-locationrelation:export'}), // // defaultButtons.defaultExportBtn({hasPermi:'wms:agv-locationrelation:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), // defaultButtons.defaultSetBtn(null), //
@ -145,8 +127,8 @@ const buttonBaseClick = (val, item) => {
// - // -
const butttondata = [ const butttondata = [
defaultButtons.mainListEditBtn({hasPermi:'wms:agv-locationrelation:update'}), // defaultButtons.mainListEditBtn({hasPermi:'qms:inspectionTemplate:update'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'wms:agv-locationrelation:delete'}), // defaultButtons.mainListDeleteBtn({hasPermi:'qms:inspectionTemplate:delete'}), //
] ]
// - // -
@ -165,23 +147,13 @@ const openForm = (type: string, row?: any) => {
} }
// form // form
const formsSuccess = async (formType,data) => { const submitForm = async (formType,data) => {
var isHave =AgvLocationrelation.allSchemas.formSchema.some(function (item) { console.log(data.value)
return item.field === 'activeTime' || item.field === 'expireTime';
});
if(isHave){
if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
message.error('失效时间要大于生效时间')
return;
}
}
if(data.activeTime==0)data.activeTime = null;
if(data.expireTime==0)data.expireTime = null;
if (formType === 'create') { if (formType === 'create') {
await AgvLocationrelationApi.createAgvLocationrelation(data) await InspectionProcessPageApi.inspectionTemplateCreat(data.value)
message.success(t('common.createSuccess')) message.success(t('common.createSuccess'))
} else { } else {
await AgvLocationrelationApi.updateAgvLocationrelation(data) await InspectionProcessPageApi.inspectionTemplateUpdate(data.value)
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
} }
basicFormRef.value.dialogVisible = false basicFormRef.value.dialogVisible = false
@ -200,43 +172,13 @@ const handleDelete = async (id: number) => {
// //
await message.delConfirm() await message.delConfirm()
// //
await AgvLocationrelationApi.deleteAgvLocationrelation(id) await InspectionProcessPageApi.inspectionTemplateDelete(id)
message.success(t('common.delSuccess')) message.success(t('common.delSuccess'))
// //
await getList() await getList()
} catch {} } catch {}
} }
/** 导出按钮操作 */
const exportLoading = ref(false) //
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await AgvLocationrelationApi.exportAgvLocationrelation(tableObject.params)
download.excel(data, 'AGV库位转换.xlsx')
} catch {
} finally {
exportLoading.value = false
}
}
/** 导入 */
const importFormRef = ref()
const handleImport = () => {
importFormRef.value.open()
}
//
const importTemplateData = reactive({
templateUrl: '',
templateTitle: 'AGV库位转换导入模版.xlsx'
})
//
const importSuccess = () => {
getList()
}
// //
const searchFormClick = (searchData) => { const searchFormClick = (searchData) => {
@ -250,7 +192,6 @@ const searchFormClick = (searchData) => {
/** 初始化 **/ /** 初始化 **/
onMounted(async () => { onMounted(async () => {
getList() getList()
importTemplateData.templateUrl = await AgvLocationrelationApi.importTemplate()
}) })
</script> </script>

207
src/views/qms/basicDataManage/inspectionTemplate/agvLocationrelation.data.ts → src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts

@ -1,157 +1,9 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime' import { dateFormatter } from '@/utils/formatTime'
import * as AreaApi from '@/api/wms/areabasic'
import { Area } from '@/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data'
import * as LocationApi from '@/api/wms/location'
import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
import * as InspectionProcessPageApi from '@/api/qms/inspectionTemplate' import * as InspectionProcessPageApi from '@/api/qms/inspectionTemplate'
let inspectionProcessPage = await InspectionProcessPageApi.getInspectionProcessPage()
inspectionProcessPage = inspectionProcessPage.list
// 表单校验 // 表单校验
export const AgvLocationrelationRules = reactive({
positionCode: [
{ required: true, message: '请填写AGV点位', trigger: 'change' }
],
positionArea: [
{ required: true, message: '请填写AGV库区', trigger: 'change' }
],
wmsArea: [
{ required: true, message: '请填写WMS库区', trigger: 'change' }
],
wmsPosition: [
{ required: true, message: '请填写WMS库位', trigger: 'change' }
]
})
export const AgvLocationrelation = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '单据号',
field: 'reqCode',
sort: 'custom',
isSearch: true,
isForm: false,
},
{
label: 'AGV点位',
field: 'positionCode',
sort: 'custom',
isSearch: false,
},
{
label: 'AGV库区',
field: 'positionArea',
sort: 'custom',
isSearch: false,
},
{
label: 'WMS库区',
field: 'wmsArea',
sort: 'custom',
isSearch: false,
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择库区代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '库区信息', // 查询弹窗标题
searchAllSchemas: Area.allSchemas, // 查询弹窗所需类
searchPage: AreaApi.getAreaPage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}
}
},
{
label: 'WMS库位',
field: 'wmsPosition',
sort: 'custom',
table: {
width: 150
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择库位代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '库位信息', // 查询弹窗标题
searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},
{
key: 'areaCode',
value: "wmsArea",
message: '请选择库区代码!',
isMainValue: true
}]
}
}
},
{
label: '是否可用',
field: 'available',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isSearch: false,
sort: 'custom',
table: {
width: 150
},
form: {
component: 'Switch',
value: 'TRUE',
componentProps: {
inactiveValue: 'FALSE',
activeValue: 'TRUE'
}
}
},
{
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')]
}
},
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
isForm: false,
},
{
label: '备注',
field: 'remark',
sort: 'custom',
isSearch: false,
},
{
label: '操作',
field: 'action',
isForm: false,
isDetail: false,
table: {
width: 150,
fixed: 'right'
}
}
]))
export const InspectionTemplateRules = reactive({ export const InspectionTemplateRules = reactive({
description: [ description: [
{ required: true , message: '请填写描述', trigger: 'blur' } { required: true , message: '请填写描述', trigger: 'blur' }
@ -237,6 +89,15 @@ export const InspectionTemplateMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '版本', label: '版本',
field: 'version', field: 'version',
sort: 'custom', sort: 'custom',
},
{
label: '操作',
field: 'action',
isForm: false,
table: {
width: 150,
fixed: 'right'
}
} }
])) ]))
export const InspectionTemplateProcess = useCrudSchemas(reactive<CrudSchema[]>([ export const InspectionTemplateProcess = useCrudSchemas(reactive<CrudSchema[]>([
@ -260,16 +121,6 @@ export const InspectionTemplateProcess = useCrudSchemas(reactive<CrudSchema[]>([
label: '检验方案模板编码', label: '检验方案模板编码',
field: 'inspectionCode', field: 'inspectionCode',
sort: 'custom', sort: 'custom',
form:{
component:'Select',
api: () => inspectionProcessPage,
componentProps:{
optionsAlias: {
labelField: 'description',
valueField: 'id'
}
}
}
},{ },{
label: '顺序号', label: '顺序号',
field: 'sequenceCode', field: 'sequenceCode',
@ -277,16 +128,6 @@ export const InspectionTemplateProcess = useCrudSchemas(reactive<CrudSchema[]>([
label: '检验特性编码', label: '检验特性编码',
field: 'inspectionCharCode', field: 'inspectionCharCode',
sort: 'custom', sort: 'custom',
form:{
component:'Select',
api: () => inspectionProcessPage,
componentProps:{
optionsAlias: {
labelField: 'description',
valueField: 'id'
}
}
}
} }
])) ]))
export const InspectionTemplateFeatures= useCrudSchemas(reactive<CrudSchema[]>([ export const InspectionTemplateFeatures= useCrudSchemas(reactive<CrudSchema[]>([
@ -309,44 +150,14 @@ export const InspectionTemplateFeatures= useCrudSchemas(reactive<CrudSchema[]>([
label: '检验方法编码', label: '检验方法编码',
field: 'inspectionMethodCode', field: 'inspectionMethodCode',
sort: 'custom', sort: 'custom',
form:{
component:'Select',
api: () => inspectionProcessPage,
componentProps:{
optionsAlias: {
labelField: 'description',
valueField: 'id'
}
}
}
},{ },{
label: '采样过程编码', label: '采样过程编码',
field: 'dynamicUpdateCode', field: 'dynamicUpdateCode',
sort: 'custom', sort: 'custom',
form:{
component:'Select',
api: () => inspectionProcessPage,
componentProps:{
optionsAlias: {
labelField: 'description',
valueField: 'id'
}
}
}
},{ },{
label: '动态修改规则编码', label: '动态修改规则编码',
field: 'inspectionMethod', field: 'inspectionMethod',
sort: 'custom', sort: 'custom',
form:{
component:'Select',
api: () => inspectionProcessPage,
componentProps:{
optionsAlias: {
labelField: 'description',
valueField: 'id'
}
}
}
},{ },{
label: '是否允许修改特征值', label: '是否允许修改特征值',
field: 'isCanUpdate', field: 'isCanUpdate',
Loading…
Cancel
Save