机具大融合问题修改

src/views/material/basic/bmUnit/people.vue

@@ -10,7 +10,6 @@
             clearable
             size="small" maxlength="50"
             prefix-icon="el-icon-search" 
-            @input="getUserList"
             style="margin-bottom: 20px"
           />
         </div>
@@ -21,7 +20,7 @@
             :filter-node-method="filterNode"
             :render-content="renderConent"
             ref="tree"
-            node-key="userId"
+            node-key="id"
             default-expand-all
             highlight-current
             @node-click="handleNodeClick"
@@ -502,7 +501,7 @@ export default {
   },
   watch: {
     // 根据名称筛选部门树
-    deptName(val) {
+    userName(val) {
       this.$refs.tree.filter(val);
     }
   },
@@ -512,7 +511,7 @@ export default {
 
   },
   methods: {
-      renderConent(h, { node }) {
+    renderConent(h, { node }) {
       let iconClass = '';
       // 根据 node 的类型判断图标
       if (node.data.level == 99) {

src/views/material/basic/unitType/index.vue

@@ -459,7 +459,7 @@ export default {
     handleDelete(row) {
       const dictCodes = row.dictCode || this.ids;
       this.$modal
-        .confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？')
+        .confirm('是否确认删除所选择的数据项')
         .then(function () {
           return delData(dictCodes);
         })

src/views/material/lease/apply/component/queryToolsApply.vue

@@ -4,7 +4,6 @@
       :model="maForm"
       ref="maForm"
       size="small" 
-      :rules="rules"
       :inline="true"
       label-width="120px"
     >
@@ -17,7 +16,6 @@
           filterable
           clearable
           collapse-tags 
-          @change="uniteChange"
           disabled
           placeholder="请选择租赁单位"
         ></el-cascader>
@@ -31,7 +29,6 @@
           filterable
           clearable
           collapse-tags 
-          @change="projectChange"
           disabled
           placeholder="请选择租赁工程"
         ></el-cascader>

src/views/material/lease/outBound/index.vue

@@ -225,7 +225,7 @@
 
     <!-- 出库弹窗 -->
     <el-dialog
-      :title="title"
+      title="出库"
       :visible.sync="showOutInfo"
       width="1200px"
       append-to-body
@@ -324,7 +324,7 @@
 
     <!-- 查看弹窗 -->
     <el-dialog
-      :title="title"
+      title="查看"
       :visible.sync="showOutView"
       width="1200px"
       append-to-body
@@ -399,7 +399,7 @@
 
     <!-- 编码出库 -->
     <el-dialog
-      :title="title"
+      title="编码出库"
       :visible.sync="openCode"
       width="1200px"
       append-to-body
@@ -774,7 +774,7 @@
 
     <!-- 数量出库 -->
     <el-dialog
-      :title="title"
+      title="数量出库"
       :visible.sync="openNum"
       width="1200px"
       append-to-body
@@ -1007,7 +1007,10 @@ export default {
       this.queryOutInfo.pageNum = 1;
       this.getDialogList();
     },
-
+    resetQueryOutInfo() {
+      this.queryOutInfo.typeId=""
+      this.getDialogList();
+    },
     getListView() {
       outInfoList(this.queryOutView.id).then((response) => {
         this.getListOutInfo = response.data.leaseApplyDetailsList;
@@ -1024,7 +1027,7 @@ export default {
         // this.loading = false;
       });
     },
-    resetQueryOutInfo() {},
+    
 
     /** 查看按钮操作 */
     handleView(row) {
@@ -1100,7 +1103,10 @@ export default {
       this.getCodeList();
     },
 
-    resetOutQuery() {},
+    resetOutQuery() {
+      this.outQuery.maCode=""
+      this.handleOutQuery()
+    },
 
     saveCodeOut() {
       console.log(this.maCodeList)