wilson
/
xujiecloud-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2024-06-07 

功能优化
java8
fengyuan_yang 2 years ago
parent
33abd4a76a
commit
e2e10b5aca
5 changed files with 103 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 37
      src/views/modules/qc/FAIResultEntry.vue
  2. 38
      src/views/modules/qc/FQCResultEntry.vue
  3. 49
      src/views/modules/qc/IPQCResultEntry.vue
  4. 10
      src/views/modules/qc/IQCResultEntry.vue
  5. 45
      src/views/modules/qc/qcItem.vue

37
src/views/modules/qc/FAIResultEntry.vue
View File

@ -32,6 +32,22 @@
<el-form-item :label="'物料名称'">
<el-input v-model="searchData.partDesc" clearable style="width: 200px"></el-input>
</el-form-item>
<el-form-item :label="'检验结论'">
<el-select v-model="searchData.inspectionResult" clearable style="width: 80px">
<el-option label="合格" value="合格"></el-option>
<el-option label="不合格" value="不合格"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'处置措施'">
<el-select v-model="searchData.disposalMeasures" clearable style="width: 90px">
<el-option
v-for = "i in disposalMeasuresOptions"
:key = "i.id"
:label = "i.disposalMeasures"
:value = "i.disposalMeasures">
</el-option>
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
<el-form-item :label="'PN'">
@ -47,29 +63,13 @@
<el-input v-model="searchData.operationDesc" clearable style="width: 108px"></el-input>
</el-form-item>
<el-form-item :label="'状态'">
<el-select v-model="searchData.state" clearable style="width: 80px">
<el-select v-model="searchData.states" multiple style="width:340px">
<el-option label="未开始" value="未开始"></el-option>
<el-option label="待检验" value="待检验"></el-option>
<el-option label="待审核" value="待审核"></el-option>
<el-option label="已完成" value="已完成"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'检验结论'">
<el-select v-model="searchData.inspectionResult" clearable style="width: 80px">
<el-option label="合格" value="合格"></el-option>
<el-option label="不合格" value="不合格"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'处置措施'">
<el-select v-model="searchData.disposalMeasures" clearable style="width: 90px">
<el-option
v-for = "i in disposalMeasuresOptions"
:key = "i.id"
:label = "i.disposalMeasures"
:value = "i.disposalMeasures">
</el-option>
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
<el-form-item :label="'送检日期'">
@ -939,7 +939,7 @@
site: '',
userName: this.$store.state.user.name,
inspectionNo: '',
state: '待检验',
state: '',
inspectionResult: '',
orderNo: '',
operationDesc: '',
@ -956,6 +956,7 @@
page: 1,
limit: 10,
seqNo: '',
states: ['未开始','待检验'],
},
pageIndex: 1,
pageSize: 20,

38
src/views/modules/qc/FQCResultEntry.vue
View File

@ -32,7 +32,22 @@
<el-form-item :label="'物料名称'">
<el-input v-model="searchData.partDesc" clearable style="width: 200px"></el-input>
</el-form-item>
<el-form-item :label="'检验结论'">
<el-select v-model="searchData.inspectionResult" clearable style="width: 80px">
<el-option label="合格" value="合格"></el-option>
<el-option label="不合格" value="不合格"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'处置措施'">
<el-select v-model="searchData.disposalMeasures" clearable style="width: 90px">
<el-option
v-for = "i in disposalMeasuresOptions"
:key = "i.id"
:label = "i.disposalMeasures"
:value = "i.disposalMeasures">
</el-option>
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
@ -49,29 +64,13 @@
<el-input v-model="searchData.operationDesc" clearable style="width: 108px"></el-input>
</el-form-item>
<el-form-item :label="'状态'">
<el-select v-model="searchData.state" clearable style="width: 80px">
<el-select v-model="searchData.states" multiple style="width: 340px">
<el-option label="未开始" value="未开始"></el-option>
<el-option label="待检验" value="待检验"></el-option>
<el-option label="待审核" value="待审核"></el-option>
<el-option label="已完成" value="已完成"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'检验结论'">
<el-select v-model="searchData.inspectionResult" clearable style="width: 80px">
<el-option label="合格" value="合格"></el-option>
<el-option label="不合格" value="不合格"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'处置措施'">
<el-select v-model="searchData.disposalMeasures" clearable style="width: 90px">
<el-option
v-for = "i in disposalMeasuresOptions"
:key = "i.id"
:label = "i.disposalMeasures"
:value = "i.disposalMeasures">
</el-option>
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
<el-form-item :label="'送检日期'">
@ -933,7 +932,8 @@
disposalMeasures: '',
page: 1,
limit: 10,
seqNo: ''
seqNo: '',
states: ['未开始','待检验'],
},
pageIndex: 1,
pageSize: 20,

