12/31 灯组管理1.2

src/api/basic/workPlace/SysWorkplaceQueue.js

@@ -119,3 +119,13 @@ export function removeLed(query) {
     data: query
   });
 }
+
+
+
+export function getLedDataByCode(query) {
+  return axios({
+    url: "/udiwms/sysWorkplaceQueue/getLedDataByCode",
+    method: "post",
+    data: query
+  });
+}

src/views/basic/workplace/bingdLedGroupDialog.vue

@@ -3,7 +3,7 @@
     <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-if="showSearch" @submit.native.prevent>
       <el-row>
         <el-col :span="18">
-          <el-form-item prop="code" label="扫码查询:">
+          <el-form-item prop="code" label="标签查询:">
             <el-input
               id="inputer"
               @focus="getInputFocus($event)"
@@ -107,6 +107,7 @@
 <script>
 import {  getLeds } from '@/api/collect/collectLedGroup'
 import {binding } from '@/api/basic/workPlace/SysWorkplaceQueue'
+import { isBlank } from '@/utils/strUtil'
 
 export default {
   props: {
@@ -128,6 +129,7 @@ export default {
         page: 1,
         limit: 10,
         scanCode:"",
+        isBind: 1,
       },
       showSearch: true,
       lesStatusMap: {
@@ -140,6 +142,18 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
+    onReset() {
+      this.$router.push({
+        path: ''
+      })
+      this.filterQuery = {
+        page: 1,
+        limit: 10,
+        scanCode:"",
+        isBind: 1,
+      }
+      this.getList()
+    },
     getInputFocus(event) {
       event.currentTarget.select()
     },
@@ -171,6 +185,14 @@ export default {
         }
       })
       // this.$emit('bindLed', row);
+    },
+    enterKey(){
+      if (isBlank(this.filterQuery.scanCode)) {
+        return this.$message.error('灯组标签不能为空')
+      }
+      this.filterQuery.mac = this.filterQuery.scanCode
+      this.getList()
+      this.filterQuery.scanCode = null
     }
   },
   created() {

src/views/basic/workplace/workplaceQueue.vue

@@ -148,13 +148,14 @@
               type="text"
               size="small"
               @click.native.stop="bingLed(scope.row)"
+              :disabled="scope.row.mac"
             >绑定灯组
             </el-button>
             <el-button
               type="text"
               size="small"
               @click.native.stop="removeMac(scope.row)"
-              :disabled="!scope.row.nameCode"
+              :disabled="!scope.row.mac"
             >解绑灯组
             </el-button>
             <el-button
@@ -193,6 +194,7 @@
       v-if="addBindVisible"
       width="65%"
       append-to-body
+      @close="getCodeDetailList()"
     >
       <el-form :model="addBindData" ref="stockCompare" class="query-form"
                size="mini" label-width="auto"
@@ -229,10 +231,10 @@
           <el-col :span="24">
             <el-form-item prop="code" label="灯组标签:" class="query-form-item">
               <el-input
-                id="inputer1"
+                id="inputer3"
                 @focus="getInputFocus($event)"
                 @keypress.enter.native="enterKey3($event)"
-                ref="inputRef1"
+                ref="inputRef3"
                 type="tel"
                 placeholder="请点击输入框进行扫描灯组标签"
                 v-model="addBindData.macCode"
@@ -246,10 +248,14 @@
 
           <el-col :span="24">
             <el-form-item prop="udiCode" label="" class="query-form-item">
-              <el-descriptions class="margin-top" title="" :column="3" border style="width: 80%">
+              <el-descriptions class="margin-top" title="" :column="2" border style="width: 80%">
-                <el-descriptions-item label="灯组标签">{{ sysWorkplaceQueue.code }}</el-descriptions-item>
+                <el-descriptions-item label="灯组标签">{{ ledData.mac }}</el-descriptions-item>
                 <!--<el-descriptions-item label="货架名称">{{ sysWorkplaceQueue.name }}</el-descriptions-item>-->
-                <el-descriptions-item label="备注">{{ sysWorkplaceQueue.remark }}</el-descriptions-item>
+                <el-descriptions-item label="备注">{{ ledData.remark }}</el-descriptions-item>
+                <el-descriptions-item label="红灯">{{ lesStatusMap[ledData.red] }}</el-descriptions-item>
+                <el-descriptions-item label="黄灯">{{ lesStatusMap[ledData.orange] }}</el-descriptions-item>
+                <el-descriptions-item label="蓝灯">{{ lesStatusMap[ledData.blue] }}</el-descriptions-item>
+                <el-descriptions-item label="绿灯">{{ lesStatusMap[ledData.green] }}</el-descriptions-item>
               </el-descriptions>
             </el-form-item>
           </el-col>
@@ -267,15 +273,6 @@
                 v-model="addBindData.udiCode"
                 :disabled="!addBindData.udiCodeFlag"
               ></el-input>
-              <el-button
-                style="margin-left: 20px"
-                type="primary"
-                size="mini"
-                @click.native="bingLed()"
-              >绑定灯组
-                <!--   v-if="(curAction.checkWebNew !== 2 || viewType !== 1) && orderFormData.billNo"-->
-              </el-button
-              >
             </el-form-item>
 
           </el-col>
@@ -367,7 +364,7 @@ import {
   getInfoByCode,
   getProductByCode,
   bind,
-  removeProduct, removeLed
+  removeProduct, removeLed, getLedDataByCode, binding
 } from '@/api/basic/workPlace/SysWorkplaceQueue'
 import { executeFuc, getHead } from '@/utils/customConfig'
 import selectDrugDialog from "./selectDrugDialog"
@@ -501,7 +498,11 @@ export default {
       },
       addBindLedVisible: false,
       queueData: null,
-      ledData:{}
+      ledData:{},
+      lesStatusMap: {
+        true : "开启",
+        false: "关闭"
+      }
     }
   },
   methods: {
@@ -566,7 +567,7 @@ export default {
                   this.addBindData.udiCodeFlag = true
 
                   this.$nextTick(() => {
-                    this.$refs.inputRef2.focus() // 设置焦点到第一个输入框
+                    this.$refs.inputRef3.focus() // 设置焦点到第一个输入框
                   })
 
                 })
