Merge remote-tracking branch 'origin/demo_' into demo_

src/api/repair/application-form.js

@@ -334,6 +334,20 @@ export function receive (parameter) {
   })
 }
 
+/**
+ * finish func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function nonPlanToPlan (parameter) {
+  return axios({
+    url: '/repair/application-forms/nonPlan/toPlan/' + parameter.id,
+    method: 'PUT',
+    data: parameter
+  })
+}
+
 /**
  * finish func
  * parameter: { }

src/views/hidden/hidden/HiddenDanger.vue

@@ -248,7 +248,7 @@ export default {
           ...this.queryParam,
           dataScope: {
             sortBy: 'desc',
-            sortName: 'update_time'
+            sortName: 'created_time'
           }
         }
         return getHiddenDangerPage(Object.assign(parameter, this.queryParam))

src/views/hidden/hidden/modules/RepairBaseForm.vue

@@ -431,7 +431,8 @@
 <script>
 import pick from 'lodash.pick'
 import BaseTool from '../../../../utils/tool'
-import { addRepairApplicationForm, updateRepairApplicationForm, getSbPositions, getDispatchUser } from '@/api/repair/application-form'
+import { getSbPositions, getDispatchUser } from '@/api/repair/application-form'
+import { transferRepair } from '@/api/hidden/hidden-danger'
 import PartInfoSelectModal from '@/views/part/info/modules/PartInfoSelectModal'
 import SbInfoSelectModal from '@/views/sb/info/modules/SbInfoSelectModal'
 import { queryUser } from '@/api/upms/user'
@@ -521,7 +522,7 @@ export default {
             setFieldsValue(Object.assign({
               'id': record.id,
               'sbId': record.sbId,
-              'sbName': record.name,
+              'sbCph': record.sbCph,
               'positionNo': record.positionNo
             }))
           })
@@ -543,9 +544,9 @@ export default {
         return
       }
       this.modalTitle = '编辑'
-      this.applicationFileList = record.applicationFileList
+      this.applicationFileList = record.beforeImageList
       this.repairFileList = record.repairFileList
-      this.reportFileList = record.reportFileList
+      this.reportFileList = record.fileList
       this.defaultApplicationFileList = this.BaseTool.UPLOAD.transImg(this.applicationFileList)
       this.defaultRepairFileList = this.BaseTool.UPLOAD.transImg(this.repairFileList)
       this.defaultCheckFileList = this.BaseTool.UPLOAD.transImg(this.reportFileList)
@@ -554,7 +555,7 @@ export default {
       }
       const { form: { setFieldsValue } } = this
       // 日期处理
-      record.applyTime = this.BaseTool.Moment(record.applyTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
+      // record.applyTime = this.BaseTool.Moment(record.applyTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
       if (record.limitDate != null) {
         record.limitDate = this.BaseTool.Moment(record.limitDate, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
         this.$nextTick(() => {
@@ -565,7 +566,6 @@ export default {
       }
       this.$nextTick(() => {
         setFieldsValue(Object.assign(pick(record, [
-          'id',
           'sbId',
           'sbCph',
           'partId',
@@ -635,9 +635,11 @@ ${record.hiddenRisk}`
           this.confirmLoading = false
           return
         }
+        console.log(values)
+
         // 日期处理
-        values.applyTime = this.BaseTool.Date.formatter(values.applyTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
-        values.limitDate = BaseTool.Date.formatter(values.limitDate, BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+        // values.applyTime = this.BaseTool.Date.formatter(values.applyTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
+        // values.limitDate = BaseTool.Date.formatter(values.limitDate, BaseTool.Date.PICKER_NORM_DATE_PATTERN)
         values.planStartTime = BaseTool.Date.formatter(values.planStartTime, BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
         values.planEndTime = BaseTool.Date.formatter(values.planEndTime, BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
         // 上传文件
@@ -646,30 +648,20 @@ ${record.hiddenRisk}`
         values.repairType = values.repairType.join(',')
         values.applicationFileList = this.applicationFileList
         values.reportFileList = this.reportFileList
-        values.sbPosition = values.sbPosition.join('->')
-        console.log(values)
+        // values.sbPosition = values.sbPosition.join('->')
         if (values.partId === undefined) {
           values.partId = ''
         }
-        if (this.BaseTool.String.isBlank(values.id)) {
-          addRepairApplicationForm(values)
-            .then(() => {
-              this.$notification.success({
-                message: '报修成功！',
-                duration: 3
-              })
-              this.handleCancel(values)
-            }).catch(() => {
-              this.confirmLoading = false
+        transferRepair(values)
+          .then(() => {
+            this.$notification.success({
+              message: '转维修单成功！',
+              duration: 3
             })
-        } else {
-          updateRepairApplicationForm(values)
-            .then(() => {
-              this.handleCancel(values)
-            }).catch(() => {
-              this.confirmLoading = false
-            })
-        }
+            this.handleCancel(values)
+          }).catch(() => {
+            this.confirmLoading = false
+          })
       })
     },
     changePlanFlag (value) {

src/views/repair/application-form/modules/DetailRepair.vue

@@ -272,6 +272,9 @@
         <a-popconfirm v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === model.status " title="是否要接单？" @confirm="receiveRepair">
           <a-button style="margin-left: 8px" type="default">接单</a-button>
         </a-popconfirm>
+        <a-button v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.RECEIVED === model.status ||
+        DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.HANG_UP === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REPAIR_FAIL === model.status ||
+        DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.DISPATCH_REPAIR === model.status " style="margin-left: 8px" type="default" @click="nonPlanToPlan">转计划维修</a-button>
         <a-button v-if="$auth('repair-application-forms-dispatch') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.RECEIVED === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.MM_DISPATCH === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.DISPATCH_REPAIR === model.status)" style="margin-left: 16px" type="default" @click="handleAssign">派单</a-button>
         <a-button v-if="(DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status )" style="margin-left: 16px" type="default" @click="reportRepair">维修上报</a-button>
         <a-button v-if="(DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REPAIR_FAIL === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.MM_REPAIR_FAIL === model.status)" style="margin-left: 16px" type="default" @click="handleReportRepair">处理维修上报</a-button>
@@ -341,6 +344,7 @@
     <ReportPauseForm ref="reportPauseForm" @ok="handleOk" />
     <BigRepairForm ref="bigRepairForm" @ok="handleOk" />
     <CheckBigRepairForm ref="checkBigRepairForm" @ok="handleOk" />
+    <ToPlanForm ref="toPlanForm" @ok="handleOk" />
   </div>
 </template>
 
@@ -349,6 +353,7 @@
 import DetailList from '@/components/tools/DetailList'
 import { fetchRepairApplicationForm, approve, receive, receiveRepair, closeRepair } from '@/api/repair/application-form'
 import CheckForm from './CheckForm'
+import ToPlanForm from './ToPlanForm'
 import BaseOutForm from './BaseOutForm'
 import FinishForm from './FinishForm'
 import PlanCheckForm from './PlanCheckForm'
@@ -436,7 +441,8 @@ export default {
     OutStroeForm,
     ReportPauseForm,
     BigRepairForm,
-    CheckBigRepairForm
+    CheckBigRepairForm,
+    ToPlanForm
   },
   data () {
     return {
@@ -920,6 +926,10 @@ export default {
       receive(this.model).then(() => {
       })
     },
+    nonPlanToPlan () {
+      const modal = this.$refs.toPlanForm
+      modal.base(this.model)
+    },
     handleClose () {
       // 判断是否具备关闭工单条件
       if (this.dataReason.length === 0 || this.dataRepairResolve.length === 0) {

src/views/repair/application-form/modules/ToPlanForm.vue

@@ -0,0 +1,103 @@
+<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="['repairPlanLevel', {rules: [{required: true, message: '计划性维修级别不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="value in ['大','中','小']"
+                :key="value"
+                :label="value"
+                :value="value">{{ value }}
+              </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 { nonPlanToPlan } from '@/api/repair/application-form'
+
+export default {
+  name: 'DispatchBaseForm',
+  data () {
+    return {
+      confirmLoading: false,
+      modalTitle: null,
+      form: this.$form.createForm(this),
+      visible: false,
+      // 下拉框map
+      record: {}
+    }
+  },
+  props: {
+  },
+  created () {
+    // 下拉框map
+  },
+  methods: {
+    base (record) {
+      this.visible = true
+      // 如果是空标识添加
+      this.modalTitle = '转计划维修'
+      this.record = record
+    },
+    save () {
+      const { form: { validateFieldsAndScroll } } = this
+      this.confirmLoading = true
+      validateFieldsAndScroll((errors, values) => {
+        if (errors) {
+          this.confirmLoading = false
+          return
+        }
+        values.id = this.record.id
+        values.category = this.record.category
+        nonPlanToPlan(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>