update:修改生产排产

src/api/mes/pro/scheduleList.js

@@ -14,7 +14,7 @@ export function updateList(query) {
   return request({
     url: "/mes/pro/taskWorkunit/update",
     method: "post",
-    data: query,
+    data: query
   });
 }
 // 下达生产
@@ -22,7 +22,7 @@ export function makeProduction(query) {
   return request({
     url: "/mes/pro/taskWorkunit/makeProduction",
     method: "post",
-    data: query,
+    data: query
   });
 }
 
@@ -31,7 +31,7 @@ export function makeSchedule(query) {
   return request({
     url: "/mes/pro/protask/schedule",
     method: "post",
-    data: query,
+    data: query
   });
 }
 
@@ -40,6 +40,46 @@ export function taskWorkunitList(query) {
   return request({
     url: "/mes/pro/taskWorkunit/workorderList",
     method: "post",
-    data: query,
+    data: query
+  });
+}
+
+// 车间列表查询
+export function getworkshopList(query) {
+  // workshopId workshopName
+  return request({
+    url: "/mes/md/workshop/list",
+    method: "get"
+  });
+}
+
+// 工作中心查询
+export function getworkstationList(query) {
+  // workshopId workstationId workstationName
+  return request({
+    url: "/mes/md/workstation/list",
+    method: "get",
+    params: query
   });
 }
