root/aio-hl-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

细节

Browse Source
This commit is contained in:
caill
2023-06-12 16:47:41 +08:00
parent 478a5b217c
commit 52604a1468
6 changed files with 31 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/dialog.vue
View File

@@ -75,7 +75,7 @@ export default {
border-radius: 16px; border-radius: 16px;
box-shadow: 0 1px 3px rgba(0,0,0,.3); box-shadow: 0 1px 3px rgba(0,0,0,.3);
box-sizing: border-box; box-sizing: border-box;
width: 65%; width: 50%;
margin-top: 15vh; margin-top: 15vh;
.dialog_header .dialog_header
padding: 20px 20px 10px; padding: 20px 20px 10px;

6
src/config/getData2.js
View File

@@ -80,11 +80,9 @@ export const reportQuery = (st, et, code, wcode) => post('api/produceWorkorder/r
}) })
// 修改报工数量 // 修改报工数量
export const updateReport = (id, report, nok, repare) => post('api/produceshiftorder/updateReport', { export const updateReport = (id, report) => post('api/produceshiftorder/updateReport', {
macoperate_id: id, macoperate_id: id,
report_qty: report, report_qty: report
nok_qty: nok,
repare_qty: repare
}) })
// 删除报工记录 // 删除报工记录

2
src/pages/modules/workorder/work-order-assignment.vue
View File

@@ -89,7 +89,7 @@
</div> </div>
</div> --> </div> -->
</div> </div>
<div v-if="type === '2'" class="form_wraper">当前操作为强制确认，确定继续操作吗？</div> <div v-if="type === '2'" class="form_wraper">当前操作将强制完成工单,结束生产，确定继续操作吗？</div>
</jxDialog> </jxDialog>
</div> </div>
</template> </template>

4
src/pages/modules/workorder/work-order-query.vue
View File

