Merge remote-tracking branch 'origin/dev' into dev

dev
siontion 5 months ago
commit a4395e2796

@ -1,5 +1,5 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<Dialog :title="dialogTitle" v-model="dialogVisible" :width="1400">
<el-form
ref="formRef"
:model="formData"
@ -7,114 +7,246 @@
label-width="150px"
v-loading="formLoading"
>
<el-form-item label="物料图片" prop="logo">
<UploadImg v-model="formData.logo" disabled/>
</el-form-item>
<el-form-item label="物料编码" prop="code">
<el-input disabled v-model="formData.code" placeholder="系统自动生成" class="!w-250px" />
</el-form-item>
<el-form-item label="物料名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入物料名称" disabled class="!w-250px" />
</el-form-item>
<el-form-item label="物料类型" prop="materialType">
<el-select v-model="formData.materialType" disabled clearable placeholder="请选择物料类型" class="!w-250px">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.BIZ_MATERIAL_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="系统单位" prop="unit">
<el-select v-model="formData.unit" disabled clearable placeholder="请选择系统单位" class="!w-250px">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.BIZ_MATERIAL_UNIT)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="物料简称" prop="shortName">
<el-input v-model="formData.shortName" disabled placeholder="请输入物料简称" class="!w-250px" />
</el-form-item>
<el-form-item label="规格/型号" prop="spec">
<el-input v-model="formData.spec" disabled placeholder="请输入规格/型号" class="!w-250px" />
</el-form-item>
<el-form-item label="品牌" prop="brand">
<el-input v-model="formData.brand" disabled placeholder="请输入品牌" class="!w-250px" />
</el-form-item>
<el-form-item label="物料主要来源" prop="mainFrom">
<el-select v-model="formData.mainFrom" disabled clearable placeholder="请选择物料主要来源" class="!w-250px">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_MATERIAL_ORIGINAL)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="首选供应商" prop="mainSupplierId">
<!-- <el-select v-model="formData.mainSupplierId"
placeholder="请输入首选供应商"
:remote-method="remoteSupplierSearch"
remote-show-suffix
remote
clearable
reserve-keyword
filterable
:loading="supplierSelectLoading"
class="!w-250px"
>
<el-option
v-for="item in supplierSelectList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select> -->
<SupplierSelect v-model="formData.mainSupplierId" class="!w-250px" @update:newValue="handleSelectedSupplier" disabled />
</el-form-item>
<el-form-item label="销项/进项税率" prop="outputInputTaxRate">
<el-input v-model="formData.outputInputTaxRate" disabled placeholder="请输入销项税率/进项税率" class="!w-250px" >
<template #append>%</template>
</el-input>
</el-form-item>
<el-form-item label="备注" prop="description">
<el-input type="textarea" disabled v-model="formData.description" height="150px" class="!w-500px" show-word-limit maxlength="200"/>
</el-form-item>
<div
class="warncenter"
style="height: 600px; overflow: auto; border: none; padding: 0px 20px"
>
<el-card class="hl-card-info">
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">基础信息</span>
</template>
<template #default>
<el-row>
<el-col :span="8">
<el-form-item label="物料图片" prop="logo">
<UploadImg v-model="formData.logo" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料编码" prop="code">
<el-input
disabled
v-model="formData.code"
placeholder="系统自动生成"
class="!w-250px"
/>
</el-form-item>
<el-form-item label="物料类型" prop="materialType">
<el-select
v-model="formData.materialType"
disabled
clearable
placeholder="请选择物料类型"
class="!w-250px"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.BIZ_MATERIAL_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="规格/型号" prop="spec">
<el-input
v-model="formData.spec"
disabled
placeholder="请输入规格/型号"
class="!w-250px"
/>
</el-form-item>
<el-form-item label="首选供应商" prop="mainSupplierId">
<SupplierSelect
v-model="formData.mainSupplierId"
class="!w-250px"
@update:newValue="handleSelectedSupplier"
disabled
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料名称" prop="name">
<el-input
v-model="formData.name"
placeholder="请输入物料名称"
disabled
class="!w-250px"
/>
</el-form-item>
<el-form-item label="安全库存" prop="invSafe">
<el-input v-model="formData.invSafe" disabled placeholder="请输入安全库存" class="!w-250px" />
</el-form-item>
<el-form-item label="物料条码" prop="barcode">
<el-input v-model="formData.barcode" disabled placeholder="请输入物料条码" class="!w-250px" />
</el-form-item>
<el-form-item label="启用状态" prop="status">
<el-radio-group v-model="formData.status" disabled>
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_COMMON_STATUS)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="系统单位" prop="unit">
<el-select
v-model="formData.unit"
disabled
clearable
placeholder="请选择系统单位"
class="!w-250px"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.BIZ_MATERIAL_UNIT)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="品牌" prop="brand">
<el-input
v-model="formData.brand"
disabled
placeholder="请输入品牌"
class="!w-250px"
/>
</el-form-item>
<el-form-item label="销项/进项税率" prop="outputInputTaxRate">
<el-input
v-model="formData.outputInputTaxRate"
disabled
placeholder="请输入销项税率/进项税率"
class="!w-250px"
>
<template #append>%</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料简称" prop="shortName">
<el-input
v-model="formData.shortName"
disabled
placeholder="请输入物料简称"
class="!w-250px"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料主要来源" prop="mainFrom">
<el-select
v-model="formData.mainFrom"
disabled
clearable
placeholder="请选择物料主要来源"
class="!w-250px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_MATERIAL_ORIGINAL)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="启用状态" prop="status">
<el-radio-group v-model="formData.status" disabled>
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_COMMON_STATUS)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="" label="工艺路线编码">
<el-input
class="!w-250px"
v-model="formData.productPathCode"
@click.prevent="handlecode"
:readonly="!isEditing"
placeholder="工艺路线编码"
>
<template #append
><el-button
:icon="Search"
@click="handlecode"
/></template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="工艺路线名称" >
<el-input
v-model="formData.productPathName"
disabled
placeholder="工艺路线名称"
class="!w-250px"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="description">
<el-input
type="textarea"
disabled
v-model="formData.description"
height="150px"
class="!w-500px"
show-word-limit
maxlength="200"
/>
</el-form-item>
</el-col>
</el-row>
</template>
</el-card>
<el-card class="hl-card-info">
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">库存信息</span>
</template>
<template #default>
<el-row>
<el-col :span="8">
<el-form-item label="安全库存" prop="invSafe">
<el-input
v-model="formData.invSafe"
:disabled="!openupdata"
placeholder="请输入安全库存"
class="!w-250px"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料条码" prop="barcode">
<el-input
v-model="formData.barcode"
disabled
placeholder="请输入物料条码"
class="!w-250px"
/>
</el-form-item>
</el-col>
</el-row>
</template>
</el-card>
</div>
</el-form>
<template #footer>
<!-- <el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button> -->
<el-button
@click="submitForm"
type="primary"
:disabled="formLoading"
:style="{ display: openupdata ? '' : 'none' }"
> </el-button
>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
<!-- 表单弹窗添加/修改 -->
<Productpath ref="dialogSelectOnlyref" @success="handleSelectedProductpath" />
</template>
<script setup lang="ts">
import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
import * as MaterialApi from '@/api/biz/material'
import {getSupplierPage} from "@/api/biz/supplier";
import { getSupplierPage } from '@/api/biz/supplier'
import SupplierSelect from '@/views/biz/hlvuestyle/supplierSelect.vue'
import { Search, Plus } from '@element-plus/icons-vue'
import Productpath from './productpath.vue'
const { t } = useI18n() //
const message = useMessage() //
@ -148,19 +280,19 @@ const formData = ref({
invLowerLimit: undefined,
barcode: undefined,
virtualPart: undefined,
logo: undefined,
logo: undefined
})
const formRules = reactive({
name: [{ required: true, message: '物料名称不能为空', trigger: 'blur' }],
status: [{ required: true, message: '启用状态不能为空', trigger: 'blur' }],
materialType: [{ required: true, message: '物料类型不能为空', trigger: 'change' }],
unit: [{ required: true, message: '系统单位不能为空', trigger: 'change' }],
unit: [{ required: true, message: '系统单位不能为空', trigger: 'change' }]
})
const formRef = ref() // Ref
const supplierList = ref<any[]>([]) //
const supplierSelectList = ref<any[]>([])
const supplierSelectLoading = ref(false);
const supplierSelectLoading = ref(false)
const remoteSupplierSearch = (query: string) => {
if (query) {
@ -172,11 +304,18 @@ const remoteSupplierSearch = (query: string) => {
})
}, 200)
} else {
supplierSelectList.value = supplierList.value;
supplierSelectList.value = supplierList.value
}
}
/** 打开弹窗 */
const openupdata = ref(false)
const open = async (type: string, id?: number) => {
if (type == 'update') {
openupdata.value = true
} else {
openupdata.value = false
}
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
@ -190,15 +329,14 @@ const open = async (type: string, id?: number) => {
let params = {
pageNo: 1,
pageSize: 10,
status: "1"
};
const supplierData = await getSupplierPage(params);
supplierList.value = supplierData.list;
supplierSelectList.value = supplierData.list;
status: '1'
}
const supplierData = await getSupplierPage(params)
supplierList.value = supplierData.list
supplierSelectList.value = supplierData.list
} finally {
formLoading.value = false
}
}
defineExpose({ open }) // open
@ -254,14 +392,25 @@ const resetForm = () => {
invLowerLimit: undefined,
barcode: undefined,
virtualPart: undefined,
logo: undefined,
logo: undefined
}
formRef.value?.resetFields()
}
//
//
const dialogSelectOnlyref = ref()
const handlecode = (type: string) => {
dialogSelectOnlyref.value?.open(type)
}
//
const handleSelectedProductpath=(val)=>{
console.log(val);
}
//
const handleSelectedSupplier = (newValue: any) => {
formData.value.mainSupplierId = newValue?.id
}
</script>

@ -120,8 +120,16 @@
<dict-tag :type="DICT_TYPE.BIZ_COMMON_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" align="center" min-width="120">
<el-table-column fixed="right" label="操作" align="center" min-width="160">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['biz:material:update']"
>
编辑
</el-button>
<el-button
link
type="primary"

@ -0,0 +1,141 @@
<template>
<Dialog :title="dialogTitle" width="80%" v-model="dialogVisible" center>
<ContentWrap class="borderxx">
<!-- 搜索工作栏 -->
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="108px">
<el-form-item label="工艺路线编码" prop="code">
<el-input v-model="queryParams.code" placeholder="工艺路线编码" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item label="工艺路线名称" prop="name">
<el-input v-model="queryParams.name" placeholder="工艺路线名称" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item>
<el-button @click="handleQuery" type="primary">
<Icon icon="ep:search" class="mr-5px" /> 查询
</el-button>
<el-button @click="resetQuery">
<Icon icon="ep:refresh" class="mr-5px" /> 重置
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<el-card class="hl-card">
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="tablelist" :stripe="true" class="hl-table" @selection-change="handleSelectionChange"
@row-click="clickRow" ref="multipleTable" selection
>
<el-table-column fixed type="selection" width="40" />
<el-table-column fixed label="序号" type="index" width="60" />
<el-table-column label="工艺路线编码" align="center" prop="code" min-width="220" />
<el-table-column fixed label="工艺路线名称" align="center" prop="name" min-width="220" />
</el-table>
<!-- 分页 -->
<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize" @pagination="getList" />
</ContentWrap>
</el-card>
<template #footer>
<el-button @click="dialogVisible=false" size="large"> </el-button>
<el-button @click="submitForm" type="primary" size="large"> </el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { getIntDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
import { dateFormatter, dateFormatter2, formatDate } from '@/utils/formatTime'
import { ref } from 'vue'
const message = useMessage() //
const { t } = useI18n() //
const router = useRouter()
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const loading = ref(true) //
const list = ref([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
name: undefined,
code: undefined,
orderStatus: 32
})
const queryFormRef = ref() //
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
// const data = await ProjectOrderApi.getProjectOrderPage(queryParams)
// list.value = data.list
// total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
const tablelist = ref([
{
name: '合立000',
code: 'biz000'
},
{
name: '合立111',
code: 'biz000'
}
])
const multipleTable = ref<InstanceType<typeof ElTable>>()
const multipleSelection:any = ref([])
const handleSelectionChange = (val: []) => {
if (val.length > 1) {
multipleTable.value.clearSelection()
multipleTable.value.toggleRowSelection(val.pop())
} else {
multipleSelection.value = val.pop()
}
}
const clickRow = (row: any) => {
if(row){
multipleTable.value!.toggleRowSelection(row, undefined)
}else{
multipleTable.value!.clearSelection()
}
}
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = () => {
if (multipleSelection.value.length === 0) {
message.warning('请选择一条数据')
return
}
dialogVisible.value = false
//
emit('success', multipleSelection.value)
}
/** 打开弹窗 */
const open = async () => {
dialogTitle.value = t('common.selectText')
dialogVisible.value = true
handleQuery()
}
defineExpose({ open }) // open
</script>

@ -0,0 +1,127 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="108px"
v-loading="formLoading"
>
<el-form-item label="参数编码" prop="code">
<el-input v-model="formData.code" disabled placeholder="参数编码" class="!w-250px" />
</el-form-item>
<el-form-item label="参数名称" prop="name">
<el-input v-model="formData.name" placeholder="参数名称" class="!w-250px" />
</el-form-item>
<el-form-item label="值范围" prop="name">
<el-input v-model="formData.name" placeholder="值范围" class="!w-250px" />
</el-form-item>
<el-form-item label="当前值" prop="val">
<el-input v-model="formData.name" placeholder="值范围" class="!w-250px" />
</el-form-item>
<el-form-item label="备注" prop="description">
<el-input type="textarea" v-model="formData.description" height="150px" show-word-limit maxlength="200"/>
</el-form-item>
<!-- <el-form-item label="启用状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_STATUS)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item> -->
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import * as WorkshopApi from '@/api/heli/workshop'
const { t } = useI18n() //
const message = useMessage() //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formData = ref({
id: undefined,
code: undefined,
name: undefined,
deptId: undefined,
leaderUserId: undefined,
description: undefined,
status: 1,
})
const formRules = reactive({
code: [{ required: true, message: '参数编码不能为空', trigger: 'blur' }],
name: [{ required: true, message: '参数名称不能为空', trigger: 'blur' }],
val: [{ required: true, message: '当前值不能为空', trigger: 'blur' }],
})
const formRef = ref() // Ref
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
//
formLoading.value = true
try {
if (id) {
}
} finally {
formLoading.value = false
}
}
defineExpose({ open }) // open
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
// const data = formData.value as unknown as WorkshopApi.WorkshopVO
// if (formType.value === 'create') {
// await WorkshopApi.createWorkshop(data)
// message.success(t('common.createSuccess'))
// } else {
// await WorkshopApi.updateWorkshop(data)
// message.success(t('common.updateSuccess'))
// }
// dialogVisible.value = false
// //
// emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
code: undefined,
name: undefined,
deptId: undefined,
leaderUserId: undefined,
description: undefined,
status: 1,
}
formRef.value?.resetFields()
}
</script>

