FIX some bug

main
chenshuichuan 2 years ago
parent 6aa15b1829
commit 37fd069908

@ -6,6 +6,7 @@ export interface PurchaseOrderVO {
no: string // 采购订单号
customerId: number // 客户编号
orderTime: Date // 订单时间
arrivalTime: Date // 预计到货时间
totalCount: number // 合计数量
totalPrice: number // 合计金额,单位:元
status: number // 状态

@ -231,7 +231,7 @@ export enum DICT_TYPE {
MES_ORG_TYPE = "mes_org_type",
MES_ORG_CLASS = "mes_org_class",
MES_ORG_STATUS = "mes_org_status",
MES_TASK_TYPE = "mes_task_type",
MES_TASK_STATUS = "mes_task_status",
MES_PLAN_STATUS = "mes_plan_status",
MES_RECORD_STATUS = "mes_record_status",

@ -9,12 +9,12 @@
:disabled="disabled"
>
<el-row :gutter="20">
<el-col :span="8">
<el-col :span="6">
<el-form-item label="订单单号" prop="no">
<el-input disabled v-model="formData.no" placeholder="保存时自动生成" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="订单时间" prop="orderTime">
<el-date-picker
v-model="formData.orderTime"
@ -25,7 +25,18 @@
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="预计到货" prop="arrivalTime">
<el-date-picker
v-model="formData.arrivalTime"
type="date"
value-format="x"
placeholder="预计到货"
class="!w-1/1"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="供应商" prop="supplierId">
<el-select
v-model="formData.supplierId"
@ -158,6 +169,7 @@ const formData = ref({
supplierId: undefined,
accountId: undefined,
orderTime: undefined,
arrivalTime: undefined,
remark: undefined,
fileUrl: '',
discountPercent: 0,
@ -168,7 +180,8 @@ const formData = ref({
no: undefined //
})
const formRules = reactive({
orderTime: [{ required: true, message: '订单时间不能为空', trigger: 'blur' }]
orderTime: [{ required: true, message: '订单时间不能为空', trigger: 'blur' }],
arrivalTime: [{ required: true, message: '预计到货时间不能为空', trigger: 'blur' }]
})
const disabled = computed(() => formType.value === 'detail')
const formRef = ref() // Ref

@ -211,6 +211,13 @@
prop="depositPrice"
:formatter="erpPriceTableColumnFormatter"
/>
<el-table-column
label="预计到货"
align="center"
prop="arrivalTime"
:formatter="dateFormatter2"
width="120px"
/>
<el-table-column label="状态" align="center" fixed="right" width="90" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" />
@ -230,7 +237,7 @@
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['erp:purchase-order:update']"
:disabled="scope.row.status === 20"
v-if="scope.row.status !== 20"
>
编辑
</el-button>
@ -257,6 +264,7 @@
type="danger"
@click="handleDelete([scope.row.id])"
v-hasPermi="['erp:purchase-order:delete']"
v-if="scope.row.status !== 20"
>
删除
</el-button>

@ -8,10 +8,11 @@
v-loading="formLoading"
>
<el-form-item label="计划编码" prop="code">
<el-input v-model="formData.code" placeholder="请输入计划编码" />
<el-input v-model="formData.code" placeholder="请输入计划编码" />
</el-form-item>
<el-form-item label="任务单" prop="taskId">
<el-select
:disabled='editDisable'
v-model="formData.taskId"
clearable
filterable
@ -28,6 +29,7 @@
</el-form-item>
<el-form-item label="产品" prop="productId">
<el-select
:disabled='editDisable'
v-model="formData.productId"
clearable
filterable
@ -90,6 +92,8 @@ const taskList = ref<TaskVO[]>([]) // 用户列表
const { t } = useI18n() //
const message = useMessage() //
const editDisable = ref(false) //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
@ -131,9 +135,11 @@ const open = async (type: string, id?: number,
formData.value.taskId = taskId
if(productId)
formData.value.productId = productId
if(number)formData.value.planNumber = number
if(number)
formData.value.planNumber = number
if(type==='update'){
editDisable.value = true
}
//
if (id) {
formLoading.value = true

@ -22,8 +22,21 @@
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="领料人" prop="planId">
<el-input v-model="formData.workerId" placeholder="请输入领料人" />
<el-form-item label="领料人" prop="workerId">
<el-select
v-model="formData.workerId"
clearable
filterable
placeholder="请选择工人"
class="!w-240px"
>
<el-option
v-for="item in userList"
:key="item.id"
:label="item.nickname"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="计划下料" prop="requisitionDate">
<el-date-picker
@ -33,14 +46,6 @@
placeholder="选择下料时间"
/>
</el-form-item>
<!-- <el-form-item label="实际下料时间" prop="deliveryDate">-->
<!-- <el-date-picker-->
<!-- v-model="formData.deliveryDate"-->
<!-- type="date"-->
<!-- value-format="x"-->
<!-- placeholder="选择实际下料时间"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" />
@ -58,6 +63,8 @@
import { ItemRequisitionApi, ItemRequisitionVO } from '@/api/mes/itemrequisition'
import {PlanApi} from "@/api/mes/plan";
import {DICT_TYPE, getStrDictOptions} from "@/utils/dict";
import * as UserApi from "@/api/system/user";
import {WorkTeamApi} from "@/api/mes/workteam";
/** 生产领料 表单 */
@ -69,7 +76,7 @@ const message = useMessage() // 消息弹窗
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const userList = ref<UserApi.UserVO[]>([]) //
const formData = ref({
requisitionDate: undefined,
@ -97,6 +104,8 @@ const open = async (planCode: string, planId: number) => {
} finally {
formLoading.value = false
}
//
userList.value = await WorkTeamApi.getUserList("zhijiang")
}
defineExpose({ open }) // open

@ -61,7 +61,7 @@
<script setup lang="ts">
import { StockInApi, StockInVO } from '@/api/erp/stock/in'
import StockInItemForm from './components/StockInItemForm.vue'
import { SupplierApi, SupplierVO } from '@/api/erp/purchase/supplier'
/** ERP 其它入库单 表单 */
defineOptions({ name: 'StockInForm' })

@ -16,7 +16,20 @@
</el-col>
<el-col :span="8">
<el-form-item label="领料人" prop="responserId">
<el-input v-model="formData.responserId" placeholder="请选择领料人" />
<el-select
v-model="formData.responserId"
clearable
filterable
placeholder="请选择领料工人"
class="!w-240px"
>
<el-option
v-for="item in userList"
:key="item.id"
:label="item.nickname"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
@ -41,11 +54,7 @@
/>
</el-form-item>
</el-col>
<!-- <el-col :span="8">-->
<!-- <el-form-item label="附件" prop="fileUrl">-->
<!-- <UploadFile :is-show-tip="false" v-model="formData.fileUrl" :limit="1" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
</el-form>
<!-- 子表的表单 -->
@ -68,6 +77,8 @@
import { StockOutApi, StockOutVO } from '@/api/erp/stock/out'
import StockOutItemForm from './components/StockOutItemForm.vue'
import { CustomerApi, CustomerVO } from '@/api/erp/sale/customer'
import * as UserApi from "@/api/system/user";
import {WorkTeamApi} from "@/api/mes/workteam";
/** ERP 其它出库单表单 */
defineOptions({ name: 'StockOutForm' })
@ -89,11 +100,12 @@ const formData = ref({
items: []
})
const formRules = reactive({
outTime: [{ required: true, message: '出库时间不能为空', trigger: 'blur' }]
outTime: [{ required: true, message: '出库时间不能为空', trigger: 'blur' }],
responserId: [{ required: true, message: '领料人不能为空', trigger: 'blur' }]
})
const disabled = computed(() => formType.value === 'detail')
const formRef = ref() // Ref
const userList = ref<UserApi.UserVO[]>([]) //
/** 子表的表单 */
const subTabsName = ref('item')
const itemFormRef = ref()
@ -113,8 +125,9 @@ const open = async (type: string, id?: number) => {
formLoading.value = false
}
}
//
customerList.value = await CustomerApi.getCustomerSimpleList()
//
userList.value = await WorkTeamApi.getUserList("zhijiang", '')
}
defineExpose({ open }) // open

@ -29,6 +29,17 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item label="任务类型" prop="taskType">
<el-radio-group v-model="formData.taskType">
<el-radio
v-for="dict in getStrDictOptions(DICT_TYPE.MES_TASK_TYPE)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<!-- 子表的表单 -->
<el-tabs v-model="subTabsName">
@ -43,7 +54,7 @@
</Dialog>
</template>
<script setup lang="ts">
import { getIntDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
import {getIntDictOptions, getBoolDictOptions, DICT_TYPE, getStrDictOptions} from '@/utils/dict'
import { TaskApi, TaskVO } from '@/api/mes/task'
import TaskAddSaleDetailForm from './components/TaskAddSaleDetailForm.vue'
@ -61,6 +72,7 @@ const formData = ref({
id: undefined,
code: undefined,
orderDate: undefined,
taskType: undefined,
deliveryDate: undefined,
status: undefined,
processInstanceId: undefined,

@ -18,7 +18,17 @@
placeholder="选择交货日期"
/>
</el-form-item>
<el-form-item label="任务类型" prop="taskType">
<el-radio-group v-model="formData.taskType">
<el-radio
v-for="dict in getStrDictOptions(DICT_TYPE.MES_TASK_TYPE)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" />
@ -32,7 +42,7 @@
</Dialog>
</template>
<script setup lang="ts">
import { getIntDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
import {DICT_TYPE, getStrDictOptions} from '@/utils/dict'
import { TaskApi, TaskVO } from '@/api/mes/task'
/** 生产任务单 表单 */
@ -51,6 +61,7 @@ const formData = ref({
orderDate: undefined,
deliveryDate: undefined,
status: undefined,
taskType: undefined,
processInstanceId: undefined,
remark: undefined,
isEnable: undefined
@ -108,6 +119,7 @@ const resetForm = () => {
id: undefined,
code: undefined,
orderDate: undefined,
taskType: undefined,
deliveryDate: undefined,
status: undefined,
processInstanceId: undefined,

@ -191,6 +191,7 @@ const queryParams = reactive({
code: undefined,
orderDate: [],
deliveryDate: [],
taskType: undefined,
status: undefined,
processInstanceId: undefined,
remark: undefined,

@ -25,11 +25,11 @@
<el-input-number v-model="formData.productsOfPlan" :min="0" class="!w-1/1"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="计划个数" prop="sizeOfPlan">
<el-input-number v-model="formData.sizeOfPlan" :min="0" class="!w-1/1"/>
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
<!-- <el-form-item label="计划个数" prop="sizeOfPlan">-->
<!-- <el-input-number v-model="formData.sizeOfPlan" :min="0" class="!w-1/1"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="8">
<el-form-item label="日期" prop="planDate">
<el-date-picker

Loading…
Cancel
Save