root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:代码找回

Browse Source
This commit is contained in:
liuxy
2023-07-18 16:58:30 +08:00
parent dda223d20a
commit 80a50ee4bd
22 changed files with 1236 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mes/qd/src/api/wms/pdm/dailyplan.js
View File

@@ -54,4 +54,12 @@ export function query2(params) {
params
})
}
export default { add, edit, del, importExcel, query2, submit, submit2 }
export function querytable(data) {
return request({
url: 'api/dailyplan/querytable',
method: 'post',
data
})
}
export default { add, edit, del, importExcel, query2, submit, submit2, querytable }

15
mes/qd/src/views/wms/basedata/master/bagrecord/insertAndPrintDialog.vue
View File

@@ -6,6 +6,7 @@
width="450px"
:before-close="handleClose"
destroy-on-close
:close-on-click-modal="false"
@close="close"
>
<el-form ref="form" :model="form1" :rules="rules" size="mini" label-width="110px">
@@ -33,7 +34,7 @@
</el-form-item>
<el-form-item label="粉料批号:" prop="pcsn">
<el-input v-model="form1.pcsn" disabled style="width: 250px;" />
<el-input v-model="form1.pcsn" readonly style="width: 250px;" />
</el-form-item>
<el-form-item label="重量:" prop="storage_qty">
@@ -41,11 +42,11 @@
</el-form-item>
<el-form-item label="还回人员编码:" prop="return_code">
<el-input v-model="form1.return_code" placeholder="请输入人员编码" style="width: 250px;" @blur="blurPerson(form1.return_code)" />
<el-input v-model="form1.return_code" placeholder="请输入人员编码" style="width: 250px;" @keyup.enter.native="blurPerson(form1.return_code)" />
</el-form-item>
<el-form-item label="还回人员名称:" prop="return_person">
<el-input v-model="form1.return_person" disabled style="width: 250px;" />
<el-input v-model="form1.return_person" readonly style="width: 250px;" />
</el-form-item>
<el-form-item label="软废类型:" prop="waste_type">
@@ -136,6 +137,14 @@ export default {
// 根据单据号查询调用接口获取压制订单内信息
crudBagrecord.blurQueryMater({ 'bill_code': val }).then(res => {
this.materialList = res.data
if (this.materialList.length === 0) {
this.form1.material_code = null
this.form1.pcsn = null
} else {
this.form1.material_code = this.materialList[0].item_code
this.form1.pcsn = this.materialList[0].batch_seq
}
})
},
changePcsn(val) {

4
mes/qd/src/views/wms/basedata/pdm/wastecchange/index.vue
View File

@@ -354,8 +354,7 @@ export default {
del: false,
download: false,
reset: true
},
query: { tech_type: '02' }
}
})
},
data() {
@@ -392,6 +391,7 @@ export default {
this.form.tableData.splice(index, 1, row) // 通过splice 替换数据 触发视图更新
},
confirm(row) {
row.tech_type = this.query.tech_type
this.confirm_flg = true
crudWastecchange.confirm(row).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)

9
mes/qd/src/views/wms/pf/initformula/DivDialog.vue
View File

@@ -1099,6 +1099,9 @@ export default {
autoformula.autoCalculation(this.form).then(res => {
this.crud.notify('自动计算成功！')
this.chunfen_qty = res.chunfen_qty
if (res.time !== 0.0 && res.time !== undefined) {
this.form.ball_time = res.time
}
this.fullscreenLoading = false
if ((parseFloat(this.chunfen_qty) > 0) && (parseFloat(this.chunfen_qty) < parseFloat(this.form.workorder_qty))) {
this.$confirm('软废纯粉重量为' + parseFloat(this.chunfen_qty).toFixed(3) + '公斤，不足工令重量，是否继续？')
@@ -1112,6 +1115,9 @@ export default {
this.form2.total_qty1 = 0
this.form2.add_qty1 = 0
this.ball_time = res2.ball_time
if (res2.time !== 0.0 && res2.time !== undefined) {
this.form.ball_time = res2.time
}
if ((parseFloat(this.ball_time) > 0)) {
this.form.ball_time = parseFloat(this.ball_time)
}
@@ -1162,6 +1168,9 @@ export default {
this.tableDtl = res.tableDtl
this.form2.total_qty1 = 0
this.form2.add_qty1 = 0
if (res.time !== 0.0 && res.time !== undefined) {
this.form.ball_time = res.time
}
for (let i = 0; i < this.tableDtl.length; i++) {
const row = this.tableDtl[i]
row.edit = true

66
mes/qd/src/views/wms/st/core/inbill/rawassist/DivDialog.vue
View File

@@ -14,7 +14,7 @@
<span class="el-dialog__title2">入库分配</span>
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<slot name="left"/>
<el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
</span>
</div>
@@ -51,10 +51,10 @@
</el-select>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column show-overflow-tooltip prop="pcsn" label="批次号" align="center" />
<el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center"/>
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center"/>
<el-table-column show-overflow-tooltip prop="pcsn" label="批次号" align="center"/>
<el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center"/>
<el-table-column
show-overflow-tooltip
prop="assign_qty"
@@ -69,15 +69,16 @@
label="未分配数量"
align="center"
/>
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" />
<el-table-column show-overflow-tooltip prop="source_bill_type_name" label="源单类型" align="center" />
<el-table-column show-overflow-tooltip prop="source_bill_code" label="源单编号" align="center" />
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center"/>
<el-table-column show-overflow-tooltip prop="source_bill_type_name" label="源单类型" align="center"/>
<el-table-column show-overflow-tooltip prop="source_bill_code" label="源单编号" align="center"/>
</el-table>
</el-card>
<el-card class="box-card" shadow="never" :body-style="{padding:'20px 20px 0 20px'}">
<el-form ref="form2" :inline="true" :model="form" :rules="rules" size="mini">
<el-form-item label="载具号" prop="storagevehicle_code">
<el-input v-model.trim="form.storagevehicle_code" placeholder="载具号" style="width: 200px" @blur="vehicleCheck" />
<el-input v-model.trim="form.storagevehicle_code" placeholder="载具号" style="width: 200px"
@blur="vehicleCheck"/>
</el-form-item>
<el-form-item label="桶号" prop="bucketunique">
<el-input
@@ -87,7 +88,7 @@
class="input-with-select"
style="width: 200px"
>
<el-button slot="append" icon="el-icon-search" @click="dialogBucket" />
<el-button slot="append" icon="el-icon-search" @click="dialogBucket"/>
</el-input>
</el-form-item>
<el-form-item label="放入重量" prop="storage_qty">
@@ -140,7 +141,7 @@
</div>
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<slot name="left"/>
<el-button
slot="left"
class="filter-item"
@@ -203,12 +204,12 @@
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column show-overflow-tooltip type="index" label="序号" align="center" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column show-overflow-tooltip prop="pcsn" label="批次" align="center" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="托盘号" align="center" />
<el-table-column show-overflow-tooltip prop="bucketunique" label="桶号" align="center" />
<el-table-column show-overflow-tooltip type="index" label="序号" align="center"/>
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center"/>
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center"/>
<el-table-column show-overflow-tooltip prop="pcsn" label="批次" align="center"/>
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="托盘号" align="center"/>
<el-table-column show-overflow-tooltip prop="bucketunique" label="桶号" align="center"/>
<el-table-column
show-overflow-tooltip
prop="storage_qty"
@@ -216,25 +217,28 @@
label="重量"
align="center"
/>
<el-table-column show-overflow-tooltip prop="point_code" label="入库点" align="center" />
<el-table-column show-overflow-tooltip prop="struct_code" label="货位" align="center" />
<el-table-column show-overflow-tooltip prop="point_code" label="入库点" align="center"/>
<el-table-column show-overflow-tooltip prop="struct_code" label="货位" align="center"/>
<el-table-column align="center" label="操作" width="190" fixed="right">
<template slot-scope="scope">
<el-popover v-model="scope.row.pop" placement="top" width="180" trigger="manual">
<p>{{ '是否确认删除桶明细？' }}</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="doCancel(scope.row)">取消</el-button>
<el-button type="primary" size="mini" @click.native.prevent="deleteRow(scope.$index, form.tableMater)">确定</el-button>
<el-button type="primary" size="mini" @click.native.prevent="deleteRow(scope.$index, form.tableMater)">
确定
</el-button>
</div>
<el-button slot="reference" :disabled="scope.row.struct_code !== '' && scope.row.struct_code" type="danger" icon="el-icon-delete" size="mini" @click="toDelete(scope.row)" />
<el-button slot="reference" :disabled="scope.row.struct_code !== '' && scope.row.struct_code"
type="danger" icon="el-icon-delete" size="mini" @click="toDelete(scope.row)"/>
</el-popover>
</template>
</el-table-column>
</el-table>
</el-card>
<StructDiv ref="child" :dialog-show.sync="structShow" :sect-prop="sectProp" @tableChanged="tableChanged" />
<BucketDialog :dialog-show.sync="bucketShow" :bucket-prop="bucketProp" @bucketChange="bucketChange" />
<StructDiv ref="child" :dialog-show.sync="structShow" :sect-prop="sectProp" @tableChanged="tableChanged"/>
<BucketDialog :dialog-show.sync="bucketShow" :bucket-prop="bucketProp" @bucketChange="bucketChange"/>
</el-dialog>
</template>
@@ -330,7 +334,8 @@ export default {
})
},
toDelete(data) {
data.pop = true
this.$set(data, 'pop', true)
// data.pop = true
},
close() {
this.form.tableMater = []
@@ -395,7 +400,8 @@ export default {
return
}
dis_dtl.storagevehicle_code = this.form.storagevehicle_code
dis_dtl.pop = false
// dis_dtl.pop = false
this.$set(dis_dtl, 'pop', false)
this.form.tableMater.splice(this.form.tableMater.length, 0, dis_dtl)
if (this.form.dtl_row.assign_qty) {
this.form.dtl_row.assign_qty = parseFloat(this.form.dtl_row.assign_qty) + parseFloat(this.form.storage_qty)
@@ -444,6 +450,7 @@ export default {
})
},
deleteRow(index, rows) {
debugger
// 如果桶状态不是生成调后台逻辑
if (rows[index].status !== '01') {
crudRawAssist.deleteDisDtl(rows[index]).then(res => {
@@ -453,9 +460,11 @@ export default {
crudRawAssist.getDisDtl(this.form.dtl_row).then(res => {
this.form.tableMater = res
})
rows[index].pop = false
// rows[index].pop = false
this.$set(rows[index], 'pop', false)
}).catch(err => {
rows[index].pop = false
// rows[index].pop = false
this.$set(rows[index], 'pop', false)
return
})
}
@@ -553,7 +562,8 @@ export default {
}
},
doCancel(data) {
data.pop = false
this.$set(data, 'pop', false)
// data.pop = false
},
unDivStruct() {
if (this.form.tableMater.length <= 0) {

37
mes/qd/src/views/wms/statistics/producttask/index.vue
View File

@@ -66,7 +66,7 @@
<el-table-column prop="workorder_date" min-width="85" label="日期" align="center" :formatter="workorder_dateFormat" />
<el-table-column prop="device_name" width="100" label="喷雾塔" align="center">
<template slot-scope="scope">
<el-link type="warning">{{ scope.row.device_name }}</el-link>
<el-link type="warning" @click="querytable(scope.$index, scope.row)">{{ scope.row.device_name }}</el-link>
</template>
</el-table-column>
<el-table-column label="投入(kg)" align="center">
@@ -79,7 +79,7 @@
<el-table-column prop="sum_qty6" label="碳化钽/铌" :formatter="crud.formatNum3" min-width="80" align="center" />
<el-table-column prop="sum_qty7" label="碳粉" :formatter="crud.formatNum3" min-width="100" align="center" />
<el-table-column prop="sum_qty8" label="钨粉" :formatter="crud.formatNum3" min-width="80" align="center" />
</el-table-column>
</el-table-column>
<el-table-column prop="sum_qty9" label="合计" :formatter="crud.formatNum3" min-width="100" align="center" />
<el-table-column label="二次粉" align="center">
@@ -107,8 +107,8 @@
<!--表格渲染-->
<el-table ref="table2" v-loading="crud.loading" :data="tableDtl" :max-height="590" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column prop="pw_time" label="配粉日期" width="140" align="center" />
<el-table-column prop="material_code" label="物料编码" width="100" align="center" />
<el-table-column prop="pw_time" label="配粉日期" width="140" align="center" show-overflow-tooltip />
<el-table-column prop="material_code" label="物料编码" width="100" align="center" show-overflow-tooltip />
<el-table-column prop="old_mark" label="牌号" width="100" align="center" />
<el-table-column prop="pcsn" label="批号" width="100" align="center" />
<el-table-column prop="org_name" label="归属部门" width="100" align="center" />
@@ -139,25 +139,25 @@
</el-table-column>
<el-table-column label="投料工序流记录" align="center">
<el-table-column label="球磨" align="center">
<el-table-column prop="task_qty1" label="开工日期" :formatter="crud.formatNum3" min-width="100" align="center" />
<el-table-column prop="task_qty2" label="设备号" :formatter="crud.formatNum3" min-width="80" align="center" />
<el-table-column prop="task_qty3" label="操作人员" :formatter="crud.formatNum3" min-width="80" align="center" />
<el-table-column prop="task_qty1" label="开工日期" min-width="100" align="center" show-overflow-tooltip />
<el-table-column prop="task_qty2" label="设备号" min-width="80" align="center" />
<el-table-column prop="task_qty3" label="操作人员" min-width="80" align="center" />
</el-table-column>
<el-table-column label="喷雾" align="center">
<el-table-column prop="task_qty4" label="计划日期" :formatter="crud.formatNum3" min-width="100" align="center" />
<el-table-column prop="task_qty5" label="执行日期" :formatter="crud.formatNum3" min-width="80" align="center" />
<el-table-column prop="task_qty6" label="设备号" :formatter="crud.formatNum3" min-width="100" align="center" />
<el-table-column prop="task_qty4" label="计划日期" min-width="100" align="center" show-overflow-tooltip />
<el-table-column prop="task_qty5" label="执行日期" min-width="80" align="center" show-overflow-tooltip />
<el-table-column prop="task_qty6" label="设备号" min-width="100" align="center" />
<el-table-column prop="task_qty7" label="产出Kg" :formatter="crud.formatNum3" min-width="80" align="center" />
<el-table-column prop="task_qty8" label="操作人员" :formatter="crud.formatNum3" min-width="80" align="center" />
<el-table-column prop="task_qty8" label="操作人员" min-width="80" align="center" />
</el-table-column>
<el-table-column label="锤磨 压团 制粒" align="center">
<el-table-column prop="task_qty9" label="日期" :formatter="crud.formatNum3" min-width="80" align="center" />
<el-table-column prop="task_qty10" label="生产线号" :formatter="crud.formatNum3" min-width="80" align="center" />
<el-table-column prop="task_qty11" label="操作人员" :formatter="crud.formatNum3" min-width="100" align="center" />
<el-table-column prop="task_qty9" label="日期" min-width="80" align="center" show-overflow-tooltip />
<el-table-column prop="task_qty10" label="生产线号" min-width="80" align="center" />
<el-table-column prop="task_qty11" label="操作人员" min-width="100" align="center" />
</el-table-column>
</el-table-column>
<el-table-column label="产出" align="center">
<el-table-column prop="out_qty1" label="入库日期" :formatter="crud.formatNum3" min-width="100" align="center" />
<el-table-column prop="out_qty1" label="入库日期" min-width="100" align="center" show-overflow-tooltip />
<el-table-column prop="out_qty2" label="PG粉重量" :formatter="crud.formatNum3" min-width="100" align="center" />
</el-table-column>
</el-table>
@@ -224,6 +224,7 @@ export default {
this.crud.query.end_time = (new Date().daysLater(0)).strftime('%F', 'zh')
this.query_flag = false
}
this.tableDtl = []
return true
},
hand(value) {
@@ -251,8 +252,10 @@ export default {
}
this.crud.toQuery()
},
querytable() {
this.crud.toQuery()
querytable(index, row) {
dailyplan.querytable(row).then(res => {
this.tableDtl = res
})
}
}
}