Skip to content

M
mes-pad
Commit e2fe0e76 authored by 沈翠玲's avatar 沈翠玲
Browse files
Options

临时提交

parent 5138ee38
Hide whitespace changes
Inline Side-by-side
Showing with 237 additions and 57 deletions
common/http.api.js
View file @ e2fe0e76
...@@ -147,7 +147,7 @@ const install = (Vue, vm) => { ...@@ -147,7 +147,7 @@ const install = (Vue, vm) => {
//查看人员管理 //查看人员管理
userQuery: (params = {}) => userQuery: (params = {}) =>
vm.$u.get(config.adminPath + '/mes/md/workunitWorker/list', params), vm.$u.get(config.adminPath + '/mes/md/workunitWorker/getMdWorkunitWorkerByUserName', params),
//增加缺陷记录 //增加缺陷记录
addDefectrecord: (params = {}) => addDefectrecord: (params = {}) =>
...@@ -420,6 +420,8 @@ const install = (Vue, vm) => { ...@@ -420,6 +420,8 @@ const install = (Vue, vm) => {
abnormal: { abnormal: {
detail: (params = {}) => detail: (params = {}) =>
vm.$u.get(config.adminPath + '/qc/information/list', params), vm.$u.get(config.adminPath + '/qc/information/list', params),
getAbnormalNumber: () =>
vm.$u.get(config.adminPath + '/qc/report/getAbnormalNumber'),
newlyAdd: (params = {}) => newlyAdd: (params = {}) =>
vm.$u.postJson(config.adminPath + '/qc/report', params), vm.$u.postJson(config.adminPath + '/qc/report', params),
}, },
......
lang/th_TH.json
View file @ e2fe0e76
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
"请输入工作单元名称": "กรุณาใส่ชื่อหน่วยงาน", "请输入工作单元名称": "กรุณาใส่ชื่อหน่วยงาน",
"工作中心名称": "ชื่อศูนย์งาน", "工作中心名称": "ชื่อศูนย์งาน",
"工号": "หมายเลขพนักงาน", "工号": "หมายเลขพนักงาน",
"请输入编号": "กรุณาใส่หมายเลข", "请扫描/输入工号": "กรุณาสแกน/ป้อนหมายเลขที่ทํางานของคุณ",
"姓名": "ชื่อ", "姓名": "ชื่อ",
"请输入名称": "กรุณาใส่ชื่อ", "请输入名称": "กรุณาใส่ชื่อ",
"规格书类型:": "ประเภทเอกสารสเปค:", "规格书类型:": "ประเภทเอกสารสเปค:",
...@@ -296,5 +296,6 @@ ...@@ -296,5 +296,6 @@
"开始下载": "เริ่มดาวน์โหลด", "开始下载": "เริ่มดาวน์โหลด",
"进度:": "ความคืบหน้า:", "进度:": "ความคืบหน้า:",
"共": "ทั้งหมด", "共": "ทั้งหมด",
"条": "บทความ" "条": "บทความ",
"车间异常单编号": "หมายเลขคําสั่งซื้อข้อยกเว้นร้านค้า"
} }
\ No newline at end of file
lang/zh_CN.json
View file @ e2fe0e76
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
"请输入工作单元名称": "请输入工作单元名称", "请输入工作单元名称": "请输入工作单元名称",
"工作中心名称": "工作中心名称", "工作中心名称": "工作中心名称",
"工号": "工号", "工号": "工号",
"请输入编号": "请输入编号", "请扫描/输入工号": "请扫描/输入工号",
"姓名": "姓名", "姓名": "姓名",
"请输入名称": "请输入名称", "请输入名称": "请输入名称",
"规格书类型:": "规格书类型:", "规格书类型:": "规格书类型:",
...@@ -296,5 +296,10 @@ ...@@ -296,5 +296,10 @@
"开始下载": "开始下载", "开始下载": "开始下载",
"进度:": "进度:", "进度:": "进度:",
"共": "共", "共": "共",
"条": "条" "条": "条",
"车间异常单编号": "车间异常单编号",
"查不到报工人数据": "查不到报工人数据",
"请输入报工人工号": "请输入报工人工号",
"选择原因": "选择原因",
"不合格原因": "不合格原因"
} }
\ No newline at end of file
pages/mes/prodReport/components/abnormalReason.vue 0 → 100644
View file @ e2fe0e76
<template>
<view class="dmodel-table">
<view class="search">
<u-form :model="tableParams" labelAlign="right" class="tableForm">
<u-form-item :label="$t('工号')" label-width="60px" name="userName">
<uni-easyinput type="text" v-model="tableParams.userName" :placeholder="$t('请输入编号')" />
</u-form-item>
<u-form-item :label="$t('姓名')" label-width="60px" name="nickName">
<uni-easyinput type="text" v-model="tableParams.nickName" :placeholder="$t('请输入名称')" />
</u-form-item>
<u-form-item>
<u-button class="btn" @click="handleClick" type="primary" size="medium">{{$t('搜索')}}</u-button>
</u-form-item>
</u-form>
</view>
<view>
<zb-table ref="zbTable" rowKey="userName" :columns="tableColumn" :data="tableData" :stripe="true" @toggleRowSelection="toggleRowSelection"></zb-table>
</view>
<view class="uni-pagination-box"><uni-pagination show-icon :page-size="params.pageSize" :current="params.pageNum" :total="total" @change="change" /></view>
</view>
</template>
<script>
import i18n from '../../../../lang/index'
export default {
props: {
data: {
type: Object,
default: () => {}
}
},
data() {
return {
params: {
pageNum: 1,
pageSize: 10,
workunitId: this.data?.workunitId || null
},
total: 0,
tableParams: {
nickName: null,
userName: null
},
tableData: [],
tableSelectData: [],
tableColumn: [
{
type: 'selection',
width: 40
},
{
name: 'userName',
label: i18n.t('工号'),
width: 160
},
{
name: 'nickName',
label: i18n.t('姓名'),
width: 200
},
{
name: 'workunitName',
label: i18n.t('工作单元'),
width: 160
}
]
};
},
// computed: {
// tableData() {
// return this.data || []
// }
// },
mounted() {
this.getList();
// this.data.workstationName
},
methods: {
handleClick() {
if (this.tableParams.userName) {
this.params.userName = this.tableParams.userName;
} else {
delete this.params.userName
}
if (this.tableParams.nickName) {
this.params.nickName = this.tableParams.nickName;
} else {
delete this.params.nickName
}
this.params.pageNum = 1;
this.getList();
},
async getList() {
const res = await this.$u.api.userQuery(this.params);
console.log(res, 'res');
if (res.code == 200) {
this.tableData = res.rows.map((item) => {
return {
...item,
workunitName: this.data?.workunitName || null
};
});
this.total = res.total;
}
},
// 分页触发
change(e) {
this.params.pageNum = e.current;
this.getList();
},
toggleRowSelection(checked, arr) {
this.tableSelectData = arr;
}
}
};
</script>
<style lang="scss" scoped>
.dmodel-table {
height: 1200rpx;
margin-top: 20rpx;
padding: 0 20rpx;
position: relative;
}
.tableForm {
display: flex;
margin-bottom: 20rpx;
}
.btn {
margin-left: 10px;
}
.uni-pagination-box {
position: absolute;
right: 20rpx;
bottom: 40rpx;
}
</style>
\ No newline at end of file
pages/mes/prodReport/components/userPersonnel.vue
View file @ e2fe0e76
...@@ -3,20 +3,13 @@ ...@@ -3,20 +3,13 @@
<view class="search"> <view class="search">
<u-form :model="tableParams" labelAlign="right" class="tableForm"> <u-form :model="tableParams" labelAlign="right" class="tableForm">
<u-form-item :label="$t('工号')" label-width="60px" name="userName"> <u-form-item :label="$t('工号')" label-width="60px" name="userName">
<uni-easyinput type="text" v-model="tableParams.userName" :placeholder="$t('请输入编号')" /> <u-input type="text" v-model="tableParams.userName" :placeholder="$t('请扫描/输入工号')" @confirm="confirmUserName($event)"/>
</u-form-item>
<u-form-item :label="$t('姓名')" label-width="60px" name="nickName">
<uni-easyinput type="text" v-model="tableParams.nickName" :placeholder="$t('请输入名称')" />
</u-form-item>
<u-form-item>
<u-button class="btn" @click="handleClick" type="primary" size="medium">{{$t('搜索')}}</u-button>
</u-form-item> </u-form-item>
</u-form> </u-form>
</view> </view>
<view> <view>
<zb-table ref="zbTable" rowKey="userName" :columns="tableColumn" :data="tableData" :stripe="true" @toggleRowSelection="toggleRowSelection"></zb-table> <zb-table ref="zbTable" rowKey="userName" :columns="tableColumn" :data="tableData" :stripe="true" @toggleRowSelection="toggleRowSelection"></zb-table>
</view> </view>
<view class="uni-pagination-box"><uni-pagination show-icon :page-size="params.pageSize" :current="params.pageNum" :total="total" @change="change" /></view>
</view> </view>
</template> </template>
...@@ -33,8 +26,6 @@ export default { ...@@ -33,8 +26,6 @@ export default {
data() { data() {
return { return {
params: { params: {
pageNum: 1,
pageSize: 10,
workunitId: this.data?.workunitId || null workunitId: this.data?.workunitId || null
}, },
total: 0, total: 0,
...@@ -45,10 +36,6 @@ export default { ...@@ -45,10 +36,6 @@ export default {
tableData: [], tableData: [],
tableSelectData: [], tableSelectData: [],
tableColumn: [ tableColumn: [
{
type: 'selection',
width: 40
},
{ {
name: 'userName', name: 'userName',
label: i18n.t('工号'), label: i18n.t('工号'),
...@@ -74,10 +61,15 @@ export default { ...@@ -74,10 +61,15 @@ export default {
// } // }
// }, // },
mounted() { mounted() {
this.getList(); // this.getList();
// this.data.workstationName // this.data.workstationName
}, },
methods: { methods: {
confirmUserName(e) {
this.tableParams.userName = e
if (!this.tableParams.userName) return this.$u.toast(i18n.t('请输入报工人工号'))
this.handleClick()
},
handleClick() { handleClick() {
if (this.tableParams.userName) { if (this.tableParams.userName) {
this.params.userName = this.tableParams.userName; this.params.userName = this.tableParams.userName;
...@@ -89,27 +81,16 @@ export default { ...@@ -89,27 +81,16 @@ export default {
} else { } else {
delete this.params.nickName delete this.params.nickName
} }
this.params.pageNum = 1;
this.getList(); this.getList();
}, },
async getList() { async getList() {
const res = await this.$u.api.userQuery(this.params); const res = await this.$u.api.userQuery(this.params);
console.log(res, 'res'); if (res.code == 200 && res.data) {
if (res.code == 200) { this.tableData.push(res.data)
this.tableData = res.rows.map((item) => { } else {
return { this.$u.toast(i18n.t('查不到报工人数据'))
...item,
workunitName: this.data?.workunitName || null
};
});
this.total = res.total;
} }
}, },
// 分页触发
change(e) {
this.params.pageNum = e.current;
this.getList();
},
toggleRowSelection(checked, arr) { toggleRowSelection(checked, arr) {
this.tableSelectData = arr; this.tableSelectData = arr;
......
pages/mes/prodReport/index.vue
View file @ e2fe0e76
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="6"> <u-col span="6">
<u-form-item :label="$t('工序:')" prop="nickName"> <u-form-item :label="$t('工序:')" prop="processName">
{{ feedback.processName }} {{ feedback.processName }}
</u-form-item> </u-form-item>
</u-col> </u-col>
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="6"> <u-col span="6">
<u-form-item :label="$t('未收货数:')" prop="nickName"> <u-form-item :label="$t('未收货数:')" prop="unquantityFeedback">
{{ feedback.unquantityFeedback }} {{ feedback.unquantityFeedback }}
</u-form-item> </u-form-item>
</u-col> </u-col>
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="6"> <u-col span="6">
<u-form-item :label="$t('产品名称:')" prop="nickName"> <u-form-item :label="$t('产品名称:')" prop="productName">
{{ feedback.productName }} {{ feedback.productName }}
</u-form-item> </u-form-item>
</u-col> </u-col>
...@@ -284,13 +284,7 @@ ...@@ -284,13 +284,7 @@
<u-number-box <u-number-box
:min="0" :min="0"
@change="quantityChanged()" @change="quantityChanged()"
:max=" :max="getFeedbackMax(feedback)"
feedback.isSerialReport &&
Number(feedback.isSerialReport) === 1 &&
!isWaiXie
? 1
: 9999999999999999999999999999999999999999
"
:input-width="190" :input-width="190"
v-model="feedback.quantityQualify" v-model="feedback.quantityQualify"
:long-press="false" :long-press="false"
...@@ -323,14 +317,24 @@ ...@@ -323,14 +317,24 @@
/> />
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="6">
<u-form-item :label="$t('不合格原因:')" prop="abnormalType">
<u-input v-model="feedback.abnormalType" disabled></u-input>
<u-button
@tap="chooseReason(feedback)"
type="success"
size="mini"
>{{ $t('选择原因') }}</u-button
>
</u-col>
<u-col :span="6"> <u-col :span="6">
<u-form-item :label="$t('报工人:')" prop="nickName"> <u-form-item :label="$t('报工人:')" prop="nickName">
<u-input v-model="feedback.nickName"></u-input> <u-input v-model="feedback.nickName" disabled></u-input>
<u-button <u-button
@tap="getCode(feedback)" @tap="getCode(feedback)"
type="success" type="success"
size="mini" size="mini"
>{{ $t('报工人员') }}</u-button >{{ $t('报工人员扫码') }}</u-button
> >
</u-form-item> </u-form-item>
</u-col> </u-col>
...@@ -433,6 +437,30 @@ ...@@ -433,6 +437,30 @@
/> />
</view> </view>
</u-modal> </u-modal>
<!-- //生产报工报工人员 -->
<u-modal
:title="$t('不合格原因')"
:cancelText="$t('取消')"
:confirmText="$t('确认')"
@confirm="userDetermine()"
show-cancel-button
:title-style="{
'background-color': '#1E3770',
color: '#FFFFFF',
'line-height': '37px',
'padding-top': '0px',
}"
v-model="abnormalReasonVisible"
width="1300rpx"
>
<view>
<userPersonnel
ref="userPersonnelRef"
v-if="abnormalReasonVisible"
:data="usePersonData"
/>
</view>
</u-modal>
<u-modal <u-modal
:title="$t('暂停原因')" :title="$t('暂停原因')"
:cancelText="$t('取消')" :cancelText="$t('取消')"
...@@ -494,6 +522,11 @@ ...@@ -494,6 +522,11 @@
</u-form-item> --> </u-form-item> -->
<u-row> <u-row>
<u-col span="6">
<u-form-item :label="$t('车间异常单编号')" prop="abnormalNumber" label-width="110px">
<u-input v-model="ExceptionForms.abnormalNumber" disabled></u-input>
</u-form-item>
</u-col>
<u-col span="6"> <u-col span="6">
<u-form-item :label="$t('异常类型')" prop="abnormalType"> <u-form-item :label="$t('异常类型')" prop="abnormalType">
<uni-data-select <uni-data-select
...@@ -1078,6 +1111,7 @@ export default { ...@@ -1078,6 +1111,7 @@ export default {
ExceptionForms: { ExceptionForms: {
abnormalType: null, abnormalType: null,
abnormalNumber: null,
abnormalReason: null, abnormalReason: null,
}, },
viewSopPicture: [], viewSopPicture: [],
...@@ -1610,6 +1644,16 @@ export default { ...@@ -1610,6 +1644,16 @@ export default {
numclik(...arg) { numclik(...arg) {
console.log('99999999', arg) console.log('99999999', arg)
}, },
getFeedbackMax(feedback){
if (feedback.isSerialReport && Number(feedback.isSerialReport) === 1 && !this.isWaiXie) {
return 1
} else if (this.isWaiXie || feedback.surpassState){
return 9999999999999999999999999999999999999999
} else if(!feedback.surpassState) {
return feedback.workorderUnfeedbackSum
}
},
changeWorkstation() { changeWorkstation() {
uni.$emit('changeWorkunit') uni.$emit('changeWorkunit')
}, },
...@@ -1887,6 +1931,9 @@ export default { ...@@ -1887,6 +1931,9 @@ export default {
this.usePersonData = row this.usePersonData = row
this.userTempVisible = true this.userTempVisible = true
}, },
chooseReason(row) {
this.abnormalReasonVisible = true
},
toggleRowSelection(checked, arr) { toggleRowSelection(checked, arr) {
console.log(arr, 'this.tableSelectData') console.log(arr, 'this.tableSelectData')
this.tableSelectData = arr this.tableSelectData = arr
...@@ -1898,7 +1945,7 @@ export default { ...@@ -1898,7 +1945,7 @@ export default {
let nick = '' let nick = ''
let user = '' let user = ''
const tableSelectData = JSON.parse( const tableSelectData = JSON.parse(
JSON.stringify(this.$refs.userPersonnelRef.tableSelectData) JSON.stringify(this.$refs.userPersonnelRef.tableData)
) )
const a = tableSelectData.length - 1 const a = tableSelectData.length - 1
tableSelectData.forEach((item) => { tableSelectData.forEach((item) => {
...@@ -2260,7 +2307,7 @@ export default { ...@@ -2260,7 +2307,7 @@ export default {
reportQualify: item.quantityQualify + item.quantityUnqualify, reportQualify: item.quantityQualify + item.quantityUnqualify,
printName: '', printName: '',
lastProcess: item.isLastProcess == 1, //未工序 lastProcess: item.isLastProcess == 1, //未工序
nickName: this.vuex_user.nickName, nickName: '',
workorderCode: workorderCode:
item.proWorkorderList.length > 0 item.proWorkorderList.length > 0
? item.proWorkorderList[0].workorderCode ? item.proWorkorderList[0].workorderCode
...@@ -2684,11 +2731,16 @@ export default { ...@@ -2684,11 +2731,16 @@ export default {
}) })
}, },
doException() { async doException() {
if (this.tableSelectData.length > 1) { if (this.tableSelectData.length > 1) {
this.$u.toast(i18n.t('不允许同时操作多条任务')) this.$u.toast(i18n.t('不允许同时操作多条任务'))
return return
} }
let abnormalNumber = ''
const data = await this.$u.api.abnormal.getAbnormalNumber()
if (data.code === 200) {
abnormalNumber = data.data
}
this.ExceptionForms = { this.ExceptionForms = {
abnormalType: null, abnormalType: null,
abnormalReason: null, abnormalReason: null,
...@@ -2706,6 +2758,7 @@ export default { ...@@ -2706,6 +2758,7 @@ export default {
abnormalType: '', abnormalType: '',
abnormalReason: '', abnormalReason: '',
abnormalTime: '', abnormalTime: '',
abnormalNumber: abnormalNumber
}) })
this.errorVisible = true this.errorVisible = true
}, },
...@@ -2734,13 +2787,10 @@ export default { ...@@ -2734,13 +2787,10 @@ export default {
this.feedbackQuantityFu = 0 this.feedbackQuantityFu = 0
this.timeTest.isshow = false this.timeTest.isshow = false
this.feedbackForms.forEach((item) => { this.feedbackForms.forEach((item) => {
if (item.returnMa == '1') { if (!item.nickName) {
if (!this.curTaskInfo.returnReason) { this.$u.toast(i18n.t('报工人不能为空'))
this.$u.toast(i18n.t('原因不能为空！')) this.proVisible = true
this.proVisible = true return
return
}
this.materialReturnSave()
} }
if ( if (
......
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