+
+// 查询任务工作单元列表
+export function gettaskWorkunitList(query) {
+  // workshopId workCenterId = workstationId workstationName  workunitId workunitName
+  return request({
+    url: "md/workunit/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 默认工作中心查询
+export function getdefaultWorkCenterList() {
+  // workshopId workCenterId = workstationId workstationName  workunitId workunitName
+  return request({
+    url: "/mes/md/workstation/defaultList",
+    method: "get"
+  });
+}
+
+

src/views/mes/pro/scheduleList/index.vue

 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+  <div class="app-container" style="display: flex;">
+    <div style="width: 600px; margin-right:10px;">
+      <el-form :model="queryWorkunitParams" ref="queryWorkunitForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="车间" prop="workshopId">
+            <el-select v-model="queryWorkunitParams.workshopId" placeholder="请选择车间" clearable @change="handleChangeWorkshopId">
+              <el-option
+                v-for="dict in workshopList"
+                :key="dict.workshopId"
+                :label="dict.workshopName"
+                :value="dict.workshopId"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="工作中心" prop="workstationId">
+            <el-select v-model="queryWorkunitParams.workstationId" placeholder="请选择工作中心" clearable @change="handleChangeWorkStationId">
+              <el-option
+                v-for="dict in workstationList"
+                :key="dict.workstationId"
+                :label="dict.workstationName"
+                :value="dict.workstationId"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleWorkunitQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetWorkunitQuery">重置</el-button>
+          </el-form-item> -->
+        </el-form>
+        <div v-if="taskWorkunitList.length" class="cardBox">
+          <div class="list">
+            <div @click.stop="handleClick(item,index)" class="list-item" :class="{'active': currentTask === index}" v-for="(item,index) in taskWorkunitList" :key="index">
+               <div class="item-top">工作单元: {{ item.workunitCode }}</div>
+               <div>工作单元名称:{{ item.workunitName }}</div>
+            </div>
+          </div>
+        </div>
+    </div>
+    <div>
+       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
           <el-form-item label="任务号" prop="taskCode">
             <el-input
               v-model="queryParams.taskCode"
@@ -62,16 +99,6 @@
             <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-item label="单据状态" prop="maintenanceStatus">
-        <el-select v-model="queryParams.maintenanceStatus" placeholder="请选择单据状态" clearable>
-          <el-option
-          v-for="dict in dict.TASK_STATUS"
-          :key="dict.value"
-          :label="dict.label"
-          :value="dict.value" />
-        </el-select>
-      </el-form-item> -->
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -83,47 +110,47 @@
           @click="handleSchedule"
         >排程</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
           size="mini"
           @click="handleSumbmitMakeProduction"
         >下达生产</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="maintenanceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-       <el-table-column label="任务单编码" width="120" prop="taskCode">
+      <el-table-column label="编排单号" width="120" prop="arrangeCode">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            @click="handleView(scope.row)"
-            v-hasPermi="['mes:pro:protask:query']"
-            >{{ scope.row.taskCode }}</el-button
+            @click="taskWorkunitId= scope.row.taskWorkunitId, arrangCodeVisible = true"
+            >{{ scope.row.arrangeCode }}</el-button
           >
         </template>
       </el-table-column>
-       <el-table-column label="编排单号" width="120" prop="arrangeCode">
+       <el-table-column label="任务单编码" width="120" prop="taskCode">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            @click="taskWorkunitId= scope.row.taskWorkunitId, arrangCodeVisible = true"
-            >{{ scope.row.arrangeCode }}</el-button
+            @click="handleView(scope.row)"
+            v-hasPermi="['mes:pro:protask:query']"
+            >{{ scope.row.taskCode }}</el-button
           >
         </template>
       </el-table-column>
-      <!-- <el-table-column
-        label="任务单名称"
-        width="200"
+       <el-table-column
+        label="工序名称"
         align="center"
-        prop="taskName"
+        prop="processName"
         :show-overflow-tooltip="true"
-      /> -->
+      />
+      <el-table-column label="排产数量" align="center" prop="quantity" />
       <el-table-column
         label="工作中心"
         align="center"
@@ -136,29 +163,6 @@
         prop="workunitName"
         width="140"
       />
-      <!-- <el-table-column
-        label="工艺名称"
-        width="200"
-        align="center"
-        prop="routeName"
-        show-overflow-tooltip
-      /> -->
-      <el-table-column
-        label="工序名称"
-        align="center"
-        prop="processName"
-        :show-overflow-tooltip="true"
-      />
-      <!-- <el-table-column
-        label="产品名称"
-        width="200"
-        align="center"
-        prop="itemName"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column label="规格型号" align="center" prop="specification" />
-      <el-table-column label="单位" align="center" prop="unitOfMeasure" /> -->
-      <el-table-column label="排产数量" align="center" prop="quantity" />
       <el-table-column
         label="计划开始时间"
         align="center"
@@ -172,13 +176,6 @@
           }}</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column
-        label="生产时长"
-        align="center"
-        prop="duration"
-        width="120"
-      >
-      </el-table-column> -->
       <el-table-column
         label="计划结束时间"
         align="center"
@@ -191,16 +188,6 @@
           }}</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column
-        label="需求日期"
-        align="center"
-        prop="requestDate"
-        width="180"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.requestDate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column> -->
       <el-table-column
         label="操作"
         width="150px"
@@ -228,6 +215,7 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+    </div>
 
     <!-- 添加或修改要维护刀模版对话框 -->
     <el-dialog
@@ -389,7 +377,15 @@
 </template>
 
 <script>
-import {getListData, updateList, makeProduction, makeSchedule} from '@/api/mes/pro/scheduleList'
+import {
+  getListData,
+  updateList,
+  makeProduction,
+  makeSchedule,
+  getworkshopList,
+  getworkstationList,
+  gettaskWorkunitList,
+  getdefaultWorkCenterList} from '@/api/mes/pro/scheduleList'
 import BrandSelect from "@/components/TmTool/index.vue";
 import OrderList from './orderList.vue'
 import arrangCodeList from './arrangCodeList.vue'
