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

pull/3/head
zengchenxi 9 months ago
commit 3332692fca

@ -1,38 +1,41 @@
import request from '@/config/axios'
export interface EquipVO {
id: number
name: string
mouldTypeId: number
status: number
}
// 查询设备信息分页
export const getEquipPage = async (params) => {
return await request.get({ url: `/heli/equip/page`, params })
}
// 查询设备信息详情
export const getEquip = async (id: number) => {
return await request.get({ url: `/heli/equip/get?id=` + id })
}
// 新增设备信息
export const createEquip = async (data: EquipVO) => {
return await request.post({ url: `/heli/equip/create`, data })
}
// 修改设备信息
export const updateEquip = async (data: EquipVO) => {
return await request.put({ url: `/heli/equip/update`, data })
}
// 删除设备信息
export const deleteEquip = async (id: number) => {
return await request.delete({ url: `/heli/equip/delete?id=` + id })
}
// 导出设备信息 Excel
export const exportEquip = async (params) => {
return await request.download({ url: `/heli/equip/export-excel`, params })
}
import request from '@/config/axios'
export interface EquipVO {
id: number
name: string
mouldTypeId: number
status: number
}
// 查询设备信息全页数据
export const getSimpList = async () => {
return await request.get({ url: `/heli/equip/all-simples` })
}
// 查询设备信息分页
export const getEquipPage = async (params) => {
return await request.get({ url: `/heli/equip/page`, params })
}
// 查询设备信息详情
export const getEquip = async (id: number) => {
return await request.get({ url: `/heli/equip/get?id=` + id })
}
// 新增设备信息
export const createEquip = async (data: EquipVO) => {
return await request.post({ url: `/heli/equip/create`, data })
}
// 修改设备信息
export const updateEquip = async (data: EquipVO) => {
return await request.put({ url: `/heli/equip/update`, data })
}
// 删除设备信息
export const deleteEquip = async (id: number) => {
return await request.delete({ url: `/heli/equip/delete?id=` + id })
}
// 导出设备信息 Excel
export const exportEquip = async (params) => {
return await request.download({ url: `/heli/equip/export-excel`, params })
}

@ -1,37 +1,42 @@
import request from '@/config/axios'
export interface MouldTypeVO {
id: number
name: string
status: number
}
// 查询模具类型分页
export const getMouldTypePage = async (params) => {
return await request.get({ url: `/heli/mould-type/page`, params })
}
// 查询模具类型详情
export const getMouldType = async (id: number) => {
return await request.get({ url: `/heli/mould-type/get?id=` + id })
}
// 新增模具类型
export const createMouldType = async (data: MouldTypeVO) => {
return await request.post({ url: `/heli/mould-type/create`, data })
}
// 修改模具类型
export const updateMouldType = async (data: MouldTypeVO) => {
return await request.put({ url: `/heli/mould-type/update`, data })
}
// 删除模具类型
export const deleteMouldType = async (id: number) => {
return await request.delete({ url: `/heli/mould-type/delete?id=` + id })
}
// 导出模具类型 Excel
export const exportMouldType = async (params) => {
return await request.download({ url: `/heli/mould-type/export-excel`, params })
}
import request from '@/config/axios'
export interface MouldTypeVO {
id: number
name: string
status: number
}
// 查询模具类型全页数据
export const getSimpList = async () => {
return await request.get({ url: `/heli/mould-type/all-simples` })
}
// 查询模具类型分页
export const getMouldTypePage = async (params) => {
return await request.get({ url: `/heli/mould-type/page`, params })
}
// 查询模具类型详情
export const getMouldType = async (id: number) => {
return await request.get({ url: `/heli/mould-type/get?id=` + id })
}
// 新增模具类型
export const createMouldType = async (data: MouldTypeVO) => {
return await request.post({ url: `/heli/mould-type/create`, data })
}
// 修改模具类型
export const updateMouldType = async (data: MouldTypeVO) => {
return await request.put({ url: `/heli/mould-type/update`, data })
}
// 删除模具类型
export const deleteMouldType = async (id: number) => {
return await request.delete({ url: `/heli/mould-type/delete?id=` + id })
}
// 导出模具类型 Excel
export const exportMouldType = async (params) => {
return await request.download({ url: `/heli/mould-type/export-excel`, params })
}

