|
|
@@ -8,7 +8,6 @@
|
|
|
v-show="showSearch"
|
|
|
label-width="100px"
|
|
|
>
|
|
|
-
|
|
|
<el-form-item label="作业票名称" prop="ticketName">
|
|
|
<el-input
|
|
|
v-model="queryParams.ticketName"
|
|
|
@@ -73,52 +72,59 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-button v-no-more-click
|
|
|
- type="primary"
|
|
|
- icon="el-icon-search"
|
|
|
- size="mini"
|
|
|
- @click="handleQuery"
|
|
|
- >搜索</el-button
|
|
|
+ <el-button
|
|
|
+ v-no-more-click
|
|
|
+ type="primary"
|
|
|
+ icon="el-icon-search"
|
|
|
+ size="mini"
|
|
|
+ @click="handleQuery"
|
|
|
+ >搜索</el-button
|
|
|
>
|
|
|
- <el-button v-no-more-click icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
|
- >重置</el-button
|
|
|
+ <el-button
|
|
|
+ v-no-more-click
|
|
|
+ icon="el-icon-refresh"
|
|
|
+ size="mini"
|
|
|
+ @click="resetQuery"
|
|
|
+ >重置</el-button
|
|
|
>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
<el-col :span="1.5">
|
|
|
- <el-button v-no-more-click
|
|
|
- type="primary"
|
|
|
- plain
|
|
|
- icon="el-icon-plus"
|
|
|
- size="mini"
|
|
|
- @click="handleAdd('hasSop')"
|
|
|
- v-hasPermi="['mes:job:jobm:add']"
|
|
|
- >新增sop作业票
|
|
|
+ <el-button
|
|
|
+ v-no-more-click
|
|
|
+ type="primary"
|
|
|
+ plain
|
|
|
+ icon="el-icon-plus"
|
|
|
+ size="mini"
|
|
|
+ @click="handleAdd('hasSop')"
|
|
|
+ v-hasPermi="['mes:job:jobm:add']"
|
|
|
+ >新增sop作业票
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
-<!-- <el-col :span="1.5">-->
|
|
|
-<!-- <el-button v-no-more-click-->
|
|
|
-<!-- type="primary"-->
|
|
|
-<!-- plain-->
|
|
|
-<!-- icon="el-icon-plus"-->
|
|
|
-<!-- size="mini"-->
|
|
|
-<!-- @click="handleAdd('noSop')"-->
|
|
|
-<!-- v-hasPermi="['mes:job:jobm:add']"-->
|
|
|
-<!-- >新增自定义作业票-->
|
|
|
-<!-- </el-button>-->
|
|
|
-<!-- </el-col>-->
|
|
|
+ <!-- <el-col :span="1.5">-->
|
|
|
+ <!-- <el-button v-no-more-click-->
|
|
|
+ <!-- type="primary"-->
|
|
|
+ <!-- plain-->
|
|
|
+ <!-- icon="el-icon-plus"-->
|
|
|
+ <!-- size="mini"-->
|
|
|
+ <!-- @click="handleAdd('noSop')"-->
|
|
|
+ <!-- v-hasPermi="['mes:job:jobm:add']"-->
|
|
|
+ <!-- >新增自定义作业票-->
|
|
|
+ <!-- </el-button>-->
|
|
|
+ <!-- </el-col>-->
|
|
|
<el-col :span="1.5">
|
|
|
- <el-button v-no-more-click
|
|
|
- type="danger"
|
|
|
- plain
|
|
|
- icon="el-icon-delete"
|
|
|
- size="mini"
|
|
|
- :disabled="multiple"
|
|
|
- @click="handleDelete"
|
|
|
- v-hasPermi="['mes:sop:sopm:batchremove']"
|
|
|
- >批量删除
|
|
|
+ <el-button
|
|
|
+ v-no-more-click
|
|
|
+ type="danger"
|
|
|
+ plain
|
|
|
+ icon="el-icon-delete"
|
|
|
+ size="mini"
|
|
|
+ :disabled="multiple"
|
|
|
+ @click="handleDelete"
|
|
|
+ v-hasPermi="['mes:sop:sopm:batchremove']"
|
|
|
+ >批量删除
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
<right-toolbar
|
|
|
@@ -133,10 +139,19 @@
|
|
|
@selection-change="handleSelectionChange"
|
|
|
>
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
- <el-table-column label="作业票名称" align="center" prop="ticketName" width="270"/>
|
|
|
+ <el-table-column
|
|
|
+ label="作业票名称"
|
|
|
+ align="center"
|
|
|
+ prop="ticketName"
|
|
|
+ width="350"
|
|
|
+ />
|
|
|
<el-table-column label="所属岗位" align="center" prop="workstationName">
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="设备工艺" align="center" prop="machineryName"></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ label="设备工艺"
|
|
|
+ align="center"
|
|
|
+ prop="machineryName"
|
|
|
+ ></el-table-column>
|
|
|
<el-table-column label="状态" align="center" prop="ticketStatus">
|
|
|
<template slot-scope="scope">
|
|
|
<dict-tag
|
|
|
@@ -163,29 +178,30 @@
|
|
|
class-name="small-padding fixed-width"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
-<!-- <el-button v-no-more-click-->
|
|
|
-<!-- size="mini"-->
|
|
|
-<!-- type="text"-->
|
|
|
-<!-- icon="el-icon-edit"-->
|
|
|
-<!-- @click="handleUpdate(scope.row)"-->
|
|
|
-<!-- v-hasPermi="['mes:job:jobm:edit']"-->
|
|
|
-<!-- >编辑-->
|
|
|
-<!-- </el-button>-->
|
|
|
-<!-- <el-button v-no-more-click-->
|
|
|
-<!-- size="mini"-->
|
|
|
-<!-- type="text"-->
|
|
|
-<!-- icon="el-icon-view"-->
|
|
|
-<!-- @click="handleLook(scope.row)"-->
|
|
|
-<!-- v-hasPermi="['mes:job:jobm:progress']"-->
|
|
|
-<!-- >查看-->
|
|
|
-<!-- </el-button>-->
|
|
|
- <el-button v-no-more-click
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- icon="el-icon-delete"
|
|
|
- @click="handleDelete(scope.row)"
|
|
|
- v-hasPermi="['mes:job:jobm:remove']"
|
|
|
- >删除
|
|
|
+ <!-- <el-button v-no-more-click-->
|
|
|
+ <!-- size="mini"-->
|
|
|
+ <!-- type="text"-->
|
|
|
+ <!-- icon="el-icon-edit"-->
|
|
|
+ <!-- @click="handleUpdate(scope.row)"-->
|
|
|
+ <!-- v-hasPermi="['mes:job:jobm:edit']"-->
|
|
|
+ <!-- >编辑-->
|
|
|
+ <!-- </el-button>-->
|
|
|
+ <!-- <el-button v-no-more-click-->
|
|
|
+ <!-- size="mini"-->
|
|
|
+ <!-- type="text"-->
|
|
|
+ <!-- icon="el-icon-view"-->
|
|
|
+ <!-- @click="handleLook(scope.row)"-->
|
|
|
+ <!-- v-hasPermi="['mes:job:jobm:progress']"-->
|
|
|
+ <!-- >查看-->
|
|
|
+ <!-- </el-button>-->
|
|
|
+ <el-button
|
|
|
+ v-no-more-click
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ icon="el-icon-delete"
|
|
|
+ @click="handleDelete(scope.row)"
|
|
|
+ v-hasPermi="['mes:job:jobm:remove']"
|
|
|
+ >删除
|
|
|
</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -214,8 +230,8 @@ import { mapActions } from "vuex";
|
|
|
import Treeselect from "@riophae/vue-treeselect";
|
|
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
|
|
|
|
-import { listMarsDept } from '@/api/system/marsdept'
|
|
|
-import { listTechnology } from '@/api/system/machinery'
|
|
|
+import { listMarsDept } from "@/api/system/marsdept";
|
|
|
+import { listTechnology } from "@/api/system/machinery";
|
|
|
export default {
|
|
|
name: "Team",
|
|
|
components: { Treeselect },
|
|
|
@@ -297,13 +313,12 @@ export default {
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {},
|
|
|
- TechnologyOptions:[],//设备工艺查询下拉
|
|
|
+ TechnologyOptions: [], //设备工艺查询下拉
|
|
|
//
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
this.getList();
|
|
|
-
|
|
|
},
|
|
|
|
|
|
methods: {
|
|
|
@@ -315,7 +330,7 @@ export default {
|
|
|
"PointTableData",
|
|
|
"PointTableData",
|
|
|
"setMapData",
|
|
|
- 'setVisibleSopSelect'
|
|
|
+ "setVisibleSopSelect",
|
|
|
]),
|
|
|
// 格式化日期查询数据
|
|
|
formatDate(date) {
|
|
|
@@ -343,16 +358,24 @@ export default {
|
|
|
this.loading = false;
|
|
|
});
|
|
|
|
|
|
- const data={
|
|
|
- pasge:1,
|
|
|
- size:-1
|
|
|
- }
|
|
|
- listMarsDept(data).then(response => {
|
|
|
- this.marsOptions = this.handleTree(response.data.records,"workstationId","parentId")
|
|
|
- })
|
|
|
+ const data = {
|
|
|
+ pasge: 1,
|
|
|
+ size: -1,
|
|
|
+ };
|
|
|
+ listMarsDept(data).then((response) => {
|
|
|
+ this.marsOptions = this.handleTree(
|
|
|
+ response.data.records,
|
|
|
+ "workstationId",
|
|
|
+ "parentId"
|
|
|
+ );
|
|
|
+ });
|
|
|
listTechnology(data).then((response) => {
|
|
|
- this.TechnologyOptions = this.handleTree(response.data.records,"machineryId","parentId")
|
|
|
- })
|
|
|
+ this.TechnologyOptions = this.handleTree(
|
|
|
+ response.data.records,
|
|
|
+ "machineryId",
|
|
|
+ "parentId"
|
|
|
+ );
|
|
|
+ });
|
|
|
},
|
|
|
/** 转换部门数据结构 */
|
|
|
normalizer(node) {
|
|
|
@@ -366,7 +389,7 @@ export default {
|
|
|
};
|
|
|
},
|
|
|
Technologynormalizer(node) {
|
|
|
- if (node.children &&!node.children.length) {
|
|
|
+ if (node.children && !node.children.length) {
|
|
|
delete node.children;
|
|
|
}
|
|
|
return {
|
|
|
@@ -405,7 +428,6 @@ export default {
|
|
|
this.createTime = "";
|
|
|
(this.queryParams.startTime = ""),
|
|
|
(this.queryParams.endTime = ""),
|
|
|
-
|
|
|
this.resetForm("queryForm");
|
|
|
this.handleQuery();
|
|
|
},
|
|
|
@@ -418,10 +440,10 @@ export default {
|
|
|
},
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd(val) {
|
|
|
- if(val=='hasSop'){
|
|
|
- this.setVisibleSopSelect(true)
|
|
|
- }else {
|
|
|
- this.setVisibleSopSelect(false)
|
|
|
+ if (val == "hasSop") {
|
|
|
+ this.setVisibleSopSelect(true);
|
|
|
+ } else {
|
|
|
+ this.setVisibleSopSelect(false);
|
|
|
}
|
|
|
this.reset();
|
|
|
this.open = true;
|
|
|
@@ -429,7 +451,7 @@ export default {
|
|
|
this.PointTableData(null);
|
|
|
// this.$router.push(`/mes/job/jobm/NewOperations?ticketId=null`);//黄总原来的作业票新增
|
|
|
this.$router.push({
|
|
|
- name:'NewMarsJob'
|
|
|
+ name: "NewMarsJob",
|
|
|
});
|
|
|
this.title = "添加隔离点";
|
|
|
this.optType = "add";
|
|
|
@@ -445,7 +467,7 @@ export default {
|
|
|
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row) {
|
|
|
- console.log(row,'作业票编辑拿到的row');
|
|
|
+ console.log(row, "作业票编辑拿到的row");
|
|
|
this.reset();
|
|
|
const teamId = row.ticketId || this.ids;
|
|
|
this.setSopLook(false);
|
|
|
@@ -487,7 +509,7 @@ export default {
|
|
|
const ticketNames = row.ticketName || this.codes;
|
|
|
// '是否确认删除作业票编号为"' + ticketNames + '"的数据项？'
|
|
|
this.$modal
|
|
|
- .confirm('是否确认删除数据项？')
|
|
|
+ .confirm("是否确认删除数据项？")
|
|
|
.then(function () {
|
|
|
return deleteIsJobTicket(teamIds);
|
|
|
})
|
