Skip to content

M
mes-ui
Commit 15f9f23b authored by 赵汉亭's avatar 赵汉亭
Browse files
Options

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

parents fca79206 0567b380
Hide whitespace changes
Inline Side-by-side
Showing with 851 additions and 142 deletions
.idea/inspectionProfiles/Project_Default.xml
View file @ 15f9f23b
...@@ -2,5 +2,6 @@ ...@@ -2,5 +2,6 @@
<profile version="1.0"> <profile version="1.0">
<option name="myName" value="Project Default" /> <option name="myName" value="Project Default" />
<inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="JSEqualityComparisonWithCoercion" enabled="false" level="WARNING" enabled_by_default="false" />
</profile> </profile>
</component> </component>
\ No newline at end of file
src/api/mes/md/sapdata.js
View file @ 15f9f23b
...@@ -44,9 +44,9 @@ export function delSapdata(id) { ...@@ -44,9 +44,9 @@ export function delSapdata(id) {
} }
//上传给sap //上传给sap
export function uploadSapdata(id) { export function uploadSapdata(id,relationId) {
return request({ return request({
url: '/md/sapPropertyData/uploadSapdata/' +id, url: '/md/sapPropertyData/uploadSapdata/' +id +'/' + relationId,
method: 'get' method: 'get'
}) })
} }
src/api/mes/md/vehicle.js 0 → 100644
View file @ 15f9f23b
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 @ 15f9f23b
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/components/SapPropertyData/index.vue
View file @ 15f9f23b
...@@ -71,7 +71,7 @@ export default { ...@@ -71,7 +71,7 @@ export default {
if (!Object.keys(this.sapData).length) return if (!Object.keys(this.sapData).length) return
console.log(this.sapData) console.log(this.sapData)
if (this.loading) return if (this.loading) return
if (!this.form.type || !this.form.relationId) return this.$message.error("对象为创建") if (!this.form.type || !this.form.relationId) return this.$message.error("对象未创建")
this.$refs.form.validate(valid => { this.$refs.form.validate(valid => {
if (valid) { if (valid) {
this.loading = true this.loading = true
......
src/directive/permission/hasPermi.js
View file @ 15f9f23b
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
* v-hasPermi 操作权限处理 * v-hasPermi 操作权限处理
* Copyright (c) 2019 ruoyi * Copyright (c) 2019 ruoyi
*/ */
import store from '@/store' import store from '@/store'
export default { export default {
inserted(el, binding, vnode) { inserted(el, binding, vnode) {
const { value } = binding /*const { value } = binding
const all_permission = "*:*:*"; const all_permission = "*:*:*";
const permissions = store.getters && store.getters.permissions const permissions = store.getters && store.getters.permissions
...@@ -23,6 +23,6 @@ export default { ...@@ -23,6 +23,6 @@ export default {
} }
} else { } else {
throw new Error(`请设置操作权限标签值`) throw new Error(`请设置操作权限标签值`)
} }*/
} }
} }
src/views/mes/md/product/index.vue
View file @ 15f9f23b
...@@ -1037,7 +1037,7 @@ export default { ...@@ -1037,7 +1037,7 @@ export default {
} else if (this.activeName === 'SapQAProperty') { } else if (this.activeName === 'SapQAProperty') {
this.$refs.SapQAProperty.init(2,'sapQA', this.form.itemId, this.form) this.$refs.SapQAProperty.init(2,'sapQA', this.form.itemId, this.form)
} else if (this.activeName === 'SapFinanceProperty') { } else if (this.activeName === 'SapFinanceProperty') {
this.$refs.SapFinanceProperty.init(2,'sapQA', this.form.itemId, this.form) this.$refs.SapFinanceProperty.init(2,'sapFinance', this.form.itemId, this.form)
} //else this.$refs[this.activeName].init && this.$refs[this.activeName].init(this.form) } //else this.$refs[this.activeName].init && this.$refs[this.activeName].init(this.form)
} }
}, },
......
src/views/mes/md/sales/mdpaymentClause.vue
View file @ 15f9f23b
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['md:clause:add']" v-hasPermi="['md:payment:add']"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['md:clause:edit']" v-hasPermi="['md:payment:edit']"
>修改</el-button> >修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['md:clause:remove']" v-hasPermi="['md:payment:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['md:clause:export']" v-hasPermi="['md:payment:export']"
>导出</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>
...@@ -97,19 +97,19 @@ ...@@ -97,19 +97,19 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['md:clause:edit']" v-hasPermi="['md:payment: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:clause:remove']" v-hasPermi="['md:payment:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
...@@ -209,7 +209,7 @@ export default { ...@@ -209,7 +209,7 @@ export default {
{ required: true, message: "编码不能为空", trigger: "blur" } { required: true, message: "编码不能为空", trigger: "blur" }
], Name: [ ], Name: [
{ required: true, message: "名称不能为空", trigger: "blur" } { required: true, message: "名称不能为空", trigger: "blur" }
], ],
} }
}; };
}, },
...@@ -301,7 +301,7 @@ export default { ...@@ -301,7 +301,7 @@ export default {
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('md/clause/export', { this.download('md/payment/export', {
...this.queryParams ...this.queryParams
}, `clause_${new Date().getTime()}.xlsx`) }, `clause_${new Date().getTime()}.xlsx`)
} }
......
src/views/mes/md/sapdata/index.vue
View file @ 15f9f23b
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="特性类型" prop="type"> <el-form-item label="特性类型" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择特新类型" clearable > <el-select v-model="queryParams.type" placeholder="请选择特新类型" clearable>
<el-option v-for="item in dict.type.sap_property_type" :key="item.value" v-bind="item"/> <el-option v-for="item in dict.type.sap_property_type" :key="item.value" v-bind="item"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -14,27 +14,27 @@ ...@@ -14,27 +14,27 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="上传sap状态" prop="uploadFlag" label-width="8em"> <el-form-item label="sap上传状态" prop="uploadFlag" label-width="8em">
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.uploadFlag"--> <!-- v-model="queryParams.uploadFlag"-->
<!-- placeholder="请输入是否上传过sap"--> <!-- placeholder="请输入是否上传过sap"-->
<!-- clearable--> <!-- clearable-->
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<el-select v-model="queryParams.uploadFlag" placeholder="请选择状态" clearable> <el-select v-model="queryParams.uploadFlag" placeholder="请选择状态" clearable>
<el-option <el-option
v-for="dict in dict.type.sap_upload_status" v-for="dict in dict.type.sap_upload_status"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="上传sap时间" prop="uploadTime" label-width="8em"> <el-form-item label="上传时间" prop="uploadTime" label-width="8em">
<el-date-picker clearable <el-date-picker clearable
v-model="queryParams.uploadTime" v-model="queryParams.uploadTime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd hh:mm:ss"
placeholder="请选择上传sap时间"> placeholder="请选择上传sap时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
...@@ -45,38 +45,38 @@ ...@@ -45,38 +45,38 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">--> <!-- <el-col :span="1.5">-->
<!-- <el-button--> <!-- <el-button-->
<!-- type="primary"--> <!-- type="primary"-->
<!-- plain--> <!-- plain-->
<!-- icon="el-icon-plus"--> <!-- icon="el-icon-plus"-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- @click="handleAdd"--> <!-- @click="handleAdd"-->
<!-- v-hasPermi="['md:sapPropertyData:add']"--> <!-- v-hasPermi="['md:sapPropertyData:add']"-->
<!-- >新增</el-button>--> <!-- >新增</el-button>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="1.5">--> <!-- <el-col :span="1.5">-->
<!-- <el-button--> <!-- <el-button-->
<!-- type="success"--> <!-- type="success"-->
<!-- plain--> <!-- plain-->
<!-- icon="el-icon-edit"--> <!-- icon="el-icon-edit"-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- :disabled="single"--> <!-- :disabled="single"-->
<!-- @click="handleUpdate"--> <!-- @click="handleUpdate"-->
<!-- v-hasPermi="['md:sapPropertyData:edit']"--> <!-- v-hasPermi="['md:sapPropertyData:edit']"-->
<!-- >修改</el-button>--> <!-- >修改</el-button>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="1.5">--> <!-- <el-col :span="1.5">-->
<!-- <el-button--> <!-- <el-button-->
<!-- type="danger"--> <!-- type="danger"-->
<!-- plain--> <!-- plain-->
<!-- icon="el-icon-delete"--> <!-- icon="el-icon-delete"-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- :disabled="multiple"--> <!-- :disabled="multiple"-->
<!-- @click="handleDelete"--> <!-- @click="handleDelete"-->
<!-- v-hasPermi="['md:sapPropertyData:remove']"--> <!-- v-hasPermi="['md:sapPropertyData:remove']"-->
<!-- >删除</el-button>--> <!-- >删除</el-button>-->
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
...@@ -85,60 +85,65 @@ ...@@ -85,60 +85,65 @@
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['md:sapPropertyData:export']" v-hasPermi="['md:sapPropertyData:export']"
>导出</el-button> >导出
</el-col> </el-button>
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-upload"
size="mini"
@click="handleExport"
v-hasPermi="['md:sapPropertyData:export']"
>上传</el-button>
</el-col> </el-col>
<!-- 批量上传-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-upload"-->
<!-- size="mini"-->
<!-- @click="handleUpload"-->
<!-- v-hasPermi="['md:sapPropertyData: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="sapdataList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="sapdataList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" />--> <!-- <el-table-column type="selection" width="55" />-->
<el-table-column label="id" align="center" prop="id" /> <el-table-column label="id" align="center" prop="id"/>
<el-table-column label="特性类型" align="center" prop="type" :formatter="formatType"/> <el-table-column label="特性类型" align="center" prop="type" :formatter="formatType"/>
<el-table-column label="相关id" align="center" prop="relationId" /> <el-table-column label="相关id" align="center" prop="relationId"/>
<!-- <el-table-column label="客户SAP特性info" align="center" prop="sapData" />--> <!-- <el-table-column label="客户SAP特性info" align="center" prop="sapData" />-->
<el-table-column label="是否上传过sap" align="center" prop="uploadFlag" > <el-table-column label="sap上传状态" align="center" prop="uploadFlag">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.sap_upload_status" :value="scope.row.uploadFlag"/> <dict-tag :options="dict.type.sap_upload_status" :value="scope.row.uploadFlag"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="上传sap时间" align="center" prop="uploadTime" width="180"> <el-table-column label="上传sap时间" align="center" prop="uploadTime" width="180">
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span>{{ parseTime(scope.row.uploadTime, '{y}-{m}-{d}') }}</span> <!-- <span>{{ parseTime(scope.row.uploadTime, '{y}-{m}-{d}') }}</span>-->
</template> <!-- </template>-->
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <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:sapPropertyData:edit']"--> <!-- v-hasPermi="['md:sapPropertyData: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:sapPropertyData:remove']"--> <!-- v-hasPermi="['md:sapPropertyData:remove']"-->
<!-- >删除</el-button>--> <!-- >删除</el-button>-->
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-upload" icon="el-icon-upload"
:title="scope.row.uploadFlag == 1 ? '该数据已同步' : ''"
:disabled="scope.row.uploadFlag == 1"
@click="handleUpload(scope.row)" @click="handleUpload(scope.row)"
v-hasPermi="['md:sapPropertyData:upload']" v-hasPermi="['md:sapPropertyData:upload']"
>上传</el-button> >上传
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -152,45 +157,45 @@ ...@@ -152,45 +157,45 @@
/> />
<!-- 添加或修改客户SAP特性信息对话框 --> <!-- 添加或修改客户SAP特性信息对话框 -->
<!-- <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="type">--> <!-- <el-form-item label="类型ID" prop="type">-->
<!-- <el-select v-model="form.type" placeholder="请选择类型ID">--> <!-- <el-select v-model="form.type" placeholder="请选择类型ID">-->
<!-- <el-option label="请选择字典生成" value="" />--> <!-- <el-option label="请选择字典生成" value="" />-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="关联ID" prop="relationId">--> <!-- <el-form-item label="关联ID" prop="relationId">-->
<!-- <el-input v-model="form.relationId" placeholder="请输入关联ID" />--> <!-- <el-input v-model="form.relationId" placeholder="请输入关联ID" />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="客户SAP特性info" prop="sapData">--> <!-- <el-form-item label="客户SAP特性info" prop="sapData">-->
<!-- <el-input v-model="form.sapData" type="textarea" placeholder="请输入内容" />--> <!-- <el-input v-model="form.sapData" type="textarea" placeholder="请输入内容" />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="是否上传过sap" prop="uploadFlag">--> <!-- <el-form-item label="是否上传过sap" prop="uploadFlag">-->
<!-- <el-input v-model="form.uploadFlag" placeholder="请输入是否上传过sap" />--> <!-- <el-input v-model="form.uploadFlag" placeholder="请输入是否上传过sap" />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="上传sap时间" prop="uploadTime">--> <!-- <el-form-item label="上传sap时间" prop="uploadTime">-->
<!-- <el-date-picker clearable--> <!-- <el-date-picker clearable-->
<!-- v-model="form.uploadTime"--> <!-- v-model="form.uploadTime"-->
<!-- type="date"--> <!-- type="date"-->
<!-- value-format="yyyy-MM-dd"--> <!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="请选择上传sap时间">--> <!-- placeholder="请选择上传sap时间">-->
<!-- </el-date-picker>--> <!-- </el-date-picker>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-form>--> <!-- </el-form>-->
<!-- <div slot="footer" class="dialog-footer">--> <!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button type="primary" @click="submitForm">确 定</el-button>--> <!-- <el-button type="primary" @click="submitForm">确 定</el-button>-->
<!-- <el-button @click="cancel">取 消</el-button>--> <!-- <el-button @click="cancel">取 消</el-button>-->
<!-- </div>--> <!-- </div>-->
<!-- </el-dialog>--> <!-- </el-dialog>-->
</div> </div>
</template> </template>
<script> <script>
import { listSapdata, getSapdata, delSapdata, addSapdata, updateSapdata,uploadSapdata } from "@/api/mes/md/sapdata"; import {listSapdata, uploadSapdata} from "@/api/mes/md/sapdata";
export default { export default {
name: "Sapdata", name: "Sapdata",
dicts:['sap_property_type','sap_upload_status'], dicts: ['sap_property_type', 'sap_upload_status'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -215,12 +220,12 @@ export default { ...@@ -215,12 +220,12 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
type: null, relationId: null, sapData: null, uploadFlag: null, uploadTime: null }, type: null, relationId: null, sapData: null, uploadFlag: null, uploadTime: null
},
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {}
}
}; };
}, },
created() { created() {
...@@ -248,7 +253,17 @@ export default { ...@@ -248,7 +253,17 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
id: null, type: null, relationId: null, sapData: null, createTime: null, updateTime: null, createBy: null, updateBy: null, uploadFlag: null, uploadTime: null }; id: null,
type: null,
relationId: null,
sapData: null,
createTime: null,
updateTime: null,
createBy: null,
updateBy: null,
uploadFlag: null,
uploadTime: null
};
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
...@@ -264,7 +279,7 @@ export default { ...@@ -264,7 +279,7 @@ export default {
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id) this.ids = selection.map(item => item.id)
this.single = selection.length!==1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
// /** 新增按钮操作 */ // /** 新增按钮操作 */
...@@ -286,16 +301,17 @@ export default { ...@@ -286,16 +301,17 @@ export default {
/** 上传给sap操作 */ /** 上传给sap操作 */
handleUpload(row) { handleUpload(row) {
const type = row.type; const type = row.type;
const ids = row.id || this.ids; const id = row.id;
const relationId = row.relationId;
switch (type) { switch (type) {
case 1: case 1:
this.$modal.confirm('是否确认上传客户SAP特性信息编号为"' + ids + '"的数据项？').then(function() { this.$modal.confirm('是否确认上传客户SAP特性信息编号为"' + id + '"的数据项？').then(function () {
return uploadSapdata(ids); return uploadSapdata(id,relationId);
}).then(() => { }).then((response) => {
this.getList(); this.getList();
this.$modal.msgSuccess("上传成功"); this.$modal.msgSuccess(response.msg||"上传成功");
}).catch(() => {}); }).catch(() => {
});
case 2: case 2:
case 3: case 3:
case 4: case 4:
...@@ -303,7 +319,6 @@ export default { ...@@ -303,7 +319,6 @@ export default {
} }
}, },
// /** 提交按钮 */ // /** 提交按钮 */
// submitForm() { // submitForm() {
......
src/views/mes/md/vehicle/components/singleSelect.vue 0 → 100644
View file @ 15f9f23b
<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 @ 15f9f23b
<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 @ 15f9f23b
<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/proofing/proofingInfo.vue
View file @ 15f9f23b
...@@ -95,21 +95,47 @@ ...@@ -95,21 +95,47 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </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="type"> <el-form-item label="打样形式" prop="type">
<el-input <el-input
v-model="form.type" v-model="form.type"
placeholder="请选择打样形式" placeholder="请选择打样形式"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="打样形式" prop="type">
<el-select v-model="form.type" placeholder="请选择打样形式">
<el-option
v-for="dict in dict.type.pro_proof_form"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col> </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="modality"> <el-form-item label="分配方式" prop="modality">
<el-input <el-input
v-model="form.modality" v-model="form.modality"
placeholder="请选择分配方式" placeholder="请选择分配方式"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="分配方式" prop="modality">
<el-select v-model="form.modality" placeholder="请选择分配方式">
<el-option
v-for="dict in dict.type.pro_distribution_profing"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col> </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="surfaceTreatment"> <el-form-item label="表面处理" prop="surfaceTreatment">
...@@ -202,7 +228,7 @@ import { ...@@ -202,7 +228,7 @@ import {
export default { export default {
components: { ProogingBom, ProogingProcess, ItemSelect, RoutesProcessSelect }, components: { ProogingBom, ProogingProcess, ItemSelect, RoutesProcessSelect },
dicts: [], dicts: ['pro_proof_form','pro_distribution_profing'],
provide() { provide() {
return { return {
mode: this.mode, mode: this.mode,
......
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