@@ -399,11 +395,19 @@ export default {
   name: "scheduleList",
   data() {
     return {
+      currentTask: null,
+      workshopList: [],
+      workstationList: [],
+      taskWorkunitList: [],
+      queryWorkunitParams: {
+        workshopId: null,
+        workstationId: null
+      },
       taskWorkunitId: null,
       arrangCodeVisible: false,
       scheduleVisible: false,
       // 遮罩层
-      loading: true,
+      loading: false,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -441,11 +445,64 @@ export default {
     };
   },
   created() {
-    this.getList();
+    // this.getList();
+    this.hanldeGetdefaultWorkCenterList()
   },
   methods: {
+    hanldeGetdefaultWorkCenterList() {
+      getdefaultWorkCenterList().then(async (res) => {
+        console.log(res, 5566)
+        if (res&&res.length) {
+          this.queryWorkunitParams.workshopId = res[0].workshopId
+        }
+        this.hanldeGetworkshopList()
+        await this.hanldeGetworkstationList()
+        this.queryWorkunitParams.workstationId = res[0].workstationId? res[0].workstationId: this.workstationList[0].workstationId
+        this.hanldeGettaskWorkunitList()
+        this.getList()
+      });
+    },
+    async hanldeGetworkshopList() {
+      const response = await getworkshopList()
+      this.workshopList = response.rows
+    },
+    handleChangeWorkshopId() {
+      this.workstationList = []
+      this.queryWorkunitParams.workstationId = null
+      this.hanldeGetworkstationList()
+    },
+    async hanldeGetworkstationList() {
+      if (!this.queryWorkunitParams.workshopId) {
+        return
+      }
+      const response = await getworkstationList({workshopId: this.queryWorkunitParams.workshopId})
+      this.workstationList = response.rows
+    },
+    handleChangeWorkStationId() {
+      this.hanldeGettaskWorkunitList()
+      this.queryParams.pageNum = 1
+      this.queryParams.workunitId = ''
+      this.getList()
+    },
+    async hanldeGettaskWorkunitList() {
+      this.taskWorkunitList = []
+      this.currentTask = null
+      if (!this.queryWorkunitParams.workstationId) {
+        return
+      }
+      console.log(this.queryWorkunitParams.workstationId, 'this.queryWorkunitParams.workstationId')
+      const response = await gettaskWorkunitList({workstationId: this.queryWorkunitParams.workstationId})
+      this.taskWorkunitList = response.rows
+    },
+    handleClick(row,index) {
+      this.currentTask = index
+      this.queryParams.workunitId = row.workunitId
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
     /** 查询要维护刀模版列表 */
-    getList() {
+    async getList() {
+      this.queryParams.workCenterId = this.queryWorkunitParams.workstationId
       this.loading = true;
       const params = {...this.queryParams}
       if (params.scheduleEndDate&&params.scheduleEndDate.length > 0) {
@@ -458,11 +515,10 @@ export default {
       }
       delete params.scheduleStartDate
       delete params.scheduleEndDate
-      getListData(params).then(response => {
-        this.maintenanceList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+      const response = await getListData(params)
+      this.maintenanceList = response.rows;
+      this.total = response.total;
+      this.loading = false;
     },
     // 取消按钮
     cancel() {
@@ -491,6 +547,16 @@ export default {
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
+    handleWorkunitQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetWorkunitQuery() {
+      this.resetForm("queryWorkunitForm");
+      this.handleWorkunitQuery();
+    },
+    /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.getList();
@@ -588,3 +654,39 @@ export default {
   }
 };
 </script>
+
+<style lang="scss" scoped>
+.cardBox{
+  padding: 10px;
+  margin-right:30px;
+  max-height:600px;
+  overflow-y:auto;
+  .list{
+    .list-item{
+      padding: 10px;
+      border: 1px solid #eee;
+      border-radius: 6px;
+      margin-bottom:10px;
+      cursor: pointer;
+      .item-top{
+        font-size:16px;
+        font-weight: 600;
+      }
+      &:nth-child(2n) {
+        background:#dfdfdf;
+      }
+      &:nth-child(2n+1) {
+        background:#efefef;
+      }
+      &:hover{
+        background: #85ce61;
+        color:#fff;
+      }
+      &.active{
+        background: #85ce61;
+        color:#fff;
+      }
+    }
+  }
+}
+</style>