筹建

src/utils/dict.js

@@ -142,6 +142,7 @@ DictCache.TYPE = {
   REPAIR_APPLICATION_FORM_CATEGORY: 'REPAIR_APPLICATION_FORM_CATEGORY', // 维修类别
   REPAIR_APPLICATION_FORM_LEVEL: 'REPAIR_APPLICATION_FORM_LEVEL', // 紧急等级
   REPAIR_APPLICATION_FORM_STATUS: 'REPAIR_APPLICATION_FORM_STATUS', // 报修状态
+  REPAIR_PREPARATION_STATUS: 'REPAIR_PREPARATION_STATUS', // 报修状态
   REPAIR_REASON_STATUS: 'REPAIR_REASON_STATUS', // 分析措施状态
   REPAIR_REASON_TYPE: 'REPAIR_REASON_TYPE', // 分析措施类别
   REPAIR_QUESTION: 'REPAIR_QUESTION', // 故障描述
@@ -921,6 +922,12 @@ DictCache.VALUE = {
     CALLER_REPAIR_VERIFY_FAIL_THREE: 20, // 	计划报修三审被拒
     BIG_REPAIR_VERIFYING: 21 // 大修审核中
   },
+  REPAIR_PREPARATION_STATUS: {
+    NOT_ALLOCATED: 1, // 待分配
+    PROCESSING: 2, // 处理中
+    FINISHED: 3, // 已完成
+    CANCEL: 4 // 已取消
+  },
   /**
    * 维修状态
    */

src/views/preparation/preparation/Preparation.vue

@@ -52,26 +52,31 @@
         :data="loadData"
         :alert="options.alert"
         :rowSelection="options.rowSelection"
+        :scroll="{x: 1500, y: BaseTool.Constant.scrollY }"
         showPagination="auto"
       >
         <span slot="action" slot-scope="record">
           <template>
-            <a @click="handleView(record)">查看</a>
+            <a @click="handleView(record)">主页数据</a>
             <operation-button
               v-if="$auth('preparation-preparations-edit')"
               @click="handleEdit(record)"
             >修改</operation-button>
-            <operation-button
-              v-if="$auth('preparation-preparations-del')"
+<!--            <operation-button
+              v-if="record.status === 1"
               :type="2"
               title="是否要删除该条数据？"
-              @confirm="batchDelete(record.id)">删除</operation-button>
+              @confirm="batchDelete(record.id)">删除</operation-button>-->
           </template>
         </span>
+        <span slot="status" slot-scope="text">
+          <badge :text="BaseTool.Object.getField(statusMap,text)" :status="DictCache.COLOR.REPAIR_FORM_STATUS[text]"/>
+        </span>
       </s-table>
     </div>
     <base-form ref="baseModal" @ok="handleOk"/>
     <detail ref="detailModal" @ok="handleOk"/>
+    <assign-form ref="assignForm" @ok="handleOk" />
   </a-card>
 </template>
 
@@ -80,19 +85,21 @@ import { STable, Ellipsis } from '@/components'
 import BaseForm from './modules/BaseForm'
 import Detail from './modules/Detail'
 import { getPreparationPage, deletePreparations, fetchPreparation, exportPreparation } from '@/api/preparation/preparation'
-
+import AssignForm from './modules/AssignForm'
 export default {
   name: 'PreparationList',
   components: {
     STable,
     Ellipsis,
     BaseForm,
-    Detail
+    Detail,
+    AssignForm
   },
   data () {
     return {
       advanced: false,
       visible: true,
+      statusMap: {},
       // 查询参数
       queryParam: {
       },
@@ -101,89 +108,63 @@ export default {
         {
           title: '序号',
           dataIndex: 'index',
+          checked: true,
+          width: '70',
           customRender: (text, record, index) => {
             return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
           }
         },
         {
-          title: '设备型号',
-          dataIndex: 'positionId'
+          title: '申请人',
+          checked: true,
+          width: '150',
+          dataIndex: 'userName'
         },
         {
-          title: '申请人id',
-          dataIndex: 'userId'
+          title: '公司',
+          checked: true,
+          width: '150',
+          dataIndex: 'companyName'
         },
         {
           title: '申请部门',
-          dataIndex: 'departId'
-        },
-        {
-          title: '报修时间',
-          dataIndex: 'applyTime'
-        },
-        {
-          title: '问题描述',
-          dataIndex: 'content'
-        },
-        {
-          title: '报修状态',
-          dataIndex: 'status'
-        },
-        {
-          title: '备注',
-          dataIndex: 'remark'
-        },
-        {
-          title: '创建日期',
-          dataIndex: 'createdTime'
-        },
-        {
-          title: '创建人名称',
-          dataIndex: 'createdUserName'
-        },
-        {
-          title: '维修开始时间',
-          dataIndex: 'repairStartTime'
-        },
-        {
-          title: '维修结束时间',
-          dataIndex: 'repairEndTime'
-        },
-        {
-          title: '维修耗时',
-          dataIndex: 'repairMinutes',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Amount.formatter(text)
-          }
+          checked: true,
+          width: '150',
+          dataIndex: 'deptName'
         },
         {
-          title: '维修人员id',
-          dataIndex: 'repairUserId'
+          title: '建筑物',
+          checked: true,
+          width: '150',
+          dataIndex: 'positionName'
         },
         {
-          title: '维修描述',
-          dataIndex: 'repairContent'
+          title: '报修时间',
+          checked: true,
+          width: '150',
+          dataIndex: 'applyTime'
         },
         {
           title: '要求完成日期',
+          checked: true,
+          width: '150',
           dataIndex: 'limitHours'
         },
         {
-          title: '费用预算',
-          dataIndex: 'fee',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Amount.formatter(text)
-          }
-        },
-        {
-          title: '预算明细表',
-          dataIndex: 'feeFile'
+          title: '报修状态',
+          checked: true,
+          width: '100',
+          fixed: 'right',
+          dataIndex: 'status',
+          scopedSlots: { customRender: 'status' }
         },
         {
           title: '操作',
           key: 'action',
-          width: '200px',
+          width: '200',
           align: 'center',
+          fixed: 'right',
+          checked: true,
           scopedSlots: { customRender: 'action' }
         }
       ],
@@ -219,6 +200,7 @@ export default {
   created () {
     // 下拉框map
     this.tableOption()
+    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_PREPARATION_STATUS)
   },
   methods: {
     tableOption () {
@@ -305,6 +287,10 @@ export default {
     },
     handleEnter () {
       this.$refs.table.refresh(true)
+    },
+    handleAssign () {
+      const modal = this.$refs.assignForm
+      modal.base(this.model)
     }
   }
 }

src/views/preparation/preparation/modules/AssignForm.vue

@@ -0,0 +1,111 @@
+<template>
+  <a-modal
+    :title="modalTitle"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @cancel="handleCancel"
+  >
+    <a-form :form="form">
+      <row-list :col="1">
+        <row-item>
+          <a-form-item
+            label="执行人"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select v-decorator="['repairUserId', {rules: [{required: true, message: '执行人不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="item in deptUserList"
+                :key="item.userId"
+                :label="item.realName"
+                :value="item.userId">{{ item.realName }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </row-item>
+      </row-list>
+      <row-list :col="1">
+        <row-item>
+          <a-form-item
+            label="主管建议"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-textarea
+              :rows="4"
+              v-decorator="['remark']"/>
+          </a-form-item>
+        </row-item>
+      </row-list>
+    </a-form>
+    <template slot="footer">
+      <a-button :loading="confirmLoading" type="primary" @click="save()">保存</a-button>
+    </template>
+  </a-modal>
+</template>
+
+<script>
+import { dispatchModelByDTO } from '@/api/repair/application-form'
+import { queryRepairUser } from '@/api/upms/user-dept'
+import { getDangersUser } from '@/api/hidden/hidden-danger'
+
+export default {
+  name: 'DispatchBaseForm',
+  data () {
+    return {
+      confirmLoading: false,
+      modalTitle: null,
+      form: this.$form.createForm(this),
+      visible: false,
+      // 下拉框map
+      record: {},
+      deptUserList: []
+    }
+  },
+  props: {
+  },
+  created () {
+    // 下拉框map
+    this.getDeptUsers()
+  },
+  methods: {
+    base (record) {
+      this.visible = true
+      // 如果是空标识添加
+      this.modalTitle = '派单'
+      this.record = record
+    },
+    getDeptUsers () {
+      getDangersUser('PREPARATION_USER').then(res => {
+        this.deptUserList = res.data
+      })
+    },
+    save () {
+      const { form: { validateFieldsAndScroll } } = this
+      this.confirmLoading = true
+      validateFieldsAndScroll((errors, values) => {
+        if (errors) {
+          this.confirmLoading = false
+          return
+        }
+        values.id = this.record.id
+        dispatchModelByDTO(values)
+          .then(() => {
+            this.handleCancel(values)
+          }).catch(() => {
+            this.confirmLoading = false
+          })
+      })
+    },
+    handleCancel (values) {
+      this.visible = false
+      this.confirmLoading = false
+      this.form.resetFields()
+      if (this.BaseTool.Object.isNotBlank(values)) {
+        this.$emit('ok')
+      }
+    }
+  }
+}
+</script>

src/views/preparation/preparation/modules/BaseForm.vue

@@ -1,302 +1,319 @@
 <template>
-    <a-card :bordered="false" v-show="visible" class="card" :title="modalTitle">
-        <a-row :gutter="48" slot="extra">
-            <a-col :md="48" :sm="48">
-              <span class="table-page-search-submitButtons" style="float: right">
-                <a-button :loading="confirmLoading" type="primary" @click="save()">保存</a-button>
-                <a-button style="margin-left: 8px" type="default" @click="handleCancel()">返回</a-button>
-              </span>
-            </a-col>
-        </a-row>
-        <a-form :form="form">
+  <a-modal
+    :title="modalTitle"
+    :width="900"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    class="ant-modal2"
+    @cancel="handleCancel"
+  >
+    <a-form :form="form">
 
-            <a-form-item v-show="false">
-                <a-input v-decorator="['id']" type="hidden"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </a-form-item>
+      <a-form-item v-show="false">
+        <a-input v-decorator="['id']" type="hidden" />
+      </a-form-item>
 
-            <row-list :col="2">
-                                                                                                <row-item>
+      <row-list :col="2">
+        <row-item>
+          <a-form-item
+            label="建筑物"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-cascader
+              :options="sbPositionList"
+              :load-data="loadData"
+              placeholder="请选择"
+              change-on-select
+              v-decorator="['positionId', {rules: [{required: true, message: '建筑物不能为空'}]}]"
+            />
+          </a-form-item>
+        </row-item>
+        <row-item>
+          <a-form-item
+            label="报修时间"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-date-picker
+              showTime
+              style="width: 100%"
+              :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
+              v-decorator="['applyTime', {rules: [{required: true, message: '报修时间不能为空'}]}]" />
+          </a-form-item>
+        </row-item>
+        <row-item>
 
-                            <a-form-item
-                                    label="设备型号"
-                                    :labelCol="BaseTool.Constant.labelCol"
-                                    :wrapperCol="BaseTool.Constant.wrapperCol"
-                            >
-                                                                    <a-input
-                                            v-decorator="['positionId', {rules: [{required: true, message: '设备型号不能为空'}]}]"/>
-                                                            </a-form-item>
-                        </row-item>
-                                                                                <row-item>
+          <a-form-item
+            label="要求完成日期"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-date-picker
+              style="width: 100%"
+              :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
+              v-decorator="['limitHours', {rules: [{required: true, message: '要求完成日期不能为空'}]}]" />
 
-                            <a-form-item
-                                    label="申请人id"
-                                    :labelCol="BaseTool.Constant.labelCol"
-                                    :wrapperCol="BaseTool.Constant.wrapperCol"
-                            >
-                                                                    <a-input
-                                            v-decorator="['userId', {rules: [{required: true, message: '申请人id不能为空'}]}]"/>
-                                                            </a-form-item>
-                        </row-item>
-                                                                                <row-item>
+          </a-form-item>
+        </row-item>
+        <row-item>
+          <a-form-item
+            label="备注"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input
+              v-decorator="['remark', {rules: [{required: true, message: '备注不能为空'}]}]" />
+          </a-form-item>
+        </row-item>
+      </row-list>
+        <row-list :col="1">
+        <row-item>
+          <a-form-item
+            label="问题描述"
+            :labelCol="BaseTool.Constant.labelCol2"
+            :wrapperCol="BaseTool.Constant.wrapperCol2"
+          >
+            <a-textarea
+              :rows="4"
+              v-decorator="['content', {rules: [{required: true, message: '委托内容描述不能为空'}]}]"/>
+          </a-form-item>
+        </row-item>
+<!--        <row-item>
 
-                            <a-form-item
-                                    label="申请部门"
-                                    :labelCol="BaseTool.Constant.labelCol"
-                                    :wrapperCol="BaseTool.Constant.wrapperCol"
-                            >
-                                                                    <a-input
-                                            v-decorator="['departId', {rules: [{required: true, message: '申请部门不能为空'}]}]"/>
-                                                            </a-form-item>
-                        </row-item>
-                                                                                <row-item>
+          <a-form-item
+            label="报修状态"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+          </a-form-item>
+        </row-item>-->
+<!--        <row-item>
 
-                            <a-form-item
-                                    label="报修时间"
-                                    :labelCol="BaseTool.Constant.labelCol"
-                                    :wrapperCol="BaseTool.Constant.wrapperCol"
-                            >
-                                                                    <a-date-picker
-                                            showTime
-                                            style="width: 100%"
-                                            :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
-                                            v-decorator="['applyTime', {rules: [{required: true, message: '报修时间不能为空'}]}]"/>
-                                                            </a-form-item>
-                        </row-item>
-                                                                                <row-item>
+          <a-form-item
+            label="维修开始时间"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-date-picker
+              showTime
+              style="width: 100%"
+              :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
+              v-decorator="['repairStartTime', {rules: [{required: true, message: '维修开始时间不能为空'}]}]" />
+          </a-form-item>
+        </row-item>
+        <row-item>
 
-                            <a-form-item
-                                    label="问题描述"
-                                    :labelCol="BaseTool.Constant.labelCol"
-                                    :wrapperCol="BaseTool.Constant.wrapperCol"
-                            >
-                                                                    <a-input
-                                            v-decorator="['content', {rules: [{required: true, message: '问题描述不能为空'}]}]"/>
-                                                            </a-form-item>
-                        </row-item>
-                                                                                <row-item>
+          <a-form-item
+            label="维修结束时间"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-date-picker
+              showTime
+              style="width: 100%"
+              :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
+              v-decorator="['repairEndTime', {rules: [{required: true, message: '维修结束时间不能为空'}]}]" />
+          </a-form-item>
+        </row-item>
+        <row-item>
 
-                            <a-form-item
-                                    label="报修状态"
-                                    :labelCol="BaseTool.Constant.labelCol"
-                                    :wrapperCol="BaseTool.Constant.wrapperCol"
-                            >
-                                                            </a-form-item>
-                        </row-item>
-                                                                                <row-item>
+          <a-form-item
+            label="维修耗时"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input-number
+              style="width: 100%"
+              :min="0"
+              :formatter="BaseTool.Amount.formatter"
+              :parser="BaseTool.Amount.parser"
+              v-decorator="['repairMinutes', {rules: [{required: true, message: '维修耗时不能为空'}]}]" />
+          </a-form-item>
+        </row-item>-->
+<!--        <row-item>
 
-                            <a-form-item
-                                    label="备注"
-                                    :labelCol="BaseTool.Constant.labelCol"
-                                    :wrapperCol="BaseTool.Constant.wrapperCol"
-                            >
-                                                                    <a-input
-                                            v-decorator="['remark', {rules: [{required: true, message: '备注不能为空'}]}]"/>
-                                                            </a-form-item>
-                        </row-item>
-                                                                                                                                                                                                                                                                                                        <row-item>
+          <a-form-item
+            label="维修人员id"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input
+              v-decorator="['repairUserId', {rules: [{required: true, message: '维修人员id不能为空'}]}]" />
+          </a-form-item>
+        </row-item>-->
+<!--        <row-item>
 
-                            <a-form-item
-                                    label="维修开始时间"
-                                    :labelCol="BaseTool.Constant.labelCol"
-                                    :wrapperCol="BaseTool.Constant.wrapperCol"
-                            >
-                                                                    <a-date-picker
-                                            showTime
-                                            style="width: 100%"
-                                            :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
-                                            v-decorator="['repairStartTime', {rules: [{required: true, message: '维修开始时间不能为空'}]}]"/>
-                                                            </a-form-item>
-                        </row-item>
-                                                                                <row-item>
+          <a-form-item
+            label="维修描述"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input
+              v-decorator="['repairContent', {rules: [{required: true, message: '维修描述不能为空'}]}]" />
+          </a-form-item>
+        </row-item>-->
+<!--        <row-item>
 
-                            <a-form-item
-                                    label="维修结束时间"
-                                    :labelCol="BaseTool.Constant.labelCol"
-                                    :wrapperCol="BaseTool.Constant.wrapperCol"
-                            >
-                                                                    <a-date-picker
-                                            showTime
-                                            style="width: 100%"
-                                            :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
-                                            v-decorator="['repairEndTime', {rules: [{required: true, message: '维修结束时间不能为空'}]}]"/>
-                                                            </a-form-item>
-                        </row-item>
-                                                                                <row-item>
+          <a-form-item
+            label="费用预算"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input-number
+              style="width: 100%"
+              :min="0"
+              :formatter="BaseTool.Amount.formatter"
+              :parser="BaseTool.Amount.parser"
+              v-decorator="['fee', {rules: [{required: true, message: '费用预算不能为空'}]}]" />
+          </a-form-item>
+        </row-item>-->
+<!--        <row-item>
 
-                            <a-form-item
-                                    label="维修耗时"
-                                    :labelCol="BaseTool.Constant.labelCol"
-                                    :wrapperCol="BaseTool.Constant.wrapperCol"
-                            >
-                                                                    <a-input-number
-                                            style="width: 100%"
-                                            :min="0"
-                                            :formatter="BaseTool.Amount.formatter"
-                                            :parser="BaseTool.Amount.parser"
-                                            v-decorator="['repairMinutes', {rules: [{required: true, message: '维修耗时不能为空'}]}]"/>
-                                                            </a-form-item>
-                        </row-item>
-                                                                                <row-item>
-
-                            <a-form-item
-                                    label="维修人员id"
-                                    :labelCol="BaseTool.Constant.labelCol"
-                                    :wrapperCol="BaseTool.Constant.wrapperCol"
-                            >
-                                                                    <a-input
-                                            v-decorator="['repairUserId', {rules: [{required: true, message: '维修人员id不能为空'}]}]"/>
-                                                            </a-form-item>
-                        </row-item>
-                                                                                <row-item>
-
-                            <a-form-item
-                                    label="维修描述"
-                                    :labelCol="BaseTool.Constant.labelCol"
-                                    :wrapperCol="BaseTool.Constant.wrapperCol"
-                            >
-                                                                    <a-input
-                                            v-decorator="['repairContent', {rules: [{required: true, message: '维修描述不能为空'}]}]"/>
-                                                            </a-form-item>
-                        </row-item>
-                                                                                <row-item>
-
-                            <a-form-item
-                                    label="要求完成日期"
-                                    :labelCol="BaseTool.Constant.labelCol"
-                                    :wrapperCol="BaseTool.Constant.wrapperCol"
-                            >
-                                                                    <a-date-picker
-                                            style="width: 100%"
-                                            :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
-                                            v-decorator="['limitHours', {rules: [{required: true, message: '要求完成日期不能为空'}]}]"/>
-
-                                                            </a-form-item>
-                        </row-item>
-                                                                                <row-item>
-
-                            <a-form-item
-                                    label="费用预算"
-                                    :labelCol="BaseTool.Constant.labelCol"
-                                    :wrapperCol="BaseTool.Constant.wrapperCol"
-                            >
-                                                                    <a-input-number
-                                            style="width: 100%"
-                                            :min="0"
-                                            :formatter="BaseTool.Amount.formatter"
-                                            :parser="BaseTool.Amount.parser"
-                                            v-decorator="['fee', {rules: [{required: true, message: '费用预算不能为空'}]}]"/>
-                                                            </a-form-item>
-                        </row-item>
-                                                                                <row-item>
-
-                            <a-form-item
-                                    label="预算明细表"
-                                    :labelCol="BaseTool.Constant.labelCol"
-                                    :wrapperCol="BaseTool.Constant.wrapperCol"
-                            >
-                                                                    <a-input
-                                            v-decorator="['feeFile', {rules: [{required: true, message: '预算明细表不能为空'}]}]"/>
-                                                            </a-form-item>
-                        </row-item>
-                                                </row-list>
-        </a-form>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        </a-card>
+          <a-form-item
+            label="预算明细表"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input
+              v-decorator="['feeFile', {rules: [{required: true, message: '预算明细表不能为空'}]}]" />
+          </a-form-item>
+        </row-item>-->
+      </row-list>
+    </a-form>
+    <template slot="footer">
+      <a-button :loading="confirmLoading" type="primary" @click="save()">保存</a-button>
+    </template>
+  </a-modal>
 </template>
 
 <script>
-    import pick from 'lodash.pick'
-    import {addPreparation, updatePreparation } from '@/api/preparation/preparation'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        export default {
-        name: 'BasePreparation',
-        data() {
-            return {
-                confirmLoading: false,
-                modalTitle: null,
-                form: this.$form.createForm(this),
-                visible: false,
-            // 下拉框map
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        }
-        },
-        props: {},
-        created() {
-            // 下拉框map
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
-        methods: {
-            base(record) {
-                this.visible = true
-                // 如果是空标识添加
-                if (this.BaseTool.Object.isBlank(record)) {
-                    this.modalTitle = '添加'
-                    return
-                }
-                this.modalTitle = '编辑'
-                const {form: {setFieldsValue}} = this
-                // 日期处理
-                                    record.applyTime = this.BaseTool.Moment(record.applyTime, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
-                                    record.repairStartTime = this.BaseTool.Moment(record.repairStartTime, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
-                                    record.repairEndTime = this.BaseTool.Moment(record.repairEndTime, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
-                                    record.limitHours = this.BaseTool.Moment(record.limitHours, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
-                                this.$nextTick(() => {
-                    setFieldsValue(Object.assign(pick(record, [
-                                                                                    'id',
-                                                                                                                'positionId',
-                                                                                                                'userId',
-                                                                                                                'departId',
-                                                                                                                'applyTime',
-                                                                                                                'content',
-                                                                                                                'status',
-                                                                                                                'remark',
-                                                                                                                                                                                                                                                                                                                                                                                                                                        'repairStartTime',
-                                                                                                                'repairEndTime',
-                                                                                                                'repairMinutes',
-                                                                                                                'repairUserId',
-                                                                                                                'repairContent',
-                                                                                                                'limitHours',
-                                                                                                                'fee',
-                                                                                                                'feeFile',
-                                                    ])))
-                })
-            },
-            save() {
-                const {form: {validateFieldsAndScroll}} = this
-                this.confirmLoading = true
-                validateFieldsAndScroll((errors, values) => {
-                    if (errors) {
-                        this.confirmLoading = false
-                        return
-                    }
-                    // 日期处理
-                                            values.applyTime = this.BaseTool.Date.formatter(values.applyTime, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
-                                            values.repairStartTime = this.BaseTool.Date.formatter(values.repairStartTime, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
-                                            values.repairEndTime = this.BaseTool.Date.formatter(values.repairEndTime, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
-                                            values.limitHours = this.BaseTool.Date.formatter(values.limitHours, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
-                                        if (this.BaseTool.String.isBlank(values.id)) {
-                        addPreparation(values)
-                                .then(() => {
-                                    this.handleCancel(values)
-                                }).catch(() => {
-                            this.confirmLoading = false
-                        })
-                    } else {
-                        updatePreparation(values)
-                                .then(() => {
-                                    this.handleCancel(values)
-                                }).catch(() => {
-                            this.confirmLoading = false
-                        })
-                    }
-                })
-            },
-            handleCancel(values) {
-                this.visible = false
-                this.confirmLoading = false
-                this.form.resetFields()
-                if (this.BaseTool.Object.isNotBlank(values)) {
-                    this.$emit('ok', values)
-                } else {
-                    this.$emit('ok')
-                }
-            }
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            }
+import pick from 'lodash.pick'
+import { addPreparation, updatePreparation } from '@/api/preparation/preparation'
+import { getSbPositions } from '@/api/repair/application-form'
+
+export default {
+  name: 'BasePreparation',
+  data () {
+    return {
+      confirmLoading: false,
+      modalTitle: null,
+      form: this.$form.createForm(this),
+      visible: false,
+      sbPositionList: []
+      // 下拉框map
+    }
+  },
+  props: {},
+  created () {
+    // 下拉框map
+    this.getSbPositions()
+  },
+  methods: {
+    base (record) {
+      this.visible = true
+      // 如果是空标识添加
+      if (this.BaseTool.Object.isBlank(record)) {
+        this.modalTitle = '添加'
+        return
+      }
+      this.modalTitle = '编辑'
+      const { form: { setFieldsValue } } = this
+      // 日期处理
+      record.applyTime = this.BaseTool.Moment(record.applyTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
+      record.repairStartTime = this.BaseTool.Moment(record.repairStartTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
+      record.repairEndTime = this.BaseTool.Moment(record.repairEndTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
+      record.limitHours = this.BaseTool.Moment(record.limitHours, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+      this.$nextTick(() => {
+        setFieldsValue(Object.assign(pick(record, [
+          'id',
+          'positionId',
+          'userId',
+          'departId',
+          'applyTime',
+          'content',
+          'status',
+          'remark',
+          'repairStartTime',
+          'repairEndTime',
+          'repairMinutes',
+          'repairUserId',
+          'repairContent',
+          'limitHours',
+          'fee',
+          'feeFile'
+        ])))
+      })
+    },
+    getSbPositions (parentId) {
+      getSbPositions({ parentId }).then(res => {
+        console.log(res)
+        this.sbPositionList = res.data.map(item => {
+          item = {
+            label: item.name,
+            value: item.name,
+            id: item.id,
+            isLeaf: false
+          }
+          return item
+        })
+      })
+    },
+    loadData (selectedOptions) {
+      console.log(selectedOptions)
+      const targetOption = selectedOptions[selectedOptions.length - 1]
+      targetOption.loading = true
+      getSbPositions({ parentId: targetOption.id }).then(res => {
+        targetOption.loading = false
+        targetOption.children = res.data.map(item => {
+          item = {
+            label: item.name,
+            value: item.id
+          }
+          return item
+        })
+        this.sbPositionList = [...this.sbPositionList]
+      })
+    },
+    save () {
+      const { form: { validateFieldsAndScroll } } = this
+      this.confirmLoading = true
+      validateFieldsAndScroll((errors, values) => {
+        if (errors) {
+          this.confirmLoading = false
+          return
+        }
+        // 日期处理
+        values.applyTime = this.BaseTool.Date.formatter(values.applyTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
+        values.limitHours = this.BaseTool.Date.formatter(values.limitHours, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+        values.positionId = values.positionId[1]
+        if (this.BaseTool.String.isBlank(values.id)) {
+          addPreparation(values)
+            .then(() => {
+              this.handleCancel(values)
+            }).catch(() => {
+              this.confirmLoading = false
+            })
+        } else {
+          updatePreparation(values)
+            .then(() => {
+              this.handleCancel(values)
+            }).catch(() => {
+              this.confirmLoading = false
+            })
+        }
+      })
+    },
+    handleCancel (values) {
+      this.visible = false
+      this.confirmLoading = false
+      this.form.resetFields()
+      if (this.BaseTool.Object.isNotBlank(values)) {
+        this.$emit('ok', values)
+      } else {
+        this.$emit('ok')
+      }
     }
+  }
+}
 </script>

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

@@ -1,90 +1,109 @@
 <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-card :bordered="false" v-show="visible" class="card" :title="modalTitle">
+    <a-row :gutter="48" slot="extra">
+      <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-row>
-        <detail-list title="" :col="2">
-                                                                                                    <detail-list-item term="设备型号">{{ model.positionId }}</detail-list-item>
-                                                                                                            <detail-list-item term="申请人id">{{ model.userId }}</detail-list-item>
-                                                                                                            <detail-list-item term="申请部门">{{ model.departId }}</detail-list-item>
-                                                                                                            <detail-list-item term="报修时间">{{ model.applyTime }}</detail-list-item>
-                                                                                                            <detail-list-item term="问题描述">{{ model.content }}</detail-list-item>
-                                                                                                            <detail-list-item term="报修状态">{{ model.status }}</detail-list-item>
-                                                                                                            <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
-                                                                                                                                        <detail-list-item term="更新日期">{{ model.updateTime }}</detail-list-item>
-                                                                                                            <detail-list-item term="创建人">{{ model.createdUserId }}</detail-list-item>
-                                                                                                                                        <detail-list-item term="更新人">{{ model.updateUserId }}</detail-list-item>
-                                                                                                            <detail-list-item term="更新人名称">{{ model.updateUserName }}</detail-list-item>
-                                                                                                            <detail-list-item term="维修开始时间">{{ model.repairStartTime }}</detail-list-item>
-                                                                                                            <detail-list-item term="维修结束时间">{{ model.repairEndTime }}</detail-list-item>
-                                                                                                            <detail-list-item term="维修耗时">{{ model.repairMinutes }}</detail-list-item>
-                                                                                                            <detail-list-item term="维修人员id">{{ model.repairUserId }}</detail-list-item>
-                                                                                                            <detail-list-item term="维修描述">{{ model.repairContent }}</detail-list-item>
-                                                                                                            <detail-list-item term="要求完成日期">{{ model.limitHours }}</detail-list-item>
-                                                                                                            <detail-list-item term="费用预算">{{ model.fee }}</detail-list-item>
-                                                                                                            <detail-list-item term="预算明细表">{{ model.feeFile }}</detail-list-item>
-                                                        </detail-list>
-    </a-card>
+      </a-col>
+    </a-row>
+    <a-descriptions :column="3" bordered>
+      <a-descriptions-item label="单据号">{{ model.no }}</a-descriptions-item>
+      <a-descriptions-item label="申请人">{{ model.createdUserName }}</a-descriptions-item>
+      <a-descriptions-item label="公司">{{ model.companyName }}</a-descriptions-item>
+      <a-descriptions-item label="申请部门">{{ model.deptName }}</a-descriptions-item>
+      <a-descriptions-item label="建筑物">{{ model.positionName }}</a-descriptions-item>
+      <a-descriptions-item label="报修时间">{{ model.applyTime }}</a-descriptions-item>
+      <a-descriptions-item label="问题描述" :span="3"> <span v-html="model.content "></span></a-descriptions-item>
+      <a-descriptions-item label="要求完成日期">{{ model.limitHours }}</a-descriptions-item>
+      <a-descriptions-item label="报修状态"><badge :text="BaseTool.Object.getField(statusMap,model.status)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_STATUS[model.status]"/></a-descriptions-item>
+      <a-descriptions-item label="维修人">{{ model.repairUserName }}</a-descriptions-item>
+      <a-descriptions-item label="维修开始时间">{{ model.repairStartTime }}</a-descriptions-item>
+      <a-descriptions-item label="维修结束时间">{{ model.repairEndTime }}</a-descriptions-item>
+      <a-descriptions-item label="维修时长">{{ model.repairMinutes }}</a-descriptions-item>
+      <a-descriptions-item label="维修描述" :span="3"> <span v-html="model.repairContent "></span></a-descriptions-item>
+      <a-descriptions-item label="费用预算">{{ model.fee }}</a-descriptions-item>
+      <a-descriptions-item label="筹建主管" >{{ model.dispatchUserName }}</a-descriptions-item>
+      <a-descriptions-item label="图片" :span="3">
+        <div v-if="model.applicationFileList != null && model.applicationFileList.length > 0">
+          <viewer :images="model.applicationFileList" @inited="inited" ref="viewer" :index="1" >
+            <img
+              v-for="item in model.applicationFileList"
+              :src="item.url"
+              :key="item.id"
+              class="image"
+              width="200px"
+              style="margin:10px;">
+          </viewer></div>
+        <div v-if="model.applicationFileList == null || model.applicationFileList.length === 0"> 暂无</div>
+      </a-descriptions-item>
+      <a-descriptions-item label="文件">
+        <a v-for="item in model.reportFileList" :key="item.id" :href="item.url" target="downloadFile" :download="item.name">{{ item.name }}</a>
+      </a-descriptions-item>
+    </a-descriptions>
+    <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 " 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>
+  </a-card>
 </template>
 
 <script>
-    import DetailList from '@/components/tools/DetailList'
-    const DetailListItem = DetailList.Item
+import DetailList from '@/components/tools/DetailList'
 
-    export default {
-        name: 'PreparationDetail',
-        components: {
-            DetailList,
-            DetailListItem
-        },
-        data () {
-            return {
-                confirmLoading: false,
-                mdl: {},
-                modalTitle: null,
-                visible: false,
-                // 下拉框map
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            model: {
-                                                                                                                    'positionId': null,
-                                                                                                'userId': null,
-                                                                                                'departId': null,
-                                                                                                'applyTime': null,
-                                                                                                'content': null,
-                                                                                                'status': null,
-                                                                                                'remark': null,
-                                                                                                                                            'updateTime': null,
-                                                                                                'createdUserId': null,
-                                                                                                                                            'updateUserId': null,
-                                                                                                'updateUserName': null,
-                                                                                                'repairStartTime': null,
-                                                                                                'repairEndTime': null,
-                                                                                                'repairMinutes': null,
-                                                                                                'repairUserId': null,
-                                                                                                'repairContent': null,
-                                                                                                'limitHours': null,
-                                                                                                'fee': null,
-                                                                                                'feeFile': null,
-                                                            }
-            }
-        },
-        created () {
-            // 下拉框map
-            
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
-        methods: {
-            base (record) {
-                this.visible = true
-                this.modalTitle = '详情'
-                this.model = record
-            },
-            handleCancel () {
-                this.visible = false
-                this.confirmLoading = false
-            }
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        }
+const DetailListItem = DetailList.Item
+
+export default {
+  name: 'PreparationDetail',
+  components: {
+    DetailList,
+    DetailListItem
+  },
+  data () {
+    return {
+      confirmLoading: false,
+      mdl: {},
+      modalTitle: null,
+      visible: false,
+      // 下拉框map
+      model: {
+        'positionId': null,
+        'userId': null,
+        'departId': null,
+        'applyTime': null,
+        'content': null,
+        'status': null,
+        'remark': null,
+        'updateTime': null,
+        'createdUserId': null,
+        'updateUserId': null,
+        'updateUserName': null,
+        'repairStartTime': null,
+        'repairEndTime': null,
+        'repairMinutes': null,
+        'repairUserId': null,
+        'repairContent': null,
+        'limitHours': null,
+        'fee': null,
+        'feeFile': null
+      }
+    }
+  },
+  created () {
+    // 下拉框map
+  },
+  methods: {
+    base (record) {
+      this.visible = true
+      this.modalTitle = '筹建单详情'
+      this.model = record
+    },
+    handleCancel () {
+      this.visible = false
+      this.confirmLoading = false
+      this.$emit('ok')
     }
+  }
+}
 </script>