浏览代码

Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

gjy 3 年之前
父节点
当前提交
a0ff961353

+ 1 - 1
src/layout/index/top/index.vue

@@ -893,7 +893,7 @@
   }
 
   .input-Style {
-    opacity: 1;
+    opacity: 0;
     margin-right: 20px;
     // visibility: hidden;
   }

+ 1 - 1
src/views/warehouse/warehouseManagementList.vue

@@ -228,7 +228,7 @@
             </el-form-item>
             <!--仓库名称-->
             <el-form-item label="仓库名称" span="1" prop="warehouseName">
-              <el-select v-model="parameter.warehouseName" placeholder="请选择仓库名称">
+              <el-select v-model="parameter.warehouseName" placeholder="请选择仓库名称" filterable  clearable>
                 <el-option v-for="item in packtypeList" :key="item.constKey" :label="item.warehouseName"
                   :value="item.warehouseName" />
               </el-select>

+ 14 - 14
src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -861,20 +861,20 @@
           })
           return
         }
-        if (!this.dataList.carNo) {
-          this.$message({
-            message: '车牌号不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (this.dataList.carNo.length > 7) {
-          this.$message({
-            message: '车牌号输入错误,请输入7个字符之内',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!this.dataList.carNo) {
+        //   this.$message({
+        //     message: '车牌号不能为空',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (this.dataList.carNo.length > 7) {
+        //   this.$message({
+        //     message: '车牌号输入错误,请输入7个字符之内',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (this.dataList.boxNo && this.dataList.boxNo.length > 20) {
           this.$message({
             message: '箱号-1输入错误',

+ 7 - 7
src/views/warehouse/warehouseManagementTare.vue

@@ -718,13 +718,13 @@
           })
           return
         }
-        if (this.deptBudgetList.carNo.length > 7) {
-          this.$message({
-            message: '车牌号输入错误,请输入7个字符之内',
-            type: 'warning',
-          })
-          return
-        }
+        // if (this.deptBudgetList.carNo.length > 7) {
+        //   this.$message({
+        //     message: '车牌号输入错误,请输入7个字符之内',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (!this.deptBudgetList.contractNo) {
           this.$message({
             message: '合同编号不能为空',