Skip to content

M
mes-ui
Commit 05e879a4 authored by 全洪江's avatar 全洪江
Browse files
Options

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

parents bfe55cbf ed0dae68
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 897 additions and 557 deletions
src/components/SapPropertyData/index.vue
View file @ 05e879a4
......@@ -2,17 +2,19 @@
<div class="base-info">
<el-form :model="sapData" ref="form" label-width="120px" size="mini">
<el-row class="form-wrap" :gutter="gutter">
<template v-for="(sapProperties, key) in sapPropertyMap">
<div class="separator">{{ getViewTypeName(key) }}</div>
<template v-for="item in sapProperties">
<el-col :span="span" :key="item.id">
<el-form-item :label="item.name" :prop="item.sapField"
:rules="{required: item.required, validator: (rule, value, callback) => onValidate(rule, value, callback, item), trigger: ['blur', 'change']}">
<el-input-all v-model="sapData[item.sapField]" :item="item"/>
</el-form-item>
</el-col>
<div>
<template v-for="(sapProperties, key) in sapPropertyMap">
<div class="separator">{{ getViewTypeName(key) }}</div>
<template v-for="item in sapProperties">
<el-col :span="span" :key="item.id">
<el-form-item :label="item.name" :prop="item.sapField"
:rules="{required: item.required, validator: (rule, value, callback) => onValidate(rule, value, callback, item), trigger: ['blur', 'change']}">
<el-input-all v-model="sapData[item.sapField]" :item="item"/>
</el-form-item>
</el-col>
</template>
</template>
</template>
</div>
</el-row>
<div class="footer">
......
src/views/mes/md/client/components/ClientContact.vue
View file @ 05e879a4
......@@ -52,17 +52,16 @@
<el-table v-loading="loading" :data="contactList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="跟单员" align="center" prop="id"/>
<el-table-column label="客户id" align="center" prop="clientId"/>
<el-table-column label="品牌ID" align="center" prop="brandId"/>
<el-table-column label="职位" align="center" prop="position"/>
<el-table-column label="联系人" align="center" prop="contact"/>
<el-table-column label="电话号码" align="center" prop="tel"/>
<el-table-column label="email" align="center" prop="email"/>
<el-table-column label="经营类型" align="center" prop="businessType"/>
<el-table-column label="工厂代号" align="center" prop="factoryCode"/>
<el-table-column label="跟单员" align="center" prop="merchandiser"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="客户id" align="center" prop="clientId" width="100"/>
<el-table-column label="品牌ID" align="center" prop="brandId" width="150"/>
<el-table-column label="职位" align="center" prop="position" width="100"/>
<el-table-column label="联系人" align="center" prop="contact" width="100"/>
<el-table-column label="电话号码" align="center" prop="tel" width="150"/>
<el-table-column label="email" align="center" prop="email" width="200"/>
<el-table-column label="经营类型" align="center" prop="businessType" width="100"/>
<el-table-column label="工厂代号" align="center" prop="factoryCode" width="100"/>
<el-table-column label="跟单员" align="center" prop="merchandiser" width="100"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200px">
<template slot-scope="scope">
<el-button
size="mini"
......@@ -91,13 +90,51 @@
: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="品牌ID" prop="brandId" label-width="120px">
<el-input v-model="form.brandId" placeholder="请输入品牌ID" />
</el-form-item>
<el-form-item label="职位" prop="position" label-width="120px">
<el-input v-model="form.position" placeholder="请输入职位" />
</el-form-item>
<el-form-item label="联系人" prop="contact" label-width="120px">
<el-input v-model="form.contact" placeholder="请输入联系人" />
</el-form-item>
<el-form-item label="电话号码" prop="tel" label-width="120px">
<el-input v-model="form.tel" placeholder="请输入电话号码" />
</el-form-item>
<el-form-item label="email" prop="email" label-width="120px">
<el-input v-model="form.email" placeholder="请输入email" />
</el-form-item>
<el-form-item label="经营类型" prop="businessType" label-width="120px">
<el-input v-model="form.businessType" placeholder="请输入经营类型" />
</el-form-item>
<el-form-item label="工厂代号" prop="spefactoryCodec" label-width="120px">
<el-input v-model="form.factoryCode" placeholder="请输入产工厂代码" />
</el-form-item>
<el-form-item label="跟单员" prop="merchandiser" label-width="120px">
<el-input v-model="form.merchandiser" placeholder="请输入跟单员" />
</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 { listContact } from '@/api/mes/md/clientContact'
import { listContact,addContact,updateContact,getContact,delContact } from '@/api/mes/md/clientContact'
export default {
props: {
clientId: { type: Number | undefined, default:undefined },
},
data() {
return {
// 遮罩层
......@@ -112,7 +149,7 @@ export default {
showSearch: true,
// 总条数
total: 0,
// 客户系人表格数据
// 客户联系人表格数据
contactList: [],
// 弹出层标题
title: '',
......@@ -127,13 +164,34 @@ export default {
// 表单参数
form: {},
// 表单校验
rules: {}
rules: {
brandId: [
{ required: true, trigger: 'blur' }
],
position: [
{ required: true, trigger: 'blur' }
],
contact: [
{ required: true, trigger: 'blur' }
],
tel: [
{ required: true, trigger: 'blur' }
],
businessType: [
{ required: true, trigger: 'blur' }
],
merchandiser: [
{ required: true, trigger: 'blur' }
]
}
}
},
methods: {
/** 查询客户系人列表 */
/** 查询客户联系人列表 */
getList() {
this.loading = true
this.queryParams.clientId=this.clientId
listContact(this.queryParams).then(response => {
this.contactList = response.rows
this.total = response.total
......@@ -148,7 +206,7 @@ export default {
reset() {
this.form = {
id: null,
clientId: null,
clientId: this.clientId,
brandId: null,
position: null,
contact: null,
......@@ -184,7 +242,7 @@ export default {
handleAdd() {
this.reset()
this.open = true
this.title = '添加客户系人'
this.title = '添加客户联系人'
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -193,7 +251,7 @@ export default {
getContact(id).then(response => {
this.form = response.data
this.open = true
this.title = '修改客户系人'
this.title = '修改客户联系人'
})
},
/** 提交按钮 */
......@@ -201,12 +259,14 @@ export default {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateContact(this.form).then(response => {
this.$modal.msgSuccess('修改成功')
this.open = false
this.getList()
})
} else {
this.form.clientId = this.clientId
addContact(this.form).then(response => {
this.$modal.msgSuccess('新增成功')
this.open = false
......@@ -219,7 +279,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids
this.$modal.confirm('是否确认删除客户系人编号为"' + ids + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除？').then(function() {
return delContact(ids)
}).then(() => {
this.getList()
......
src/views/mes/md/client/components/PaymentRelation.vue
View file @ 05e879a4
......@@ -48,9 +48,11 @@
<el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="支付方客户ID" align="center" prop="id" />
<el-table-column label="客户id" align="center" prop="clientId" />
<el-table-column label="支付方客户ID" align="center" prop="relatedClientId" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="修改时间" align="center" prop="updateTime" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
......@@ -82,10 +84,7 @@
<!-- 添加或修改客户付款信息关联对话框 -->
<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="客户id" prop="clientId">
<el-input v-model="form.clientId" placeholder="请输入客户id" />
</el-form-item>
<el-form-item label="支付方客户ID" prop="relatedClientId">
<el-form-item label="支付方客户ID" prop="relatedClientId" label-width="8em">
<el-input v-model="form.relatedClientId" placeholder="请输入支付方客户ID" />
</el-form-item>
</el-form>
......@@ -102,6 +101,9 @@ import { listRelation, getRelation, delRelation, addRelation, updateRelation } f
export default {
name: "Relation",
props: {
clientId: { type: Number | undefined, default:undefined },
},
data() {
return {
// 遮罩层
......@@ -133,6 +135,9 @@ export default {
form: {},
// 表单校验
rules: {
relatedClientId: [{
required: true, trigger: 'blur'
}]
}
};
},
......@@ -143,6 +148,7 @@ export default {
/** 查询客户付款信息关联列表 */
getList() {
this.loading = true;
this.queryParams.clientId=this.clientId
listRelation(this.queryParams).then(response => {
this.relationList = response.rows;
this.total = response.total;
......@@ -157,7 +163,7 @@ export default {
// 表单重置
reset() {
this.form = {
id: null, clientId: null, relatedClientId: null, createBy: null, createTime: null, updateBy: null, updateTime: null };
id: null, clientId: this.clientId, relatedClientId: null, createBy: null, createTime: null, updateBy: null, updateTime: null };
this.resetForm("form");
},
/** 搜索按钮操作 */
......@@ -203,6 +209,7 @@ export default {
this.getList();
});
} else {
this.form.clientId= this.clientId
addRelation(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
......
src/views/mes/md/client/components/UrgeEmail.vue
View file @ 05e879a4
......@@ -53,11 +53,14 @@
<el-table v-loading="loading" :data="emailList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="是否开启" align="center" prop="id"/>
<el-table-column label="客户id" align="center" prop="clientId"/>
<el-table-column label="邮箱" align="center" prop="email"/>
<el-table-column label="联系人" align="center" prop="contact"/>
<el-table-column label="是否开启" align="center" prop="enableFlag"/>
<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
......@@ -90,17 +93,21 @@
<!-- 添加或修改催货款通知邮箱对话框 -->
<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="客户id" prop="clientId">
<el-input v-model="form.clientId" placeholder="请输入客户id"/>
</el-form-item>
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" placeholder="请输入邮箱"/>
</el-form-item>
<el-form-item label="联系人" prop="contact">
<el-input v-model="form.contact" placeholder="请输入联系人"/>
</el-form-item>
<el-form-item label="是否开启" prop="enableFlag">
<el-input v-model="form.enableFlag" placeholder="请输入是否开启"/>
<el-form-item label="是否启用" prop="enableFlag">
<el-select v-model="form.enableFlag" placeholder="请选择是或否">
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -116,6 +123,10 @@ import { addEmail, delEmail, getEmail, listEmail, updateEmail } from '@/api/mes/
export default {
name: 'Email',
dicts:['sys_yes_no'],
props: {
clientId: { type: Number | undefined, default:undefined },
},
data() {
return {
// 遮罩层
......@@ -140,18 +151,33 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
clientId: null, email: null, contact: null, enableFlag: null
clientId: null,
email: null, contact: null, enableFlag: null
},
// 表单参数
form: {},
// 表单校验
rules: {}
rules: {
email: [
{ required: true, trigger: 'blur' }
],
contact: [
{ required: true, trigger: 'blur' }
],
contact: [
{ required: true, trigger: 'blur' }
],
enableFlag: [
{ required: true, trigger: 'blur' }
]
}
}
},
methods: {
/** 查询催货款通知邮箱列表 */
getList() {
this.loading = true
this.queryParams.clientId=this.clientId
listEmail(this.queryParams).then(response => {
this.emailList = response.rows
this.total = response.total
......@@ -167,7 +193,7 @@ export default {
reset() {
this.form = {
id: null,
clientId: null,
clientId: this.clientId,
email: null,
contact: null,
enableFlag: null,
......@@ -221,6 +247,7 @@ export default {
this.getList()
})
} else {
this.form.clientId = this.clientId
addEmail(this.form).then(response => {
this.$modal.msgSuccess('新增成功')
this.open = false
......
src/views/mes/md/client/index.vue
View file @ 05e879a4
......@@ -243,13 +243,13 @@
<FinanceInfo ref="FinanceInfo" :form="form"/>
</el-tab-pane>
<el-tab-pane label="客户联系人" name="ClientContact">
<ClientContact ref="ClientContact"/>
<ClientContact ref="ClientContact" :clientId="form.clientId"/>
</el-tab-pane>
<el-tab-pane label="催货款通知邮箱" name="UrgeEmail">
<UrgeEmail ref="UrgeEmail"/>
<UrgeEmail ref="UrgeEmail" :clientId="form.clientId"/>
</el-tab-pane>
<el-tab-pane label="客户付款信息" name="PaymentRelation">
<PaymentRelation ref="PaymentRelation"/>
<PaymentRelation ref="PaymentRelation" :clientId="form.clientId"/>
</el-tab-pane>
<el-tab-pane label="SAP特性" name="SapProperty">
<SapPropertyData ref="SapProperty"/>
......
src/views/mes/order/sales/index.vue
View file @ 05e879a4
This diff is collapsed.
src/views/mes/order/salesdetail/index.vue 0 → 100644
View file @ 05e879a4
This diff is collapsed.
src/views/mes/proofing/components/ProogingProcess.vue
View file @ 05e879a4
......@@ -8,9 +8,15 @@
prop="linkType"
align="center"
/>
<el-table-column label="工作站" prop="workstationId" align="center" />
<el-table-column label="工作站" prop="workstationName" align="center" />
<el-table-column label="标准工时" prop="stdWorkingTime" align="center" />
<el-table-column label="甘特图显示颜色" prop="colorCode" align="center" />
<el-table-column v-if="mode != 'info'" label="操作" align="center" width="150">
<el-table-column
v-if="mode != 'info'"
label="操作"
align="center"
width="150"
>
<template slot-scope="{ row, $index }">
<el-button
type="text"
......@@ -42,7 +48,7 @@
v-dialogDrag
:visible.sync="showFlag"
width="800px"
title="添加工序"
title="工序修改"
>
<el-form
ref="form"
......@@ -54,75 +60,31 @@
>
<el-row>
<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-col :span="12">
<el-form-item label="计量单位" prop="unitOfMeasure">
<el-input
v-model="form.unitOfMeasure"
placeholder="请输入计量单位"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="报废百分比" prop="scrapPercentage">
<el-input
v-model="form.scrapPercentage"
placeholder="请输入报废百分比"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="替代组" prop="alternativeGroup">
<el-input
v-model="form.alternativeGroup"
placeholder="请输入替代组"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="替代优先级" prop="alternativePriorities">
<el-input
v-model="form.alternativePriorities"
placeholder="请输入替代优先级"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="策略" prop="alternativeStrategy">
<el-form-item label="工作站" prop="workstationId">
<el-input
v-model="form.alternativeStrategy"
placeholder="请输入策略"
></el-input>
v-model="form.workstationName"
disabled
placeholder="请选择工作站信息"
>
<el-button
slot="append"
icon="el-icon-search"
@click="handleWorkstationSelect"
></el-button>
</el-input>
<WorkstationSelect
ref="WorkstationSelect"
:processId="form.processId"
@onSelected="onWorkstationSelected"
></WorkstationSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="使用概率" prop="alternativeProbability">
<el-form-item label="标准工时" prop="quantity">
<el-input
v-model="form.alternativeProbability"
placeholder="请输入使用概率"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="BOM行备注" prop="bomItemRemark">
<el-input
v-model="form.bomItemRemark"
placeholder="请输入BOM行备注"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物料备注" prop="itemRemark">
<el-input
v-model="form.itemRemark"
placeholder="请输入物料备注"
type="number"
v-model="form.quantity"
placeholder="请输入标准工时"
></el-input>
</el-form-item>
</el-col>
......@@ -139,9 +101,10 @@
<script>
import ItemBomSelect from "@/components/itemBomSelect/single.vue";
import ProcessProd from "./ProcessProd.vue";
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue";
export default {
components: { ItemBomSelect, ProcessProd },
inject: ['mode'],
components: { ItemBomSelect, ProcessProd, WorkstationSelect },
inject: ["mode"],
props: {
bomList: {
type: Array,
......@@ -158,15 +121,9 @@ export default {
rules: {},
/**表单初始化数据 */
form: {
quantity: "",
unitOfMeasure: "",
scrapPercentage: "",
alternativeGroup: "",
alternativePriorities: "",
alternativeStrategy: "",
alternativeProbability: "",
bomItemRemark: "",
itemRemark: "",
stdWorkingTime: "",
workstationId: "",
workstationName: "",
},
currentRow: {},
currentRowIndex: undefined,
......@@ -174,9 +131,9 @@ export default {
},
methods: {
setList(rows) {
this.tableData = rows.map(item => {
item.processItemList = []
return item
this.tableData = rows.map((item) => {
item.processItemList = [];
return item;
});
},
/** 更新工序的物料信息 */
......@@ -199,6 +156,8 @@ export default {
this.$refs["form"].validate((valid) => {
if (valid) {
this.showFlag = false;
Object.assign(this.currentRow, this.form);
this.tableData.splice(this.currentRowIndex, 1, this.currentRow);
}
});
},
......@@ -208,22 +167,27 @@ export default {
/**重置表单 */
resetForm() {
this.form = {
quantity: "",
unitOfMeasure: "",
scrapPercentage: "",
alternativeGroup: "",
alternativePriorities: "",
alternativeStrategy: "",
alternativeProbability: "",
bomItemRemark: "",
itemRemark: "",
stdWorkingTime: "",
workstationId: "",
workstationName: "",
};
},
/**重置组件状态 */
resetState() {
this.resetForm()
this.tableData = []
}
this.resetForm();
this.tableData = [];
},
// 查询工作站信息
handleWorkstationSelect() {
this.$refs.WorkstationSelect.showFlag = true;
},
onWorkstationSelected(row) {
if (row != undefined && row != null) {
this.form.workstationId = row.workstationId;
this.form.workstationName = row.workstationName;
this.form.stdWorkingTime = row.stdWorkingTime;
}
},
},
};
</script>
......
src/views/mes/proofing/proofingInfo.vue
View file @ 05e879a4
......@@ -259,7 +259,7 @@ export default {
this.bomList = data.bomList;
// 设置组件数据
this.$refs["ProogingBomRef"].tableData = data.bomList;
this.$refs["ProogingProcess"].tableData = data.processList;
this.$refs["ProogingProcessRef"].tableData = data.processList;
})
.finally(() => {
this.loading = false;
......
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