筹建

src/api/preparation/preparation.js

@@ -125,3 +125,11 @@ export function exportPreparation (parameter) {
     responseType: 'blob'
   })
 }
+
+export function dispatchModelByDTO (parameter) {
+  return axios({
+    url: '/preparation/preparations/dispatch/' + parameter.id,
+    method: 'PUT',
+    data: parameter
+  })
+}

src/views/preparation/preparation/Preparation.vue

@@ -57,16 +57,12 @@
       >
         <span slot="action" slot-scope="record">
           <template>
-            <a @click="handleView(record)">主页数据</a>
-            <operation-button
+            <a @click="handleView(record)">主页数据</a><a-divider type="vertical" />
+<!--            <operation-button
               v-if="$auth('preparation-preparations-edit')"
               @click="handleEdit(record)"
-            >修改</operation-button>
-<!--            <operation-button
-              v-if="record.status === 1"
-              :type="2"
-              title="是否要删除该条数据？"
-              @confirm="batchDelete(record.id)">删除</operation-button>-->
+            >修改</operation-button>-->
+            <a @click="handleAssign(record)">派单</a>
           </template>
         </span>
         <span slot="status" slot-scope="text">
@@ -288,9 +284,11 @@ export default {
     handleEnter () {
       this.$refs.table.refresh(true)
     },
-    handleAssign () {
-      const modal = this.$refs.assignForm
-      modal.base(this.model)
+    handleAssign (record) {
+      fetchPreparation({ id: record.id }).then(res => {
+        const modal = this.$refs.assignForm
+        modal.base(res.data)
+      })
     }
   }
 }

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

@@ -46,8 +46,7 @@
 </template>
 
 <script>
-import { dispatchModelByDTO } from '@/api/repair/application-form'
-import { queryRepairUser } from '@/api/upms/user-dept'
+import { dispatchModelByDTO } from '@/api/preparation/preparation'
 import { getDangersUser } from '@/api/hidden/hidden-danger'
 
 export default {
@@ -102,9 +101,7 @@ export default {
       this.visible = false
       this.confirmLoading = false
       this.form.resetFields()
-      if (this.BaseTool.Object.isNotBlank(values)) {
-        this.$emit('ok')
-      }
+      this.$emit('ok')
     }
   }
 }

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

@@ -16,7 +16,7 @@
       <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="单据状态"><badge :text="BaseTool.Object.getField(statusMap,model.status)" :status="DictCache.COLOR.REPAIR_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>
@@ -46,19 +46,24 @@
       <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>
+    <assign-form ref="assignForm" @ok="handleCancel" />
+    <finish-form ref="finishForm" @ok="handleCancel" />
   </a-card>
 </template>
 
 <script>
 import DetailList from '@/components/tools/DetailList'
