Skip to content

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

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

parents 393df706 54469042
Show whitespace changes
Inline Side-by-side
Showing with 984 additions and 247 deletions
src/api/mes/md/vehicle.js 0 → 100644
View file @ 35f56c97
import request from '@/utils/request'
// 查询车辆列表列表
export function listVehicle(query) {
return request({
url: '/md/vehicle/list',
method: 'get',
params: query
})
}
// 查询车辆列表详细
export function getVehicle(vehicleId) {
return request({
url: '/md/vehicle/' + vehicleId,
method: 'get'
})
}
// 新增车辆列表
export function addVehicle(data) {
return request({
url: '/md/vehicle',
method: 'post',
data: data
})
}
// 修改车辆列表
export function updateVehicle(data) {
return request({
url: '/md/vehicle',
method: 'put',
data: data
})
}
// 删除车辆列表
export function delVehicle(vehicleId) {
return request({
url: '/md/vehicle/' + vehicleId,
method: 'delete'
})
}
src/api/mes/md/vehicleDispatch.js 0 → 100644
View file @ 35f56c97
import request from '@/utils/request'
// 查询派车记录列表
export function listVehicleDispatch(query) {
return request({
url: '/md/vehicleDispatch/list',
method: 'get',
params: query
})
}
// 查询派车记录详细
export function getVehicleDispatch(dispatchId) {
return request({
url: '/md/vehicleDispatch/' + dispatchId,
method: 'get'
})
}
// 新增派车记录
export function addVehicleDispatch(data) {
return request({
url: '/md/vehicleDispatch',
method: 'post',
data: data
})
}
// 修改派车记录
export function updateVehicleDispatch(data) {
return request({
url: '/md/vehicleDispatch',
method: 'put',
data: data
})
}
// 删除派车记录
export function delVehicleDispatch(dispatchId) {
return request({
url: '/md/vehicleDispatch/' + dispatchId,
method: 'delete'
})
}
src/assets/styles/page-form.scss
View file @ 35f56c97
.page-form.el-form--inline { .page-form.el-form--inline {
.el-row {
.el-col {
min-height: 51px;
.el-form-item { .el-form-item {
display: flex; display: flex;
.el-form-item__content { .el-form-item__content {
...@@ -6,6 +9,11 @@ ...@@ -6,6 +9,11 @@
.el-date-editor { .el-date-editor {
width: 100%; width: 100%;
} }
.el-select {
width: 100%;
}
}
}
} }
} }
} }
src/components/SapPropertyData/index.vue
View file @ 35f56c97
...@@ -76,6 +76,7 @@ export default { ...@@ -76,6 +76,7 @@ export default {
if (valid) { if (valid) {
this.loading = true this.loading = true
this.form.sapData = JSON.stringify(this.sapData) this.form.sapData = JSON.stringify(this.sapData)
console.log(this.form)
let handleEdit = this.form.id ? updateData : addData let handleEdit = this.form.id ? updateData : addData
handleEdit(this.form).then(() => this.$message.success('操作成功')).finally(() => this.loading = false) handleEdit(this.form).then(() => this.$message.success('操作成功')).finally(() => this.loading = false)
} else { } else {
...@@ -126,6 +127,7 @@ export default { ...@@ -126,6 +127,7 @@ export default {
this.$refs.form && this.$refs.form.resetFields() this.$refs.form && this.$refs.form.resetFields()
this.form.type = type this.form.type = type
this.form.relationId = relationId this.form.relationId = relationId
this.form.viewType = viewType
let sapData = {} let sapData = {}
// 获取sap特性列表 // 获取sap特性列表
listByType({type, viewType}).then(res => { listByType({type, viewType}).then(res => {
......
src/views/mes/md/client/components/ClientContact.vue
View file @ 35f56c97
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['md:contact:add']"
>新增 >新增
</el-button> </el-button>
</el-col> </el-col>
...@@ -20,7 +19,6 @@ ...@@ -20,7 +19,6 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['md:contact:edit']"
>修改 >修改
</el-button> </el-button>
</el-col> </el-col>
...@@ -32,43 +30,30 @@ ...@@ -32,43 +30,30 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['md:contact:remove']"
>删除 >删除
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['md:contact:export']"
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="contactList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="contactList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55"/>
<el-table-column label="品牌名称" align="center" prop="brandName" width="150"/> <el-table-column label="品牌名称" prop="brandName" width="150"/>
<el-table-column label="部门" align="center" prop="department" width="100"/> <el-table-column label="部门" prop="department" width="100"/>
<el-table-column label="职位" align="center" prop="position" width="100"/> <el-table-column label="职位" prop="position" width="100"/>
<el-table-column label="联系人" align="center" prop="contact" width="100"/> <el-table-column label="联系人" prop="contact" width="100"/>
<el-table-column label="电话号码" align="center" prop="tel" width="150"/> <el-table-column label="电话号码" prop="tel" width="150"/>
<el-table-column label="email" align="center" prop="email" width="200"/> <el-table-column label="email" prop="email" width="200"/>
<el-table-column label="经营类型" align="center" prop="businessType" width="100"/> <el-table-column label="经营类型" prop="businessType" width="100"/>
<el-table-column label="工厂代号" align="center" prop="factoryCode" width="100"/> <el-table-column label="工厂代号" prop="factoryCode" width="100"/>
<el-table-column label="跟单员" align="center" prop="merchandiser" width="100"/> <el-table-column label="跟单员" prop="merchandiser" width="100"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200px"> <el-table-column label="操作" class-name="small-padding fixed-width" fixed="right" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['md:contact:edit']"
>修改 >修改
</el-button> </el-button>
<el-button <el-button
...@@ -76,7 +61,6 @@ ...@@ -76,7 +61,6 @@
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['md:contact:remove']"
>删除 >删除
</el-button> </el-button>
</template> </template>
......
src/views/mes/md/client/components/ClientItem.vue
View file @ 35f56c97
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
:disabled="!queryParams.clientId" :disabled="!queryParams.clientId"
v-hasPermi="['md:clientItem:add']"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -20,7 +19,6 @@ ...@@ -20,7 +19,6 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['md:clientItem:edit']"
>修改</el-button> >修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -31,7 +29,6 @@ ...@@ -31,7 +29,6 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['md:clientItem:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
...@@ -42,21 +39,19 @@ ...@@ -42,21 +39,19 @@
<el-table-column label="产品" prop="itemName" /> <el-table-column label="产品" prop="itemName" />
<el-table-column label="客户产品名称" prop="clientItemName" /> <el-table-column label="客户产品名称" prop="clientItemName" />
<el-table-column label="客户产品编码" prop="clientItemCode" /> <el-table-column label="客户产品编码" prop="clientItemCode" />
<el-table-column label="操作" class-name="small-padding fixed-width"> <el-table-column label="操作" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['md:clientItem:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['md:clientItem:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
src/views/mes/md/client/components/PaymentRelation.vue
View file @ 35f56c97
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['md:relation:add']"
>新增 >新增
</el-button> </el-button>
</el-col> </el-col>
...@@ -20,7 +19,6 @@ ...@@ -20,7 +19,6 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['md:relation:edit']"
>修改 >修改
</el-button> </el-button>
</el-col> </el-col>
...@@ -32,39 +30,23 @@ ...@@ -32,39 +30,23 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['md:relation:remove']"
>删除 >删除
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['md:relation:export']"
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55"/>
<el-table-column label="客户id" align="center" prop="clientId"/> <el-table-column label="支付方客户编码" prop="relatedCode"/>
<el-table-column label="支付方客户ID" align="center" prop="relatedClientId"/> <el-table-column label="支付方客户名称" prop="relatedName"/>
<el-table-column label="创建人" align="center" prop="createBy"/> <el-table-column label="操作" class-name="small-padding fixed-width" width="120">
<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"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['md:relation:edit']"
>修改 >修改
</el-button> </el-button>
<el-button <el-button
...@@ -72,7 +54,6 @@ ...@@ -72,7 +54,6 @@
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['md:relation:remove']"
>删除 >删除
</el-button> </el-button>
</template> </template>
...@@ -90,8 +71,10 @@ ...@@ -90,8 +71,10 @@
<!-- 添加或修改客户付款信息关联对话框 --> <!-- 添加或修改客户付款信息关联对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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 ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="支付方客户ID" prop="relatedClientId" label-width="8em"> <el-form-item label="支付方客户" prop="relatedClientId" label-width="8em">
<el-input v-model="form.relatedClientId" placeholder="请输入支付方客户ID"/> <el-select v-model="form.relatedClientId" placeholder="请选择支付方客户" @focus="getClientList()" clearable filterable remote :remote-method="getClientList">
<el-option v-for="item in clientList" :key="item.clientId" :value="item.clientId" :label="item.clientName"/>
</el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -104,6 +87,7 @@ ...@@ -104,6 +87,7 @@
<script> <script>
import {listRelation, getRelation, delRelation, addRelation, updateRelation} from "@/api/mes/md/clientPaymentRelation"; import {listRelation, getRelation, delRelation, addRelation, updateRelation} from "@/api/mes/md/clientPaymentRelation";
import { listClient } from '@/api/mes/md/client'
export default { export default {
name: "Relation", name: "Relation",
...@@ -139,6 +123,7 @@ export default { ...@@ -139,6 +123,7 @@ export default {
}, },
// 表单参数 // 表单参数
form: {}, form: {},
clientList: [],
// 表单校验 // 表单校验
rules: { rules: {
relatedClientId: [{ relatedClientId: [{
...@@ -147,9 +132,6 @@ export default { ...@@ -147,9 +132,6 @@ export default {
} }
}; };
}, },
created() {
this.getList();
},
methods: { methods: {
/** 查询客户付款信息关联列表 */ /** 查询客户付款信息关联列表 */
getList() { getList() {
...@@ -249,6 +231,10 @@ export default { ...@@ -249,6 +231,10 @@ export default {
...this.queryParams ...this.queryParams
}, `relation_${new Date().getTime()}.xlsx`) }, `relation_${new Date().getTime()}.xlsx`)
}, },
getClientList(key) {
listClient({ clientName: key, pageNum: 1, pageSize: 100 }).then(res => this.clientList = res.rows)
},
init(form) { init(form) {
if (!form.clientId) return if (!form.clientId) return
this.queryParams.clientId = form.clientId this.queryParams.clientId = form.clientId
......
src/views/mes/md/client/components/UrgeEmail.vue
View file @ 35f56c97
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['md:email:add']"
>新增 >新增
</el-button> </el-button>
</el-col> </el-col>
...@@ -21,7 +20,6 @@ ...@@ -21,7 +20,6 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['md:email:edit']"
>修改 >修改
</el-button> </el-button>
</el-col> </el-col>
...@@ -33,42 +31,28 @@ ...@@ -33,42 +31,28 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['md:email:remove']"
>删除 >删除
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['md:email:export']"
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="emailList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="emailList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55"/>
<el-table-column label="客户id" align="center" prop="clientId"/> <el-table-column label="邮箱" prop="email"/>
<el-table-column label="邮箱" align="center" prop="email"/> <el-table-column label="联系人" prop="contact"/>
<el-table-column label="联系人" align="center" prop="contact"/> <el-table-column label="是否启用" prop="enableFlag">
<el-table-column label="是否启用" align="center" prop="enableFlag">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/> <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" class-name="small-padding fixed-width" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['md:email:edit']"
>修改 >修改
</el-button> </el-button>
<el-button <el-button
...@@ -76,7 +60,6 @@ ...@@ -76,7 +60,6 @@
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['md:email:remove']"
>删除 >删除
</el-button> </el-button>
</template> </template>
......
src/views/mes/md/client/index.vue
View file @ 35f56c97
...@@ -533,10 +533,10 @@ export default { ...@@ -533,10 +533,10 @@ export default {
}, },
//自动生成编码 //自动生成编码
handleAutoGenChange(autoGenFlag){ handleAutoGenChange(autoGenFlag){
debugger;
if(autoGenFlag){ if(autoGenFlag){
genCode('CLIENT_CODE').then(response =>{ genCode('CLIENT_CODE').then(response =>{
this.form.clientCode = response; this.form.clientCode = response;
this.$forceUpdate()
}); });
}else{ }else{
this.form.clientCode = null; this.form.clientCode = null;
......
src/views/mes/md/product/components/backFaceColor.vue
View file @ 35f56c97
<!--产品正反面颜色--> <!--产品正反面颜色-->
<template> <template>
<!-- v-hasPermi="['mes:md:faceColor:add']"
v-hasPermi="['mes:md:faceColor:remove']"
v-hasPermi="['mes:md:faceColor:remove']"
v-hasPermi="['mes:md:faceColor:edit']"-->
<div class="app-container"> <div class="app-container">
<el-row :gutter="10" class="mb8" v-if="optType !='view'"> <el-row :gutter="10" class="mb8" v-if="optType !='view'">
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -13,7 +9,7 @@ ...@@ -13,7 +9,7 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['mes:md:faceColor:add']"
>新增</el-button> >新增</el-button>
<ColorSelect ref="colorSelect" @onSelected="onColorSelected" > </ColorSelect> <ColorSelect ref="colorSelect" @onSelected="onColorSelected" > </ColorSelect>
</el-col> </el-col>
...@@ -25,7 +21,7 @@ ...@@ -25,7 +21,7 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['mes:md:faceColor:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
...@@ -52,14 +48,14 @@ ...@@ -52,14 +48,14 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['mes:md:faceColor:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['mes:md:faceColor:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
src/views/mes/md/product/components/customerLoss.vue
View file @ 35f56c97
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['md:loss:add']"
>新增</el-button >新增</el-button
> >
</el-col> </el-col>
...@@ -20,6 +21,7 @@ ...@@ -20,6 +21,7 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['md:loss:edit']"
>修改</el-button >修改</el-button
> >
</el-col> </el-col>
...@@ -31,6 +33,7 @@ ...@@ -31,6 +33,7 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['md:loss:remove']"
>删除</el-button >删除</el-button
> >
</el-col> </el-col>
...@@ -69,6 +72,7 @@ ...@@ -69,6 +72,7 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['md:loss:edit']"
>修改</el-button >修改</el-button
> >
<el-button <el-button
...@@ -76,6 +80,7 @@ ...@@ -76,6 +80,7 @@
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['md:loss:remove']"
>删除</el-button >删除</el-button
> >
</template> </template>
......
src/views/mes/md/product/components/faceColor.vue
View file @ 35f56c97
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['mes:md:faceColor:add']"
>新增</el-button> >新增</el-button>
<ColorSelect ref="colorSelect" @onSelected="onColorSelected" > </ColorSelect> <ColorSelect ref="colorSelect" @onSelected="onColorSelected" > </ColorSelect>
</el-col> </el-col>
...@@ -20,6 +21,7 @@ ...@@ -20,6 +21,7 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['mes:md:faceColor:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
...@@ -46,12 +48,14 @@ ...@@ -46,12 +48,14 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['mes:md:faceColor:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['mes:md:faceColor:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
src/views/mes/md/product/components/factory.vue
View file @ 35f56c97
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['md:factory:add']"
>新增</el-button >新增</el-button
> >
<FactorySelect ref="FactorySelectRef" @onSelected="onFactorySelect" /> <FactorySelect ref="FactorySelectRef" @onSelected="onFactorySelect" />
...@@ -21,6 +22,7 @@ ...@@ -21,6 +22,7 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['md:factory:remove']"
>删除</el-button >删除</el-button
> >
</el-col> </el-col>
...@@ -31,6 +33,7 @@ ...@@ -31,6 +33,7 @@
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['md:factory:export']"
>导出</el-button >导出</el-button
> >
</el-col> </el-col>
...@@ -97,6 +100,7 @@ ...@@ -97,6 +100,7 @@
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['md:factory:remove']"
>删除</el-button >删除</el-button
> >
</template> </template>
......
src/views/mes/md/vehicle/components/singleSelect.vue 0 → 100644
View file @ 35f56c97
<template>
<el-dialog
title="车辆选择"
v-if="showFlag"
:visible.sync="showFlag"
:modal="true"
width="80%"
center
append-to-body
>
<el-row :gutter="20">
<el-col :span="20" :xs="24">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="车辆名称" prop="vehicleName">
<el-input
v-model="queryParams.vehicleName"
placeholder="请输入车辆名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="车牌号" prop="licensePlate">
<el-input
v-model="queryParams.licensePlate"
placeholder="请输入车牌号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-table
v-loading="loading"
:data="vehicleList"
@current-change="handleCurrent"
@row-dblclick="handleRowDbClick"
>
<el-table-column width="50" align="center">
<template v-slot="scope">
<el-radio
v-model="selectedVehicleId"
:label="scope.row.vehicleId"
@change="handleRowChange(scope.row)"
>{{ "" }}</el-radio
>
</template>
</el-table-column>
<el-table-column label="车辆编码" align="center" prop="vehicleCode"/>
<el-table-column label="车辆名称" align="center" prop="vehicleName" />
<el-table-column label="车牌号" align="center" prop="licensePlate" />
<el-table-column label="车型" align="center" prop="vehicleModel">
<template slot-scope="scope">
<dict-tag
:options="dict.type.vehicle_model"
:value="scope.row.vehicleModel"
/>
</template>
</el-table-column>
<el-table-column label="座位数" align="center" prop="seating" />
<el-table-column label="购买时间" align="center" prop="purchaseDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.purchaseDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="验车时间" align="center" prop="inspectionDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.inspectionDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-col>
</el-row>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelect">确 定</el-button>
<el-button @click="showFlag = false">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { listVehicle } from "@/api/mes/md/vehicle";
export default {
name: "MdItemSingle",
dicts: ["sys_yes_no", "mes_item_product"],
components: { },
data() {
return {
showFlag: false,
// 选中数组
selectedVehicleId: undefined,
selectedRows: undefined,
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 物料产品表格数据
vehicleList: null,
// 部门树选项
itemTypeOptions: undefined,
// 部门名称
itemTypeName: undefined,
defaultProps: {
children: "children",
label: "label",
},
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
itemCode: undefined,
itemName: undefined,
itemTypeId: 0,
},
// 列信息
columns: [
{ key: 0, label: `物料/产品编码`, visible: true },
{ key: 1, label: `物料/产品名称`, visible: true },
{ key: 2, label: `规格型号`, visible: true },
{ key: 3, label: `单位`, visible: true },
{ key: 4, label: `物料/产品`, visible: true },
{ key: 5, label: `物料分类`, visible: true },
{ key: 6, label: `创建时间`, visible: true },
{ key: 7, label: `备注`, visible: true },
],
};
},
watch: {
// 根据名称筛选分类树
itemTypeName(val) {
this.$refs.tree.filter(val);
},
},
created() {
this.getList();
},
methods: {
/** 查询物料编码列表 */
getList() {
this.loading = true;
listVehicle(this.queryParams).then((response) => {
this.vehicleList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 筛选节点
filterNode(value, data) {
if (!value) return true;
return data.label.indexOf(value) !== -1;
},
// 节点单击事件
handleNodeClick(data) {
this.queryParams.itemTypeId = data.id;
this.handleQuery();
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
handleCurrent(row) {
if (row) {
this.selectedRows = row;
}
},
handleRowDbClick(row) {
if (row) {
this.selectedRows = row;
this.$emit("onSelected", this.selectedRows);
this.showFlag = false;
}
},
// 单选选中数据
handleRowChange(row) {
if (row) {
this.selectedRows = row;
}
},
//确定选中
confirmSelect() {
if (this.selectedVehicleId == null || this.selectedVehicleId == 0) {
this.$notify({
title: "提示",
type: "warning",
message: "请至少选择一条数据!",
});
return;
}
this.$emit("onSelected", this.selectedRows);
this.showFlag = false;
},
},
};
</script>
src/views/mes/md/vehicleDispatch/components/dispatchAdd.vue 0 → 100644
View file @ 35f56c97
<template>
<!-- 车辆派送 -->
<el-dialog :title="title" v-if="showFlag" :visible.sync="showFlag" width="700px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
<el-form-item label="派车编号" prop="dispatchCode" disabled="" v-if="form.dispatchId != null">
<el-input v-model="form.dispatchCode" placeholder="请输入派车编号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="用车说明" prop="dispatchTitle">
<el-input v-model="form.dispatchTitle" placeholder="请输入名称" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="车辆" prop="vehicleId">
<el-input
v-model="form.vehicleName"
readonly
placeholder="请选择车辆"
>
<el-button
slot="append"
icon="el-icon-search"
@click="$refs['VehicleSelectRef'].showFlag = true"
></el-button>
</el-input>
<VehicleSelect
ref="VehicleSelectRef"
@onSelected="onVehicleSelect"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="驾驶人" prop="driverBy">
<el-input v-model="form.driverBy" placeholder="请输入驾驶人" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="派车时间" prop="dispatchDate">
<el-date-picker clearable
v-model="form.dispatchDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择派车时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="派时里程" prop="startMileage">
<el-input v-model="form.startMileage" placeholder="请输入派时里程" />
</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" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm" v-if="optType !='view'">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { getVehicleDispatch, addVehicleDispatch, updateVehicleDispatch } from "@/api/mes/md/vehicleDispatch";
import VehicleSelect from "@/views/mes/md/vehicle/components/singleSelect.vue";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "DispatchBack",
dicts: ["sys_yes_no", "mes_item_product"],
components: { VehicleSelect },
data() {
return {
showFlag: false,
dispatchId: null,
optType:null,
// 表单参数
form: {
dispatchId: null,
dispatchCode: null,
dispatchTitle: null,
vehicleId: null,
vehicleName: null,
dispatchBy: null,
driverBy: null, dispatchDate: null,
backDate: null, travelMileage: null,
startMileage: null, endMileage: null,
oilConsumption: null, remark: null},
// 表单校验
rules: {
vehicleId: [
{ required: true, message: "车辆不能为空", trigger: "blur" }
],
vehicleId: [
{ required: true, message: "车辆不能为空", trigger: "blur" }
],
},
title:'确认派送'
};
},
created() {
},
methods: {
// 取消按钮
cancel() {
this.showFlag = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
dispatchId: null,
dispatchCode: null,
dispatchTitle: null,
vehicleId: null,
vehicleName: null,
dispatchBy: null,
driverBy: null, dispatchDate: null,
backDate: null, travelMileage: null,
startMileage: null, endMileage: null,
oilConsumption: null, remark: null
};
this.resetForm("form");
},
onVehicleSelect(row) {
if (row != undefined && row != null) {
this.form.vehicleId = row.vehicleId;
this.form.vehicleName = row.vehicleName;
}
},
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.dispatchId != null) {
updateVehicleDispatch(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.showFlag=false;
this.$emit("reload");
});
} else {
addVehicleDispatch(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.showFlag=false;
this.$emit("reload");
});
}
}
});
},
},
};
</script>
src/views/mes/md/vehicleDispatch/components/dispatchBack.vue 0 → 100644
View file @ 35f56c97
<template>
<!-- 车辆回收 -->
<el-dialog :title="title" v-if="showFlag" :visible.sync="showFlag"
:modal="true" width="900px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :md="8" :xs="12">
<el-form-item label="派车编号" prop="dispatchCode" v-if="form.dispatchId != null">
<el-input v-model="form.dispatchCode" disabled placeholder="请输入派车编号" />
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="名称" prop="dispatchTitle">
<el-input v-model="form.dispatchTitle" disabled placeholder="请输入名称" />
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="车辆" prop="vehicleId">
<el-input
v-model="form.vehicleName"
disabled
placeholder="请选择车辆"
>
<el-button
slot="append"
icon="el-icon-search"
@click="$refs['VehicleSelectRef'].showFlag = true"
></el-button>
</el-input>
<VehicleSelect
ref="VehicleSelectRef"
@onSelected="onVehicleSelect"
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="派车人" prop="dispatchBy">
<el-input v-model="form.dispatchBy" disabled placeholder="请输入派车人" />
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="驾驶人" prop="driverBy">
<el-input v-model="form.driverBy" disabled placeholder="请输入驾驶人" />
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="派车时间" required prop="dispatchDate">
<el-date-picker clearable readonly
v-model="form.dispatchDate"
type="date"
disabled
value-format="yyyy-MM-dd"
placeholder="请选择派车时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="派时总里程" prop="startMileage">
<el-input v-model="form.startMileage" disabled placeholder="请输入派时里程"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="8" :xs="12">
<el-form-item label="返回时间" prop="backDate">
<el-date-picker clearable
v-model="form.backDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择返回时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="还车总里程" prop="endMileage">
<el-input v-model="form.endMileage" placeholder="请输入还车里程" @change="mileageCalculate"/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="本次里程数" prop="travelMileage">
<el-input v-model="form.travelMileage" placeholder="请输入本次里程数"/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="耗油量" prop="oilConsumption">
<el-input v-model="form.oilConsumption" placeholder="请输入耗油量" />
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm" v-if="optType !='view'">确 定</el-button>
<el-button @click="showFlag = false">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { getVehicleDispatch, addVehicleDispatch, updateVehicleDispatch } from "@/api/mes/md/vehicleDispatch";
import VehicleSelect from "@/views/mes/md/vehicle/components/singleSelect.vue";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "DispatchBack",
dicts: ["sys_yes_no", "mes_item_product"],
components: { VehicleSelect },
data() {
return {
showFlag: false,
dispatchId: null,
optType:null,
// 表单参数
form: {},
// 表单校验
rules: {
backDate: [
{ required: true, message: "返回时间不能为空", trigger: "blur" }
],
},
title:'确认派送'
};
},
created() {
},
methods: {
// 取消按钮
cancel() {
this.showFlag = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
dispatchId: null,
dispatchCode: null,
dispatchTitle: null,
vehicleId: null,
dispatchBy: null,
driverBy: null, dispatchDate: null,
backDate: null, travelMileage: null,
startMileage: null, endMileage: null,
oilConsumption: null, remark: null
};
this.resetForm("form");
},
mileageCount(){
},
onVehicleSelect(row) {
if (row != undefined && row != null) {
this.form.itemId = row.itemId;
this.form.itemName = row.itemName;
this.form.unit = row.unitOfMeasure;
}
},
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
updateVehicleDispatch(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.showFlag=false;
this.$emit("reload");
});
}
});
},
mileageCalculate(){
if(this.form.startMileage!=null&&this.form.endMileage!=null){
this.form.travelMileage = this.form.endMileage-this.form.startMileage;
}
}
},
};
</script>
src/views/mes/order/sales/index.vue
View file @ 35f56c97
...@@ -125,14 +125,14 @@ ...@@ -125,14 +125,14 @@
v-hasPermi="['od:salesOrder:remove']" v-hasPermi="['od:salesOrder:remove']"
>删除 >删除
</el-button> </el-button>
<el-button <!-- <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-refresh" icon="el-icon-refresh"
@click="onSync(scope.row)" @click="onSync(scope.row)"
v-hasPermi="['od:salesOrder:edit']" v-hasPermi="['od:salesOrder:edit']"
>同步 >同步
</el-button> </el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
src/views/mes/order/salesdetail/index.vue
View file @ 35f56c97
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<el-dialog :visible="showEditDetail" title="订单详情" width="1200px"> <el-dialog :visible.sync="showEditDetail" title="订单详情" width="1200px">
<el-form :model="itemForm" ref="itemForm" :rules="itemRules" label-width="100px"> <el-form :model="itemForm" ref="itemForm" :rules="itemRules" label-width="100px">
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="8"> <el-col :span="8">
......
src/views/mes/pro/workorder/proofingInfo.vue
View file @ 35f56c97
<template> <template>
<div class="form-page" v-loading="loading"> <div v-loading="loading">
<PageTitle> <PageTitle>
{{ pageTitle }} {{ pageTitle }}
<!-- 申请按钮显示 --> <!-- 申请按钮显示 -->
<template slot="buttons" v-if="mode == 'apply' "> <template slot="buttons" v-if="mode == 'apply'">
<el-button size="mini" @click="resetForm">重置</el-button> <el-button size="mini" @click="resetForm">重置</el-button>
<el-button size="mini" type="primary" @click="saveForm" >提交</el-button> <el-button size="mini" type="primary" @click="saveForm">提交</el-button>
</template> </template>
<!-- 修改 按钮显示 --> <!-- 修改 按钮显示 -->
<template slot="buttons" v-if="mode == 'edit' "> <template slot="buttons" v-if="mode == 'edit'">
<el-button size="mini" type="primary" @click="saveForm">提交</el-button> <el-button size="mini" type="primary" @click="saveForm">提交</el-button>
</template> </template>
</PageTitle> </PageTitle>
<PageWrapper> <PageWrapper>
<el-form <el-form
class="page-form"
:model="form" :model="form"
ref="form" ref="form"
size="small" size="small"
...@@ -23,7 +24,7 @@ ...@@ -23,7 +24,7 @@
label-width="8em" label-width="8em"
> >
<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="workorderCode"> <el-form-item label="申请单编码" prop="workorderCode">
<el-input <el-input
disabled disabled
...@@ -32,39 +33,60 @@ ...@@ -32,39 +33,60 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="工单名称" prop="workorderName"> <el-form-item label="工单名称" prop="workorderName">
<el-input v-model="form.workorderName" placeholder="请输入工单名称" /> <el-input
v-model="form.workorderName"
placeholder="请输入工单名称"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="来源类型" prop="orderSource"> <el-form-item label="来源类型" prop="orderSource">
<el-radio-group v-model="form.orderSource" disabled v-if="optType=='view'"> <el-radio-group
v-model="form.orderSource"
disabled
v-if="optType == 'view'"
>
<el-radio <el-radio
v-for="dict in dict.type.mes_workorder_sourcetype" v-for="dict in dict.type.mes_workorder_sourcetype"
:key="dict.value" :key="dict.value"
:label="dict.value" :label="dict.value"
>{{dict.label}}</el-radio> >{{ dict.label }}</el-radio
>
</el-radio-group> </el-radio-group>
<el-radio-group v-model="form.orderSource" v-else> <el-radio-group v-model="form.orderSource" v-else>
<el-radio <el-radio
v-for="dict in dict.type.mes_workorder_sourcetype" v-for="dict in dict.type.mes_workorder_sourcetype"
:key="dict.value" :key="dict.value"
:label="dict.value" :label="dict.value"
>{{dict.label}}</el-radio> >{{ dict.label }}</el-radio
>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row> <el-col
<el-col :span="8" v-if="form.orderSource == 'ORDER'"> :lg="6"
:md="8"
:sm="12"
:xs="12"
v-if="form.orderSource == 'ORDER'"
>
<el-form-item label="订单编号" prop="sourceCode"> <el-form-item label="订单编号" prop="sourceCode">
<el-input v-model="form.sourceCode" placeholder="请输入订单编号" /> <el-input
v-model="form.sourceCode"
placeholder="请输入订单编号"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="单据状态" prop="status"> <el-form-item label="单据状态" prop="status">
<el-select v-model="form.status" disabled placeholder="请选择单据状态"> <el-select
v-model="form.status"
disabled
placeholder="请选择单据状态"
>
<el-option <el-option
v-for="dict in dict.type.mes_order_status" v-for="dict in dict.type.mes_order_status"
:key="dict.value" :key="dict.value"
...@@ -74,7 +96,7 @@ ...@@ -74,7 +96,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="8"> <!-- <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="单据状态" prop="status"> <el-form-item label="单据状态" prop="status">
<el-select v-model="form.status" disabled> <el-select v-model="form.status" disabled>
<el-option <el-option
...@@ -87,7 +109,7 @@ ...@@ -87,7 +109,7 @@
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<el-col :span="8"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="工单类型" prop="workorderType"> <el-form-item label="工单类型" prop="workorderType">
<el-select v-model="form.workorderType" placeholder="请选择类型"> <el-select v-model="form.workorderType" placeholder="请选择类型">
<el-option <el-option
...@@ -99,9 +121,7 @@ ...@@ -99,9 +121,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-row>
<el-col :md="8" :xs="12" style="height: 50.5px">
<el-form-item label="工艺名称" prop="routeId"> <el-form-item label="工艺名称" prop="routeId">
<el-input <el-input
v-model="form.routeName" v-model="form.routeName"
...@@ -114,93 +134,157 @@ ...@@ -114,93 +134,157 @@
@click="$refs['RoutesProcessSelectRef'].showFlag = true" @click="$refs['RoutesProcessSelectRef'].showFlag = true"
></el-button> ></el-button>
</el-input> </el-input>
<RoutesProcessSelect
ref="RoutesProcessSelectRef"
@onSelected="onRoutesProcessSelect"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-col :span="8">
<el-form-item label="产品编号" prop="productCode"> <el-form-item label="产品编号" prop="productCode">
<el-input v-model="form.productCode" placeholder="请选择产品" > <el-input v-model="form.productCode" placeholder="请选择产品">
<el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button> <el-button
slot="append"
@click="handleSelectProduct"
icon="el-icon-search"
></el-button>
</el-input> </el-input>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="产品名称" prop="productName"> <el-form-item label="产品名称" prop="productName">
<el-input v-model="form.productName" placeholder="请选择产品" disabled/> <el-input
v-model="form.productName"
placeholder="请选择产品"
disabled
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="规格型号" prop="productSpc"> <el-form-item label="规格型号" prop="productSpc">
<el-input v-model="form.productSpc" placeholder="请选择产品" disabled/> <el-input
v-model="form.productSpc"
placeholder="请选择产品"
disabled
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="单位" prop="unitOfMeasure"> <el-form-item label="单位" prop="unitOfMeasure">
<el-input v-model="form.unitOfMeasure" placeholder="请选择产品" disabled/> <el-input
v-model="form.unitOfMeasure"
placeholder="请选择产品"
disabled
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="工单数量" prop="quantity"> <el-form-item label="工单数量" prop="quantity">
<el-input-number :min="1" v-model="form.quantity" placeholder="请输入生产数量" /> <el-input-number
:min="1"
v-model="form.quantity"
placeholder="请输入生产数量"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="需求日期" prop="requestDate"> <el-form-item label="需求日期" prop="requestDate">
<el-date-picker clearable <el-date-picker
clearable
v-model="form.requestDate" v-model="form.requestDate"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="请选择需求日期"> placeholder="请选择需求日期"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="批次号" prop="batchCode"> <el-form-item label="批次号" prop="batchCode">
<el-input v-model="form.batchCode" placeholder="请输入批次号" /> <el-input v-model="form.batchCode" placeholder="请输入批次号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-row v-if="form.orderSource == 'ORDER'"> <!-- <el-row v-if="form.orderSource == 'ORDER'"> -->
<el-col :span="8"> <el-col
:lg="6"
:md="8"
:sm="12"
:xs="12"
v-if="form.orderSource == 'ORDER'"
>
<el-form-item label="客户编码" prop="clientCode"> <el-form-item label="客户编码" prop="clientCode">
<el-input v-model="form.clientCode" placeholder="请选择客户" > <el-input v-model="form.clientCode" placeholder="请选择客户">
<el-button slot="append" @click="handleSelectClient" icon="el-icon-search"></el-button> <el-button
slot="append"
@click="handleSelectClient"
icon="el-icon-search"
></el-button>
</el-input> </el-input>
<ClientSelect ref="clientSelect" @onSelected="onClientSelected" > </ClientSelect> <ClientSelect ref="clientSelect" @onSelected="onClientSelected">
</ClientSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col
:lg="6"
:md="8"
:sm="12"
:xs="12"
v-if="form.orderSource == 'ORDER'"
>
<el-form-item label="客户名称" prop="clientName"> <el-form-item label="客户名称" prop="clientName">
<el-input v-model="form.clientName" readonly="readonly" placeholder="请输入客户名称" /> <el-input
v-model="form.clientName"
readonly="readonly"
placeholder="请输入客户名称"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col></el-col>
</el-row> <el-col
<el-row v-if="form.workorderType == 'OUTSOURCE' || form.workorderType == 'PURCHASE'"> :lg="6"
<el-col :span="8"> :md="8"
:sm="12"
:xs="12"
v-if="
form.workorderType == 'OUTSOURCE' ||
form.workorderType == 'PURCHASE'
"
>
<el-form-item label="供应商编码" prop="vendorCode"> <el-form-item label="供应商编码" prop="vendorCode">
<el-input v-model="form.vendorCode" placeholder="请选择供应商" > <el-input v-model="form.vendorCode" placeholder="请选择供应商">
<el-button slot="append" @click="handleSelectVendor" icon="el-icon-search"></el-button> <el-button
slot="append"
@click="handleSelectVendor"
icon="el-icon-search"
></el-button>
</el-input> </el-input>
<VendorSelect ref="vendorSelect" @onSelected="onVendorSelected" /> <VendorSelect ref="vendorSelect" @onSelected="onVendorSelected" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col
:lg="6"
:md="8"
:sm="12"
:xs="12"
v-if="
form.workorderType == 'OUTSOURCE' ||
form.workorderType == 'PURCHASE'
"
>
<el-form-item label="供应商名称" prop="vendorName"> <el-form-item label="供应商名称" prop="vendorName">
<el-input v-model="form.vendorName" readonly="readonly" placeholder="请选择供应商" /> <el-input
v-model="form.vendorName"
readonly="readonly"
placeholder="请选择供应商"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col></el-col>
</el-row> </el-row>
<el-row>
<el-col :span="8"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -215,28 +299,47 @@ ...@@ -215,28 +299,47 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</PageWrapper> </PageWrapper>
<RoutesProcessSelect
ref="RoutesProcessSelectRef"
@onSelected="onRoutesProcessSelect"
/>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected"> </ItemSelect>
</div> </div>
</template> </template>
<script> <script>
import {genCode} from "@/api/system/autocode/rule";; import { genCode } from "@/api/system/autocode/rule";
import ProogingBom from "./components/ProogingBom.vue"; import ProogingBom from "./components/ProogingBom.vue";
import ProogingProcess from "./components/ProogingProcess.vue"; import ProogingProcess from "./components/ProogingProcess.vue";
import ItemSelect from "@/components/itemSelect/single.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
import ClientSelect from "@/components/clientSelect/single.vue"; import ClientSelect from "@/components/clientSelect/single.vue";
import VendorSelect from "@/components/vendorSelect/single.vue"; import VendorSelect from "@/components/vendorSelect/single.vue";
import RoutesProcessSelect from "@/components/routesProcessSelect/index.vue"; import RoutesProcessSelect from "@/components/routesProcessSelect/index.vue";
import { listRouteprocess } from "@/api/mes/pro/routeprocess"; import { listRouteprocess } from "@/api/mes/pro/routeprocess";
import tabPlugins from "@/plugins/tab"; import tabPlugins from "@/plugins/tab";
import { import {
addPrototypeRequest, addPrototypeRequest,
getPrototypeRequest, getPrototypeRequest,
updatePrototypeRequest, updatePrototypeRequest,
} from "@/api/mes/pro/prototypeRequest"; } from "@/api/mes/pro/prototypeRequest";
import { listWorkorder, getWorkorder, delWorkorder, addWorkorder, updateWorkorder ,dofinish} from "@/api/mes/pro/workorder"; import {
listWorkorder,
getWorkorder,
delWorkorder,
addWorkorder,
updateWorkorder,
dofinish,
} from "@/api/mes/pro/workorder";
export default { export default {
components: { ProogingProcess,ProogingBom, ItemSelect, RoutesProcessSelect ,ClientSelect,VendorSelect}, components: {
dicts: ['mes_order_status','mes_workorder_sourcetype','mes_workorder_type'], ProogingProcess,
ProogingBom,
ItemSelect,
RoutesProcessSelect,
ClientSelect,
VendorSelect,
},
dicts: ["mes_order_status", "mes_workorder_sourcetype", "mes_workorder_type"],
provide() { provide() {
return { return {
mode: this.mode, mode: this.mode,
...@@ -244,11 +347,9 @@ export default { ...@@ -244,11 +347,9 @@ export default {
}, },
data() { data() {
return { return {
loading: false, loading: false,
optType: undefined, optType: undefined,
bomList: [], bomList: [],
// 表单参数 // 表单参数
form: { form: {
...@@ -291,38 +392,37 @@ export default { ...@@ -291,38 +392,37 @@ export default {
parentId: "", parentId: "",
ancestors: "", ancestors: "",
status: "PREPARE", status: "PREPARE",
}, },
// 表单校验 // 表单校验
rules: { rules: {
workorderCode: [ workorderCode: [
{ required: true, message: "工单编码不能为空", trigger: "blur" } { required: true, message: "工单编码不能为空", trigger: "blur" },
], ],
workorderName: [ workorderName: [
{ required: true, message: "工单名称不能为空", trigger: "blur" } { required: true, message: "工单名称不能为空", trigger: "blur" },
], ],
workorderType: [ workorderType: [
{ required: true, message: "请选择生产工单类型", trigger: "blur" } { required: true, message: "请选择生产工单类型", trigger: "blur" },
], ],
orderSource: [ orderSource: [
{ required: true, message: "来源类型不能为空", trigger: "blur" } { required: true, message: "来源类型不能为空", trigger: "blur" },
], ],
productId: [ productId: [
{ required: true, message: "产品不能为空", trigger: "blur" } { required: true, message: "产品不能为空", trigger: "blur" },
], ],
productCode: [ productCode: [
{ required: true, message: "产品编号不能为空", trigger: "blur" } { required: true, message: "产品编号不能为空", trigger: "blur" },
], ],
productName: [ productName: [
{ required: true, message: "产品名称不能为空", trigger: "blur" } { required: true, message: "产品名称不能为空", trigger: "blur" },
], ],
quantity: [ quantity: [
{ required: true, message: "生产数量不能为空", trigger: "blur" } { required: true, message: "生产数量不能为空", trigger: "blur" },
], ],
requestDate: [ requestDate: [
{ required: true, message: "需求日期不能为空", trigger: "blur" } { required: true, message: "需求日期不能为空", trigger: "blur" },
], ],
} },
}; };
}, },
computed: { computed: {
...@@ -349,14 +449,20 @@ export default { ...@@ -349,14 +449,20 @@ export default {
}, },
methods: { methods: {
/** 查询生产工单下拉树结构 */ /** 查询生产工单下拉树结构 */
getTreeselect() { getTreeselect() {
listWorkorder().then(response => { listWorkorder().then((response) => {
this.workorderOptions = []; this.workorderOptions = [];
const data = { workorderId: 0, workorderName: '顶级节点', children: [] }; const data = {
data.children = this.handleTree(response.data, "workorderId", "parentId"); workorderId: 0,
workorderName: "顶级节点",
children: [],
};
data.children = this.handleTree(
response.data,
"workorderId",
"parentId"
);
this.workorderOptions.push(data); this.workorderOptions.push(data);
}); });
}, },
...@@ -384,10 +490,9 @@ export default { ...@@ -384,10 +490,9 @@ export default {
// this.optType="add"; // this.optType="add";
// }, // },
//物料选择弹出框 //物料选择弹出框
onItemSelected(obj){ onItemSelected(obj) {
if(obj != undefined && obj != null){ if (obj != undefined && obj != null) {
this.form.productId = obj.itemId; this.form.productId = obj.itemId;
this.form.productCode = obj.itemCode; this.form.productCode = obj.itemCode;
this.form.productName = obj.itemName; this.form.productName = obj.itemName;
...@@ -397,30 +502,30 @@ export default { ...@@ -397,30 +502,30 @@ export default {
}, },
//客户选择弹出框 //客户选择弹出框
onClientSelected(row){ onClientSelected(row) {
if(row != undefined && row != null){ if (row != undefined && row != null) {
this.form.clientId = row.clientId; this.form.clientId = row.clientId;
this.form.clientCode = row.clientCode; this.form.clientCode = row.clientCode;
this.form.clientName = row.clientName; this.form.clientName = row.clientName;
} }
}, },
//供应商选择弹出框 //供应商选择弹出框
onVendorSelected(row){ onVendorSelected(row) {
debugger; debugger;
if(row != undefined && row != null){ if (row != undefined && row != null) {
this.form.vendorId = row.vendorId; this.form.vendorId = row.vendorId;
this.form.vendorCode = row.vendorCode; this.form.vendorCode = row.vendorCode;
this.form.vendorName = row.vendorName; this.form.vendorName = row.vendorName;
} }
}, },
handleSelectProduct(){ handleSelectProduct() {
this.$refs.itemSelect.showFlag = true; this.$refs.itemSelect.showFlag = true;
}, },
handleSelectClient(){ handleSelectClient() {
this.$refs.clientSelect.showFlag = true; this.$refs.clientSelect.showFlag = true;
}, },
handleSelectVendor(){ handleSelectVendor() {
this.$refs.vendorSelect.showFlag = true; this.$refs.vendorSelect.showFlag = true;
}, },
/** 根据 id 获取页面数据 */ /** 根据 id 获取页面数据 */
...@@ -462,7 +567,6 @@ export default { ...@@ -462,7 +567,6 @@ export default {
// }, // },
//物料选择弹出框 //物料选择弹出框
onRoutesProcessSelect(row) { onRoutesProcessSelect(row) {
if (row != undefined && row != null) { if (row != undefined && row != null) {
this.form.routeId = row.routeId; this.form.routeId = row.routeId;
...@@ -532,7 +636,7 @@ export default { ...@@ -532,7 +636,7 @@ export default {
workorderCode: null, workorderCode: null,
workorderName: null, workorderName: null,
routeName: null, routeName: null,
workorderType: 'SELF', workorderType: "SELF",
orderSource: null, orderSource: null,
sourceCode: null, sourceCode: null,
productId: null, productId: null,
...@@ -557,14 +661,13 @@ export default { ...@@ -557,14 +661,13 @@ export default {
createBy: null, createBy: null,
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null updateTime: null,
}; };
this.$refs["ProogingBomRef"].resetState(); this.$refs["ProogingBomRef"].resetState();
this.$refs["ProogingProcessRef"].resetState(); this.$refs["ProogingProcessRef"].resetState();
this.gCode(); this.gCode();
}, },
},
}
}; };
</script> </script>
......
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