完善

src/views/preparation/preparation/Preparation.vue

@@ -57,7 +57,7 @@
               v-if="$auth('preparation-preparations-edit')"
               @click="handleEdit(record)"
             >修改</operation-button>-->
-<!--            <a-divider v-if="record.status === 1" type="vertical" />-->
+            <!--            <a-divider v-if="record.status === 1" type="vertical" />-->
             <a-divider type="vertical" />
             <a @click="handlePrint(record)">打印</a>
           </template>
@@ -294,11 +294,10 @@ export default {
     },
     handlePrint (record) {
       this.visible = false
-      console.log(record)
-      // fetchOutStoreForm({ id: record.id }).then(res => {
-      const modal = this.$refs.ticketForm
-      modal.base(record)
-      // })
+      fetchPreparation({ id: record.id }).then(res => {
+        const modal = this.$refs.ticketForm
+        modal.base(res.data)
+      })
     }
   }
 }

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

@@ -1,7 +1,7 @@
 <template>
   <a-card :bordered="false" v-show="visible" class="card" :title="modalTitle">
-    <a-row :gutter="48" slot="extra">
-    </a-row>
+    <title-divider title="基本信息" width="90px"></title-divider>
+
     <a-descriptions :column="3" bordered>
       <a-descriptions-item label="任务名称">{{ model.name }}</a-descriptions-item>
       <a-descriptions-item label="单据号">{{ model.no }}</a-descriptions-item>
@@ -39,17 +39,23 @@
           </viewer></div>
         <div v-if="model.imageList == null || model.imageList.length === 0"> 暂无</div>
       </a-descriptions-item>
-      <a-descriptions-item label="费用文件">
+      <a-descriptions-item label="费用文件" :span="3">
         <a v-for="item in model.fileList" :key="item.id" :href="item.url" target="downloadFile" :download="item.name">{{ item.name }}</a>
       </a-descriptions-item>
+
     </a-descriptions>
+    <title-divider title="审核流程" width="90px"></title-divider>
+    <a-steps :current="model.recordList.length-1" direction="vertical">
+      <a-step v-for="item in model.recordList" :key="item.id" :title="item.realName" :sub-title="item.createdTime" :description="item.remark" />
+    </a-steps>
     <div class="btn">
       <a-button style="margin-left: 8px" type="primary" @click="handleCancel">返回</a-button>
-      <a-button v-if="DictCache.VALUE.REPAIR_PREPARATION_STATUS.NOT_ALLOCATED === model.status ||
-      DictCache.VALUE.REPAIR_PREPARATION_STATUS.APPLY_MANAGER_VERIFY_SUCCESS === model.status"
-                style="margin-left: 16px"
-                type="default"
-                @click="handleVerify()">审核</a-button>
+      <a-button
+        v-if="DictCache.VALUE.REPAIR_PREPARATION_STATUS.NOT_ALLOCATED === model.status ||
+          DictCache.VALUE.REPAIR_PREPARATION_STATUS.APPLY_MANAGER_VERIFY_SUCCESS === model.status"
+        style="margin-left: 16px"
+        type="default"
+        @click="handleVerify()">审核</a-button>
       <a-button v-if="DictCache.VALUE.REPAIR_PREPARATION_STATUS.WAIT_DISPATCH === model.status " style="margin-left: 16px" type="default" @click="handleAssign">派单</a-button>
       <a-button v-if="DictCache.VALUE.REPAIR_PREPARATION_STATUS.PROCESSING === model.status" style="margin-left: 8px" type="default" @click="handleFinish()">完成维修</a-button>
     </div>
