From f90f5bea5434c3c260e8211c5090e3e53a62dcd5 Mon Sep 17 00:00:00 2001 From: zhouzy062 Date: Sun, 24 Dec 2023 00:15:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=85=B7=E7=AE=A1=E7=90=86=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/store/label/labelBinding.vue | 44 +++++++++++++++---- .../newBuy/newDevices/newDevicesAccept.vue | 4 +- sgzb-ui/src/views/store/tools/toolsType.vue | 7 +-- sgzb-ui/vue.config.js | 2 +- 4 files changed, 43 insertions(+), 14 deletions(-) diff --git a/sgzb-ui/src/views/store/label/labelBinding.vue b/sgzb-ui/src/views/store/label/labelBinding.vue index 4c34c19e..0cdfc0d6 100644 --- a/sgzb-ui/src/views/store/label/labelBinding.vue +++ b/sgzb-ui/src/views/store/label/labelBinding.vue @@ -287,11 +287,12 @@ v-model="form.typeId" :options="deptOptions" placeholder="请选择规格型号" - @select="select" + default-expand-all + @select="selectType" /> - +
@@ -581,15 +582,42 @@ export default { console.log(this.form); this.$refs["form"].validate(valid => { if (valid) { - addLabelBind(this.form).then(response => { - this.$modal.msgSuccess("绑定成功"); - this.open = false; - this.getList(); - }); + if(this.form.level=='4'){ + if(this.form.maCode.indexOf('null')>0){ + this.$modal.msgError("请输入正确规则的设备编码！"); + }else{ + addLabelBind(this.form).then(response => { + this.$modal.msgSuccess("绑定成功"); + this.open = false; + this.getList(); + }); + } + + }else{ + this.$modal.msgError("当前类型无法生成标签，请选择设备类型-规格型号！"); + } + + } }); }, - select(val) { + selectType(val) { + console.log(val) + if(!val.children){ + console.log(val) + + let nTime = new Date(); + let nYear = nTime.getFullYear()+''; + let nMonth = nTime.getMonth() + 1; + console.log(nYear) + console.log(nMonth) + this.form.level='4'; + // let arr = this.form.arrivalTime.split('-') + this.$set(this.form,'maCode','NSJJ'+val.code+val.modelCode+nYear[2]+nYear[3]+nMonth) + }else{ + this.form.level=''; + this.$set(this.form,'maCode','') + } this.form.typeId = val.id }, /** 删除按钮操作 */ diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue index 42df853b..1d967b69 100644 --- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue +++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue @@ -307,8 +307,8 @@ export default { field101fileList:[], //上传地址 // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system - uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system - // uploadUrl:'http://192.168.5.12:9201',//本地测试 + // uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system + uploadUrl:'http://10.40.92.102:9201',//本地测试 dialogImageUrl: '', dialogVisible: false, //-------------- diff --git a/sgzb-ui/src/views/store/tools/toolsType.vue b/sgzb-ui/src/views/store/tools/toolsType.vue index 0b1c5678..7f6b1470 100644 --- a/sgzb-ui/src/views/store/tools/toolsType.vue +++ b/sgzb-ui/src/views/store/tools/toolsType.vue @@ -13,8 +13,9 @@ style="margin-bottom: 20px" />
-
+
- + - +