Skip to content

M
mes-pad
Commit 81d20bfc authored by 528360026@qq.com's avatar 528360026@qq.com
Browse files
Options

显示已填报首件检，且满足需质检确认的要求（比如订单数量大于6000） 

提供合格、不合格、查看按钮
parent 93f2a653
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 49 deletions
pages/mes/qc/index.vue
View file @ 81d20bfc
......@@ -3,13 +3,13 @@
<view class="button-bar">
<view class="button-frame" @click="addQC('QCMSG')">
<view class="shortcut-icon icon-color01">
<img class="icon-button" :src="require('@/static/icons/png/pro.png')" alt="">
<image class="icon-button" src="/static/icons/png/pro.png"/>
</view>
<view class="grid-text">检查通知</view>
</view>
<view class="button-frame" v-for="qcType in dict.type.mes_ipqc_type" @click="addQC(qcType.value )">
<view class="button-frame" v-for="qcType in dict.type.mes_ipqc_type" v-if="qcType.value !== 'FIRST'" @click="addQC(qcType.value )">
<view class="shortcut-icon icon-color01">
<img class="icon-button" :src="require('@/static/icons/png/pro.png')" alt="">
<image class="icon-button" src="/static/icons/png/pro.png"/>
</view>
<view class="grid-text">{{ qcType.label }}</view>
</view>
......@@ -18,6 +18,10 @@
<view class="list-bar">
<scroll-view scroll-y="true" class="scroll-list" :style="{ 'height': (this.screenHeight -280) + 'px' }">
<uni-table ref="qcTable" border stripe :loading="loading" emptyText="未查询到数据">
<!-- <zb-table :columns="tableColumn" :stripe="true" @rowClick="rowClick"-->
<!-- @toggleRowSelection="toggleRowSelection" @toggleAllSelection="toggleAllSelection" :border="true"-->
<!-- :data="tableData"></zb-table>-->
<uni-tr>
<uni-th width="160px" align="center">检验单编号</uni-th>
<uni-th width="160px" align="center">检验单名称</uni-th>
......@@ -57,7 +61,8 @@
</uni-td>
<uni-td>
<view class="uni-group">
<button class="uni-button" size="mini" type="primary" @click="qcLineClick(line)">编辑
<button class="uni-button" size="mini" type="primary" v-if="line.quantityCheck>=line.maxNum"
@click="qcLineClick(line)">查看编辑
</button>
</view>
</uni-td>
......@@ -70,19 +75,18 @@
</view>
</view>
<u-modal width="1800rpx" v-model="qcModalFlag" :showConfirmButton=true :showCancelButton="true"
title="请填写检验单"
<u-modal width="90%" v-model="qcModalFlag" :showConfirmButton=true :showCancelButton="true" title="请填写检验单"
content="操作内容">
<u-form ref="qcForm" label-width="70px" :model="qcForm" :rules="qcRules">
<u-form ref="qcForm" label-width="70px">
<u-row>
<u-col span="5">
<u-form-item label="任务编号" prop="taskCode">
<u-form-item label="任务编号">
<SearchInput v-model="qcForm.taskCode" placeholder="请输入任务编号" hassearchbtn="true"
@serach="searchTask"/>
</u-form-item>
</u-col>
<u-col span="3">
<u-form-item label="检验单名称" label-width="90px" prop="ipqcName">
<u-form-item label="检验单名称" label-width="90px">
<u-input v-model="qcForm.ipqcName" placeholder="请输入检验单名称"></u-input>
</u-form-item>
</u-col>
......@@ -117,17 +121,25 @@
<u-col span="12">
<u-form-item label="检测人员" prop="inspector">
<!-- <u-input v-model="qcForm.inspector"></u-input>-->
<zxz-uni-data-select v-model="qcForm.inspector" filterable multiple dataKey="label" dataValue="value"
:localdata="qcUserList" @change="change"></zxz-uni-data-select>
<zxz-uni-data-select v-model="qcForm.inspector" filterable multiple dataKey="label"
dataValue="value" :localdata="qcUserList" @change="change"></zxz-uni-data-select>
</u-form-item>
</u-col>
</u-row>
<u-button type="primary" @click="submitIpqc" class="submit-qc">提交</u-button>
<u-row>
<u-col span="3"></u-col>
<u-col span="3">
<u-button type="primary" @click="submitIpqc">保存</u-button>
</u-col>
<u-col span="1"></u-col>
<u-col span="3">
<u-button type="success" @click="submitIpqc('CONFIRMED')">完成</u-button>
</u-col>
</u-row>
</u-form>
<scroll-view scroll-y="true" scroll-x="true" class="line-list">
<view class="line-content">
<uni-table ref="qcLineTable" class="line-table" border stripe :loading="loading"
emptyText="未查询到数据">
<uni-table ref="qcLineTable" class="line-table" border stripe :loading="loading" emptyText="未查询到数据">
<uni-tr>
<uni-th width="160px" align="center">检测项名称</uni-th>
<uni-th width="150px" align="center">检测工具</uni-th>
......@@ -154,7 +166,8 @@
<uni-td align="center">{{ line.minQuantity }}</uni-td>
<uni-td>
<view class="uni-group">
<button class="uni-button" size="mini" type="primary" @click="qcLineItemClick(line)">缺陷登记
<button class="uni-button" size="mini" type="primary"
@click="qcLineItemClick(line)">缺陷登记
</button>
</view>
</uni-td>
......@@ -164,8 +177,8 @@
</scroll-view>
</u-modal>
<u-modal width="760px" v-model="qcMsgVisible" :showConfirmButton=false :showCancelButton="true"
title="检验通知" content="操作内容">
<u-modal width="80%" v-model="qcMsgVisible" :showConfirmButton=false :showCancelButton="true" title="检验通知"
content="操作内容">
<uni-table class="line-table" border stripe :loading="loading" emptyText="未查询到数据">
<uni-tr>
<uni-th width="60px" align="center">单号</uni-th>
......@@ -203,10 +216,8 @@
</u-form>
</u-modal>
<u-modal width="600px" v-model="deffectModalFlag" @confirm="subQcdeffect" @cancel="getTemplateLineList"
confirm-text="提交"
:showConfirmButton=true :showCancelButton=true
title="缺陷登记">
<u-modal width="80%" v-model="deffectModalFlag" @confirm="subQcdeffect" @cancel="getTemplateLineList"
confirm-text="提交" :showConfirmButton=true :showCancelButton=true title="缺陷登记">
<u-button @click="addQcdeffect">新增</u-button>
<uni-card v-for="item in defectrecordList">
<u-form label-width="100px">
......@@ -224,7 +235,8 @@
<u-col>
<u-form-item label="缺陷等级">
<u-radio-group v-model="item.defectLevel">
<u-radio :name="item.value" v-for="item in dict.type.mes_defect_level" v-key="item.value">
<u-radio :name="item.value" v-for="item in dict.type.mes_defect_level"
v-key="item.value">
{{ item.label }}
</u-radio>
</u-radio-group>
......@@ -238,12 +250,13 @@
</template>
<script>
import SearchInput from "@/components/ScanInput/index.vue";
export default {
name: "QcContent",
components: {SearchInput},
components: {
SearchInput
},
dicts: ['mes_ipqc_type', 'mes_qc_result', 'mes_order_status', 'mes_defect_level'],
data() {
return {
......@@ -268,21 +281,19 @@ export default {
qcMsgVisible: false,
//所有检测单的列表
qcList: [],
qcUserList: [
{
value: 0,
label: 'admin'
}, {
value: 1,
label: '张三'
}, {
value: 2,
label: '李四'
}, {
value: 3,
label: '王五'
}
],
qcUserList: [{
value: 0,
label: 'admin'
}, {
value: 1,
label: '张三'
}, {
value: 2,
label: '李四'
}, {
value: 3,
label: '王五'
}],
taskInfo: {},
curQcType: '',
defectrecordList: [],
......@@ -308,7 +319,9 @@ export default {
}
},
async searchTask(val) {
const res = await this.$u.api.getTaskInfoByTaskCode({taskCode: val})
const res = await this.$u.api.getTaskInfoByTaskCode({
taskCode: val
})
if (res.code === 200) {
if (!res.data) {
this.$u.toast('暂未查询到任务订单信息！');
......@@ -316,7 +329,8 @@ export default {
this.taskInfo = res.data;
}
},
async submitIpqc() {
async submitIpqc(status = 'PREPARE') {
if (!this.taskInfo) {
this.$u.toast('请输入任务单号！');
return
......@@ -381,6 +395,7 @@ export default {
});
},
addQC(type) {
this.qcForm = {}
this.curQcType = type;
if (type === 'QCMSG') {
this.qcMsgVisible = true
......@@ -392,6 +407,7 @@ export default {
qcLineClick(item) {
this.qcModalFlag = true;
this.qcForm = item
console.log(this.qcForm)
this.getTemplateLineList()
},
qcLineItemClick(item) {
......@@ -449,7 +465,7 @@ export default {
}
.list-bar {
width: calc(100vw - 100px);
width: calc(100vw - 130px);
}
.button-bar {
......@@ -463,10 +479,14 @@ export default {
.button-frame {
width: 80px;
height: 80px;
background-color: aliceblue;
background-color: #76bd1d;
border-radius: 10px;
box-shadow: 2px 2px 3px #888888;
display: grid;
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: center;
color: #FFFFFF;
place-items: center;
}
......@@ -476,7 +496,7 @@ export default {
}
.shortcut-icon {
width: 48px;
width: 100%;
height: 48px;
align-items: center;
border-radius: 10px;
......@@ -491,9 +511,6 @@ export default {
font-size: 26px;
}
.scroll-list {
height: ;
}
.line-list {
width: 100%;
......@@ -537,4 +554,4 @@ export default {
margin: 1rpx auto;
display: block;
}
</style>
</style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment