Merge remote-tracking branch 'origin/project1' into project1

# Conflicts:
#	src/views/equipment/draw.vue

src/views/equipment/basicInfo.vue

@@ -401,36 +401,7 @@ export default {
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
-    // 树权限（父子联动）
-    handleCheckedTreeConnect(value, type) {
-      if (type === 'menu') {
-        this.form.menuCheckStrictly = !!value
-      } else if (type === 'dept') {
-        this.form.deptCheckStrictly = !!value
-      }
-    },
-    // 树权限（全选/全不选）
-    handleCheckedTreeNodeAll(value, type) {
-      if (type === 'menu') {
-        this.$refs.menu.setCheckedNodes(value ? this.menuOptions : [])
-      } else if (type === 'dept') {
-        this.$refs.dept.setCheckedNodes(value ? this.deptOptions : [])
-      }
-    },
-    // 树权限（展开/折叠）
-    handleCheckedTreeExpand(value, type) {
-      if (type === 'menu') {
-        const treeList = this.menuOptions
-        for (let i = 0; i < treeList.length; i++) {
-          this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value
-        }
-      } else if (type === 'dept') {
-        const treeList = this.deptOptions
-        for (let i = 0; i < treeList.length; i++) {
-          this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value
-        }
-      }
-    },
+
     /** 新增按钮操作 */
     handleAdd() {
       this.open = true

src/views/equipment/draw.vue

@@ -265,10 +265,6 @@
           <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQueryWarehouse">查询</el-button>
           <el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQueryWarehouse">重置</el-button>
         </el-form-item>
-        <el-radio-group v-model="radio1" class="ml-4" style="padding: 25px 7px;" @change="login">
-          <el-radio label="2" size="large">工序库</el-radio>
-          <el-radio label="1" size="large">设备库</el-radio>
-        </el-radio-group>
       </el-form>
 
       <el-table v-loading="loadingDetail" border :data="detailApplyList" @selection-change="handleSelectionChange">
@@ -348,7 +344,6 @@
 import {
   listWbApply,
   deleteLogical,
-  detailList,
   batchAddition,
   detail,
   canceListByType,
@@ -379,7 +374,7 @@ export default {
       multipleSelection: [],
       detailApplyList: [],
       deviceList: [],
-      // TODO: 表单里的单项详情参数
+      // 表单里的单项详情参数
       singleDetails: {
         pn: '',
         phd: '',
@@ -397,12 +392,6 @@ export default {
       loadingDetail: false,
       // 遮罩层
       loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
       // 总条数
       total: 0,
       // apply_detail的总条数
@@ -413,16 +402,6 @@ export default {
       title: '',
       // 是否显示弹出层
       open: false,
-      // 是否显示弹出层（数据权限）
-      openDataScope: false,
-      // 日期范围
-      // dateRange: [],
-      // 菜单表格数据
-      menuList: [],
-      menuExpand: false,
-      menuNodeAll: false,
-      deptExpand: true,
-      deptNodeAll: false,
       // 状态数据字典
       statusOptions: [
         {
@@ -449,9 +428,9 @@ export default {
       queryParams: {
         page: 1,
         rows: 10,
-        pn: undefined,
-        lot: undefined,
-        plocation: undefined,
+        pn: '',
+        lot: '',
+        plocation: '',
         ptype: 1,
         delFlag: 0
       },
@@ -459,15 +438,14 @@ export default {
       queryParamsDetail: {
         page: 1,
         rows: 10,
-        pn: undefined,
-        lot: undefined,
-        plocation: undefined,
+        pn: '',
+        lot: '',
+        plocation: '',
         ptype: 1,
         delFlag: 0
       },
       // 表单参数
       form: {},
-      deptOptions: [],
       // 判断状态显示表单
       applyStatus: ''
     }
@@ -483,12 +461,6 @@ export default {
     next()
   },
   created() {
-    // this.resetQuery()
-    // if (this.$store.getters.searchParams[this.$route.path]) {
-    //   const { searchParams } = this.$store.getters; const { path } = this.$route
-    //   const param = JSON.parse(searchParams[path]) // 保留着的查询条件
-    //   this.queryParams = { ...param }
-    // }
     this.getList()
   },
   methods: {
@@ -710,25 +682,8 @@ export default {
       )
     },
 
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 取消按钮（数据权限）
-    cancelDataScope() {
-      this.openDataScope = false
-      this.reset()
-    },
     // 表单重置
     reset() {
-      if (this.$refs.menu !== undefined) {
-        this.$refs.menu.setCheckedKeys([])
-      }
-      this.menuExpand = false
-      this.menuNodeAll = false
-      this.deptExpand = true
-      this.deptNodeAll = false
       this.form = {
         pn: undefined,
         ptype: undefined,
@@ -763,7 +718,7 @@ export default {
         prank: '',
         pstatus: '',
         ptype: '1',
-        delFlag: 0
+        delFlag: '0'
       }
       this.handleQuery()
     },
@@ -787,36 +742,7 @@ export default {
     handleSelectionChange: function(selection) {
       this.multipleSelection = selection
     },
-    // 树权限（父子联动）
-    handleCheckedTreeConnect(value, type) {
-      if (type === 'menu') {
-        this.form.menuCheckStrictly = !!value
-      } else if (type === 'dept') {
-        this.form.deptCheckStrictly = !!value
-      }
-    },
-    // 树权限（全选/全不选）
-    handleCheckedTreeNodeAll(value, type) {
-      if (type === 'menu') {
-        this.$refs.menu.setCheckedNodes(value ? this.menuOptions : [])
-      } else if (type === 'dept') {
-        this.$refs.dept.setCheckedNodes(value ? this.deptOptions : [])
-      }
-    },
-    // 树权限（展开/折叠）
-    handleCheckedTreeExpand(value, type) {
-      if (type === 'menu') {
-        const treeList = this.menuOptions
-        for (let i = 0; i < treeList.length; i++) {
-          this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value
-        }
-      } else if (type === 'dept') {
-        const treeList = this.deptOptions
-        for (let i = 0; i < treeList.length; i++) {
-          this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value
-        }
-      }
-    },
+
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.businessId