Merge branch 'master' into fencang

# Conflicts:
#	src/views/warehouse/IOCheckErrOrder.vue

src/views/basic/BussinessTypeModify.vue

@@ -236,7 +236,7 @@
                 <div class="text item" style="margin-top: 12px">
                     <el-checkbox v-model="inputQuery.ullageFill" :disabled="!inputQuery.changeEnable">单据默认勾选缺量补单
                     </el-checkbox>
-                    <el-checkbox v-model="inputQuery.scanPreIn" :disabled="inputQuery.corpType!='2'">出入库是必须校验预验收库
+                    <el-checkbox v-model="inputQuery.scanPreIn" :disabled="inputQuery.corpType!='2'">出入库时必须校验预验收库
                     </el-checkbox>
                     <el-checkbox v-model="inputQuery.vailInv">出入库时是否查询库存
                     </el-checkbox>

src/views/userManage/admin/authAdmin.vue

@@ -273,7 +273,10 @@ export default {
         ],
         userFlag: [
           {required: true, message: "请选择状态", trigger: "change"}
-        ]
+        ],
+          passWord: [
+              {required: true, message: "请输入密码", trigger: "blur"}
+          ]
       },
       deleteLoading: false
     };
@@ -361,12 +364,6 @@ export default {
       }
     },
     formSubmit() {
-      console.log(
-          this.formData.userName +
-          "-----" +
-          this.formData.employeeName +
-          this.formData.userFlag
-      );
       this.$refs["dataForm"].validate(valid => {
         if (valid) {
           this.formLoading = true;

src/views/userManage/customerManage.vue

@@ -448,6 +448,9 @@ export default {
         },
         getList() {
             this.loading = true;
+            if (this.filterQuery.companyName != null && this.filterQuery.companyName != '') {
+                this.filterQuery.page = 1;
+            }
             getCustomers(this.filterQuery)
                 .then((response) => {
                     this.loading = false;

src/views/userManage/param/systemParamConfig.vue

@@ -13,10 +13,10 @@
 
 
             <el-table v-loading="loading" :data="list" style="width: 100%">
-              <el-table-column type="index" label="序号" width="50"></el-table-column>
+                <el-table-column type="index" label="序号" width="50"></el-table-column>
-              <el-table-column label="参数名" prop="paramName" ></el-table-column>
+                <el-table-column label="参数名" prop="paramName"></el-table-column>
-              <el-table-column label="参数键" prop="paramKey" width="200"></el-table-column>
+                <el-table-column label="参数键" prop="paramKey" width="200"></el-table-column>
-              <el-table-column label="参数值" prop="paramValue" width="100"></el-table-column>
+                <el-table-column label="参数值" prop="paramValue" width="100"></el-table-column>
                 <!--<el-table-column label="参数状态">-->
                 <!--<template slot-scope="scope">-->
                 <!--<el-tag :type="scope.row.paramStatus | paramStatusFilterType">{{-->
@@ -175,8 +175,6 @@ export default {
                     this.loading = false;
                     this.list = response.data.list || [];
                     this.total = response.data.total || 0;
-                    console.log('------------')
-                    console.log(response)
                 })
                 .catch(() => {
                     this.loading = false;
@@ -214,15 +212,17 @@ export default {
             }
         },
         formSubmit() {
+            if (!Number.isInteger(parseInt(this.formData.paramValue))) {
+                this.$message.warning("参数值必须为数字");
+                return;
+            }
             this.$refs["dataForm"].validate(valid => {
                 if (valid) {
                     this.formLoading = true;
                     let data = Object.assign({}, this.formData);
-                    console.log('------2------')
                     data.paramValue = data.paramValue.trim();
                     systemParamConfigSave(data, this.formName)
                         .then(response => {
-                            console.log(response)
                             this.formLoading = false;
                             if (response.code !== 20000) {
                                 this.$message.error(response.message);

src/views/userManage/registerManage.vue

@@ -4,7 +4,7 @@
             <el-row>
                 <el-form-item class="query-form-item">
                     <el-input
-                        v-model="filterQuery.batchNo"
+                        v-model="filterQuery.companyName"
                         placeholder="企业名称"
                     ></el-input>
                 </el-form-item>
@@ -262,9 +262,10 @@
                             >
                                 <el-option
                                     v-for="item in sOptions"
-                                    :key="idx"
+                                    :key="id"
                                     :label="item.name"
-                                    :value="item">
+                                    :value="item.id">
+                                    <span>{{item.name}}</span>
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -410,9 +411,9 @@
             },
             selectOne(event) {
                 this.rowData.companyName = event.name;
-                this.rowData.companyId = event.value;
+                this.rowData.companyId = event.id;
                 this.checkQuery.companyName = event.name;
-                this.checkQuery.companyId = event.value;
+                this.checkQuery.companyId = event.id;
                 this.sSelectStatus = true;
             },
             remoteMethod(query) {
@@ -425,9 +426,8 @@
                     };
                     getBasicUnitMaintains2(tQuery)
                         .then((response) => {
-                            console.log(response)
                             this.sLoading = false;
-                            this.sOptions = response.data.list;
+                            this.sOptions = response.data.list
                         })
                         .catch(() => {
                             this.sLoading = false;
@@ -442,7 +442,6 @@
             },
 
             handleCheckedChange(val) {
-                console.log(val);
             },
 
             handleSizeChange(val) {
@@ -454,7 +453,6 @@
                 this.getList();
             },
             findMethod(query) {
-                console.log(query);
                 this.fromOptions = [];
                 let cQuery = {
                     key: query,
@@ -487,21 +485,16 @@
                     });
             },
             checkDialog(row) {
-                console.log(this.checkQuery.roles);
                 this.check = row.roles;
                 this.checkQuery = {
                     id: row.id + "",
                     checkType: 1,
                     roles: row.roles,
                 };
-                console.log(
-                    this.check + "---" + row.roles + "---" + this.checkQuery.roles
-                );
                 this.rowData = row;
                 if (this.registerConfigMap.companyCheckStatus) {
                     this.sValue = this.rowData.companyName;
                 }
-                console.log(this.rowData);
                 this.centerDialogVisible = true;
             },
 
@@ -547,7 +540,6 @@
                 authCustomerRoles()
                     .then((response) => {
                         this.roles = response.data.list || [];
-                        console.log("888---" + this.checkQuery.roles);
                     })
                     .catch(() => {
                         this.checkQuery.roles = [];