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

1.修改查询派工单号，状态默认值 

2.存在上传图片，按钮变颜色
3.增加校验 合格数量不能大于送检数量
master
赵宏斌 2 months ago
parent
815bcb8caa
commit
ee18a8e92d
5 changed files with 64 additions and 27 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. 15
      src/views/modules/qc/FAIResultEntry.vue
  2. 15
      src/views/modules/qc/FQCResultEntry.vue
  3. 46
      src/views/modules/qc/IPQCResultEntry.vue
  4. 13
      src/views/modules/qc/IQCResultEntry.vue
  5. 2
      src/views/modules/qc/PQCResultEntry.vue

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

@ -365,7 +365,10 @@
<el-form-item :label="'批次合格数'">
<el-input-number :controls="false" :step="0" min="0" v-model="detailData.batchQualifiedQty" disabled style="width: 85px"></el-input-number>
</el-form-item>
<el-form-item style="margin-top: 13px;margin-left: 450px">
<el-form-item :label="'批次不合格数'">
<el-input-number :controls="false" :step="0" min="0" v-model="detailData.notbatchQualifiedQty" disabled style="width: 85px"></el-input-number>
</el-form-item>
<el-form-item style="margin-top: 13px;margin-left: 360px">
<!-- <el-button v-if="detailData.submitFlag !== 'Y'" :loading="loadFlag" @click="dataAcquisition">-->
<!-- <svg t="1739002700745" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="38076" width="22" height="22"><path d="M922.000696 762.746435V465.363478l55.652174-0.111304v299.542261c0 131.695304-106.562783 239.571478-236.922435 239.571478H285.42887C155.158261 1004.365913 48.484174 896.623304 48.484174 764.794435V465.252174h59.258435v299.542261c0 101.843478 77.022609 179.712 177.775304 179.712H740.841739c100.61913 0 181.158957-79.916522 181.158957-181.76z" fill="#1D293F" p-id="38077"></path><path d="M290.148174 192.556522c20.301913-20.925217 30.47513-48.617739 30.47513-83.099826 0-72.548174-36.285217-108.833391-108.722087-108.833392H141.401043v223.365566h70.255305c32.055652-0.111304 58.167652-10.529391 78.491826-31.432348z m-105.227131-7.635479V39.446261h23.596522c19.70087 0 35.661913 6.166261 47.994435 18.632348 12.354783 12.466087 18.387478 29.740522 18.387478 52.001391 0 22.973217-5.921391 41.22713-17.652869 54.650435s-27.937391 20.190609-48.617739 20.190608H184.921043zM634.434783 595.366957h-84.057044V498.866087a102.511304 102.511304 0 0 0 74.262261-98.54887c0-56.230957-45.478957-102.310957-101.10887-102.310956-55.629913 0-101.086609 46.08-101.086608 102.310956 0 46.08 30.586435 85.25913 72.192 97.947826v96.990609h-81.252174c-16.829217-43.78713-50.688-99.283478-81.65287-143.070609a101.331478 101.331478 0 0 0 14.269218-52.001391c0-56.230957-45.946435-102.310957-102.177392-102.310956s-102.177391 46.08-102.177391 102.310956c0 56.230957 45.946435 102.310957 102.177391 102.310957 15.716174 0 30.72-3.628522 44.009739-10.017392 21.170087 34.326261 42.829913 74.351304 57.811479 102.778435h-73.906087l128.333913 130.493218 94.675478-108.966957v145.853217h-111.616l148.034783 148.858435 130.715826-148.858435h-111.504696v-129.402434l91.180522 92.516174 113.307826-130.248348h-53.203478c14.758957-28.42713 36.173913-68.452174 57.210434-102.800696 13.178435 6.41113 27.937391 10.039652 43.542261 10.039652 55.629913 0 101.086609-46.08 101.086609-102.310956 0-56.230957-45.456696-102.310957-101.086609-102.310957-55.652174 0-101.220174 46.08-101.220174 102.310957a102.4 102.4 0 0 0 14.135653 52.001391c-30.72 43.653565-64.200348 99.283478-80.896 142.937044z m-390.611479-148.48a46.614261 46.614261 0 0 1-46.436174-46.458435c0-25.510957 20.925217-46.436174 46.436174-46.436174s46.436174 20.925217 46.436174 46.436174-20.925217 46.436174-46.436174 46.436174z m279.819131 0c-25.266087 0-45.946435-20.925217-45.946435-46.458435 0-25.510957 20.702609-46.436174 45.968696-46.436174 25.266087 0 45.946435 20.925217 45.946434 46.436174s-20.680348 46.436174-45.946434 46.436174z m278.639304-93.005914c25.288348 0 45.968696 20.925217 45.968696 46.436174s-20.702609 46.436174-45.968696 46.436174c-25.266087 0-45.946435-20.925217-45.946435-46.436174s20.680348-46.436174 45.946435-46.436174zM395.130435 172.722087h74.128695l15.248696 51.155478h47.415652L458.707478 0.623304h-51.155478L332.8 223.98887h47.170783l15.11513-51.266783z m32.768-114.777044c1.825391-6.032696 3.027478-12.332522 3.517217-18.854956h1.202087c0.601043 8.102957 1.691826 14.514087 3.138783 19.456l23.218087 77.401043h-54.405566l23.329392-78.002087z m168.96 165.932522h43.631304V39.446261h58.189913V0.623304h-159.877565v38.956522h58.056348v184.297739z m169.894956-51.155478h74.128696l15.248696 51.155478h47.415652L830.330435 0.623304h-51.155478l-74.752 223.365566h47.193043l15.09287-51.266783z m32.768-114.777044c1.825391-6.032696 3.027478-12.332522 3.517218-18.854956h1.202087c0.601043 8.102957 1.691826 14.514087 3.161043 19.456l23.218087 77.401043h-54.427826l23.329391-78.002087z" fill="#FD9F01" p-id="38078"></path></svg>-->
<!-- </el-button>-->
@ -431,7 +434,8 @@
min-width="90"
label="操作">
<template slot-scope="scope">
<el-button class="el-icon-picture" type="primary" @click="uploadImageModal(scope.row)"></el-button>
<el-button class="el-icon-picture" v-if="scope.row.imageDetailNum > 0" type="success" @click="uploadImageModal(scope.row)"></el-button>
<el-button class="el-icon-picture" v-else type="primary" @click="uploadImageModal(scope.row)"></el-button>
<!-- <el-button style="margin-left: 2px" class="el-icon-s-platform" type="primary" :loading="loadFlag" @click="dataAcquisitionByItem(scope.row)"></el-button>-->
</template>
</el-table-column>
@ -996,6 +1000,7 @@ export default {
} else {
this.detailData.batchQualifiedQty = this.detailData.rollQty
}
this.detailData.notbatchQualifiedQty = this.detailData.rollQty - this.detailData.batchQualifiedQty
}
},
detailList: {
@ -3460,6 +3465,10 @@ export default {
this.detailData.disposalRemark = ''
}
}
if (this.detailData.passQty>this.detailData.rollQty){
this.$message.warning('合格数量不能大于送检数量！')
return
}
this.saveDetailInformation(type)
},
@ -4163,7 +4172,7 @@ export default {
partNo: '',
partDesc: '',
operationDesc: '',
status: '下达'
status: 'N'
}
this.seqInfoList = []
},

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

@ -348,7 +348,10 @@
<el-form-item :label="'批次合格数'">
<el-input-number :controls="false" :step="0" min="0" v-model="detailData.batchQualifiedQty" disabled style="width: 85px"></el-input-number>
</el-form-item>
<el-form-item style="margin-top: 13px;margin-left: 450px">
<el-form-item :label="'批次不合格数'">
<el-input-number :controls="false" :step="0" min="0" v-model="detailData.notbatchQualifiedQty" disabled style="width: 85px"></el-input-number>
</el-form-item>
<el-form-item style="margin-top: 13px;margin-left: 360px">
<!-- <el-button v-if="detailData.submitFlag !== 'Y'" :loading="loadFlag" @click="dataAcquisition">-->
<!-- <svg t="1739002700745" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="38076" width="22" height="22"><path d="M922.000696 762.746435V465.363478l55.652174-0.111304v299.542261c0 131.695304-106.562783 239.571478-236.922435 239.571478H285.42887C155.158261 1004.365913 48.484174 896.623304 48.484174 764.794435V465.252174h59.258435v299.542261c0 101.843478 77.022609 179.712 177.775304 179.712H740.841739c100.61913 0 181.158957-79.916522 181.158957-181.76z" fill="#1D293F" p-id="38077"></path><path d="M290.148174 192.556522c20.301913-20.925217 30.47513-48.617739 30.47513-83.099826 0-72.548174-36.285217-108.833391-108.722087-108.833392H141.401043v223.365566h70.255305c32.055652-0.111304 58.167652-10.529391 78.491826-31.432348z m-105.227131-7.635479V39.446261h23.596522c19.70087 0 35.661913 6.166261 47.994435 18.632348 12.354783 12.466087 18.387478 29.740522 18.387478 52.001391 0 22.973217-5.921391 41.22713-17.652869 54.650435s-27.937391 20.190609-48.617739 20.190608H184.921043zM634.434783 595.366957h-84.057044V498.866087a102.511304 102.511304 0 0 0 74.262261-98.54887c0-56.230957-45.478957-102.310957-101.10887-102.310956-55.629913 0-101.086609 46.08-101.086608 102.310956 0 46.08 30.586435 85.25913 72.192 97.947826v96.990609h-81.252174c-16.829217-43.78713-50.688-99.283478-81.65287-143.070609a101.331478 101.331478 0 0 0 14.269218-52.001391c0-56.230957-45.946435-102.310957-102.177392-102.310956s-102.177391 46.08-102.177391 102.310956c0 56.230957 45.946435 102.310957 102.177391 102.310957 15.716174 0 30.72-3.628522 44.009739-10.017392 21.170087 34.326261 42.829913 74.351304 57.811479 102.778435h-73.906087l128.333913 130.493218 94.675478-108.966957v145.853217h-111.616l148.034783 148.858435 130.715826-148.858435h-111.504696v-129.402434l91.180522 92.516174 113.307826-130.248348h-53.203478c14.758957-28.42713 36.173913-68.452174 57.210434-102.800696 13.178435 6.41113 27.937391 10.039652 43.542261 10.039652 55.629913 0 101.086609-46.08 101.086609-102.310956 0-56.230957-45.456696-102.310957-101.086609-102.310957-55.652174 0-101.220174 46.08-101.220174 102.310957a102.4 102.4 0 0 0 14.135653 52.001391c-30.72 43.653565-64.200348 99.283478-80.896 142.937044z m-390.611479-148.48a46.614261 46.614261 0 0 1-46.436174-46.458435c0-25.510957 20.925217-46.436174 46.436174-46.436174s46.436174 20.925217 46.436174 46.436174-20.925217 46.436174-46.436174 46.436174z m279.819131 0c-25.266087 0-45.946435-20.925217-45.946435-46.458435 0-25.510957 20.702609-46.436174 45.968696-46.436174 25.266087 0 45.946435 20.925217 45.946434 46.436174s-20.680348 46.436174-45.946434 46.436174z m278.639304-93.005914c25.288348 0 45.968696 20.925217 45.968696 46.436174s-20.702609 46.436174-45.968696 46.436174c-25.266087 0-45.946435-20.925217-45.946435-46.436174s20.680348-46.436174 45.946435-46.436174zM395.130435 172.722087h74.128695l15.248696 51.155478h47.415652L458.707478 0.623304h-51.155478L332.8 223.98887h47.170783l15.11513-51.266783z m32.768-114.777044c1.825391-6.032696 3.027478-12.332522 3.517217-18.854956h1.202087c0.601043 8.102957 1.691826 14.514087 3.138783 19.456l23.218087 77.401043h-54.405566l23.329392-78.002087z m168.96 165.932522h43.631304V39.446261h58.189913V0.623304h-159.877565v38.956522h58.056348v184.297739z m169.894956-51.155478h74.128696l15.248696 51.155478h47.415652L830.330435 0.623304h-51.155478l-74.752 223.365566h47.193043l15.09287-51.266783z m32.768-114.777044c1.825391-6.032696 3.027478-12.332522 3.517218-18.854956h1.202087c0.601043 8.102957 1.691826 14.514087 3.161043 19.456l23.218087 77.401043h-54.427826l23.329391-78.002087z" fill="#FD9F01" p-id="38078"></path></svg>-->
<!-- </el-button>-->
@ -414,7 +417,8 @@
min-width="90"
label="操作">
<template slot-scope="scope">
<el-button class="el-icon-picture" type="primary" @click="uploadImageModal(scope.row)"></el-button>
<el-button class="el-icon-picture" v-if="scope.row.imageDetailNum > 0" type="success" @click="uploadImageModal(scope.row)"></el-button>
<el-button class="el-icon-picture" v-else type="primary" @click="uploadImageModal(scope.row)"></el-button>
<!-- <el-button style="margin-left: 2px" class="el-icon-s-platform" type="primary" :loading="loadFlag" @click="dataAcquisitionByItem(scope.row)"></el-button>-->
</template>
</el-table-column>
@ -971,6 +975,7 @@
} else {
this.detailData.batchQualifiedQty = this.detailData.rollQty
}
this.detailData.notbatchQualifiedQty = this.detailData.rollQty - this.detailData.batchQualifiedQty
}
},
detailList: {
@ -3427,6 +3432,10 @@
this.detailData.disposalRemark = ''
}
}
if (this.detailData.passQty>this.detailData.rollQty){
this.$message.warning('合格数量不能大于送检数量！')
return
}
this.saveDetailInformation(type)
},
@ -4134,7 +4143,7 @@
partNo: '',
partDesc:'',
operationDesc: '',
status: '下达'
status: 'N'
}
this.seqInfoList = []
},

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

