Browse Source

Merge remote-tracking branch 'origin/master'

master
[li_she] 3 years ago
parent
commit
7edc4f74b4
  1. 12
      src/api/shopOrder/shopOrder.js
  2. 138
      src/views/modules/schedule/order_schedule_expand.vue
  3. 455
      src/views/modules/shopOrder/shopOrder/common/shop_order_tool.vue
  4. 299
      src/views/modules/shopOrder/shopOrder/common/tool_add_and_edit.vue
  5. 39
      src/views/modules/shopOrder/shopOrder/shopOrder.vue
  6. 140
      src/views/modules/yieldReport/produce_order.vue

12
src/api/shopOrder/shopOrder.js

@ -80,5 +80,17 @@ export const getOrderNoItemNoCenter = data => createAPI('/shopOrder/getOrderNoIt
//查询--生产派工单 ---》取消派工单操作
export const cancelScheduleWithScheduleQuery = data => createAPI('/scheduling/cancelScheduleWithScheduleQuery', 'post', data)
//查询工单的工具信息
export const getShopOrderToolDatas = data => createAPI('/shopOrder/getShopOrderToolDatas', 'post', data)
//新增工单的工具信息
export const insertShopOrderToolData = data => createAPI('/shopOrder/insertShopOrderToolData', 'post', data)
//修改工单的工具信息
export const updateShopOrderToolData = data => createAPI('/shopOrder/updateShopOrderToolData', 'post', data)
//查询工单的工具信息
export const deleteShopOrderToolData = data => createAPI('/shopOrder/deleteShopOrderToolData', 'post', data)

138
src/views/modules/schedule/order_schedule_expand.vue

@ -93,6 +93,8 @@
:disabled="primaryMenuButton.partStockFlag">查看物料库存</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button @click="userSetting" type="primary">{{ buttons.settingTable }}</el-button>
<el-button v-if="showDefault" @click="saveColumnList()" type="primary">{{ buttons.defaultTable }}</el-button>
</el-form>
<el-table
:height="height"
@ -106,7 +108,7 @@
v-loading="dataListLoading"
style="margin-top: -20px; width: 100%;">
<el-table-column
v-for="(item,index) in columnOrderArray" :key="index"
v-for="(item,index) in columnList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
@ -138,6 +140,9 @@
@refreshPageTables = "refreshPageTables">
</comScheduleOrderExpand>
<!-- 动态列 -->
<column v-if="visible" ref="column" @refreshData="getTableUserColumn" v-drag></column>
</div>
</template>
@ -145,16 +150,29 @@
import Chooselist from '@/views/modules/common/Chooselist';/*列表组件*/
import comPartStock from "../common/com_part_stock";/*展示物料库存的组件*/
import comScheduleOrderExpand from '@/views/modules/schedule/com_schedule_order_expand';/*排产扩展 排产单个工单*/
import column from '@/views/modules/common/column';/*动态表头*/
import {
getShopOrderList,
getCurrentWorkCenterNoByResourceId,
} from '@/api/schedule/order_schedule_expand.js'
} from '@/api/schedule/order_schedule_expand.js';
/*动态表头*/
import {
saveTableDefaultList,
getTableDefaultListLanguage,
getTableUserListLanguage,
removerDefault,
removerUser
} from "@/api/table.js";
export default {
data() {
return {
height: 200,
tagNo: '',
showDefault: false,
visible: false,
showPartStockFlag: false,
showScheduleOrderFlag: false,
currentRoutingRow: {},
@ -184,7 +202,7 @@ export default {
},
shopOrderList: [],
dataListLoading: false,
columnOrderArray: [
columnList: [
{
userId: this.$store.state.user.name,
functionId: 5301,
@ -816,11 +834,41 @@ export default {
fixed: false
},
],
buttons: {
settingLanguageList: '按语言设置',
edit: '编辑',
delete: '删除',
deleteList: '批量删除',
cz: '操作',
search: '查询',
download: '导出',
settingTable: '设置列表',
defaultTable: '设置默认配置',
list: "列表",
addList: '批量添加',
settingLanguage: "按控件设置"
},
calendarOutList: [],
primaryMenuButton: {
shopOrderFlag: true,
partStockFlag: true,
},
queryTable:{
userId: this.$store.state.user.name,
functionId: this.$route.meta.menuId,
tableId: "5301Order",
languageCode: this.$i18n.locale
},
// table
queryTableUser: {
userId: this.$store.state.user.name,
functionId: this.$route.meta.menuId,
tableId: "5301Order",
status: true,
languageCode: this.$i18n.locale
},
// table
userColumnList: [],
}
},
@ -829,6 +877,7 @@ export default {
Chooselist,/*列表的组件*/
comPartStock,/*展示物料库存的组件*/
comScheduleOrderExpand,/*扩展排产 处理多加工中心排产*/
column,/*动态列*/
},
mounted() {
@ -977,6 +1026,89 @@ export default {
}
},
//
userSetting() {
this.visible = true;
let queryTable = {
userId: this.$store.state.user.name,
functionId: this.$route.meta.menuId,
tableId: "5301Order",
languageCode: this.$i18n.locale
}
this.$nextTick(() => {
this.$refs.column.init(queryTable);
});
},
//
getTableUserColumn() {
getTableUserListLanguage(this.queryTableUser).then(({data}) => {
if (data.rows.length > 0) {
//this.columnList = []
this.columnList = data.rows
} else {
this.getColumnList()
}
})
},
//
async saveColumnList() {
//
if (this.userColumnList) {
// user
await removerUser(this.queryTable)
}
//
await removerDefault(this.queryTable)
// table
let sumColumnList = this.columnList;//concat(this.columnList1);
sumColumnList = sumColumnList.map(item => {
return item = {
tableId: item.tableId,
tableName: item.tableName,
columnProp: item.columnProp,
columnLabel: item.columnLabel,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: item.columnWidth,
format: item.format,
functionId: this.$route.meta.menuId,
sortLv: item.sortLv,
status: true,
fixed: item.fixed,
serialNumber: item.serialNumber,
columnType: item.columnType,
align: item.align
}
})
await saveTableDefaultList(sumColumnList)
// button label title
/* let buttons = this.buttonList.map(item => {
return item = {
functionId: this.$route.meta.menuId,
languageValue: item.languageValue,
objectId: item.objectId,
objectType: item.objectType,
tableId: item.tableId
}
})
await saveButtonList(buttons)*/
this.getFunctionButtonList()
this.getColumnList()
},
// tableDefault
getColumnList() {
getTableDefaultListLanguage(this.queryTable).then(({data}) => {
if (!data.rows.length == 0) {
// this.showDefault = false
this.columnList = data.rows
} else {
// this.showDefault = true
}
})
},

455
src/views/modules/shopOrder/shopOrder/common/shop_order_tool.vue

@ -0,0 +1,455 @@
<template>
<div class="mod-config">
<el-dialog
v-drag
@close="closeDialog"
width="880px"
:title="'生产订单-工具维护'"
:close-on-click-modal="false"
:visible.sync="visible">
<el-row>
<el-col :span="24">
<el-button @click="toolAddAndEditModal(0)" type="primary" style="margin-left: 2px;margin-top: 0px">{{ '新增' }}
</el-button>
<el-button @click="toolAddAndEditModal(1)" :disabled="disabledFlag" type="primary"
style="margin-left: 2px;margin-top: 0px">{{ '修改' }}
</el-button>
<el-button @click="removeShopOrderTool" :disabled="disabledFlag" type="primary"
style="margin-left: 2px;margin-top: 0px">{{ '删除' }}
</el-button>
<el-button @click="toolAddAndEditModal(2)" :disabled="disabledFlag" type="primary"
style="margin-left: 2px;margin-top: 0px">{{ '复制' }}
</el-button>
</el-col>
</el-row>
<el-row>
<el-col style="margin-top: -5px" :span="24">
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
<el-form-item :label="'订单号'">
<el-input class="customer-input-color-red" disabled v-model="shopOrderRow.orderNo"></el-input>
</el-form-item>
<el-form-item :label="'物料编码'">
<el-input class="customer-input-color-red" disabled v-model="shopOrderRow.partNo"></el-input>
</el-form-item>
<el-form-item :label="'物料名称/规格'">
<el-input class="customer-input-color-red" disabled style="width: 260px"
v-model="shopOrderRow.partDesc"></el-input>
</el-form-item>
<el-form-item :label="'工厂编号'">
<el-input class="customer-input-color-red" disabled style="width: 80px"
v-model="shopOrderRow.site"></el-input>
</el-form-item>
</el-form>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-table
ref="routingTable"
:height="height"
:data="dataList"
highlight-current-row
@current-change="handleCurrentChange"
border
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
</el-dialog>
<toolAddAndEdit ref="toolAddAndEdit" @searchShopOrderTools="searchShopOrderTools"></toolAddAndEdit>
</div>
</template>
<script>
import {
getShopOrderToolDatas,
insertRouteInShopOrder,
getOrderNoRouteInMaxItemNo,
deleteShopOrderToolData,
} from "@/api/shopOrder/shopOrder.js"
import toolAddAndEdit from './tool_add_and_edit';/*工具的新增和修改*/
export default {
components: {
toolAddAndEdit,/*工具的新增和修改*/
},
data() {
return {
visible: false,
height: 350,
dataListLoading: false,
disabledFlag: true,
columnList: [
{
userId: this.$store.state.user.name,
functionId: 6031,
serialNumber: '6031Table4ItemNo',
tableId: "6031Table4",
tableName: "生产订单工具信息表",
columnProp: "itemNo",
headerAlign: "center",
align: "left",
columnLabel: "工序号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
columnWidth: 80
},
{
userId: this.$store.state.user.name,
functionId: 6031,
serialNumber: '6031Table4ToolID',
tableId: "6031Table4",
tableName: "生产订单工具信息表",
columnProp: "toolId",
headerAlign: "center",
align: "left",
columnLabel: "工具编号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 6031,
serialNumber: '6031Table4ToolDescription',
tableId: "6031Table4",
tableName: "生产订单工具信息表",
columnProp: "toolDesc",
headerAlign: "center",
align: "left",
columnLabel: "工具名称",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
columnWidth: 160
},
{
userId: this.$store.state.user.name,
functionId: 6031,
serialNumber: '6031Table4Spec',
tableId: "6031Table4",
tableName: "生产订单工具信息表",
columnProp: "spec",
headerAlign: "center",
align: "left",
columnLabel: "规格型号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
columnWidth: 120
},
{
userId: this.$store.state.user.name,
functionId: 6031,
serialNumber: '6031Table4ToolQty',
tableId: "6031Table4",
tableName: "生产订单工具信息表",
columnProp: "toolQty",
headerAlign: "center",
align: "right",
columnLabel: "工具数量",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
columnWidth: 80
},
{
userId: this.$store.state.user.name,
functionId: 6031,
serialNumber: '6031Table4UMID',
tableId: "6031Table4",
tableName: "生产订单工具信息表",
columnProp: "umid",
headerAlign: "center",
align: "left",
columnLabel: "计量单位",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
columnWidth: 80
},
{
userId: this.$store.state.user.name,
functionId: 6031,
serialNumber: '6031Table4Active',
tableId: "6031Table4",
tableName: "生产订单工具信息表",
columnProp: "active",
headerAlign: "center",
align: "left",
columnLabel: "在用",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
columnWidth: 40
},
{
userId: this.$store.state.user.name,
functionId: 6031,
serialNumber: '6031Table4FamilyID',
tableId: "6031Table4",
tableName: "生产订单工具信息表",
columnProp: "familyId",
headerAlign: "center",
align: "left",
columnLabel: "工具分类",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
columnWidth: 80
},
{
userId: this.$store.state.user.name,
functionId: 6031,
serialNumber: '6031Table4FamilyName',
tableId: "6031Table4",
tableName: "生产订单工具信息表",
columnProp: "familyName",
headerAlign: "center",
align: "left",
columnLabel: "工具分类名称",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
columnWidth: 120
},
{
userId: this.$store.state.user.name,
functionId: 6031,
serialNumber: '6031Table4Remark',
tableId: "6031Table4",
tableName: "生产订单工具信息表",
columnProp: "remark",
headerAlign: "center",
align: "left",
columnLabel: "备注",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
columnWidth: 160
},
{
userId: this.$store.state.user.name,
functionId: 6031,
serialNumber: '6031Table4CreateDate',
tableId: "6031Table4",
tableName: "生产订单工具信息表",
columnProp: "createdDate",
headerAlign: "center",
align: "left",
columnLabel: "录入日期",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
columnWidth: 160
},
{
userId: this.$store.state.user.name,
functionId: 6031,
serialNumber: '6031Table4CreatedBy',
tableId: "6031Table4",
tableName: "生产订单工具信息表",
columnProp: "createdBy",
headerAlign: "center",
align: "left",
columnLabel: "录入人",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
columnWidth: 60
}
],
dataList: [],
shopOrderRow: {
site: this.$store.state.user.site,
orderNo: '',
partNo: '',
partDesc: '',
username: this.$store.state.user.name,
},
selectRow: null
}
},
watch: {
selectRow: {
deep: true,
handler: function (newV, oldV) {
if (newV == null) {
this.disabledFlag = true
} else {
this.disabledFlag = false
}
}
}
},
methods: {
init(modelData) {
this.visible = true
this.shopOrderRow = modelData
this.searchShopOrderTools()
},
//
searchShopOrderTools() {
getShopOrderToolDatas(this.shopOrderRow).then(({data}) => {
if (data.code === 200) {
this.dataList = data.rows
}
})
},
//
toolAddAndEditModal(val) {
this.$nextTick(() => {
if (val === 1 || val === 2) {
//
this.$refs.toolAddAndEdit.init(this.selectRow, val);
} else {
let selectRow = {
site: this.shopOrderRow.site,
username: this.$store.state.user.name,
orderNo: this.shopOrderRow.orderNo,
itemNo: null,
itemDesc: null,
toolId: '',
toolQty: null,
toolSpec: '',
remark: '',
}
this.$refs.toolAddAndEdit.init(JSON.parse(JSON.stringify(selectRow)), 0)
}
})
},
//
removeShopOrderTool() {
this.$confirm('确认删除该刀具?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteShopOrderToolData(this.selectRow).then(({data}) => {
if (data.code == 200) {
this.$message.success(data.msg)
//
this.searchShopOrderTools();
} else {
this.$message.error(data.msg)
}
})
})
},
//
copyToolData() {
//
getOrderNoRouteInMaxItemNo(this.shopOrderRow).then(({data}) => {
if (data.code == 0) {
let maxItem = JSON.parse(JSON.stringify(this.selectRow))
maxItem.itemNo = Number(data.data) + 10
let barcodeID = '0000'+maxItem.itemNo
maxItem.barcodeID = maxItem.site+'-00000'+maxItem.orderNo+"-"+barcodeID.slice(-4)
//
this.addRouteInShopOrder(maxItem)
}
})
},
//
addRouteInShopOrder(val) {
insertRouteInShopOrder(val).then(({data}) => {
if (data.code == 0) {
this.$message.success(data.msg)
this.searchRouteInShopOrder()
} else {
this.$message.warning(data.msg)
}
})
},
handleCurrentChange(val) {
this.selectRow = val;
},
closeDialog() {
this.$nextTick(() => {
this.$emit('tableHanddle', this.shopOrderRow)
Object.assign(this.$data, this.$options.data.call(this));
})
}
},
created() {
}
}
</script>
<style scoped>
.mod-config /deep/ .el-card__header {
padding: 0px 2px;
font-size: 12px;
}
/*统一的input内容颜色样式*/
.customer-input-color-red /deep/ .el-input__inner {
color: red;
}
.mod-config /deep/ .el-form-item--medium .el-form-item__content {
height: 20px;
line-height: 20px;
}
</style>

