Skip to content

P
pda-ui
Commit bd2d1e8d authored by chenzj's avatar chenzj
Browse files
Options

Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

parents bcef8987 6703dbba
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2328 additions and 562 deletions
src/api/mes/md/clientAccount.js 0 → 100644
View file @ bd2d1e8d
import request from '@/utils/request'
// 查询客户付款信息列表
export function pageAccount(data) {
return request({
url: '/md/mdClientAccount/page',
method: 'post',
data
})
}
// 查询客户付款信息列表
export function listAccount(query) {
return request({
url: '/md/mdClientAccount/list',
method: 'get',
params: query
})
}
// 查询客户付款信息详细
export function getAccount(id) {
return request({
url: '/md/mdClientAccount/' + id,
method: 'get'
})
}
// 新增客户付款信息
export function addAccount(data) {
return request({
url: '/md/mdClientAccount',
method: 'post',
data: data
})
}
// 修改客户付款信息
export function updateAccount(data) {
return request({
url: '/md/mdClientAccount',
method: 'put',
data: data
})
}
// 删除客户付款信息
export function delAccount(id) {
return request({
url: '/md/mdClientAccount/' + id,
method: 'delete'
})
}
src/api/mes/md/paymentClause.js
View file @ bd2d1e8d
......@@ -38,7 +38,7 @@ export function updateClause(data) {
// 删除销售订单付款条件
export function delClause(id) {
return request({
url: '/md/clause/' + id,
url: '/md/payment/' + id,
method: 'delete'
})
}
src/store/modules/order.js
View file @ bd2d1e8d
......@@ -155,7 +155,7 @@ const order = {
getSaleShipmentPoint({commit, state}) {
return new Promise((resolve, reject) => {
if (state.saleShipmentPoint && state.saleShipmentPoint.length) return resolve(state.saleShipmentPoint)
listPaymentClause().then(res => {
listPoint().then(res => {
commit('SET_SALE_SHIPMENT_POINT', res.rows)
resolve(res.rows)
}).catch(() => reject())
......
src/views/mes/dv/brandquotation/components/ProcessQcindex.vue 0 → 100644
View file @ bd2d1e8d
<template>
<div class="process-prod">
<!-- 设置检验项弹窗 -->
<el-dialog
:visible.sync="showProcessProd"
width="800px"
:before-close="beforeClose"
append-to-body
title="设置检验项"
>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
</el-col>
</el-row>
<el-table :data="tableData">
<el-table-column label="检测项编码" align="center" prop="indexCode" />
<el-table-column label="检测项名称" align="center" prop="indexName" />
<el-table-column label="检测项类型" align="center" prop="indexType">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_index_type" :value="scope.row.indexType"/>
</template>
</el-table-column>
<el-table-column label="检测工具" align="center" prop="qcTool" />
<el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150">
<template slot-scope="{ row, $index }">
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="updateRow(row, $index)"
>修改</el-button
>
<el-button
type="text"
icon="el-icon-delete"
size="small"
@click="deleteRow($index)"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
<div slot="footer">
<el-button type="primary" size="small" @click="cancleConnect"
>关闭</el-button
>
</div>
</el-dialog>
<!-- 编辑检验项关联信息 -->
<el-dialog
:visible.sync="editConnectVisible"
width="800px"
title="编辑检验项关联信息"
>
<el-form ref="form" :model="form" label-width="120px">
<el-row>
<el-col :span="12">
<el-form-item label="检测项编码" prop="indexCode" >
<el-input v-model="form.indexCode" placeholder="请选择测项编码"
readonly>
<el-button
slot="append"
icon="el-icon-search"
@click="$refs['QcindexSelectRef'].showFlag = true"
></el-button>
</el-input>
<QcindexSelect ref="QcindexSelectRef" @onSelected="onQcindexSelect" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="3"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer">
<el-button type="primary" size="small" @click="addOrEditubmit"
>确认</el-button
>
<el-button size="small" @click="editConnectVisible = false"
>取消</el-button
>
</div>
</el-dialog>
</div>
</template>
<script>
import QcindexSelect from "@/components/qcindexSelect/single.vue";
export default {
props: {
process: {
type: Object,
default: () => ({}),
},
},
components: { QcindexSelect },
dicts: ['mes_index_type'],
data() {
return {
form: {
indexCode: "",
indexName: "",
indexType: "",
qcTool:"",
qcindexId:"",
remark: "",
},
currentRowIdx: undefined,
tableData: [],
selectedItemId: undefined,
selectedRows: null,
showFlag: false,
optType:null,
showProcessProd: false,
editConnectVisible: false,
};
},
computed: {
title() {
return "设置" + this.process.itemName + "检验项";
},
},
watch: {
process: {
handler(val) {
this.tableData = val.qcindexList;
},
deep: true,
},
},
methods: {
handleRowChange(row) {
if (row) {
this.selectedRows = row;
}
},
handleRowDbClick(row) {
if (row) {
this.selectedRows = row;
this.tableData.unshift(this.selectedRows);
this.showFlag = false;
}
},
/**新增按钮 */
handleAdd() {
this.resetForm();
this.optType='add';
this.editConnectVisible = true;
},
/**编辑 */
updateRow(row, idx) {
this.resetForm();
Object.assign(this.form, row);
this.currentRowIdx = idx;
this.optType='edit';
this.editConnectVisible = true;
},
/**新增 */
configmSelect() {
if (this.form.indexCode == null || this.form.indexCode == 0) {
return;
}
console.log("进来了"+this.form);
this.tableData.unshift({
...this.form,
processId: this.process.processId,
});
this.editConnectVisible = false;
},
/** 提交编辑关联信息 */
submitEditConnect() {
this.tableData.splice(this.currentRowIdx, 1, {
...this.form,
});
this.editConnectVisible = false;
},
addOrEditubmit(){
if(this.optType=='add'){
this.configmSelect();
}else{
this.submitEditConnect();
}
},
deleteRow(index) {
this.tableData.splice(index, 1);
},
cancleConnect() {
this.$emit("updateQcindex", this.tableData);
this.showProcessProd = false;
},
beforeClose(done) {
// 更新父组件的processItemList
this.$emit("updateQcindex", this.tableData);
done();
},
/**重置表单 */
resetForm() {
this.form = {
indexCode: "",
indexName: "",
indexType: "",
qcTool:"",
qcindexId:"",
remark: "",
};
},
onQcindexSelect(row){
if (row != undefined && row != null) {
this.form.indexCode = row.indexCode;
this.form.indexName = row.indexName;
this.form.indexType = row.indexType;
this.form.qcTool = row.qcTool;
this.form.qcindexId = row.indexId;
}
}
},
};
</script>
<style>
.process-prod {
padding: 0 20px;
}
</style>
src/views/mes/dv/brandquotation/components/ProcessTool.vue 0 → 100644
View file @ bd2d1e8d
<template>
<div class="process-prod">
<!-- 设置工装量具弹窗 -->
<el-dialog
:visible.sync="showProcessProd"
width="800px"
:before-close="beforeClose"
append-to-body
title="设置工装量具"
>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
</el-col>
</el-row>
<el-table :data="tableData">
<el-table-column label="编号" align="center" prop="toolCode" >
</el-table-column>
<el-table-column label="名称" align="center" prop="toolName" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/>
<el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/>
<el-table-column label="类型" align="center" prop="toolTypeName" />
<el-table-column label="要求数量" align="center" prop="quantity" />
<el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150">
<template slot-scope="{ row, $index }">
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="updateRow(row, $index)"
>修改</el-button
>
<el-button
type="text"
icon="el-icon-delete"
size="small"
@click="deleteRow($index)"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
<div slot="footer">
<el-button type="primary" size="small" @click="cancleConnect"
>关闭</el-button
>
</div>
</el-dialog>
<!-- 编辑工装量具关联信息 -->
<el-dialog
:visible.sync="editConnectVisible"
width="800px"
title="编辑工装量具关联信息"
>
<el-form ref="form" :model="form" label-width="120px">
<el-row>
<el-col :span="12">
<el-form-item label="工装量具编码" prop="toolCode" >
<el-input v-model="form.toolCode" placeholder="请选择测项编码"
readonly>
<el-button
slot="append"
icon="el-icon-search"
@click="$refs['TmToolSelectRef'].showFlag = true"
></el-button>
</el-input>
<TmToolSelect ref="TmToolSelectRef" @onSelected="onTmToolSelect" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="要求数量" prop="quantity">
<el-input
type="number"
v-model="form.quantity"
placeholder="请输入要求数量"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="3"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer">
<el-button type="primary" size="small" @click="addOrEditubmit"
>确认</el-button
>
<el-button size="small" @click="editConnectVisible = false"
>取消</el-button
>
</div>
</el-dialog>
</div>
</template>
<script>
import TmToolSelect from "@/components/TmTool/index.vue";
export default {
props: {
process: {
type: Object,
default: () => ({}),
},
},
components: { TmToolSelect },
dicts: ['mes_index_type'],
data() {
return {
form: {
toolCode: "",
toolName: "",
brand: "",
spec:"",
toolTypeName:"",
remark: "",
quantity: "",
toolId:"",
},
currentRowIdx: undefined,
tableData: [],
selectedItemId: undefined,
selectedRows: null,
showFlag: false,
optType:null,
showProcessProd: false,
editConnectVisible: false,
};
},
computed: {
title() {
return "设置" + this.process.itemName + "工装量具";
},
},
watch: {
process: {
handler(val) {
this.tableData = val.toolList;
},
deep: true,
},
},
methods: {
handleRowChange(row) {
if (row) {
this.selectedRows = row;
}
},
handleRowDbClick(row) {
if (row) {
this.selectedRows = row;
this.tableData.unshift(this.selectedRows);
this.showFlag = false;
}
},
/**新增按钮 */
handleAdd() {
this.resetForm();
this.optType='add';
this.editConnectVisible = true;
},
/**编辑 */
updateRow(row, idx) {
this.resetForm();
Object.assign(this.form, row);
this.currentRowIdx = idx;
this.optType='edit';
this.editConnectVisible = true;
},
/**新增 */
configmSelect() {
if (this.form.toolCode == null || this.form.toolCode == 0) {
return;
}
console.log(this.process.processId);
this.tableData.unshift({
...this.form,
processId: this.process.processId,
});
this.editConnectVisible = false;
},
/** 提交编辑关联信息 */
submitEditConnect() {
this.tableData.splice(this.currentRowIdx, 1, {
...this.form,
});
this.editConnectVisible = false;
},
addOrEditubmit(){
if(this.optType=='add'){
this.configmSelect();
}else{
this.submitEditConnect();
}
},
deleteRow(index) {
this.tableData.splice(index, 1);
},
cancleConnect() {
this.$emit("updateTool", this.tableData);
this.showProcessProd = false;
},
beforeClose(done) {
// 更新父组件的processItemList
this.$emit("updateTool", this.tableData);
done();
},
/**重置表单 */
resetForm() {
this.form = {
toolCode: "",
toolName: "",
brand: "",
spec:"",
toolTypeName:"",
toolId:"",
quantity: "",
remark: "",
};
},
onTmToolSelect(row){
if (row != undefined && row != null) {
this.form.toolCode = row.toolCode;
this.form.toolName = row.toolName;
this.form.brand = row.brand;
this.form.spec = row.spec;
this.form.toolTypeName = row.toolTypeName;
this.form.toolId = row.toolId;
}
}
},
};
</script>
<style>
.process-prod {
padding: 0 20px;
}
</style>
src/views/mes/dv/brandquotation/components/ProogingProcess.vue
View file @ bd2d1e8d
......@@ -25,6 +25,20 @@
@click="openSetProd(row, $index)"
>
设置物料
</el-button>
<el-button
type="text"
size="small"
@click="openSetQrindex(row, $index)"
>
设置检验项
</el-button>
<el-button
type="text"
size="small"
@click="openSetTool(row, $index)"
>
设置工装量具
</el-button>
<el-button
type="text"
......@@ -44,6 +58,15 @@
@updateItem="updateItem"
/>
<ProcessQcindex
:process="currentRow"
ref="ProcessQcindexRef"
/>
<ProcessTool
:process="currentRow"
ref="ProcessToolRef"
/>
<el-dialog
v-dialogDrag
:visible.sync="showFlag"
......@@ -101,9 +124,11 @@
<script>
import ItemBomSelect from "@/components/itemBomSelect/single.vue";
import ProcessProd from "./ProcessProd.vue";
import ProcessQcindex from "./ProcessQcindex.vue";
import ProcessTool from "./ProcessTool.vue";
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue";
export default {
components: { ItemBomSelect, ProcessProd, WorkstationSelect },
components: { ItemBomSelect, ProcessProd, WorkstationSelect, ProcessQcindex, ProcessTool },
inject: ["mode"],
props: {
bomList: {
......@@ -133,6 +158,8 @@ export default {
setList(rows) {
this.tableData = rows.map((item) => {
item.processItemList = [];
item.toolList = [];
item.qcindexList = [];
return item;
});
},
......@@ -140,11 +167,27 @@ export default {
updateItem(items) {
this.tableData[this.currentRowIndex].processItemList = items;
},
updateTool(items) {
this.tableData[this.currentRowIndex].toolList = items;
},
updateQcindex(items) {
this.tableData[this.currentRowIndex].qcindexList = items;
},
openSetProd(row, idx) {
this.currentRow = row;
this.currentRowIndex = idx;
this.$refs["ProcessProdRef"].showProcessProd = true;
},
openSetQrindex(row, idx) {
this.currentRow = row;
this.currentRowIndex = idx;
this.$refs["ProcessQcindexRef"].showProcessProd = true;
},
openSetTool(row, idx) {
this.currentRow = row;
this.currentRowIndex = idx;
this.$refs["ProcessToolRef"].showProcessProd = true;
},
/**更新行 */
updateRow(row, idx) {
Object.assign(this.form, row);
......
src/views/mes/md/client/components/Account.vue 0 → 100644
View file @ bd2d1e8d
<template>
<div class="app-container">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['md:account:add']"
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['md:account:edit']"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['md:account:remove']"
>删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['md:account:export']"
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="accountList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="开户银行" align="center" prop="bank"/>
<el-table-column label="银行账户" align="center" prop="bankAccount"/>
<el-table-column label="户名" align="center" prop="accountName"/>
<el-table-column label="是否启用" align="center" prop="enableFlag" >
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['md:account:edit']"
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['md:account:remove']"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改客户付款信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="开户银行" prop="bank">
<el-input v-model="form.bank" placeholder="请输入开户银行"/>
</el-form-item>
<el-form-item label="银行账户" prop="bankAccount">
<el-input v-model="form.bankAccount" placeholder="请输入银行账户"/>
</el-form-item>
<el-form-item label="户名" prop="accountName">
<el-input v-model="form.accountName" placeholder="请输入户名"/>
</el-form-item>
<el-form-item label="是否启用" prop="enableFlag">
<el-select
v-model="form.enableFlag"
placeholder="是否启用"
clearable
style="width: 215px"
>
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { addAccount, delAccount, getAccount, pageAccount, updateAccount } from '@/api/mes/md/clientAccount'
export default {
name: 'Account',
dicts: ['sys_yes_no'],
props: {
clientId: {type: Number | undefined, default: undefined},
},
data() {
return {
// 遮罩层
loading: false,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 客户付款信息表格数据
accountList: [],
// 弹出层标题
title: '',
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
clientId: this.clientId, bank: null, bankAccount: null, accountName: null, enableFlag: null
},
// 表单参数
form: {},
// 表单校验
rules: {}
}
},
methods: {
/** 查询客户付款信息列表 */
getList() {
this.accountList = []
this.total = 0
if (!this.queryParams.clientId) return
this.loading = true
pageAccount(this.queryParams).then(response => {
this.accountList = response.data.records
this.total = response.data.total
this.loading = false
})
},
// 取消按钮
cancel() {
this.open = false
this.reset()
},
// 表单重置
reset() {
this.form = {
id: null,
clientId: this.clientId,
bank: null,
bankAccount: null,
accountName: null,
enableFlag: 'Y',
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
}
this.resetForm('form')
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm('queryForm')
this.handleQuery()
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.open = true
this.title = '添加客户付款信息'
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const id = row.id || this.ids
getAccount(id).then(response => {
this.form = response.data
this.open = true
this.title = '修改客户付款信息'
})
},
/** 提交按钮 */
submitForm() {
if (!this.form.clientId) return this.$message.error("请先创建客户")
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateAccount(this.form).then(response => {
this.$modal.msgSuccess('修改成功')
this.open = false
this.getList()
})
} else {
addAccount(this.form).then(response => {
this.form.clientId = this.clientId
this.$modal.msgSuccess('新增成功')
this.open = false
this.getList()
})
}
}
})
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids
this.$modal.confirm('是否确认删除客户付款信息编号为"' + ids + '"的数据项？').then(function() {
return delAccount(ids)
}).then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
}).catch(() => {
})
},
/** 导出按钮操作 */
handleExport() {
this.download('md/account/export', {
...this.queryParams
}, `account_${new Date().getTime()}.xlsx`)
},
init(form) {
if (!form.clientId) return
this.queryParams.clientId = form.clientId
this.getList()
}
}
}
</script>
src/views/mes/md/client/components/PaymentRelation.vue
View file @ bd2d1e8d
......@@ -38,8 +38,8 @@
<el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"/>
<el-table-column label="支付方客户编码" prop="relatedCode"/>
<el-table-column label="支付方客户名称" prop="relatedName"/>
<el-table-column label="关联客户编码" prop="relatedCode"/>
<el-table-column label="关联客户名称" prop="relatedName"/>
<el-table-column label="操作" class-name="small-padding fixed-width" width="120">
<template slot-scope="scope">
<el-button
......@@ -181,7 +181,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加客户付款信息关联";
this.title = "添加客户关联关系";
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -190,7 +190,7 @@ export default {
getRelation(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改客户付款信息关联";
this.title = "修改客户关联关系";
});
},
/** 提交按钮 */
......@@ -217,7 +217,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除客户付款信息关联编号为"' + ids + '"的数据项？').then(function () {
this.$modal.confirm('是否确认删除关联客户编号为"' + ids + '"的数据项？').then(function () {
return delRelation(ids);
}).then(() => {
this.getList();
......
src/views/mes/md/client/index.vue
View file @ bd2d1e8d
......@@ -171,7 +171,7 @@
/>
<!-- 添加或修改客户对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1200px">
<el-dialog :title="title" :visible.sync="open" width="950px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row :gutter="10">
<el-col :span="8">
......@@ -233,7 +233,7 @@
<el-tab-pane label="客户基本信息" name="BaseInfo">
<BaseInfo ref="BaseInfo" :form="form"/>
</el-tab-pane>
<el-tab-pane label="地址信息" name="AddrInfo">
<!-- <el-tab-pane label="地址信息" name="AddrInfo">
<AddrInfo ref="AddrInfo" :form="form"/>
</el-tab-pane>
<el-tab-pane label="交货信息" name="DeliveryInfo">
......@@ -241,10 +241,13 @@
</el-tab-pane>
<el-tab-pane label="财务信息" name="FinanceInfo">
<FinanceInfo ref="FinanceInfo" :form="form"/>
</el-tab-pane>
</el-tab-pane>-->
<el-tab-pane label="客户联系人" name="ClientContact">
<ClientContact ref="ClientContact" :clientId="form.clientId"/>
</el-tab-pane>
<el-tab-pane label="银行账号" name="Account">
<Account ref="Account" :clientId="form.clientId"/>
</el-tab-pane>
<el-tab-pane label="产品对照" name="ClientItem">
<ClientItem ref="ClientItem"/>
</el-tab-pane>
......@@ -275,6 +278,7 @@ import BaseInfo from '@/views/mes/md/client/components/BaseInfo'
import UrgeEmail from '@/views/mes/md/client/components/UrgeEmail'
import AddrInfo from '@/views/mes/md/client/components/AddrInfo'
import ClientContact from '@/views/mes/md/client/components/ClientContact'
import Account from '@/views/mes/md/client/components/Account'
import ClientItem from '@/views/mes/md/client/components/ClientItem'
import DeliveryInfo from '@/views/mes/md/client/components/DeliveryInfo'
import FinanceInfo from '@/views/mes/md/client/components/FinanceInfo'
......@@ -285,7 +289,7 @@ export default {
name: "Client",
dicts: ['mes_client_type','sys_yes_no'],
components: {
AddrInfo, BaseInfo, DeliveryInfo, FinanceInfo, UrgeEmail, PaymentRelation, ClientContact, ClientItem
AddrInfo, BaseInfo, DeliveryInfo, FinanceInfo, UrgeEmail, PaymentRelation, ClientContact, Account, ClientItem
},
data() {
return {
......
src/views/mes/order/sales/OrderSync.vue 0 → 100644
View file @ bd2d1e8d
This diff is collapsed.
src/views/mes/order/sales/index.vue
View file @ bd2d1e8d
......@@ -29,7 +29,7 @@
</el-form-item>
<el-form-item label="跟单人" prop="merchandiser">
<el-select v-model="queryParams.merchandiser" clearable filterable remote :remote-method="getUserList" placeholder="请选择跟单人">
<el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
<el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.nickName"/>
</el-select>
</el-form-item>
<el-form-item label="订单状态" prop="state">
......@@ -99,8 +99,7 @@
<el-table-column label="客户编号" prop="clientNo"/>
<el-table-column label="交货期" prop="deliveryDate" width="180"/>
<el-table-column label="总金额" prop="amount" :formatter="r => this.formatMoney(r.amount)"/>
<el-table-column label="跟单人" prop="merchandiser"
:formatter="r => (this.userList.find(item => item.userId == r.merchandiser) || {}).nickName"/>
<el-table-column label="跟单人" prop="merchandiser"/>
<el-table-column label="备注" prop="remark"/>
<el-table-column label="订单状态" prop="state">
<template slot-scope="{row}">
......@@ -125,14 +124,14 @@
v-hasPermi="['od:salesOrder:remove']"
>删除
</el-button>
<!-- <el-button
<el-button
size="mini"
type="text"
icon="el-icon-refresh"
@click="onSync(scope.row)"
v-hasPermi="['od:salesOrder:edit']"
>同步
</el-button>-->
</el-button>
</template>
</el-table-column>
</el-table>
......@@ -222,13 +221,8 @@ export default {
},
/** 同步数据 */
onSync(row) {
const ids = row.id || this.ids
this.$modal.confirm('是否确认同步销售订单编号为"' + ids + '"的数据项？').then(() => {
syncOrder(ids).then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
})
})
console.log(row.id)
this.$router.push('/order/sales/sync?id=' + row.id)
},
/** 删除按钮操作 */
handleDelete(row) {
......
src/views/mes/order/salesdetail/index.vue
View file @ bd2d1e8d
This diff is collapsed.
src/views/mes/pro/productionMake/productionMakeApply.vue
View file @ bd2d1e8d
......@@ -96,30 +96,29 @@
</el-table-column>
<el-table-column
label="产品名称"
width="120"
width="400"
align="center"
prop="itemName"
:show-overflow-tooltip="true"
/>
<el-table-column label="工艺路线名称" align="center" prop="routeName">
<el-table-column label="工艺路线名称" width="200" align="center" prop="routeName">
</el-table-column>
<el-table-column label="确认人" align="center" prop="identifyingPeople">
</el-table-column>
<el-table-column
label="确认日期"
width="140"
align="center"
prop="identifyingDate"
/>
<el-table-column
label="印刷正面颜色"
width="120"
align="center"
prop="printingFrontcolorName"
/>
<el-table-column
label="印刷背面颜色"
width="120"
align="center"
prop="printingBackcolorName"
/>
......
src/views/mes/pro/productiorequest/requestApply.vue
View file @ bd2d1e8d
......@@ -120,7 +120,7 @@
row-key="productionRequestId"
default-expand-all
>
<el-table-column label="量产申请单编码" width="180" prop="productionRequestCode">
<el-table-column label="量产申请单编码" prop="productionRequestCode">
<template slot-scope="scope">
<el-button
size="mini"
......@@ -133,14 +133,14 @@
</el-table-column>
<el-table-column
label="工艺路线"
width="120"
width="200"
align="center"
prop="routeName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="产品名称"
width="120"
width="200"
align="center"
prop="itemName"
:show-overflow-tooltip="true"
......
src/views/mes/pro/productiorequest/requestInfoAdd.vue
View file @ bd2d1e8d
......@@ -16,6 +16,7 @@
<PageWrapper>
<el-form
class="page-form"
:model="form"
ref="form"
size="small"
......@@ -23,7 +24,7 @@
label-width="8em"
>
<el-row>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="申请单编码" prop="productionRequestCode">
<el-input
disabled
......@@ -33,7 +34,7 @@
</el-form-item>
</el-col>
<el-col :md="8" :xs="12" style="height: 50.5px">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="产品" prop="itemId">
<el-input
v-model="form.itemName"
......@@ -49,7 +50,7 @@
<ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
</el-form-item>
</el-col>
<el-col :md="8" :xs="12" style="height: 50.5px">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="工艺路线" prop="routeId">
<el-input
v-model="form.routeName"
......@@ -68,9 +69,7 @@
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="制造工厂" prop="factoryId">
<el-input
v-model="form.factoryName"
......@@ -89,7 +88,7 @@
/>
</el-form-item>
</el-col>
<!-- <el-col :md="8" :xs="12">
<!-- <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="仓库" prop="warehouse">
<el-input
v-model="form.warehouse"
......@@ -97,7 +96,7 @@
></el-input>
</el-form-item>
</el-col> -->
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="尺码" prop="sizeGroup">
<el-input
v-model="form.sizeGroup"
......@@ -105,52 +104,40 @@
></el-input>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="是否要鞋图" prop="isNeedShoeImg">
<el-select
v-model="form.isNeedShoeImg"
placeholder="请选择"
>
<el-select v-model="form.isNeedShoeImg" placeholder="请选择">
<el-option label="是" value="1"></el-option>
<el-option label="否" value="0"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="是否附样品" prop="isNeedPrototype">
<el-select
v-model="form.isNeedPrototype"
placeholder="请选择"
>
<el-select v-model="form.isNeedPrototype" placeholder="请选择">
<el-option label="是" value="1"></el-option>
<el-option label="否" value="0"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="唯一码产品" prop="isUniqueCode">
<el-select
v-model="form.isUniqueCode"
placeholder="请选择"
>
<el-select v-model="form.isUniqueCode" placeholder="请选择">
<el-option label="是" value="1"></el-option>
<el-option label="否" value="0"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="不考虑型体配色" prop="isConsiderColor">
<el-select
v-model="form.isConsiderColor"
placeholder="请选择"
>
<el-select v-model="form.isConsiderColor" placeholder="请选择">
<el-option label="是" value="1"></el-option>
<el-option label="否" value="0"></el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :md="8" :xs="12">
<!-- <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="样品" prop="prototype">
<el-input
v-model="form.prototype"
......@@ -160,7 +147,7 @@
</el-col> -->
</el-row>
<el-row>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
......@@ -172,9 +159,15 @@
</el-col>
</el-row>
<el-row>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="鞋图" prop="shoeImg">
<ImageUpload :limit="1" :value="form.shoeImg" :fileSize="5" @onUploaded="handleImgUploaded" @onRemoved="handleImgRemoved"></ImageUpload>
<ImageUpload
:limit="1"
:value="form.shoeImg"
:fileSize="5"
@onUploaded="handleImgUploaded"
@onRemoved="handleImgRemoved"
></ImageUpload>
</el-form-item>
</el-col>
</el-row>
......@@ -193,26 +186,30 @@
</template>
<script>
import { genCode } from "@/api/system/autocode/rule";
import ProogingBom from "./components/ProogingBom.vue";
import ProogingProcess from "./components/ProogingProcess.vue";
import ItemSelect from "@/components/itemSelect/single.vue";
import RoutesProcessSelect from "@/components/routesProcessSelect/index.vue";
import FactorySelect from "@/components/FactorySelect/index.vue";
import { listRouteprocess } from "@/api/mes/pro/routeprocess";
import tabPlugins from "@/plugins/tab";
import {
import { genCode } from "@/api/system/autocode/rule";
import ProogingBom from "./components/ProogingBom.vue";
import ProogingProcess from "./components/ProogingProcess.vue";
import ItemSelect from "@/components/itemSelect/single.vue";
import RoutesProcessSelect from "@/components/routesProcessSelect/index.vue";
import FactorySelect from "@/components/FactorySelect/index.vue";
import { listRouteprocess } from "@/api/mes/pro/routeprocess";
import tabPlugins from "@/plugins/tab";
import {
addProductionRequest,
getProductionRequest,
updateProductionRequest,
} from "@/api/mes/pro/productionRequest";
} from "@/api/mes/pro/productionRequest";
import {
getPrototypeMake
} from "@/api/mes/pro/prototypeMake";
import { getPrototypeMake } from "@/api/mes/pro/prototypeMake";
export default {
components: { ProogingBom, ProogingProcess, ItemSelect, RoutesProcessSelect, FactorySelect },
export default {
components: {
ProogingBom,
ProogingProcess,
ItemSelect,
RoutesProcessSelect,
FactorySelect,
},
dicts: [],
provide() {
return {
......@@ -231,18 +228,18 @@
unit: "",
routeId: "",
routeName: "",
factoryId:"",
factoryName:"",
factoryId: "",
factoryName: "",
type: "",
modality: "",
isNeedPrototype: "",
isNeedShoeImg: "",
isUniqueCode: "",
isDisabled:"",
isDisabled: "",
shoeImg: "",
sizeGroup: "",
remark: "",
prototype:"",
prototype: "",
warehouse: "",
},
rules: {},
......@@ -343,8 +340,11 @@
.then((res) => {
this.loading = false;
this.$modal.msgSuccess("提交成功！");
this.$nextTick(() => {
// 关闭页签
tabPlugins.closeOpenPage();
this.$router.replace("/mes/pro/productiorequest/query");
});
})
.catch(() => {
this.loading = false;
......@@ -369,18 +369,18 @@
unit: "",
routeId: "",
routeName: "",
factoryId:"",
factoryName:"",
factoryId: "",
factoryName: "",
type: "",
modality: "",
isNeedPrototype: "",
isNeedShoeImg: "",
isUniqueCode: "",
isDisabled:"",
isDisabled: "",
shoeImg: "",
sizeGroup: "",
remark: "",
prototype:"",
prototype: "",
warehouse: "",
};
this.$refs["ProogingBomRef"].resetState();
......@@ -388,15 +388,15 @@
this.gCode();
},
//图片上传成功
handleImgUploaded(imgUrl){
handleImgUploaded(imgUrl) {
this.form.shoeImg = imgUrl;
},
//图片移除
handleImgRemoved(imgUrl){
handleImgRemoved(imgUrl) {
this.form.shoeImg = null;
},
},
};
};
</script>
<style lang="scss" scoped></style>
src/views/mes/pro/productiorequest/requestInfoEdit.vue
View file @ bd2d1e8d
......@@ -16,6 +16,7 @@
<PageWrapper>
<el-form
class="page-form"
:model="form"
ref="form"
size="small"
......@@ -23,7 +24,7 @@
label-width="8em"
>
<el-row>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="申请单编码" prop="productionRequestCode">
<el-input
disabled
......@@ -33,7 +34,7 @@
</el-form-item>
</el-col>
<el-col :md="8" :xs="12" style="height: 50.5px">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="产品" prop="itemId">
<el-input
v-model="form.itemName"
......@@ -49,7 +50,7 @@
<ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
</el-form-item>
</el-col>
<el-col :md="8" :xs="12" style="height: 50.5px">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="工艺路线" prop="routeId">
<el-input
v-model="form.routeName"
......@@ -68,9 +69,7 @@
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="8" :xs="12" style="height: 50.5px">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="制造工厂" prop="factoryId">
<el-input
v-model="form.factoryName"
......@@ -83,10 +82,13 @@
@click="$refs['FactorySelectRef'].showFlag = true"
></el-button>
</el-input>
<FactorySelect ref="FactorySelectRef" @onSelected="onFactorySelect" />
<FactorySelect
ref="FactorySelectRef"
@onSelected="onFactorySelect"
/>
</el-form-item>
</el-col>
<!-- <el-col :md="8" :xs="12">
<!-- <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="仓库" prop="warehouse">
<el-input
v-model="form.warehouse"
......@@ -94,7 +96,7 @@
></el-input>
</el-form-item>
</el-col> -->
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="尺码" prop="sizeGroup">
<el-input
v-model="form.sizeGroup"
......@@ -102,63 +104,48 @@
></el-input>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="是否要鞋图" prop="isNeedShoeImg">
<el-select
v-model="form.isNeedShoeImg"
placeholder="请选择"
>
<el-select v-model="form.isNeedShoeImg" placeholder="请选择">
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="是否附样品" prop="isNeedPrototype">
<el-select
v-model="form.isNeedPrototype"
placeholder="请选择"
>
<el-select v-model="form.isNeedPrototype" placeholder="请选择">
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="唯一码产品" prop="isUniqueCode">
<el-select
v-model="form.isUniqueCode"
placeholder="请选择"
>
<el-select v-model="form.isUniqueCode" placeholder="请选择">
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="不考虑型体配色" prop="isConsiderColor">
<el-select
v-model="form.isConsiderColor"
placeholder="请选择"
>
<el-select v-model="form.isConsiderColor" placeholder="请选择">
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="是否禁用" prop="isDisabled">
<el-select
v-model="form.isDisabled"
placeholder="请选择"
>
<el-select v-model="form.isDisabled" placeholder="请选择">
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :md="8" :xs="12">
<!-- <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="样品" prop="prototype">
<el-input
v-model="form.prototype"
......@@ -169,7 +156,7 @@
</el-row>
<el-row>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
......@@ -181,9 +168,15 @@
</el-col>
</el-row>
<el-row>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="鞋图" prop="shoeImg">
<ImageUpload :limit="1" :value="form.shoeImg" :fileSize="5" @onUploaded="handleImgUploaded" @onRemoved="handleImgRemoved"></ImageUpload>
<ImageUpload
:limit="1"
:value="form.shoeImg"
:fileSize="5"
@onUploaded="handleImgUploaded"
@onRemoved="handleImgRemoved"
></ImageUpload>
</el-form-item>
</el-col>
</el-row>
......@@ -204,7 +197,7 @@
<script>
import { genCode } from "@/api/system/autocode/rule";
import ProogingBom from "./components/ProogingBom.vue";
import ImageUpload from "@/components/ImageUpload/index.vue"
import ImageUpload from "@/components/ImageUpload/index.vue";
import ProogingProcess from "./components/ProogingProcess.vue";
import ItemSelect from "@/components/itemSelect/single.vue";
import FactorySelect from "@/components/FactorySelect/index.vue";
......@@ -218,7 +211,14 @@ import {
} from "@/api/mes/pro/productionRequest";
export default {
components: { ProogingBom, ProogingProcess, ItemSelect, RoutesProcessSelect, FactorySelect, ImageUpload },
components: {
ProogingBom,
ProogingProcess,
ItemSelect,
RoutesProcessSelect,
FactorySelect,
ImageUpload,
},
dicts: [],
provide() {
return {
......@@ -237,18 +237,18 @@ export default {
unit: "",
routeId: "",
routeName: "",
factoryId:"",
factoryName:"",
factoryId: "",
factoryName: "",
type: "",
modality: "",
isNeedPrototype: "",
isNeedShoeImg: "",
isUniqueCode: "",
isDisabled:"",
isDisabled: "",
shoeImg: "",
sizeGroup: "",
remark: "",
prototype:"",
prototype: "",
warehouse: "",
},
rules: {},
......@@ -375,29 +375,29 @@ export default {
unit: "",
routeId: "",
routeName: "",
factoryId:"",
factoryName:"",
factoryId: "",
factoryName: "",
type: "",
modality: "",
isNeedPrototype: "",
isNeedShoeImg: "",
isUniqueCode: "",
isDisabled:"",
isDisabled: "",
shoeImg: "",
sizeGroup: "",
remark: "",
prototype:"",
prototype: "",
warehouse: "",
};
this.$refs["ProogingBomRef"].resetState();
this.$refs["ProogingProcessRef"].resetState();
},
//图片上传成功
handleImgUploaded(imgUrl){
handleImgUploaded(imgUrl) {
this.form.shoeImg = imgUrl;
},
//图片移除
handleImgRemoved(imgUrl){
handleImgRemoved(imgUrl) {
this.form.shoeImg = null;
},
},
......
src/views/mes/pro/prototypeMake/prototypeMakeApply.vue
View file @ bd2d1e8d
......@@ -105,7 +105,7 @@
row-key="prototypeMakeId"
default-expand-all
>
<el-table-column label="制作单编码" width="180" prop="prototypeMakeCode">
<el-table-column label="制作单编码" prop="prototypeMakeCode">
<template slot-scope="scope">
<el-button
size="mini"
......@@ -118,7 +118,7 @@
</el-table-column>
<el-table-column
label="产品名称"
width="120"
align="center"
prop="itemName"
:show-overflow-tooltip="true"
......@@ -129,7 +129,7 @@
label="计划完成日期"
align="center"
prop="plannedFinishDate"
width="180"
>
<template slot-scope="scope">
<span>{{
......@@ -141,7 +141,7 @@
label="版面需求时间"
align="center"
prop="plannedLayoutDate"
width="180"
>
<template slot-scope="scope">
<span>{{
......
src/views/mes/pro/schedule/ganttx.vue
View file @ bd2d1e8d
<template>
<div ref="gantt"></div>
<div ref="gantt" style="width: 100%;"></div>
</template>
<script>
......@@ -52,6 +52,8 @@ export default {
gantt.clearAll();
this.addTodayLine();
gantt.parse(this.$props.tasks);
console.log('this.$props.tasks', this.$props.tasks)
gantt.render();
},
addTodayLine() {
......
src/views/mes/pro/schedule/index.vue
View file @ bd2d1e8d
......@@ -732,7 +732,7 @@ export default {
const taskId = row.taskId || this.ids;
getProtask(taskId).then((response) => {
this.form = response.data;
this.getProcess();
// this.getProcess();
this.open = true;
this.title = "查看任务单信息";
this.optType = "view";
......@@ -747,7 +747,7 @@ export default {
}
getProtask(row.taskId).then((response) => {
this.form = response.data;
this.getProcess();
// this.getProcess();
this.open = true;
this.title = "生产排产";
this.optType = "edit";
......
src/views/mes/pro/workorder/components/ProcessQcindex.vue 0 → 100644
View file @ bd2d1e8d
<template>
<div class="process-prod">
<!-- 设置检验项弹窗 -->
<el-dialog
:visible.sync="showProcessProd"
width="800px"
:before-close="beforeClose"
append-to-body
title="设置检验项"
>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
</el-col>
</el-row>
<el-table :data="tableData">
<el-table-column label="检测项编码" align="center" prop="indexCode" />
<el-table-column label="检测项名称" align="center" prop="indexName" />
<el-table-column label="检测项类型" align="center" prop="indexType">
<template slot-scope="scope">
<dict-tag
:options="dict.type.mes_index_type"
:value="scope.row.indexType"
/>
</template>
</el-table-column>
<el-table-column label="检测工具" align="center" prop="qcTool" />
<el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150">
<template slot-scope="{ row, $index }">
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="updateRow(row, $index)"
>修改</el-button
>
<el-button
type="text"
icon="el-icon-delete"
size="small"
@click="deleteRow($index)"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
<div slot="footer">
<el-button type="primary" size="small" @click="cancleConnect"
>关闭</el-button
>
</div>
</el-dialog>
<!-- 编辑检验项关联信息 -->
<el-dialog
:visible.sync="editConnectVisible"
width="800px"
title="编辑检验项关联信息"
>
<el-form ref="form" :model="form" label-width="120px">
<el-row>
<el-col :span="12">
<el-form-item label="检测项编码" prop="indexCode">
<el-input
v-model="form.indexName"
placeholder="请选择测项编码"
readonly
>
<el-button
slot="append"
icon="el-icon-search"
@click="$refs['QcindexSelectRef'].showFlag = true"
></el-button>
</el-input>
<QcindexSelect
ref="QcindexSelectRef"
@onSelected="onQcindexSelect"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input
v-model="form.remark"
type="textarea"
:rows="3"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer">
<el-button type="primary" size="small" @click="addOrEditubmit"
>确认</el-button
>
<el-button size="small" @click="editConnectVisible = false"
>取消</el-button
>
</div>
</el-dialog>
</div>
</template>
<script>
import QcindexSelect from "@/components/qcindexSelect/single.vue";
export default {
props: {
process: {
type: Object,
default: () => ({}),
},
},
components: { QcindexSelect },
dicts: ["mes_index_type"],
data() {
return {
form: {
indexCode: "",
indexName: "",
indexType: "",
qcTool: "",
qcindexId: "",
remark: "",
},
currentRowIdx: undefined,
tableData: [],
selectedItemId: undefined,
selectedRows: null,
showFlag: false,
optType: null,
showProcessProd: false,
editConnectVisible: false,
};
},
computed: {
title() {
return "设置" + this.process.itemName + "检验项";
},
},
watch: {
process: {
handler(val) {
this.tableData = val.qcindexList;
},
deep: true,
},
},
methods: {
handleRowChange(row) {
if (row) {
this.selectedRows = row;
}
},
handleRowDbClick(row) {
if (row) {
this.selectedRows = row;
this.tableData.unshift(this.selectedRows);
this.showFlag = false;
}
},
/**新增按钮 */
handleAdd() {
this.resetForm();
this.optType = "add";
this.editConnectVisible = true;
},
/**编辑 */
updateRow(row, idx) {
this.resetForm();
Object.assign(this.form, row);
this.currentRowIdx = idx;
this.optType = "edit";
this.editConnectVisible = true;
},
/**新增 */
configmSelect() {
if (this.form.indexCode == null || this.form.indexCode == 0) {
return;
}
this.tableData.unshift({
...this.form,
processId: this.process.processId,
});
this.editConnectVisible = false;
},
/** 提交编辑关联信息 */
submitEditConnect() {
this.tableData.splice(this.currentRowIdx, 1, {
...this.form,
});
this.editConnectVisible = false;
},
addOrEditubmit() {
if (this.optType == "add") {
this.configmSelect();
} else {
this.submitEditConnect();
}
},
deleteRow(index) {
this.tableData.splice(index, 1);
},
cancleConnect() {
this.$emit("updateQcindex", this.tableData);
this.showProcessProd = false;
},
beforeClose(done) {
// 更新父组件的processItemList
this.$emit("updateQcindex", this.tableData);
done();
},
/**重置表单 */
resetForm() {
this.form = {
indexCode: "",
indexName: "",
indexType: "",
qcTool: "",
qcindexId: "",
remark: "",
};
},
onQcindexSelect(row) {
if (row != undefined && row != null) {
this.form.indexCode = row.indexCode;
this.form.indexName = row.indexName;
this.form.qcTool = row.qcTool;
this.form.qcindexId = row.indexId;
}
},
},
};
</script>
<style>
.process-prod {
padding: 0 20px;
}
</style>
src/views/mes/pro/workorder/components/ProcessTool.vue 0 → 100644
View file @ bd2d1e8d
<template>
<div class="process-prod">
<!-- 设置工装量具弹窗 -->
<el-dialog
:visible.sync="showProcessProd"
width="800px"
:before-close="beforeClose"
append-to-body
title="设置工装量具"
>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
</el-col>
</el-row>
<el-table :data="tableData">
<el-table-column label="编号" align="center" prop="toolCode">
</el-table-column>
<el-table-column
label="名称"
align="center"
prop="toolName"
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column
label="品牌"
align="center"
prop="brand"
:show-overflow-tooltip="true"
/>
<el-table-column
label="型号"
align="center"
prop="spec"
:show-overflow-tooltip="true"
/>
<el-table-column label="类型" align="center" prop="toolTypeName" />
<el-table-column label="要求数量" align="center" prop="quantity" />
<el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150">
<template slot-scope="{ row, $index }">
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="updateRow(row, $index)"
>修改</el-button
>
<el-button
type="text"
icon="el-icon-delete"
size="small"
@click="deleteRow($index)"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
<div slot="footer">
<el-button type="primary" size="small" @click="cancleConnect"
>关闭</el-button
>
</div>
</el-dialog>
<!-- 编辑工装量具关联信息 -->
<el-dialog
:visible.sync="editConnectVisible"
width="800px"
title="编辑工装量具关联信息"
>
<el-form ref="form" :model="form" label-width="120px">
<el-row>
<el-col :span="12">
<el-form-item label="工装量具编码" prop="toolCode">
<el-input
v-model="form.toolName"
placeholder="请选择测项编码"
readonly
>
<el-button
slot="append"
icon="el-icon-search"
@click="$refs['TmToolSelectRef'].showFlag = true"
></el-button>
</el-input>
<TmToolSelect
ref="TmToolSelectRef"
@onSelected="onTmToolSelect"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="要求数量" prop="quantity">
<el-input
type="number"
v-model="form.quantity"
placeholder="请输入要求数量"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input
v-model="form.remark"
type="textarea"
:rows="3"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer">
<el-button type="primary" size="small" @click="addOrEditubmit"
>确认</el-button
>
<el-button size="small" @click="editConnectVisible = false"
>取消</el-button
>
</div>
</el-dialog>
</div>
</template>
<script>
import TmToolSelect from "@/components/TmTool/index.vue";
export default {
props: {
process: {
type: Object,
default: () => ({}),
},
},
components: { TmToolSelect },
dicts: ["mes_index_type"],
data() {
return {
form: {
toolCode: "",
toolName: "",
brand: "",
spec: "",
toolTypeName: "",
remark: "",
quantity: "",
toolId: "",
},
currentRowIdx: undefined,
tableData: [],
selectedItemId: undefined,
selectedRows: null,
showFlag: false,
optType: null,
showProcessProd: false,
editConnectVisible: false,
};
},
computed: {
title() {
return "设置" + this.process.itemName + "工装量具";
},
},
watch: {
process: {
handler(val) {
this.tableData = val.toolList;
},
deep: true,
},
},
methods: {
handleRowChange(row) {
if (row) {
this.selectedRows = row;
}
},
handleRowDbClick(row) {
if (row) {
this.selectedRows = row;
this.tableData.unshift(this.selectedRows);
this.showFlag = false;
}
},
/**新增按钮 */
handleAdd() {
this.resetForm();
this.optType = "add";
this.editConnectVisible = true;
},
/**编辑 */
updateRow(row, idx) {
this.resetForm();
Object.assign(this.form, row);
this.currentRowIdx = idx;
this.optType = "edit";
this.editConnectVisible = true;
},
/**新增 */
configmSelect() {
if (this.form.toolCode == null || this.form.toolCode == 0) {
return;
}
this.tableData.unshift({
...this.form,
processId: this.process.processId,
});
this.editConnectVisible = false;
},
/** 提交编辑关联信息 */
submitEditConnect() {
this.tableData.splice(this.currentRowIdx, 1, {
...this.form,
});
this.editConnectVisible = false;
},
addOrEditubmit() {
if (this.optType == "add") {
this.configmSelect();
} else {
this.submitEditConnect();
}
},
deleteRow(index) {
this.tableData.splice(index, 1);
},
cancleConnect() {
this.$emit("updateTool", this.tableData);
this.showProcessProd = false;
},
beforeClose(done) {
// 更新父组件的processItemList
this.$emit("updateTool", this.tableData);
done();
},
/**重置表单 */
resetForm() {
this.form = {
toolCode: "",
toolName: "",
brand: "",
spec: "",
toolTypeName: "",
toolId: "",
quantity: "",
remark: "",
};
},
onTmToolSelect(row) {
if (row != undefined && row != null) {
this.form.toolCode = row.toolCode;
this.form.toolName = row.toolName;
this.form.brand = row.brand;
this.form.spec = row.spec;
this.form.toolTypeName = row.toolTypeName;
this.form.toolId = row.toolId;
}
},
},
};
</script>
<style>
.process-prod {
padding: 0 20px;
}
</style>
src/views/mes/pro/workorder/components/ProogingProcess.vue
View file @ bd2d1e8d
......@@ -15,22 +15,24 @@
v-if="mode != 'info'"
label="操作"
align="center"
width="150"
width="300"
fixed="right"
>
<template slot-scope="{ row, $index }">
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="openSetProd(row, $index)"
>
<el-button type="text" size="small" @click="openSetProd(row, $index)">
设置物料
</el-button>
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="updateRow(row, $index)"
@click="openSetQrindex(row, $index)"
>
设置检验项
</el-button>
<el-button type="text" size="small" @click="openSetTool(row, $index)">
设置工装量具
</el-button>
<el-button type="text" size="small" @click="updateRow(row, $index)"
>修改</el-button
>
</template>
......@@ -44,6 +46,9 @@
@updateItem="updateItem"
/>
<ProcessQcindex :process="currentRow" ref="ProcessQcindexRef" />
<ProcessTool :process="currentRow" ref="ProcessToolRef" />
<el-dialog
v-dialogDrag
:visible.sync="showFlag"
......@@ -99,11 +104,19 @@
</template>
<script>
import ProcessQcindex from "./ProcessQcindex.vue";
import ProcessTool from "./ProcessTool.vue";
import ItemBomSelect from "@/components/itemBomSelect/single.vue";
import ProcessProd from "./ProcessProd.vue";
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue";
export default {
components: { ItemBomSelect, ProcessProd, WorkstationSelect },
components: {
ItemBomSelect,
ProcessProd,
WorkstationSelect,
ProcessQcindex,
ProcessTool,
},
inject: ["mode"],
props: {
bomList: {
......@@ -133,6 +146,8 @@ export default {
setList(rows) {
this.tableData = rows.map((item) => {
item.processItemList = [];
item.toolList = [];
item.qcindexList = [];
return item;
});
},
......@@ -140,6 +155,12 @@ export default {
updateItem(items) {
this.tableData[this.currentRowIndex].processItemList = items;
},
updateTool(items) {
this.tableData[this.currentRowIndex].toolList = items;
},
updateQcindex(items) {
this.tableData[this.currentRowIndex].qcindexList = items;
},
openSetProd(row, idx) {
this.currentRow = row;
this.currentRowIndex = idx;
......@@ -179,6 +200,16 @@ export default {
this.resetForm();
this.tableData = [];
},
openSetQrindex(row, idx) {
this.currentRow = row;
this.currentRowIndex = idx;
this.$refs["ProcessQcindexRef"].showProcessProd = true;
},
openSetTool(row, idx) {
this.currentRow = row;
this.currentRowIndex = idx;
this.$refs["ProcessToolRef"].showProcessProd = true;
},
// 查询工作站信息
handleWorkstationSelect() {
this.$refs.WorkstationSelect.showFlag = true;
......
src/views/mes/pro/workorder/indexApply.vue
View file @ bd2d1e8d
......@@ -164,12 +164,50 @@
>生成任务单</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="info"
plain
icon="el-icon-upload2"
size="mini"
@click="handleImport"
v-hasPermi="['mes:pro:workorder:edit']"
>导入工单</el-button>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<!-- 用户导入对话框 -->
<el-dialog title="导入工单" :visible.sync="upload.open" width="400px">
<el-upload
ref="upload"
:limit="1"
accept=".xlsx, .xls"
:headers="upload.headers"
:action="upload.url"
:disabled="upload.isUploading"
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"
:auto-upload="false"
drag
>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
</div>
</el-upload>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFileForm">确 定</el-button>
<el-button @click="upload.open = false">取 消</el-button>
</div>
</el-dialog>
<el-table
v-loading="loading"
:data="workorderList"
......@@ -198,14 +236,14 @@
prop="workorderName"
:show-overflow-tooltip="true"
/>
<el-table-column label="工单类型" align="center" prop="workorderType">
<!-- <el-table-column label="工单类型" align="center" prop="workorderType">
<template slot-scope="scope">
<dict-tag
:options="dict.type.mes_workorder_type"
:value="scope.row.workorderType"
/>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="工单来源" align="center" prop="orderSource">
<template slot-scope="scope">
<dict-tag
......@@ -434,7 +472,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="工单类型" prop="workorderType">
<el-select v-model="form.workorderType" placeholder="请选择类型">
<el-option
......@@ -445,7 +483,7 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="产品编号" prop="productCode">
<el-input v-model="form.productCode" placeholder="请选择产品" >
......@@ -641,6 +679,7 @@ import VendorSelect from "@/components/vendorSelect/single.vue";
import { genCode } from "@/api/system/autocode/rule";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { getToken } from '@/utils/auth'
export default {
name: "Workorder",
......@@ -677,6 +716,20 @@ export default {
title: "",
// 是否显示弹出层
open: false,
upload: {
// 是否显示弹出层（用户导入）
open: false,
// 弹出层标题（用户导入）
title: "",
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的用户数据
updateSupport: 0,
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
url: process.env.VUE_APP_BASE_API + "/mes/pro/workorder/importData"
},
// 查询参数
queryParams: {
pageNum: 1,
......@@ -765,6 +818,30 @@ export default {
this.loading = false;
});
},
importTemplate() {
this.download('mes/pro/workorder/importTemplate', {
}, `work_order_template_${new Date().getTime()}.xlsx`)
},
/** 导入按钮操作 */
handleImport() {
this.upload.open = true;
},
// 文件上传中处理
handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true;
},
// 文件上传成功处理
handleFileSuccess(response, file, fileList) {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
this.getList();
},
// 提交上传文件
submitFileForm() {
this.$refs.upload.submit();
},
/** 转换生产工单数据结构 */
normalizer(node) {
if (node.children && !node.children.length) {
......
src/views/mes/pro/workorder/proofingInfo.vue
View file @ bd2d1e8d
......@@ -19,6 +19,7 @@
class="page-form"
:model="form"
ref="form"
:rules="rules"
size="small"
:inline="true"
label-width="8em"
......@@ -109,7 +110,7 @@
</el-form-item>
</el-col> -->
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<!-- <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="工单类型" prop="workorderType">
<el-select v-model="form.workorderType" placeholder="请选择类型">
<el-option
......@@ -120,7 +121,7 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="工艺名称" prop="routeId">
<el-input
......
src/views/mes/proofing/components/ProcessQcindex.vue
View file @ bd2d1e8d
......@@ -223,6 +223,7 @@
if (row != undefined && row != null) {
this.form.indexCode = row.indexCode;
this.form.indexName = row.indexName;
this.form.indexType = row.indexType;
this.form.qcTool = row.qcTool;
this.form.qcindexId = row.indexId;
}
......
src/views/mes/proofing/proofingApply.vue
View file @ bd2d1e8d
......@@ -120,7 +120,7 @@
row-key="prototypeRequestId"
default-expand-all
>
<el-table-column label="样品编码" width="180" prop="prototypeRequestCode">
<el-table-column label="样品编码" prop="prototypeRequestCode">
<template slot-scope="scope">
<el-button
size="mini"
......@@ -144,7 +144,7 @@
label="计划完成日期"
align="center"
prop="plannedFinishDate"
width="180"
>
<template slot-scope="scope">
<span>{{
......@@ -156,7 +156,7 @@
label="版面需求时间"
align="center"
prop="plannedLayoutDate"
width="180"
>
<template slot-scope="scope">
<span>{{
......
src/views/mes/proofing/proofingInfo.vue
View file @ bd2d1e8d
......@@ -145,14 +145,14 @@
></el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<!-- <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="NG原因" prop="ngReason">
<el-input
v-model="form.ngReason"
placeholder="请输入NG原因"
></el-input>
</el-form-item>
</el-col>
</el-col> -->
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item prop="plannedFinishDate">
<template slot="label">
......
src/views/mes/wm/issue/index.vue
View file @ bd2d1e8d
......@@ -321,7 +321,7 @@ export default {
areaCode: null,
areaName: null,
issueDate: null,
status: null,
status: 'PREPARE',
},
// 表单参数
form: {},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment