作业票管理内容界面修改

src/router/index.js

@@ -112,7 +112,6 @@ export const dynamicRoutes = [
     hidden: true,
     permissions: ['mes:sop:sopm:add'],
     children: [
-
       {
         path: 'NewSop',
         component: () => import('@/views/mes/sop/sopm/NewSop'),

src/views/mes/job/jobm/index.vue

@@ -1,39 +1,44 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="作业编号" prop="teamCode">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
+      <el-form-item label="作业票编号" prop="ticketCode">
         <el-input
-          v-model="queryParams.teamCode"
-          placeholder="请输入作业编号"
+          v-model="queryParams.ticketCode"
+          placeholder="请输入作业票编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="作业名称" prop="teamCode">
+      <el-form-item label="作业票名称" prop="ticketName">
         <el-input
-          v-model="queryParams.teamCode"
-          placeholder="请输入作业名称"
+          v-model="queryParams.ticketName"
+          placeholder="请输入作业票名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="calendarType">
-        <el-select v-model="queryParams.calendarType" placeholder="状态">
-          <el-option>新建中</el-option>
-          <el-option>未通过</el-option>
-          <el-option>待审批</el-option>
-          <el-option>已生效</el-option>
-          <el-option>已失效</el-option>
-          <!--          <el-option-->
-          <!--            v-for="dict in dict.type.mes_calendar_type"-->
-          <!--            :key="dict.value"-->
-          <!--            :label="dict.label"-->
-          <!--            :value="dict.value"-->
-          <!--          />-->
+      <el-form-item label="状态" prop="ticketStatus">
+        <el-select v-model="queryParams.ticketStatus" placeholder="状态">
+          <el-option
+            v-for="dict in dict.type.mes_calendar_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
-      <el-form-item label="车间名称" prop="calendarType">
-        <el-select v-model="queryParams.calendarType" placeholder="请选择车间名称">
+      <el-form-item label="车间名称" prop="workshopId">
+        <el-select
+          v-model="queryParams.workshopId"
+          placeholder="请选择车间名称"
+        >
           <el-option
             v-for="dict in dict.type.mes_calendar_type"
             :key="dict.value"
@@ -42,8 +47,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="产线" prop="calendarType">
-        <el-select v-model="queryParams.calendarType" placeholder="请选择产线">
+      <el-form-item label="产线" prop="workareaId">
+        <el-select v-model="queryParams.workareaId" placeholder="请选择产线">
           <el-option
             v-for="dict in dict.type.mes_calendar_type"
             :key="dict.value"
@@ -52,7 +57,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="上锁人" prop="teamCode">
+      <!-- <el-form-item label="上锁人" prop="teamCode">
         <el-input
           v-model="queryParams.teamCode"
           placeholder="请输入上锁人"
@@ -67,11 +72,11 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="创建时间">
         <el-date-picker
-          style="width:218px"
-          v-model="value2"
+          style="width: 218px"
+          v-model="createTime"
           type="daterange"
           align="right"
           unlink-panels
@@ -82,8 +87,11 @@
         >
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="隔离能量类型" prop="calendarType">
-        <el-select v-model="queryParams.calendarType" placeholder="请选择隔离能量类型">
+      <el-form-item label="作业类型" prop="ticketType">
+        <el-select
+          v-model="queryParams.ticketType"
+          placeholder="请选择作业类型"
+        >
           <el-option
             v-for="dict in dict.type.mes_calendar_type"
             :key="dict.value"
@@ -92,18 +100,17 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="隔离方式" prop="calendarType">
-        <el-input
-          v-model="queryParams.teamCode"
-          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-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>
 
@@ -116,9 +123,22 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['mes:job:jobm:add']"
-        >新增
+          >新增
+        </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="['mes:sop:sopm:batchremove']"
+          >批量删除
         </el-button>
       </el-col>
+
       <!--      <el-col :span="1.5">-->
       <!--        <el-button-->
       <!--          type="success"-->
@@ -130,18 +150,6 @@
       <!--          v-hasPermi="['mes:cal:team: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="['mes:sop:sopm:batchremove']"-->
-<!--        >批量删除-->
-<!--        </el-button>-->
-<!--      </el-col>-->
       <!--      <el-col :span="1.5">-->
       <!--        <el-button-->
       <!--          type="warning"-->
@@ -152,43 +160,55 @@
       <!--          v-hasPermi="['mes:cal:team: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-table v-loading="loading" :data="teamList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="SOP编号" align="center" prop="teamCode">
-        <template slot-scope="scope">
+    <el-table
+      v-loading="loading"
+      :data="jobList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="作业票编号" align="center" prop="ticketCode">
+        <!-- <template slot-scope="scope">
           <el-button
             type="text"
             @click="handleView(scope.row)"
             v-hasPermi="['mes:job:jobm:query']"
-          >{{ scope.row.teamCode }}
+            >{{ scope.row.teamCode }}
           </el-button>
-        </template>
-      </el-table-column>
-      <el-table-column label="SOP名称" align="center" prop="teamName"/>
-      <el-table-column label="状态" align="center" prop="calendarType">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.mes_calendar_type" :value="scope.row.calendarType"/>
-        </template>
+        </template> -->
       </el-table-column>
-      <el-table-column label="车间名称" align="center" prop="remark">
+      <el-table-column label="作业票名称" align="center" prop="ticketName" />
+      <el-table-column label="状态" align="center" prop="ticketStatus">
         <template slot-scope="scope">
-          <img src="" alt="">
+          <dict-tag
+            :options="dict.type.mes_calendar_type"
+            :value="scope.row.ticketStatus"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="上锁人" align="center" prop="remark">
+      <el-table-column label="车间名称" align="center" prop="workshopId">
+        <!-- <template slot-scope="scope">
+          <img src="" alt="" />
+        </template> -->
       </el-table-column>
-      <el-table-column label="产线" align="center" prop="remark">
+      <el-table-column label="作业类型" align="center" prop="ticketType">
       </el-table-column>
-      <el-table-column label="隔离能量类型" align="center" prop="remark">
+      <el-table-column label="产线" align="center" prop="workareaId">
       </el-table-column>
-      <el-table-column label="隔离方式" align="center" prop="remark">
+      <el-table-column label="隔离点总数" align="center" prop="pointCount">
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="remark">
+      <el-table-column label="创建时间" align="center" prop="createTime">
       </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">
           <el-button
             size="mini"
@@ -196,15 +216,15 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:job:jobm:edit']"
-          >编辑
+            >编辑
           </el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-view"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:job:jobm:progress']"
-          >查看审批进度
+            >查看
           </el-button>
           <el-button
             size="mini"
@@ -212,32 +232,30 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['mes:job:jobm:remove']"
-          >删除
+            >删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+      :page.sync="queryParams.current"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-
   </div>
 </template>
 
 <script>
-import { listTeam, getTeam, delTeam, addTeam, updateTeam } from '@/api/mes/cal/team'
+import { listJobTicket } from "@/api/mes/job/job";
 
-import { genCode } from '@/api/system/autocode/rule'
+import { genCode } from "@/api/system/autocode/rule";
 
 export default {
-  name: 'Team',
-  dicts: ['mes_calendar_type'],
+  name: "Team",
+  dicts: ["mes_calendar_type"],
   data() {
     return {
       //自动生成编码
@@ -256,83 +274,91 @@ export default {
       // 总条数
       total: 0,
       // 班组表格数据
-      teamList: [],
+      jobList: [],
       // 弹出层标题
-      title: '',
+      title: "",
       // 是否显示弹出层
       open: false,
       // 查询参数
+      createTime: "",
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        teamCode: null,
-        teamName: null,
-        calendarType: null
+        current: 1,
+        size: 10,
+        ticketCode: null,
+        ticketName: null,
+        ticketStatus: null,
+        workshopId: null,
+        workareaId: null,
+        ticketType: null,
+        ticketStartTime: null,
+        ticketEndTime: null,
       },
       pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
       },
 
-      value2: '',
-
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         teamCode: [
-          { required: true, message: '班组编号不能为空', trigger: 'blur' }
+          { required: true, message: "班组编号不能为空", trigger: "blur" },
         ],
         teamName: [
-          { required: true, message: '班组名称不能为空', trigger: 'blur' }
+          { required: true, message: "班组名称不能为空", trigger: "blur" },
         ],
         calendarType: [
-          { required: true, message: '清选择班组类型', trigger: 'blur' }
-        ]
-      }
-    }
+          { required: true, message: "清选择班组类型", trigger: "blur" },
+        ],
+      },
+    };
   },
   created() {
-    this.getList()
+    this.getList();
   },
   methods: {
     /** 查询班组列表 */
     getList() {
-      this.loading = true
-      listTeam(this.queryParams).then(response => {
-        this.teamList = response.rows
-        this.total = response.total
-        this.loading = false
-      })
+      this.loading = true;
+      listJobTicket(this.queryParams).then((response) => {
+        this.jobList = response.data.records;
+        this.total = response.data.total;
+        this.loading = false;
+      });
     },
 
     // 取消按钮
     cancel() {
-      this.open = false
-      this.reset()
+      this.open = false;
+      this.reset();
     },
     // 表单重置
     reset() {
@@ -349,105 +375,112 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
-      }
-      this.resetForm('form')
+        updateTime: null,
+      };
+      this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
+      this.queryParams.current = 1;
+      this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm('queryForm')
-      this.handleQuery()
+      this.resetForm("queryForm");
+      this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.teamId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.teamId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset()
-      this.open = true
-      this.$router.push('/mes/job/jobm/NewOperations')
-      this.title = '添加隔离点'
-      this.optType = 'add'
+      this.reset();
+      this.open = true;
+      this.$router.push("/mes/job/jobm/NewOperations");
+      this.title = "添加隔离点";
+      this.optType = "add";
     },
     // 查询明细按钮操作
     handleView(row) {
-      this.reset()
-      const teamId = row.teamId || this.ids
-      getTeam(teamId).then(response => {
-        this.form = response.data
-        this.open = true
-        this.title = '查看班组'
-        this.optType = 'view'
-      })
+      this.reset();
+      const teamId = row.teamId || this.ids;
+      getTeam(teamId).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "查看班组";
+        this.optType = "view";
+      });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset()
-      const teamId = row.teamId || this.ids
-      getTeam(teamId).then(response => {
-        this.form = response.data
-        this.open = true
-        this.title = '修改隔离点信息'
-        this.optType = 'edit'
-      })
+      this.reset();
+      const teamId = row.teamId || this.ids;
+      getTeam(teamId).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改隔离点信息";
+        this.optType = "edit";
+      });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs['form'].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.teamId != null) {
-            updateTeam(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
-              this.open = false
-              this.getList()
-            })
+            updateTeam(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
           } else {
-            addTeam(this.form).then(response => {
-              this.$modal.msgSuccess('新增成功')
-              this.open = false
-              this.getList()
-            })
+            addTeam(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
           }
         }