@ -19,41 +19,41 @@
<el-row>
<el-col :span="6">
<el-form-item label="发货单号" prop="code">
<el-input disabled v-model="formData.code" placeholder="系统自动生成" />
<el-input disabled v-model="formData.code" placeholder="系统自动生成" class="!w-250px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="项目编号" prop="saleOrderIds">
<el-input disabled v-model="formData.saleOrderCode" placeholder="请输入项目编号">
<el-input disabled v-model="formData.saleOrderCode" placeholder="请输入项目编号" class="!w-250px">
<template #append><el-button :disabled="active != 'create'" @click="openProjectOrderDialog" :icon="Search" /></template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="contractNo" label="合同号">
<el-input v-model="formData.contractNo" disabled />
<el-input v-model="formData.contractNo" disabled class="!w-250px"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="property" label="性质">
<el-input v-model="formData.property" disabled />
<el-input v-model="formData.property" disabled class="!w-250px" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="发货日期" prop="deliverDate">
<el-date-picker :disabled="detailDisabled" v-model="formData.deliverDate" type="date" value-format="x" placeholder="选择发货日期" />
<el-date-picker :disabled="detailDisabled" v-model="formData.deliverDate" type="date" value-format="x" placeholder="选择发货日期" class="!w-250px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="customerId" label="客户名称">
<el-input v-model="formData.customerName" disabled />
<el-input v-model="formData.customerName" disabled class="!w-250px"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="projectName" label="项目名称">
<el-input disabled v-model="formData.projectName" />
<el-input disabled v-model="formData.projectName" class="!w-250px"/>
</el-form-item>
</el-col>
<el-col :span="6">
@ -77,24 +77,24 @@
<el-row>
<el-col :span="6">
<el-form-item label="发货人姓名" prop="deliverPerson">
<UserSelect :disabled="detailDisabled" v-model="formData.deliverPerson" @update:newValue="handleSelectedUser" />
<UserSelect :disabled="detailDisabled" v-model="formData.deliverPerson" @update:newValue="handleSelectedUser" class="!w-250px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="发货人电话" prop="deliverPersonMobile">
<el-input :disabled="detailDisabled" v-model="formData.deliverPersonMobile" />
<el-input :disabled="detailDisabled" v-model="formData.deliverPersonMobile" class="!w-250px"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="发货方式" >
<el-select :disabled="detailDisabled" v-model="formData.deliverMode" placeholder="请选择发货方式">
<el-select :disabled="detailDisabled" v-model="formData.deliverMode" placeholder="请选择发货方式" class="!w-250px">
<el-option v-for="dict in getStrDictOptions(DICT_TYPE.HELI_DELIVER_MODE)" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="发货单位" prop="deliverCompany">
<el-input v-model="formData.deliverCompany" disabled />
<el-input v-model="formData.deliverCompany" disabled class="!w-250px" />
</el-form-item>
</el-col>
</el-row>
@ -114,12 +114,12 @@
</el-col>
<el-col :span="6">
<el-form-item label="收货人电话" prop="receivePersonMobile">
<el-input :disabled="detailDisabled" v-model="formData.receivePersonMobile" />
<el-input :disabled="detailDisabled" v-model="formData.receivePersonMobile" class="!w-250px" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="收货详细地址" prop="receiveAddress">
<el-select v-model="formData.receiveAddress" filterable allow-create :disabled="detailDisabled" @blur="e => { if(e.target.value) formData.receiveAddress = e.target.value;}" clearable style="width: 100%">
<el-select v-model="formData.receiveAddress" filterable allow-create :disabled="detailDisabled" @blur="e => { if(e.target.value) formData.receiveAddress = e.target.value;}" clearable class="!w-250px">
<el-option v-for="dict in receivePersonAddressOptions" :key="dict.address" :label="dict.address" :value="dict.address" />
</el-select>
</el-form-item>
@ -134,29 +134,29 @@
<el-row>
<el-col :span="6">
<el-form-item label="司机姓名" prop="transportDriverName">
<el-input :disabled="detailDisabled" v-model="formData.transportDriverName" />
<el-input :disabled="detailDisabled" v-model="formData.transportDriverName" class="!w-250px"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="司机电话" prop="transportDriverMobile">
<el-input :disabled="detailDisabled" v-model="formData.transportDriverMobile" />
<el-input :disabled="detailDisabled" v-model="formData.transportDriverMobile" class="!w-250px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="车牌号" prop="transportBusNumber">
<el-input :disabled="detailDisabled" v-model="formData.transportBusNumber" />
<el-input :disabled="detailDisabled" v-model="formData.transportBusNumber" class="!w-250px"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="重量(T)" prop="transportWeight">
<el-input :disabled="detailDisabled" v-model="formData.transportWeight" />
<el-input :disabled="detailDisabled" v-model="formData.transportWeight" class="!w-250px"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="位置(米)" prop="transportSize">
<el-input :disabled="detailDisabled" v-model="formData.transportSize" />
<el-input :disabled="detailDisabled" v-model="formData.transportSize" class="!w-250px"/>
</el-form-item>
</el-col>
</el-row>