@ -349,20 +349,23 @@
<el-input-number :controls="false" :step="0" v-model="detailData.samplingQty" style="width: 85px"></el-input-number>
</el-form-item>
<el-form-item :label="'合格数量'">
<el-input-number :controls="false" :step="0" min="0" v-if="detailData.submitFlag === 'Y'" v-model="detailData.passQty" disabled style="width: 85px"></el-input-number>
<el-input-number :controls="false" :step="0" min="0" v-else v-model="detailData.passQty" style="width: 85px"></el-input-number>
<el-input-number :controls="false" :step="0" :min="0" v-if="detailData.submitFlag === 'Y'" v-model="detailData.passQty" disabled style="width: 85px"></el-input-number>
<el-input-number :controls="false" :step="0" :min="0" v-else v-model="detailData.passQty" style="width: 85px"></el-input-number>
</el-form-item>
<el-form-item :label="'不合格数量'">
<el-input-number :controls="false" :step="0" min="0" v-model="detailData.notPassQty" disabled style="width: 85px"></el-input-number>
<el-input-number :controls="false" :step="0" :min="0" v-model="detailData.notPassQty" disabled style="width: 85px"></el-input-number>
</el-form-item>
<el-form-item :label="'不合格项目数量'">
<el-input-number :controls="false" :step="0" v-if="detailData.submitFlag === 'Y'" v-model="detailData.unqualifiedQty" disabled style="width: 85px"></el-input-number>
<el-input-number :controls="false" :step="0" v-else v-model="detailData.unqualifiedQty" style="width: 85px"></el-input-number>
</el-form-item>
<el-form-item :label="'批次合格数'">
<el-input-number :controls="false" :step="0" min="0" v-model="detailData.batchQualifiedQty" disabled style="width: 85px"></el-input-number>
<el-input-number :controls="false" :step="0" :min="0" v-model="detailData.batchQualifiedQty" disabled style="width: 85px"></el-input-number>
</el-form-item>
<el-form-item style="margin-top: 13px;margin-left: 450px">
<el-form-item :label="'批次不合格数'">
<el-input-number :controls="false" :step="0" :min="0" v-model="detailData.notbatchQualifiedQty" disabled style="width: 85px"></el-input-number>
</el-form-item>
<el-form-item style="margin-top: 13px;margin-left: 365px">
<!-- <el-button v-if="detailData.submitFlag !== 'Y'" :loading="loadFlag" @click="dataAcquisition">-->
<!-- <svg t="1739002700745" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="38076" width="22" height="22"><path d="M922.000696 762.746435V465.363478l55.652174-0.111304v299.542261c0 131.695304-106.562783 239.571478-236.922435 239.571478H285.42887C155.158261 1004.365913 48.484174 896.623304 48.484174 764.794435V465.252174h59.258435v299.542261c0 101.843478 77.022609 179.712 177.775304 179.712H740.841739c100.61913 0 181.158957-79.916522 181.158957-181.76z" fill="#1D293F" p-id="38077"></path><path d="M290.148174 192.556522c20.301913-20.925217 30.47513-48.617739 30.47513-83.099826 0-72.548174-36.285217-108.833391-108.722087-108.833392H141.401043v223.365566h70.255305c32.055652-0.111304 58.167652-10.529391 78.491826-31.432348z m-105.227131-7.635479V39.446261h23.596522c19.70087 0 35.661913 6.166261 47.994435 18.632348 12.354783 12.466087 18.387478 29.740522 18.387478 52.001391 0 22.973217-5.921391 41.22713-17.652869 54.650435s-27.937391 20.190609-48.617739 20.190608H184.921043zM634.434783 595.366957h-84.057044V498.866087a102.511304 102.511304 0 0 0 74.262261-98.54887c0-56.230957-45.478957-102.310957-101.10887-102.310956-55.629913 0-101.086609 46.08-101.086608 102.310956 0 46.08 30.586435 85.25913 72.192 97.947826v96.990609h-81.252174c-16.829217-43.78713-50.688-99.283478-81.65287-143.070609a101.331478 101.331478 0 0 0 14.269218-52.001391c0-56.230957-45.946435-102.310957-102.177392-102.310956s-102.177391 46.08-102.177391 102.310956c0 56.230957 45.946435 102.310957 102.177391 102.310957 15.716174 0 30.72-3.628522 44.009739-10.017392 21.170087 34.326261 42.829913 74.351304 57.811479 102.778435h-73.906087l128.333913 130.493218 94.675478-108.966957v145.853217h-111.616l148.034783 148.858435 130.715826-148.858435h-111.504696v-129.402434l91.180522 92.516174 113.307826-130.248348h-53.203478c14.758957-28.42713 36.173913-68.452174 57.210434-102.800696 13.178435 6.41113 27.937391 10.039652 43.542261 10.039652 55.629913 0 101.086609-46.08 101.086609-102.310956 0-56.230957-45.456696-102.310957-101.086609-102.310957-55.652174 0-101.220174 46.08-101.220174 102.310957a102.4 102.4 0 0 0 14.135653 52.001391c-30.72 43.653565-64.200348 99.283478-80.896 142.937044z m-390.611479-148.48a46.614261 46.614261 0 0 1-46.436174-46.458435c0-25.510957 20.925217-46.436174 46.436174-46.436174s46.436174 20.925217 46.436174 46.436174-20.925217 46.436174-46.436174 46.436174z m279.819131 0c-25.266087 0-45.946435-20.925217-45.946435-46.458435 0-25.510957 20.702609-46.436174 45.968696-46.436174 25.266087 0 45.946435 20.925217 45.946434 46.436174s-20.680348 46.436174-45.946434 46.436174z m278.639304-93.005914c25.288348 0 45.968696 20.925217 45.968696 46.436174s-20.702609 46.436174-45.968696 46.436174c-25.266087 0-45.946435-20.925217-45.946435-46.436174s20.680348-46.436174 45.946435-46.436174zM395.130435 172.722087h74.128695l15.248696 51.155478h47.415652L458.707478 0.623304h-51.155478L332.8 223.98887h47.170783l15.11513-51.266783z m32.768-114.777044c1.825391-6.032696 3.027478-12.332522 3.517217-18.854956h1.202087c0.601043 8.102957 1.691826 14.514087 3.138783 19.456l23.218087 77.401043h-54.405566l23.329392-78.002087z m168.96 165.932522h43.631304V39.446261h58.189913V0.623304h-159.877565v38.956522h58.056348v184.297739z m169.894956-51.155478h74.128696l15.248696 51.155478h47.415652L830.330435 0.623304h-51.155478l-74.752 223.365566h47.193043l15.09287-51.266783z m32.768-114.777044c1.825391-6.032696 3.027478-12.332522 3.517218-18.854956h1.202087c0.601043 8.102957 1.691826 14.514087 3.161043 19.456l23.218087 77.401043h-54.427826l23.329391-78.002087z" fill="#FD9F01" p-id="38078"></path></svg>-->
<!-- </el-button>-->
@ -425,10 +428,11 @@
prop=""
header-align="center"
align="center"
min-width="90"
:min-width="90"
label="操作">
<template slot-scope="scope">
<el-button class="el-icon-picture" type="primary" @click="uploadImageModal(scope.row)"></el-button>
<el-button class="el-icon-picture" v-if="scope.row.imageDetailNum > 0" type="success" @click="uploadImageModal(scope.row)"></el-button>
<el-button class="el-icon-picture" v-else type="primary" @click="uploadImageModal(scope.row)"></el-button>
<!-- <el-button style="margin-left: 2px" class="el-icon-s-platform" type="primary" :loading="loadFlag" @click="dataAcquisitionByItem(scope.row)"></el-button>-->
</template>
</el-table-column>
@ -451,7 +455,7 @@
prop=""
header-align="center"
align="right"
min-width="80"
:min-width="80"
label="实测值">
<template slot-scope="scope">
<el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'N'" v-model="scope.row.numberValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" type="number" @change="updateItemResult(scope.row)" style="height: 11px; width: 98%"></el-input>
@ -462,7 +466,7 @@
prop=""
header-align="center"
align="center"
min-width="80"
:min-width="80"
label="检验明细">
<template slot-scope="scope">
<el-button v-if="scope.row.subDetailRecordNum > 0" type="success" @click="subDetailModal(scope.row)">点击输入</el-button>
@ -473,7 +477,7 @@
prop=""
header-align="center"
align="right"
min-width="80"
:min-width="80"
label="抽样数量">
<template slot-scope="scope">
<el-input-number :controls="false" :step="0" v-if="detailData.submitFlag === 'Y'" v-model="scope.row.samplingQty" disabled style="height: 11px; width:98%"></el-input-number>
@ -484,7 +488,7 @@
prop=""
header-align="center"
align="right"
min-width="80"
:min-width="80"
label="不合格数量">
<template slot-scope="scope">
<el-input-number :controls="false" :step="0" v-if="detailData.submitFlag === 'Y'" v-model="scope.row.unqualifiedQuantity" disabled style="height: 11px; width:98%"></el-input-number>
@ -495,7 +499,7 @@
prop=""
header-align="center"
align="right"
min-width="90"
:min-width="90"
label="项目检验结论">
<template slot-scope="scope">
<el-select :class="{redElSelect:scope.row.itemResult === 'N', greenElSelect:scope.row.itemResult === 'Y'}" v-if="detailData.submitFlag === 'Y'" v-model="scope.row.itemResult" disabled style="height: 11px;padding: 0px">
@ -869,7 +873,7 @@
<el-table-column
header-align="center"
align="center"
min-width="100"
:min-width="100"
label="设备">
<template slot-scope="scope">
<el-select v-model="scope.row.equipmentNo" style="height: 11px" placeholder="请选择设备">
@ -992,6 +996,7 @@
} else {
this.detailData.batchQualifiedQty = this.detailData.rollQty
}
this.detailData.notbatchQualifiedQty = this.detailData.rollQty - this.detailData.batchQualifiedQty
}
},
detailList: {
@ -1601,7 +1606,7 @@
partNo:'',
partDesc:'',
rollQty:'',
samplingQty: '',
samplingQty: 0,
unqualifiedQty: 0,
unqualifiedQuantity:'',
disposalMeasures:'',
@ -1621,9 +1626,10 @@
responsiblePerson: '',
responsiblePersonName: '',
state: '',
passQty: '',
notPassQty: '',
batchQualifiedQty: ''
passQty: 0,
notPassQty: 0,
batchQualifiedQty: 0,
notbatchQualifiedQty: 0
},
detailInformationFlag: false,
detailList: [],
@ -3504,6 +3510,10 @@
this.detailData.disposalRemark = ''
}
}
if (this.detailData.passQty>this.detailData.rollQty){
this.$message.warning('合格数量不能大于送检数量！')
return
}
this.saveDetailInformation(type)
},
@ -4201,7 +4211,7 @@
partNo: '',
partDesc: '',
operationDesc: '',
status: '下达'
status: 'N'
}
this.seqInfoList = []
},

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