-      })
+      });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const teamIds = row.teamId || this.ids
-      this.$modal.confirm('是否确认删除班组编号为"' + teamIds + '"的数据项？').then(function() {
-        return delTeam(teamIds)
-      }).then(() => {
-        this.getList()
-        this.$modal.msgSuccess('删除成功')
-      }).catch(() => {
-      })
+      const teamIds = row.teamId || this.ids;
+      this.$modal
+        .confirm('是否确认删除班组编号为"' + teamIds + '"的数据项？')
+        .then(function () {
+          return delTeam(teamIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('cal/team/export', {
-        ...this.queryParams
-      }, `team_${new Date().getTime()}.xlsx`)
+      this.download(
+        "cal/team/export",
+        {
+          ...this.queryParams,
+        },
+        `team_${new Date().getTime()}.xlsx`
+      );
     },
     //自动生成编码
     handleAutoGenChange(autoGenFlag) {
       if (autoGenFlag) {
-        genCode('CAL_TEAM_CODE').then(response => {
-          this.form.teamCode = response
-        })
+        genCode("CAL_TEAM_CODE").then((response) => {
+          this.form.teamCode = response;
+        });
       } else {
-        this.form.teamCode = null
+        this.form.teamCode = null;
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 <style lang="scss" src="@/assets/styles/dialog-title.scss" scoped>
 .el-input-width {

src/views/mes/sop/sopm/index.vue

@@ -193,7 +193,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:sop:sopm:progress']"
-            >查看审批进度
+            >执行
           </el-button>
           <el-button
             size="mini"
@@ -397,7 +397,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.queryParams.current = 1;
       this.getList();
     },
     /** 重置按钮操作 */