Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/basic/corpMaintain/corpMaintain.vue

src/views/system/dept/authDept.vue

@@ -542,6 +542,7 @@ export default {
       this.formVisible = false;
       // 刷新表单
       this.$refs["dataForm"].resetFields();
+      this.getList();
     },
     deleteDialog(row) {
       this.$confirm("是否删除该部门?", "提示", {

src/views/system/dept/invWarehouse.vue

@@ -9,13 +9,6 @@
             placeholder="仓库名称"
           ></el-input>
         </el-form-item>
-        <el-form-item class="query-form-item" label="仓库状态:">
-          <el-select v-model="query.status" placeholder="仓库状态" clearable>
-            <el-option label="全部" value=""></el-option>
-            <el-option label="正常" value='1'></el-option>
-            <el-option label="禁用" value='0'></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item>
           <el-button-group style="margin-left: 10px;display:flex;">
             <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>

src/views/system/device/phoneRegisterManage.vue

@@ -259,6 +259,7 @@ export default {
     },
 
     onSubmit() {
+      this.filterQuery.page=1;
       this.getList();
     },
     closeDialogVisible(){

src/views/system/param/busTypeChange.vue

@@ -94,7 +94,12 @@
 <script>
 import {isBlank} from "@/utils/strUtil";
 import modifyDialog from "@/views/system/param/busTypeChangeModify.vue";
-import {getBusTypeChangeList, updateBusTypeChange, addBusTypeChange, deleteBusTypeChange} from "@/api/basic/busTypeChange";
+import {
+  getBusTypeChangeList,
+  updateBusTypeChange,
+  addBusTypeChange,
+  deleteBusTypeChange
+} from "@/api/basic/busTypeChange";
 
 export default {
   data() {
@@ -209,15 +214,10 @@ export default {
         addBusTypeChange(this.inputQuery).then((res) => {
           if (res.code === 20000) {
             this.loading = false;
-            this.cancelDialog();
             this.getList();
-          } else {
-            this.$message.error(res.message);
           }
         }).catch((error) => {
           this.loading = false;
-          this.$message.error(error.message);
-          this.cancelDialog();
         });
       } else {
         updateBusTypeChange(this.inputQuery).then((res) => {
@@ -238,6 +238,15 @@ export default {
 
     handleAddClick() {
       this.formName = 'add';
+      this.inputQuery = {
+        id: null,
+        originName: null,
+        originAction: null,
+        targetAction: null,
+        name: null,
+        enable: null,
+        remark: null
+      };
       this.modifyDialogVisible = true;
     },
 

src/views/system/param/busTypePre.vue

@@ -6,12 +6,14 @@
           <el-input
             v-model="filterQuery.name"
             placeholder="请输入单据类型名称"
+            clearable
           ></el-input>
         </el-form-item>
         <el-form-item class="query-form-item" label="单据类型代码:">
           <el-input
             v-model="filterQuery.originAction"
             placeholder="请输入单据类型代码"
+            clearable
           ></el-input>
         </el-form-item>
         <el-form-item>
@@ -128,10 +130,9 @@ export default {
       loading: false,
       formMap: {
         add: "新增单据流转设置",
-        update: "编辑单据流转设置",
+        edit: "编辑单据流转设置",
       },
       formName: null,
-
     };
   },
 
@@ -178,7 +179,6 @@ export default {
       this.filterQuery.page = val;
       this.getList();
     },
-
     onAddSubmit() {
       if (isBlank(this.inputQuery.originAction)) {
         this.$message.error("原单据类型不能为空！");
@@ -192,10 +192,10 @@ export default {
         this.$message.error("目标所在仓库不能为空！")
         return;
       }
-      // if (isBlank(this.inputQuery.defaultInvCode)) {
-      //   this.$message.error("目标往来仓库不能为空");
-      //   return;
-      // }
+      if (!isBlank(this.inputQuery.beforeTime) && this.inputQuery.beforeTime < 0) {
+        this.$message.error("推移时间不能小于0！");
+        return;
+      }
 
       if (this.formName === "add") {
         let numRegExp = '^[0-9]*$';
@@ -210,13 +210,8 @@ export default {
             this.loading = false;
             this.cancelDialog();
             this.getList();
-          } else {
-            this.$message.error(res.message);
           }
-        }).catch((error) => {
-          this.loading = false;
-          this.$message.error(error.message);
-          this.cancelDialog();
+        }).catch(() => {
         });
       } else {
         updateBusTypePre(this.inputQuery).then((res) => {
@@ -252,6 +247,7 @@ export default {
     },
 
     handleModifyClick(row) {
+      this.formName = 'edit';
       this.inputQuery = row;
       this.modifyDialogVisible = true;
     },

src/views/system/param/busTypePreModify.vue

@@ -54,7 +54,7 @@
 
         <el-col :span="11">
           <el-form-item label="目标往来仓库" prop="defaultInvCode">
-            <el-select v-model="inputQuery.defaultInvName" placeholder="目标往来仓库" clearable size="small"
+            <el-select v-model="inputQuery.defaultInvCode" placeholder="目标往来仓库" clearable size="small"
                        @change="invChange"
                        style="width: 90%">
               <el-option
@@ -74,8 +74,12 @@
           <el-form-item label="推移时间（小时）" prop="beforeTime">
             <el-input style="width: 90%"
                       size="small"
-                      type="number" placeholder="请输入内容"
-                      v-model="inputQuery.beforeTime"></el-input>
+                      type="number"
+                      placeholder="请输入内容"
+                      v-model="inputQuery.beforeTime"
+                      onkeyup="this.value=this.value.replace(/\D/g,'')"
+                      onafterpaste="this.value=this.value.replace(/\D/g,'')"
+            ></el-input>
           </el-form-item>
         </el-col>
 
@@ -107,7 +111,8 @@
 <script>
 
 import {getBusTypeList, getBusTypeListByUser} from "@/api/basic/busType";
-import {filterSubByInv, filterSubAll, findByFrom} from "@/api/system/invSubWarehouse";
+import {filterSubAll, findByFrom} from "@/api/system/invSubWarehouse";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
   name: "BusTypePreModify",
@@ -198,7 +203,7 @@ export default {
     getLocInv() {
       let params = {};
       filterSubAll(params).then((res) => {
-        if (res.code === 20000){
+        if (res.code === 20000) {
           this.locInvs = res.data || [];
         }
       });
@@ -217,8 +222,13 @@ export default {
     },
 
     invChange() {
-      this.getFromInv();
-      this.getTargetBusType();
+      if (!isBlank(this.inputQuery.invCode)) {
+        this.getFromInv();
+        this.getTargetBusType();
+      } else {
+        this.inputQuery.action = null;
+        this.targetBusTypes = [];
+      }
     },
   },
 
@@ -230,6 +240,8 @@ export default {
     }
     this.getOriginBusType();
     this.getLocInv();
+    this.getFromInv();
+
   }
 }
 </script>