From f6fe1a0a36da99364b352e9ca7cd6f22a70c6cb6 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Fri, 14 Jun 2024 10:16:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=BB=91=E5=AE=9A=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E7=BB=91=E5=AE=9A=E5=BC=B9=E6=A1=86-=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=BC=96=E7=A0=81=E5=8E=BB=E9=99=A4=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouseManage/tagBind/bind/index.vue    | 55 ++++++++++---------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/sgzb-ui/src/views/warehouseManage/tagBind/bind/index.vue b/sgzb-ui/src/views/warehouseManage/tagBind/bind/index.vue
index 294f38ea..b1ffae28 100644
--- a/sgzb-ui/src/views/warehouseManage/tagBind/bind/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/tagBind/bind/index.vue
@@ -365,7 +365,7 @@
                 <el-form-item label="设备编码" prop="maCode">
                     <el-input
                         v-model="form.maCode"
-                        placeholder="请输入设备编码,如NSJJ+类型编码+规格编码"
+                        placeholder="请输入设备编码,如: 类型编码+规格编码"
                         :clearable="true"
                         maxlength="50"
                     />
@@ -732,15 +732,20 @@ export default {
             this.$refs['form'].validate((valid) => {
                 if (valid) {
                     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()
-                            })
-                        }
+                        addLabelBind(this.form).then((response) => {
+                            this.$modal.msgSuccess('绑定成功')
+                            this.open = false
+                            this.getList()
+                        })
+                        // 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(
                             '当前类型无法生成标签，请选择设备类型-规格型号！',
@@ -754,23 +759,23 @@ export default {
             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)
+                // 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,
-                )
+                // this.$set(
+                //     this.form,
+                //     'maCode',
+                //     'NSJJ' +
+                //         val.code +
+                //         val.modelCode +
+                //         nYear[2] +
+                //         nYear[3] +
+                //         nMonth,
+                // )
             } else {
                 this.form.level = ''
                 this.$set(this.form, 'maCode', '')