@ -1,7 +1,7 @@
<template>
<el-card class="hl-card">
<template #header>
<span>摸具发货</span>
<span>订单信息</span>
</template>
<ContentWrap class="borderxx">
<!-- 搜索工作栏 -->

@ -294,9 +294,9 @@
<tr>
<td> 序号 </td>
<td colspan="3">
<span>具名称</span>
<span>具名称</span>
</td>
<td colspan="3">具图号</td>
<td colspan="3">具图号</td>
<td> 数量() </td>
<td colspan="2">备注 </td>
</tr>

@ -8,19 +8,10 @@
:inline="true"
label-width="68px"
>
<el-form-item label="自增字段,唯一" prop="id">
<el-input
v-model="queryParams.id"
placeholder="请输入自增字段,唯一"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="设备名称 唯一" prop="name">
<el-form-item label="设备名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入设备名称 唯一"
placeholder="设备名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
@ -35,14 +26,10 @@
class="!w-240px"
/>
</el-form-item>
<el-form-item label="状态,1表示正常2表示禁用默认是1" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择状态,1表示正常2表示禁用默认是1"
clearable
class="!w-240px"
>
<el-option label="请选择字典生成" value="" />
<el-form-item label="启用状态" prop="pnStatus">
<el-select v-model="queryParams.status" placeholder="启用状态" clearable class="!w-240px">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_STATUS)" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="创建者" prop="creator">
@ -173,6 +160,7 @@
import download from '@/utils/download'
import * as EquipApi from '@/api/heli/equip'
import EquipForm from './EquipForm.vue'
import * as MoudleTypeApi from '@api/heli/mouldtype'
defineOptions({ name: 'Equip' })
@ -258,7 +246,8 @@ const handleExport = async () => {
}
/** 初始化 **/
onMounted(() => {
getList()
onMounted( async() => {
await MoudleTypeApi.getSimpList()
await getList()
})
</script>

@ -37,7 +37,7 @@
<tr>
<td colspan="2"> 项目名称 </td>
<td colspan="6">
{{ `系列` }}
{{ `系列` }}
</td>
<td> 业务员 </td>
<td>{{ `xxx` }} </td>

@ -11,7 +11,7 @@
</div>
</td>
<td colspan="6">
<span style="font-size: 20px; font-weight: 700">具生产计划单</span>
<span style="font-size: 20px; font-weight: 700">具生产计划单</span>
</td>
<td colspan="2" style="padding: 5px 0">
<div style="border-bottom: 1px solid #666; padding-bottom: 5px">项目编号</div>
@ -33,7 +33,7 @@
<tr>
<td colspan="2"> 项目名称 </td>
<td colspan="6">
{{ `系列` }}
{{ `系列` }}
</td>
<td> 业务员 </td>
<td>{{ `xxx` }} </td>
@ -215,7 +215,7 @@
</div>
</td>
<td colspan="6">
<span style="font-size: 20px; font-weight: 700">具生产计划单-附页</span>
<span style="font-size: 20px; font-weight: 700">具生产计划单-附页</span>
</td>
<td colspan="2" style="padding: 5px 0">
<div style="border-bottom: 1px solid #666; padding-bottom: 5px">项目编号</div>
@ -237,7 +237,7 @@
<tr>
<td colspan="2"> 项目名称 </td>
<td colspan="6">
{{ `系列` }}
{{ `系列` }}
</td>
<td> 业务员 </td>
<td>{{ `xxx` }} </td>

@ -245,9 +245,9 @@
<tr>
<td> 序号 </td>
<td colspan="3">
<span>具名称</span>
<span>具名称</span>
</td>
<td colspan="3">具图号</td>
<td colspan="3">具图号</td>
<td> 数量() </td>
<td colspan="2">备注 </td>
</tr>
@ -259,9 +259,9 @@
<tr v-for="item in 7" :key="item">
<td> {{ item }} </td>
<td colspan="3">
<span>{{ '具名称' }}</span>
<span>{{ '具名称' }}</span>
</td>
<td colspan="3">{{ `具图号` }}</td>
<td colspan="3">{{ `具图号` }}</td>
<td> {{ item }} </td>
<td colspan="2">{{ `备注` }} </td>
</tr>
@ -274,9 +274,9 @@
<tr v-for="item in 5" :key="item">
<td> {{ item }} </td>
<td colspan="3">
<span>{{ '具名称' }}</span>
<span>{{ '具名称' }}</span>
</td>
<td colspan="3">{{ `具图号` }}</td>
<td colspan="3">{{ `具图号` }}</td>
<td> {{ item }} </td>
<td colspan="2">{{ `备注` }} </td>
</tr>
@ -289,9 +289,9 @@
<tr v-for="item in 5" :key="item">
<td> {{ item }} </td>
<td colspan="3">
<span>{{ '具名称' }}</span>
<span>{{ '具名称' }}</span>
</td>
<td colspan="3">{{ `具图号` }}</td>
<td colspan="3">{{ `具图号` }}</td>
<td> {{ item }} </td>
<td colspan="2">{{ `备注` }} </td>
</tr>

@ -280,7 +280,7 @@
</el-button>
<el-button @click="handleStatus(2)" type="primary" v-if="btnSave" size="large">
</el-button>
<el-button @click="handleStatus(3)" type="danger" v-if="btnCancel" size="large">
<el-button @click="handleStatus(3)" type="danger" v-if="btnCancel" size="large">
</el-button>
</div>
</el-card>
@ -368,7 +368,7 @@ const handleStatus = async (num) => {
return
}
//
await message.confirm('确认'+(num==2?'提交':'废')+'入库信息?')
await message.confirm('确认'+(num==2?'提交':'废')+'入库信息?')
formData.value.status = num
//

@ -283,7 +283,7 @@
</el-button>
<el-button @click="handleStatus(2)" type="primary" v-if="btnSave" size="large">
</el-button>
<el-button @click="handleStatus(3)" type="danger" v-if="btnCancel" size="large">
<el-button @click="handleStatus(3)" type="danger" v-if="btnCancel" size="large">
</el-button>
</div>
</el-card>
@ -402,7 +402,7 @@ const handleStatus = async (num) => {
}
//
await message.confirm('确认'+(num==2?'提交':'废')+'出库信息?')
await message.confirm('确认'+(num==2?'提交':'废')+'出库信息?')
//
await saveFormData()

@ -92,7 +92,7 @@
<el-col>
<el-card class="hl-incard">
<el-col>
<el-button class="hl-addbutton" type="primary" size="large" v-bind:disabled="ctrView || ctrSave" @click="openMatForm"></el-button>
<el-button class="hl-addbutton" type="primary" size="large" v-bind:disabled="ctrView || ctrSave" @click="openMatForm"></el-button>
</el-col>
<el-form ref="matSubFormRef" :model="formData.matItemDOList" :rules="subFormRules" v-loading="subFormLoading" label-width="0">
<el-table :data="formData.matItemDOList" class="hl-table">

@ -3,17 +3,17 @@
<ContentWrap class="borderxx">
<el-form class="-mb-15px" :model="queryReqVo" :inline="true" label-width="108px">
<el-form-item label="物料类型:">
<el-select v-model="queryReqVo.matType" placeholder="物料类型" clearable class="!w-240px">
<el-select v-model="queryReqVo.matType" placeholder="物料类型" clearable class="!w-240px" v-bind:disabled="!chkboxEnable">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_MATERIAL_TYPE)" :key="dict.label" :label="dict.label" :value="dict.label" />
</el-select>
</el-form-item>
<el-form-item label=" 物料名称/编码:" label-width="150px">
<el-input v-model="queryReqVo.matCode" placeholder="物料名称/编码" class="!w-240px" />
<el-input v-model="queryReqVo.matCode" placeholder="物料名称/编码" class="!w-240px" v-bind:disabled="!chkboxEnable" />
</el-form-item>
<el-form-item>
<el-button @click="handleQuery" type="primary">
<el-button @click="handleQuery" type="primary" v-bind:disabled="!chkboxEnable">
<Icon icon="ep:search" class="mr-5px" /> 搜索
</el-button><el-button @click="resetQuery">
</el-button><el-button @click="resetQuery" v-bind:disabled="!chkboxEnable">
<Icon icon="ep:refresh" class="mr-5px" /> 重置
</el-button>
</el-form-item>
@ -51,6 +51,7 @@ import * as StorageLogApi from '@/api/heli/storagelog'
//:selectable="row=>row.disabled || chkboxEnable"
const chkboxEnable = ref(true)
const queryEnable = ref(true)
const { t } = useI18n() //
const message = useMessage() //
@ -107,6 +108,7 @@ const open = async (noZero: number, whId?: number, isAll?: number) => {
list.value = data
// total.value = data.total
chkboxEnable.value = isAll === 2 ? false : true
//queryEnable.value = isAll === 2?true:false
var iNum = 1
list.value.forEach((row) => {

Loading…
Cancel
Save