Yangwl
/
lanju-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改质量管理 来料检验接口字段调整

Browse Source
master
LAPTOP-R6EHHS26\86155 2 years ago
parent f078acabd7
commit cbfb8b1d6b
5 changed files with 177 additions and 104 deletions
Show Stats Download Patch File Download Diff File

105
src/pages/quality/Belowstandard/index.vue
Unescape Escape View File

@ -60,7 +60,7 @@
</view> </view>
</view> </view>
<view> <view>
<u-popup v-model="show" mode="center" width="98%"> <u-popup v-model="show" mode="center" width="98%" :closeable="true">
<view class="selectlist"> <view class="selectlist">
<div class="item-name"> <div class="item-name">
<div class="quest">来料不合格处理:</div> <div class="quest">来料不合格处理:</div>
@ -138,49 +138,7 @@ import { session } from '@/store/modules/session';
export default class PurchaseWHSRM extends BasePage { export default class PurchaseWHSRM extends BasePage {
model = model; model = model;
moren = '请选择检验节点'; moren = '请选择检验节点';
list: any = [ list: any = [];
{
createBy: null,
createTime: '2023-12-05 17:05:38',
updateBy: null,
updateTime: null,
remark: null,
poolName: null,
deptId: null,
id: '6026eb7bb28e463a82f8ce42a28b8644',
taskId: 'bacd97a5eda443a7895a88c484b88a51',
status: '0',
nextNodeCode: null,
nextNodeName: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
factoryCode: null,
delFlag: null,
checkTimeStart: null,
checkTimeEnd: null,
type: null,
checkType: 'checkTypeLL',
checkName: '来料检验',
checkNo: '202312050001',
incomeBatchNo: '202312051339zxl',
orderNo: '202312051338zxl',
materialCode: '000000020000000279',
materialName: 'Φ120mm微烟白坯',
quality: '800.00',
unit: 'ST',
supplierCode: '0000102874',
supplierName: '中山恒阳日用制品有限公司',
incomeTime: '2023-12-05 21:34:06',
checkLoc: 'khd',
checkStatus: '0',
checkManCode: 'device',
checkManName: '设备测试',
checkTime: '2023-12-05 17:05:38.0',
checkResult: 'N',
},
];
show = false; show = false;
showselect = false; showselect = false;
isshow = false; isshow = false;
@ -199,47 +157,7 @@ export default class PurchaseWHSRM extends BasePage {
radiovalue: null, radiovalue: null,
}, },
]; ];
formdata: any = { formdata: any = {};
createBy: null,
createTime: '2023-12-05 17:05:38',
updateBy: null,
updateTime: null,
remark: null,
poolName: null,
deptId: null,
id: '6026eb7bb28e463a82f8ce42a28b8644',
taskId: 'bacd97a5eda443a7895a88c484b88a51',
status: '0',
nextNodeCode: null,
nextNodeName: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
factoryCode: null,
delFlag: null,
checkTimeStart: null,
checkTimeEnd: null,
type: null,
checkType: 'checkTypeLL',
checkName: '来料检验',
checkNo: '202312050001',
incomeBatchNo: '202312051339zxl',
orderNo: '202312051338zxl',
materialCode: '000000020000000279',
materialName: 'Φ120mm微烟白坯',
quality: '800.00',
unit: 'ST',
supplierCode: '0000102874',
supplierName: '中山恒阳日用制品有限公司',
incomeTime: '2023-12-05 21:34:06',
checkLoc: 'khd',
checkStatus: '0',
checkManCode: 'device',
checkManName: '设备测试',
checkTime: '2023-12-05 17:05:38.0',
checkResult: 'N',
};
selectList: any = {}; selectList: any = {};
// remove: any = {}; // remove: any = {};
// async onReady() { // async onReady() {
@ -591,18 +509,27 @@ export default class PurchaseWHSRM extends BasePage {
// }); // });
} }
async onLoad(options) { async onLoad(options) {
this.getselectlist(); this.getselectlist(options);
}
async getselectlist(options) {
await this.model.getCheckType();
this.nodelist = this.model.orderNoItemList;
if (options.listitem) { if (options.listitem) {
let str = decodeURIComponent(options.listitem); let str = decodeURIComponent(options.listitem);
if (str) { if (str) {
this.detailsinfo = JSON.parse(str); this.detailsinfo = JSON.parse(str);
if (this.detailsinfo.checkType) {
this.selectList.value = this.detailsinfo.checkType; this.selectList.value = this.detailsinfo.checkType;
} else {
this.selectList.value = this.nodelist[0].orderCode;
}
console.log(this.detailsinfo); console.log(this.detailsinfo);
let query = { let query = {
factoryCode: session.PoolName, factoryCode: session.PoolName,
checkManCode: session.userName, checkManCode: session.userName,
checkStatus: 0, checkStatus: 0,
checkType: this.detailsinfo.checkType, checkType: this.selectList.value,
}; };
await this.model.getCheckTaskListall(query); await this.model.getCheckTaskListall(query);
console.log(model.CheckTaskListall); console.log(model.CheckTaskListall);
@ -610,10 +537,6 @@ export default class PurchaseWHSRM extends BasePage {
} }
} }
} }
async getselectlist() {
await this.model.getCheckType();
this.nodelist = this.model.orderNoItemList;
}
async onPass(item) { async onPass(item) {
console.log('1234567', item); console.log('1234567', item);
this.clickitem = item; this.clickitem = item;

4
src/pages/quality/Materialinspection/index.vue
Unescape Escape View File

@ -51,7 +51,7 @@
</view> </view>
</view> </view>
<view> <view>
<u-popup v-model="show" mode="center" width="98%"> <u-popup v-model="show" mode="center" width="98%" :closeable="true">
<view class="selectlist"> <view class="selectlist">
<div class="item-name"> <div class="item-name">
<div class="quest">检验项目 :</div> <div class="quest">检验项目 :</div>
@ -168,7 +168,7 @@
</div> </div>
<div class="upload-name"> <div class="upload-name">
<div> <div>
<u-input :border="true" v-model="tagsvalue" :focus="isfocus" style="overflow: hidden" /> <u-input :border="true" v-model="tagsvalue" type="number" :focus="isfocus" style="overflow: hidden" />
</div> </div>
<div> <div>
<u-button style="width: 100px; height: 35px; margin-left: 5px" @click="ontagsadd" size="mini" type="primary">确认</u-button> <u-button style="width: 100px; height: 35px; margin-left: 5px" @click="ontagsadd" size="mini" type="primary">确认</u-button>

167
src/pages/quality/Records/index.vue
Unescape Escape View File

@ -51,13 +51,13 @@
</view> </view>
</view> </view>
<view> <view>
<u-popup v-model="show" mode="center" width="98%"> <u-popup v-model="show" mode="center" width="98%" :closeable="true">
<view class="selectlist"> <view class="selectlist">
<view class="item" v-for="(item, index) in detaillistceshi" :key="index"> <view class="item" v-for="(item, index) in detaillistceshi" :key="index">
<div class="item1">项目名称: {{ item.ruleName }}</div> <div class="item1">项目名称: {{ item.ruleName }}</div>
<div class="item1">检查结果: {{ item.itemMethod }}</div> <div class="item1">检查标准: {{ item.checkStandard }}</div>
<div class="item1 item2" v-if="item.propertyCode == '0'"> <div class="item1 item2 item3" v-if="item.propertyCode == '0'">
<div>检查标准: {{ item.checkStandard }}</div> <div>检查结果:</div>
<div class="select"> <div class="select">
<u-radio-group v-model="item.status" @change="radioGroupChange(item, item.status, index)"> <u-radio-group v-model="item.status" @change="radioGroupChange(item, item.status, index)">
<u-radio @change="radioChange" :disabled="item.status == n.type ? false : true" v-for="(n, indexn) in listselect" :key="indexn" :name="n.type"> <u-radio @change="radioChange" :disabled="item.status == n.type ? false : true" v-for="(n, indexn) in listselect" :key="indexn" :name="n.type">
@ -67,13 +67,22 @@
</div> </div>
</div> </div>
<div class="item1 item2" v-if="item.propertyCode == '1'"> <div class="item1 item2" v-if="item.propertyCode == '1'">
<div @click="checkimg(item, item.actualValue, index)">检查标准: {{ item.checkStandard }}</div>
<div class="input-box" id="input-box1"> <div class="input-box" id="input-box1">
实际值: 实际值:
<input class="input" :disabled="item.actualValue == null ? true : true" v-model="item.actualValue" @focus="focus(item, item.actualValue, index)" @change="changeinput(item)" @input="input(item)" type="text" name="" id="" /> <input class="input" :disabled="item.actualValue == null ? true : true" v-model="item.actualValue" @focus="focus(item, item.actualValue, index)" @change="changeinput(item)" @input="input(item)" type="text" name="" id="" />
单位:mm 单位:mm
</div> </div>
</div> </div>
<div class="item1 item2 item3" v-if="item.propertyCode == '1'">
<div>检查结果:</div>
<div class="select">
<u-radio-group v-model="item.status" @change="radioGroupChange(item, item.status, index)">
<u-radio @change="radioChange" :disabled="item.status == n.type ? false : true" v-for="(n, indexn) in listselect" :key="indexn" :name="n.type">
{{ n.name }}
</u-radio>
</u-radio-group>
</div>
</div>
<!-- <div v-for="(item1, index1) in item.standardList" :key="index1"> <!-- <div v-for="(item1, index1) in item.standardList" :key="index1">
<div class="item1 item2" v-if="item1.standardType == 'qualitative'"> <div class="item1 item2" v-if="item1.standardType == 'qualitative'">
<div>检查标准: {{ item1.standardName }}</div> <div>检查标准: {{ item1.standardName }}</div>
@ -96,6 +105,23 @@
</div> --> </div> -->
</view> </view>
</view> </view>
<u-form class="Belowsform3" ref="form" label-width="230rpx" label-position="left">
<u-form-item label="抽样数量:">
<u-input v-model="clickitem.sampleQuality" :disabled="clickitem.sampleQuality == null ? true : true" placeholder="" type="number" />
</u-form-item>
<u-form-item v-if="isshow1" label="不合格数量:">
<u-input v-model="clickitem.noOkQuality" :disabled="clickitem.noOkQuality == null ? true : true" placeholder="" type="number" />
</u-form-item>
<u-form-item v-if="isshow3" label="A类不良:">
<u-input v-model="clickitem.aNoOkquality" :disabled="clickitem.aNoOkquality == null ? true : true" placeholder="" type="number" />
</u-form-item>
<u-form-item v-if="isshow3" label="B类不良:">
<u-input v-model="clickitem.bNoOkquality" :disabled="clickitem.bNoOkquality == null ? true : true" placeholder="" type="number" />
</u-form-item>
<u-form-item v-if="isshow3" label="C类不良:">
<u-input v-model="clickitem.cNoOkquality" :disabled="clickitem.cNoOkquality == null ? true : true" placeholder="" type="number" />
</u-form-item>
</u-form>
<div style="text-align: center"> <div style="text-align: center">
<u-button style="width: 100%; height: 35px; margin: auto" @click="onOk" size="mini" type="primary">确认</u-button> <u-button style="width: 100%; height: 35px; margin: auto" @click="onOk" size="mini" type="primary">确认</u-button>
</div> </div>
@ -223,8 +249,18 @@ export default class PurchaseWHSRM extends BasePage {
nodelist: any = ''; nodelist: any = '';
detaillistceshi: any = []; detaillistceshi: any = [];
clickitem: any = ''; clickitem: any = '';
formdata: any = {
sampleQuality: null,
noOkQuality: null,
aNoOkquality: null,
bNoOkquality: null,
cNoOkquality: null,
};
isvalue = false; isvalue = false;
isfocus = false; isfocus = false;
isshow1 = false;
isshow2 = false;
isshow3 = false;
//收货按钮 //收货按钮
tagClick(index) { tagClick(index) {
this.tagslist.splice(index, 1); this.tagslist.splice(index, 1);
@ -270,6 +306,19 @@ export default class PurchaseWHSRM extends BasePage {
async onPass(item) { async onPass(item) {
console.log('1234567', item); console.log('1234567', item);
this.clickitem = item; this.clickitem = item;
let labelname = null;
this.nodelist.forEach((item) => {
if (item.orderCode == this.selectList.value) {
labelname = item.checkName;
}
});
if (labelname == '来料检验') {
this.isshow1 = true;
} else if (labelname == '成品入库检验') {
this.isshow1 = true;
} else if (labelname == '过程检验') {
this.isshow3 = true;
}
let belongTo = item.recordId; let belongTo = item.recordId;
await this.model.getCheckTaskList(belongTo); await this.model.getCheckTaskList(belongTo);
this.detaillistceshi = this.model.CheckTaskList; this.detaillistceshi = this.model.CheckTaskList;
@ -698,9 +747,9 @@ export default class PurchaseWHSRM extends BasePage {
font-weight: 600; font-weight: 600;
} }
.item2 { .item2 {
display: flex; // display: flex;
align-content: center; // align-content: center;
justify-content: space-between; // justify-content: space-between;
.select { .select {
font-size: 15px; font-size: 15px;
font-weight: 400; font-weight: 400;
@ -715,7 +764,6 @@ export default class PurchaseWHSRM extends BasePage {
margin-top: 2px; margin-top: 2px;
.input { .input {
font-size: 12px; font-size: 12px;
width: 65px;
padding: 1px 8px; padding: 1px 8px;
height: 20px; height: 20px;
box-sizing: border-box; box-sizing: border-box;
@ -728,6 +776,11 @@ export default class PurchaseWHSRM extends BasePage {
} }
} }
} }
.item3 {
display: flex;
align-content: center;
justify-content: space-between;
}
} }
} }
.modal { .modal {
@ -747,5 +800,101 @@ export default class PurchaseWHSRM extends BasePage {
} }
} }
} }
.Belowsform3 {
background-color: #fff;
padding: 7px 8px 7px 12px;
.u-form-item {
line-height: 35rpx;
font-size: 16px;
}
.photoList {
display: flex;
padding-top: 12rpx;
.chooseBtn {
width: 202rpx;
height: 202rpx;
background: #fafafa;
border-radius: 12rpx;
border: 2rpx dashed #e2e2e2;
display: flex;
justify-content: center;
align-items: center;
.inner {
text-align: center;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
.desc {
font-size: 28rpx;
font-weight: 400;
color: #24252a;
line-height: 40rpx;
}
.img {
width: 50rpx;
height: 50rpx;
margin-bottom: 6rpx;
}
}
.photoBox {
width: 202rpx;
height: 202rpx;
background: #fafafa;
border-radius: 12rpx;
position: relative;
.closeBtn {
position: absolute;
top: -12rpx;
right: -12rpx;
z-index: 2;
width: 36rpx;
height: 36rpx;
.img {
width: 36rpx;
height: 36rpx;
}
}
.img {
width: 202rpx;
height: 202rpx;
border-radius: 12rpx;
}
}
.itemBox {
flex: 0 0 202rpx;
margin-right: 20rpx;
&:last-child {
margin-right: 0;
}
}
}
}
::v-deep .input1 .u-input__input {
//background: rgb(233 231 231 / 38%);
background-color: #f0f0f0;
}
::v-deep .uni-input-placeholder {
font-weight: 500;
left: 10px;
}
::v-deep .uni-textarea-placeholder {
font-weight: 500;
}
::v-deep .Belowsform3 .uni-input-input {
width: 97%;
border: 1px solid #dcdfe6;
}
} }
</style> </style>

1
src/pages/quality/model.ts
Unescape Escape View File

@ -21,6 +21,7 @@ export class quality extends VuexModule {
//loginName: session.loginName, //loginName: session.loginName,
params: { params: {
factoryCode: session.PoolName, factoryCode: session.PoolName,
checkManCode: session.userName,
}, },
}); });
const orderNoItemList = result.data; const orderNoItemList = result.data;

2
src/pages/shouye/me.vue
Unescape Escape View File

@ -65,7 +65,7 @@ export default class RawHome extends BasePage {
model = model; model = model;
src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg'; src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg';
today = dayjs().format('YYYY-MM-DD dddd'); today = dayjs().format('YYYY-MM-DD dddd');
version = '0.0.18'; version = '0.0.19';
checkversion: any = {}; checkversion: any = {};
sessiondata: any = ''; sessiondata: any = '';
onLoad() { onLoad() {

Write Preview
Loading…
Cancel
Save