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

Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

Browse Source
dev
siontion 5 months ago
parent e94b71baf0 6478b4b7fe
commit c3606ff5f2
3 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File

40
mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageOut.vue
Unescape View File

@ -147,7 +147,7 @@
show-word-limit show-word-limit
maxlength="200" maxlength="200"
class="!w-2080px" class="!w-2080px"
v-bind:disabled="ctrView || ctrSave" v-bind:disabled="activetype == 'review'"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -166,7 +166,7 @@
class="hl-addbutton" class="hl-addbutton"
type="primary" type="primary"
size="large" size="large"
v-bind:disabled="ctrView || ctrSave" v-bind:disabled="activetype == 'review'"
@click="openMatForm" @click="openMatForm"
>新增</el-button >新增</el-button
> >
@ -251,7 +251,7 @@
> >
<el-input <el-input
v-model="scope.row.storageOkQty" v-model="scope.row.storageOkQty"
v-bind:disabled="ctrView || ctrSave" v-bind:disabled="activetype == 'review'"
/> />
</el-form-item> </el-form-item>
</template> </template>
@ -271,7 +271,7 @@
class="mb-0px!" class="mb-0px!"
> >
<ProcedureSelect <ProcedureSelect
v-bind:disabled="ctrView || ctrSave" v-bind:disabled="activetype == 'review'"
v-model="row.procedureId" v-model="row.procedureId"
@update:newValue=" @update:newValue="
(val) => { (val) => {
@ -286,7 +286,7 @@
<template #default="scope"> <template #default="scope">
<el-input <el-input
v-model="scope.row.description" v-model="scope.row.description"
v-bind:disabled="ctrView || ctrSave" v-bind:disabled="activetype == 'review'"
/> />
</template> </template>
</el-table-column> </el-table-column>
@ -298,7 +298,7 @@
type="danger" type="danger"
size="small" size="small"
@click.prevent="handleDelete2(scope.$index)" @click.prevent="handleDelete2(scope.$index)"
v-bind:disabled="ctrView || ctrDelete" v-bind:disabled="activetype == 'review'"
> >
删除 删除
</el-button> </el-button>
@ -317,8 +317,8 @@
class="hl-addbutton" class="hl-addbutton"
type="primary" type="primary"
size="large" size="large"
v-bind:disabled="ctrView || ctrSave" v-bind:disabled="activetype == 'review'"
@click="openMatForm" @click="openMatForm2"
>新增</el-button >新增</el-button
> >
</el-col> </el-col>
@ -347,7 +347,7 @@
<el-input <el-input
class="!w-265px" class="!w-265px"
placeholder="物料编码" placeholder="物料编码"
v-bind:disabled="true || ctrView || ctrSave" v-bind:disabled="true"
v-model="scope.row.projectSubCode" v-model="scope.row.projectSubCode"
readonly readonly
> >
@ -402,7 +402,7 @@
> >
<el-input <el-input
v-model="scope.row.storageOkQty" v-model="scope.row.storageOkQty"
v-bind:disabled="ctrView || ctrSave" v-bind:disabled="activetype == 'review'"
/> />
</el-form-item> </el-form-item>
</template> </template>
@ -421,7 +421,7 @@
class="mb-0px!" class="mb-0px!"
> >
<ProcedureSelect <ProcedureSelect
v-bind:disabled="ctrView || ctrSave" v-bind:disabled="activetype == 'review'"
v-model="row.procedureId" v-model="row.procedureId"
@update:newValue=" @update:newValue="
(val) => { (val) => {
@ -436,7 +436,7 @@
<template #default="scope"> <template #default="scope">
<el-input <el-input
v-model="scope.row.description" v-model="scope.row.description"
v-bind:disabled="ctrView || ctrSave" v-bind:disabled="activetype == 'review'"
/> />
</template> </template>
</el-table-column> </el-table-column>
@ -448,7 +448,7 @@
type="danger" type="danger"
size="small" size="small"
@click.prevent="handleDelete2(scope.$index)" @click.prevent="handleDelete2(scope.$index)"
v-bind:disabled="ctrView || ctrDelete" v-bind:disabled="activetype == 'review'"
> >
删除 删除
</el-button> </el-button>
@ -488,7 +488,7 @@
:before-upload="before" :before-upload="before"
class="upload-file-uploader" class="upload-file-uploader"
> >
<el-button type="primary" v-bind:disabled="ctrView || ctrSave"> <el-button type="primary" v-bind:disabled="activetype == 'review'">
<Icon icon="ep:upload-filled" />上传 <Icon icon="ep:upload-filled" />上传
</el-button> </el-button>
</el-upload> </el-upload>
@ -602,7 +602,7 @@
<el-button <el-button
@click="saveFormData('SAVE', 1, 'suc')" @click="saveFormData('SAVE', 1, 'suc')"
type="primary" type="primary"
v-if="btnSave && activetype !== 'audit' && formData.status !== 4" v-if="activetype !== 'audit' && formData.status !== 4&& formData.status !== 2"
size="large" size="large"
>保 存</el-button >保 存</el-button
> >
@ -610,7 +610,7 @@
<el-button <el-button
@click="saveFormData('SUBMIT', 2, 'suc')" @click="saveFormData('SUBMIT', 2, 'suc')"
type="success" type="success"
v-if="btnSave && activetype !== 'create' && formData.status !== 4 && activetype !== 'audit'" v-if="formData.status !== 2 && activetype !== 'create' && formData.status !== 4 && activetype !== 'audit'"
size="large" size="large"
>送 审</el-button >送 审</el-button
> >
@ -734,10 +734,10 @@ const proOpenFormRef = ref()
const openMatForm = () => { const openMatForm = () => {
matOpenFormRef.value.open(formData.value.whId) matOpenFormRef.value.open(formData.value.whId)
} }
// //派工单号不为空 //派工单号不为空
// const openMatForm2 = () => { const openMatForm2 = () => {
// matOpenFormRef2.value.open(formData.value.whId, formData.value.projectSubCode) matOpenFormRef2.value.open(formData.value.whId, formData.value.projectSubCode)
// } }
const handleHeaderNoRef = ref() const handleHeaderNoRef = ref()
const handleHeaderNo = () => { const handleHeaderNo = () => {

11
mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdex.vue
Unescape View File

@ -141,25 +141,25 @@
min-width="240" min-width="240"
/> />
<el-table-column label="提交人" align="center" prop="keeper" min-width="120"> <el-table-column label="送审人" align="center" prop="keeper" min-width="120">
<template #default="scope"> <template #default="scope">
{{ userList.find((user) => user.id == scope.row.outbound)?.nickname }} {{ userList.find((user) => user.id == scope.row.outbound)?.nickname }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="提交时间" label="送审时间"
align="center" align="center"
prop="outboundTime" prop="outboundTime"
:formatter="dateFormatter" :formatter="dateFormatter"
min-width="240" min-width="240"
/> />
<el-table-column label="作废人" align="center" prop="cancel" min-width="120"> <el-table-column label="审核人" align="center" prop="cancel" min-width="120">
<template #default="scope"> <template #default="scope">
{{ userList.find((user) => user.id == scope.row.cancel)?.nickname }} {{ userList.find((user) => user.id == scope.row.cancel)?.nickname }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="作废时间" label="审核时间"
align="center" align="center"
prop="cancelTime" prop="cancelTime"
:formatter="dateFormatter" :formatter="dateFormatter"
@ -172,7 +172,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="180" fixed="right"> <el-table-column label="操作" align="center" width="180" fixed="right">
<template #default="scope"> <template #default="scope">
<el-button link type="primary" @click="openDetail('update', scope.row.id)" v-if="scope.row.status != 3&&scope.row.status != 2"> <el-button link type="primary" @click="openDetail('update', scope.row.id)" v-if="scope.row.status != 4&&scope.row.status != 2">
编辑 编辑
</el-button> </el-button>
<el-button link type="primary" @click="openDetail('review', scope.row.id)"> <el-button link type="primary" @click="openDetail('review', scope.row.id)">
@ -206,7 +206,6 @@ import download from '@/utils/download'
import * as StorageApi from '@/api/biz/storage' import * as StorageApi from '@/api/biz/storage'
import * as WarehouseApi from '@/api/biz/warehouse' import * as WarehouseApi from '@/api/biz/warehouse'
import * as UserApi from '@/api/system/user' import * as UserApi from '@/api/system/user'
defineOptions({ name: 'Storage' }) defineOptions({ name: 'Storage' })
import { useCommonStateWithOut } from '@/store/modules/common' import { useCommonStateWithOut } from '@/store/modules/common'
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗

8
mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdexAudit.vue
Unescape View File

@ -141,25 +141,25 @@
min-width="240" min-width="240"
/> />
<el-table-column label="提交人" align="center" prop="keeper" min-width="120"> <el-table-column label="送审人" align="center" prop="keeper" min-width="120">
<template #default="scope"> <template #default="scope">
{{ userList.find((user) => user.id == scope.row.outbound)?.nickname }} {{ userList.find((user) => user.id == scope.row.outbound)?.nickname }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="提交时间" label="送审时间"
align="center" align="center"
prop="outboundTime" prop="outboundTime"
:formatter="dateFormatter" :formatter="dateFormatter"
min-width="240" min-width="240"
/> />
<el-table-column label="作废人" align="center" prop="cancel" min-width="120"> <el-table-column label="审核人" align="center" prop="cancel" min-width="120">
<template #default="scope"> <template #default="scope">
{{ userList.find((user) => user.id == scope.row.cancel)?.nickname }} {{ userList.find((user) => user.id == scope.row.cancel)?.nickname }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="作废时间" label="审核时间"
align="center" align="center"
prop="cancelTime" prop="cancelTime"
:formatter="dateFormatter" :formatter="dateFormatter"

Write Preview
Loading…
Cancel
Save