Merge remote-tracking branch 'origin/dev' into dev

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"
           />
         </el-form-item>
         <el-form-item label="设备编码" prop="maCode">
-          <el-input v-model="form.maCode" placeholder="请输入设备编码" />
+          <el-input v-model="form.maCode" placeholder="请输入设备编码,如NSJJ+类型编码+规格编码" :clearable="true"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -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
     },
     /** 删除按钮操作 */

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,
       //--------------

sgzb-ui/src/views/store/tools/toolsType.vue

@@ -13,8 +13,9 @@
             style="margin-bottom: 20px"
           />
         </div>
-        <div class="head-container">
+        <div class="head-container" style="">
           <el-tree
+            style="height: 700px;overflow: scroll;"
             :data="treeOptions"
             :props="defaultProps"
             :expand-on-click-node="false"
@@ -82,7 +83,7 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" ></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="typeList" height="600" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center"/>
           <el-table-column label="名称" align="center" key="typeName" prop="typeName" />
           <el-table-column label="计量单位" align="center" key="unitName" prop="unitName"
@@ -244,7 +245,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="库管员" prop="keeperUserId">
-              <el-select v-model="form.keeperUserId" placeholder="请选择库管员">
+              <el-select v-model="form.keeperUserId" placeholder="请选择库管员" filterable>
                 <el-option
                   v-for="keeper in keeperList"
                   :key="keeper.userId"

sgzb-ui/vue.config.js

@@ -39,7 +39,7 @@ module.exports = {
         target: `http://112.29.103.165:21624`,//线上环境
         // target: `http://192.168.0.14:21624`,//线上环境
         // target: `http://192.168.5.12:8080`,//丁
-        // target: `http://10.40.92.138:8080`,//丁/
+        // target: `http://10.40.92.102:8080`,//丁/
         // target: `http://10.40.92.126:8080`,//高
         // target: `http://10.40.92.111:8080`,//亮
         // target: `http://10.40.92.209:8080`,//刘川