筹建完善

src/router/generator-platform-routers.js

@@ -379,7 +379,9 @@ const constantRouterComponents = {
   'Information': () => import('@/views/qykh/information/Information'),
   'InformationHelp': () => import('@/views/qykh/information-help/InformationHelp'),
   // 筹建管理
-  'Preparation': () => import('@/views/preparation/preparation/Preparation'),
+  'PreparationAll': () => import('@/views/preparation/preparation/PreparationAll'),
+  'PreparationMine': () => import('@/views/preparation/preparation/PreparationMine'),
+  'PreparationDispatch': () => import('@/views/preparation/preparation/PreparationDispatch'),
   // 工器具管理
   'Tool': () => import('@/views/tool/tool/Tool'),
   'ToolWaitCheck': () => import('@/views/tool/tool/ToolWaitCheck'),

src/utils/dict.js

@@ -358,6 +358,7 @@ DictCache.VALUE = {
     SB_ALLOCATE: 4,
     SB_OIL: 5,
     SB_SCRAP: 16,
+    PREPARATION_REPAIR: 8,
     /**
      * 采购总需求计划审批提醒
      */

src/views/preparation/preparation/Preparation.vue

@@ -57,12 +57,13 @@
       >
         <span slot="action" slot-scope="record">
           <template>
-            <a @click="handleView(record)">主页数据</a><a-divider type="vertical" />
+            <a @click="handleView(record)">主页数据</a>
 <!--            <operation-button
               v-if="$auth('preparation-preparations-edit')"
               @click="handleEdit(record)"
             >修改</operation-button>-->
-            <a @click="handleAssign(record)">派单</a>
+            <a-divider v-if="record.status === 1" type="vertical" />
+            <a v-if="record.status === 1" @click="handleAssign(record)">派单</a>
           </template>
         </span>
         <span slot="status" slot-scope="text">
@@ -91,6 +92,12 @@ export default {
     Detail,
     AssignForm
   },
+  props: {
+    searchType: {
+      type: Number,
+      default: -1
+    }
+  },
   data () {
     return {
       advanced: false,
@@ -98,6 +105,7 @@ export default {
       statusMap: {},
       // 查询参数
       queryParam: {
+        searchType: this.searchType
       },
       // 表头
       columns: [
@@ -172,7 +180,7 @@ export default {
           ...this.queryParam,
           dataScope: {
             sortBy: 'desc',
-            sortName: 'update_time'
+            sortName: 'created_time'
           }
         }
         return getPreparationPage(Object.assign(parameter, this.queryParam))

src/views/preparation/preparation/PreparationAll.vue

@@ -0,0 +1,17 @@
+<template>
+  <Preparation :search-type="-1"/>
+</template>
+
+<script>
+import Preparation from './Preparation'
+export default {
+  name: 'PreparationAll',
+  components: {
+    Preparation
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/preparation/preparation/PreparationDispatch.vue

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

src/views/preparation/preparation/PreparationMine.vue

@@ -0,0 +1,17 @@
+<template>
+  <Preparation :search-type="1"/>
+</template>
+
+<script>
+import Preparation from './Preparation'
+export default {
+  name: 'PreparationMine',
+  components: {
+    Preparation
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/preparation/preparation/modules/Detail.vue

@@ -1,11 +1,11 @@
 <template>
   <a-card :bordered="false" v-show="visible" class="card" :title="modalTitle">
     <a-row :gutter="48" slot="extra">
-      <a-col :md="48" :sm="48">
+<!--      <a-col :md="48" :sm="48">
               <span class="table-page-search-submitButtons" style="float: right">
                 <a-button style="margin-left: 8px" type="default" @click="handleCancel()">返回</a-button>
               </span>
-      </a-col>
+      </a-col>-->
     </a-row>
     <a-descriptions :column="3" bordered>
       <a-descriptions-item label="单据号">{{ model.no }}</a-descriptions-item>
@@ -129,3 +129,13 @@ export default {
   }
 }
 </script>
+<style lang="less" scoped>
+.btn{
+  position: fixed;
+  bottom: 50px;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+}
+::-webkit-scrollbar { width: 0; height: 0; color: transparent; }
+</style>

src/views/workplace/backlog/WorkplaceBacklog.vue

@@ -66,6 +66,7 @@
       <detail ref="detail" />
       <detail-repair-application-form ref="detailRepairApplicationFormModal" @ok="handleOk"/>
       <detail-repair-application-form-repair ref="detailRepairApplicationFormRepairModal" @ok="handleOk"/>
+      <detail-preparation-modal ref="detailPreparationModal" @ok="handleOk"/>
       <detail-repair-application-form-check ref="detailRepairApplicationFormCheckModal" @ok="handleOk"/>
       <detail-out-store ref="detailOutStoreModal" @ok="handleOk"/>
       <detail-spare-pick ref="detailSparePickModal" @ok="handleOk"/>
@@ -103,6 +104,8 @@ import { fetchSbAllocateApply } from '@/api/sb/allocate-apply'
 import SuplierAuditForm from '@/views/purchase/supplier/modules/AuditForm'
 import DetailAuditScrap from '@/views/sb/scrap/modules/DetailAuditScrap'
 import DetailScrap from '@/views/sb/scrap/modules/Detail'
+import DetailPreparationModal from '@/views/preparation/preparation/modules/Detail'
+import { fetchPreparation } from '@/api/preparation/preparation'
 
 export default {
   name: 'Workplace',
@@ -121,7 +124,8 @@ export default {
     SbAllocateApplyDetail,
     SuplierAuditForm,
     DetailAuditScrap,
-    DetailScrap
+    DetailScrap,
+    DetailPreparationModal
   },
   data () {
     return {
@@ -283,18 +287,6 @@ export default {
           const modal = this.$refs.detailRepairApplicationFormRepairModal
           modal.base(res.data)
         })
-        /*if (record.detailType === this.DictCache.getValueByCode(this.DictCache.TYPE.WORKPLACE_BACKLOG_DETAIL_TYPE, 'REPAIR_APPLICATION') ||
-          record.detailType === this.DictCache.getValueByCode(this.DictCache.TYPE.WORKPLACE_BACKLOG_DETAIL_TYPE, 'REPAIR_DISPATCH') ||
-          record.detailType === this.DictCache.getValueByCode(this.DictCache.TYPE.WORKPLACE_BACKLOG_DETAIL_TYPE, 'REPAIR_BACK') ||
-          record.detailType === this.DictCache.getValueByCode(this.DictCache.TYPE.WORKPLACE_BACKLOG_DETAIL_TYPE, 'REPAIR_RECEIVE') ||
-          record.detailType === this.DictCache.getValueByCode(this.DictCache.TYPE.WORKPLACE_BACKLOG_DETAIL_TYPE,'REPAIR_MANAGE_RECEIVE') ||
-          record.detailType === this.DictCache.getValueByCode(this.DictCache.TYPE.WORKPLACE_BACKLOG_DETAIL_TYPE, 'REPAIR_APPLICATION_STOP')) {
-          fetchRepairApplicationForm({ id: record.otherId }).then(res => {
-            this.visible = false
-            const modal = this.$refs.detailRepairApplicationFormRepairModal
-            modal.base(res.data)
-          })
-        }*/
         if (record.detailType === this.DictCache.getValueByCode(this.DictCache.TYPE.WORKPLACE_BACKLOG_DETAIL_TYPE, 'REPAIR_OK')) {
           fetchRepairApplicationForm({ id: record.otherId }).then(res => {
             this.visible = false
@@ -397,6 +389,18 @@ export default {
           }
           this.$refs.detailScrapModal.base(param)
         }
+      } else if (record.type === this.DictCache.VALUE.WORKPLACE_BACKLOG_TYPE.PREPARATION_REPAIR) {
+        // 已读
+        if (record.status === 1) {
+          updateWorkplaceBacklog({ id: record.backlogId }).then(res => {
+            record.status = 2
+          })
+        }
+        fetchPreparation({ id: record.otherId }).then(res => {
+          this.visible = false
+          const modal = this.$refs.detailPreparationModal
+          modal.base(res.data)
+        })
       } else if (record.type === this.DictCache.getValueByCode(this.DictCache.TYPE.WORKPLACE_BACKLOG_TYPE, 'FILL_TASK')) {
         console.log(record)
         this.$router.push('/sb/inspection/fill/task?id=' + record.targetId) // 跳转巡检