@@ -575,10 +576,12 @@ export default {
             } else {
               this.addBindData.id = this.sysWorkplaceQueue.id
               this.addBindData.codeFlag = true
+              this.addBindData.macCodeFlag = true
+              //绑定产品
               this.addBindData.udiCodeFlag = true
 
               this.$nextTick(() => {
-                this.$refs.inputRef2.focus() // 设置焦点到第一个输入框
+                this.$refs.inputRef3.focus() // 设置焦点到第一个输入框
               })
 
             }
@@ -599,14 +602,16 @@ export default {
             this.product = response.data
             if (this.product.relId != null) {
               //已绑定
-              // this.$confirm('当前出货槽位编码将绑定绑定产品, 是否提交?', '提示', {
+              this.$confirm('当前出货槽位编码将绑定绑定产品, 是否提交?', '提示', {
-              //   confirmButtonText: '确定',
+                confirmButtonText: '确定',
-              //   cancelButtonText: '取消',
+                cancelButtonText: '取消',
-              //   type: 'warning'
+                type: 'warning'
-              // }).then(() => {
+              }).then(() => {
                 this.addBindData.relId = this.product.relId
-                this.codeQuery.scanCode = null
+                this.submitAddBindData()
-                // this.submitAddBindData()
+              })
+                .catch(() => {
+                })
             } else {
 
             }
@@ -617,6 +622,60 @@ export default {
         this.$message.error(error.message)
       })
     },
+    enterKey3(){
+      if (isBlank(this.addBindData.macCode)) {
+        return this.$message.error('灯组标签不能为空')
+      }
+      let query = {
+        macCode: this.addBindData.macCode,
+        queueCode : this.sysWorkplaceQueue.code
+      }
+      getLedDataByCode(query).then(
+        (response) => {
+          if (response.code === 20000) {
+            this.ledData = response.data
+            this.addBindData.macCodeFlag = false
+            if (!isBlank(this.sysWorkplaceQueue.mac) && this.sysWorkplaceQueue.mac === this.ledData.mac){
+              this.addBindData.macCodeFlag = true
+              return this.$message.warning("当前灯组标签已和当前出货槽绑定")
+            }
+            if (!isBlank(this.sysWorkplaceQueue.mac)){
+              this.$confirm('当前出货槽信息已绑定灯组, 是否更换?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                this.bindLED()
+              }).catch(() => {})
+            }else {
+              this.bindLED()
+            }
+          } else {
+            this.addBindData.macCode = null
+            this.$message.error(response.message)
+          }
+        }).catch((error) => {
+        this.$message.error()
+      })
+    },
+    bindLED(){
+      let query = {
+        id :  this.sysWorkplaceQueue.id,
+        code : this.sysWorkplaceQueue.code,
+        mac : this.ledData.mac
+      }
+      binding(query).then(res => {
+        if (res.code == 20000){
+          this.$nextTick(() => {
+            this.$refs.inputRef3.focus() // 设置焦点到第一个输入框
+          })
+          this.$message.success("绑定成功")
+        }else {
+          this.$message.error(res.meaage)
+        }
+      })
+      // this.$emit('bindLed', row);
+    },
     submitAddBindData() {
       if (this.addBindData.id == null || this.addBindData.code == null) {
         return this.$message.error('请添加槽位')
@@ -642,11 +701,13 @@ export default {
             this.$nextTick(() => {
               this.$refs.inputRef1.focus() // 设置焦点到第一个输入框
             })
+            this.getCodeDetailList()
           } else {
             this.$message.error(response.message)
             this.$nextTick(() => {
               this.$refs.inputRef1.focus() // 设置焦点到第一个输入框
             })
+            this.getCodeDetailList()
           }
         }).catch((error) => {
         this.$message.error(error.message)
@@ -808,6 +869,7 @@ export default {
       }
       this.sysWorkplaceQueue = {}
       this.product = {}
+      this.ledData = {}
       this.addBindVisible = true
       this.$nextTick(() => {
         this.$refs.inputRef1.focus() // 设置焦点到第一个输入框