车间组件数据调用

src/api/mes/job/job.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 
-// 查询硬件类型-列表
+// 查询作业票类型-列表
 export function listJobTicket(query) {
   return request({
     url: '/iscs/ticket/getIsJobTicketPage',
@@ -10,15 +10,21 @@ export function listJobTicket(query) {
   })
 }
 
-// 获取硬件类型详细信息
+// 获取作业票类型详细信息
 export function getJobTicketInfo(repairId) {
   return request({
     url: '/iscs/ticket/selectIsJobTicketById?ticketId=' + repairId,
     method: 'get'
   })
 }
-
-//新增硬件类型
+//查询工作区域列表
+export function getworkareaList(repairId) {
+  return request({
+    url: '/dev-api/iscs/workarea/getIsWorkareaList?workshopId='+ repairId,
+    method: 'get',
+  })
+}
+//新增作业票类型
 export function addJobTicket(query) {
   return request({
     url: '/iscs/ticket/insertIsJobTicket',
@@ -27,7 +33,7 @@ export function addJobTicket(query) {
   })
 }
 
-// 修改设备维修单
+// 修改作业票信息
 export function updateJobTicket(data) {
   return request({
     url: '/iscs/ticket/updateIsJobTicket',
@@ -36,8 +42,8 @@ export function updateJobTicket(data) {
   })
 }
 
-// 删除设备维修单
-export function delWorkarea(repairId) {
+// 删除作业票
+export function deleteIsJobTicket(repairId) {
   return request({
     url: '/iscs/ticket/deleteIsJobTicketByTicketIds?ticketIds='+ repairId,
     method: 'post'

src/api/mes/wa/workarea.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 
-// 查询硬件类型-列表
+// 查询工作区域类型-列表page
 export function listWorkarea(query) {
   return request({
     url: '/iscs/workarea/getIsWorkareaPage',
@@ -9,8 +9,14 @@ export function listWorkarea(query) {
     params: query
   })
 }
-
-// 获取硬件类型详细信息
+// 获取工作区域list
+export function getIsWorkareaList(query) {
+  return request({
+    url: '/iscs/workarea/getIsWorkareaList?workshopId=' + query,
+    method: 'get',
+  })
+}
+// 获取工作区域详细信息
 export function getWorkareaInfo(repairId) {
   return request({
     url: '/iscs/workarea/selectIsWorkareaById/?workareaId=' + repairId,
@@ -25,7 +31,7 @@ export function listAllWorkshop(){
   })
 }
 
-//新增硬件类型
+//新增工作区域
 export function addWorkarea(query) {
   return request({
     url: '/iscs/workarea/insertIsWorkarea',
@@ -34,7 +40,7 @@ export function addWorkarea(query) {
   })
 }
 
-// 修改设备维修单
+// 修改工作区域
 export function updateWorkarea(data) {
   return request({
     url: '/iscs/workarea/updateIsWorkarea',
@@ -43,7 +49,7 @@ export function updateWorkarea(data) {
   })
 }
 
-// 删除设备维修单
+// 删除工作区域
 export function delWorkarea(repairId) {
   return request({
     url: '/iscs/workarea/deleteIsWorkareaByWorkareaIds?workareaIds='+ repairId,

src/components/separationPoint/workshop.vue

@@ -2,35 +2,44 @@
   <div class="leftcon">
     <el-form ref="form" :model="form" label-width="100px" :inline="true">
       <el-form-item label="车间">
-        <el-select
-          v-model="form.workShop"
-          v-bind="$attrs"
-          multiple
-          style="width: 100%"
-          placeholder="请选择线路"
-          @change="handleSelect"
-        >
-          <div style="padding: 0 20px; line-height: 34px">
-            <el-checkbox
-              v-model="checkAll"
-              :indeterminate="isIndeterminate"
-              @change="handleCheckAllChange"
-            >全选</el-checkbox
-            >
-          </div>
-          <el-checkbox-group v-model="form.workShop">
-            <el-option
-              v-for="item in this.workShopOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-              <el-checkbox style="pointer-events: none" :label="item.value">
-                {{ item.label }}
-              </el-checkbox>
-            </el-option>
-          </el-checkbox-group>
+        <el-select v-model="form.workShop" placeholder="请选择车间" @change="handleselect">
+          <el-option
+            v-for="item in this.workShopOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
         </el-select>
+<!--        <el-select-->
+<!--          v-model="form.workShop"-->
+<!--          v-bind="$attrs"-->
+<!--          multiple-->
+<!--          style="width: 100%"-->
+<!--          placeholder="请选择线路"-->
+<!--          @change="handleSelect"-->
+<!--        >-->
+<!--          <div style="padding: 0 20px; line-height: 34px">-->
+<!--            <el-checkbox-->
+<!--              v-model="checkAll"-->
+<!--              :indeterminate="isIndeterminate"-->
+<!--              @change="handleCheckAllChange"-->
+<!--            >全选</el-checkbox-->
+<!--            >-->
+<!--          </div>-->
+<!--          <el-checkbox-group v-model="form.workShop">-->
+<!--            <el-option-->
+<!--              v-for="item in this.workShopOptions"-->
+<!--              :key="item.value"-->
+<!--              :label="item.label"-->
+<!--              :value="item.value"-->
+<!--            >-->
+<!--              <el-checkbox style="pointer-events: none" :label="item.value">-->
+<!--                {{ item.label }}-->
+<!--              </el-checkbox>-->
+<!--            </el-option>-->
+<!--          </el-checkbox-group>-->
+<!--        </el-select>-->
       </el-form-item>
       <el-form-item label="生产线">
         <el-select v-model="form.producLine" placeholder="请选择生产线">
@@ -48,6 +57,8 @@
 </template>
 
 <script>
+import { listAllWorkshop } from '@/api/mes/md/workshop'
+import {getIsWorkareaList} from "@/api/mes/wa/workarea"
 export default {
   data() {
     return {
@@ -71,20 +82,48 @@ export default {
       ],
     };
   },
+  mounted() {
+    this.getworkshopList()
+  },
   methods: {
-    // 下拉框选择事件
-    handleSelect(value) {
-      console.log(value, "value");
-      const checkedCount = value.length;
-      this.checkAll = checkedCount === this.workShopOptions.length;
-      this.isIndeterminate =
-        checkedCount > 0 && checkedCount < this.workShopOptions.length;
-      const data = value.map((item) => {
-        return item;
-      });
-      this.form.workShop = value.length > 0 ? data : [];
-      console.log(this.form.workShop, " form.workShop");
+    // 获取车间列表
+    getworkshopList(){
+      listAllWorkshop().then(response => {
+        this.workShopOptions = response.data.map((item) => {
+          return {
+            label:item.workshopName,
+            value:item.workshopId,
+            key:item.workshopCode
+          }
+        });
+      })
+    },
+    // 单选车间下拉
+    handleselect(value){
+      getIsWorkareaList(value).then(response => {
+        this.producLineOptions = response.data.map((item) => {
+          return {
+            label:item.workareaName,
+            value:item.workareaId,
+            key:item.workareaCode
+          }
+        })
+      })
     },
+    // 多选车间下拉框选择事件
+    // handleSelect(value) {
+    //   console.log(value, "value");
+    //   const checkedCount = value.length;
+    //   this.checkAll = checkedCount === this.workShopOptions.length;
+    //   this.isIndeterminate =
+    //     checkedCount > 0 && checkedCount < this.workShopOptions.length;
+    //   const data = value.map((item) => {
+    //     return item;
+    //   });
+    //   this.form.workShop = value.length > 0 ? data : [];
+    //
+    //   console.log(this.form.workShop, " form.workShop");
+    // },
     // 全选事件
     handleCheckAllChange(val) {
       const data = this.workShopOptions.map((item) => {

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

@@ -302,6 +302,8 @@
 <script>
 import SeparationPoint from "@/components/separationPoint/index.vue";
 import WorkShop from "@/components/separationPoint/workshop.vue";
+import {listJobTicket,getJobTicketInfo,addJobTicket,updateJobTicket,deleteIsJobTicket,getworkareaList} from "@/api/mes/job/job"
+import {listAllWorkshop} from "@/api/mes/md/workshop"
 export default {
   name: "addView",
   components: {
@@ -366,10 +368,14 @@ export default {
       // 弹框中显示的form表单内容
       insideMumber: false,
       outsideMumber: false,
+
     };
   },
+  mounted() {
 
+  },
   methods: {
+
     handleClick(tab, event) {
       console.log(tab, event);
     },