完善

src/views/sqarepartmanage/sparepartinfo/SparePartInfo.vue

@@ -78,10 +78,16 @@
                   </a-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="关联设备">
+                  <a-input v-model="queryParam.model" placeholder="新号/旧号/名称/规格"/>
+                </a-form-item>
+              </a-col>
               <a-col :md="6 || 24" :sm="24">
                 <span class="table-page-search-submitButtons">
                   <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
                   <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
+                  <a-button style="margin-left: 8px" @click="searchTypeNull">空类型</a-button>
                 </span>
               </a-col>
             </a-row>
@@ -93,7 +99,7 @@
           <a-button style="margin-left: 8px" v-if="$auth('sqarepartmanage-spare-part-info-export')" type="primary" icon="download" @click="doExport">导出</a-button>
           <a-button style="margin-left: 8px" v-if="$auth('sqarepartmanage-spare-part-info-export')" type="primary" icon="upload" @click="doImport">初始化新增导入</a-button>
           <a-button style="margin-left: 8px" v-if="$auth('sqarepartmanage-spare-part-info-export')" type="primary" icon="upload" @click="doImportForUpdate">修改导入</a-button>
-<!--          <a-button style="margin-left: 8px" v-if="selectedRowKeys.length > 0 && $auth('sqarepartmanage-spare-part-info-del')" type="primary" icon="upload" @click="handleSpareSelect">批量矫正</a-button>-->
+          <!--          <a-button style="margin-left: 8px" v-if="selectedRowKeys.length > 0 && $auth('sqarepartmanage-spare-part-info-del')" type="primary" icon="upload" @click="handleSpareSelect">批量矫正</a-button>-->
           <a-button style="margin-left: 8px" type="primary" icon="printer" @click="handlePrintBatch()">批量打印</a-button>
           <a-button style="margin-left: 8px" v-if="$auth('sb-infos-generate-code-all')" :loading="confirmLoading" type="primary" @click="batchGenerate()">重新生成二维码</a-button>
           <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('sqarepartmanage-spare-part-info-del')">
@@ -517,6 +523,10 @@ export default {
         this.BaseTool.UPLOAD.downLoadExportExcel(file)
       })
     },
+    searchTypeNull () {
+      this.queryParam.searchType = true
+      this.$refs.table.refresh(true)
+    },
     batchGenerate () {
       this.confirmLoading = true
       this.$message.info('正在生成请稍后')

src/views/sqarepartmanage/sparepartinfo/modules/SparePartInfoSelectModal.vue

@@ -38,6 +38,11 @@
                     <a-input v-model="queryParam.initNo" placeholder="原厂编号"/>
                   </a-form-item>
                 </a-col>
+                <a-col :md="8" :sm="24">
+                  <a-form-item label="关联设备">
+                    <a-input v-model="queryParam.model" placeholder="新号/旧号/名称/规格"/>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6 || 24" :sm="24">
                   <span class="table-page-search-submitButtons">
                     <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>

src/views/store/sparestore/SpareStore.vue

@@ -30,6 +30,16 @@
                   <a-input v-model="queryParam.initNo" placeholder="请输入原厂编号"/>
                 </a-form-item>
               </a-col>
+              <a-col :md="8" :sm="24">
+                <a-form-item label="关联设备">
+                  <a-input v-model="queryParam.model" placeholder="新号/旧号/名称/规格"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="8" :sm="24">
+                <a-form-item label="最低数量">
+                  <a-input v-model="queryParam.num" placeholder="请输入数量"/>
+                </a-form-item>
+              </a-col>
               <a-col :md="8" :sm="24">
                 <a-form-item
                   label="仓库"
@@ -59,7 +69,7 @@
         </div>
 
         <div class="table-operator">
-          <a-button  type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
+          <a-button type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
           <a-button style="margin-left: 8px" type="primary" icon="download" @click="doExport">导出</a-button>
         </div>
 
@@ -76,7 +86,7 @@
           <span slot="action" slot-scope="record">
             <template>
               <a @click="handleView(record)">查看</a>
-<!--              <a-divider type="vertical" />
+              <!--              <a-divider type="vertical" />
               <a v-if="$auth('store-spare-stores-edit')" @click="handleEdit(record)">出入库详情</a>-->
             </template>
           </span>
@@ -213,12 +223,6 @@ export default {
     fetchSpareTypeTree({}).then(res => {
       this.spareTypeTreeData = res.data
     })
-    //queryDept({ nature: this.DictCache.VALUE.SYS_DEPT_NATURE.FEN_GONG_SI }).then(res => {
-    //  this.companyList = res.data
-    //})
-    //getDeptsAllByParentId({ deptId: record.useCompany, nature: this.DictCache.VALUE.SYS_DEPT_NATURE.XIANG_MU_BU }).then(res => {
-    //  this.projectList = res.data
-    //})
   },
   methods: {
     handleCompanyChange (value) {

src/views/store/sparestore/modules/SpareStoreSelectModal.vue

@@ -52,6 +52,29 @@
                     <a-input v-model="queryParam.initNo" placeholder="模糊查询"/>
                   </a-form-item>
                 </a-col>
+                <a-col :md="8" :sm="24">
+                  <a-form-item label="关联设备">
+                    <a-input v-model="queryParam.model" placeholder="新号/旧号/名称/规格"/>
+                  </a-form-item>
+                </a-col>
+                <a-col :md="8" :sm="24">
+                  <a-form-item
+                    label="仓库"
+                    :labelCol="BaseTool.Constant.labelCol"
+                    :wrapperCol="BaseTool.Constant.wrapperCol"
+                  >
+                    <a-tree-select
+                      style="width: 100%"
+                      :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+                      :treeData="storeTreeDate"
+                      :treeNodeFilterProp="'title'"
+                      :showSearch="true"
+                      v-model="queryParam.storeId"
+                      placeholder="请选择"
+                    >
+                    </a-tree-select>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="8 || 24" :sm="24">
                   <span class="table-page-search-submitButtons">
                     <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
@@ -98,6 +121,7 @@ import { STable, Ellipsis } from '@/components'
 import Detail from './Detail'
 import { getSpareStorePage, fetchSpareStore } from '@/api/store/sparestore'
 import { fetchSpareTypeTree } from '@/api/sqarepartmanage/sparetype'
+import { fetchStoreTree } from '@/api/store/store'
 
 export default {
   name: 'SpareStoreSelectModal',
@@ -128,6 +152,7 @@ export default {
     return {
       confirmLoading: false,
       mdl: {},
+      storeTreeDate: [],
       modalTitle: null,
       visible: false,
       record: null,
@@ -227,6 +252,9 @@ export default {
     fetchSpareTypeTree({}).then(res => {
       this.spareTypeTreeData = res.data
     })
+    fetchStoreTree({}).then(res => {
+      this.storeTreeDate = res.data
+    })
   },
   methods: {
     tableOption () {
@@ -284,6 +312,8 @@ export default {
     resetSearchForm () {
       this.queryParam.keyword = null
       this.queryParam.typeId = null
+      this.queryParam.model = null
+      this.queryParam.storeId = null
       this.$refs.table.refresh(true)
     },
     base (record, queryParam = {}) {