49
src/views/modules/qc/IPQCResultEntry.vue
View File

@ -32,28 +32,6 @@
<el-form-item :label="'物料名称'">
<el-input v-model="searchData.partDesc" clearable style="width: 200px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
<el-form-item :label="'PN'">
<el-input v-model="searchData.cinvSourceCode" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'工单号'">
<el-input v-model="searchData.orderNo" clearable style="width: 137px"></el-input>
</el-form-item>
<el-form-item :label="'派工单号'">
<el-input v-model="searchData.seqNo" clearable style="width: 167px"></el-input>
</el-form-item>
<el-form-item :label="'工序'">
<el-input v-model="searchData.operationDesc" clearable style="width: 108px"></el-input>
</el-form-item>
<el-form-item :label="'状态'">
<el-select v-model="searchData.state" clearable style="width: 80px">
<el-option label="未开始" value="未开始"></el-option>
<el-option label="待检验" value="待检验"></el-option>
<el-option label="待审核" value="待审核"></el-option>
<el-option label="已完成" value="已完成"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'检验结论'">
<el-select v-model="searchData.inspectionResult" clearable style="width: 80px">
<el-option label="合格" value="合格"></el-option>
@ -79,6 +57,28 @@
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
<el-form-item :label="'PN'">
<el-input v-model="searchData.cinvSourceCode" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'工单号'">
<el-input v-model="searchData.orderNo" clearable style="width: 137px"></el-input>
</el-form-item>
<el-form-item :label="'派工单号'">
<el-input v-model="searchData.seqNo" clearable style="width: 167px"></el-input>
</el-form-item>
<el-form-item :label="'工序'">
<el-input v-model="searchData.operationDesc" clearable style="width: 108px"></el-input>
</el-form-item>
<el-form-item :label="'状态'">
<el-select v-model="searchData.states" multiple style="width: 340px">
<el-option label="未开始" value="未开始"></el-option>
<el-option label="待检验" value="待检验"></el-option>
<el-option label="待审核" value="待审核"></el-option>
<el-option label="已完成" value="已完成"></el-option>
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
<el-form-item :label="'送检日期'">
<el-date-picker style="width: 160px" v-model="searchData.startDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
@ -936,7 +936,7 @@
site: '',
userName: this.$store.state.user.name,
inspectionNo: '',
state: '待检验',
state: '',
inspectionResult: '',
orderNo: '',
operationDesc: '',
@ -953,7 +953,8 @@
disposalMeasures: '',
page: 1,
limit: 10,
seqNo: ''
seqNo: '',
states: ['未开始','待检验'],
},
pageIndex: 1,
pageSize: 20,

10
src/views/modules/qc/IQCResultEntry.vue
View File

