update:修改生产排产

src/api/mes/cal/team.js

@@ -3,10 +3,10 @@ import request from '@/utils/request'
 // 查询工作单元列表
 export function listTeam(query) {
   return request({
-    url: '/md/workunit/list',
-    method: 'get',
-    params: query
-  })
+    url: "/md/cal/workunit/unSelectList",
+    method: "get",
+    params: query,
+  });
 }
 
 // 查询工作单元列表

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

 <template>
   <div class="app-container" style="display: flex;">
-    <div style="width: 600px; margin-right:10px;">
+    <div style="width: 400px; 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-select filterable v-model="queryWorkunitParams.workshopId" placeholder="请选择车间" clearable @change="handleChangeWorkshopId">
               <el-option
                 v-for="dict in workshopList"
                 :key="dict.workshopId"
@@ -13,7 +13,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="工作中心" prop="workstationId">
-            <el-select v-model="queryWorkunitParams.workstationId" placeholder="请选择工作中心" clearable @change="handleChangeWorkStationId">
+            <el-select filterable v-model="queryWorkunitParams.workstationId" placeholder="请选择工作中心" clearable @change="handleChangeWorkStationId">
               <el-option
                 v-for="dict in workstationList"
                 :key="dict.workstationId"
@@ -37,7 +37,7 @@
           <div v-else style="text-align: center;margin-top:30px;color:#ccc;">暂无数据</div>
         </div>
     </div>
-    <div style="width: calc(100% - 600px);">
+    <div style="width: calc(100% - 400px);">
        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
           <el-form-item label="任务号" prop="taskCode">
             <el-input
@@ -55,14 +55,14 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="工作单元名称" prop="workunitName">
+          <!-- <el-form-item label="工作单元名称" prop="workunitName">
             <el-input
               v-model="queryParams.workunitName"
               placeholder="请输入工作单元名称"
               clearable
               @keyup.enter.native="handleQuery"
             />
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="状态" prop="statusArr">
             <el-select v-model="queryParams.statusArr" multiple placeholder="请选择单据状态" clearable>
               <el-option
@@ -162,18 +162,41 @@
         label="作业单元名称"
         align="center"
         prop="workunitName"
-        width="140"
-      />
+        width="200"
+      >
+        <template slot-scope="scope">
+          <el-input v-if="scope.row.status === 'UN_ASSIGN'|| scope.row.status === 'PREPARE'" v-model="scope.row.workunitName">
+            <el-button
+              slot="append"
+              icon="el-icon-search"
+              @click="currentData = scope.row, $refs['WorkunitSelect'].showFlag = true"
+            ></el-button>
+          </el-input>
+          <span v-else>{{
+            scope.row.workunitName
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="计划开始时间"
         align="center"
         prop="scheduleStartDate"
-        width="180"
+        width="230"
         :show-overflow-tooltip="true"
       >
         <template slot-scope="scope">
-          <span>{{
-            parseTime(scope.row.scheduleStartDate, "{y}-{m}-{d} {h}:{i}")
+          <el-date-picker
+            v-if="scope.row.status === 'UN_ASSIGN'|| scope.row.status === 'PREPARE'"
+            v-model="scope.row.scheduleStartDate"
+            type="datetime"
+            style="width: 100%;"
+            value-format="yyyy-MM-dd hh:mm:ss"
+            format="yyyy-MM-dd hh:mm:ss"
+            placeholder="请选择计划开始时间"
+          >
+          </el-date-picker>
+          <span v-else>{{
+            parseTime(scope.row.scheduleStartDate)
           }}</span>
         </template>
       </el-table-column>
@@ -181,15 +204,25 @@
         label="计划结束时间"
         align="center"
         prop="scheduleEndDate"
-        width="180"
+        width="230"
       >
         <template slot-scope="scope">
-          <span>{{
-            parseTime(scope.row.scheduleEndDate, "{y}-{m}-{d} {h}:{i}")
+          <el-date-picker
+             v-if="scope.row.status === 'UN_ASSIGN'|| scope.row.status === 'PREPARE'"
+            v-model="scope.row.scheduleEndDate"
+            type="datetime"
+            style="width: 100%;"
+            value-format="yyyy-MM-dd hh:mm:ss"
+            format="yyyy-MM-dd hh:mm:ss"
+            placeholder="请选择计划结束时间"
+          >
+          </el-date-picker>
+          <span v-else>{{
+            parseTime(scope.row.scheduleEndDate)
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         label="操作"
         width="150px"
         align="center"
@@ -206,7 +239,7 @@
             >编辑</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination
@@ -374,6 +407,12 @@
       </div>
     </el-dialog>
 
+    <WorkuintSelect
+      ref="WorkunitSelect"
+      :workstationName="currentData.workstationName"
+      @onSelected="onWorkunitSelect"
+    />
+
   </div>
 </template>
 
@@ -390,12 +429,14 @@ import {
 import BrandSelect from "@/components/TmTool/index.vue";
 import OrderList from './orderList.vue'
 import arrangCodeList from './arrangCodeList.vue'
+import WorkuintSelect from "@/components/workunitSelect/single.vue";
 export default {
-  components: {BrandSelect, OrderList, arrangCodeList},
+  components: {BrandSelect, OrderList, arrangCodeList, WorkuintSelect},
   dicts: ['TASK_STATUS'],
   name: "scheduleList",
   data() {
     return {
+      currentData: {},
       currentTask: null,
       workshopList: [],
       workstationList: [],
@@ -433,7 +474,6 @@ export default {
         pageSize: 10,
         taskCode: null,
         processName: null,
-        workunitName: null,
         statusArr: ['UN_ASSIGN'],
         scheduleStartDate: null,
         scheduleEndDate: null,
@@ -490,6 +530,10 @@ export default {
       this.queryParams.workunitId = ''
       this.getList()
     },
+    // 获取工作单元
+    onWorkunitSelect(row) {
+      console.log(45456, row);
+    },
     async hanldeGettaskWorkunitList() {
       this.taskWorkunitList = []
       this.currentTask = null
@@ -673,7 +717,7 @@ export default {
     justify-content: space-between;
     flex-wrap: wrap;
     .list-item{
-      width: 48%;
+      width: 100%;
       padding: 10px;
       border: 1px solid #eee;
       border-radius: 6px;