完善

src/router/generator-platform-routers.js

@@ -140,6 +140,8 @@ const constantRouterComponents = {
   'SpareStore': () => import('@/views/store/sparestore/SpareStore'),
   // 备件库存汇总
   'SpareStoreTotal': () => import('@/views/store/sparestore/SpareStoreTotal'),
+  // 备件库存汇总预警
+  'SpareStoreTotalMinStock': () => import('@/views/store/sparestore/SpareStoreTotal'),
   // 备件二级库存
   'SpareStoreSecond': () => import('@/views/store/sparestoresecond/SpareStoreSecond'),
   // 入库登记单
@@ -273,10 +275,6 @@ const constantRouterComponents = {
   'CompanySbInfo': () => import('@/views/sb/info/CompanySbInfo'),
   'MySpareStore': () => import('@/views/store/sparestore/MySpareStore'),
   'MySpareStoreTotal': () => import('@/views/store/sparestore/MySpareStoreTotal'),
-  'ProjectSpareStoreTotal': () => import('@/views/store/sparestore/ProjectSpareStoreTotal'),
-  'CompanySpareStoreTotal': () => import('@/views/store/sparestore/CompanySpareStoreTotal'),
-  'ProjectSpareStore': () => import('@/views/store/sparestore/ProjectSpareStore'),
-  'CompanySpareStore': () => import('@/views/store/sparestore/CompanySpareStore'),
   'MyRunCheckJob': () => import('@/views/check/checkjob/MyRunCheckJob'),
   'MyPollingCheckJob': () => import('@/views/check/checkjob/MyPollingCheckJob'),
   'MyPollingCheckJobFinish': () => import('@/views/check/checkjob/MyPollingCheckJobFinish'),

src/views/sqarepartmanage/sparepartinfo/SparePartInfo.vue

@@ -227,7 +227,6 @@ export default {
             return this.BaseTool.Amount.formatter(text)
           }
         },
-
         {
           title: '计量单位',
           checked: true,

src/views/store/instoredetail/InStoreDetail.vue

@@ -83,7 +83,7 @@ export default {
     return {
       // 查询参数
       queryParam: {
-        inId:this.inId
+        inId: this.inId
       },
       // 表头
       columns: [
@@ -94,10 +94,10 @@ export default {
             return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
           }
         },
-        //{
+        // {
         //  title: '入库单号',
-         // dataIndex: 'inNo'
-        //},
+        // dataIndex: 'inNo'
+        // },
         {
           title: '入库仓库',
           dataIndex: 'storeId',
@@ -105,10 +105,10 @@ export default {
             return record.storeName
           }
         },
-        {
+        /* {
           title: '备件编号',
-          dataIndex: 'spareNo',
-        },
+          dataIndex: 'spareNo'
+        }, */
         {
           title: '备件名称',
           dataIndex: 'spareId',
@@ -142,10 +142,10 @@ export default {
             return this.BaseTool.Amount.formatter(text)
           }
         },
-        //{
+        // {
         //  title: '创建日期',
         //  dataIndex: 'createdTime'
-       // },
+        // },
         {
           title: '操作',
           key: 'action',

src/views/store/instoreform/modules/BaseForm.vue

@@ -17,7 +17,26 @@
               v-decorator="['inNo', {rules: [{required: false, message: '入库单号不能为空'}]}]" />
           </a-form-item>
         </a-col>
-<!--        <a-col :lg="12" :md="24" :sm="24">
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="仓库"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-tree-select
+              style="width: 100%"
+              @change="handleStoreChange"
+              :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+              :treeData="storeTreeDate"
+              :treeNodeFilterProp="'title'"
+              :showSearch="true"
+              v-decorator="['storeId', {rules: [{required: false, message: '仓库不能为空'}]}]"
+              placeholder="请选择"
+            >
+            </a-tree-select>
+          </a-form-item>
+        </a-col>
+        <!--        <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="采购单号"
             :labelCol="BaseTool.Constant.labelCol"
@@ -58,7 +77,7 @@
               v-decorator="['userTime']" />
           </a-form-item>
         </a-col>
-<!--        <a-col :lg="12" :md="24" :sm="24">
+        <!--        <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="发运单号"
             :labelCol="BaseTool.Constant.labelCol"
@@ -71,19 +90,6 @@
             <a-button type="primary" style="width:30%" @click="handlePurchaseOrderSelect">查看明细</a-button>
           </a-form-item>
         </a-col>-->
-        <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item
-            label="仓库"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              disabled
-              style="width:70%"
-              v-decorator="['storeName', {rules: [{required: true, message: '仓库不能为空'}]}]" />
-            <a-button type="primary" style="width:30%"  @click="handleStoreSelect">选择仓库</a-button>
-          </a-form-item>
-        </a-col>
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="入库类型"
@@ -181,8 +187,9 @@ import PurchaseOrderSelectModal from '@/views/purchase/purchase-order/modules/Pu
 import StoreSelectModal from '@/views/store/store/modules/StoreSelectModal'
 import SparePartInfoSelectModal from '@/views/sqarepartmanage/sparepartinfo/modules/SparePartInfoSelectModal'
 import SpareStoreSelectModal from '@/views/store/sparestore/modules/SpareStoreSelectModal'
-import {queryUsersByParentDeptNatureAll} from "@/api/upms/user";
-import BaseTool from "@/utils/tool";
+import { queryUsersByParentDeptNatureAll } from '@/api/upms/user'
+import BaseTool from '@/utils/tool'
+import { fetchStoreTree } from '@/api/store/store'
 
 export default {
   name: 'BaseInStoreForm',
@@ -203,6 +210,7 @@ export default {
       storeId: null,
       typeMap: {},
       userList: {},
+      storeTreeDate: [],
       rowSelection: {
         onChange: (selectedRowKeys, selectedRows) => {
           this.selectedRowKeys = selectedRowKeys
@@ -287,6 +295,9 @@ export default {
       queryUsersByParentDeptNatureAll(params).then(res => {
         this.userList = res.data
       })
+      fetchStoreTree().then(res => {
+        this.storeTreeDate = res.data
+      })
       // 如果是空标识添加
       if (this.BaseTool.Object.isBlank(record)) {
         this.modalTitle = '添加'
@@ -358,6 +369,9 @@ export default {
         this.$emit('ok')
       }
     },
+    handleStoreChange (value) {
+      this.storeId = value
+    },
     handleStoreSelect () {
       this.$refs.storeSelectModal.base({}, { filter: -1 })
     },
@@ -424,7 +438,7 @@ export default {
         this.$message.error('请先选择入库仓库')
         return
       }
-      this.$refs.spareStoreSelectModal.base({}, { storeId: this.storeId })
+      this.$refs.spareStoreSelectModal.base()
     },
     handleSpareStoreSelected (record, keys, rows) {
       const { data } = this

src/views/store/outstoredetail/OutStoreDetail.vue

@@ -99,10 +99,10 @@ export default {
             return record.storeName
           }
         },
-        {
+/*        {
           title: '备件编号',
           dataIndex: 'spareNo'
-        },
+        },*/
         {
           title: '备件名称',
           dataIndex: 'spareId',
@@ -141,6 +141,8 @@ export default {
           ...parameter,
           ...this.queryParam,
           dataScope: {
+            sortBy: 'desc',
+            sortName: 'created_time'
           }
         }
         return getOutStoreDetailPage(Object.assign(parameter, this.queryParam))

src/views/store/outstoreform/modules/BaseForm.vue

@@ -18,7 +18,7 @@
               v-decorator="['outNo', {rules: [{required: false, message: '出库单号不能为空'}]}]" />
           </a-form-item>
         </a-col>
-        <a-col :lg="12" :md="24" :sm="24">
+<!--        <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="领用/退货单号"
             :labelCol="BaseTool.Constant.labelCol"
@@ -37,20 +37,26 @@
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-input
-              disabled
-              style="width:70%"
-              v-decorator="['storeName', {rules: [{required: true, message: '仓库不能为空'}]}]" />
-            <a-button type="primary" style="width:30%" @click="handleStoreSelect">选择仓库</a-button>
+            <a-tree-select
+              style="width: 100%"
+              @change="handleStoreChange"
+              :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+              :treeData="storeTreeDate"
+              :treeNodeFilterProp="'title'"
+              :showSearch="true"
+              v-decorator="['storeId', {rules: [{required: false, message: '仓库不能为空'}]}]"
+              placeholder="请选择"
+            >
+            </a-tree-select>
           </a-form-item>
-        </a-col>
+        </a-col>-->
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="出库类型"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select @change="typeChange" v-decorator="['type', {rules: [{required: true, message: '出库类型不能为空'}]}]" placeholder="请选择">
+            <a-select @change="typeChange" v-decorator="['type', {initValue: 1, rules: [{required: true, message: '出库类型不能为空'}]}]" placeholder="请选择">
               <a-select-option
                 v-for="(label,value) in typeMap"
                 :key="value"
@@ -60,7 +66,7 @@
             </a-select>
           </a-form-item>
         </a-col>
-        <a-col :lg="12" :md="24" :sm="24">
+<!--        <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="操作人"
             :labelCol="BaseTool.Constant.labelCol"
@@ -75,7 +81,7 @@
               </a-select-option>
             </a-select>
           </a-form-item>
-        </a-col>
+        </a-col>-->
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="操作时间"
@@ -85,7 +91,7 @@
             <a-date-picker
               style="width: 100%"
               :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
-              v-decorator="['userTime']" />
+              v-decorator="['userTime', {rules: [{required: true, message: '操作时间不能为空'}]}]" />
           </a-form-item>
         </a-col>
         <a-col :lg="12" :md="24" :sm="24">
@@ -165,8 +171,9 @@ import DetailBaseForm from './DetailBaseForm'
 import StoreSelectModal from '@/views/store/store/modules/StoreSelectModal'
 import SpareStoreSelectModal from '@/views/store/sparestore/modules/SpareStoreSelectModal'
 import BaseFormForModify from '@/views/store/outstoredetail/modules/BaseFormForModify'
-import BaseTool from "@/utils/tool";
-import {queryUsersByParentDeptNatureAll} from "@/api/upms/user";
+import BaseTool from '@/utils/tool'
+import { queryUsersByParentDeptNatureAll } from '@/api/upms/user'
+import { fetchStoreTree } from '@/api/store/store'
 
 export default {
   name: 'BaseOutStoreForm',
@@ -237,6 +244,10 @@ export default {
             return this.BaseTool.Amount.formatter(text)
           }
         },
+        {
+          title: '所在仓库',
+          dataIndex: 'storeName'
+        },
         {
           title: '操作',
           key: 'action',
@@ -245,6 +256,7 @@ export default {
         }
       ],
       data: [],
+      storeTreeDate: [],
       userList: {},
       user: this.$store.getters.userInfo,
       selectedRowKeys: [],
@@ -276,6 +288,9 @@ export default {
       queryUsersByParentDeptNatureAll(params).then(res => {
         this.userList = res.data
       })
+      fetchStoreTree().then(res => {
+        this.storeTreeDate = res.data
+      })
       // 如果是空标识添加
       if (this.BaseTool.Object.isBlank(record)) {
         this.modalTitle = '添加'
@@ -418,7 +433,7 @@ export default {
       this.data = data.filter(item => id !== item.id)
     },
     handleSpareStoreSelect () {
-      this.$refs.spareStoreSelectModal.base({}, { storeId: this.storeId, num: 0 })
+      this.$refs.spareStoreSelectModal.base({}, { num: 0 })
     },
     handleSpareStoreSelected (record, keys, rows) {
       const { data } = this
@@ -434,10 +449,15 @@ export default {
           const selectData = rows[i]
           selectData.num = 1
           selectData.totalPrice = selectData.price
+          selectData.storeId = rows[i].storeId
+          selectData.storeName = rows[i].storeName
           data.push(selectData)
         }
       }
     },
+    handleStoreChange (value) {
+      this.storeId = value
+    },
     handleBaseFormForModifySelect (record) {
       this.$refs.baseFormForModify.base(record)
     },

src/views/store/outstoreform/modules/Detail.vue

@@ -14,10 +14,10 @@
     <detail-list title="" :col="3">
       <detail-list-item term="出库单号">{{ model.outNo }}</detail-list-item>
       <detail-list-item term="出库类型">{{ BaseTool.Object.getField(typeMap,model.type) }}</detail-list-item>
-      <detail-list-item term="仓库">{{ model.storeName }}</detail-list-item>
+<!--      <detail-list-item term="仓库">{{ model.storeName }}</detail-list-item>-->
       <detail-list-item term="总价">{{ model.totalPrice }}</detail-list-item>
-      <detail-list-item term="领用/退货单id">{{ model.pickId }}</detail-list-item>
-      <detail-list-item term="领用/退货单号">{{ model.pickNo }}</detail-list-item>
+<!--      <detail-list-item term="领用/退货单id">{{ model.pickId }}</detail-list-item>
+      <detail-list-item term="领用/退货单号">{{ model.pickNo }}</detail-list-item>-->
       <detail-list-item term="状态"><badge :text="BaseTool.Object.getField(statusMap,model.status)" :status="statusMap[model.status]"/></detail-list-item>
       <detail-list-item term="创建人">{{ model.createdUserName }}</detail-list-item>
       <detail-list-item term="更新人">{{ model.updateUserName }}</detail-list-item>

src/views/store/sparestore/CompanySpareStore.vue

@@ -1,17 +0,0 @@
-<template>
-  <SpareStore :filter="3"/>
-</template>
-
-<script>
-import SpareStore from './SpareStore'
-export default {
-  name: 'CompanySpareStore',
-  components: {
-    SpareStore
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/views/store/sparestore/CompanySpareStoreTotal.vue

@@ -1,17 +0,0 @@
-<template>
-  <SpareStoreTotal :filter="3"/>
-</template>
-
-<script>
-import SpareStoreTotal from './SpareStoreTotal'
-export default {
-  name: 'MySpareStoreTotal',
-  components: {
-    SpareStoreTotal
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/views/store/sparestore/ProjectSpareStore.vue

@@ -1,17 +0,0 @@
-<template>
-  <SpareStore :filter="2"/>
-</template>
-
-<script>
-import SpareStore from './SpareStore'
-export default {
-  name: 'ProjectSpareStore',
-  components: {
-    SpareStore
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/views/store/sparestore/ProjectSpareStoreTotal.vue

@@ -1,17 +0,0 @@
-<template>
-  <SpareStoreTotal :filter="2"/>
-</template>
-
-<script>
-import SpareStoreTotal from './SpareStoreTotal'
-export default {
-  name: 'MySpareStoreTotal',
-  components: {
-    SpareStoreTotal
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/views/store/sparestore/SpareStoreTotal.vue

@@ -32,20 +32,20 @@
               </a-select>
             </a-form-item>
           </a-col>
-           <a-col :md="6" :sm="24">
-              <a-form-item label="备件类别">
-                <a-tree-select
-                  style="width: 100%"
-                  :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
-                  :treeData="spareTypeTreeData"
-                  :treeNodeFilterProp="'title'"
-                  :showSearch="true"
-                  v-model="queryParam.typeId"
-                  placeholder="请选择"
-                >
-                </a-tree-select>
-              </a-form-item>
-            </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="备件类别">
+              <a-tree-select
+                style="width: 100%"
+                :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+                :treeData="spareTypeTreeData"
+                :treeNodeFilterProp="'title'"
+                :showSearch="true"
+                v-model="queryParam.typeId"
+                placeholder="请选择"
+              >
+              </a-tree-select>
+            </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>
@@ -94,11 +94,11 @@ import { STable, Ellipsis } from '@/components'
 import BaseForm from './modules/BaseForm'
 import Detail from './modules/Detail'
 import { fetchSpareTypeTree } from '@/api/sqarepartmanage/sparetype'
-import { queryDept,getDeptsAllByParentId } from '@/api/upms/dept'
+import { queryDept, getDeptsAllByParentId } from '@/api/upms/dept'
 import { getSpareStoreTotalPage, deleteSpareStores, fetchSpareStore, exportSpareStore } from '@/api/store/sparestore'
 
 export default {
-  name: 'SpareStoreList',
+  name: 'SpareStoreTotal',
   components: {
     STable,
     Ellipsis,
@@ -109,6 +109,14 @@ export default {
     filter: {
       type: Number,
       default: -1
+    },
+    minStock: {
+      type: Boolean,
+      default: true
+    },
+    maxStock: {
+      type: Boolean,
+      default: null
     }
   },
   data () {
@@ -118,7 +126,9 @@ export default {
       spareTypeTreeData: [],
       // 查询参数
       queryParam: {
-        filter: this.filter
+        filter: this.filter,
+        minStock: this.minStock,
+        maxStock: this.maxStock
       },
       // 表头
       columns: [
@@ -149,22 +159,30 @@ export default {
           title: '单价',
           dataIndex: 'price'
         },
+        {
+          title: '最低库存',
+          dataIndex: 'minStock'
+        },
+        {
+          title: '最高库存',
+          dataIndex: 'maxStock'
+        },
         {
           title: '总库存',
           dataIndex: 'totalStock'
         }
 
-        //{
-         // title: '创建日期',
-         // dataIndex: 'createdTime'
-        //},
-        //{
-         // title: '操作',
-         // key: 'action',
-         // width: '200px',
-         // align: 'center',
-          //scopedSlots: { customRender: 'action' }
-       // }
+        // {
+        // title: '创建日期',
+        // dataIndex: 'createdTime'
+        // },
+        // {
+        // title: '操作',
+        // key: 'action',
+        // width: '200px',
+        // align: 'center',
+        // scopedSlots: { customRender: 'action' }
+        // }
       ],
       // 下拉框map
       delFlagMap: {},
@@ -206,8 +224,8 @@ export default {
     })
   },
   methods: {
-    handleCompanyChange(value) {
-      getDeptsAllByParentId({ deptId: value, nature: this.DictCache.VALUE.SYS_DEPT_NATURE.XIANG_MU_BU}).then(res => {
+    handleCompanyChange (value) {
+      getDeptsAllByParentId({ deptId: value, nature: this.DictCache.VALUE.SYS_DEPT_NATURE.XIANG_MU_BU }).then(res => {
         this.projectList = res.data
       })
     },
@@ -274,7 +292,9 @@ export default {
     },
     resetSearchForm () {
       this.queryParam = {
-        filter: this.filter
+        filter: this.filter,
+        minStock: this.minStock,
+        maxStock: this.maxStock
       }
       this.$refs.table.refresh(true)
     },
@@ -282,12 +302,12 @@ export default {
       const parameter = {
         ...this.queryParam
       }
-      if(this.queryParam.useCompany == null){
-        this.$message.error("请先选择分公司")
+      if (this.queryParam.useCompany == null) {
+        this.$message.error('请先选择分公司')
         return
       }
-      if(this.queryParam.useProject == null){
-        this.$message.error("请先选择项目部")
+      if (this.queryParam.useProject == null) {
+        this.$message.error('请先选择项目部')
         return
       }
       exportSpareStore(parameter).then(file => {

src/views/store/sparestore/SpareStoreTotalMinStock.vue

@@ -0,0 +1,19 @@
+<template>
+  <SpareStoreTotal :min-stock="true"/>
+</template>
+
+<script>
+import SpareStore from './SpareStoreTotal'
+import SpareStoreTotal from '@/views/store/sparestore/SpareStoreTotal'
+export default {
+  name: 'SpareStoreTotalMinStock',
+  components: {
+    SpareStoreTotal,
+    SpareStore
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -9,7 +9,7 @@
   >
     <a-card :bordered="false">
       <a-row :gutter="8">
-        <a-col :span="5">
+<!--        <a-col :span="5">
           <a-tree
             @expand="onExpand"
             :expandedKeys="expandedKeys"
@@ -18,14 +18,38 @@
             :selectedKeys="selectedKeys"
             :treeData="spareTypeTreeData"
           />
-        </a-col>
-        <a-col :span="19">
+        </a-col>-->
+        <a-col :span="24">
           <div class="table-page-search-wrapper">
             <a-form layout="inline">
               <a-row :gutter="48">
                 <a-col :md="8" :sm="24">
                   <a-form-item label="关键字">
-                    <a-input v-model="queryParam.keyword" placeholder="请输入名称/类型名称"/>
+                    <a-input v-model="queryParam.keyword" placeholder="请输入备件名称"/>
+                  </a-form-item>
+                </a-col>
+                <a-col :md="8" :sm="24">
+                  <a-form-item label="类型">
+                    <a-tree-select
+                      style="width: 100%"
+                      :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+                      :treeData="spareTypeTreeData"
+                      :treeNodeFilterProp="'title'"
+                      :showSearch="true"
+                      v-model="queryParam.typeId"
+                      placeholder="请选择"
+                    >
+                    </a-tree-select>
+                  </a-form-item>
+                </a-col>
+                <a-col :md="8" :sm="24">
+                  <a-form-item label="规格型号">
+                    <a-input v-model="queryParam.ggxh" placeholder="模糊查询"/>
+                  </a-form-item>
+                </a-col>
+                <a-col :md="8" :sm="24">
+                  <a-form-item label="原厂编号">
+                    <a-input v-model="queryParam.initNo" placeholder="模糊查询"/>
                   </a-form-item>
                 </a-col>
                 <a-col :md="8 || 24" :sm="24">
@@ -142,10 +166,10 @@ export default {
           title: '原厂编号',
           dataIndex: 'initNo'
         },
-        // {
-        //  title: '仓库名称',
-        //  dataIndex: 'storeName'
-        // },
+        {
+          title: '仓库名称',
+          dataIndex: 'storeName'
+        },
         {
           title: '库存数量',
           dataIndex: 'num'
@@ -284,11 +308,11 @@ export default {
       if (this.selectedRowKeys.length === 0) {
         this.$message.warn('请至少选择一项信息')
       } else {
-        /*console.log(this.selectedRows[0].num)
+        /* console.log(this.selectedRows[0].num)
          if (this.selectedRows[0].num == 0) {
          this.$message.error('不能选择库存为0的物品，请重新选择')
          return
-       }*/
+       } */
         this.confirmLoading = true
         this.$emit('selected', this.record, this.selectedRowKeys, this.selectedRows)
         this.confirmLoading = false