sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue

@@ -33,7 +33,6 @@
                 :options="deptList"
                 :normalizer="normalizer"
                 placeholder="选择上级"
-                :disable-branch-nodes="true"
               />
             </el-form-item>
             <el-form-item
@@ -196,7 +195,6 @@
                 :options="deptList"
                 :normalizer="normalizer"
                 placeholder="选择上级"
-                :disable-branch-nodes="true"
               />
             </el-form-item>
             <el-form-item

sgzb-ui/src/views/store/label/labelBinding.vue

@@ -289,15 +289,10 @@
             placeholder="请选择规格型号"
             default-expand-all
             @select="selectType"
-            :disable-branch-nodes="true"
           />
         </el-form-item>
         <el-form-item label="设备编码" prop="maCode">
-          <el-input
-            v-model="form.maCode"
-            placeholder="请输入设备编码,如NSJJ+类型编码+规格编码"
-            :clearable="true"
-          />
+          <el-input v-model="form.maCode" placeholder="请输入设备编码,如NSJJ+类型编码+规格编码" :clearable="true"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -587,41 +582,41 @@ export default {
       console.log(this.form);
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.level == '4') {
-            if (this.form.maCode.indexOf('null') > 0) {
+          if(this.form.level=='4'){
+            if(this.form.maCode.indexOf('null')>0){
               this.$modal.msgError("请输入正确规则的设备编码！");
-            } else {
+            }else{
               addLabelBind(this.form).then(response => {
                 this.$modal.msgSuccess("绑定成功");
                 this.open = false;
                 this.getList();
               });
             }
-
-          } else {
+            
+          }else{
             this.$modal.msgError("当前类型无法生成标签，请选择设备类型-规格型号！");
           }
-
+          
 
         }
       });
     },
     selectType(val) {
       console.log(val)
-      if (!val.children) {
+      if(!val.children){
         console.log(val)
-
+        
         let nTime = new Date();
-        let nYear = nTime.getFullYear() + '';
+			  let nYear = nTime.getFullYear()+'';
         let nMonth = nTime.getMonth() + 1;
         console.log(nYear)
         console.log(nMonth)
-        this.form.level = '4';
+        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.$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
     },