@@ -56,7 +56,7 @@
<th width="8%">报废数量</th> <th width="8%">报废数量</th>
<th width="8%">报修数量</th> <th width="8%">报修数量</th>
<th width="9%">开始时间</th> <th width="9%">开始时间</th>
<th width="9%">开始时间</th> <th width="9%">结束时间</th>
</tr> </tr>
<tr v-for="e in dataList" :key="e.workorder_id" :class="{'selected_icon': pkId === e.workorder_id}" @click="toRadio(e)"> <tr v-for="e in dataList" :key="e.workorder_id" :class="{'selected_icon': pkId === e.workorder_id}" @click="toRadio(e)">
<!-- <td> <!-- <td>
@@ -113,7 +113,7 @@ export default {
}, },
data () { data () {
return { return {
value1: [], value1: [new Date((new Date().getTime() - 24 * 60 * 60 * 1000)), new Date((new Date().getTime() + 24 * 60 * 60 * 1000))],
options: [], options: [],
value: '', value: '',
keyValue: '', keyValue: '',

50
src/pages/modules/workorder/work-report-query.vue
View File

@@ -45,20 +45,20 @@
<table class="filter-table"> <table class="filter-table">
<tr> <tr>
<!-- <th width="4%"></th> --> <!-- <th width="4%"></th> -->
<th width="6%">工单号</th> <th width="7%">工单号</th>
<th width="6%">设备</th> <th width="8%">设备</th>
<th width="6%">顺序号</th> <th width="8%">顺序号</th>
<th width="5%">班次</th> <th width="7%">班次</th>
<th width="10%">物料名称</th> <th width="12%">物料名称</th>
<th width="8%">物料规格</th> <th width="10%">物料规格</th>
<th width="10%">开始时间</th> <th width="10%">开始时间</th>
<th width="10%">结束时间</th> <th width="10%">结束时间</th>
<th width="7%">电气数量</th> <th width="7%">电气数量</th>
<th width="7%">上报合格数</th> <th width="7%">上报合格数</th>
<th width="7%">上报报废数</th> <!-- <th width="7%">上报报废数</th>
<th width="7%">上报报修数</th> <th width="7%">上报报修数</th> -->
<th width="6%">操作工</th> <th width="7%">操作工</th>
<th width="5%">状态</th> <th width="7%">状态</th>
</tr> </tr>
<tr v-for="e in dataList" :key="e.macoperate_id" :class="{'selected_icon': pkId === e.macoperate_id}" @click="toRadio(e)"> <tr v-for="e in dataList" :key="e.macoperate_id" :class="{'selected_icon': pkId === e.macoperate_id}" @click="toRadio(e)">
<!-- <td> <!-- <td>
@@ -74,8 +74,8 @@
<td>{{e.operatetime_end}}</td> <td>{{e.operatetime_end}}</td>
<td>{{ e.dq_report_qty }}</td> <td>{{ e.dq_report_qty }}</td>
<td>{{e.report_qty}}</td> <td>{{e.report_qty}}</td>
<td>{{e.nok_qty}}</td> <!-- <td>{{e.nok_qty}}</td>
<td>{{ e.repare_qty }}</td> <td>{{ e.repare_qty }}</td> -->
<td>{{ e.produce_person_name }}</td> <td>{{ e.produce_person_name }}</td>
<td>{{ ['生成','报工','审核'][Number(e.report_status) - 1] }}</td> <td>{{ ['生成','报工','审核'][Number(e.report_status) - 1] }}</td>
</tr> </tr>
@@ -94,20 +94,6 @@
<input type="number" class="form_item__input" v-model="reportQty"> <input type="number" class="form_item__input" v-model="reportQty">
</div> </div>
</div> </div>
<div class="form_item">
<div class="form_item__label">报废数量</div>
<div class="form_item__content">
<input type="number" class="form_item__input" v-model="nokQty">
</div>
</div>
</div>
<div class="form">
<div class="form_item">
<div class="form_item__label">报修数量</div>
<div class="form_item__content">
<input type="number" class="form_item__input" v-model="repareQty">
</div>
</div>
</div> </div>
</div> </div>
</jxDialog> </jxDialog>
@@ -133,9 +119,9 @@ export default {
dataList: [], dataList: [],
pkId: '', pkId: '',
pkObj: {}, pkObj: {},
reportQty: '', reportQty: ''
nokQty: '', // nokQty: '',
repareQty: '' // repareQty: ''
} }
}, },
computed: { computed: {
@@ -193,8 +179,8 @@ export default {
return return
} }
this.reportQty = this.pkObj.report_qty this.reportQty = this.pkObj.report_qty
this.nokQty = this.pkObj.nok_qty // this.nokQty = this.pkObj.nok_qty
this.repareQty = this.pkObj.repare_qty // this.repareQty = this.pkObj.repare_qty
this.$refs.child.active = true this.$refs.child.active = true
}, },
toSureDialog () { toSureDialog () {
@@ -202,7 +188,7 @@ export default {
}, },
async _updateReport () { async _updateReport () {
try { try {
let res = await updateReport(this.pkId, this.reportQty, this.nokQty, this.repareQty) let res = await updateReport(this.pkId, this.reportQty)
this.toast(res.message) this.toast(res.message)
this.disabled1 = false this.disabled1 = false
this.$refs.child.active = false this.$refs.child.active = false

16
src/style/layout.styl
View File

@@ -324,12 +324,10 @@ input::-webkit-input-placeholder
width 100% width 100%
.form .form
width 100% width 100%
_fj(flex-start, flex-start)
.form_item .form_item
width 48% width 100%
margin-bottom: 20px
.form_item+.form_item .form_item+.form_item
margin-left 4% margin-top: 20px
.form_item__label .form_item__label
width: 74px; width: 74px;
text-align: left; text-align: left;
@@ -337,7 +335,7 @@ input::-webkit-input-placeholder
float: left; float: left;
font-size: 14px; font-size: 14px;
color: #606266; color: #606266;
line-height: 30px; line-height: 40px;
padding: 0 12px 0 0; padding: 0 12px 0 0;
box-sizing: border-box; box-sizing: border-box;
i i
@@ -345,7 +343,7 @@ input::-webkit-input-placeholder
.form_item__content .form_item__content
width: calc(100% - 74px) width: calc(100% - 74px)
margin-left: 74px; margin-left: 74px;
line-height: 30px; line-height: 40px;
position: relative; position: relative;
font-size: 14px; font-size: 14px;
.form_item__input .form_item__input
@@ -358,9 +356,9 @@ input::-webkit-input-placeholder
box-sizing: border-box; box-sizing: border-box;
color: #696969; color: #696969;
display: inline-block; display: inline-block;
font-size: 14px; font-size: 17px;
height: 30px; height: 40px;
line-height: 30px; line-height: 40px;
outline: none; outline: none;
padding: 0 15px; padding: 0 15px;
transition: border-color .2s cubic-bezier(.645,.045,.355,1); transition: border-color .2s cubic-bezier(.645,.045,.355,1);