diff --git a/src/api/collect/collectLedGroup.js b/src/api/collect/collectLedGroup.js
new file mode 100644
index 00000000..d48417bf
--- /dev/null
+++ b/src/api/collect/collectLedGroup.js
@@ -0,0 +1,17 @@
+import axios from "@/utils/request"
+
+export function getLeds(query) {
+ return axios({
+ url: "/udiwms/basic/collect/ledGroup/filter",
+ method: "post",
+ data: query
+ });
+}
+
+export function binding(query) {
+ return axios({
+ url: "/udiwms/basic/collect/ledGroup/binding",
+ method: "post",
+ data: query
+ });
+}
diff --git a/src/views/basic/workplace/bingdLedGroupDialog.vue b/src/views/basic/workplace/bingdLedGroupDialog.vue
new file mode 100644
index 00000000..bfe1b1ef
--- /dev/null
+++ b/src/views/basic/workplace/bingdLedGroupDialog.vue
@@ -0,0 +1,178 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 显示/隐藏搜索栏
+ 重置
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+ {{ lesStatusMap[scope.row.red] }}
+
+
+
+
+ {{ lesStatusMap[scope.row.orange] }}
+
+
+
+
+ {{ lesStatusMap[scope.row.blue] }}
+
+
+
+
+ {{ lesStatusMap[scope.row.green] }}
+
+
+
+
+
+ 绑定
+
+
+
+
+
+
+
取消
@@ -270,6 +296,24 @@
+
+
+
+
+
+
@@ -285,6 +329,7 @@ import {
} from '@/api/basic/workPlace/SysWorkplaceQueue'
import { executeFuc, getHead } from '@/utils/customConfig'
import selectDrugDialog from "./selectDrugDialog"
+import bingdLedGroupDialog from "./bingdLedGroupDialog"
const formJson = {
site_id: '',
@@ -295,7 +340,7 @@ const formJson = {
export default {
name: 'workplaceQueue',
- components:{selectDrugDialog},
+ components:{selectDrugDialog,bingdLedGroupDialog},
data() {
return {
@@ -410,6 +455,8 @@ export default {
2: '已使用',
3: '已退回'
},
+ addBindLedVisible: false,
+ ledData:{}
}
},
methods: {
@@ -507,16 +554,14 @@ export default {
this.product = response.data
if (this.product.relId != null) {
//已绑定
- this.$confirm('当前出货槽位编码将绑定绑定产品, 是否提交?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning'
- }).then(() => {
+ // this.$confirm('当前出货槽位编码将绑定绑定产品, 是否提交?', '提示', {
+ // confirmButtonText: '确定',
+ // cancelButtonText: '取消',
+ // type: 'warning'
+ // }).then(() => {
this.addBindData.relId = this.product.relId
- this.submitAddBindData()
- })
- .catch(() => {
- })
+ this.codeQuery.scanCode = null
+ // this.submitAddBindData()
} else {
}
@@ -534,6 +579,9 @@ export default {
if (this.addBindData.udiCode == null) {
return this.$message.error('请添加产品!')
}
+ if (this.ledData.id == null){
+ return this.$message.error('请绑定灯组!')
+ }
this.addBindData.relId = this.product.relId
bind(this.addBindData).then(
(response) => {
@@ -541,12 +589,14 @@ export default {
this.$message.success('绑定成功')
this.addBindData = {
code: null,
+ //todo 绑定灯组完成之后需要更改该addBindData值和下面注释的
codeFlag: false,
udiCode: null,
udiCodeFlag: false
}
this.sysWorkplaceQueue = {}
this.product = {}
+ this.addBindVisible = false
this.$nextTick(() => {
this.$refs.inputRef1.focus() // 设置焦点到第一个输入框
})
@@ -558,7 +608,7 @@ export default {
}
}).catch((error) => {
this.$message.error(error.message)
- this.$refs.inputRef1.select()
+ // this.$refs.inputRef1.select()
})
},
@@ -817,6 +867,17 @@ export default {
}).catch(() => {
})
+ },
+ bingLed(){
+ if (isBlank(this.product.nameCode)){
+ return this.$message.error("请先录入产品")
+ }
+ this.addBindLedVisible = true
+ },
+ bingLedGroup(row){
+ this.ledData = row
+ this.addBindLedVisible = false
+ // console.log("hagaggaga",row)
}
},
diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue
index 307a87fb..4b21c80f 100644
--- a/src/views/collect/CollectOrderAllotCardComponents.vue
+++ b/src/views/collect/CollectOrderAllotCardComponents.vue
@@ -851,6 +851,7 @@ export default {
key: val,
page: 1,
limit: 10,
+ workPlaceClass:1
}
filterWorkOptimize(query)
.then((response) => {