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

2023-11-10 设备和质量修改

java8
杨奉源 2 years ago
parent
e60590cd40
commit
9011f6c9da
4 changed files with 70 additions and 54 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. 43
      src/views/modules/qc/IQCResultEntry.vue
  2. 74
      src/views/modules/qc/qcItem.vue
  3. 4
      src/views/modules/qc/qcPartAttribute.vue
  4. 3
      src/views/modules/qc/qcSamplingInspectionProgramme.vue

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

@ -139,9 +139,12 @@
<el-form-item :label="'计量单位'">
<el-input v-model="detailData.umId" disabled style="width: 200px"></el-input>
</el-form-item>
<el-form-item :label="'送检数量'">
<el-form-item :label="'到货数量'">
<el-input v-model="detailData.rollQty" disabled style="width: 80px"></el-input>
</el-form-item>
<el-form-item :label="'送检数量'">
<el-input v-model="detailData.rollCount" disabled style="width: 80px"></el-input>
</el-form-item>
<el-form-item :label="'抽样数量'">
<el-input v-model="detailData.samplingQty" disabled style="width: 80px"></el-input>
</el-form-item>
@ -192,7 +195,7 @@
:value = "i.inspectorNo">
</el-option>
</el-select>
<el-select v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectorNo" placeholder="请选择" style="width: 100px">
<el-select v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectorNo" disabled placeholder="请选择" style="width: 100px">
<el-option
v-for = "i in options"
:key = "i.inspectorNo"
@ -643,6 +646,24 @@
columnProp: 'rollQty',
headerAlign: "center",
align: "right",
columnLabel: '到货数量',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1RollCount',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'rollCount',
headerAlign: "center",
align: "right",
columnLabel: '送检数量',
columnHidden: false,
columnImage: false,
@ -799,10 +820,10 @@
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1InspectorNo',
serialNumber: '301006Table1InspectorName',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'inspectorNo',
columnProp: 'inspectorName',
headerAlign: "center",
align: "center",
columnLabel: '质检员',
@ -1081,7 +1102,8 @@
inspectionRemark: '',
submitFlag: '',
supplierNo: '',
umId: ''
umId: '',
rollCount: ''
},
detailInformationFlag: false,
detailList:[],
@ -1327,10 +1349,10 @@
this.$message.warning('请选择检验结论！')
return
}
if (this.detailData.inspectorNo === '' || this.detailData.inspectorNo == null) {
this.$message.warning('请选择检验员！')
return
}
// if (this.detailData.inspectorNo === '' || this.detailData.inspectorNo == null) {
// this.$message.warning('请选择检验员！')
// return
// }
// if (this.detailData.inspectionResult == 'Y' && (this.detailData.disposalMeasures == '特采' || this.detailData.disposalMeasures == '拒收')) {
// this.$alert('合格不予处置措施，请查看！', '错误', {
// confirmButtonText: '确定'
@ -1369,7 +1391,7 @@
this.saveInformationData.inspectionNo = this.detailData.inspectionNo
this.saveInformationData.disposalMeasures = this.detailData.disposalMeasures
this.saveInformationData.disposalRemark = this.detailData.disposalRemark
this.saveInformationData.inspectorNo = this.detailData.inspectorNo
this.saveInformationData.inspectorNo = this.$store.state.user.name
this.saveInformationData.inspectionResult = this.detailData.inspectionResult
this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
@ -1407,6 +1429,7 @@
this.detailData.inspectorNo = row.inspectorNo
this.detailData.inspectionRemark = row.inspectionRemark
this.detailData.umId = row.umId
this.detailData.rollCount = row.rollCount
this.getInspectionFormData()
this.inspectorSearch()
this.detailInformationFlag = true

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

