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

解决冲突

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-06-13 11:21:32 +08:00
parent 28cfc1b6d0
commit 5d8a28be7e
9 changed files with 237 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mes/qd/src/api/wms/st/out/semiProductOut.js
View File

@@ -94,7 +94,6 @@ export function oneCancel(data) {
}) })
} }
export function setPoint(data) { export function setPoint(data) {
return request({ return request({
url: '/api/semiProductOut/setPoint', url: '/api/semiProductOut/setPoint',
method: 'post', method: 'post',

2
mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
View File

@@ -139,7 +139,7 @@ export default {
this.notify('保存成功', 'success') this.notify('保存成功', 'success')
}).catch(() => { }).catch(() => {
}) })
}, }
} }
} }
</script> </script>

7
mes/qd/src/views/wms/product_manage/workorder/index.vue
View File

@@ -403,8 +403,7 @@
<el-table-column prop="planproduceend_date" label="计划结束时间" width="100" show-overflow-tooltip /> <el-table-column prop="planproduceend_date" label="计划结束时间" width="100" show-overflow-tooltip />
<el-table-column prop="realproducestart_date" label="实际开始时间" width="100" show-overflow-tooltip /> <el-table-column prop="realproducestart_date" label="实际开始时间" width="100" show-overflow-tooltip />
<el-table-column prop="realproduceend_date" label="实际结束时间" width="100" show-overflow-tooltip /> <el-table-column prop="realproduceend_date" label="实际结束时间" width="100" show-overflow-tooltip />
<el-table-column prop="is_canupdate_update" label="允许修改报工数" :formatter="formatBoolean" width="200" show-overflow-tooltip> <el-table-column prop="is_canupdate_update" label="允许修改报工数" :formatter="formatBoolean" width="200" show-overflow-tooltip />
</el-table-column>
<el-table-column prop="is_needmove" label="是否搬运" :formatter="formatBoolean" /> <el-table-column prop="is_needmove" label="是否搬运" :formatter="formatBoolean" />
<el-table-column prop="shift_type_scode" label="班次类型"> <el-table-column prop="shift_type_scode" label="班次类型">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -416,7 +415,7 @@
{{ dict.label.WORKORDER_CREATE_TYPE[scope.row.create_type] }} {{ dict.label.WORKORDER_CREATE_TYPE[scope.row.create_type] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="is_error" :formatter="formatBoolean" label="是否异常"></el-table-column> <el-table-column prop="is_error" :formatter="formatBoolean" label="是否异常" />
<el-table-column prop="error_info" label="异常信息" show-overflow-tooltip /> <el-table-column prop="error_info" label="异常信息" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" /> <el-table-column prop="remark" label="备注" />
<el-table-column prop="nok_qty" label="报废总数" /> <el-table-column prop="nok_qty" label="报废总数" />
@@ -588,7 +587,7 @@ export default {
this.initClass3() this.initClass3()
}, },
methods: { methods: {
databaseUploadApi(){ databaseUploadApi() {
}, },
formatBoolean: function(row, column) { formatBoolean: function(row, column) {

37
mes/qd/src/views/wms/product_manage/workorder/reportDialog.vue
View File

@@ -9,7 +9,7 @@
<div> <div>
<el-form ref="form" :inline="true" :rules="rules" size="mini" label-width="180px"> <el-form ref="form" :inline="true" :rules="rules" size="mini" label-width="180px">
<el-form-item label="工单编码"> <el-form-item label="工单编码">
<el-input v-model="query.workorder_code" style="width: 200px;" clearable/> <el-input v-model="query.workorder_code" style="width: 200px;" clearable />
</el-form-item> </el-form-item>
<el-form-item label="班次类型" prop="shift_type_scode"> <el-form-item label="班次类型" prop="shift_type_scode">
<el-select <el-select
@@ -42,8 +42,8 @@
v-model="query.is_report" v-model="query.is_report"
active-color="#409EFF" active-color="#409EFF"
inactive-color="#F56C6C" inactive-color="#F56C6C"
active-value='true' active-value="true"
inactive-valu='false' inactive-valu="false"
/> />
</el-form-item> </el-form-item>
<rrOperation :crud="crud" /> <rrOperation :crud="crud" />
@@ -78,25 +78,24 @@
<el-table-column prop="product_area" label="生产车间" /> <el-table-column prop="product_area" label="生产车间" />
<el-table-column prop="device_code" label="设备编码" align="center" /> <el-table-column prop="device_code" label="设备编码" align="center" />
<el-table-column prop="needproduct_qty" label="待生产数" /> <el-table-column prop="needproduct_qty" label="待生产数" />
<el-table-column prop="report_qty" label="报工数量" > <el-table-column prop="report_qty" label="报工数量">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model = scope.row.report_qty></el-input> <el-input v-model="scope.row.report_qty/" /></template>
</template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="nok_qty" label="报废数量" >--> <!-- <el-table-column prop="nok_qty" label="报废数量" >-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-input v-model = scope.row.nok_qty></el-input>--> <!-- <el-input v-model = scope.row.nok_qty></el-input>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column prop="repare_qty" label="报修数量" >--> <!-- <el-table-column prop="repare_qty" label="报修数量" >-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-input v-model = scope.row.repare_qty></el-input>--> <!-- <el-input v-model = scope.row.repare_qty></el-input>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column prop="person_finish_qty" label="人员期末数量" />--> <!-- <el-table-column prop="person_finish_qty" label="人员期末数量" />-->
<el-table-column prop="operatetime_start" label="开工时间" /> <el-table-column prop="operatetime_start" label="开工时间" />
<el-table-column prop="operatetime_end" label="完工时间" /> <el-table-column prop="operatetime_end" label="完工时间" />
<el-table-column prop="report_status" label="报工状态" > <el-table-column prop="report_status" label="报工状态">
<template slot-scope="scope"> <template slot-scope="scope">
{{ reportStatus[scope.row.report_status-1].label }} {{ reportStatus[scope.row.report_status-1].label }}
</template> </template>
@@ -260,7 +259,7 @@ export default {
const arr = [] const arr = []
arr.push(data) arr.push(data)
crudProduceshiftorder.reportApprove(arr).then(res => { crudProduceshiftorder.reportApprove(arr).then(res => {
//todo:刷新数据 // todo:刷新数据
}) })
}, },
setForm() { setForm() {

25
mes/qd/src/views/wms/product_manage/workorder/reportDialog3.vue
View File

@@ -9,7 +9,7 @@
<!-- 搜索 --> <!-- 搜索 -->
<el-form ref="form" :inline="true" :rules="rules" size="mini" label-width="180px"> <el-form ref="form" :inline="true" :rules="rules" size="mini" label-width="180px">
<el-form-item label="工单编码"> <el-form-item label="工单编码">
<el-input v-model="query.workorder_code" style="width: 200px;" clearable/> <el-input v-model="query.workorder_code" style="width: 200px;" clearable />
</el-form-item> </el-form-item>
<el-form-item label="班次类型" prop="shift_type_scode"> <el-form-item label="班次类型" prop="shift_type_scode">
<el-select <el-select
@@ -42,8 +42,8 @@
v-model="query.is_report" v-model="query.is_report"
active-color="#409EFF" active-color="#409EFF"
inactive-color="#F56C6C" inactive-color="#F56C6C"
active-value='true' active-value="true"
inactive-valu='false' inactive-valu="false"
/> />
</el-form-item> </el-form-item>
<el-dropdown split-button type="primary" class="filter-item" @click="report()"> <el-dropdown split-button type="primary" class="filter-item" @click="report()">
@@ -74,25 +74,22 @@
<el-table-column prop="product_area" label="生产车间" /> <el-table-column prop="product_area" label="生产车间" />
<el-table-column prop="device_code" label="设备编码" align="center" /> <el-table-column prop="device_code" label="设备编码" align="center" />
<el-table-column prop="needproduct_qty" label="待生产数" /> <el-table-column prop="needproduct_qty" label="待生产数" />
<el-table-column prop="report_qty" label="报工数量" > <el-table-column prop="report_qty" label="报工数量">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model = scope.row.report_qty></el-input> <el-input v-model="scope.row.report_qty/" /></template>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="nok_qty" label="报废数量" > <el-table-column prop="nok_qty" label="报废数量">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model = scope.row.nok_qty></el-input> <el-input v-model="scope.row.nok_qty/" /></template>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="repare_qty" label="报修数量" > <el-table-column prop="repare_qty" label="报修数量">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model = scope.row.repare_qty></el-input> <el-input v-model="scope.row.repare_qty/" /></template>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="person_finish_qty" label="人员期末数量" /> <el-table-column prop="person_finish_qty" label="人员期末数量" />
<el-table-column prop="operatetime_start" label="开工时间" /> <el-table-column prop="operatetime_start" label="开工时间" />
<el-table-column prop="operatetime_end" label="完工时间" /> <el-table-column prop="operatetime_end" label="完工时间" />
<el-table-column prop="report_status" label="报工状态" > <el-table-column prop="report_status" label="报工状态">
<template slot-scope="scope"> <template slot-scope="scope">
{{ reportStatus[scope.row.report_status-1].label }} {{ reportStatus[scope.row.report_status-1].label }}
</template> </template>
@@ -154,7 +151,7 @@ const defaultForm = { sale_id: null,
material_spec: null } material_spec: null }
export default { export default {
name: 'reportDialog', name: 'ReportDialog',
components: { crudOperation, pagination, rrOperation }, components: { crudOperation, pagination, rrOperation },
dicts: ['product_area'], dicts: ['product_area'],
cruds() { cruds() {

2
mes/qd/src/views/wms/scheduler_manage/task/index.vue
View File

@@ -157,7 +157,7 @@
<el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip /> <el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
<el-table-column v-if="true" prop="material_spec" label="物料标识" min-width="150" show-overflow-tooltip /> <el-table-column v-if="true" prop="material_spec" label="物料标识" min-width="150" show-overflow-tooltip />
<el-table-column prop="task_name" label="任务类型" min-width="120" show-overflow-tooltip /> <el-table-column prop="task_name" label="任务类型" min-width="120" show-overflow-tooltip />
<el-table-column prop = "acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip :formatter = "acsTypeName"></el-table-column> <el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip :formatter="acsTypeName" />
<el-table-column v-if="false" prop="task_status" label="任务状态" /> <el-table-column v-if="false" prop="task_status" label="任务状态" />
<el-table-column prop="task_status_name" label="任务状态" width="120px" :formatter="formatTaskStatusName" /> <el-table-column prop="task_status_name" label="任务状态" width="120px" :formatter="formatTaskStatusName" />
<el-table-column prop="point_code1" label="起点" width="100" /> <el-table-column prop="point_code1" label="起点" width="100" />

6
mes/qd/src/views/wms/storage_manage/product/productIn/TaskDialog.vue
View File

@@ -44,7 +44,7 @@
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" align="center" /> <el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" align="center" />
</el-table> </el-table>
</el-card> </el-card>
<!-- <el-card class="box-card" shadow="never" :body-style="{padding:'20px 20px 0 20px'}"> <!-- <el-card class="box-card" shadow="never" :body-style="{padding:'20px 20px 0 20px'}">
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini"> <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini">
<el-form-item prop="checked"> <el-form-item prop="checked">
<el-checkbox v-model="form.checked" true-label="1" false-label="0" @change="checkedChange()">仅显示未完成的任务</el-checkbox> <el-checkbox v-model="form.checked" true-label="1" false-label="0" @change="checkedChange()">仅显示未完成的任务</el-checkbox>
@@ -112,8 +112,8 @@
<el-table-column show-overflow-tooltip prop="point_code1" label="起始位置" align="center" /> <el-table-column show-overflow-tooltip prop="point_code1" label="起始位置" align="center" />
<el-table-column show-overflow-tooltip prop="point_code2" label="目的位置" align="center" /> <el-table-column show-overflow-tooltip prop="point_code2" label="目的位置" align="center" />
<el-table-column show-overflow-tooltip prop="task_code" label="任务号" align="center" /> <el-table-column show-overflow-tooltip prop="task_code" label="任务号" align="center" />
<el-table-column show-overflow-tooltip prop="task_status" label="任务状态" align="center" :formatter="formatStatus"/> <el-table-column show-overflow-tooltip prop="task_status" label="任务状态" align="center" :formatter="formatStatus" />
<el-table-column show-overflow-tooltip prop="task_type" label="任务类型" align="center" width="150px" :formatter="formatType"/> <el-table-column show-overflow-tooltip prop="task_type" label="任务类型" align="center" width="150px" :formatter="formatType" />
</el-table> </el-table>
</el-card> </el-card>

2
mes/qd/src/views/wms/storage_manage/product/productIvt/index.vue
View File

@@ -65,7 +65,7 @@
</el-form> </el-form>
</div> </div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'--> <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission"/> <crudOperation :permission="permission" />
<!--表格渲染--> <!--表格渲染-->
<el-table <el-table
ref="table" ref="table"

6
mes/qd/src/views/wms/storage_manage/product/productOut/TaskDialog.vue
View File

@@ -44,7 +44,7 @@
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" align="center" /> <el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" align="center" />
</el-table> </el-table>
</el-card> </el-card>
<!-- <el-card class="box-card" shadow="never" :body-style="{padding:'20px 20px 0 20px'}"> <!-- <el-card class="box-card" shadow="never" :body-style="{padding:'20px 20px 0 20px'}">
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini"> <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini">
<el-form-item prop="checked"> <el-form-item prop="checked">
<el-checkbox v-model="form.checked" true-label="1" false-label="0" @change="checkedChange()">仅显示未完成的任务</el-checkbox> <el-checkbox v-model="form.checked" true-label="1" false-label="0" @change="checkedChange()">仅显示未完成的任务</el-checkbox>
@@ -112,8 +112,8 @@
<el-table-column show-overflow-tooltip prop="point_code1" label="起始位置" align="center" /> <el-table-column show-overflow-tooltip prop="point_code1" label="起始位置" align="center" />
<el-table-column show-overflow-tooltip prop="point_code2" label="目的位置" align="center" /> <el-table-column show-overflow-tooltip prop="point_code2" label="目的位置" align="center" />
<el-table-column show-overflow-tooltip prop="task_code" label="任务号" align="center" /> <el-table-column show-overflow-tooltip prop="task_code" label="任务号" align="center" />
<el-table-column show-overflow-tooltip prop="task_status" label="任务状态" align="center" :formatter="formatStatus"/> <el-table-column show-overflow-tooltip prop="task_status" label="任务状态" align="center" :formatter="formatStatus" />
<el-table-column show-overflow-tooltip prop="task_type" label="任务类型" align="center" width="150px" :formatter="formatType"/> <el-table-column show-overflow-tooltip prop="task_type" label="任务类型" align="center" width="150px" :formatter="formatType" />
</el-table> </el-table>
</el-card> </el-card>