root/wms1.0
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

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

@@ -101,7 +101,7 @@ const defaultForm = { product_area: 'A1', workprocedure_id: '1535144552481034240
export default {
name: 'SKdevice',
components: { crudOperation, pagination, rrOperation },
components: { crudOperation, pagination, rrOperation },
dicts: ['product_area'],
cruds() {
return [
@@ -139,7 +139,7 @@ export default {
this.notify('保存成功', 'success')
}).catch(() => {
})
},
}
}
}
</script>

9
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="realproducestart_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>
<el-table-column prop="is_canupdate_update" label="允许修改报工数" :formatter="formatBoolean" width="200" show-overflow-tooltip />
<el-table-column prop="is_needmove" label="是否搬运" :formatter="formatBoolean" />
<el-table-column prop="shift_type_scode" label="班次类型">
<template slot-scope="scope">
@@ -416,7 +415,7 @@
{{ dict.label.WORKORDER_CREATE_TYPE[scope.row.create_type] }}
</template>
</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="remark" label="备注" />
<el-table-column prop="nok_qty" label="报废总数" />
@@ -448,7 +447,7 @@
@setMaterValue="setMaterValue"
/>
<ViewDialog ref="child3" />
<reportDialog ref="report" @AddChanged="querytable" />
<reportDialog ref="report" @AddChanged="querytable" />
<UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="tableChanged3" />
<AddDialog :dialog-show.sync="addShow" @AddChanged="querytable" />
<ReplaceDeviceDialog ref="child4" @AddChanged="querytable" />
@@ -588,7 +587,7 @@ export default {
this.initClass3()
},
methods: {
databaseUploadApi(){
databaseUploadApi() {
},
formatBoolean: function(row, column) {

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

@@ -7,9 +7,9 @@
@close="close"
>
<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-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 label="班次类型" prop="shift_type_scode">
<el-select
@@ -42,8 +42,8 @@
v-model="query.is_report"
active-color="#409EFF"
inactive-color="#F56C6C"
active-value='true'
inactive-valu='false'
active-value="true"
inactive-valu="false"
/>
</el-form-item>
<rrOperation :crud="crud" />
@@ -78,25 +78,24 @@
<el-table-column prop="product_area" label="生产车间" />
<el-table-column prop="device_code" label="设备编码" align="center" />
<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">
<el-input v-model = scope.row.report_qty></el-input>
</template>
<el-input v-model="scope.row.report_qty/" /></template>
</el-table-column>
<!-- <el-table-column prop="nok_qty" label="报废数量" >-->
<!-- <template slot-scope="scope">-->
<!-- <el-input v-model = scope.row.nok_qty></el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="repare_qty" label="报修数量" >-->
<!-- <template slot-scope="scope">-->
<!-- <el-input v-model = scope.row.repare_qty></el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="person_finish_qty" label="人员期末数量" />-->
<!-- <el-table-column prop="nok_qty" label="报废数量" >-->
<!-- <template slot-scope="scope">-->
<!-- <el-input v-model = scope.row.nok_qty></el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="repare_qty" label="报修数量" >-->
<!-- <template slot-scope="scope">-->
<!-- <el-input v-model = scope.row.repare_qty></el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="person_finish_qty" label="人员期末数量" />-->
<el-table-column prop="operatetime_start" 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">
{{ reportStatus[scope.row.report_status-1].label }}
</template>
@@ -165,7 +164,7 @@ const defaultForm = { sale_id: null,
export default {
name: 'ViewDialog',
components: { crudOperation, pagination, rrOperation },
components: { crudOperation, pagination, rrOperation },
cruds() {
return [
CRUD({ title: '报工审核', url: '/api/produceWorkorder/reportQuery2', query: {}, idField: 'macoperate_id', crudMethod: { ...crudProduceshiftorder }})
@@ -260,7 +259,7 @@ export default {
const arr = []
arr.push(data)
crudProduceshiftorder.reportApprove(arr).then(res => {
//todo:刷新数据
// todo:刷新数据
})
},
setForm() {

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

@@ -7,9 +7,9 @@
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<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-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 label="班次类型" prop="shift_type_scode">
<el-select
@@ -42,8 +42,8 @@
v-model="query.is_report"
active-color="#409EFF"
inactive-color="#F56C6C"
active-value='true'
inactive-valu='false'
active-value="true"
inactive-valu="false"
/>
</el-form-item>
<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="device_code" label="设备编码" align="center" />
<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">
<el-input v-model = scope.row.report_qty></el-input>
</template>
<el-input v-model="scope.row.report_qty/" /></template>
</el-table-column>
<el-table-column prop="nok_qty" label="报废数量" >
<el-table-column prop="nok_qty" label="报废数量">
<template slot-scope="scope">
<el-input v-model = scope.row.nok_qty></el-input>
</template>
<el-input v-model="scope.row.nok_qty/" /></template>
</el-table-column>
<el-table-column prop="repare_qty" label="报修数量" >
<el-table-column prop="repare_qty" label="报修数量">
<template slot-scope="scope">
<el-input v-model = scope.row.repare_qty></el-input>
</template>
<el-input v-model="scope.row.repare_qty/" /></template>
</el-table-column>
<el-table-column prop="person_finish_qty" label="人员期末数量" />
<el-table-column prop="operatetime_start" 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">
{{ reportStatus[scope.row.report_status-1].label }}
</template>
@@ -154,8 +151,8 @@ const defaultForm = { sale_id: null,
material_spec: null }
export default {
name: 'reportDialog',
components: { crudOperation, pagination, rrOperation },
name: 'ReportDialog',
components: { crudOperation, pagination, rrOperation },
dicts: ['product_area'],
cruds() {
return [

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

@@ -138,7 +138,7 @@
clearable
style="width: 60px"
/>
<el-button type="primary" @click="taskScheduler()">任务调度</el-button>
<el-button type="primary" @click="taskScheduler()">任务调度</el-button>
</span>
<crudOperation :permission="permission" />
@@ -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_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 = "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 prop="task_status_name" label="任务状态" width="120px" :formatter="formatTaskStatusName" />
<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>
</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-item prop="checked">
<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_code2" 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_type" label="任务类型" align="center" width="150px" :formatter="formatType"/>
<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>
</el-card>

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

@@ -65,7 +65,7 @@
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission"/>
<crudOperation :permission="permission" />
<!--表格渲染-->
<el-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>
</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-item prop="checked">
<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_code2" 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_type" label="任务类型" align="center" width="150px" :formatter="formatType"/>
<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>
</el-card>