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

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

@ -6,7 +6,10 @@ export interface EquipVO {
mouldTypeId: number mouldTypeId: number
status: number status: number
} }
// 查询设备信息全页数据
export const getSimpList = async () => {
return await request.get({ url: `/heli/equip/all-simples` })
}
// 查询设备信息分页 // 查询设备信息分页
export const getEquipPage = async (params) => { export const getEquipPage = async (params) => {
return await request.get({ url: `/heli/equip/page`, params }) return await request.get({ url: `/heli/equip/page`, params })

@ -6,6 +6,11 @@ export interface MouldTypeVO {
status: number status: number
} }
// 查询模具类型全页数据
export const getSimpList = async () => {
return await request.get({ url: `/heli/mould-type/all-simples` })
}
// 查询模具类型分页 // 查询模具类型分页
export const getMouldTypePage = async (params) => { export const getMouldTypePage = async (params) => {
return await request.get({ url: `/heli/mould-type/page`, params }) return await request.get({ url: `/heli/mould-type/page`, params })

@ -19,41 +19,41 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="发货单号" prop="code"> <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-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="项目编号" prop="saleOrderIds"> <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> <template #append><el-button :disabled="active != 'create'" @click="openProjectOrderDialog" :icon="Search" /></template>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item prop="contractNo" label="合同号"> <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-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item prop="property" label="性质"> <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-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="发货日期" prop="deliverDate"> <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-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item prop="customerId" label="客户名称"> <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-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item prop="projectName" label="项目名称"> <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-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
@ -77,24 +77,24 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="发货人姓名" prop="deliverPerson"> <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-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="发货人电话" prop="deliverPersonMobile"> <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-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="发货方式" > <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-option v-for="dict in getStrDictOptions(DICT_TYPE.HELI_DELIVER_MODE)" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="发货单位" prop="deliverCompany"> <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-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -114,12 +114,12 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="收货人电话" prop="receivePersonMobile"> <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-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="收货详细地址" prop="receiveAddress"> <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-option v-for="dict in receivePersonAddressOptions" :key="dict.address" :label="dict.address" :value="dict.address" />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -134,29 +134,29 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="司机姓名" prop="transportDriverName"> <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-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="司机电话" prop="transportDriverMobile"> <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-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="车牌号" prop="transportBusNumber"> <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-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="重量(T)" prop="transportWeight"> <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-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="位置(米)" prop="transportSize"> <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-form-item>
</el-col> </el-col>
</el-row> </el-row>

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

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

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

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

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

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

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

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

@ -92,7 +92,7 @@
<el-col> <el-col>
<el-card class="hl-incard"> <el-card class="hl-incard">
<el-col> <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-col>
<el-form ref="matSubFormRef" :model="formData.matItemDOList" :rules="subFormRules" v-loading="subFormLoading" label-width="0"> <el-form ref="matSubFormRef" :model="formData.matItemDOList" :rules="subFormRules" v-loading="subFormLoading" label-width="0">
<el-table :data="formData.matItemDOList" class="hl-table"> <el-table :data="formData.matItemDOList" class="hl-table">

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

Loading…
Cancel
Save