yunxi
/
mes-majoys
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
dev
qiuhongwu 2 months ago
parent d1c8c91d4a
commit 830cebe9b5
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File

24
mes-ui/mes-ui-admin-vue3/src/views/biz/projectorder/detail.vue
Unescape View File

@ -265,9 +265,7 @@
<el-row> <el-row>
<el-col> <el-col>
<el-card class="hl-incard"> <el-card class="hl-incard">
<el-col <el-col v-if="'update,create,alter'.indexOf(query.active) > -1">
v-if="'update,create,alter'.indexOf(query.active) > -1 "
>
<el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem" <el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem"
>新增</el-button >新增</el-button
> >
@ -294,7 +292,7 @@
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item <el-form-item
:prop="`${$index}.projectSubCode`" :prop="`${$index}.projectSubCode`"
:rules="subFormRules.matCode" :rules="subFormRules.projectSubCode"
class="mb-0px!" class="mb-0px!"
> >
<el-input <el-input
@ -356,7 +354,7 @@
> >
<el-input-number <el-input-number
style="width: 100%" style="width: 100%"
:disabled="detailDisabled " :disabled="detailDisabled"
v-model="row.amount" v-model="row.amount"
placeholder="请输入生产数量" placeholder="请输入生产数量"
:min="0" :min="0"
@ -405,8 +403,7 @@
clearable clearable
class="!w-400px" class="!w-400px"
@change="handleWh(row, $index)" @change="handleWh(row, $index)"
:disabled=" :disabled="detailDisabled"
detailDisabled"
> >
<el-option <el-option
v-for="dict in whList" v-for="dict in whList"
@ -426,7 +423,7 @@
class="mb-0px!" class="mb-0px!"
> >
<el-input <el-input
:disabled="detailDisabled " :disabled="detailDisabled"
v-model="row.remark" v-model="row.remark"
placeholder="请输入备注" placeholder="请输入备注"
:class="{ 'alter-class': fieldHasAlterInRow('remark', row) }" :class="{ 'alter-class': fieldHasAlterInRow('remark', row) }"
@ -437,9 +434,8 @@
<el-table-column label="操作" align="center" width="150"> <el-table-column label="操作" align="center" width="150">
<template #default="scope"> <template #default="scope">
<el-button <el-button
v-if=" v-if="'update,create,alter'.indexOf(query.active) > -1"
'update,create,alter'.indexOf(query.active) > -1 " :disabled="detailDisabled || scope.row.id"
:disabled="detailDisabled||scope.row.id"
link link
type="danger" type="danger"
size="small" size="small"
@ -707,11 +703,11 @@ const formRules = reactive({
const formRef = ref() // 表单 Ref const formRef = ref() // 表单 Ref
const subFormLoading = ref(false) // 子表单的加载中 const subFormLoading = ref(false) // 子表单的加载中
const subFormRules = reactive({ const subFormRules = reactive({
name: [{ required: true, message: '子项目名称不能为空', trigger: 'blur' }], projectSubCode: [{ required: true, message: '产品编码不能为空', trigger: 'blur' }],
amount: [{ required: true, message: '数量不能为空', trigger: 'blur' }], amount: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
unit: [{ required: true, message: '单位不能为空', trigger: 'blur' }],
compositionId: [{ required: true, message: '材质不能为空', trigger: 'blur' }], compositionId: [{ required: true, message: '材质不能为空', trigger: 'blur' }],
status: [{ required: true, message: '状态,1表示正常，2表示禁用不能为空', trigger: 'blur' }] status: [{ required: true, message: '状态,1表示正常，2表示禁用不能为空', trigger: 'blur' }],
warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'blur' }]
}) })
const fieldHasAlter = (fieldName) => { const fieldHasAlter = (fieldName) => {

21
mes-ui/mes-ui-admin-vue3/src/views/biz/qualityfeedback/detail.vue
Unescape View File

@ -22,7 +22,7 @@
v-model="formData.customerId" v-model="formData.customerId"
@update:newValue="handleSelectedClient" @update:newValue="handleSelectedClient"
class="!w-260px" class="!w-260px"
:disabled="detailDisabled" :disabled="detailDisabled||formData.status==2"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -40,7 +40,7 @@
v-model="formData.projectSubCode" v-model="formData.projectSubCode"
@click.prevent="openProjectSubDialog" @click.prevent="openProjectSubDialog"
readonly readonly
:disabled="detailDisabled" :disabled="detailDisabled||formData.status==2"
> >
<template #append <template #append
><el-button ><el-button
@ -76,7 +76,7 @@
class="!w-260px" class="!w-260px"
v-model="formData.feedbackPerson" v-model="formData.feedbackPerson"
placeholder="请输入客户反馈人" placeholder="请输入客户反馈人"
:disabled="detailDisabled" :disabled="detailDisabled||formData.status==2"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -86,7 +86,7 @@
class="!w-260px" class="!w-260px"
v-model="formData.telephone" v-model="formData.telephone"
placeholder="请输入联系电话" placeholder="请输入联系电话"
:disabled="detailDisabled" :disabled="detailDisabled||formData.status==2"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -97,8 +97,8 @@
<el-input <el-input
class="!w-260px" class="!w-260px"
v-model="formData.feedbackNum" v-model="formData.feedbackNum"
placeholder="请输入客户反馈人" placeholder="请输入数量"
:disabled="detailDisabled" :disabled="detailDisabled||formData.status==2"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -108,7 +108,7 @@
class="!w-260px" class="!w-260px"
v-model="formData.reduceMoney" v-model="formData.reduceMoney"
placeholder="请输入扣款金额" placeholder="请输入扣款金额"
:disabled="detailDisabled" :disabled="detailDisabled||formData.status==2"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -122,7 +122,7 @@
placeholder="请输入扣款原因描述" placeholder="请输入扣款原因描述"
show-word-limit show-word-limit
maxlength="200" maxlength="200"
:disabled="detailDisabled" :disabled="detailDisabled||formData.status==2"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -149,8 +149,9 @@
:on-success="handleSuccess" :on-success="handleSuccess"
:before-upload="before" :before-upload="before"
class="upload-file-uploader" class="upload-file-uploader"
> >
<el-button type="primary"> <Icon icon="ep:upload-filled" />上传 </el-button> <el-button type="primary" :disabled="detailDisabled||formData.status==2"> <Icon icon="ep:upload-filled" />上传 </el-button>
</el-upload> </el-upload>
</el-col> </el-col>
<el-col> <el-col>
@ -474,7 +475,7 @@ onMounted(async () => {
: active.value === 'Check' : active.value === 'Check'
? '审核' ? '审核'
: t('action.' + active.value) : t('action.' + active.value)
console.log('active:', active.value, currentId.value) // console.log('active:', active.value, currentId.value,formData.value.status)
if ('detail' == active.value || 'Check' == active.value) { if ('detail' == active.value || 'Check' == active.value) {
detailDisabled.value = true detailDisabled.value = true
} }

Write Preview
Loading…
Cancel
Save