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

pull/2/head
zengchenxi 9 months ago
commit 0179496596

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

@ -105,10 +105,10 @@
} }
.el-card__body { .el-card__body {
padding: 15px 0px; padding: 10px 0px;
.el-row { .el-row {
margin: 10px; margin: 5px 0;
} }
} }
} }
@ -204,43 +204,43 @@
// //
.ialteration { .ialteration {
border: 1px solid #F39800; border: 1px solid #f39800;
background-color: #F7F3ED; background-color: #f7f3ed;
color: #F39800; color: #f39800;
} }
// //
.isubmit { .isubmit {
border: 1px solid #356899; border: 1px solid #356899;
background-color: #ECF0F4; background-color: #ecf0f4;
color: #356899; color: #356899;
} }
// //
.icancellation { .icancellation {
border: 1px solid #95969D; border: 1px solid #95969d;
background-color: #EBEBEB; background-color: #ebebeb;
color: #95969D; color: #95969d;
} }
// //
.ibreakup { .ibreakup {
border: 1px solid #0D0D26; border: 1px solid #0d0d26;
background-color: #E8E8E8; background-color: #e8e8e8;
color: #0D0D26; color: #0d0d26;
} }
// //
.allshipments { .allshipments {
color: #3AC33D; color: #3ac33d;
background-color: transparent; background-color: transparent;
border: none; border: none;
} }
// //
.noshipments { .noshipments {
color: #4589FF; color: #4589ff;
background-color: transparent; background-color: transparent;
border: none; border: none;
} }
.partshipments { .partshipments {
color: #19A998; color: #19a998;
background-color: transparent; background-color: transparent;
border: none; border: none;
} }

@ -50,7 +50,9 @@
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">基础信息</span> <div class="hl-card-info-icona"></div><span class="hl-card-info-text">基础信息</span>
</template> </template>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="12">
<el-row>
<el-col :span="12">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="项目编号" prop="code"> <el-form-item label="项目编号" prop="code">
@ -90,20 +92,13 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="所属业务线" prop="businessLine"> <el-form-item label="模具名称" prop="mouldName">
<el-select <el-input
class="!w-250px" class="!w-250px"
v-model="formData.businessLine"
placeholder="请选择所属业务线"
:disabled="alterDisabled || detailDisabled" :disabled="alterDisabled || detailDisabled"
> v-model="formData.mouldName"
<el-option placeholder="请输入模具名称"
v-for="dict in getStrDictOptions(DICT_TYPE.HELI_BUSINESS_LINE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/> />
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -111,6 +106,7 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="项目开始日期" prop="projectStartTime"> <el-form-item label="项目开始日期" prop="projectStartTime">
<el-date-picker <el-date-picker
class="!w-250px"
v-model="formData.projectStartTime" v-model="formData.projectStartTime"
type="date" type="date"
value-format="x" value-format="x"
@ -120,21 +116,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="24">
<el-form-item label="可引用的原有技术" prop="referenceTechnology">
<el-input
class="!w-250px"
:disabled="detailDisabled"
v-model="formData.referenceTechnology"
placeholder="请输入可引用的原有技术"
:class="{ 'alter-class': fieldHasAlter('referenceTechnology') }"
/>
</el-form-item>
</el-col>
</el-row>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="12">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="单据日期" prop="orderTime"> <el-form-item label="单据日期" prop="orderTime">
@ -174,13 +157,20 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="模具图号" prop="blueprintNo"> <el-form-item label="所属业务线" prop="businessLine">
<el-input <el-select
class="!w-250px" class="!w-250px"
v-model="formData.businessLine"
placeholder="请选择所属业务线"
:disabled="alterDisabled || detailDisabled" :disabled="alterDisabled || detailDisabled"
v-model="formData.blueprintNo" >
placeholder="请输入模具图号" <el-option
v-for="dict in getStrDictOptions(DICT_TYPE.HELI_BUSINESS_LINE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/> />
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -212,6 +202,22 @@
</el-col> </el-col>
</el-row> </el-row>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="可引用的原有技术" prop="referenceTechnology">
<el-input
class="!w-703px"
:disabled="detailDisabled"
v-model="formData.referenceTechnology"
placeholder="请输入可引用的原有技术"
:class="{ 'alter-class': fieldHasAlter('referenceTechnology') }"
/>
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
@ -246,6 +252,26 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="24">
<el-form-item label="性质" prop="property">
<el-select
class="!w-250px"
:class="{ 'alter-class': fieldHasAlter('property') }"
:disabled="detailDisabled"
v-model="formData.property"
placeholder="请选择性质"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PROPERTY)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="是否有价格" prop="hasPrice"> <el-form-item label="是否有价格" prop="hasPrice">
@ -284,21 +310,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="24">
<el-form-item label="是否已变更" prop="hasAlter">
<el-radio-group v-model="formData.hasAlter" disabled>
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-row> <el-row>
@ -322,12 +333,12 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="模具名称" prop="mouldName"> <el-form-item label="模具图号" prop="blueprintNo">
<el-input <el-input
class="!w-250px" class="!w-250px"
:disabled="alterDisabled || detailDisabled" :disabled="alterDisabled || detailDisabled"
v-model="formData.mouldName" v-model="formData.blueprintNo"
placeholder="请输入模具名称" placeholder="请输入模具图号"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -366,31 +377,26 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="性质" prop="property"> <el-form-item label="是否已变更" prop="hasAlter">
<el-select <el-radio-group v-model="formData.hasAlter" disabled>
class="!w-250px" <el-radio
:class="{ 'alter-class': fieldHasAlter('property') }" v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"
:disabled="detailDisabled"
v-model="formData.property"
placeholder="请选择性质"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PROPERTY)"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.value"
:value="dict.value" >
/> {{ dict.label }}
</el-select> </el-radio>
</el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-col> </el-col>
</el-row> </el-row>
<el-row style="margin-top:-10px;margin-left:15px"> <el-row >
<el-col :span="12"> <el-col :span="12">
<el-form-item label="检验要求" prop="qualityRequirement"> <el-form-item label="检验要求" prop="qualityRequirement">
<el-input <el-input
class="!w-700px" class="!w-703px"
:disabled="detailDisabled" :disabled="detailDisabled"
type="textarea" type="textarea"
v-model="formData.qualityRequirement" v-model="formData.qualityRequirement"
@ -404,7 +410,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="备注" prop="remark" :disabled="detailDisabled"> <el-form-item label="备注" prop="remark" :disabled="detailDisabled">
<el-input <el-input
class="!w-700px" class="!w-703px"
:disabled="detailDisabled" :disabled="detailDisabled"
type="textarea" type="textarea"
v-model="formData.remark" v-model="formData.remark"