@@ -165,7 +171,7 @@ export default {
 .btn{
   position: fixed;
   bottom: 50px;
-  width: 100%;
+  width: 80%;
   display: flex;
   justify-content: center;
 }

src/views/preparation/preparation/modules/TicketForm.vue

@@ -9,56 +9,56 @@
         <div style="font-size:26px;"><span style="font-size:30px;font-weight:700;vertical-align: middle;letter-spacing:.2em;">工作联络单</span></div>
       </div>
       <div style="display:flex;justify-content:space-between; margin: 10px auto;width: 830px;">
-        <div>申请人：{{ model.userName }}</div>
-        <div>申请部门：{{ model.userName }}</div>
-        <div>日期：{{ model.userName }}</div>
-        <div>单号：{{ model.userName }}</div>
+        <div>申请人：{{ model.createdUserName }}</div>
+        <div>申请部门：{{ model.deptName }}</div>
+        <div>日期：{{ BaseTool.Date.formatter(new Date, BaseTool.Date.PICKER_NORM_DATE_PATTERN) }}</div>
+        <div>单号：{{ model.no }}</div>
       </div>
       <div class="tables" >
         <table>
           <tr>
             <td colspan="2" style="text-align:left;">
-              公司：{{ model.userName }}
+              公司：{{ BaseTool.Object.getField(preparationMap,model.parentPositionId) }}
             </td>
             <td colspan="2" style="text-align:left;">
-              收件部门：{{ model.userName }}
+              收件部门：{{ model.receiveDeptName }}
             </td>
           </tr>
           <tr>
             <td colspan="2" style="text-align:left;">
-              任务名称：{{ model.userName }}
+              任务名称：{{ model.name }}
             </td>
             <td colspan="2" style="text-align:left;">
-              要求完成：{{ model.userName }}
+              要求完成：{{ model.limitHours }}
             </td>
           </tr>
           <tr>
             <td colspan="4" style="text-align:left;">
-              任务内容：{{ model.userName }}
+              任务内容：{{ model.content }}
             </td>
           </tr>
           <tr>
             <td colspan="4" style="text-align:left;">
-              申请原因：{{ model.userName }}
+              申请原因：{{ model.applyReason }}
             </td>
           </tr>
           <tr>
             <td colspan="1" style="text-align:left;">
-              承办人：{{ model.userName }}
+              承办人：{{ model.repairUserName }}
             </td>
             <td colspan="1" style="text-align:left;">
-              承办部门：{{ model.userName }}
+              承办部门：{{ model.executeDeptName }}
             </td>
             <td colspan="1" style="text-align:left;">
-              处理日期：{{ model.userName }}
+              处理日期：{{ model.repairStartTime }}
             </td>
             <td colspan="1" style="text-align:left;">
-              费用预算：{{ model.userName }}
+              费用预算：{{ model.fee }}
             </td>
           </tr>
           <tr>
             <td colspan="4" style="text-align:left;">
-              费用计算表：{{ model.userName }}
+              费用计算表：<a v-for="item in model.fileList" :key="item.id" :href="item.url" target="downloadFile" :download="item.name">{{ item.name }}</a>
             </td>
           </tr>
           <tr>
@@ -66,11 +66,8 @@
               处理人意见区： <br />
               <br />
               <div style="padding-left:30px;">
-                <a-steps :current="2" direction="vertical">
-                  <a-step title="Finished" :sub-title="2" description="This is a description. This is a description." />
-                  <a-step title="In Progress" description="This is a description. This is a description." />
-                  <a-step title="Waiting" description="This is a description." />
-                  <a-step title="Waiting" description="This is a description." />
+                <a-steps :current="model.recordList.length-1" direction="vertical">
+                  <a-step v-for="item in model.recordList" :key="item.id" :title="item.realName" :sub-title="item.createdTime" :description="item.remark" />
                 </a-steps>
               </div>
             </td>
@@ -90,7 +87,7 @@ export default {
       value1: 1,
       type: true,
       typeMap: {},
-      deptYYMap: {},
+      preparationMap: {},
       model: {
         userName: 2
       }
@@ -99,7 +96,7 @@ export default {
   created () {
     // 下拉框map
     // this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.OUT_STORE_FORM_TYPE)
-    this.deptYYMap = { ...this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.OUT_STORE_FORM_DEPT_CODE), ...this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBB) }
+    this.preparationMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.PREPARATION_PARENT)
   },
   methods: {
     base (record) {