@ -50,7 +50,7 @@
<el-input v-model="searchData.inspectorName" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'状态'">
<el-select v-model="searchData.state" clearable style="width: 80px">
<el-select v-model="searchData.states" multiple style="width: 340px">
<el-option label="未开始" value="未开始"></el-option>
<el-option label="待检验" value="待检验"></el-option>
<el-option label="待审核" value="待审核"></el-option>
@ -648,7 +648,7 @@
partDesc:'',
cinvSourceCode:'',
sku:'',
state: '待检验',
state: '',
inspectionResult: '',
supplierDesc: '',
disposalMeasures: '',
@ -657,7 +657,8 @@
limit: 10,
poOrderNo: '',
poItemNo: '',
orderType: ''
orderType: '',
states: ['未开始','待检验'],
},
pageIndex: 1,
pageSize: 20,
@ -1635,7 +1636,6 @@
duration: 1500
})
}
console.log(this.acquisitionList)
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
@ -2042,6 +2042,8 @@
getDataList () {
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
//this.searchData.state = this.searchData.state.join(',')
console.log(this.searchData.states)
qcIQCInspectionSearch(this.searchData).then(({data}) => {
if (data.code === 0) {
this.dataList = data.page.list

45
src/views/modules/qc/qcItem.vue
View File

@ -171,14 +171,6 @@
<el-input v-model="modalData.samplingLevelDesc" disabled style="width: 300px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="抽样数量">
<el-input v-model="modalData.itemSamplingQuantity" type="number" style="width: 143px"></el-input>
</el-form-item>
<el-form-item label="抽样比例%">
<el-input v-model="modalData.defaultSamplingProportion" type="number" style="width: 143px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="参照值">
<el-input v-model="modalData.defaultValue" style="width: 143px"></el-input>
@ -192,6 +184,31 @@
<el-input v-if="modalData.valueTypeDb === 'N'" v-model="modalData.minValue" type="number" style="width: 143px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="抽样数量">
<el-input v-model="modalData.itemSamplingQuantity" type="number" style="width: 143px"></el-input>
</el-form-item>
<el-form-item label="抽样比例%">
<el-input v-model="modalData.defaultSamplingProportion" type="number" style="width: 95px"></el-input>
</el-form-item>
<el-form-item label="采集数据来源">
<el-select clearable v-model="modalData.collectionSource" style="width: 105px">
<el-option label="值0" value="value0"></el-option>
<el-option label="值1" value="value1"></el-option>
<el-option label="值2" value="value2"></el-option>
<el-option label="值3" value="value3"></el-option>
<el-option label="值4" value="value4"></el-option>
<el-option label="值5" value="value5"></el-option>
<el-option label="值6" value="value6"></el-option>
<el-option label="值7" value="value7"></el-option>
<el-option label="值8" value="value8"></el-option>
<el-option label="值9" value="value9"></el-option>
</el-select>
</el-form-item>
<el-form-item label=" ">
<el-checkbox v-model="modalData.collectionFlag" true-label="Y">采集标记</el-checkbox>
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-button type="primary" @click="saveData()">保存</el-button>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
@ -343,7 +360,9 @@
samplingProgrammeDesc: '',
samplingLevelNo: '',
samplingLevelDesc: '',
defaultSamplingProportion: ''
defaultSamplingProportion: '',
collectionFlag: '',
collectionSource: ''
},
// 检验项目展示标头
columnList: [
@ -919,7 +938,9 @@
samplingProgrammeDesc: '',
samplingLevelNo: '',
samplingLevelDesc: '',
defaultSamplingProportion: ''
defaultSamplingProportion: '',
collectionFlag: '',
collectionSource: ''
}
this.modalDisableFlag = false
this.modalFlag = true
@ -948,7 +969,9 @@
samplingProgrammeDesc: row.samplingProgrammeDesc,
samplingLevelNo: row.samplingLevelNo,
samplingLevelDesc: row.samplingLevelDesc,
defaultSamplingProportion: row.defaultSamplingProportion
defaultSamplingProportion: row.defaultSamplingProportion,
collectionFlag: row.collectionFlag,
collectionSource: row.collectionSource
}
this.modalDisableFlag = true
this.modalFlag = true

Write Preview
Loading…
Cancel
Save