299
src/views/modules/shopOrder/shopOrder/common/tool_add_and_edit.vue

@ -0,0 +1,299 @@
<template>
<div class="mod-config">
<el-dialog
v-drag
@close="closeDialog"
width="390px"
class="sxm"
:title="titile"
:close-on-click-modal="false"
:visible.sync="visible">
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
<el-row>
<el-col :span="24">
<el-form-item :label="'工序号:'">
<el-select v-model="selectRow.itemNo" placeholder="请选择" @change="getItemDesc()"
:class="operationFlag?'customer-input-color-red':''" style="width: 150px;text-align: right">
<el-option
v-for="item in itemRows"
:key="item.itemNo"
:label="item.itemLabel"
:value="item.itemNo">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'工序名称:'">
<el-input v-model="selectRow.itemDesc" class="customer-input-color-red" style="width: 150px" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item>
<span slot="label" style="" @click="getBaseList(70)"><a herf="#">工具编码</a></span>
<el-input v-model="selectRow.toolId" style="width: 150px;text-align: right"></el-input>
</el-form-item>
<el-form-item :label="'工具名称:'">
<el-input v-model="selectRow.toolDesc" class="customer-input-color-red" style="width: 150px" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item :label="'规格型号:'">
<el-input class="customer-input-color-red" disabled v-model="selectRow.toolSpec"
style="width: 150px"></el-input>
</el-form-item>
<el-form-item :label="'工具数量:'">
<el-input oninput="value=value.replace(/[^0-9.]/g,'')" v-model="selectRow.toolQty"
style="width: 150px"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item :label="'备注:'">
<el-input v-model="selectRow.remark" style="width: 150px"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-button type="primary" @click="saveOrEdit">保存</el-button>
<el-button type="primary" @click="visible = false">关闭</el-button>
</el-footer>
</el-dialog>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
</template>
<script>
import {
getRouteInShopOrder,
insertShopOrderToolData,
updateShopOrderToolData,
} from "@/api/shopOrder/shopOrder.js"
import Chooselist from '@/views/modules/common/Chooselist'
import {debounce, throttle} from "../../../../../utils/common";
export default {
components: {
Chooselist
},
data() {
return {
visible: false,
operationFlag: true,
operationType: 0,
oriToolId: '',
username: this.$store.state.user.name,
titile: '',
selectRow: {
site: this.$store.state.user.site,
username: this.$store.state.user.name,
orderNo: '',
partNo: '',
itemNo: null,
itemDesc: null,
toolDesc: null,
toolSpec: null,
toolQty: 0,
remark: null,
},
itemRows:[],
}
},
methods: {
/*初始化页面的参数*/
init(selectRow, operationType) {
this.visible = true;
this.selectRow = Object.assign(this.selectRow, selectRow);
this.operationType = operationType;
if (operationType === 1) {
this.operationFlag = true;
this.oriToolId = selectRow.toolId;
} else if (operationType === 2){
this.operationFlag = true;
} else {
this.operationFlag = false;
}
//
if(operationType === 0){
this.titile = '新增工具信息';
}else if(operationType === 1){
this.titile = '编辑工具信息';
}else if(operationType === 2){
this.titile = '复制工具信息';
}
//
this.searchShopOrderSoRouting();
},
//
searchShopOrderSoRouting() {
getRouteInShopOrder(this.selectRow).then(({data}) => {
if (data.code == 0) {
//
this.itemRows = data.dataList.map(item => {
let itemRow = {
itemNo: item.itemNo,
itemLabel: item.itemNo +" | " +item.operationDesc,
itemDesc: item.operationDesc,
}
return itemRow;
});
}
});
//
if(this.operationFlag){
this.getItemDesc();//
}
},
//
getItemDesc() {
//
this.itemRows.forEach(item => {
//
if(this.selectRow.itemNo === item.itemNo){
this.selectRow.itemDesc = item.itemDesc;
}
});
let order = {
orderNo: this.selectRow.orderNo,
site: this.selectRow.site,
}
},
//
saveOrEdit() {
if (!this.selectRow.itemNo) {
this.$message.warning('工序号不能为空!')
return false;
}
if (!this.selectRow.toolId) {
this.$message.warning('工具编码不能为空!')
return false;
}
if (!this.selectRow.toolQty) {
this.$message.warning('工具的数量必须大于零!')
return false;
}
//
if(this.operationType === 1){
//
this.saveShopOrderToolData();
}else{
//
this.addShopOrderToolData();
}
},
// this.
addShopOrderToolData() {
//
this.selectRow.createdBy = this.username;
insertShopOrderToolData(this.selectRow).then(({data}) => {
if (data.code == 200) {
debugger;
this.$message.success(data.msg);
//
this.closeDialog();
} else {
this.$message.error(data.msg)
}
})
},
// this.
saveShopOrderToolData() {
//
this.selectRow.updatedBy = this.username;
//
this.selectRow.oriToolId = this.oriToolId;
updateShopOrderToolData(this.selectRow).then(({data}) => {
if (data.code == 200) {
this.$message.success(data.msg);
//
this.closeDialog();
} else {
this.$message.error(data.msg);
}
})
},
/*当前行改变事件*/
handleCurrentChange(val) {
this.selectRow = val
},
//
getBaseList(val) {
this.tagNo = val
this.$nextTick(() => {
let strVal = "";
if (val === 94) {
strVal = this.selectRow.orderNo;
}
this.$refs.baseList.init(val, strVal)
})
},
getBaseData(val) {
if (this.tagNo === 70) {
//
this.selectRow.toolId = val.ToolID;
//
if(val.ToolDescription == null || "" === val.ToolDescription){
this.selectRow.toolDesc = '';
this.selectRow.toolSpec = '';
}else if(val.ToolDescription.indexOf(" | ") > -1){
let mixedToolData = val.ToolDescription.split(" | ");
this.selectRow.toolDesc = mixedToolData[0].trim();
this.selectRow.toolSpec = mixedToolData[1].trim();
}else{
this.selectRow.toolDesc = mixedToolData[0].trim();
this.selectRow.toolSpec = '';
}
}
},
closeDialog() {
this.$nextTick(() => {
this.$emit('searchShopOrderTools')
Object.assign(this.$data, this.$options.data.call(this));
})
}
},
created() {
}
}
</script>
<style scoped>
.mod-config /deep/ .el-card__header {
padding: 0px 2px;
font-size: 12px;
}
.mod-config /deep/ .el-form-item--medium .el-form-item__content {
height: 20px;
line-height: 20px;
}
.customer-input-color-red /deep/ .el-input__inner {
color: red;
}
.sxm /deep/ .el-input--prefix .el-input__inner {
padding-left: 20px;
}
.sxm /deep/ .el-input__prefix {
left: 0px;
}
</style>

