完善

src/views/sb/info/SbInfo.vue

@@ -1,16 +1,6 @@
 <template>
   <a-card :bordered="false">
     <a-row :gutter="8" v-show="visible">
-      <!--      <a-col :span="4">
-        <a-tree
-          @expand="onExpand"
-          :expandedKeys="expandedKeys"
-          :autoExpandParent="true"
-          @select="onSelect"
-          :selectedKeys="selectedKeys"
-          :treeData="treeData"
-        />
-      </a-col>-->
       <a-col :span="24">
         <div>
           <div class="table-page-search-wrapper">
@@ -545,9 +535,6 @@ export default {
     this.useTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_USE_TYPE)
     this.isChildMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_IS_CHILD)
     this.isShowMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_IS_SHOW)
-    querySbPosition().then(res => {
-      this.sbPositionData = res.data
-    })
   },
   methods: {
     tableOption () {
@@ -708,6 +695,9 @@ export default {
       fetchSbTypeTree().then(res => {
         this.treeData = res.data
       })
+      querySbPosition().then(res => {
+        this.sbPositionData = res.data
+      })
     },
     onSelect: function (selectedKeys, info) {
       this.selectedKeys = selectedKeys

src/views/sb/storecheckjob/modules/StoreCheckJobTable2.vue

@@ -101,15 +101,7 @@ export default {
         },
         {
           title: '存放位置',
-          dataIndex: 'positionId'
-        },
-        {
-          title: '使用班组',
-          dataIndex: 'useGroupName'
-        },
-        {
-          title: '管理人员',
-          dataIndex: 'saveUserName'
+          dataIndex: 'storeName'
         },
         {
           title: '设备编号',

src/views/sb/storecheckplan/StoreCheckPlan.vue

@@ -66,7 +66,7 @@
             <a-divider type="vertical" />
             <a v-if="($auth('check-spot-plans-edit') || $auth('check-polling-plans-edit'))" @click="handleEdit(record)">修改</a>
             <a-divider type="vertical" v-if="record.status == 1"/>
-            <a v-if="record.status == 1" @click="handleExcute(record)">执行</a>
+            <a v-if="record.status == 1" @click="handleExecute(record)">执行</a>
             <a-divider type="vertical" />
             <a-popconfirm v-if="($auth('check-spot-plans-del') || $auth('check-polling-plans-del'))" title="是否要删除该条数据？" @confirm="batchDelete(record.id)">
               <a>删除</a>
@@ -96,7 +96,6 @@ import { STable, Ellipsis } from '@/components'
 import BaseForm from './modules/BaseForm'
 import Detail from './modules/Detail'
 import { getCheckPlanPage, excuteCheckPlan, deleteCheckPlans, fetchCheckPlan, exportCheckPlan } from '@/api/sb/sbstorecheckplan'
-import { fetchStoreTree } from '@/api/store/store'
 import StoreCheckJobTable2 from '@/views/sb/storecheckjob/modules/StoreCheckJobTable2'
 import { queryDept } from '@/api/upms/dept'
 
@@ -140,7 +139,7 @@ export default {
           dataIndex: 'name'
         },
         {
-          title: '项目部',
+          title: '区域',
           dataIndex: 'storeName'
         },
         {
@@ -269,14 +268,12 @@ export default {
       })
     },
     handleEdit (record) {
-      fetchCheckPlan({ id: record.id }).then(res => {
-        const modal = this.$refs.baseModal
-        modal.base(res.data)
-      })
+      const modal = this.$refs.baseModal
+      modal.base(record)
     },
-    handleExcute (record) {
+    handleExecute (record) {
       excuteCheckPlan({ id: record.id }).then(res => {
-        this.$message.info('启动中，请稍后查看任务')
+        this.$message.info('任务启动中，请稍后查看任务')
         this.$refs.table.refresh(true)
       })
     },

src/views/sb/storecheckplan/modules/BaseForm.vue

@@ -37,16 +37,34 @@
         </row-item>
         <row-item>
           <a-form-item
-            label="项目部"
+            label="设备类型"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select @change="handleProjectChange" v-decorator="['storeId', {rules: [{required: true, message: '项目不能为空'}]}]" placeholder="请选择">
+            <a-tree-select
+              style="width: 100%"
+              :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+              :treeData="treeData"
+              :treeNodeFilterProp="'title'"
+              :showSearch="true"
+              v-decorator="['spareType', {rules: [{required: false, message: '设备类型不能为空'}]}]"
+              placeholder="请选择"
+            >
+            </a-tree-select>
+          </a-form-item>
+        </row-item>
+        <row-item>
+          <a-form-item
+            label="盘点区域"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select   v-decorator="['storeId', {rules: [{required: false, message: '盘点区域不能为空'}]}]" placeholder="请选择">
               <a-select-option
-                v-for="({deptId, name}) in projectList"
-                :key="deptId"
+                v-for="({id,name}) in sbPositionData"
+                :key="id"
                 :label="name"
-                :value="deptId">{{ name }}
+                :value="id">{{ name }}
               </a-select-option>
             </a-select>
           </a-form-item>
@@ -133,8 +151,9 @@
 <script>
 import pick from 'lodash.pick'
 import { addCheckPlan, updateCheckPlan } from '@/api/sb/sbstorecheckplan'
-import { queryDept } from '@/api/upms/dept'
-import { queryUsersByParentDeptNatureAll } from '@/api/upms/user'
+import { queryUser } from '@/api/upms/user'
+import { fetchSbTypeTree } from '@/api/sb/type'
+import { querySbPosition } from '@/api/sb/position'
 
 export default {
   name: 'BaseCheckPlan',
@@ -157,10 +176,11 @@ export default {
       visible: false,
       // 下拉框map
       typeMap: {},
+      treeData: [],
+      sbPositionData: [],
       periodTypeMap: {},
       checkUserTypeMap: {},
       validTimeTypeMap: {},
-      projectList: {},
       userList: {},
       enableMap: {},
       rowSelection: {
@@ -193,8 +213,11 @@ export default {
     this.periodTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_PLAN_PERIOD_TYPE)
     this.validTimeTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_PLAN_PERIOD_TYPE)
     this.enableMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
-    queryDept({ nature: this.DictCache.VALUE.SYS_DEPT_NATURE.XIANG_MU_BU }).then(res => {
-      this.projectList = res.data
+    fetchSbTypeTree().then(res => {
+      this.treeData = res.data
+    })
+    querySbPosition().then(res => {
+      this.sbPositionData = res.data
     })
   },
   methods: {
@@ -206,10 +229,8 @@ export default {
         return
       }
       this.modalTitle = '编辑'
-      const params = { includeMy: true }
-      params.deptId = record.storeId
-      params.nature = this.DictCache.VALUE.SYS_DEPT_NATURE.XIANG_MU_BU
-      queryUsersByParentDeptNatureAll(params).then(res => {
+      const params = { }
+      queryUser(params).then(res => {
         this.userList = res.data
       })
       const { form: { setFieldsValue } } = this
@@ -267,19 +288,6 @@ export default {
         this.$emit('ok', values)
       }
     },
-    handleProjectChange (value) {
-      const params = { includeMy: true }
-      if (this.BaseTool.Object.isBlank(value)) {
-        this.$message.info('请先选择项目部')
-        return
-      } else {
-        params.deptId = value
-      }
-      params.nature = this.DictCache.VALUE.SYS_DEPT_NATURE.XIANG_MU_BU
-      queryUsersByParentDeptNatureAll(params).then(res => {
-        this.userList = res.data
-      })
-    }
 
   }
 }