@ -55,34 +55,6 @@
border
v-loading="dataListLoading"
style="width: 100%;">
<!-- <el-table-column-->
<!-- prop="itemNo"-->
<!-- header-align="center"-->
<!-- align="center"-->
<!-- label="检验项目编码"-->
<!-- width="100">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="itemDesc"-->
<!-- header-align="center"-->
<!-- align="left"-->
<!-- label="检验项目名称"-->
<!-- :width="flexColumnWidth('检验项目名称','itemDesc')">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="methodName"-->
<!-- header-align="center"-->
<!-- align="center"-->
<!-- label="检验方法"-->
<!-- :width="flexColumnWidth('检验方法','methodName')">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="methodRemark"-->
<!-- header-align="center"-->
<!-- align="left"-->
<!-- label="检验方法说明"-->
<!-- :width="flexColumnWidth('检验方法说明','methodRemark')">-->
<!-- </el-table-column>-->
<el-table-column
v-for="(item,index) in columnList" :key="index"
:sortable="item.columnSortable"
@ -125,23 +97,14 @@
<el-dialog title="检验项目" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="项目名称:" prop="itemDesc" :rules="rules.itemDescType">
<el-input v-model="modalData.itemDesc" style="width: 221px"></el-input>
<el-input v-model="modalData.itemDesc" style="width: 143px"></el-input>
</el-form-item>
<el-form-item label="检验值类型:" prop="valueTypeDb" :rules="rules.valueTypeDbType">
<el-select filterable v-model="modalData.valueTypeDb" style="width: 221px">
<el-select filterable v-model="modalData.valueTypeDb" style="width: 143px">
<el-option label="文本" value="T"></el-option>
<el-option label="数字" value="N"></el-option>
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item prop="methodNo" :rules="rules.methodNoType">
<span slot="label" style="" @click="getBaseList(1036)"><a herf="#">方法编码</a></span>
<el-input v-model="modalData.methodNo" style="width: 143px"></el-input>
</el-form-item>
<el-form-item label="方法名称:" prop="methodName" :rules="rules.methodNameType">
<el-input v-model="modalData.methodName" disabled style="width: 143px"></el-input>
</el-form-item>
<el-form-item label="检验类型:" prop="inspectionTypeNo" :rules="rules.inspectionTypeNoType">
<el-select v-model="modalData.inspectionTypeNo" placeholder="请选择" style="width: 143px">
<el-option
@ -153,6 +116,18 @@
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item prop="methodNo" :rules="rules.methodNoType">
<span slot="label" style="" @click="getBaseList(1036)"><a herf="#">方法编码</a></span>
<el-input v-model="modalData.methodNo" style="width: 143px"></el-input>
</el-form-item>
<el-form-item label="方法名称:" prop="methodName" :rules="rules.methodNameType">
<el-input v-model="modalData.methodName" disabled style="width: 143px"></el-input>
</el-form-item>
<el-form-item label="抽样数量:">
<el-input v-model="modalData.itemSamplingQuantity" type="number" style="width: 143px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="参照值:">
<el-input v-if="modalData.valueTypeDb === 'T'" v-model="modalData.defaultValue" style="width: 143px"></el-input>
@ -252,7 +227,8 @@
methodNo: '',
methodName: '',
updateBy: '',
inspectionTypeNo: ''
inspectionTypeNo: '',
itemSamplingQuantity: ''
},
// 检验项目展示标头
columnList: [
@ -364,6 +340,18 @@
status: true,
fixed: '',
},
{
columnProp: 'itemSamplingQuantity',
headerAlign: 'center',
align: "right",
columnLabel: '抽样数量',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'createdDate',
headerAlign: 'center',
@ -566,7 +554,8 @@
methodNo: '',
methodName: '',
updateBy: '',
inspectionTypeNo: ''
inspectionTypeNo: '',
itemSamplingQuantity: ''
}
this.modalDisableFlag = false
this.modalFlag = true
@ -587,7 +576,8 @@
methodNo: row.methodNo,
methodName: row.methodName,
updateBy: this.$store.state.user.name,
inspectionTypeNo: row.inspectionTypeNo
inspectionTypeNo: row.inspectionTypeNo,
itemSamplingQuantity: row.itemSamplingQuantity
}
this.modalDisableFlag = true
this.modalFlag = true

4
src/views/modules/qc/qcPartAttribute.vue
View File

@ -802,7 +802,7 @@
columnProp: 'defaultSamplingQuantity',
headerAlign: "center",
align: "right",
columnLabel: '默认检验数量',
columnLabel: '默认抽样数量',
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -814,7 +814,7 @@
columnProp: 'defaultSamplingProportion',
headerAlign: "center",
align: "right",
columnLabel: '默认检验比例',
columnLabel: '默认抽样比例',
columnHidden: false,
columnImage: false,
columnSortable: false,

3
src/views/modules/qc/qcSamplingInspectionProgramme.vue
View File

@ -8,6 +8,9 @@
</div>
<!-- 条件查询 -->
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
<el-form-item :label="'抽样方案编码'">
<el-input v-model="searchData.samplingProgrammeNo" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'抽样方案名称'">
<el-input v-model="searchData.samplingProgrammeDesc" clearable style="width: 120px"></el-input>
</el-form-item>

Write Preview
Loading…
Cancel
Save