39
src/views/modules/shopOrder/shopOrder/shopOrder.vue

@ -295,6 +295,16 @@
class="el-button el-button--primary el-button--medium">
{{ buttons.download3 }}
</download-excel>
<!--2022-08-19 新增工具信息-->
<el-dropdown trigger="click" style="margin-top: 3px" class="customer-dropdown" @command="handleCommand">
<el-button type="primary">
主菜单<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item class="customer-li" command="1"><span>工具信息</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-col>
</el-row>
<el-table
@ -491,11 +501,17 @@
<Routing ref="routing" @tableHanddle="tableHanddle" ></Routing>
<!--订单的工具信息维护-->
<shopOrderTool ref="shopOrderTool" @tableHanddle="tableHanddle" ></shopOrderTool>
</div>
</template>
<script>
import Routing from './common/routing'
import Routing from './common/routing';
import shopOrderTool from './common/shop_order_tool';/*工具的信息维护*/
import {
getShopOrderData,
deleteShopOrderData,
@ -507,6 +523,7 @@
closeShopOrder,//
openShopOrder,//
} from "@/api/shopOrder/shopOrder.js"
import Chooselist from '@/views/modules/common/Chooselist'
@ -515,7 +532,8 @@
name: "searchProductionLineOutputReportInOrderNo",
components: {
Chooselist,
Routing
Routing,
shopOrderTool,/*工具的信息维护*/
},
data() {
return {
@ -1721,6 +1739,9 @@
case '0':
this.getRouting()
break;
case '1':
this.getShopOrderToolData()
break;
}
},
// 线
@ -1733,6 +1754,20 @@
this.$refs.routing.init(this.modelData)
})
},
//
getShopOrderToolData(){
if (!this.modelData.orderNo){
this.$message.warning('请选择生产订单')
return
}
this.$nextTick(() => {
this.$refs.shopOrderTool.init(this.modelData)
})
},
async getOrderInfo() {
await getOrderInfo(this.modelData).then(({data}) => {
this.orderInfo = data.orderInfo;

140
src/views/modules/yieldReport/produce_order.vue

@ -129,6 +129,8 @@
<hr width="95%"/>
</el-dropdown-menu>
</el-dropdown>
<el-button @click="userSetting" type="primary">{{ buttons.settingTable }}</el-button>
<el-button v-if="showDefault" @click="saveColumnList()" type="primary">{{ buttons.defaultTable }}</el-button>
</el-form-item>
</el-form>
<!-- 工单主表信息 -->
@ -141,7 +143,7 @@
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnProduceScheduleArray" :key="index"
v-for="(item,index) in columnList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
@ -209,6 +211,9 @@
<!--列表的组件-->
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
<!-- 动态列 -->
<column v-if="visible" ref="column" @refreshData="getTableUserColumn" v-drag></column>
</div>
</template>
@ -228,6 +233,15 @@ import {
getScheduleMultiReportSpecialAuth,/*获取派工单的特殊权限*/
} from '@/api/yieldReport/produce_order.js';
/*动态表头*/
import {
saveTableDefaultList,
getTableDefaultListLanguage,
getTableUserListLanguage,
removerDefault,
removerUser
} from "@/api/table.js";
/*引入组件*/
import Chooselist from '@/views/modules/common/Chooselist';/*列表组件*/
import comSwitchOperator from "./com_switch_operator";/*切换操作员*/
@ -240,7 +254,9 @@ import changePackaging from "./otherReport/change_packaging";/*结束派工的
import createRecheck from './com_create_recheck'
import Com_split_schedule from "../schedule/com_split_schedule";
import comSplitOrderReport from './com_split_order_report';
import comPartStock from "../common/com_part_stock";/*展示物料库存的组件*/
import comPartStock from "../common/com_part_stock";
import column from '@/views/modules/common/column';
/*展示物料库存的组件*/
/*分切报工*/
export default {
@ -251,6 +267,8 @@ export default {
showOperatorFlag: false,
showReportFlag: false,
showSplitReportFlag: false,
showDefault: false,
visible: false,
fqcShowReportFlag: false,
reworkShowReportFlag: false,
fqcRollShowReportFlag: false,
@ -282,9 +300,20 @@ export default {
produceScheduleList: [],
dataListLoading: false,
buttons: {
settingLanguageList: '按语言设置',
edit: '编辑',
delete: '删除',
deleteList: '批量删除',
cz: '操作',
search: '查询',
download: '导出',
settingTable: '设置列表',
defaultTable: '设置默认配置',
list: "列表",
addList: '批量添加',
settingLanguage: "按控件设置"
},
columnProduceScheduleArray: [
columnList: [
{
userId: this.$store.state.user.name,
functionId: 5302,
@ -1121,6 +1150,22 @@ export default {
createRecheckButton: false,
partStockFlag: true,/*查看物料库存*/
},
queryTable:{
userId: this.$store.state.user.name,
functionId: this.$route.meta.menuId,
tableId: "5302Produce",
languageCode: this.$i18n.locale
},
// table
queryTableUser: {
userId: this.$store.state.user.name,
functionId: this.$route.meta.menuId,
tableId: "5302Produce",
status: true,
languageCode: this.$i18n.locale
},
// table
userColumnList: [],
}
},
components: {
@ -1136,7 +1181,7 @@ export default {
createRecheck,/*创建重检派工单*/
changePackaging, /*换包装*/
comPartStock,/*展示物料库存的组件*/
column,/*动态列*/
},
mounted() {
this.$nextTick(() => {
@ -2001,6 +2046,92 @@ export default {
this.$refs.baseList.init(val,strVal, " AND WorkCenterNo <> 'FQC'");
})
},
//
userSetting() {
this.visible = true;
let queryTable = {
userId: this.$store.state.user.name,
functionId: this.$route.meta.menuId,
tableId: "5302Produce",
languageCode: this.$i18n.locale
}
this.$nextTick(() => {
this.$refs.column.init(queryTable);
});
},
//
getTableUserColumn() {
getTableUserListLanguage(this.queryTableUser).then(({data}) => {
if (data.rows.length > 0) {
//this.columnList = []
this.columnList = data.rows
} else {
this.getColumnList()
}
})
},
//
async saveColumnList() {
//
if (this.userColumnList) {
// user
await removerUser(this.queryTable)
}
//
await removerDefault(this.queryTable)
// table
let sumColumnList = this.columnList;//concat(this.columnList1);
sumColumnList = sumColumnList.map(item => {
return item = {
tableId: item.tableId,
tableName: item.tableName,
columnProp: item.columnProp,
columnLabel: item.columnLabel,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: item.columnWidth,
format: item.format,
functionId: this.$route.meta.menuId,
sortLv: item.sortLv,
status: true,
fixed: item.fixed,
serialNumber: item.serialNumber,
columnType: item.columnType,
align: item.align
}
})
await saveTableDefaultList(sumColumnList)
// button label title
/* let buttons = this.buttonList.map(item => {
return item = {
functionId: this.$route.meta.menuId,
languageValue: item.languageValue,
objectId: item.objectId,
objectType: item.objectType,
tableId: item.tableId
}
})
await saveButtonList(buttons)*/
this.getFunctionButtonList()
this.getColumnList()
},
// tableDefault
getColumnList() {
getTableDefaultListLanguage(this.queryTable).then(({data}) => {
if (!data.rows.length == 0) {
// this.showDefault = false
this.columnList = data.rows
} else {
// this.showDefault = true
}
})
},
},
created() {
//
@ -2045,6 +2176,7 @@ export default {
this.reportButton.slitReportButton = true;
}
});
}
}

Loading…
Cancel
Save