Skip to content

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

创建sap数据时增加状态

parent 35f56c97
Show whitespace changes
Inline Side-by-side
Showing with 141 additions and 125 deletions
.idea/inspectionProfiles/Project_Default.xml
View file @ 483560cb
......@@ -2,5 +2,6 @@
<profile version="1.0">
<option name="myName" value="Project Default" />
<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>
</component>
\ No newline at end of file
src/api/mes/md/sapdata.js
View file @ 483560cb
......@@ -44,9 +44,9 @@ export function delSapdata(id) {
}
//上传给sap
export function uploadSapdata(id) {
export function uploadSapdata(id,relationId) {
return request({
url: '/md/sapPropertyData/uploadSapdata/' +id,
url: '/md/sapPropertyData/uploadSapdata/' +id +'/' + relationId,
method: 'get'
})
}
src/components/SapPropertyData/index.vue
View file @ 483560cb
......@@ -71,7 +71,7 @@ export default {
if (!Object.keys(this.sapData).length) return
console.log(this.sapData)
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 => {
if (valid) {
this.loading = true
......
src/views/mes/md/sapdata/index.vue
View file @ 483560cb
......@@ -2,7 +2,7 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<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-select>
</el-form-item>
......@@ -14,13 +14,13 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="上传sap状态" prop="uploadFlag" label-width="8em">
<!-- <el-input-->
<!-- v-model="queryParams.uploadFlag"-->
<!-- placeholder="请输入是否上传过sap"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<el-form-item label="sap上传状态" prop="uploadFlag" label-width="8em">
<!-- <el-input-->
<!-- v-model="queryParams.uploadFlag"-->
<!-- placeholder="请输入是否上传过sap"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<el-select v-model="queryParams.uploadFlag" placeholder="请选择状态" clearable>
<el-option
v-for="dict in dict.type.sap_upload_status"
......@@ -30,11 +30,11 @@
/>
</el-select>
</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
v-model="queryParams.uploadTime"
type="date"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd hh:mm:ss"
placeholder="请选择上传sap时间">
</el-date-picker>
</el-form-item>
......@@ -45,38 +45,38 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['md:sapPropertyData:add']"-->
<!-- >新增</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['md:sapPropertyData:edit']"-->
<!-- >修改</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['md:sapPropertyData:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['md:sapPropertyData:add']"-->
<!-- >新增</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['md:sapPropertyData:edit']"-->
<!-- >修改</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['md:sapPropertyData:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
......@@ -85,60 +85,65 @@
size="mini"
@click="handleExport"
v-hasPermi="['md:sapPropertyData:export']"
>导出</el-button>
</el-col>
<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-button>
</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>
</el-row>
<el-table v-loading="loading" :data="sapdataList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" />-->
<el-table-column label="id" align="center" prop="id" />
<!-- <el-table-column type="selection" width="55" />-->
<el-table-column label="id" align="center" prop="id"/>
<el-table-column label="特性类型" align="center" prop="type" :formatter="formatType"/>
<el-table-column label="相关id" align="center" prop="relationId" />
<!-- <el-table-column label="客户SAP特性info" align="center" prop="sapData" />-->
<el-table-column label="是否上传过sap" align="center" prop="uploadFlag" >
<el-table-column label="相关id" align="center" prop="relationId"/>
<!-- <el-table-column label="客户SAP特性info" align="center" prop="sapData" />-->
<el-table-column label="sap上传状态" align="center" prop="uploadFlag">
<template slot-scope="scope">
<dict-tag :options="dict.type.sap_upload_status" :value="scope.row.uploadFlag"/>
</template>
</el-table-column>
<el-table-column label="上传sap时间" align="center" prop="uploadTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.uploadTime, '{y}-{m}-{d}') }}</span>
</template>
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.uploadTime, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['md:sapPropertyData:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['md:sapPropertyData:remove']"-->
<!-- >删除</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['md:sapPropertyData:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['md:sapPropertyData:remove']"-->
<!-- >删除</el-button>-->
<el-button
size="mini"
type="text"
icon="el-icon-upload"
:title="scope.row.uploadFlag == 1 ? '该数据已同步' : ''"
:disabled="scope.row.uploadFlag == 1"
@click="handleUpload(scope.row)"
v-hasPermi="['md:sapPropertyData:upload']"
>上传</el-button>
>上传
</el-button>
</template>
</el-table-column>
</el-table>
......@@ -152,45 +157,45 @@
/>
<!-- 添加或修改客户SAP特性信息对话框 -->
<!-- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>-->
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">-->
<!-- <el-form-item label="类型ID" prop="type">-->
<!-- <el-select v-model="form.type" placeholder="请选择类型ID">-->
<!-- <el-option label="请选择字典生成" value="" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="关联ID" prop="relationId">-->
<!-- <el-input v-model="form.relationId" placeholder="请输入关联ID" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="客户SAP特性info" prop="sapData">-->
<!-- <el-input v-model="form.sapData" type="textarea" placeholder="请输入内容" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="是否上传过sap" prop="uploadFlag">-->
<!-- <el-input v-model="form.uploadFlag" placeholder="请输入是否上传过sap" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="上传sap时间" prop="uploadTime">-->
<!-- <el-date-picker clearable-->
<!-- v-model="form.uploadTime"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="请选择上传sap时间">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button type="primary" @click="submitForm">确 定</el-button>-->
<!-- <el-button @click="cancel">取 消</el-button>-->
<!-- </div>-->
<!-- </el-dialog>-->
<!-- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>-->
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">-->
<!-- <el-form-item label="类型ID" prop="type">-->
<!-- <el-select v-model="form.type" placeholder="请选择类型ID">-->
<!-- <el-option label="请选择字典生成" value="" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="关联ID" prop="relationId">-->
<!-- <el-input v-model="form.relationId" placeholder="请输入关联ID" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="客户SAP特性info" prop="sapData">-->
<!-- <el-input v-model="form.sapData" type="textarea" placeholder="请输入内容" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="是否上传过sap" prop="uploadFlag">-->
<!-- <el-input v-model="form.uploadFlag" placeholder="请输入是否上传过sap" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="上传sap时间" prop="uploadTime">-->
<!-- <el-date-picker clearable-->
<!-- v-model="form.uploadTime"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="请选择上传sap时间">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button type="primary" @click="submitForm">确 定</el-button>-->
<!-- <el-button @click="cancel">取 消</el-button>-->
<!-- </div>-->
<!-- </el-dialog>-->
</div>
</template>
<script>
import { listSapdata, getSapdata, delSapdata, addSapdata, updateSapdata,uploadSapdata } from "@/api/mes/md/sapdata";
import {listSapdata, uploadSapdata} from "@/api/mes/md/sapdata";
export default {
name: "Sapdata",
dicts:['sap_property_type','sap_upload_status'],
dicts: ['sap_property_type', 'sap_upload_status'],
data() {
return {
// 遮罩层
......@@ -215,12 +220,12 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
type: null, relationId: null, sapData: null, uploadFlag: null, uploadTime: null },
type: null, relationId: null, sapData: null, uploadFlag: null, uploadTime: null
},
// 表单参数
form: {},
// 表单校验
rules: {
}
rules: {}
};
},
created() {
......@@ -248,7 +253,17 @@ export default {
// 表单重置
reset() {
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");
},
/** 搜索按钮操作 */
......@@ -264,7 +279,7 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.single = selection.length !== 1
this.multiple = !selection.length
},
// /** 新增按钮操作 */
......@@ -286,16 +301,17 @@ export default {
/** 上传给sap操作 */
handleUpload(row) {
const type = row.type;
const ids = row.id || this.ids;
const id = row.id;
const relationId = row.relationId;
switch (type) {
case 1:
this.$modal.confirm('是否确认上传客户SAP特性信息编号为"' + ids + '"的数据项？').then(function() {
return uploadSapdata(ids);
}).then(() => {
this.$modal.confirm('是否确认上传客户SAP特性信息编号为"' + id + '"的数据项？').then(function () {
return uploadSapdata(id,relationId);
}).then((response) => {
this.getList();
this.$modal.msgSuccess("上传成功");
}).catch(() => {});
this.$modal.msgSuccess(response.msg||"上传成功");
}).catch(() => {
});
case 2:
case 3:
case 4:
......@@ -303,7 +319,6 @@ export default {
}
},
// /** 提交按钮 */
// submitForm() {
......
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