Merge remote-tracking branch 'origin/master'

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

src/views/basic/corpMaintain/corpMaintain.vue

@@ -28,14 +28,17 @@
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click.native="handleForm(null, null)" :disabled="!configParms.basicCorp">新增</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click.native="handleForm(null, null)"
+                     :disabled="!configParms.basicCorp">新增
+          </el-button>
           <el-button type="primary" icon="el-icon-bottom-right" @click="intentDetail">选入往来单位信息</el-button>
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
 
 
-        <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
+                @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="往来单位编码" prop="erpId" show-overflow-tooltip></el-table-column>
@@ -47,7 +50,9 @@
         <el-table-column label="操作" width="120">
           <template slot-scope="scope">
             <el-button type="text" @click.native="handleForm(scope.$index, scope.row)">编辑</el-button>
-                    <el-button  type="text"  :disabled="!configParms.basicCorp" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
+            <el-button type="text" :disabled="!configParms.basicCorp" @click.native.stop="deleteDialog(scope.row)">
+              删除
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -62,7 +67,6 @@
       ></pagination>
 
 
-
       <el-dialog
         :title="combinTypeMap[combinType]"
         :visible.sync="selectDrugDialogVisible"
@@ -104,8 +108,12 @@
           <el-table-column label="第三方往来单位名称" prop="thirdName" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
-                        <el-button type="text" size="small" @click="intentSelect(scope.row)" :disabled="!configParms.basicCorp">关联</el-button>
+              <el-button type="text" size="small" @click="intentSelect(scope.row)" :disabled="!configParms.basicCorp">
-                        <el-button type="text" size="small" @click.native.stop="removeErp(scope.row)" :disabled="scope.row.thirdId=='' ||scope.row.thirdId==null || !configParms.basicCorp">解绑</el-button>
+                关联
+              </el-button>
+              <el-button type="text" size="small" @click.native.stop="removeErp(scope.row)"
+                         :disabled="scope.row.thirdId=='' ||scope.row.thirdId==null || !configParms.basicCorp">解绑
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -113,35 +121,42 @@
           <el-row type="flex">
             <el-col :span="12" type="flex">
               <el-form-item label="往来单位名称" prop="name">
-                      <el-input v-model="editQuery.name" size="small" style="width: 90%" auto-complete="off" @input="change()" splaceholder="请输入往来单位名称"></el-input>
+                <el-input v-model="editQuery.name" size="small" style="width: 90%" auto-complete="off" @input="change()"
+                          splaceholder="请输入往来单位名称"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12" type="flex">
               <el-form-item label="往来单位编码" prop="erpId">
-                    <el-input v-model="editQuery.erpId" style="width: 90%" auto-complete="off" disabled="true" splaceholder="请输入往来单位编码"></el-input>
+                <el-input v-model="editQuery.erpId" style="width: 90%" auto-complete="off" disabled="true"
+                          splaceholder="请输入往来单位编码"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row type="flex">
             <el-col :span="12" type="flex">
               <el-form-item label="社会信用号" prop="creditNo">
-                      <el-input v-model="editQuery.creditNo" style="width: 90%" splaceholder="请输入社会信用号" auto-complete="off"></el-input>
+                <el-input v-model="editQuery.creditNo" style="width: 90%" splaceholder="请输入社会信用号"
+                          auto-complete="off"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12" type="flex">
               <el-form-item label="联系人" prop="contact">
-                      <el-input v-model="editQuery.contact"  splaceholder="请输入联系人" style="width: 90%" auto-complete="off"></el-input>
+                <el-input v-model="editQuery.contact" splaceholder="请输入联系人" style="width: 90%"
+                          auto-complete="off"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :type="flex">
             <el-col :span="12" type="flex">
               <el-form-item label="地址" prop="addr">
-                      <el-input type="" v-model="editQuery.addr" splaceholder="请输入地址" style="width: 90%" auto-complete="off"></el-input></el-form-item>
+                <el-input type="" v-model="editQuery.addr" splaceholder="请输入地址" style="width: 90%"
+                          auto-complete="off"></el-input>
+              </el-form-item>
             </el-col>
             <el-col :span="12" type="flex">
               <el-form-item label="联系电话" prop="mobile">
-                      <el-input v-model="editQuery.mobile" splaceholder="请输入联系电话" auto-complete="off" style="width: 90%"></el-input>
+                <el-input v-model="editQuery.mobile" splaceholder="请输入联系电话" auto-complete="off"
+                          style="width: 90%"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -160,14 +175,17 @@
             </el-col>
             <el-col :span="12" type="flex">
               <el-form-item label="拼音码" prop="spell">
-                      <el-input v-model="editQuery.spell"  placeholder="请输入拼音码" auto-complete="off" style="width: 90%"></el-input>
+                <el-input v-model="editQuery.spell" placeholder="请输入拼音码" auto-complete="off"
+                          style="width: 90%"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
         <div style='text-align: center; margin-bottom: 10px;'>
           <el-button @click.native="hideForm">取消</el-button>
-                <el-button type="primary" @click.native="formSubmit()" :loading="formLoading" :disabled="!configParms.basicCorp">提交</el-button>
+          <el-button type="primary" @click.native="formSubmit()" :loading="formLoading"
+                     :disabled="!configParms.basicCorp">提交
+          </el-button>
         </div>
       </el-dialog>
     </el-card>
@@ -175,7 +193,14 @@
 </template>
 
 <script>
-import {getBasicUnitMaintains, basicUnitMaintainSave, deleteBasicUnitMaintain, getThrsysUnit, removeRl,getSystemParamConfig} from "@/api/basic/basicUnitMaintain";
+import {
+  getBasicUnitMaintains,
+  basicUnitMaintainSave,
+  deleteBasicUnitMaintain,
+  getThrsysUnit,
+  removeRl,
+  getSystemParamConfig
+} from "@/api/basic/basicUnitMaintain";
 import selectUnit from "./corpRelevance";
 import selectSingleUnit from "./corpSingleRelevance";
 import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
@@ -397,7 +422,6 @@ export default {
               }
               // 刷新表单
               this.resetForm();
-                            this.getList();
             })
             .catch(() => {
               this.formLoading = false;

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)) {
+      if (!isBlank(this.inputQuery.beforeTime) && this.inputQuery.beforeTime < 0) {
-      //   this.$message.error("目标往来仓库不能为空");
+        this.$message.error("推移时间不能小于0！");
-      //   return;
+        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) => {
+        }).catch(() => {
-          this.loading = false;
-          this.$message.error(error.message);
-          this.cancelDialog();
         });
       } 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="请输入内容"
+                      type="number"
-                      v-model="inputQuery.beforeTime"></el-input>
+                      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",
@@ -217,8 +222,13 @@ export default {
     },
 
     invChange() {
+      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>