-
+import AssignForm from './AssignForm'
+import FinishForm from './FinishForm'
+import { fetchPreparation } from '@/api/preparation/preparation'
 const DetailListItem = DetailList.Item
 
 export default {
   name: 'PreparationDetail',
   components: {
     DetailList,
-    DetailListItem
+    DetailListItem,
+    AssignForm
   },
   data () {
     return {
@@ -66,8 +71,10 @@ export default {
       mdl: {},
       modalTitle: null,
       visible: false,
+      statusMap: {},
       // 下拉框map
       model: {
+        'id': null,
         'positionId': null,
         'userId': null,
         'departId': null,
@@ -92,6 +99,7 @@ export default {
   },
   created () {
     // 下拉框map
+    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_PREPARATION_STATUS)
   },
   methods: {
     base (record) {
@@ -103,6 +111,16 @@ export default {
       this.visible = false
       this.confirmLoading = false
       this.$emit('ok')
+    },
+    handleAssign () {
+      fetchPreparation({ id: this.model.id }).then(res => {
+        const modal = this.$refs.assignForm
+        modal.base(res.data)
+      })
+    },
+    handleFinish () {
+      const modal = this.$refs.finishForm
+      modal.base(this.model)
     }
   }
 }

src/views/preparation/preparation/modules/FinishForm.vue

@@ -0,0 +1,331 @@
+<template>
+  <a-modal
+    :title="modalTitle"
+    :width="800"
+    :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>
+
+      <row-list :col="2">
+        <row-item>
+          <a-form-item
+            label="工单类别"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select
+              disabled
+              @change="changePlanFlag"
+              v-decorator="['category', {rules: [{required: true, message: '计划性维修不能为空'}]}]"
+              placeholder="请选择">
+              <a-select-option
+                v-for="(label,value) in planFlagMap"
+                :key="value"
+                :label="label"
+                :value="parseInt(value)">{{ label }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </row-item>
+        <row-item>
+          <a-form-item
+            label="所属工程师"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select
+              v-decorator="['dispatchUserId', {rules: [{required: true, message: '所属工程师不能为空'}]}]"
+              placeholder="请选择">
+              <a-select-option
+                v-for="item in dispatchList"
+                :key="item.userId"
+                :label="item.realName"
+                :value="item.userId">{{ item.realName }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </row-item>
+        <row-item>
+          <a-form-item
+            label="完成时间"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-date-picker
+              disabled="disabled"
+              showTime
+              v-decorator="['repairEndTime']"
+              style="width: 100%"
+              :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
+            />
+          </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-upload
+              :action="uploadUrl"
+              :multiple="true"
+              list-type="picture"
+              :file-list="defaultRepairFileList"
+              @change="handleRepairFileChange"
+              accept="image/*"
+              :headers="headers"
+            >
+              <a-button> <a-icon type="upload" /> 上传图片 </a-button>
+            </a-upload>
+          </a-form-item>
+        </row-item>
+        <row-item>
+          <a-form-item
+            label="维修文件"
+            :labelCol="BaseTool.Constant.labelCol2"
+            :wrapperCol="BaseTool.Constant.wrapperCol2"
+          >
+            <a-upload
+              :action="uploadUrl"
+              :multiple="true"
+              :file-list="defaultFileList"
+              @change="handleFileChange"
+              :headers="headers"
+            >
+              <a-button> <a-icon type="upload" /> 上传文件 </a-button>
+            </a-upload>
+          </a-form-item>
+        </row-item>
+        <row-item>
+          <a-form-item
+            label="维修描述"
+            :labelCol="BaseTool.Constant.labelCol2"
+            :wrapperCol="BaseTool.Constant.wrapperCol2"
+          >
+            <a-textarea v-decorator="['remark']"/>
+          </a-form-item>
+        </row-item>
+      </row-list>
+    </a-form>
+    <spare-part-used-select-modal ref="sparePartUsedSelectModal" />
+    <template slot="footer">
+      <a-button :loading="confirmLoading" type="primary" @click="save()">保存</a-button>
+    </template>
+  </a-modal>
+</template>
+
+<script>
+import pick from 'lodash.pick'
+import { finish } from '@/api/repair/application-form'
+import { queryUser } from '@/api/upms/user'
+import { fetchErrorTypeTree } from '@/api/repair/errortype'
+import SparePartUsedSelectModal from '@/views/sqarepartmanage/sparepartused/modules/SparePartUsedSelectModal'
+import { uploadUrl } from '@/api/upms/file'
+import Vue from 'vue'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
+import { queryRepairUser } from '@/api/upms/user-dept'
+
+export default {
+  name: 'BaseRepairApplicationForm',
+  data () {
+    return {
+      model: null,
+      confirmLoading: false,
+      modalTitle: null,
+      form: this.$form.createForm(this),
+      visible: false,
+      category: 0,
+      planFlagMap: {},
+      // 下拉框map
+      treeData: [],
+      dispatchList: [],
+      descripitionMap: {},
+      headers: {
+        Authorization: 'Bearer ' + Vue.ls.get(ACCESS_TOKEN)
+      },
+      sourceMap: {},
+      levelMap: {},
+      needStopMap: {},
+      statusMap: {},
+      uploadUrl: uploadUrl,
+      defaultRepairFileList: [],
+      repairFileList: [], // 维修图片,
+      defaultFileList: [], // 维修文件
+      fileList: [],
+      userList: []
+    }
+  },
+  components: {
+    SparePartUsedSelectModal
+  },
+  props: {
+  },
+  created () {
+    // 下拉框map
+    this.sourceMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_SOURCE)
+    this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_LEVEL)
+    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_STATUS)
+    this.needStopMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
+    this.descripitionMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIRE_ACTION)
+    this.planFlagMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_CATEGORY)
+  },
+  methods: {
+    base (record) {
+      this.setTree()
+      this.visible = true
+      this.model = record
+      const params = { roleType: 2, deptId: record.repairDeptId, queryType: 1 }
+      this.getUsers(params)
+      this.defaultFileList = []
+      this.repairFileList = []
+      // 如果是空标识添加
+      if (this.BaseTool.Object.isBlank(record)) {
+        this.modalTitle = '添加'
+        return
+      }
+      this.modalTitle = '维修完成'
+      this.repairFileList = record.repairFileList
+      this.defaultRepairFileList = this.BaseTool.UPLOAD.transImg(this.repairFileList)
+      const { form: { setFieldsValue } } = this
+      // 日期处理
+      if (record.repairEndTime !== null) {
+        record.repairEndTime = this.BaseTool.Date.formatter(record.repairEndTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
+      } else {
+        record.repairEndTime = this.BaseTool.Date.formatter(new Date(), this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
+      }
+      this.$nextTick(() => {
+        setFieldsValue(Object.assign(pick(record, [
+          'id',
+          'needStop',
+          'level',
+          'category',
+          'repairErrorTypeId',
+          'repairEndTime',
+          'dispatchUserId'
+        ])))
+      })
+    },
+    getUsers (params) {
+      queryRepairUser(params).then(res => {
+        this.dispatchList = res.data
+      })
+    },
+    changePlanFlag (value) {
+      this.category = value
+      const { form: { setFieldsValue } } = this
+      if (this.category === 1) {
+        this.$nextTick(() => {
+          setFieldsValue({ needStop: 1 })
+        })
+      } else {
+        this.$nextTick(() => {
+          setFieldsValue({ needStop: 0 })
+        })
+      }
+    },
+    handleFileChange (info) {
+      this.defaultFileList = info.fileList
+      this.fileList = this.setFileList(info, 19)
+    },
+    handleRepairFileChange (info) {
+      this.defaultRepairFileList = info.fileList
+      this.repairFileList = this.setFileList(info, 12)
+    },
+    setFileList (info, type) {
+      const file = info.file
+      const fileList = info.fileList
+      if (file.status === 'done') {
+        return this.BaseTool.UPLOAD.getUploadFileDTO(fileList, type)
+      } else if (file.status === 'removed') {
+        return this.BaseTool.UPLOAD.getUploadFileDTO(fileList, type)
+      } else if (file.status === 'error') {
+        this.$message.error('上传失败')
+        return []
+      }
+    },
+    save () {
+      const { form: { validateFieldsAndScroll } } = this
+      this.confirmLoading = true
+      validateFieldsAndScroll((errors, values) => {
+        if (errors) {
+          this.confirmLoading = false
+          return
+        }
+        // 日期处理
+        values.category = this.model.category
+        values.repairFileList = this.repairFileList
+        values.opinionFileList = this.fileList // 维修文件
+        values.repairEndTime = this.BaseTool.Date.formatter(values.repairEndTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
+        finish(values).then(() => {
+          this.$message.info('维修已提交，等待工程师审核')
+          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')
+      } else {
+        this.$emit('ok')
+      }
+    },
+    handleSbSelect () {
+      this.$refs.sbInfoSelectModal.base({}, { filter: 0, status: 2 })
+    },
+    handleSbSelectd (keys, rows) {
+      const [ key ] = keys
+      const [ row ] = rows
+      const { form: { setFieldsValue } } = this
+      // 日期处理
+      this.$nextTick(() => {
+        setFieldsValue(Object.assign({
+          'sbId': key,
+          'sbName': row.name
+        }))
+      })
+    },
+    handlePartSelect () {
+      const sbId = this.form.getFieldValue('sbId')
+      this.$refs.partInfoSelectModal.base({ sbId })
+    },
+    handlePartSelected (keys, rows) {
+      const [ key ] = keys
+      const [ row ] = rows
+      const { form: { setFieldsValue } } = this
+      this.$nextTick(() => {
+        setFieldsValue(Object.assign({
+          'partId': key,
+          'partName': row.name
+        }))
+      })
+    },
+    /**
+     * 设置类别树
+     */
+    setTree (record = {}) {
+      fetchErrorTypeTree({ id: record.id }).then(res => {
+        this.treeData = res.data
+      })
+    },
+    handleAddPartUsed () {
+      /* const modal = this.$refs.repairFeeModal
+      modal.base(null, record) */
+      this.$refs.sparePartUsedSelectModal.base(this.model, { sbId: this.model.sbId, modelId: this.model.modelId })
+    }
+
+  }
+}
+</script>