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

2023-11-06 设备和质量修改3

java8
杨奉源 2 years ago
parent
a9d5c23e1f
commit
1de52d8f90
3 changed files with 64 additions and 39 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. 34
      src/views/modules/qc/FAIResultEntry.vue
  2. 34
      src/views/modules/qc/FQCResultEntry.vue
  3. 35
      src/views/modules/qc/IPQCResultEntry.vue

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

@ -165,7 +165,7 @@
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="工序" prop="operationDesc" :rules="rules.operationDescType">
<el-select v-model="modalData.operationDesc" @change="getResourceList()" placeholder="请选择" style="width: 221px">
<el-select v-model="modalData.operationDesc" placeholder="请选择" style="width: 221px">
<el-option
v-for = "i in operationList"
:key = "i.operationNo"
@ -175,14 +175,15 @@
</el-select>
</el-form-item>
<el-form-item v-if="this.modalData.specialTaskFlag !== 'Y'" label="机台" prop="resourceId" :rules="rules.resourceIdType">
<el-select v-model="modalData.resourceDesc" placeholder="请选择" style="width: 221px">
<el-option
v-for = "i in resourceList"
:key = "i.resourceId"
:label = "i.resourceDesc"
:value = "i.resourceId">
</el-option>
</el-select>
<!-- <el-select v-model="modalData.resourceDesc" placeholder="请选择" style="width: 221px">-->
<!-- <el-option-->
<!-- v-for = "i in resourceList"-->
<!-- :key = "i.resourceId"-->
<!-- :label = "i.resourceDesc"-->
<!-- :value = "i.resourceId">-->
<!-- </el-option>-->
<!-- </el-select>-->
<el-input v-model="modalData.resourceDesc" style="width: 221px"></el-input>
</el-form-item>
<el-form-item v-if="this.modalData.specialTaskFlag === 'Y'" prop="resourceId" :rules="rules.resourceIdType">
<span slot="label" @click="getBaseList(205)"><a herf="#">机台</a></span>
@ -1367,7 +1368,7 @@
this.modalData.seqNo = item.seqNo
this.modalData.orderNo = item.orderNo
this.getOperationList()
this.getPartList()
//this.getPartList()
},
// 获取处置措施列表
@ -1419,7 +1420,7 @@
this.modalData.operationDesc = ''
this.modalData.resourceId = ''
this.getOperationList()
this.getPartList()
//this.getPartList()
}
if (this.tagNo === 205) {
this.modalData.resourceId = val.resource_id
@ -1455,7 +1456,7 @@
} else {
getResourceList(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.resourceList = data.rows
//this.resourceList = data.rows
this.modalData.workCenterNo = data.rows[0].workCenterNo
this.modalData.resourceId = data.rows[0].resourceId
this.modalData.resourceDesc = data.rows[0].resourceDesc
@ -1474,7 +1475,14 @@
if (data && data.code === 0) {
this.operationList = data.rows
this.modalData.operationDesc = data.rows[0].operationDesc
this.getResourceList()
//this.getResourceList()
this.modalData.workCenterNo = data.rows[0].workCenterNo
this.modalData.resourceId = data.rows[0].resourceId
this.modalData.resourceDesc = data.rows[0].resourceDesc
this.modalData.partNo = data.rows[0].partNo
this.modalData.partDesc = data.rows[0].partDesc
this.modalData.spec = data.rows[0].spec
this.modalData.sku = data.rows[0].sku
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'

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

@ -163,7 +163,7 @@
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="工序" prop="operationDesc" :rules="rules.operationDescType">
<el-select v-model="modalData.operationDesc" @change="getResourceList()" placeholder="请选择" style="width: 221px">
<el-select v-model="modalData.operationDesc" placeholder="请选择" style="width: 221px">
<el-option
v-for = "i in operationList"
:key = "i.operationNo"
@ -173,14 +173,15 @@
</el-select>
</el-form-item>
<el-form-item v-if="this.modalData.specialTaskFlag !== 'Y'" label="机台" prop="resourceId" :rules="rules.resourceIdType">
<el-select v-model="modalData.resourceDesc" placeholder="请选择" style="width: 221px">
<el-option
v-for = "i in resourceList"
:key = "i.resourceId"
:label = "i.resourceDesc"
:value = "i.resourceId">
</el-option>
</el-select>
<!-- <el-select v-model="modalData.resourceDesc" placeholder="请选择" style="width: 221px">-->
<!-- <el-option-->
<!-- v-for = "i in resourceList"-->
<!-- :key = "i.resourceId"-->
<!-- :label = "i.resourceDesc"-->
<!-- :value = "i.resourceId">-->
<!-- </el-option>-->
<!-- </el-select>-->
<el-input v-model="modalData.resourceDesc" style="width: 221px"></el-input>
</el-form-item>
<el-form-item v-if="this.modalData.specialTaskFlag === 'Y'" prop="resourceId" :rules="rules.resourceIdType">
<span slot="label" @click="getBaseList(205)"><a herf="#">机台</a></span>
@ -1364,7 +1365,7 @@
this.modalData.seqNo = item.seqNo
this.modalData.orderNo = item.orderNo
this.getOperationList()
this.getPartList()
//this.getPartList()
},
// 获取处置措施列表
@ -1416,7 +1417,7 @@
this.modalData.operationDesc = ''
this.modalData.resourceId = ''
this.getOperationList()
this.getPartList()
//this.getPartList()
}
if (this.tagNo === 205) {
this.modalData.resourceId = val.resource_id
@ -1452,7 +1453,7 @@
} else {
getResourceList(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.resourceList = data.rows
//this.resourceList = data.rows
this.modalData.workCenterNo = data.rows[0].workCenterNo
this.modalData.resourceId = data.rows[0].resourceId
this.modalData.resourceDesc = data.rows[0].resourceDesc
@ -1471,7 +1472,14 @@
if (data && data.code === 0) {
this.operationList = data.rows
this.modalData.operationDesc = data.rows[0].operationDesc
this.getResourceList()
//this.getResourceList()
this.modalData.workCenterNo = data.rows[0].workCenterNo
this.modalData.resourceId = data.rows[0].resourceId
this.modalData.resourceDesc = data.rows[0].resourceDesc
this.modalData.partNo = data.rows[0].partNo
this.modalData.partDesc = data.rows[0].partDesc
this.modalData.spec = data.rows[0].spec
this.modalData.sku = data.rows[0].sku
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'

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

@ -173,7 +173,7 @@
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="工序" prop="operationDesc" :rules="rules.operationDescType">
<el-select v-model="modalData.operationDesc" @change="getResourceList()" placeholder="请选择" style="width: 221px">
<el-select v-model="modalData.operationDesc" placeholder="请选择" style="width: 221px">
<el-option
v-for = "i in operationList"
:key = "i.operationNo"
@ -181,16 +181,18 @@
:value = "i.operationDesc">
</el-option>
</el-select>
<!-- <el-input v-model="modalData.operationDesc" style="width: 221px"></el-input>-->
</el-form-item>
<el-form-item v-if="this.modalData.specialTaskFlag !== 'Y'" label="机台" prop="resourceId" :rules="rules.resourceIdType">
<el-select v-model="modalData.resourceDesc" placeholder="请选择" style="width: 221px">
<el-option
v-for = "i in resourceList"
:key = "i.resourceId"
:label = "i.resourceDesc"
:value = "i.resourceId">
</el-option>
</el-select>
<!-- <el-select v-model="modalData.resourceDesc" placeholder="请选择" style="width: 221px">-->
<!-- <el-option-->
<!-- v-for = "i in resourceList"-->
<!-- :key = "i.resourceId"-->
<!-- :label = "i.resourceDesc"-->
<!-- :value = "i.resourceId">-->
<!-- </el-option>-->
<!-- </el-select>-->
<el-input v-model="modalData.resourceDesc" style="width: 221px"></el-input>
</el-form-item>
<el-form-item v-if="this.modalData.specialTaskFlag === 'Y'" prop="resourceId" :rules="rules.resourceIdType">
<span slot="label" @click="getBaseList(205)"><a herf="#">机台</a></span>
@ -1414,7 +1416,7 @@
this.modalData.seqNo = item.seqNo
this.modalData.orderNo = item.orderNo
this.getOperationList()
this.getPartList()
//this.getPartList()
},
// 获取处置措施列表
@ -1591,7 +1593,7 @@
this.modalData.operationDesc = ''
this.modalData.resourceId = ''
this.getOperationList()
this.getPartList()
//this.getPartList()
}
if (this.tagNo === 205) {
this.modalData.resourceId = val.resource_id
@ -1625,7 +1627,14 @@
if (data && data.code === 0) {
this.operationList = data.rows
this.modalData.operationDesc = data.rows[0].operationDesc
this.getResourceList()
//this.getResourceList()
this.modalData.workCenterNo = data.rows[0].workCenterNo
this.modalData.resourceId = data.rows[0].resourceId
this.modalData.resourceDesc = data.rows[0].resourceDesc
this.modalData.partNo = data.rows[0].partNo
this.modalData.partDesc = data.rows[0].partDesc
this.modalData.spec = data.rows[0].spec
this.modalData.sku = data.rows[0].sku
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
@ -1642,7 +1651,7 @@
} else {
getResourceList(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.resourceList = data.rows
//this.resourceList = data.rows
this.modalData.workCenterNo = data.rows[0].workCenterNo
this.modalData.resourceId = data.rows[0].resourceId
this.modalData.resourceDesc = data.rows[0].resourceDesc

Write Preview
Loading…
Cancel
Save