Merge branch 'demo_' of http://123.60.19.203:8088/hitch/hitch-antd into demo_

src/router/generator-platform-routers.js

@@ -79,13 +79,17 @@ const constantRouterComponents = {
   'SpareType': () => import('@/views/sqarepartmanage/sparetype/SpareType'),
   // 备件基础信息和报表
   'SparePartInfo': () => import('@/views/sqarepartmanage/sparepartinfo/SparePartInfo'),
-  'SparePartInfoCheckWarn': () => import('@/views/sqarepartmanage/sparepartinfo/SpareStoreTotalCheckStock'),
   'SparePartInfoPrint': () => import('@/views/sqarepartmanage/sparepartinfo/SparePartInfoPrint'),
   'SparePartMonthReport': () => import('@/views/sqarepartmanage/report/SparePartMonthReport'),
-  // 备件库存汇总
-  'SpareStoreTotal': () => import('@/views/sqarepartmanage/sparepartinfo/SpareStoreTotal'),
-  // 备件库存汇总预警
-  'SpareStoreTotalMinStock': () => import('@/views/sqarepartmanage/sparepartinfo/SpareStoreTotalMinStock'),
+  // 备件库存汇总、备件库存汇总预警、备件保养预警（已废弃，改成备件更换预警）
+  'SparePartTotal': () => import('@/views/sqarepartmanage/sparepartinfo/SparePartTotal'),
+  'SparePartTotalMinStock': () => import('@/views/sqarepartmanage/sparepartinfo/SparePartTotalMinStock'),
+  'SparePartTotalCheckStock': () => import('@/views/sqarepartmanage/sparepartinfo/SparePartTotalCheckStock'),
+
+  // 仓库汇总、仓库备件库存汇总（单个仓库的）
+  'SpareStoreTotal': () => import('@/views/store/sparestore/SpareStoreTotal'),
+  'SpareStoreTotalMinStock': () => import('@/views/store/sparestore/SpareStoreTotalMinStock'),
+
   // 备件使用信息
   'SparePartUsed': () => import('@/views/sqarepartmanage/sparepartused/SparePartUsed'),
   'SbInfoStopDetail': () => import('@/views/sb/stop-detail/SbInfoStopDetail'),

src/utils/dict.js

@@ -95,6 +95,7 @@ DictCache.TYPE = {
   SB_MEASURE_RESULT: 'SB_MEASURE_RESULT', // 检定结论
   SB_INFO_STATUS: 'SB_INFO_STATUS', // 设备状态
   SPARE_WARN_STATUS: 'SPARE_WARN_STATUS', // 备件库存不足预警状态
+  STORE_SPARE_WARN_STATUS: 'STORE_SPARE_WARN_STATUS', // 仓库备件库存不足预警状态
   SB_MEASURE_STATUS: 'SB_MEASURE_STATUS', // 检定设备状态
   SBTYPE_SOURCETYPE: 'SBTYPE_SOURCETYPE', // 设备来源方式
   SBINFO_UNIT: 'SBINFO_UNIT', // 计量单位

src/views/sqarepartmanage/sparepartinfo/SparePartTotalCheckStock.vue

@@ -0,0 +1,17 @@
+<template>
+  <SparePartTotal :forecast-status-list="[1,2,3]"/>
+</template>
+
+<script>
+import SparePartTotal from '@/views/sqarepartmanage/sparepartinfo/SparePartTotal'
+export default {
+  name: 'SparePartTotalCheckStock',
+  components: {
+    SparePartTotal
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/sqarepartmanage/sparepartinfo/SparePartTotalMinStock.vue

@@ -0,0 +1,17 @@
+<template>
+  <SpareStoreTotal :warn-status-list="[1,2,3]"/>
+</template>
+
+<script>
+import SparePartTotal from '@/views/sqarepartmanage/sparepartinfo/SparePartTotal'
+export default {
+  name: 'SparePartTotalMinStock',
+  components: {
+    SparePartTotal
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/sqarepartmanage/sparepartinfo/SpareStoreTotalCheckStock.vue

@@ -1,19 +0,0 @@
-<template>
-  <SpareStoreTotal :forecast-status-list="[1,2,3]"/>
-</template>
-
-<script>
-import SpareStore from './SpareStoreTotal'
-import SpareStoreTotal from '@/views/sqarepartmanage/sparepartinfo/SpareStoreTotal'
-export default {
-  name: 'SpareStoreTotalMinStock',
-  components: {
-    SpareStoreTotal,
-    SpareStore
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/views/sqarepartmanage/sparepartinfo/SpareStoreTotalMinStock.vue

@@ -1,19 +0,0 @@
-<template>
-  <SpareStoreTotal :warn-status-list="[1,2,3]"/>
-</template>
-
-<script>
-import SpareStore from './SpareStoreTotal'
-import SpareStoreTotal from '@/views/sqarepartmanage/sparepartinfo/SpareStoreTotal'
-export default {
-  name: 'SpareStoreTotalMinStock',
-  components: {
-    SpareStoreTotal,
-    SpareStore
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

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

@@ -106,10 +106,10 @@ export default {
         'purchasePeriod': null,
         'usePeriod': null,
         'agePeriod': null,
-        'maxStock': null,
         'qrCode': null,
         'applicationFileList': [],
         'minStock': null,
+        'maxStock': null,
         'image': null,
         'initStock': null,
         'params': null,

src/views/store/sparestore/SpareStore.vue

@@ -88,6 +88,8 @@
               <a @click="handleView(record)">查看</a>
               <!--              <a-divider type="vertical" />
               <a v-if="$auth('store-spare-stores-edit')" @click="handleEdit(record)">出入库详情</a>-->
+              <a-divider v-if="$auth('store-spare-stores-edit')" type="vertical" />
+              <a v-if="$auth('store-spare-stores-edit')" @click="handleEdit(record)">修改</a>
             </template>
           </span>
           <span slot="delFlag" slot-scope="text">
@@ -173,6 +175,14 @@ export default {
           title: '库存总价',
           dataIndex: 'totalPrice'
         },
+        {
+          title: '仓库最高库存',
+          dataIndex: 'maxStock'
+        },
+        {
+          title: '仓库最低库存',
+          dataIndex: 'minStock'
+        },
         // {
         // title: '创建日期',
         // dataIndex: 'createdTime'

src/views/store/sparestore/SpareStoreTotal.vue

@@ -63,6 +63,11 @@
           :status="DictCache.COLOR.DELFLAG[text]"
           :text="delFlagMap[text]" />
       </span>
+      <span slot="status" slot-scope="text">
+        <badge
+          :status="DictCache.COLOR.SPARE_WARN_STATUS[text]"
+          :text="warnStatusMap[text]" />
+      </span>
     </s-table>
     <base-form ref="baseModal" @ok="handleOk"/>
     <detail ref="detailModal"/>
@@ -96,12 +101,8 @@ export default {
       type: Number,
       default: -1
     },
-    minStock: {
-      type: Boolean,
-      default: true
-    },
-    maxStock: {
-      type: Boolean,
+    warnStatusList: {
+      type: Array,
       default: null
     }
   },
@@ -109,12 +110,12 @@ export default {
     return {
       companyList: {},
       projectList: {},
+      warnStatusMap: {},
       spareTypeTreeData: [],
       // 查询参数
       queryParam: {
         filter: this.filter,
-        minStock: this.minStock,
-        maxStock: this.maxStock
+        warnStatusList: this.warnStatusList
       },
       // 表头
       columns: [
@@ -173,6 +174,12 @@ export default {
             }
           }
         },
+        {
+          title: '状态',
+          checked: true,
+          dataIndex: 'warnStatus',
+          scopedSlots: { customRender: 'status' }
+        },
         {
           title: '操作',
           checked: true,
@@ -212,6 +219,7 @@ export default {
   },
   created () {
     // 下拉框map
+    this.warnStatusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.STORE_SPARE_WARN_STATUS)
     this.delFlagMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.DELFLAG)
     this.tableOption()
     queryDept({ nature: this.DictCache.VALUE.SYS_DEPT_NATURE.FEN_GONG_SI }).then(res => {
@@ -303,8 +311,7 @@ export default {
     resetSearchForm () {
       this.queryParam = {
         filter: this.filter,
-        minStock: this.minStock,
-        maxStock: this.maxStock
+        warnStatusList: this.warnStatusList
       }
       this.$refs.table.refresh(true)
     },

src/views/store/sparestore/SpareStoreTotalMinStock.vue

@@ -1,5 +1,5 @@
 <template>
-  <SpareStoreTotal :min-stock="true"/>
+  <SpareStoreTotal :warn-status-list="[1,2,3]"/>
 </template>
 
 <script>

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

@@ -88,6 +88,26 @@
           :min="0"
           v-decorator="['initPurchasePrice', {rules: [{required: true, message: '采购价不能为空'}]}]" />
       </a-form-item>
+      <a-form-item
+        label="最高库存"
+        :labelCol="BaseTool.Constant.labelCol"
+        :wrapperCol="BaseTool.Constant.wrapperCol"
+      >
+        <a-input-number
+          style="width: 100%"
+          :min="0"
+          v-decorator="['maxStock']" />
+      </a-form-item>
+      <a-form-item
+        label="最低库存"
+        :labelCol="BaseTool.Constant.labelCol"
+        :wrapperCol="BaseTool.Constant.wrapperCol"
+      >
+        <a-input-number
+          style="width: 100%"
+          :min="0"
+          v-decorator="['minStock']" />
+      </a-form-item>
       <a-form-item
         label="排序"
         :labelCol="BaseTool.Constant.labelCol"
@@ -201,8 +221,11 @@ export default {
           'initPrice',
           'initPurchasePrice',
           'sort',
+          'maxStock',
+          'minStock',
           'delFlag',
           'remark'
+
         ])))
       })
     },

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

@@ -14,6 +14,8 @@
       <detail-list-item term="价格">{{ model.price }}</detail-list-item>
       <detail-list-item term="初始价">{{ model.initPrice }}</detail-list-item>
       <detail-list-item term="采购价">{{ model.initPurchasePrice }}</detail-list-item>
+      <detail-list-item term="最高库存">{{ model.maxStock }}</detail-list-item>
+      <detail-list-item term="最低库存">{{ model.minStock }}</detail-list-item>
 <!--      <detail-list-item term="排序">{{ model.sort }}</detail-list-item>
       <detail-list-item term="创建人">{{ model.createdUserName }}</detail-list-item>
       <detail-list-item term="更新人">{{ model.updateUserName }}</detail-list-item>-->
@@ -58,6 +60,8 @@ export default {
         'initPurchasePrice': null,
         'sort': null,
         'delFlag': null,
+        'minStock': null,
+        'maxStock': null,
         'remark': null,
         'createdUserId': null,
         'updateUserId': null,