suojin
/
jonhon-mes-web
24
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

缺陷修复

Browse Source
dev-scheduling
jinna 3 weeks ago
parent d416094521
commit 243549edfe
9 changed files with 140 additions and 52 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. 9
      src/api/qualityManagement/remindRedeem/remindRedeem.js
  2. 20
      src/views/basicData/components/addRuleDialog.vue
  3. 2
      src/views/inboundOutboundManagement/components/addEditDialog.vue
  4. 4
      src/views/inboundOutboundManagement/returnReceiving.vue
  5. 4
      src/views/oem/outsourcingAssignmentControl/index.vue
  6. 91
      src/views/productionSchedulingPlan/basic/qualityGrade.vue
  7. 20
      src/views/qualityManagement/remindRedeem/components/batchAdd.vue
  8. 28
      src/views/qualityManagement/remindRedeem/index.vue
  9. 14
      src/views/warehouseManagement/materialPreserve.vue

9
src/api/qualityManagement/remindRedeem/remindRedeem.js
Unescape View File

@ -50,4 +50,13 @@ export const getPartList = () =>{
url:'/api/blade-desk/dsPart/getPartList',
method:'get'
})
}
// 子件下拉
export const getSubPartList = (params) =>{
return request({
url:'/api/blade-desk/dsPartRelation/getSubParts',
method:'get',
params
})
}

20
src/views/basicData/components/addRuleDialog.vue
Unescape View File

@ -64,13 +64,6 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column align="center" label="单件面积上限(dm²)" prop="upArea">
<template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].upArea`" :rules="formRules.upArea">
<el-input v-model="scope.row.upArea" placeholder="请输入单件面积上限"></el-input>
</el-form-item>
</template>
</el-table-column>
<el-table-column align="center" label="单件面积下限(dm²)" prop="lowArea">
<template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].lowArea`" :rules="formRules.lowArea">
@ -78,10 +71,10 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column align="center" label="单批面积上限(dm²)" prop="singleUpArea">
<el-table-column align="center" label="单件面积上限(dm²)" prop="upArea">
<template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].singleUpArea`" :rules="formRules.singleUpArea">
<el-input v-model="scope.row.singleUpArea" placeholder="请输入单批面积上限"></el-input>
<el-form-item :prop="`tableData[${scope.$index}].upArea`" :rules="formRules.upArea">
<el-input v-model="scope.row.upArea" placeholder="请输入单件面积上限"></el-input>
</el-form-item>
</template>
</el-table-column>
@ -92,6 +85,13 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column align="center" label="单批面积上限(dm²)" prop="singleUpArea">
<template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].singleUpArea`" :rules="formRules.singleUpArea">
<el-input v-model="scope.row.singleUpArea" placeholder="请输入单批面积上限"></el-input>
</el-form-item>
</template>
</el-table-column>
<el-table-column align="center" label="限制类型" prop="limitType">
<template #header>
<span><i style="color: red">*</i>限制类型</span>

2
src/views/inboundOutboundManagement/components/addEditDialog.vue
Unescape View File