@ -252,7 +252,10 @@
<el-form-item :label="'批次合格数'">
<el-input-number :controls="false" :step="0" min="0" v-model="detailData.batchQualifiedQty" disabled style="width: 81px"></el-input-number>
</el-form-item>
<el-form-item style="margin-top: 13px;margin-left: 450px">
<el-form-item :label="'批次不合格数'">
<el-input-number :controls="false" :step="0" min="0" v-model="detailData.notbatchQualifiedQty" disabled style="width: 85px"></el-input-number>
</el-form-item>
<el-form-item style="margin-top: 13px;margin-left: 290px">
<!-- <el-button v-if="detailData.submitFlag !== 'Y'" :loading="loadFlag" @click="dataAcquisition">-->
<!-- <svg t="1739002700745" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="38076" width="22" height="22"><path d="M922.000696 762.746435V465.363478l55.652174-0.111304v299.542261c0 131.695304-106.562783 239.571478-236.922435 239.571478H285.42887C155.158261 1004.365913 48.484174 896.623304 48.484174 764.794435V465.252174h59.258435v299.542261c0 101.843478 77.022609 179.712 177.775304 179.712H740.841739c100.61913 0 181.158957-79.916522 181.158957-181.76z" fill="#1D293F" p-id="38077"></path><path d="M290.148174 192.556522c20.301913-20.925217 30.47513-48.617739 30.47513-83.099826 0-72.548174-36.285217-108.833391-108.722087-108.833392H141.401043v223.365566h70.255305c32.055652-0.111304 58.167652-10.529391 78.491826-31.432348z m-105.227131-7.635479V39.446261h23.596522c19.70087 0 35.661913 6.166261 47.994435 18.632348 12.354783 12.466087 18.387478 29.740522 18.387478 52.001391 0 22.973217-5.921391 41.22713-17.652869 54.650435s-27.937391 20.190609-48.617739 20.190608H184.921043zM634.434783 595.366957h-84.057044V498.866087a102.511304 102.511304 0 0 0 74.262261-98.54887c0-56.230957-45.478957-102.310957-101.10887-102.310956-55.629913 0-101.086609 46.08-101.086608 102.310956 0 46.08 30.586435 85.25913 72.192 97.947826v96.990609h-81.252174c-16.829217-43.78713-50.688-99.283478-81.65287-143.070609a101.331478 101.331478 0 0 0 14.269218-52.001391c0-56.230957-45.946435-102.310957-102.177392-102.310956s-102.177391 46.08-102.177391 102.310956c0 56.230957 45.946435 102.310957 102.177391 102.310957 15.716174 0 30.72-3.628522 44.009739-10.017392 21.170087 34.326261 42.829913 74.351304 57.811479 102.778435h-73.906087l128.333913 130.493218 94.675478-108.966957v145.853217h-111.616l148.034783 148.858435 130.715826-148.858435h-111.504696v-129.402434l91.180522 92.516174 113.307826-130.248348h-53.203478c14.758957-28.42713 36.173913-68.452174 57.210434-102.800696 13.178435 6.41113 27.937391 10.039652 43.542261 10.039652 55.629913 0 101.086609-46.08 101.086609-102.310956 0-56.230957-45.456696-102.310957-101.086609-102.310957-55.652174 0-101.220174 46.08-101.220174 102.310957a102.4 102.4 0 0 0 14.135653 52.001391c-30.72 43.653565-64.200348 99.283478-80.896 142.937044z m-390.611479-148.48a46.614261 46.614261 0 0 1-46.436174-46.458435c0-25.510957 20.925217-46.436174 46.436174-46.436174s46.436174 20.925217 46.436174 46.436174-20.925217 46.436174-46.436174 46.436174z m279.819131 0c-25.266087 0-45.946435-20.925217-45.946435-46.458435 0-25.510957 20.702609-46.436174 45.968696-46.436174 25.266087 0 45.946435 20.925217 45.946434 46.436174s-20.680348 46.436174-45.946434 46.436174z m278.639304-93.005914c25.288348 0 45.968696 20.925217 45.968696 46.436174s-20.702609 46.436174-45.968696 46.436174c-25.266087 0-45.946435-20.925217-45.946435-46.436174s20.680348-46.436174 45.946435-46.436174zM395.130435 172.722087h74.128695l15.248696 51.155478h47.415652L458.707478 0.623304h-51.155478L332.8 223.98887h47.170783l15.11513-51.266783z m32.768-114.777044c1.825391-6.032696 3.027478-12.332522 3.517217-18.854956h1.202087c0.601043 8.102957 1.691826 14.514087 3.138783 19.456l23.218087 77.401043h-54.405566l23.329392-78.002087z m168.96 165.932522h43.631304V39.446261h58.189913V0.623304h-159.877565v38.956522h58.056348v184.297739z m169.894956-51.155478h74.128696l15.248696 51.155478h47.415652L830.330435 0.623304h-51.155478l-74.752 223.365566h47.193043l15.09287-51.266783z m32.768-114.777044c1.825391-6.032696 3.027478-12.332522 3.517218-18.854956h1.202087c0.601043 8.102957 1.691826 14.514087 3.161043 19.456l23.218087 77.401043h-54.427826l23.329391-78.002087z" fill="#FD9F01" p-id="38078"></path></svg>-->
<!-- </el-button>-->
@ -336,7 +339,8 @@
min-width="90"
label="操作">
<template slot-scope="scope">
<el-button class="el-icon-picture" type="primary" @click="uploadImageModal(scope.row)"></el-button>
<el-button class="el-icon-picture" v-if="scope.row.imageDetailNum > 0" type="success" @click="uploadImageModal(scope.row)"></el-button>
<el-button class="el-icon-picture" v-else type="primary" @click="uploadImageModal(scope.row)"></el-button>
<!-- <el-button style="margin-left: 2px" class="el-icon-s-platform" type="primary" :loading="loadFlag" @click="dataAcquisitionByItem(scope.row)"></el-button>-->
</template>
</el-table-column>
@ -848,6 +852,7 @@
} else {
this.detailData.batchQualifiedQty = this.detailData.rollQty
}
this.detailData.notbatchQualifiedQty = this.detailData.rollQty - this.detailData.batchQualifiedQty
}
},
detailList: {
@ -2538,6 +2543,10 @@
this.detailData.disposalRemark = ''
}
}
if (this.detailData.passQty>this.detailData.rollQty){
this.$message.warning('合格数量不能大于送检数量！')
return
}
this.saveDetailInformation(type)
},

2
src/views/modules/qc/PQCResultEntry.vue
View File

@ -4571,7 +4571,7 @@ export default {
partNo: '',
partDesc:'',
operationDesc: '',
status: '下达'
status: 'N'
}
this.seqInfoList = []
},

Write Preview
Loading…
Cancel
Save