1.单据类型列表增加备注展示

src/views/basic/BussinessTypeLocl.vue

@@ -55,6 +55,7 @@
                         <span>{{ enableMap[scope.row.spUse] }}</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="备注" prop="remark" fixed></el-table-column>
                 <el-table-column label="操作" fixed="right">
                     <template slot-scope="scope">
                         <el-button

src/views/basic/CorpMaintain.vue

@@ -303,7 +303,9 @@
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <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>
     </div>
@@ -464,29 +466,18 @@ export default {
                 this.editQuery = row;
 
             } else {
-                this.editQuery =
-                    {
+                this.editQuery = {
                     id: "",
-                        thirdId:
-                            "",
-                        erpId:
-                            "",
-                        name:
-                            "",
-                        spell:
-                            "",
-                        addr:
-                            "",
-                        status:
-                            "",
-                        type:
-                            "",
-                        creditNo:
-                            "",
-                        contact:
-                            "",
-                        mobile:
-                            ""
+                    thirdId: "",
+                    erpId: "",
+                    name: "",
+                    spell: "",
+                    addr: "",
+                    status: "",
+                    type: "",
+                    creditNo: "",
+                    contact: "",
+                    mobile: ""
                 };
             }
 

src/views/basic/CorpSingleRelevance.vue

@@ -77,6 +77,7 @@
                     </el-form-item>
                     <el-form-item style="display: flex">
                         <el-button-group>
+                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                             <el-button type="primary" icon="search" @click="searchList">查询</el-button>
                             <el-button type="primary" size="mini" icon="search" @click="combine"
                                        :loading="combineLoading"
@@ -177,6 +178,16 @@ export default {
             this.unitQuery.page = 1;
             this.getList();
         },
+        onReset() {
+            this.unitQuery = {
+                page: 1,
+                limit: 10,
+                key: "",
+                thirdSys: null,
+            }
+            this.total = 0;
+            this.getList();
+        },
         getList() {
             this.loading = true;
             this.unitQuery.thirdSys = this.thirdSysFk;
@@ -235,7 +246,7 @@ export default {
                 this.$message.warning("未选择往来单位！");
                 return;
             }
-            if( this.combineQuery.erpUnitsResponse.checked == true){
+            if (this.combineQuery.erpUnitsResponse.checked == true) {
                 this.$message.warning("该往来单位已被关联，不能重复选入！");
                 return;
             }

src/views/basic/UdiInfoManageSp.vue

@@ -67,7 +67,7 @@
                     <el-form-item>
                         <el-button-group>
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                            <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                            <el-button type="primary" icon="search" @click="search">查询</el-button>
                             <el-button
                                 type="primary"
                                 icon="search"
@@ -850,6 +850,10 @@ export default {
                 limit: 20,
                 addType: 1,
             };
+            this.total = 0;
+        },
+        search() {
+            this.filterQuery.page = 1;
             this.getList();
         },
         getList() {

src/views/inout/IOAddOrder.vue

@@ -424,6 +424,8 @@
         <el-dialog
             :title="editTitle"
             :visible.sync="editCodeVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
             append-to-body width="70%"
             v-if="editCodeVisible"
         >
@@ -462,13 +464,12 @@ import {filterSubByInv} from "../../api/basic/invSubWarehouse";
 import draggable from "vuedraggable";
 import {parseTime} from "../../filtres/index";
 import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
-import {deleteWarehouse, filterAllByLoc, filterAllByUser} from "@/api/basic/invWarehouse";
-import {getLocalBusType, getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
+import {filterAllByLoc, filterAllByUser} from "@/api/basic/invWarehouse";
+import {getLocalJoinByUser} from "../../api/basic/busLocalType";
 import DialogSelectUnit from "./DialogSelectUnit";
 import selectRlDialog from "./DialogSelectRl";
 import editCodeDialog from "./editCode";
 import A from "../../plugin/KeyScaner"
-import {deleteLog} from "@/api/basic/udiinfolog";
 import {isBlank} from "@/utils/strUtil";