@ -0,0 +1,117 @@
<template>
<el-card class="hl-card" v-loading="fullscreenLoading">
<template #header>
<span>系统参数</span>
</template>
<ContentWrap class="borderxx">
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="108px"
>
<el-form-item label="参数编码" prop="code">
<el-input
v-model="queryParams.code"
placeholder="请输入参数编码"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="参数名称" prop="brief">
<el-input
v-model="queryParams.name"
placeholder="请输入参数名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery" type="primary"
><Icon icon="ep:search" class="mr-5px" /> 查询</el-button
>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button @click="openForm('create')" plain type="primary">
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table
v-loading="loading"
:data="list"
:stripe="true"
:show-overflow-tooltip="true"
class="hl-table"
>
<el-table-column type="index" min-width="60" fixed label="序号" align="center" />
<el-table-column label="参数编码" min-width="120" fixed align="center" prop="code" />
<el-table-column label="参数名称" align="center" min-width="200" prop="brief" />
<el-table-column label="值范围" align="center" min-width="120" prop="name" />
<el-table-column label="当前值" align="center" min-width="140" prop="industry" />
<el-table-column label="备注" align="center" min-width="180" prop="brief" />
<el-table-column label="操作" min-width="140" fixed="right" align="center">
<template #default="scope">
<el-button link type="primary" @click="openForm('update', scope.row.id)">
编辑
</el-button>
<el-button link type="primary" @click="openForm('detail', scope.row.id)">
查看详情
</el-button>
</template>
</el-table-column>
</el-table>
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
</el-card>
<!-- 表单弹窗添加/修改 -->
<ParamenterForm ref="ParamenterformRef" @success="getList" />
</template>
<script setup lang="ts">
import {ref,reactive} from 'vue';
import ParamenterForm from './ParamenterForm.vue'
const message = useMessage() //
const { t } = useI18n() //
const list = ref([]) //
const total = ref(0) //
const queryParams =reactive({
pageNo: 1,
pageSize: 10,
code: undefined,
name:undefined
})
const handleQuery =()=>{
}
const ParamenterformRef=ref()
const openForm =(type:string,id?:number)=>{
ParamenterformRef.value.open(type, id)
}
const getList =()=>{
}
onMounted(() => {
getList()
})
</script>
<style scoped lang="scss">
</style>
Loading…
Cancel
Save