diff --git a/src/views/basic/corpMaintain/corpMaintain.vue b/src/views/basic/corpMaintain/corpMaintain.vue
index 80c4d04f..cedc41b8 100644
--- a/src/views/basic/corpMaintain/corpMaintain.vue
+++ b/src/views/basic/corpMaintain/corpMaintain.vue
@@ -1,181 +1,206 @@
 <template>
-    <div>
-      <el-card class="el-card">
-        <el-form  :model="query" label-width="100px" class="query-form" size="mini" v-show="showSearch">
-            <el-row>
-              <el-col span="6">
-                <el-form-item label="搜索:">
-                    <el-input v-model="query.key" placeholder="搜索" style="width: 90%" clearable="true"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col span="6">
-                <el-form-item label="往来单位类型:">
-                    <el-select v-model="query.corpType" style="width: 90%" placeholder="请选择往来单位类型">
-                        <el-option label="全部" value=""></el-option>
-                        <el-option label="客户" value="1"></el-option>
-                        <el-option label="供应商" value="2"></el-option>
-                        <el-option label="特殊科室" value="3"></el-option>
-                        <el-option label="特殊往来" value="4"></el-option>
-                    </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="query" label-width="100px" class="query-form" size="mini" v-show="showSearch">
+        <el-row>
+          <el-col span="6">
+            <el-form-item label="搜索:">
+              <el-input v-model="query.key" placeholder="搜索" style="width: 90%" clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col span="6">
+            <el-form-item label="往来单位类型:">
+              <el-select v-model="query.corpType" style="width: 90%" placeholder="请选择往来单位类型">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="客户" value="1"></el-option>
+                <el-option label="供应商" value="2"></el-option>
+                <el-option label="特殊科室" value="3"></el-option>
+                <el-option label="特殊往来" value="4"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <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-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-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>
+        <el-table-column label="第三方主系统ID" prop="thirdId" show-overflow-tooltip></el-table-column>
+        <el-table-column label="名称" prop="name" show-overflow-tooltip></el-table-column>
+        <el-table-column label="简写" prop="spell" show-overflow-tooltip></el-table-column>
+        <el-table-column label="社会信用号" prop="creditNo" show-overflow-tooltip></el-table-column>
+        <el-table-column label="地址" prop="addr" show-overflow-tooltip></el-table-column>
+        <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>
+          </template>
+        </el-table-column>
+      </el-table>
+
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="query.page"
+        :limit.sync="query.limit"
+        @pagination="handleCurrentChange"
+      ></pagination>
+
+
+      <el-dialog
+        :title="combinTypeMap[combinType]"
+        :visible.sync="selectDrugDialogVisible"
+        width="80%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="selectDrugDialogVisible"
+      >
+        <selectUnit v-on:closeMain="closeMain"></selectUnit>
+      </el-dialog>
+
+      <el-dialog
+        :title="combinTypeMap[combinType]"
+        :visible.sync="selectSingleUnitVisible"
+        width="85%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="selectSingleUnitVisible"
+      >
+        <selectSingleUnit v-on:cancelDialog="cancelDialog" :corpData="corpData"
+                          :defaultSys="defaultSys"></selectSingleUnit>
+      </el-dialog>
+
+
+      <!--表单-->
+      <el-dialog
+        :title="formMap[formName]"
+        :visible.sync="formVisible"
+        :before-close="hideForm"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="60%"
+        top="5vh"
+      >
+        <el-table :data="sysList" style="width: 100%" border v-if="formName=='update'">
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column label="第三方系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
+          <el-table-column label="第三方往来单位ID" prop="thirdId" show-overflow-tooltip></el-table-column>
+          <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.native.stop="removeErp(scope.row)"
+                         :disabled="scope.row.thirdId=='' ||scope.row.thirdId==null || !configParms.basicCorp">解绑
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-form :model="editQuery" :rules="formRules" style="margin-top: 20px" label-width="120px" ref="dataForm">
+          <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-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-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-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-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-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-form-item>
+            </el-col>
+          </el-row>
+          <el-row :type="flex">
+            <el-col :span="12" type="flex">
+              <el-form-item label="往来单位类型" prop="corpType">
+                <el-select v-model="editQuery.corpType" style="width: 90%" placeholder="请选择往来单位类型">
+                  <el-option
+                    v-for="item in corpTypeList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </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-form-item>
+            </el-col>
+          </el-row>
         </el-form>
-
-
-        <div class="top-right-btn">
-          <el-button-group style="display:flex;">
-              <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-bottom-right" @click="intentDetail">选入往来单位信息</el-button>
-            </el-button-group>
+        <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>
         </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-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>
-            <el-table-column label="第三方主系统ID" prop="thirdId" show-overflow-tooltip></el-table-column>
-            <el-table-column label="名称" prop="name" show-overflow-tooltip></el-table-column>
-            <el-table-column label="简写" prop="spell" show-overflow-tooltip></el-table-column>
-            <el-table-column label="社会信用号" prop="creditNo" show-overflow-tooltip></el-table-column>
-            <el-table-column label="地址" prop="addr" show-overflow-tooltip></el-table-column>
-            <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>
-                </template>
-            </el-table-column>
-        </el-table>
-
-
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="query.page"
-          :limit.sync="query.limit"
-          @pagination="handleCurrentChange"
-        ></pagination>
-
-
-
-        <el-dialog
-            :title="combinTypeMap[combinType]"
-            :visible.sync="selectDrugDialogVisible"
-            width="80%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            v-if="selectDrugDialogVisible"
-        >
-            <selectUnit v-on:closeMain="closeMain"></selectUnit>
-        </el-dialog>
-
-        <el-dialog
-            :title="combinTypeMap[combinType]"
-            :visible.sync="selectSingleUnitVisible"
-            width="85%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            v-if="selectSingleUnitVisible"
-        >
-            <selectSingleUnit v-on:cancelDialog="cancelDialog" :corpData="corpData"
-                              :defaultSys="defaultSys"></selectSingleUnit>
-        </el-dialog>
-
-
-        <!--表单-->
-        <el-dialog
-            :title="formMap[formName]"
-            :visible.sync="formVisible"
-            :before-close="hideForm"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            width="60%"
-            top="5vh"
-        >
-            <el-table :data="sysList" style="width: 100%" border v-if="formName=='update'">
-                <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column label="第三方系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="第三方往来单位ID" prop="thirdId" show-overflow-tooltip></el-table-column>
-                <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.native.stop="removeErp(scope.row)" :disabled="scope.row.thirdId=='' ||scope.row.thirdId==null || !configParms.basicCorp">解绑</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <el-form :model="editQuery" :rules="formRules" style="margin-top: 20px" label-width="120px" ref="dataForm">
-              <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-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-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-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-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-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-form-item>
-                  </el-col>
-                </el-row>
-                <el-row :type="flex">
-                  <el-col :span="12" type="flex">
-                    <el-form-item label="往来单位类型" prop="corpType">
-                      <el-select v-model="editQuery.corpType"  style="width: 90%" placeholder="请选择往来单位类型">
-                        <el-option
-                          v-for="item in corpTypeList"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value">
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-                  </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-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>
-            </div>
-        </el-dialog>
-      </el-card>
-    </div>
+      </el-dialog>
+    </el-card>
+  </div>
 </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";
@@ -184,438 +209,437 @@ import {findConfig} from "@/api/thrsys/spsSyncStatus";
 var pinyin = require("pinyin");
 
 export default {
-    data() {
-        return {
-            query: {
-                key: "",
-                page: 1,
-                limit: 20,
-            },
-            showSearch:true,
-            erpIdColumn: false,
-            thirdIdColumn: false,
-            editQuery: {
-                id: "",
-                thirdId: "",
-                erpId: "",
-                name: "",
-                spell: "",
-                addr: "",
-                status: "",
-                type: "",
-                creditNo: "",
-                contact: "",
-                mobile: ""
-            },
-            corpData: null,
-            checked: false,
-            formName: null,
-            formMap: {
-                add: "新增",
-                update: "编辑"
-            },
-            formLoading: false,
-            formVisible: false,
-            combinType: 0,//0:新增，1，修改
-            combinTypeMap: {
-                0: "选入往来单位信息",
-                1: "关联往来单位信息",
-            },
-
-            corpTypeList: [
-                {
-                    value: 1,
-                    label: "客户"
-                },
-                {
-                    value: 2,
-                    label: "供应商"
-                },
-                {
-                    value: 3,
-                    label: "特殊科室"
-                },
-                {
-                    value: 4,
-                    label: "特殊往来"
-                }
-
-            ],
-            formRules: {
-                name: [
-                    {required: true, message: "请输入名称", trigger: "blur"}
-                ],
-                // erpId: [
-                //     {required: true, message: "请输入自定义码", trigger: "blur"}
-                // ],
-                creditNo: [
-                    {required: true, message: "请输入社会信用号", trigger: "blur"}
-                ]
-            },
-            spellUpdate: false,
-            editDialogVisible: false,
-            selectDrugDialogVisible: false,
-            selectSingleUnitVisible: false,
-            list: [],
-            sysList: [],
-            loading:false,
-            total: 0,
-            multipleSelection: [],
-            thirdSys: [],
-            thirdSysFk: null,
-            defaultSys: null,
-            configParms: {},
-        };
-    },
+  data() {
+    return {
+      query: {
+        key: "",
+        page: 1,
+        limit: 20,
+      },
+      showSearch: true,
+      erpIdColumn: false,
+      thirdIdColumn: false,
+      editQuery: {
+        id: "",
+        thirdId: "",
+        erpId: "",
+        name: "",
+        spell: "",
+        addr: "",
+        status: "",
+        type: "",
+        creditNo: "",
+        contact: "",
+        mobile: ""
+      },
+      corpData: null,
+      checked: false,
+      formName: null,
+      formMap: {
+        add: "新增",
+        update: "编辑"
+      },
+      formLoading: false,
+      formVisible: false,
+      combinType: 0,//0:新增，1，修改
+      combinTypeMap: {
+        0: "选入往来单位信息",
+        1: "关联往来单位信息",
+      },
 
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.query = {
-                key: "",
-                page: 1,
-                limit: 20,
-            };
-            this.getList();
+      corpTypeList: [
+        {
+          value: 1,
+          label: "客户"
         },
-        search() {
-            this.query.page = 1;
-            this.getList();
+        {
+          value: 2,
+          label: "供应商"
         },
-        getList() {
-            this.loading = true;
-            this.erpIdColumn = false;
-            this.thirdIdColumn = false;
-            getBasicUnitMaintains(this.query)
-                .then((response) => {
-                    this.getSystemParamConfig();
-                    this.loading = false;
-                    this.list = response.data.list || [];
-                    this.total = response.data.total || 0;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
+        {
+          value: 3,
+          label: "特殊科室"
         },
-      getSystemParamConfig(){
-        getSystemParamConfig().then((req) => {
-          this.erpIdColumn = req.data.BUMErpIdValue == "1" ? true : false;
-          this.thirdIdColumn = req.data.BUMThirdIdValue == "1" ? true : false;
-        })
-      },
-      hideSearch() {
-        this.showSearch = !this.showSearch;
+        {
+          value: 4,
+          label: "特殊往来"
+        }
+
+      ],
+      formRules: {
+        name: [
+          {required: true, message: "请输入名称", trigger: "blur"}
+        ],
+        // erpId: [
+        //     {required: true, message: "请输入自定义码", trigger: "blur"}
+        // ],
+        creditNo: [
+          {required: true, message: "请输入社会信用号", trigger: "blur"}
+        ]
       },
+      spellUpdate: false,
+      editDialogVisible: false,
+      selectDrugDialogVisible: false,
+      selectSingleUnitVisible: false,
+      list: [],
+      sysList: [],
+      loading: false,
+      total: 0,
+      multipleSelection: [],
+      thirdSys: [],
+      thirdSysFk: null,
+      defaultSys: null,
+      configParms: {},
+    };
+  },
+
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.query = {
+        key: "",
+        page: 1,
+        limit: 20,
+      };
+      this.getList();
+    },
+    search() {
+      this.query.page = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      this.erpIdColumn = false;
+      this.thirdIdColumn = false;
+      getBasicUnitMaintains(this.query)
+        .then((response) => {
+          this.getSystemParamConfig();
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    getSystemParamConfig() {
+      getSystemParamConfig().then((req) => {
+        this.erpIdColumn = req.data.BUMErpIdValue == "1" ? true : false;
+        this.thirdIdColumn = req.data.BUMThirdIdValue == "1" ? true : false;
+      })
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
         // 刷新表单
-        resetForm() {
-            if (this.$refs["dataForm"]) {
-                // 清空验证信息表单
-                this.$refs["dataForm"].clearValidate();
-                // 刷新表单
-                this.$refs["dataForm"].resetFields();
-                this.getList();
-            }
-        },
-        // 隐藏表单
-        hideForm() {
-            // 更改值
-            this.formVisible = !this.formVisible;
-           // this.getList();
-            return true;
-        },
-        // 显示表单
-        handleForm(index, row) {
-            this.formVisible = true;
-            this.formName = "add";
-            this.spellUpdate = false;
-            if (index !== null) {
-                this.index = index;
-                this.formName = "update";
-                this.spellUpdate = true;
-                this.editQuery = row;
-
-            } else {
-                this.editQuery = {
-                    id: "",
-                    thirdId: "",
-                    erpId: "",
-                    name: "",
-                    spell: "",
-                    addr: "",
-                    status: "",
-                    type: "",
-                    creditNo: "",
-                    contact: "",
-                    mobile: ""
-                };
-            }
-
-            this.getThirdSysDetail();
-        },
-        formSubmit() {
-            if (this.$isBlank(this.editQuery.corpType)) {
-                this.$message.error("往来单位类型不能为空！");
-                return;
-            }
-
-            this.$refs["dataForm"].validate(valid => {
-                if (valid) {
-                    this.formLoading = true;
-                    this.editQuery.thirdId = null;
-                    this.editQuery.thirdId1 = null;
-                    this.editQuery.thirdId2 = null;
-                    this.editQuery.thirdId3 = null;
-                    this.editQuery.thirdId4 = null;
-                    this.editQuery.thirdName = null;
-                    this.editQuery.thirdName1 = null;
-                    this.editQuery.thirdName2 = null;
-                    this.editQuery.thirdName3 = null;
-                    this.editQuery.thirdName4 = null;
-                    let data = Object.assign({}, this.editQuery);
-
-                    basicUnitMaintainSave(data, this.formName)
-                        .then(response => {
-                            this.formLoading = false;
-                            if (response.code !== 20000) {
-                                this.$message.error(response.message);
-                                return false;
-                            }
-                            this.$message.success("操作成功");
-                            this.formVisible = false;
-                            if (this.formName === "add") {
-                                // 向头部添加数据
-                                if (response.data && response.data.id) {
-                                    data.id = response.data.id;
-                                    this.list.unshift(data);
-                                }
-                            } else {
-                                this.list.splice(this.index, 1, data);
-                            }
-                            // 刷新表单
-                            this.resetForm();
-                            this.getList();
-                        })
-                        .catch(() => {
-                            this.formLoading = false;
-                        });
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    // 隐藏表单
+    hideForm() {
+      // 更改值
+      this.formVisible = !this.formVisible;
+      // this.getList();
+      return true;
+    },
+    // 显示表单
+    handleForm(index, row) {
+      this.formVisible = true;
+      this.formName = "add";
+      this.spellUpdate = false;
+      if (index !== null) {
+        this.index = index;
+        this.formName = "update";
+        this.spellUpdate = true;
+        this.editQuery = row;
+
+      } else {
+        this.editQuery = {
+          id: "",
+          thirdId: "",
+          erpId: "",
+          name: "",
+          spell: "",
+          addr: "",
+          status: "",
+          type: "",
+          creditNo: "",
+          contact: "",
+          mobile: ""
+        };
+      }
+
+      this.getThirdSysDetail();
+    },
+    formSubmit() {
+      if (this.$isBlank(this.editQuery.corpType)) {
+        this.$message.error("往来单位类型不能为空！");
+        return;
+      }
+
+      this.$refs["dataForm"].validate(valid => {
+        if (valid) {
+          this.formLoading = true;
+          this.editQuery.thirdId = null;
+          this.editQuery.thirdId1 = null;
+          this.editQuery.thirdId2 = null;
+          this.editQuery.thirdId3 = null;
+          this.editQuery.thirdId4 = null;
+          this.editQuery.thirdName = null;
+          this.editQuery.thirdName1 = null;
+          this.editQuery.thirdName2 = null;
+          this.editQuery.thirdName3 = null;
+          this.editQuery.thirdName4 = null;
+          let data = Object.assign({}, this.editQuery);
+
+          basicUnitMaintainSave(data, this.formName)
+            .then(response => {
+              this.formLoading = false;
+              if (response.code !== 20000) {
+                this.$message.error(response.message);
+                return false;
+              }
+              this.$message.success("操作成功");
+              this.formVisible = false;
+              if (this.formName === "add") {
+                // 向头部添加数据
+                if (response.data && response.data.id) {
+                  data.id = response.data.id;
+                  this.list.unshift(data);
                 }
+              } else {
+                this.list.splice(this.index, 1, data);
+              }
+              // 刷新表单
+              this.resetForm();
+            })
+            .catch(() => {
+              this.formLoading = false;
             });
-        },
+        }
+      });
+    },
 
-        deleteUnit(data) {
-            this.loading = true;
-            let tquery = {
-                id: data.id + "",
-            };
-
-            deleteBasicUnitMaintain(tquery)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.getList();
-                        this.$message({
-                            type: "success",
-                            message: "删除成功！",
-                        });
-                    } else {
-                        this.$message.error(response.message);
-                    }
-
-                })
-                .catch(() => {
-                });
-        },
+    deleteUnit(data) {
+      this.loading = true;
+      let tquery = {
+        id: data.id + "",
+      };
 
-        cancelDialog() {
-            this.editDialogVisible = false;
-            this.selectSingleUnitVisible = false;
+      deleteBasicUnitMaintain(tquery)
+        .then((response) => {
+          if (response.code == 20000) {
             this.getList();
-            this.getThirdSysDetail();
-        },
-        closeMain(val) {
-            this.selectDrugDialogVisible = false;
-
-            if (val) {
-                this.$message.success("添加成功！");
-                this.getList();
-            } else {
-                this.$message.error("添加失败！");
-            }
-        },
+            this.$message({
+              type: "success",
+              message: "删除成功！",
+            });
+          } else {
+            this.$message.error(response.message);
+          }
+
+        })
+        .catch(() => {
+        });
+    },
+
+    cancelDialog() {
+      this.editDialogVisible = false;
+      this.selectSingleUnitVisible = false;
+      this.getList();
+      this.getThirdSysDetail();
+    },
+    closeMain(val) {
+      this.selectDrugDialogVisible = false;
 
+      if (val) {
+        this.$message.success("添加成功！");
+        this.getList();
+      } else {
+        this.$message.error("添加失败！");
+      }
+    },
 
-        handleModifyClick(row) {
-            this.editDialogVisible = true;
-            this.editQuery = row;
 
+    handleModifyClick(row) {
+      this.editDialogVisible = true;
+      this.editQuery = row;
 
-            this.getThirdSysDetail();
-        },
 
-        deleteDialog(rowId) {
-            this.$confirm("此操作将永久删除该往来单位信息, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    this.deleteUnit(rowId);
-                })
-                .catch(() => {
-                });
-        },
+      this.getThirdSysDetail();
+    },
 
-        exportTxt() {
-        },
+    deleteDialog(rowId) {
+      this.$confirm("此操作将永久删除该往来单位信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteUnit(rowId);
+        })
+        .catch(() => {
+        });
+    },
 
-        intentDetail() {
-            this.combinType = 0;
-            this.selectDrugDialogVisible = true;
-        },
+    exportTxt() {
+    },
 
-        intentSelect(row) {
-            this.combinType = 1;
-            this.corpData = this.editQuery;
-            this.defaultSys = row.sysId;
-            this.selectSingleUnitVisible = true;
-        },
+    intentDetail() {
+      this.combinType = 0;
+      this.selectDrugDialogVisible = true;
+    },
 
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
+    intentSelect(row) {
+      this.combinType = 1;
+      this.corpData = this.editQuery;
+      this.defaultSys = row.sysId;
+      this.selectSingleUnitVisible = true;
+    },
 
-        handleCurrentChange(val) {
-            this.query.page = val.page;
-            this.getList();
-        },
-        getBasicThirdSys() {
-            let query = {
-                enabled: null,
-            };
-            getBasicThirdSys(query)
-                .then((response) => {
-                    this.thirdSys = response.data.list || [];
-                    this.thirdSysFk = this.thirdSys[0].thirdId;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                });
-        },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
 
-        getThirdSysDetail() {
+    handleCurrentChange(val) {
+      this.query.page = val.page;
+      this.getList();
+    },
+    getBasicThirdSys() {
+      let query = {
+        enabled: null,
+      };
+      getBasicThirdSys(query)
+        .then((response) => {
+          this.thirdSys = response.data.list || [];
+          this.thirdSysFk = this.thirdSys[0].thirdId;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
+    },
 
-            let query = {};
+    getThirdSysDetail() {
 
-            if (this.formName == "update") {
-                query = {
-                    id: this.editQuery.id,
-                }
-            }
-            getThrsysUnit(query)
-                .then((response) => {
-                    this.loading = false;
-                    this.sysList = response.data.list || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.sysList = [];
-                });
+      let query = {};
+
+      if (this.formName == "update") {
+        query = {
+          id: this.editQuery.id,
         }
-        ,
-        change() {
-            var pinyin = require("pinyin");
-            var py = pinyin(this.editQuery.name, {
-                style: pinyin.STYLE_FIRST_LETTER, // 设置拼音风格
-                heteronym: true,
-            });
-            var str = "";
-            py.forEach((item) => {
-                str = str + item[0];
-            });
-            this.editQuery.spell = str;
-        },
-        removeErp(row) {
-            this.$confirm("此操作将解除该绑定往来单位信息, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    let query = {
-                        relId: this.editQuery.id,
-                        thirdSys: row.sysId
-                    };
-                    removeRl(query)
-                        .then((response) => {
-                            if (response.code == 20000) {
-                                this.getThirdSysDetail()();
-                                this.$message({
-                                    type: "success",
-                                    message: "解绑成功！",
-                                });
-                            } else {
-                                this.$message.error(response.message);
-                            }
-                        })
-                        .catch(() => {
-                        });
-                })
-                .catch(() => {
-                });
-        },
-        getSyncConfig() {
-            findConfig()
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.configParms = response.data;
-                    }
-                })
-                .catch(() => {
-                });
-        },
-    }
-    ,
-    mounted() {
-    }
-    ,
-    components: {
-        selectUnit, selectSingleUnit
-    }
-    ,
-    created() {
-        this.getList();
-        this.getSyncConfig();
-        this.getBasicThirdSys();
+      }
+      getThrsysUnit(query)
+        .then((response) => {
+          this.loading = false;
+          this.sysList = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.sysList = [];
+        });
     }
     ,
+    change() {
+      var pinyin = require("pinyin");
+      var py = pinyin(this.editQuery.name, {
+        style: pinyin.STYLE_FIRST_LETTER, // 设置拼音风格
+        heteronym: true,
+      });
+      var str = "";
+      py.forEach((item) => {
+        str = str + item[0];
+      });
+      this.editQuery.spell = str;
+    },
+    removeErp(row) {
+      this.$confirm("此操作将解除该绑定往来单位信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let query = {
+            relId: this.editQuery.id,
+            thirdSys: row.sysId
+          };
+          removeRl(query)
+            .then((response) => {
+              if (response.code == 20000) {
+                this.getThirdSysDetail()();
+                this.$message({
+                  type: "success",
+                  message: "解绑成功！",
+                });
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+            });
+        })
+        .catch(() => {
+        });
+    },
+    getSyncConfig() {
+      findConfig()
+        .then((response) => {
+          if (response.code == 20000) {
+            this.configParms = response.data;
+          }
+        })
+        .catch(() => {
+        });
+    },
+  }
+  ,
+  mounted() {
+  }
+  ,
+  components: {
+    selectUnit, selectSingleUnit
+  }
+  ,
+  created() {
+    this.getList();
+    this.getSyncConfig();
+    this.getBasicThirdSys();
+  }
+  ,
 }
 ;
 </script>
 <style scoped>
 .itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
+  float: left;
+  text-align: left;
+  margin-top: 10px;
 
 }
 
 .text {
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
 }
 
 .el-row {
-    display: flex;
-    flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 }
 
 .el-col {
-    border-radius: 4px;
-    flex-wrap: wrap;
+  border-radius: 4px;
+  flex-wrap: wrap;
 }
 
 
diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue
index 943f114e..5b88f104 100644
--- a/src/views/system/dept/authDept.vue
+++ b/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("是否删除该部门?", "提示", {
diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index 7605e5b0..817816fb 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/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>
diff --git a/src/views/system/device/phoneRegisterManage.vue b/src/views/system/device/phoneRegisterManage.vue
index eae3255c..e45b4826 100644
--- a/src/views/system/device/phoneRegisterManage.vue
+++ b/src/views/system/device/phoneRegisterManage.vue
@@ -259,6 +259,7 @@ export default {
     },
 
     onSubmit() {
+      this.filterQuery.page=1;
       this.getList();
     },
     closeDialogVisible(){
diff --git a/src/views/system/param/busTypeChange.vue b/src/views/system/param/busTypeChange.vue
index 9de27d98..8842dedd 100644
--- a/src/views/system/param/busTypeChange.vue
+++ b/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;
     },
 
diff --git a/src/views/system/param/busTypePre.vue b/src/views/system/param/busTypePre.vue
index 7f9ca058..0487efae 100644
--- a/src/views/system/param/busTypePre.vue
+++ b/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;
     },
diff --git a/src/views/system/param/busTypePreModify.vue b/src/views/system/param/busTypePreModify.vue
index c9f94032..6cea57ca 100644
--- a/src/views/system/param/busTypePreModify.vue
+++ b/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>