Skip to content

T
TF-MOM-WEB
Commit ced04935 authored by xioln's avatar xioln
Browse files
Options

入库修改

parent dfcf32df
Hide whitespace changes
Inline Side-by-side
Showing with 231 additions and 254 deletions
applications/dee-mes/src/privateComponents/components/JobResponseInTestProcess/component/UploadFiles.vue
View file @ ced04935
<template>
<div class="upload-files">
<dee-form app-name="tf-mom" label-position="top" :form="form" :form-data="formData1" />
<dee-form app-name="tf-mom" label-position="top" :form="form" :form-data="formData" />
</div>
</template>
<script>
......@@ -11,6 +11,10 @@ export default {
value: {
type: Array,
default: () => []
},
viewOrEdit: {
type: String,
default: () => 'edit'
}
},
data() {
......@@ -18,26 +22,7 @@ export default {
form: {
objFileLinks: []
},
'formData': [
{
'title': '',
'split': 3,
'data': [
{
'name': '上传附件',
'key': 'objFileLinks',
'parentKey': 'objFileLinks',
'component': {
'name': 'DeeUploadTable',
'url': '/dfs/fileManager/feign/uploadFile'
},
'width': 3
}
],
'labelPosition': 'right'
}
],
formData1: [
formData: [
{
'title': '',
'split': 3,
......@@ -51,7 +36,6 @@ export default {
'hidden': false,
'component': {
'name': 'DeeUploadTable',
'appName': 'tf-mom',
'taleType': 'single',
'showFileList': true,
'filterKey': 'contentType',
......@@ -59,7 +43,8 @@ export default {
'alimit': 1,
'limit': 5,
'mrequired': true,
'state': 'edit',
// 'state': 'edit',
'state': this.viewOrEdit,
'masterTitle': '主内容',
'appendTitle': '附件',
'masterFilter': ['MASTER_FILE', 'PRIMARY'],
......@@ -77,13 +62,17 @@ export default {
}
},
watch: {
value: function(newForm, oldForm) {
if (newForm) {
this.$set(this.form, 'objFileLinks', newForm)
}
},
'form.objFileLinks': function(newForm, oldForm) {
this.$emit('input', newForm)
}
},
mounted() {
const data = this.value
this.form.objFileLinks = data
// this.$set(this.form, 'objFileLinks', this.value)
},
methods: {
}
......@@ -98,7 +87,7 @@ export default {
width: 100% !important;
.el-form-item__content {
padding-left: 3.75rem;
// padding-left: 3.75rem;
}
}
}
......
applications/dee-mes/src/privateComponents/components/JobResponseInTestProcess/component/equipmenCheckNo.vue
View file @ ced04935
......@@ -7,14 +7,16 @@
<template>
<div class="equipmen-checkNo">
<dee-tools :tools="tools" mode="normal" style="flex-direction: row-reverse;margin-bottom: 12px;" />
<el-form
ref="form"
:model="form"
:rules="formRules"
>
<el-form ref="form" :model="form" :rules="formRules">
<el-col :span="8">
<el-form-item label-width="100px" label="验收单号" prop="testNo">
<el-input v-model="form.testNo" placeholder="请输入验收单号" :disabled="subTypeNameDisabled" clearable onchange="this.value=this.value.toUpperCase()" />
<el-input
v-model="form.testNo"
placeholder="请输入验收单号"
:disabled="subTypeNameDisabled"
clearable
onchange="this.value=this.value.toUpperCase()"
/>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -41,29 +43,17 @@
</el-col>
<el-col :span="8">
<el-form-item label-width="100px" label=" 保证期">
<el-input
v-model="form.guaranteePeriod"
clearable
placeholder="请输入保证期"
/>
<el-input v-model="form.guaranteePeriod" clearable placeholder="请输入保证期" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label-width="100px" label=" 首翻期">
<el-input
v-model="form.firstTurnPeriod"
clearable
placeholder="请输入首翻期"
/>
<el-input v-model="form.firstTurnPeriod" clearable placeholder="请输入首翻期" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label-width="100px" label=" 总寿命">
<el-input
v-model="form.totalLife"
clearable
placeholder="请输入总寿命"
/>
<el-input v-model="form.totalLife" clearable placeholder="请输入总寿命" />
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -74,7 +64,14 @@
<el-col :span="8">
<el-form-item label-width="100px" label="重量">
<!-- <el-input v-model="form.weight" placeholder="请输入重量" /> -->
<el-input v-model="form.weight" clearable type="number" placeholder="请输入重量" onkeyup="this.value=this.value.replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3');" onafterpaste="this.value=this.value.replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3');">
<el-input
v-model="form.weight"
clearable
type="number"
placeholder="请输入重量"
onkeyup="this.value=this.value.replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3');"
onafterpaste="this.value=this.value.replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3');"
>
<template slot="append">Kg</template>
</el-input>
</el-form-item>
......@@ -126,7 +123,7 @@
clearable
:min="0"
placeholder="不合格数"
:disabled="form.isPass!=='N'"
:disabled="form.isPass !== 'N'"
/>
</el-form-item>
</el-col>
......@@ -347,14 +344,20 @@ export default {
})
})
},
savePDF() {}
savePDF() {
this.$api.apiDownloadFile(`JobResponseInTest/download/pdf?id=${this.basicData.id}&billType=AirEquipment`)
}
}
}
</script>
<style lang='scss'>
.equipmen-checkNo{
.el-select{
width: 100%;
}
.equipmen-checkNo {
.el-select {
width: 220px
}
.el-input {
width: 220px
}
}
</style>
applications/dee-mes/src/privateComponents/components/JobResponseInTestProcess/component/materialCheckNo.vue
View file @ ced04935
......@@ -5,16 +5,11 @@
* @FilePath: applications/dee-mes/src/privateComponents/components/JobResponseInTestProcess/component/materialCheckNo.vue
*/
<template>
<div class="check-no">
<div class="material-checkNo">
<dee-tools :tools="tools" mode="normal" style="flex-direction: row-reverse;margin-bottom: 12px;" />
<el-form
ref="form"
:model="form"
class="checkNo-container"
:rules="formRules"
>
<el-form ref="form" :model="form" class="checkNo-container" :rules="formRules">
<el-col :span="8">
<el-form-item label="验收单号" label-width="100px" prop="testNo">
<el-form-item label="验收单号" label-width="130px" prop="testNo">
<el-input
v-model="form.testNo"
placeholder="请输入验收单号"
......@@ -25,7 +20,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label=" 封装期" label-width="100px">
<el-form-item label=" 封装期" label-width="130px">
<el-date-picker
v-model="form.maskPeriod"
clearable
......@@ -36,7 +31,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label=" 保质期/贮存期" label-width="100px">
<el-form-item label=" 保质期/贮存期" label-width="130px">
<el-date-picker
v-model="form.qualityPeriod"
clearable
......@@ -47,7 +42,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label=" 最长期" label-width="100px">
<el-form-item label=" 最长期" label-width="130px">
<el-date-picker
v-model="form.longPeriod"
clearable
......@@ -58,7 +53,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label=" 抽查期" label-width="100px">
<el-form-item label=" 抽查期" label-width="130px">
<el-input
v-model="form.spotCheckPeriod"
clearable
......@@ -71,13 +66,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="性能复验" label-width="100px">
<el-select
v-model="form.isPerformRetest"
clearable
placeholder="请选择"
disabled
>
<el-form-item label="性能复验" label-width="130px">
<el-select v-model="form.isPerformRetest" clearable placeholder="请选择" disabled>
<el-option label="是" :value="true" />
<el-option label="否" :value="false" />
</el-select>
......@@ -85,94 +75,76 @@
</el-form-item>
</el-col>
<el-col v-if="form.isPerformRetest" :span="24">
<div class="radio-input experiment">
<el-col :span="8">
<!-- <span>报告单号:</span> -->
<el-form-item label="报告单号" label-width="100px">
<el-input
v-model="form.reportNo"
clearable
placeholder="报告单号"
:disabled="true"
/>
<el-form-item label="报告单号" label-width="130px">
<el-input v-model="form.reportNo" clearable placeholder="报告单号" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="8">
<!-- 是否合格 -->
<el-form-item label="是否合格" label-width="100px">
<el-select
v-model="form.reportNoIsPass"
clearable
placeholder="请选择"
disabled
>
<el-form-item label="是否合格" label-width="130px">
<el-select v-model="form.reportNoIsPass" clearable placeholder="请选择" disabled>
<el-option label="合格" value="Y" />
<el-option label="不合格" value="N" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<!-- 是否报废 -->
<el-form-item label="是否报废" label-width="100px">
<el-select
v-model="form.isDestroy"
clearable
placeholder="请选择"
disabled
>
<el-form-item label="是否报废" label-width="130px">
<el-select v-model="form.isDestroy" clearable placeholder="请选择" disabled>
<el-option label="是" :value="true" />
<el-option label="否" :value="false" />
</el-select>
</el-form-item>
</el-form-item></el-col>
<el-col :span="8">
<!-- 报废数量 -->
<el-form-item label="试验数量" label-width="100px">
<el-input
v-model="form.experimentAmount"
clearable
placeholder="试验数量"
:disabled="true"
/>
<el-form-item label="试验数量" label-width="130px">
<el-input v-model="form.experimentAmount" clearable placeholder="试验数量" :disabled="true" />
</el-form-item>
</div>
</el-col>
<el-col :span="8">
<el-form-item label="附件" label-width="130px">
<el-popover
placement="bottom"
width="800"
trigger="click"
>
<upload-files ref="chemical" v-model="form.chemicalObjFileLinks" :view-or-edit="'view'" />
<el-button slot="reference">查看附件</el-button>
</el-popover>
</el-form-item>
</el-col>
</el-col>
<el-col :span="8">
<el-form-item label="质量证明文件" label-width="100px">
<el-select
v-model="form.qualityCert"
clearable
placeholder="请选择"
>
<el-form-item label="质量证明文件" label-width="130px">
<el-select v-model="form.qualityCert" clearable placeholder="请选择">
<el-option label="合格" value="Y" />
<el-option label="不合格" value="N" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="标识检查" label-width="100px">
<el-select
v-model="form.flagCheck"
clearable
placeholder="请选择"
>
<el-form-item label="标识检查" label-width="130px">
<el-select v-model="form.flagCheck" clearable placeholder="请选择">
<el-option label="合格" value="Y" />
<el-option label="不合格" value="N" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="外观质量检查" label-width="120px">
<el-select
v-model="form.performCheck"
clearable
placeholder="请选择"
>
<el-form-item label="外观质量检查" label-width="130px">
<el-select v-model="form.performCheck" clearable placeholder="请选择">
<el-option label="合格" value="Y" />
<el-option label="不合格" value="N" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="尺寸检验" label-width="100px">
<el-select
v-model="form.isSizeCheck"
clearable
placeholder="请选择"
>
<el-form-item label="尺寸检验" label-width="130px">
<el-select v-model="form.isSizeCheck" clearable placeholder="请选择">
<el-option label="是" :value="true" />
<el-option label="否" :value="false" />
</el-select>
......@@ -180,37 +152,24 @@
</el-col>
<el-col v-if="form.isSizeCheck" :span="8">
<div class="radio-input">
<el-form-item label="抽样数" label-width="100px">
<el-input-number
v-model="form.sampleAmount"
clearable
:min="0"
placeholder="抽样数量"
/>
<el-form-item label="抽样数" label-width="130px">
<el-input-number v-model="form.sampleAmount" clearable :min="0" placeholder="抽样数量" />
</el-form-item>
</div>
</el-col>
<el-col :span="8">
<el-form-item label="检验依据" label-width="100px">
<el-input
v-model="form.checkBill"
clearable
placeholder="请输入检验依据"
/>
<el-form-item label="检验依据" label-width="130px">
<el-input v-model="form.checkBill" clearable placeholder="请输入检验依据" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注" label-width="100px">
<el-form-item label="备注" label-width="130px">
<el-input v-model="form.remark" clearable placeholder="备注" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="处理方式" label-width="100px">
<el-select
v-model="form.disposeType"
clearable
placeholder="请选择"
>
<el-form-item label="处理方式" label-width="130px">
<el-select v-model="form.disposeType" clearable placeholder="请选择">
<el-option label="原样使用" value="OriginalSampleTest" />
<el-option label="报废" value="Scrap" />
<el-option label="返修" value="Rework" />
......@@ -221,16 +180,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item
label="是否合格"
prop="isPass"
label-width="100px"
>
<el-select
v-model="form.isPass"
clearable
placeholder="请选择"
>
<el-form-item label="是否合格" prop="isPass" label-width="130px">
<el-select v-model="form.isPass" clearable placeholder="请选择">
<el-option label="合格" value="Y" />
<el-option label="不合格" value="N" />
</el-select>
......@@ -238,64 +189,42 @@
</el-col>
<el-col :span="8">
<div class="radio-input">
<el-form-item
label="不合格数"
label-width="100px"
prop="noPassAmount"
>
<el-form-item label="不合格数" label-width="130px" prop="noPassAmount">
<el-input-number
v-model="form.noPassAmount"
clearable
:min="0"
placeholder="不合格数"
:disabled="form.isPass!=='N'"
:disabled="form.isPass !== 'N'"
/>
</el-form-item>
</div>
</el-col>
<el-col :span="8">
<el-form-item label="是否封闭" label-width="100px">
<el-select
v-model="form.isClosure"
clearable
placeholder="请选择"
>
<el-form-item label="是否封闭" label-width="130px">
<el-select v-model="form.isClosure" clearable placeholder="请选择">
<el-option label="是" :value="true" />
<el-option label="否" :value="false" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item
label="不合格品审理单号"
label-width="130px"
>
<el-input
v-model="form.noPassReviewNo"
clearable
placeholder="请输入不合格品审理单号"
/>
<el-form-item label="不合格品审理单号" label-width="130px">
<el-input v-model="form.noPassReviewNo" clearable placeholder="请输入不合格品审理单号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="超期复验报告" label-width="100px">
<el-input
v-model="form.overdueReport"
clearable
placeholder="请输入超期复验报告编号"
/>
<el-form-item label="超期复验报告" label-width="130px">
<el-input v-model="form.overdueReport" clearable placeholder="请输入超期复验报告编号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label=" 结论" label-width="100px">
<el-input
v-model="form.conclusion"
placeholder="请输入复验报告结论"
/>
<el-form-item label=" 结论" label-width="130px">
<el-input v-model="form.conclusion" placeholder="请输入复验报告结论" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label=" 延期到" label-width="100px">
<el-form-item label=" 延期到" label-width="130px">
<el-date-picker
v-model="form.delayTo"
clearable
......@@ -307,65 +236,30 @@
</el-col>
<!-- 表格区域 -->
<el-col :span="24">
<el-form-item label="尺寸检验项目" label-width="100px">
<el-form-item label="尺寸检验项目" label-width="130px">
<el-col :span="3">
<el-input
v-model="jobTestCheckItems[0].itemDescription"
clearable
type="text"
placeholder="录入"
/>
<el-input v-model="jobTestCheckItems[0].itemDescription" clearable type="text" placeholder="录入" />
</el-col>
<el-col :span="3">
<el-input
v-model="jobTestCheckItems[1].itemDescription"
clearable
type="text"
placeholder="录入"
/>
<el-input v-model="jobTestCheckItems[1].itemDescription" clearable type="text" placeholder="录入" />
</el-col>
<el-col :span="3">
<el-input
v-model="jobTestCheckItems[2].itemDescription"
clearable
type="text"
placeholder="录入"
/>
<el-input v-model="jobTestCheckItems[2].itemDescription" clearable type="text" placeholder="录入" />
</el-col>
<el-col :span="3">
<el-input
v-model="jobTestCheckItems[3].itemDescription"
clearable
type="text"
placeholder="录入"
/>
<el-input v-model="jobTestCheckItems[3].itemDescription" clearable type="text" placeholder="录入" />
</el-col>
<el-col :span="3">
<el-input
v-model="jobTestCheckItems[4].itemDescription"
clearable
type="text"
placeholder="录入"
/>
<el-input v-model="jobTestCheckItems[4].itemDescription" clearable type="text" placeholder="录入" />
</el-col>
<el-col :span="3">
<el-input
v-model="jobTestCheckItems[5].itemDescription"
clearable
type="text"
placeholder="录入"
/>
<el-input v-model="jobTestCheckItems[5].itemDescription" clearable type="text" placeholder="录入" />
</el-col>
<el-col :span="3">
<el-input
v-model="jobTestCheckItems[6].itemDescription"
clearable
type="text"
placeholder="录入"
/>
<el-input v-model="jobTestCheckItems[6].itemDescription" clearable type="text" placeholder="录入" />
</el-col>
</el-form-item>
<el-form-item label="要求尺寸" label-width="100px">
<el-form-item label="要求尺寸" label-width="130px">
<el-col :span="3">
<el-input
v-model="jobTestCheckItems[0].jobTestCheckItemDetails[0].checkvalue"
......@@ -423,7 +317,7 @@
/>
</el-col>
</el-form-item>
<el-form-item label="实测尺寸" label-width="100px">
<el-form-item label="实测尺寸" label-width="130px">
<el-col :span="3">
<el-input
v-model="jobTestCheckItems[0].jobTestCheckItemDetails[1].checkvalue"
......@@ -481,7 +375,7 @@
/>
</el-col>
</el-form-item>
<el-form-item label="量具编号" label-width="100px">
<el-form-item label="量具编号" label-width="130px">
<el-col :span="3">
<el-input
v-model="jobTestCheckItems[0].jobTestCheckItemDetails[2].checkvalue"
......@@ -541,7 +435,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="入场验收问题描述" label-width="120px">
<el-form-item label="入场验收问题描述" label-width="130px">
<el-input
v-model="form.acceptanceProblem"
type="textarea"
......@@ -550,11 +444,11 @@
:autosize="{ minRows: 9, maxRows: 10 }"
placeholder="入场验收问题描述"
/>
<!-- 相关单位意见 -->
<!-- 相关单位意见 -->
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="相关单位意见" label-width="120px">
<el-form-item label="相关单位意见" label-width="130px">
<el-input
v-model="form.relevantOpinions"
type="textarea"
......@@ -566,24 +460,21 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="检验备注" label-width="120px">
<el-input
v-model="form.checkRemark"
clearable
type="textarea"
placeholder="检验备注"
resize="none"
/>
<el-form-item label="检验备注" label-width="130px">
<el-input v-model="form.checkRemark" clearable type="textarea" placeholder="检验备注" resize="none" />
</el-form-item>
</el-col>
<el-col :span="24">
<upload-files v-model="form.objFileLinks" />
<el-form-item label-width="130px">
<upload-files v-model="form.objFileLinks" />
</el-form-item>
</el-col>
</el-form>
</div>
</template>
<script>
import UploadFiles from './UploadFiles.vue'
import { post } from '@/utils/http'
export default {
components: { UploadFiles },
......@@ -667,7 +558,9 @@ export default {
delayTo: '',
checkRemark: '',
// 上传附件
objFileLinks: []
objFileLinks: [],
// 理化附件
chemicalObjFileLinks: []
},
// 尺寸检验项目
jobTestCheckItems: [
......@@ -871,6 +764,16 @@ export default {
deep: true,
immediate: true
}
// 'form.isPerformRetest': {
// handler: function(v) {
// console.log('v', v)
// if (v) {
// this.getChemicalData(this.basicData.id)
// }
// },
// deep: true,
// immediate: true
// }
// form: {
// handler: function(v) {
// this.form
......@@ -893,8 +796,72 @@ export default {
)
this.jobTestCheckItems = this.form.jobTestCheckItems
}
if (this.form.isPerformRetest) {
this.getChemicalData(this.basicData.id)
}
},
methods: {
getChemicalData(id) {
const param = {
'pageFrom': 1,
'pageSize': 10,
'searchItems': {
'children': [
{
'items': [
{
'fieldName': 'jobOrderId',
'operator': 'EQ',
'value': id
},
{
'fieldName': 'subTypeName',
'operator': 'EQ',
'value': 'JobResponseInExperment'
}
],
'operator': 'AND'
}
],
'items': [],
'operator': 'AND'
},
'openProps': [
{
'name': 'objFileLinks',
'openProps': [
{ 'name': 'target' }
]
},
{
'name': 'jobOrder',
'openProps': [
{ 'name': 'purchaseUnit' }
]
}
],
'sortItem': [
{
'fieldName': 'modifyTime',
'sortOrder': 'desc'
}
]
}
post('JobResponseInStorage/search', param).then(res => {
// this.data = res.items.content[0]
const data = res.items.content[0]
this.form = {
...this.form,
reportNo: data.reportNo,
reportNoIsPass: data.isPass,
isDestroy: data.isDestroy,
experimentAmount: data.experimentAmount,
chemicalObjFileLinks: data.objFileLinks
}
}).catch((err) => {
console.log(err)
})
},
// onSubmit() {
// console.log('this', this)
// const params = {
......@@ -907,10 +874,9 @@ export default {
// })
// },
savePDF() {
console.log('this', this.$store.state.globalUploader.openUploader)
console.log('this', this.$store.state.globalUploader.activeLoad)
this.$api.apiDownloadFile(`JobResponseInTest/download/pdf?id=${this.basicData.id}&billType=Material`)
},
viewDialog() {},
viewDialog() { },
onSubmit() {
const params = {
...this.form,
......@@ -941,4 +907,12 @@ export default {
}
</script>
<style lang='scss'>
.material-checkNo {
.el-select {
width: 220px
}
.el-input {
width: 220px
}
}
</style>
applications/dee-mes/src/privateComponents/components/JobResponseInTestProcess/component/outSourceCheckNo.vue
View file @ ced04935
......@@ -316,9 +316,19 @@ export default {
})
})
},
savePDF() {}
savePDF() {
this.$api.apiDownloadFile(`JobResponseInTest/download/pdf?id=${this.basicData.id}&billType=OutSource`)
}
}
}
</script>
<style lang='scss'>
.outSource-checkNo{
.el-select {
width: 220px
}
.el-input {
width: 220px
}
}
</style>
applications/dee-mes/src/privateComponents/components/JobResponseInTestProcess/index.vue
View file @ ced04935
......@@ -123,6 +123,7 @@ export default {
]
}
post('JobResponseInTest/search', param).then(res => {
console.log('data', res)
const data = res.items.content[0]
this.data = data
this.type = type
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment