zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2

This commit is contained in:
shijing 2024-01-22 17:07:13 +08:00
parent 0f15a76945 29b073759d
commit 410a55b411
2 changed files with 198 additions and 705 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/wpm/mlog_hun.vue
View File

@ -23,7 +23,8 @@
</el-table-column> </el-table-column>
<el-table-column label="每桶重量/kg" prop="count_real_eweight"> <el-table-column label="每桶重量/kg" prop="count_real_eweight">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.count_real_eweight"> {{ scope.row.count_real_eweight.toFixed(2) }}</span> <span v-if="scope.row.count_real_eweight"> {{ scope.row.count_real_eweight.toFixed(2)
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="配料人" prop="handle_user_name"> <el-table-column label="配料人" prop="handle_user_name">
@ -146,8 +147,8 @@
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="每桶(kg)" prop="count_eweight"> <el-form-item label="每桶(kg)" prop="count_eweight">
<el-input-number v-model="handoverForm.count_eweight" controls-position="right" :min="0" step="1" <el-input-number v-model="handoverForm.count_eweight" controls-position="right" :min="0"
:precision="2" :step-strictly="true" style="width:100%" placeholder="每桶kg"> :precision="2" style="width:100%" placeholder="每桶kg">
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -158,13 +159,8 @@
<el-button type="primary" @click="submitHandover">提交</el-button> <el-button type="primary" @click="submitHandover">提交</el-button>
</el-footer> </el-footer>
</el-dialog> </el-dialog>
<save-dialog v-if="dialogSave" <save-dialog v-if="dialogSave" ref="saveDialog" :mgroup="currentMgroup.id" :mgroupShiftRule="currentMgroup.shift_rule"
ref="saveDialog" :activeType="activeName" @success="handleSaveSuccess" @closed="dialogSave = false">
:mgroup="currentMgroup.id"
:mgroupShiftRule = "currentMgroup.shift_rule"
:activeType="activeName"
@success="handleSaveSuccess"
@closed="dialogSave = false">
</save-dialog> </save-dialog>
</template> </template>
<script> <script>

757
src/views/wpm/worktask_form.vue
View File

File diff suppressed because it is too large Load Diff