硬件信息新增和编辑弹出框逻辑错误问题修复

src/api/mes/hw/hardwareinfo.js

@@ -17,6 +17,13 @@ export function getHardwareTypeListAPI() {
 
   })
 }
+// 获取所有车间
+export function listAllWorkshop(){
+  return request({
+    url: '/mes/md/workshop/listAll',
+    method: 'get'
+  })
+}
 // 获取硬件详细信息
 export function getHardwareInfo(repairId) {
   return request({

src/api/mes/job/job.js

@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+
+// 查询硬件类型-列表
+export function listJobTicket(query) {
+  return request({
+    url: '/iscs/ticket/getIsJobTicketPage',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取硬件类型详细信息
+export function getJobTicketInfo(repairId) {
+  return request({
+    url: '/iscs/ticket/selectIsJobTicketById?ticketId=' + repairId,
+    method: 'get'
+  })
+}
+
+//新增硬件类型
+export function addJobTicket(query) {
+  return request({
+    url: '/iscs/ticket/insertIsJobTicket',
+    method: 'post',
+    data: query
+  })
+}
+
+// 修改设备维修单
+export function updateJobTicket(data) {
+  return request({
+    url: '/iscs/ticket/updateIsJobTicket',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除设备维修单
+export function delWorkarea(repairId) {
+  return request({
+    url: '/iscs/ticket/deleteIsJobTicketByTicketIds?ticketIds='+ repairId,
+    method: 'post'
+  })
+}

src/api/mes/wa/workarea.js

@@ -48,6 +48,5 @@ export function delWorkarea(repairId) {
   return request({
     url: '/iscs/workarea/deleteIsWorkareaByWorkareaIds?workareaIds='+ repairId,
     method: 'post'
-
   })
 }

src/views/mes/hw/information/index.vue

@@ -89,9 +89,9 @@
         >
           <el-option
             v-for="dict in this.workshopOption"
-            :key="dict.workshopId"
-            :label="dict.workshopName"
-            :value="dict.workshopCode"
+            :key="dict.key"
+            :label="dict.label"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
@@ -313,9 +313,9 @@
               >
                 <el-option
                   v-for="dict in this.workshopOption"
-                  :key="dict.workshopId"
-                  :label="dict.workshopName"
-                  :value="dict.workshopCode"
+                  :key="dict.key"
+                  :label="dict.label"
+                  :value="dict.value"
                 />
               </el-select>
             </el-form-item>
@@ -395,7 +395,8 @@ import {
   addHardware,
   updateHardware,
   delHardware,
-  getHardwareInfo
+  getHardwareInfo,
+  listAllWorkshop
 } from '@/api/mes/hw/hardwareinfo'
 
 export default {
@@ -441,16 +442,7 @@ export default {
         workshopId:'',
       },
       workshopOption:[
-        {
-          workshopCode:'EEE',
-          workshopId:1,
-          workshopName:'车间一'
-        },
-        {
-          workshopCode:'FFF',
-          workshopId:2,
-          workshopName:'车间二'
-        }
+
       ],
       hardwareTypeOption:[],
       // 表单参数
@@ -536,6 +528,16 @@ export default {
         this.total = response.data.total;
         this.loading = false;
       });
+    //   车间数据
+      listAllWorkshop().then((response) => {
+        this.workshopOption = response.data.map((item)=>{
+          return {
+            label:item.workshopName,
+            value:item.workshopId,
+            key:item.workshopCode,
+          }
+        });
+      })
     },
     // 获取硬件类型-所有
     getHardwareTypeList() {
@@ -561,22 +563,26 @@ export default {
     },
     // 车间下拉 --新增表单
     workShopChange(val){
-      this.form.workshopCode=val
+      console.log(val,'val')
 
-      const workshopId=this.workshopOption.find((item)=>{
-        return item.workshopCode==val?item.workshopId:null;
+      this.form.workshopId=val
+      const item=this.workshopOption.find((item)=>{
+        return item.value==val?item.key:null;
       })
-      this.form.workshopId=workshopId.workshopId
-      this.form.workshopName=workshopId.workshopName
+      console.log(item,'item')
+      this.form.workshopCode=item.key
+      this.form.workshopName=item.label
+
     },
     workShopChangequery(val){
       console.log(val,'查询下拉')
-      this.queryParams.workshopCode=val
-      const workshopId=this.workshopOption.find((item)=>{
-        return item.workshopCode==val?item.workshopId:null;
+      this.queryParams.workshopId=val
+      const item=this.workshopOption.find((item)=>{
+        return item.value==val?item.key:null;
       })
-      this.queryParams.workshopId=workshopId.workshopId
-      this.queryParams.workshopName=workshopId.workshopName
+
+      this.queryParams.workshopCode=item.key
+      this.queryParams.workshopName=item.label
     },
 
     // 取消按钮
@@ -627,6 +633,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
+      this.EditId=null
       this.title = "新增硬件信息";
     },
     /** 修改按钮操作 */
@@ -644,7 +651,7 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
 
-          if (this.EditId != 0) {
+          if (this.EditId != null) {
             updateHardware(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -655,6 +662,7 @@ export default {
             addHardware(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
+              this.EditId=null
               this.getList();
             });
           }

src/views/mes/hw/type/index.vue

@@ -249,7 +249,7 @@ export default {
       form: {
         parentTypeId:0
       },
-      EditId:0,//编辑传递id
+      EditId:null,//编辑传递id
       // 表单校验
       rules: {
         hardwareTypeCode: [
@@ -316,6 +316,7 @@ export default {
       console.log(this.form,'新增')
       this.reset();
       this.open = true;
+      this.EditId=null
       this.title = "新增硬件类型";
     },
     /** 修改按钮操作 */
@@ -332,7 +333,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          if (this.EditId != 0) {
+          if (this.EditId != null) {
             updateHardware(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -343,6 +344,7 @@ export default {
             addHardwareType(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
+              this.EditId=null
               this.getList();
             });
           }

src/views/mes/wa/workarea/index.vue

@@ -333,6 +333,8 @@ export default {
       this.open = true
       this.title = '添加工作区域'
       this.optType = 'add'
+
+      this.EditId=null
     },
     // 查询明细按钮操作
     handleView(row) {
@@ -354,6 +356,7 @@ export default {
         console.log(response,'获取单条工作区域数据')
         this.form = response.data
         this.open = true
+
         this.title = '修改工作区域信息'
         this.optType = 'edit'
       })
@@ -372,6 +375,7 @@ export default {
             addWorkarea(this.form).then(response => {
               this.$modal.msgSuccess('新增成功')
               this.open = false
+              this.EditId=null
               this.getList()
             })
           }