Skip to content

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

报工修改

parent 02466744
Hide whitespace changes
Inline Side-by-side
Showing with 269 additions and 199 deletions
pages/mes/prodReport/index.vue
View file @ 78513280
......@@ -16,13 +16,16 @@
<view>
<u-form :model="tableParams" labelAlign="right" class="tableForm">
<u-form-item label="编排单号" label-width="70px" name="arrangeCode">
<uni-easyinput type="text" suffixIcon="scan" v-model="tableParams.arrangeCode" @iconClick="iconClickArrangeCode" placeholder="请输入编排单号" />
<uni-easyinput type="text" suffixIcon="scan" v-model="tableParams.arrangeCode"
@iconClick="iconClickArrangeCode" placeholder="请输入编排单号" />
</u-form-item>
<u-form-item label="生产工单编号" label-width="100px" name="workorderCode">
<uni-easyinput type="text" suffixIcon="scan" v-model="tableParams.workorderCode" @iconClick="iconClickWorkorderCode" placeholder="请输入生产工单编号" />
<uni-easyinput type="text" suffixIcon="scan" v-model="tableParams.workorderCode"
@iconClick="iconClickWorkorderCode" placeholder="请输入生产工单编号" />
</u-form-item>
<u-form-item name="allowProduce" label-width="80px" label="当前可加工">
<uni-data-checkbox v-model="tableParams.allowProduce" @change="getTaskList()" :localdata="allowProduceLocal"></uni-data-checkbox>
<uni-data-checkbox v-model="tableParams.allowProduce" @change="getTaskList()"
:localdata="allowProduceLocal"></uni-data-checkbox>
</u-form-item>
<u-form-item name="allowProduce">
<u-button @click="getTaskList()" type="primary" size="medium">搜索</u-button>
......@@ -30,18 +33,9 @@
</u-form>
</view>
<view class="prod-body-left-task">
<zb-table
ref="zbtable"
:columns="tableColumn"
:stripe="true"
rowKey="taskWorkunitId"
:isTrClassStyle="isTrClassStyle"
@rowClick="rowClick"
@toggleRowSelection="toggleRowSelection"
@toggleAllSelection="toggleAllSelection"
:border="true"
:data="tableData"
></zb-table>
<zb-table ref="zbtable" :columns="tableColumn" :stripe="true" rowKey="taskWorkunitId"
:isTrClassStyle="isTrClassStyle" @rowClick="rowClick" @toggleRowSelection="toggleRowSelection"
@toggleAllSelection="toggleAllSelection" :border="true" :data="tableData"></zb-table>
</view>
<view class="prod-body-left-num">可选订单数：{{ tableData.length }}</view>
<!-- <view class="prod-body-left-bom"> -->
......@@ -103,15 +97,10 @@
</scroll-view>
</view>
<u-modal
title="生产报工"
@confirm="handleSubmitfeedback"
show-cancel-button
<u-modal title="生产报工" @confirm="handleSubmitfeedback" show-cancel-button
:show-confirm-button="feedbackForms[0] && feedbackForms[0].isPackage === '1' ? false : true"
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="proVisible"
width="1800rpx"
>
v-model="proVisible" width="1800rpx">
<view>
<!-- 是否包装工序isPackage为1是 -->
......@@ -173,7 +162,8 @@
<u-row>
<u-col span="4">
<u-form-item label="生产工单:" prop="workorderId">
<uni-data-select v-model="feedback.workorderId" :localdata="feedback.workorderOption" @change="workorderSelect($event, i)"></uni-data-select>
<uni-data-select v-model="feedback.workorderId" :localdata="feedback.workorderOption"
@change="workorderSelect($event, i)"></uni-data-select>
</u-form-item>
</u-col>
<u-col span="4">
......@@ -183,7 +173,8 @@
</u-col>
<u-col span="4">
<u-form-item label="报工时间:" prop="feedbackTime">
<uni-datetime-picker return-type="string" class="times" type="datetime" :clear-icon="false" v-model="feedback.feedbackTime" />
<uni-datetime-picker return-type="string" class="times" type="datetime" :clear-icon="false"
v-model="feedback.feedbackTime" />
</u-form-item>
</u-col>
</u-row>
......@@ -201,7 +192,8 @@
<u-col span="6">
<u-form-item label="检测人员:" prop="checkBy">
<u-input disabled v-model="feedback.checkBy"></u-input>
<u-button @tap="(userVisible = true), (useData = feedback)" type="success" size="mini">选择人员</u-button>
<u-button @tap="(userVisible = true), (useData = feedback)" type="success"
size="mini">选择人员</u-button>
</u-form-item>
</u-col>
</u-row>
......@@ -209,14 +201,15 @@
<u-col span="6">
<u-form-item label="打印模板:" prop="printTemplate">
<u-input v-model="feedback.printTemplate" placeholder="请选择打印模板"></u-input>
<u-button @tap="getPrintTemplate(feedback)" type="success" style="margin-left: 20rpx" size="mini">选择打印模板</u-button>
<u-button @tap="getPrintTemplate(feedback)" type="success" style="margin-left: 20rpx"
size="mini">选择打印模板</u-button>
</u-form-item>
</u-col>
<u-col span="4">
<u-form-item label-width="120px" label="是否合并包装:" prop="mergePack">
<view class="uni-list-item__extra">
<!-- @change="handleChangePackNum(feedback, i)" -->
<u-radio-group v-model="feedback.mergePack" >
<u-radio-group v-model="feedback.mergePack">
<u-radio :name="1">是</u-radio>
<u-radio :name="0">否</u-radio>
</u-radio-group>
......@@ -229,7 +222,8 @@
</u-row>
</u-form>
<view>
<u-tabs :list="feedback.listTabPro" :is-scroll="false" :show-bar="false" :current="feedback.currentTabPro" @change="handleChangeTabPro($event, feedback)"></u-tabs>
<u-tabs :list="feedback.listTabPro" :is-scroll="false" :show-bar="false"
:current="feedback.currentTabPro" @change="handleChangeTabPro($event, feedback)"></u-tabs>
<!-- 报工列表 -->
<view v-if="feedback.tableOrderData.length">
<zb-table :columns="tableOrderColumn" :stripe="true" :border="true" :data="feedback.tableOrderData">
......@@ -243,13 +237,9 @@
</template>
<template slot="peration" slot-scope="scope">
<!-- {{ scope.row }} -->
<u-button
v-if="Number(scope.row.packageNum) > Number(scope.row.feedbackQuantity)"
@tap="handleSubmitPackageFeedback(feedback, scope.row, i)"
type="success"
style="margin-left: 20rpx"
size="mini"
>
<u-button v-if="Number(scope.row.packageNum) > Number(scope.row.feedbackQuantity)"
@tap="handleSubmitPackageFeedback(feedback, scope.row, i)" type="success"
style="margin-left: 20rpx" size="mini">
打印/报工
</u-button>
<!-- <u-input v-model="scope.row.reportQuantity" type="number"></u-input> -->
......@@ -258,7 +248,8 @@
</view>
<!-- 指令列表 -->
<view v-if="feedback.tableDirectiveData.length">
<zb-table :columns="tableDirectiveColumn" :stripe="true" :border="true" :data="feedback.tableDirectiveData">
<zb-table :columns="tableDirectiveColumn" :stripe="true" :border="true"
:data="feedback.tableDirectiveData">
<template slot="reportQuantity" slot-scope="scope">
<!-- {{ scope.row }} -->
<u-input v-model="scope.row.reportQuantity" type="number"></u-input>
......@@ -269,14 +260,16 @@
</template>
<template slot="peration" slot-scope="scope">
<!-- {{ scope.row }} -->
<u-button @tap="handleSubmitPackageFeedback(feedback, scope.row, i)" type="success" style="margin-left: 20rpx" size="mini">打印/报工</u-button>
<u-button @tap="handleSubmitPackageFeedback(feedback, scope.row, i)" type="success"
style="margin-left: 20rpx" size="mini">打印/报工</u-button>
<!-- <u-input v-model="scope.row.reportQuantity" type="number"></u-input> -->
</template>
</zb-table>
</view>
<!-- SIZE列表 -->
<view v-if="feedback.tableSizeData.length">
<zb-table :columns="feedback.tableSizeColumn" :stripe="true" :border="true" :data="feedback.tableSizeData">
<zb-table :columns="feedback.tableSizeColumn" :stripe="true" :border="true"
:data="feedback.tableSizeData">
<template slot="reportQuantity" slot-scope="scope">
<!-- {{ scope.row }} -->
<u-input v-model="scope.row.reportQuantity" type="number"></u-input>
......@@ -287,7 +280,8 @@
</template>
<template slot="peration" slot-scope="scope">
<!-- {{ scope.row }} -->
<u-button @tap="handleSubmitPackageFeedback(feedback, scope.row, i)" type="success" style="margin-left: 20rpx" size="mini">打印/报工</u-button>
<u-button @tap="handleSubmitPackageFeedback(feedback, scope.row, i)" type="success"
style="margin-left: 20rpx" size="mini">打印/报工</u-button>
</template>
</zb-table>
</view>
......@@ -312,6 +306,8 @@
<u-col span="6">
<u-form-item label="报工总数量:" prop="quantity">
{{ feedback.quantityQualify + feedback.quantityUnqualify }}
<!-- {{ computedQuantityV2 }} -->
</u-form-item>
</u-col>
<u-col span="6">
......@@ -330,70 +326,116 @@
</u-col>
<u-col span="6">
<u-form-item label="生产工单:" prop="workorderId">
<uni-data-select v-model="feedback.workorderId" :localdata="feedback.workorderOption" @change="workorderSelect($event, i)"></uni-data-select>
<uni-data-select v-model="feedback.workorderId" :localdata="feedback.workorderOption"
@change="workorderSelect($event, i)"></uni-data-select>
</u-form-item>
</u-col>
</u-row>
<u-row>
<!--
<view>
<block v-for="(feedback, i) in feedbackForms" :key="i">
<view class="feedback-card">
{{ i }} - {{ feedback.unitOfConvert }}- {{ feedback.quantity }}
</view>
</block>
<u-col span="6">
计算器 : {{ computedQuantity }}
feedbackQuantityFu: {{ feedbackQuantityFu }},
feedbackUnQuantityFu: {{ feedbackUnQuantityFu }},
quantityUnqualify: {{ feedback.quantityUnqualify }}
quantityqualify: {{ feedback.quantityQualify }}
unitOfConvert: {{ feedback.unitOfConvert }}
</u-col>
<view class="box" v-if="timeTest.isshow">123</view>
<button type="default" @tap="changeShow()">隐藏</button>
</view> -->
<u-col span="6">
<u-form-item label="合格数量:" prop="quantityQualify">
<u-number-box :min="0" @change="quantityChanged" v-model="feedback.quantityQualify"></u-number-box>
<u-number-box :min="0" @change="quantityChanged()"
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" v-model="feedback.quantityUnqualify"></u-number-box>
<u-number-box :min="0" @change="quantityChanged()"
v-model="feedback.quantityUnqualify"></u-number-box>
</u-form-item>
</u-col>
<u-col span="6">
<u-form-item label="合格数量(副):" prop="feedbackQuantityFu">
<u-number-box :min="0"
@change="quantityChangedV2(feedback, feedbackQuantityFu, feedbackUnQuantityFu)"
v-model="feedbackQuantityFu"></u-number-box>
</u-form-item>
</u-col>
<u-col span="6">
<u-form-item label="不良品数量(副):" prop="feedbackUnQuantityFu">
<u-number-box :min="0"
@change="quantityChangedV2(feedback, feedbackQuantityFu, feedbackUnQuantityFu)"
v-model="feedbackUnQuantityFu"></u-number-box>
</u-form-item>
</u-col>
<u-col span="6">
<u-form-item label="报工时间:" prop="feedbackTime">
<uni-datetime-picker return-type="string" class="times" type="datetime" :clear-icon="false" v-model="feedback.feedbackTime" />
<uni-datetime-picker return-type="string" class="times" type="datetime" :clear-icon="false"
v-model="feedback.feedbackTime" />
</u-form-item>
</u-col>
</u-row>
<!-- <u-row> -->
<!-- <u-col span="3" width: max-content>
<u-button class="auto-size-button" type="default" @tap="changeShow()">隐藏</u-button>
</u-col>
<view class="box" v-if="timeTest.isshow">
<u-col span="6">
<u-form-item label="合格数量(副):" prop="feedbackQuantityFu">
<u-number-box :min="0" @change="quantityChangedV2(feedback, feedbackQuantityFu)"
v-model="feedbackQuantityFu"></u-number-box>
</u-form-item>
</u-col>
<u-col span="6">
<u-form-item label="不良品数量(副):" prop="feedbackUnQuantityFu">
<u-number-box :min="0" @change="quantityChangedV2(feedback, feedbackUnQuantityFu)"
v-model="feedbackUnQuantityFu"></u-number-box>
</u-form-item>
</u-col>
</view> -->
<!-- </u-row> -->
</u-form>
</view>
</view>
</scroll-view>
</view>
</u-modal>
<u-modal
title="选择人员"
@confirm="chooseUser()"
show-cancel-button
<u-modal title="选择人员" @confirm="chooseUser()" show-cancel-button
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="userVisible"
width="1300rpx"
>
v-model="userVisible" width="1300rpx">
<view class="feedback-card">
<user ref="userRef" v-if="userVisible" />
</view>
</u-modal>
<u-modal
title="选择打印模板"
@confirm="handleSubmitPrintTemplate"
show-cancel-button
<u-modal title="选择打印模板" @confirm="handleSubmitPrintTemplate" show-cancel-button
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="printTemplateVisible"
width="1300rpx"
>
v-model="printTemplateVisible" width="1300rpx">
<view class="feedback-card">
<print-template ref="printTemplateRef" :data="printTemplateData" />
</view>
</u-modal>
<u-modal
title="刀模版上下机"
show-cancel-button
:show-confirm-button="!!knifeTempType"
@confirm="handleSubmitConfirmlKnifeTemp"
@cancel="handleSubmitCancelKnifeTemp"
:confirmText="knifeTempCancelText"
<u-modal title="刀模版上下机" show-cancel-button :show-confirm-button="!!knifeTempType"
@confirm="handleSubmitConfirmlKnifeTemp" @cancel="handleSubmitCancelKnifeTemp" :confirmText="knifeTempCancelText"
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="knifeTempVisible"
width="100%"
:content-style="{ height: '87vh' }"
>
v-model="knifeTempVisible" width="100%" :content-style="{ height: '87vh' }">
<view style="display: flex">
<view style="width: 520px">
<!-- #ifdef APP-PLUS -->
......@@ -404,31 +446,22 @@
</view>
</u-modal>
<!-- //生产报工报工人员 -->
<u-modal
title="报工人员"
@confirm="userDetermine()"
show-cancel-button
<u-modal title="报工人员" @confirm="userDetermine()" show-cancel-button
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="userTempVisible"
width="1300rpx"
>
v-model="userTempVisible" width="1300rpx">
<view>
<userPersonnel ref="userPersonnelRef" v-if="userTempVisible" :data="usePersonData" />
</view>
</u-modal>
<u-modal
title="暂停原因"
@confirm="stopReasonSubmit()"
show-cancel-button
<u-modal title="暂停原因" @confirm="stopReasonSubmit()" show-cancel-button
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="stopReasonVisible"
width="1300rpx"
>
v-model="stopReasonVisible" width="1300rpx">
<view class="feedback-card" style="height: 200px">
<u-form label-width="120px" :model="stopReasonForm" :rules="rules">
<u-form-item label="暂停原因" prop="reason">
<!-- <uni-data-select v-model="stopReasonForm.reason" :localdata="exception" @change="stopReas"></uni-data-select> -->
<uni-data-select v-model="stopReasonForm.reason" :localdata="causeList" @change="stopCause"></uni-data-select>
<uni-data-select v-model="stopReasonForm.reason" :localdata="causeList"
@change="stopCause"></uni-data-select>
</u-form-item>
<u-form-item label="暂停描述" prop="desc">
<!-- <uni-data-selec v-model="stopReasonForm.desc" :localdata="reasonList" type=“textarea”></uni-data-select> -->
......@@ -438,14 +471,9 @@
</view>
</u-modal>
<u-modal
title="异常报告"
@confirm="newlyAddss()"
show-cancel-button
<u-modal title="异常报告" @confirm="newlyAddss()" show-cancel-button
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '60px', 'padding-top': '0px' }"
v-model="errorVisible"
width="1300rpx"
>
v-model="errorVisible" width="1300rpx">
<view class="feedback-card">
<u-form label-width="70px" labelAlign="right" :model="ExceptionForms" :rules="rules">
<!-- <u-form-item label="异常时间" prop="abnormalTime">
......@@ -456,7 +484,8 @@
<u-row>
<u-col span="6">
<u-form-item label="异常类型" prop="abnormalType">
<uni-data-select v-model="ExceptionForms.abnormalType" :localdata="exception" @change="stopReas"></uni-data-select>
<uni-data-select v-model="ExceptionForms.abnormalType" :localdata="exception"
@change="stopReas"></uni-data-select>
</u-form-item>
</u-col>
<u-col span="6">
......@@ -486,17 +515,10 @@
</u-form>
</view>
</u-modal>
<u-modal
title="投料校验"
@cancel="$refs.appScan.closed(), (feedingInspectionVisible = false)"
show-cancel-button
cancelText="关闭"
:show-confirm-button="false"
<u-modal title="投料校验" @cancel="$refs.appScan.closed(), (feedingInspectionVisible = false)" show-cancel-button
cancelText="关闭" :show-confirm-button="false"
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="feedingInspectionVisible"
width="100%"
:content-style="{ height: '87vh' }"
>
v-model="feedingInspectionVisible" width="100%" :content-style="{ height: '87vh' }">
<view style="display: flex">
<view style="width: 520px" v-if="feedingInspectionVisible">
<!-- #ifdef APP-PLUS -->
......@@ -504,7 +526,8 @@
<!-- #endif -->
</view>
<view class="list-bar">
<scroll-view scroll-y="true" scroll-x="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 border stripe :loading="loading" emptyText="未查询到数据">
<uni-tr>
<uni-th width="100px" align="center">操作</uni-th>
......@@ -517,7 +540,8 @@
<uni-tr v-for="(line, index) in feedingInspectionList" :key="index">
<uni-td align="center">
<view class="uni-group">
<button class="uni-button" size="mini" type="primary" @click="validateFeedingInspection(line)">校验</button>
<button class="uni-button" size="mini" type="primary"
@click="validateFeedingInspection(line)">校验</button>
</view>
</uni-td>
<uni-td align="center">{{ line.attr3 == 1 ? '校验' : '未校验' }}</uni-td>
......@@ -532,17 +556,10 @@
</view>
</u-modal>
<u-modal
title="反冲料登记"
@cancel="$refs.appScan.closed(), (recoilMaterialVisible = false)"
show-cancel-button
cancelText="关闭"
:show-confirm-button="false"
<u-modal title="反冲料登记" @cancel="$refs.appScan.closed(), (recoilMaterialVisible = false)" show-cancel-button
cancelText="关闭" :show-confirm-button="false"
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="recoilMaterialVisible"
width="100%"
:content-style="{ height: '87vh' }"
>
v-model="recoilMaterialVisible" width="100%" :content-style="{ height: '87vh' }">
<view style="display: flex">
<view style="width: 520px" v-if="recoilMaterialVisible">
<!-- #ifdef APP-PLUS -->
......@@ -561,7 +578,8 @@
<uni-tr v-for="(line, index) in recoilMaterialList" :key="index">
<uni-td align="center">
<view class="uni-group">
<button class="uni-button" size="mini" type="primary" @click="recoilMaterialDelete(line)">删除</button>
<button class="uni-button" size="mini" type="primary"
@click="recoilMaterialDelete(line)">删除</button>
</view>
</uni-td>
<uni-td align="center">{{ line.itemCode }}</uni-td>
......@@ -574,14 +592,9 @@
</view>
</u-modal>
<u-modal
title="领料申请"
@confirm="materialRequestSave()"
show-cancel-button
<u-modal title="领料申请" @confirm="materialRequestSave()" show-cancel-button
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="materialRequestVisible"
width="1300rpx"
>
v-model="materialRequestVisible" width="1300rpx">
<view class="list-bar">
<u-form label-width="65px" labelAlign="right" :model="curTaskInfo">
<u-row>
......@@ -592,12 +605,14 @@
</u-col>
<u-col span="4.5">
<u-form-item label="生产工单" prop="workorderCode">
<uni-data-select v-model="curTaskInfo.workorderCode" @change="materialReturnWorkorderProcessItem" :localdata="curTaskInfo.workorderOption"></uni-data-select>
<uni-data-select v-model="curTaskInfo.workorderCode" @change="materialReturnWorkorderProcessItem"
:localdata="curTaskInfo.workorderOption"></uni-data-select>
</u-form-item>
</u-col>
<u-col span="4.5">
<u-form-item label="领料原因" prop="pickingReason">
<uni-data-select v-model="curTaskInfo.pickingReason" :localdata="reasonList" @change="pickingCause"></uni-data-select>
<uni-data-select v-model="curTaskInfo.pickingReason" :localdata="reasonList"
@change="pickingCause"></uni-data-select>
</u-form-item>
</u-col>
</u-row>
......@@ -613,7 +628,8 @@
<uni-tr v-for="(line, index) in materialRequestArrays" :key="index">
<uni-td align="center">
<view class="uni-group">
<button class="uni-button" size="mini" type="primary" @click="materialRequestFormShow(line)">补料</button>
<button class="uni-button" size="mini" type="primary"
@click="materialRequestFormShow(line)">补料</button>
</view>
</uni-td>
<uni-td align="center">{{ line.itemCode }}</uni-td>
......@@ -625,14 +641,9 @@
</view>
</u-modal>
<u-modal
title="领料申请数量"
@confirm="materialRequestSetting()"
show-cancel-button
<u-modal title="领料申请数量" @confirm="materialRequestSetting()" show-cancel-button
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="materialRequestFormVisible"
width="700rpx"
>
v-model="materialRequestFormVisible" width="700rpx">
<view class="">
<u-form label-width="100px">
<u-row>
......@@ -645,7 +656,8 @@
<u-row>
<u-col>
<u-form-item label="领料数量">
<u-number-box v-model="materialRequestFormData.applyNum" :long-press="false" :positive-integer="false" :size="50" :input-width="190"></u-number-box>
<u-number-box v-model="materialRequestFormData.applyNum" :long-press="false" :positive-integer="false"
:size="50" :input-width="190"></u-number-box>
</u-form-item>
</u-col>
</u-row>
......@@ -653,14 +665,9 @@
</view>
</u-modal>
<u-modal
title="退料申请"
@confirm="materialReturnSave()"
show-cancel-button
<u-modal title="退料申请" @confirm="materialReturnSave()" show-cancel-button
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="materialReturnVisible"
width="1600rpx"
>
v-model="materialReturnVisible" width="1600rpx">
<view class="list-bar">
<u-form :model="materialReturnFormData" label-width="100px">
<u-row>
......@@ -671,7 +678,8 @@
</u-col>
<u-col span="6">
<u-form-item label="生产工单" prop="workorderCode">
<uni-data-select v-model="materialReturnFormData.workorderCode" @change="materialReturnWorkorderChange" :localdata="curTaskInfo.workorderOption"></uni-data-select>
<uni-data-select v-model="materialReturnFormData.workorderCode" @change="materialReturnWorkorderChange"
:localdata="curTaskInfo.workorderOption"></uni-data-select>
</u-form-item>
</u-col>
</u-row>
......@@ -691,7 +699,8 @@
<uni-tr v-for="(line, index) in materialReturnList" :key="index">
<uni-td align="center">
<view class="uni-group">
<button class="uni-button" size="mini" type="primary" @click="materialReturnFormShow(line)">退料</button>
<button class="uni-button" size="mini" type="primary"
@click="materialReturnFormShow(line)">退料</button>
</view>
</uni-td>
<uni-td align="center">{{ line.itemCode }}</uni-td>
......@@ -700,21 +709,17 @@
<uni-td align="center">{{ line.applyNum }}</uni-td>
<uni-td align="center">{{ line.totalBackNum }}</uni-td>
<uni-td align="center">{{ line.batchCode }}</uni-td>
<uni-td align="center">{{ line.isQualified == 1 ? '是' : '' }}{{ line.isQualified == 0 ? '否' : '' }}</uni-td>
<uni-td align="center">{{ line.isQualified == 1 ? '是' : '' }}{{ line.isQualified == 0 ? '否' : ''
}}</uni-td>
</uni-tr>
</uni-table>
</scroll-view>
</view>
</u-modal>
<u-modal
title="退料申请数量"
@confirm="materialReturnSetting()"
show-cancel-button
<u-modal title="退料申请数量" @confirm="materialReturnSetting()" show-cancel-button
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="materialReturnFormVisible"
width="700rpx"
>
v-model="materialReturnFormVisible" width="700rpx">
<view class="">
<u-form label-width="100px">
<u-row>
......@@ -727,7 +732,8 @@
<u-row>
<u-col>
<u-form-item label="退料数量">
<u-number-box v-model="materialReturnFormData.applyNum" :long-press="false" :positive-integer="false" :size="50" :input-width="190"></u-number-box>
<u-number-box v-model="materialReturnFormData.applyNum" :long-press="false" :positive-integer="false"
:size="50" :input-width="190"></u-number-box>
</u-form-item>
</u-col>
</u-row>
......@@ -746,27 +752,17 @@
</u-form>
</view>
</u-modal>
<u-modal
title="详细数据"
:showConfirmButton="true"
<u-modal title="详细数据" :showConfirmButton="true"
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="showRowDeatilFlag"
width="1800rpx"
>
v-model="showRowDeatilFlag" width="1800rpx">
<view class="">
<zb-table :columns="tableDetailColumn" :stripe="true" :border="true" :data="tableDataDetail"></zb-table>
</view>
</u-modal>
<!-- //查询图片生产工单 -->
<u-modal
title="生产工单"
show-cancel-button
:show-confirm-button="false"
cancel-text="返回"
<u-modal title="生产工单" show-cancel-button :show-confirm-button="false" cancel-text="返回"
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="materialReturn"
width="1300rpx"
>
v-model="materialReturn" width="1300rpx">
<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="未查询到数据">
......@@ -796,37 +792,28 @@
</scroll-view>
</view>
</u-modal>
<u-modal
title="详情"
show-cancel-button
:show-confirm-button="false"
cancel-text="返回"
<u-modal title="详情" show-cancel-button :show-confirm-button="false" cancel-text="返回"
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="material"
width="680px"
>
v-model="material" width="680px">
<view class="list-bar">
<scroll-view scroll-y="true" class="scroll-list" :style="{ height: this.screenHeight - 280 + 'px' }">
<!-- <view style="display: flex; justify-content: space-between; flex-wrap: wrap">
<image v-for="(line, index) in viewSop" :key="index" @click="onPreviewTap(line)" style="padding: 10px" class="u-avatar-demo" :src="line" mode="aspectFill"></image>
</view> -->
<ProogingSpecificationSheet v-if="material" :form="ProogingSpecificationSheetForm"></ProogingSpecificationSheet>
<ProogingSpecificationSheet v-if="material" :form="ProogingSpecificationSheetForm">
</ProogingSpecificationSheet>
</scroll-view>
</view>
</u-modal>
<u-modal
title="作业分派"
@confirm="handleSubmitJobAssignment"
show-cancel-button
<u-modal title="作业分派" @confirm="handleSubmitJobAssignment" show-cancel-button
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="jobAssignmentVisible"
width="1200rpx"
>
v-model="jobAssignmentVisible" width="1200rpx">
<view class="feedback-card">
<u-form :mode="jobAssignmentForm" label-width="100px">
<u-form-item label="排产数量">
<u-number-box v-model="jobAssignmentForm.quantity" :long-press="false" :positive-integer="false" :size="50" :input-width="190"></u-number-box>
<u-number-box v-model="jobAssignmentForm.quantity" :long-press="false" :positive-integer="false" :size="50"
:input-width="190"></u-number-box>
</u-form-item>
<u-form-item label="工作单元">
<u-input disabled v-model="jobAssignmentForm.workunitName" placeholder="选择工作单元"></u-input>
......@@ -836,20 +823,18 @@
</view>
</u-modal>
<u-modal
title="选择工作单元"
@confirm="handleSubmitWorkunit"
show-cancel-button
<u-modal title="选择工作单元" @confirm="handleSubmitWorkunit" show-cancel-button
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="workunitVisible"
width="1800rpx"
>
v-model="workunitVisible" width="1800rpx">
<view class="feedback-card" v-if="workunitVisible">
<workunitList ref="workunitRef" />
</view>
</u-modal>
</view>
</template>
<style scoped>
@import '/static/css/amebase.css';
</style>
<script>
import SearchInput from '@/components/ScanInput/index.vue';
......@@ -1224,6 +1209,9 @@ export default {
dModelData: [],
tableSelectData: [],
feedbackForms: [],
feedbackQuantityFu: 0,
feedbackUnQuantityFu: 0,
ExceptionForms: {
abnormalType: null,
abnormalReason: null
......@@ -1340,9 +1328,16 @@ export default {
tableDataDetail: [],
showRowDeatilFlag: false,
loading: false,
copyFeedBackForms: []
copyFeedBackForms: [],
timeTest: {
isshow: true
},
};
},
// watch() {
// },
mounted() {
//监听工作中心切换事件
uni.$on('switchWorkunit', (station) => {
......@@ -1377,6 +1372,11 @@ export default {
uni.$off('switchWorkunit');
uni.$off('taskStatusChanged');
},
computed: {
computedQuantity() {
return this.feedbackForm.quantityQualify + this.feedbackForm.quantityUnqualify;
}
},
methods: {
handleChangePackNum(feedback, i) {
this.getWorkorderDirectiveList(feedback, i, true)
......@@ -1685,6 +1685,7 @@ export default {
const row = this.feedbackForms[index];
const items = row.workorderList.find((item) => item.workorderId === id);
if (!id) {
row.packUnitOfMeasure = '';
row.printContents = row.arrangeCode;
row.tableDirectiveData = [];
row.tableSizeColumn = [];
......@@ -1692,14 +1693,13 @@ export default {
row.tableOrderData = [];
row.packNum = '';
row.packType = '';
row.packUnitOfMeasure = '';
row.lossIndividuallyWrap = undefined;
row.currentTabPro = 0;
return;
} else {
if (row.isPackage === '1') {
row.packNum = items.usagePackNum?items.usagePackNum:0;
row.encasementNum = items.usageEncasementNum?items.usageEncasementNum:0;
row.packNum = items.usagePackNum ? items.usagePackNum : 0;
row.encasementNum = items.usageEncasementNum ? items.usageEncasementNum : 0;
this.getWorkorderDirectiveList(id, index);
}
}
......@@ -1770,7 +1770,9 @@ export default {
.getWorkorderWithSizeAndDirective({
pageNum: 1,
pageSize: 10,
arrangeCode: item.arrangeCode
arrangeCode: item.arrangeCode,
taskWorkunitId: item.taskWorkunitId,
processId: item.processId
})
.then((res) => {
item.workorderList = res.rows;
......@@ -1781,6 +1783,8 @@ export default {
item.workorderCode = res.rows[0].workorderCode;
item.packByDirective = res.rows[0].packByDirective;
item.packBySize = res.rows[0].packBySize;
item.unitOfConvert = res.rows[0].unitOfConvert;
}
item.workorderOption = res.rows.map((temp) => {
if (temp.saleDirectiveList != null) {
......@@ -1807,8 +1811,8 @@ export default {
});
if (item.isPackage === '1' && res.rows.length > 0) {
item.workorderId = res.rows[0].workorderId;
item.packNum = res.rows[0].usagePackNum?res.rows[0].usagePackNum:0;
item.encasementNum = res.rows[0].usageEncasementNum?res.rows[0].usageEncasementNum:0;
item.packNum = res.rows[0].usagePackNum ? res.rows[0].usagePackNum : 0;
item.encasementNum = res.rows[0].usageEncasementNum ? res.rows[0].usageEncasementNum : 0;
this.getWorkorderDirectiveList(res.rows[0].workorderId, index);
}
});
......@@ -1951,6 +1955,35 @@ export default {
quantityChanged() {
this.feedbackForm.quantity = this.feedbackForm.quantityQualify + this.feedbackForm.quantityUnqualify;
},
changeShow() {
console.log(this.timeTest.isshow);
this.timeTest.isshow = !this.timeTest.isshow;
},
quantityChangedV2(feedback, val1, val2) {
let qq = (val1 === 0 || val1 === null) ? 0 : val1;
let quq = (val2 === 0 || val2 === null) ? 0 : val2;
if (qq > 0) {
feedback.quantityQualify = qq / feedback.unitOfConvert;
}
if (quq > 0) {
feedback.quantityUnqualify = quq / feedback.unitOfConvert;
}
feedback.quantity = feedback.quantityUnqualify + feedback.quantityQualify;
// console.log(this.feedbackQuantityFu);
// console.log(this.feedbackUnQuantityFu);
// console.log(feedback.quantityUnqualify);
// console.log(feedback.quantityqualify);
// console.log(feedback.unitOfConvert);
},
getPrintTemplate(row) {
this.printTemplateData = row;
this.printTemplateVisible = true;
......@@ -1966,6 +1999,9 @@ export default {
doFeedback() {
// this.reset();
console.log(this.dict.type, 'this.dicts.type');
this.feedbackUnQuantityFu = 0;
this.feedbackQuantityFu = 0;
this.feedbackForms = [];
let flagPackage = [];
this.tableSelectData.forEach((item, index) => {
......@@ -1979,11 +2015,13 @@ export default {
userName: this.vuex_user.userName,
taskId: item.taskId,
taskWorkunitId: item.taskWorkunitId,
processId: item.processId,
feedbackChannel: 'PAD',
quantity: item.quantity,
quantityQualify: item.quantityWait, //默认为排产数量-合格数-不合格数
quantityUnqualify: 0,
reportQualify: item.quantityQualify+item.quantityUnqualify,
reportQualify: item.quantityQualify + item.quantityUnqualify,
printName: '',
lastProcess: item.isLastProcess == 1, //未工序
nickName: this.vuex_user.nickName,
......@@ -2265,11 +2303,18 @@ export default {
},
cancel() {
this.proVisible = false;
this.timeTest.isshow = false;
// this.feedbackUnQuantityFu = 0;
// this.feedbackQuantityFu = 0;
},
handleSubmitfeedback() {
this.proVisible = true;
this.feedbackUnQuantityFu = 0;
this.feedbackQuantityFu = 0;
this.proVisible = false;
this.timeTest.isshow = false;
this.feedbackForms.forEach((item) => {
if (item.quantityQualify === 0 && item.quantityUnqualify === 0) {
if (item.quantity === 0 || item.quantity === null) {
this.$u.toast('请填写合格/不合格产品数量！');
return;
}
......@@ -2281,9 +2326,9 @@ export default {
this.$u.toast('打印机连接失败');
return;
}
//工单
this.$u.api
.feedback({
//工单
taskWorkunitId: item.taskWorkunitId,
taskId: item.taskId,
taskCode: item.taskCode,
......@@ -2714,6 +2759,7 @@ export default {
height: calc(100vh - 200rpx);
min-height: 400rpx;
border: 1px solid rgb(232, 232, 232);
/deep/ .item-tr.trbg .item-td {
background: #fb9461 !important;
// color:#fff !important;
......@@ -2759,6 +2805,7 @@ export default {
font-size: 40rpx;
}
}
.times {
/deep/ .uni-date-picker__container {
height: 360rpx;
......
static/css/amebase.css 0 → 100644
View file @ 78513280
.auto-size-button {
width: max-content; /* 根据内容自动调整宽度 */
padding: 10px; /* 按钮内间距 */
border: none; /* 无边框 */
background-color: #007BFF; /* 背景颜色 */
color: white; /* 文本颜色 */
cursor: pointer; /* 鼠标悬停时显示指针 */
font-size: 16px; /* 文本大小 */
border-radius: 5px; /* 边框圆角 */
}
.auto-size-button:hover {
background-color: #0056b3; /* 鼠标悬停时的背景颜色 */
}
.u-col1 label {
white-space: nowrap;
/* white-space: normal; 默认，空白会被浏览器忽略，文本会在达到元素宽度后自动换行 */
/* word-break: break-all; 如果需要在任意字符间断开，可以使用这个属性 */
/* word-wrap: break-word; 允许在长单词或URL地址内部换行 */
}
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