@ -238,7 +238,7 @@ export default {
// 切换仓库
changeWarehouse(val){
if(this.tableData.length > 0){
if(this.tableData.length == 1){
if(this.tableData.length == 1 && this.tableData[0].goodsCode){
this.tableData[0].slId = ''
getLocationList({
shId:this.ruleForm.shId,

4
src/views/inboundOutboundManagement/returnReceiving.vue
Unescape View File

@ -22,7 +22,7 @@
<!-- 物料入库 -->
<!-- <el-form v-model="searchFrom"> -->
<!-- <el-form-item label="物料编号："> -->
<span>物料编号：</span>
<span style="font-size:12px;color:#606266;">物料编号：</span>
<el-input style="width:240px;" v-model="searchFrom.prtno" @keyup.enter.native="changeCode"></el-input>
<!-- </el-form-item> -->
<!-- </el-form> -->
@ -113,7 +113,7 @@ export default {
calcHeight: 32,
simplePage: false,
searchShow: true,
searchMenuSpan: 6,
searchMenuSpan: 18,
searchIcon: true,
searchIndex: 3,
tree: false,

4
src/views/oem/outsourcingAssignmentControl/index.vue
Unescape View File

@ -46,10 +46,6 @@
<template #proportion="{ row }">
<span>{{ row.proportion ? row.proportion + "%" : "0%" }}</span>
</template>
<template #menu-form>
<el-button type="primary" @click="handleDelete">发送审批 </el-button>
</template>
</avue-crud>
<!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"

91
src/views/productionSchedulingPlan/basic/qualityGrade.vue
Unescape View File

@ -23,7 +23,12 @@
<template #menu-right> </template>
<template #menu="{ row }"> </template>
<template #heatTreat="scope"> </template>
<template #isThickness="scope">
<span>{{scope.row.isThickness == 1 ? '√' : ''}}</span>
</template>
<template #isLocal="scope">
<span>{{scope.row.isLocal == 1 ? '√' : ''}}</span>
</template>
</avue-crud>
</basic-container>
</template>
@ -113,13 +118,13 @@ export default {
sortable: true,
span: 12,
type:'select',
rules: [
{
required: true,
message: '请选择',
trigger: 'blur',
},
],
// rules: [
// {
// required: true,
// message: '请选择',
// trigger: 'blur',
// },
// ],
dicData:[
{
label:'军品',
@ -143,13 +148,13 @@ export default {
sortable: true,
span: 12,
type:'select',
rules: [
{
required: true,
message: '请选择',
trigger: 'blur',
},
],
// rules: [
// {
// required: true,
// message: '请选择',
// trigger: 'blur',
// },
// ],
dicData:[
{
label:'军品',
@ -165,7 +170,50 @@ export default {
}
]
},
{
label:"局部镀",
prop:"isLocal",
type:'radio',
rules:[
{
required: true,
message: '请选择',
trigger: 'blur',
},
],
dicData:[
{
label:'是',
value:1
},
{
label:'否',
value:0
}
]
},
{
label:"厚金区固定厚度",
prop:"isThickness",
type:'radio',
dicData:[
{
label:'是',
value:1
},
{
label:'否',
value:0
}
],
rules:[
{
required: true,
message: '请选择',
trigger: 'blur',
},
],
}
],
},
@ -175,15 +223,20 @@ export default {
methods: {
beforeOpen(done, type) {
if (['edit', 'view'].includes(type)) {
done();
}else if(['add'].includes(type)){
this.form.isLocal = 0
this.form.isThickness = 0
done();
}
done();
},
rowSave(row, done, loading) {
console.log(row);
let params = {
qualityGrade:row.qualityGrade,
types:row.type
types:row.type,
isLocal:row.isLocal,
isThickness:row.isThickness
}
addGualityGrade(params).then(
() => {

20
src/views/qualityManagement/remindRedeem/components/batchAdd.vue
Unescape View File

@ -80,13 +80,13 @@
</template> -->
<template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].subPartId`" :rules="formRules.subPartId">
<el-form-item :prop="`tableData[${scope.$index}].subPartCode`" :rules="formRules.subPartCode">
<el-select
v-model="scope.row.subPartId"
v-model="scope.row.subPartCode"
placeholder="请选择"
style="width: 100%"
>
<el-option v-for="item in pqList" :key="item.id" :label="item.name" :value="item.id"></el-option>
<el-option v-for="item in scope.row.subList" :key="item.partCode" :label="item.partCode" :value="item.partCode"></el-option>
</el-select>
</el-form-item>
</template>
@ -175,7 +175,7 @@
<script>
// import { getWorkCenterList } from '@/api/processManagement/addQuantity.js';
import {getPqList,addBatch,getPartList} from '@/api/qualityManagement/remindRedeem/remindRedeem'
import {getPqList,addBatch,getPartList,getSubPartList} from '@/api/qualityManagement/remindRedeem/remindRedeem'
// import { submitBatchData } from '@/api/processManagement/periodical.js'; // 实际提交接口
export default {
@ -188,6 +188,7 @@ export default {
return {
openShow: false,
wcData: [],
subList:[],
formError: '', // 全局错误提示
// 单个表单模型：包含表格所有行数据
@ -263,6 +264,16 @@ export default {
this.partData = res.data.data
})
},
getSubPartList(val,index){
let tmp = this.partData.find(item => item.id === val)
console.log('tmp----------------',tmp)
getSubPartList({
partCode:tmp && tmp.partCode
}).then(res =>{
console.log('res----------------',res)
this.form.tableData[index].subList = res.data.data
})
},
getPqData(){
getPqList().then(res =>{
this.pqList = res.data.data
@ -278,6 +289,7 @@ export default {
changePart(val,index){
let tmp = this.partData.find(item => item.id == val)
this.form.tableData[index].partName = tmp.partName
this.getSubPartList(val,index)
},
selectChange(list, row) {

28
src/views/qualityManagement/remindRedeem/index.vue
Unescape View File

@ -26,9 +26,9 @@
<!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel"
templateUrl="/blade-desk/QA/RemindMsg/downloadExcelTemplate"
templateName="提醒信息维护模板.xls"
importUrl="/blade-desk/QA/RemindMsg/importExcel"
@closeDialog="closeDialog"></basic-import>
<batch-add v-if="showDialog" :show-dialog="showDialog" @closeDialog="closeDialog"></batch-add>
@ -47,7 +47,7 @@ import {
remove,
update,
} from '@/api/system/role';
import {getList,deleteRemind,editRemind} from '@/api/qualityManagement/remindRedeem/remindRedeem'
import {getList,deleteRemind,editRemind,getSubPartList} from '@/api/qualityManagement/remindRedeem/remindRedeem'
import { mapGetters } from 'vuex';
import { validatenull } from '@/utils/validate';
import basicImport from '@/components/basic-import/main.vue'
@ -144,7 +144,7 @@ export default {
rules: [
{
required: true,
message: '请输入角色名称',
message: '请选择零件号',
trigger: 'blur',
},
],
@ -155,7 +155,14 @@ export default {
},
onChange:val =>{
console.log('val-------------',val)
this.form.partName = val.item.partName
this.form.partName = val && val.item && val.item.partName
getSubPartList({
partCode:val && val.item && val.item.partCode
}).then(res =>{
console.log('option--------',this.option)
this.option.column[6].dicData = res.data.data
// this.form.tableData[index].subList = res.data.data
})
}
},
{
@ -214,12 +221,18 @@ export default {
},
{
label: '子件编码',
prop: 'subPartId',
prop: 'subPartCode',
type:'select',
search: false,
sortable: true,
width: 150,
span: 12,
type:'select',
dicData:[],
props:{
label:"partCode",
value:"id"
}
},
{
label: '提醒内容',
@ -349,6 +362,7 @@ export default {
this.isRushOpen = false
this.isBatchOpen = false
this.showDialog = false
this.isShowImport = false
console.log('partName---------------------',val)
if(val){
this.onLoad()

14
src/views/warehouseManagement/materialPreserve.vue
Unescape View File

@ -138,7 +138,7 @@ export default {
trigger: 'click',
},
],
dicUrl:"/api/blade-wms/stGoods/list",
dicUrl:"/api/blade-wms/stGoods/list?current=1&size=9999&goodsCode={{key}}",
remote: true,
props:{
label: 'goodsCode',
@ -338,6 +338,7 @@ export default {
width: 200,
search: true,
searchLabelWidth: 60,
remote: true,
// rules: [
// {
// required: true,
@ -350,7 +351,7 @@ export default {
value: 'id',
res: 'data.records',
},
dicUrl:'/api/blade-system/user/page'
dicUrl:'/api/blade-system/user/page?current=1&size=9999&realName={{key}}'
},
{
label: '配送标记',
@ -469,10 +470,13 @@ export default {
beforeOpen(done, type) {
if (['edit', 'view'].includes(type)) {
console.log('form---------------------',this.form)
this.form.turnover = this.form.turnover + ''
this.form.goodsId = this.form.goodsId + ''
this.form.turnover = this.form.turnover && this.form.turnover + ''
this.form.goodsId = this.form.goodsId && this.form.goodsId + ''
done();
}else{
done();
}
done();
},
handlePaint(){
this.laInData = []

Write Preview
Loading…
Cancel
Save