@ -1,9 +1,14 @@
<template> <template>
<!-- 入库 --> <!-- 入库 -->
<el-card class="hl-card"> <el-card class="hl-card" style="position: relative">
<template #header> <template #header>
<span v-text="dialogTitle"></span> <span v-text="dialogTitle"></span>
</template> </template>
<div class="abstatus">
<img src="/src/assets/imgs/status/status2.png" v-if="formData.status == 2" alt="" />
<img src="/src/assets/imgs/status/statuszf.png" v-else-if="formData.status == 3" alt="" />
<span v-else></span>
</div>
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"
@ -517,7 +522,6 @@ const subFormRules = reactive({
storageOkQty: [{ required: true, message: '入库数量不能为空', trigger: 'blur' }] storageOkQty: [{ required: true, message: '入库数量不能为空', trigger: 'blur' }]
}) })
const handleStatus = async (num) => { const handleStatus = async (num) => {
// //
await formRef.value.validate() await formRef.value.validate()
if (formData.value.matItemDOList.length === 0) { if (formData.value.matItemDOList.length === 0) {
@ -579,7 +583,6 @@ const handleStatus = async (num) => {
query.type = 'update' query.type = 'update'
query.id = formData.value.id query.id = formData.value.id
reload() reload()
} }
const userList = ref<UserApi.UserVO[]>([]) // const userList = ref<UserApi.UserVO[]>([]) //
@ -671,7 +674,6 @@ const saveFormData = async () =>{
} }
formData.value = await StorageApi.getStorage(storageid.value) formData.value = await StorageApi.getStorage(storageid.value)
message.success(t(commonResult)) message.success(t(commonResult))
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
@ -697,7 +699,7 @@ const submitForm = async () => {
query.id = storageid.value query.id = storageid.value
formData.value.id = storageid.value formData.value.id = storageid.value
// //
reload(); reload()
} }
var matCount = 1 var matCount = 1
@ -866,7 +868,6 @@ onMounted(async () => {
isShowBtnDelete.value = false isShowBtnDelete.value = false
} }
// //
const queryParamsRg = reactive({ const queryParamsRg = reactive({
pageNo: 1, pageNo: 1,

@ -1,9 +1,14 @@
<template> <template>
<!-- 出库 --> <!-- 出库 -->
<el-card class="hl-card"> <el-card class="hl-card" style="position: relative">
<template #header> <template #header>
<span v-text="dialogTitle"></span> <span v-text="dialogTitle"></span>
</template> </template>
<div class="abstatus">
<img src="/src/assets/imgs/status/status2.png" v-if="formData.status == 2" alt="" />
<img src="/src/assets/imgs/status/statuszf.png" v-else-if="formData.status == 3" alt="" />
<span v-else></span>
</div>
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"
@ -177,7 +182,12 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="matSpec" label="规格/型号" min-width="120" align="center" /> <el-table-column
prop="matSpec"
label="规格/型号"
min-width="120"
align="center"
/>
<el-table-column prop="matUnit" label="系统单位" min-width="120" align="center"> <el-table-column prop="matUnit" label="系统单位" min-width="120" align="center">
<template #default="scope"> <template #default="scope">
@ -489,7 +499,6 @@ const subFormRules = reactive({
storageOkQty: [{ required: true, message: '出库数量不能为空', trigger: 'blur' }] storageOkQty: [{ required: true, message: '出库数量不能为空', trigger: 'blur' }]
}) })
const handleStatus = async (num) => { const handleStatus = async (num) => {
// //
await formRef.value.validate() await formRef.value.validate()
if (formData.value.matItemDOList.length === 0) { if (formData.value.matItemDOList.length === 0) {
@ -660,9 +669,6 @@ const saveFormData = async () =>{
} }
formData.value = await StorageApi.getStorage(storageid.value) formData.value = await StorageApi.getStorage(storageid.value)
message.success(t(commonResult)) message.success(t(commonResult))
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
@ -712,7 +718,6 @@ const onAddItem = () => {
} }
matCount = matCount + 1 matCount = matCount + 1
formData.value.matItemDOList.push(newData) formData.value.matItemDOList.push(newData)
} else { } else {
message.alertWarning('请选择出库仓库') message.alertWarning('请选择出库仓库')
@ -748,11 +753,14 @@ const handleWh = async (wid) => {
let matParams = { let matParams = {
pageNo: 1, pageNo: 1,
pageSize: 99, pageSize: 99,
status: "1" status: '1'
} }
const dataMat = await MaterialApi.getMaterialPage(matParams) const dataMat = await MaterialApi.getMaterialPage(matParams)
matList.value = [] matList.value = []
matList.value = dataMat.list.filter((item) => matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == wid) !== undefined) matList.value = dataMat.list.filter(
(item) =>
matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == wid) !== undefined
)
formData.value.matItemDOList = [] formData.value.matItemDOList = []
// formData.value.matItemDOList.forEach(item => { // formData.value.matItemDOList.forEach(item => {
@ -792,7 +800,12 @@ const remoteMatCodeSearch = async (name) => {
const dataMat = await MaterialApi.getMaterialPage(matParams) const dataMat = await MaterialApi.getMaterialPage(matParams)
matList.value = [] matList.value = []
matList.value = dataMat.list.filter((item) => matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == formData.value.whId) !== undefined) matList.value = dataMat.list.filter(
(item) =>
matLastRemoteData.find(
(fish) => fish.matId === item.id && fish.whId == formData.value.whId
) !== undefined
)
matSelectLoading.value = false matSelectLoading.value = false
} }
@ -862,8 +875,6 @@ onMounted(async () => {
dialogTitle.value = t('action.' + query.type) dialogTitle.value = t('action.' + query.type)
dialogTitle.value = query.type === 'review' ? '查看' : dialogTitle.value dialogTitle.value = query.type === 'review' ? '查看' : dialogTitle.value
//------------------- //-------------------
const data = await WarehouseApi.getWarehouseSimpList() const data = await WarehouseApi.getWarehouseSimpList()
warehouseList.value = data warehouseList.value = data

Loading…
Cancel
Save