Skip to content

M
mes-pad
Commit d6d777b7 authored by zhuli's avatar zhuli
Browse files
Options

Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev

parents 24ffbc66 84d0139c
Show whitespace changes
Inline Side-by-side
Showing with 92 additions and 26 deletions
components/AppScan/AppScan.vue
View file @ d6d777b7
......@@ -12,7 +12,8 @@ export default {
return {
barcode: null,
flash: false,
tip: '将二维码放入框中，即可自动扫描',
scanBarVew: null,
tip: '将二维码放入框中，即可自动扫描'
}
},
onShow() {
......@@ -35,6 +36,9 @@ export default {
}
},
methods: {
start() {
this.barcode.start()
},
/**
* 创建二维码
* @param {Object} currentWebview
......@@ -65,6 +69,8 @@ export default {
closed() {
this.barcode.close()
let currentWebview = this.$mp.page.$getAppWebview();
currentWebview.remove(this.scanBarVew)
},
/**
......@@ -109,7 +115,7 @@ export default {
},
closeImg);
scanBarVew.interceptTouchEvent(true);
this.scanBarVew = scanBarVew
currentWebview.append(scanBarVew);
scanBarVew.addEventListener("click", (e) => { //点亮手电筒
......
pages/mes/prodReport/index.vue
View file @ d6d777b7
......@@ -360,20 +360,20 @@
<u-col span="6">
<u-form-item label="合格数量:" prop="quantityQualify">
<u-number-box :min="0" @change="quantityChanged()"
<u-number-box :min="0" @change="quantityChanged()" :max="9999999999999999999999999999999999999999" :input-width="190"
v-model="feedback.quantityQualify"></u-number-box>
</u-form-item>
</u-col>
<u-col span="6">
<u-form-item label="不良品数量:" prop="quantityUnqualify">
<u-number-box :min="0" @change="quantityChanged()"
<u-number-box :min="0" @change="quantityChanged()" :max="99999999999999999999999999999999999999999" :input-width="190"
v-model="feedback.quantityUnqualify"></u-number-box>
</u-form-item>
</u-col>
<u-col span="6">
<u-form-item class="column-type" label-width="100px" label="合格数量(副):" prop="feedbackQuantityFu">
<view class="button-type2">
<u-number-box :min="0"
<u-number-box :min="0" :max="99999999999999999999999999999999999999999" :input-width="190"
@change="quantityChangedV2(feedback, feedbackQuantityFu, feedbackUnQuantityFu)"
v-model="feedbackQuantityFu"></u-number-box>
</view>
......@@ -382,7 +382,7 @@
</u-col>
<u-col span="6">
<u-form-item class="column-type" label-width="100px" label="不良品数量(副):" prop="feedbackUnQuantityFu">
<u-number-box :min="0" align="right"
<u-number-box :min="0" align="right" :max="99999999999999999999999999999999999999999" :input-width="190"
@change="quantityChangedV2(feedback, feedbackQuantityFu, feedbackUnQuantityFu)"
v-model="feedbackUnQuantityFu"></u-number-box>
</u-form-item>
......@@ -573,19 +573,25 @@
<view style="display: flex">
<view style="width: 520px" v-if="recoilMaterialVisible">
<!-- #ifdef APP-PLUS -->
<app-scan ref="appScan" @getCode="recoilMaterialScan"></app-scan>
<app-scan ref="appScan" @getCode="recoilMaterialScan" v-if="!recoilMaterialFlag"></app-scan>
<!-- #endif -->
<view class="scan-mask" v-show="recoilMaterialFlag" :style="{top: '38px',
left: '0px',
height: '87%',
width: '500px',
position: 'absolute',
background: 'black'}"></view>
</view>
<view class="list-bar">
<scroll-view scroll-y="true" class="scroll-list" :style="{ height: this.screenHeight - 280 + 'px' }">
<scroll-view scroll-y="true" scroll-x="true" class="scroll-list" :style="{ height: this.screenHeight - 280 + 'px' }">
<uni-table ref="qcTable" border stripe :loading="loading" emptyText="未查询到数据">
<uni-tr>
<!-- <uni-th width="200px" align="center">操作</uni-th> -->
<uni-th width="110px" align="center">产品物料编码</uni-th>
<uni-th width="300px" align="center">产品物料名称</uni-th>
<uni-th width="110px" align="center">批次号</uni-th>
<uni-th width="110px" align="center">需求数量</uni-th>
<uni-th width="110px" align="center">数量</uni-th>
<uni-th width="200px" align="center">产品物料名称</uni-th>
<uni-th width="90px" align="center">批次号</uni-th>
<uni-th width="80px" align="center">需求数量</uni-th>
<uni-th width="65px" align="center">数量</uni-th>
</uni-tr>
<uni-tr v-for="(line, index) in recoilMaterialDetailList" :key="index">
......@@ -725,6 +731,7 @@
<uni-th width="80px" align="center">领料数量</uni-th>
<uni-th width="80px" align="center">本次退料数</uni-th>
<uni-th width="80px" align="center">累计退料数</uni-th>
<uni-th width="100px" align="center">版号</uni-th>
<uni-th width="110px" align="center">批次号</uni-th>
<uni-th width="60" align="center">合格</uni-th>
</uni-tr>
......@@ -740,6 +747,7 @@
<uni-td align="center">{{ line.quantityIssued }}</uni-td>
<uni-td align="center">{{ line.applyNum }}</uni-td>
<uni-td align="center">{{ line.totalBackNum }}</uni-td>
<uni-td align="center">{{ line.packNo }}</uni-td>
<uni-td align="center">{{ line.batchCode }}</uni-td>
<uni-td align="center">{{ line.isQualified == 1 ? '是' : '' }}{{ line.isQualified == 0 ? '否' : ''
}}</uni-td>
......@@ -791,8 +799,8 @@
<zb-table :columns="tableDetailColumn" :stripe="true" :border="true" :data="tableDataDetail"></zb-table>
</view>
</u-modal>
<u-modal title="查看倒冲批次" :showRecoilMaterialButton="true"
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
<u-modal title="查看倒冲批次" :showRecoilMaterialButton="true" @confirm="$refs.appScan.start()"
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px',' z-index': 9999 }"
v-model="recoilMaterialFlag" width="1300rpx">
<view>
<zb-table :columns="recoilMaterialColumn" :stripe="true" :border="true" :data="recoilMaterialList"></zb-table>
......@@ -2032,7 +2040,7 @@ export default {
// quantityUnqualify: 0
// }
// },
quantityChanged() {
quantityChanged(val) {
this.feedbackForm.quantity = this.feedbackForm.quantityQualify + this.feedbackForm.quantityUnqualify;
},
......@@ -2574,6 +2582,7 @@ export default {
batchShow(row) {
this.recoilMaterialList = row.proRecoilMaterialList;
this.$refs.appScan.closed()
this.recoilMaterialFlag = true;
},
......@@ -2616,6 +2625,11 @@ export default {
const t = this;
// const items = this.curTaskInfo.workorderOption.find((item) => item.value === this.curTaskInfo.workorderCode);
// console.log(this.curTaskInfo.workorderOption, this.curTaskInfo.workorderCode);
let workorderCode = null
if(this.curTaskInfo.workorderOption) {
const finditem = this.curTaskInfo.workorderOption.find(v=>v.value === this.curTaskInfo.workorderCode)
if(finditem) workorderCode = finditem.text
}
this.materialRequestArrays.forEach((s) => {
if (s.applyNum != null) {
rst.push({
......@@ -2624,7 +2638,7 @@ export default {
workunitCode: this.curTaskInfo.workunitCode,
workunitName: this.curTaskInfo.workunitName,
taskWorkunitId: this.curTaskInfo.taskWorkunitId,
workorderCode: s.workorderCode,
workorderCode: workorderCode,
taskId: taskInfo.taskId,
applyNum: s.applyNum,
applyType: 1
......@@ -2690,7 +2704,7 @@ export default {
this.materialRequestArrays = this.materialRequests.filter((item, index, self) => {
return self.findIndex((t) => t.itemCode === item.itemCode) === index;
});
console.log(materialRequestArrays, 'materialRequestArrays');
console.log(this.materialRequestArrays, 'materialRequestArrays');
}
});
}
......@@ -2721,8 +2735,18 @@ export default {
this.materialReturnSelected.isQualified = this.materialReturnFormData.isQualified;
this.materialReturnFormVisible = false;
},
formatDateRandom() {
const date = new Date();
const year = date.getFullYear();
const month = (date.getMonth() + 1).toString().padStart(2, '0');
const day = date.getDate().toString().padStart(2, '0');
let randomNumber = Math.floor(Math.random() * 10000);
randomNumber = randomNumber.toString().padStart(4, '0');
return `SN${year}${month}${day}${randomNumber}`
},
materialReturnSave() {
const taskInfo = this.tableSelectData[0];
const apply_no = this.formatDateRandom()
const rst = this.materialReturnList.map((s) => {
let data = {
itemId: s.itemId,
......@@ -2733,12 +2757,14 @@ export default {
workOrderId: s.workorderId,
batchNo: s.batchCode,
packNo: s.packNo,
apply_no: apply_no,
isQualified: s.isQualified
};
if (this.materialReturnFormData.workorderCode) {
data.workorderCode = this.materialReturnFormData.workorderCode;
} else {
data.workorderCode = this.curTaskInfo.workorderOption.flatMap((it) => it.value).join(',');
// data.workorderCode = this.curTaskInfo.workorderOption.flatMap((it) => it.value).join(',');
data.workorderCode = null;
}
return data;
});
......
pages/mes/qc/components/addDialog.vue
View file @ d6d777b7
......@@ -21,6 +21,11 @@
<u-form-item label="检验单名称" label-width="90px">
<u-input v-model="qcForm.ipqcName" placeholder="请输入检验单名称"></u-input>
</u-form-item>
</u-col>
<u-col span="4" v-if="btnType">
<u-form-item label="检验单编号" label-width="90px">
<u-input v-model="qcForm.ipqcCode" placeholder="请输入检验单编号"></u-input>
</u-form-item>
</u-col>
<u-col span="4">
<u-form-item label="检测结果" prop="checkResult">
......@@ -40,12 +45,12 @@
</u-col>
<u-col span="4">
<u-form-item label="合格数量" prop="quantityQualified">
<u-number-box v-model="qcForm.quantityQualified" @change="handleChangeQuantityCheck"></u-number-box>
<u-number-box :min="0" v-model="qcForm.quantityQualified" @change="handleChangeQuantityCheck"></u-number-box>
</u-form-item>
</u-col>
<u-col span="4">
<u-form-item label="不合格数量" prop="quantityUnqualified">
<u-number-box v-model="qcForm.quantityUnqualified" @change="handleChangeQuantityCheck"></u-number-box>
<u-number-box :min="0" v-model="qcForm.quantityUnqualified" @change="handleChangeQuantityCheck"></u-number-box>
</u-form-item>
</u-col>
</u-row>
......@@ -59,7 +64,7 @@
</u-row>
</u-form>
<view class="btnbox">
<u-button type="success" v-if="btnType === 'firstEdit' || !btnType" size="medium" @click="handleAddFirstEdit">新增</u-button>
<u-button type="success" v-if="isEdit" size="medium" @click="handleAddFirstEdit">新增</u-button>
</view>
<view class="line-content-item">
<uni-table ref="qcLineTable" class="line-table" border stripe :loading="loading" emptyText="未查询到数据">
......@@ -67,6 +72,7 @@
<uni-th width="100px" align="center">质检项目</uni-th>
<uni-th width="100px" align="center">检验要求</uni-th>
<uni-th width="150px" align="center">检验结果</uni-th>
<!-- <uni-th width="15px" align="center">操作</uni-th> -->
</uni-tr>
<uni-tr v-for="(line, index) in qcLines" :key="index + 'index'">
<uni-td align="center">{{ line.indexName }}</uni-td>
......@@ -75,6 +81,9 @@
<uni-data-checkbox v-if="line.inputType == 2" multiple v-model="line.qualityCheckResults" :localdata="line.selectValues"></uni-data-checkbox>
<uni-easyinput v-else v-model="line.qualityCheckResults"></uni-easyinput>
</uni-td>
<!-- <uni-td width="15px" align="center">
<view @click="del('qcAddList', index)" :style="{color: isEdit ? '#e56048' : '#ddd'}">删除</view>
</uni-td> -->
</uni-tr>
<uni-tr v-for="(line, index) in qcAddList" :key="index + 'add'">
<uni-td align="center">
......@@ -87,6 +96,9 @@
<uni-td width="150px" align="center">
<uni-easyinput v-model="line.qualityCheckResults"></uni-easyinput>
</uni-td>
<!-- <uni-td width="15px" align="center">
<view @click="del('qcAddList', index)" :style="{color: isEdit ? '#e56048' : '#ddd'}">删除</view>
</uni-td> -->
</uni-tr>
</uni-table>
</view>
......@@ -144,7 +156,11 @@
},
created() {
this.visable = true
console.log('qqq', this.dict.type.mes_qc_result)
},
computed: {
isEdit () {
return this.btnType === 'firstEdit' || !this.btnType || this.btnType === 'sjqrFinish'
}
},
watch: {
visable(){
......@@ -173,6 +189,20 @@
}
},
methods: {
del(list, index){
if(this.isEdit) {
uni.showModal({
title: '提示',
content: '您确定要删除此项吗？',
style: 'z-index: 99999',
success: async (res) => {
if (res.confirm) {
this[list].splice(index, 1)
}
}
})
}
},
getTemplateLineList() {
this.$u.api
.getIpqcLineList({
......@@ -339,10 +369,14 @@
}
.btnbox {
// display:flex;
margin-bottom: 20rpx;
margin-bottom: 10rpx;
margin-top: 10rpx;
padding-left: 40rpx;
.u-btn {
width: 150rpx;
}
}
.del-modal{
z-index: 99999;
}
</style>
\ No newline at end of file
pages/mes/qc/index.vue
View file @ d6d777b7
......@@ -72,12 +72,12 @@
<u-modal width="90%" @confirm="submitIpqc" @cancel="closemodel" v-model="qcModalFlag" :showConfirmButton="showIpqcConfirmButton" :showCancelButton="true" title="请填写检验单" content="操作内容">
<u-form ref="qcForm" label-width="90px" class="addForm">
<u-row>
<u-col span="5">
<u-col span="4">
<u-form-item label="任务编号">
<SearchInput v-model="qcForm.taskCode" placeholder="请输入任务编号" hassearchbtn="true" @serach="searchTask" />
</u-form-item>
</u-col>
<u-col span="3">
<u-col span="4">
<u-form-item label="检验单名称" label-width="90px">
<u-input v-model="qcForm.ipqcName" placeholder="请输入检验单名称"></u-input>
</u-form-item>
......
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