whj 1 jaar geleden
bovenliggende
commit
dbc11c83a8

+ 61 - 49
src/api/repair/application-form.js

@@ -7,7 +7,7 @@ import { stringify } from 'qs'
  * @param parameter
  * @returns {*}
  */
-export function getRepairApplicationFormPage (parameter) {
+export function getRepairApplicationFormPage(parameter) {
   return axios({
     url: '/repair/application-forms/page?' + stringify(parameter),
     method: 'get',
@@ -17,7 +17,7 @@ export function getRepairApplicationFormPage (parameter) {
   })
 }
 
-export function getRepairApplicationFormPoolPage (parameter) {
+export function getRepairApplicationFormPoolPage(parameter) {
   return axios({
     url: '/repair/application-forms/pool/page?' + stringify(parameter),
     method: 'get',
@@ -33,7 +33,7 @@ export function getRepairApplicationFormPoolPage (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function addRepairApplicationForm (parameter) {
+export function addRepairApplicationForm(parameter) {
   return axios({
     url: '/repair/application-forms',
     method: 'POST',
@@ -50,7 +50,7 @@ export function addRepairApplicationForm (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function againRepairApplicationForm (parameter) {
+export function againRepairApplicationForm(parameter) {
   return axios({
     url: '/repair/application-forms/again',
     method: 'POST',
@@ -67,7 +67,7 @@ export function againRepairApplicationForm (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function saveFormByApplication (parameter) {
+export function saveFormByApplication(parameter) {
   return axios({
     url: '/repair/application-forms/' + parameter.id,
     method: 'POST',
@@ -81,7 +81,7 @@ export function saveFormByApplication (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function updateRepairApplicationForm (parameter) {
+export function updateRepairApplicationForm(parameter) {
   return axios({
     url: '/repair/application-forms/' + parameter.id,
     method: 'PUT',
@@ -95,7 +95,7 @@ export function updateRepairApplicationForm (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function fetchRepairApplicationForm (parameter) {
+export function fetchRepairApplicationForm(parameter) {
   return axios({
     url: '/repair/application-forms/' + parameter.id,
     method: 'get',
@@ -110,7 +110,7 @@ export function fetchRepairApplicationForm (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function getCalendarNotice (parameter) {
+export function getCalendarNotice(parameter) {
   return axios({
     url: '/repair/application-forms/login/notice',
     method: 'get',
@@ -125,7 +125,7 @@ export function getCalendarNotice (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function getDispatchUser (parameter) {
+export function getDispatchUser(parameter) {
   return axios({
     url: '/upms/user-depts/repair-manager',
     method: 'get',
@@ -140,7 +140,7 @@ export function getDispatchUser (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function getSbPositions (parameter) {
+export function getSbPositions(parameter) {
   return axios({
     url: '/sb/positions/longYan?' + stringify(parameter),
     method: 'get',
@@ -155,7 +155,7 @@ export function getSbPositions (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function getSbPositions2 (parameter) {
+export function getSbPositions2(parameter) {
   return axios({
     url: '/sb/positions/longYan2?' + stringify(parameter),
     method: 'get',
@@ -170,7 +170,7 @@ export function getSbPositions2 (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function queryRepairApplicationForm (parameter) {
+export function queryRepairApplicationForm(parameter) {
   return axios({
     url: '/repair/application-forms?' + stringify(parameter),
     method: 'get',
@@ -186,7 +186,7 @@ export function queryRepairApplicationForm (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function deleteRepairApplicationForms (parameter) {
+export function deleteRepairApplicationForms(parameter) {
   return axios({
     url: '/repair/application-forms',
     method: 'DELETE',
@@ -200,7 +200,7 @@ export function deleteRepairApplicationForms (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function deleteRepairApplicationForm (parameter) {
+export function deleteRepairApplicationForm(parameter) {
   return axios({
     url: '/repair/application-forms/' + parameter.id,
     method: 'DELETE',
@@ -214,7 +214,7 @@ export function deleteRepairApplicationForm (parameter) {
  * @param parameter :
  * @returns {*}
  */
-export function exportRepairApplicationForm (parameter) {
+export function exportRepairApplicationForm(parameter) {
   return axios({
     url: '/repair/application-forms/export?' + stringify(parameter),
     method: 'get',
@@ -230,7 +230,7 @@ export function exportRepairApplicationForm (parameter) {
  * @param parameter :
  * @returns {*}
  */
-export function joinHoliday (parameter) {
+export function joinHoliday(parameter) {
   return axios({
     url: `/repair/application-forms/join/${parameter}`,
     method: 'get',
@@ -245,7 +245,7 @@ export function joinHoliday (parameter) {
  * @param parameter :
  * @returns {*}
  */
-export function cancelHoliday (parameter) {
+export function cancelHoliday(parameter) {
   return axios({
     url: `/repair/application-forms/cancel/${parameter}`,
     method: 'get',
@@ -260,7 +260,7 @@ export function cancelHoliday (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function changeApplicationForm (parameter) {
+export function changeApplicationForm(parameter) {
   return axios({
     url: '/repair/application-forms/change/' + parameter.id,
     method: 'PUT',
@@ -273,7 +273,7 @@ export function changeApplicationForm (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function changeEditForm (parameter) {
+export function changeEditForm(parameter) {
   return axios({
     url: '/repair/application-forms/edit/error/info',
     method: 'PUT',
@@ -286,7 +286,7 @@ export function changeEditForm (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function finish (parameter) {
+export function finish(parameter) {
   return axios({
     url: '/repair/application-forms/finish/' + parameter.id,
     method: 'PUT',
@@ -299,7 +299,7 @@ export function finish (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function changeFieldTemplateData (parameter) {
+export function changeFieldTemplateData(parameter) {
   return axios({
     url: '/customize/fieldTemplateData/ticket/' + parameter.id,
     method: 'PUT',
@@ -312,7 +312,7 @@ export function changeFieldTemplateData (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function examine (parameter) {
+export function examine(parameter) {
   return axios({
     url: '/repair/application-forms/examine/' + parameter.id,
     method: 'PUT',
@@ -326,7 +326,7 @@ export function examine (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function examineOk (result, parameter) {
+export function examineOk(result, parameter) {
   return axios({
     url: '/repair/application-forms/examined/' + parameter.id + '/' + result,
     method: 'PUT',
@@ -339,7 +339,7 @@ export function examineOk (result, parameter) {
  * @param parameter
  * @returns {*}
  */
-export function pushCalendar (parameter) {
+export function pushCalendar(parameter) {
   return axios({
     url: '/repair/application-forms/addCalendar/' + parameter.id,
     method: 'PUT',
@@ -352,7 +352,7 @@ export function pushCalendar (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function getCalendar (parameter) {
+export function getCalendar(parameter) {
   return axios({
     url: '/repair/application-forms/tuiCalendar?' + stringify(parameter),
     method: 'get',
@@ -367,7 +367,7 @@ export function getCalendar (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function repairVerify (parameter) {
+export function repairVerify(parameter) {
   return axios({
     url: '/repair/application-forms/repair/verify',
     method: 'PUT',
@@ -381,7 +381,7 @@ export function repairVerify (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function dispatchModelByDTO (parameter) {
+export function dispatchModelByDTO(parameter) {
   return axios({
     url: '/repair/application-forms/dispatch/' + parameter.id,
     method: 'PUT',
@@ -395,7 +395,7 @@ export function dispatchModelByDTO (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function transferApplyByDTO (parameter) {
+export function transferApplyByDTO(parameter) {
   return axios({
     url: '/repair/application-forms/transfer',
     method: 'PUT',
@@ -409,7 +409,7 @@ export function transferApplyByDTO (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function refusedByDTO (parameter) {
+export function refusedByDTO(parameter) {
   return axios({
     url: '/repair/application-forms/refused/' + parameter.id,
     method: 'PUT',
@@ -423,7 +423,7 @@ export function refusedByDTO (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function receive (parameter) {
+export function receive(parameter) {
   return axios({
     url: '/repair/application-forms/deal/' + parameter.id,
     method: 'PUT',
@@ -437,7 +437,7 @@ export function receive (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function nonPlanToPlan (parameter) {
+export function nonPlanToPlan(parameter) {
   return axios({
     url: '/repair/application-forms/nonPlan/toPlan/' + parameter.id,
     method: 'PUT',
@@ -451,21 +451,33 @@ export function nonPlanToPlan (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function closeRepair (parameter) {
+export function closeRepair(parameter) {
   return axios({
     url: '/repair/application-forms/close/repair',
     method: 'PUT',
     data: parameter
   })
 }
-
+/**
+ * finish func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function closeRepair2(parameter) {
+  return axios({
+    url: '/repair/application-forms/close/repair2',
+    method: 'PUT',
+    data: parameter
+  })
+}
 /**
  * 工程师审核报修-通过
  * parameter: { }
  * @param parameter
  * @returns {*}
  */
-export function approve (parameter) {
+export function approve(parameter) {
   return axios({
     url: '/repair/application-forms/approve/' + parameter.id,
     method: 'PUT',
@@ -473,7 +485,7 @@ export function approve (parameter) {
   })
 }
 
-export function receiveRepair (parameter) {
+export function receiveRepair(parameter) {
   return axios({
     url: '/repair/application-forms/receive/repair',
     method: 'PUT',
@@ -481,7 +493,7 @@ export function receiveRepair (parameter) {
   })
 }
 
-export function reportRepair (parameter) {
+export function reportRepair(parameter) {
   return axios({
     url: '/repair/application-forms/report/repair',
     method: 'PUT',
@@ -495,7 +507,7 @@ export function reportRepair (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function returnRepair (parameter) {
+export function returnRepair(parameter) {
   return axios({
     url: '/repair/application-forms/returnRepair/' + parameter.id,
     method: 'PUT',
@@ -508,7 +520,7 @@ export function returnRepair (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function verifyPassRepair (parameter) {
+export function verifyPassRepair(parameter) {
   return axios({
     url: '/repair/application-forms/verify/mm/pass/' + parameter.id,
     method: 'PUT',
@@ -521,7 +533,7 @@ export function verifyPassRepair (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function verifyRefusedRepair (parameter) {
+export function verifyRefusedRepair(parameter) {
   return axios({
     url: '/repair/application-forms/verify/mm/refused/' + parameter.id,
     method: 'PUT',
@@ -534,7 +546,7 @@ export function verifyRefusedRepair (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function verifyProduceRepair (parameter) {
+export function verifyProduceRepair(parameter) {
   return axios({
     url: '/repair/application-forms/verify/produce/pass/' + parameter.id,
     method: 'PUT',
@@ -547,7 +559,7 @@ export function verifyProduceRepair (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function verifyProduceRefusedRepair (parameter) {
+export function verifyProduceRefusedRepair(parameter) {
   return axios({
     url: '/repair/application-forms/verify/produce/refused/' + parameter.id,
     method: 'PUT',
@@ -560,7 +572,7 @@ export function verifyProduceRefusedRepair (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function applyVerifyRepair (parameter) {
+export function applyVerifyRepair(parameter) {
   return axios({
     url: '/repair/application-forms/apply/verify/' + parameter.id,
     method: 'PUT',
@@ -573,7 +585,7 @@ export function applyVerifyRepair (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function recoverRepair (parameter) {
+export function recoverRepair(parameter) {
   return axios({
     url: '/repair/application-forms/recover/' + parameter.id,
     method: 'PUT',
@@ -586,7 +598,7 @@ export function recoverRepair (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function applyBigRepair (parameter) {
+export function applyBigRepair(parameter) {
   return axios({
     url: '/repair/application-forms/apply/bigRepair/' + parameter.id,
     method: 'PUT',
@@ -599,7 +611,7 @@ export function applyBigRepair (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function getProducerUser (parameter) {
+export function getProducerUser(parameter) {
   return axios({
     url: '/upms/user-depts/producer',
     method: 'get',
@@ -614,14 +626,14 @@ export function getProducerUser (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function checkBigRepair (parameter) {
+export function checkBigRepair(parameter) {
   return axios({
     url: '/repair/application-forms/verify/bigRepair/' + parameter.id,
     method: 'PUT',
     data: parameter
   })
 }
-export function repairCancel (parameter) {
+export function repairCancel(parameter) {
   return axios({
     url: '/repair/application-forms/repair/delete/' + parameter.id,
     method: 'PUT'
@@ -633,7 +645,7 @@ export function repairCancel (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function receiveProfessor (parameter) {
+export function receiveProfessor(parameter) {
   return axios({
     url: '/sb/infos/gain/repair/professor/' + parameter.id,
     method: 'get',
@@ -648,7 +660,7 @@ export function receiveProfessor (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function backRepair (parameter) {
+export function backRepair(parameter) {
   return axios({
     url: '/repair/application-forms/back/repair',
     method: 'put',

File diff suppressed because it is too large
+ 224 - 250
src/views/repair/application-form/modules/DetailRepair.vue


+ 54 - 103
src/views/repair/repair/modules/BaseForm.vue

@@ -1,11 +1,5 @@
 <template>
-  <a-modal
-    :title="modalTitle"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @cancel="handleCancel"
-  >
+  <a-modal :title="modalTitle" :width="800" :visible="visible" :confirmLoading="confirmLoading" @cancel="handleCancel">
     <a-form :form="form">
 
       <a-form-item v-show="false">
@@ -16,89 +10,36 @@
 
       <row-list :col="1">
         <row-item>
-          <a-form-item
-            label="维修单号"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              disabled="disabled"
-              v-decorator="['repairNo']" />
+          <a-form-item label="维修单号" :labelCol="BaseTool.Constant.labelCol" :wrapperCol="BaseTool.Constant.wrapperCol">
+            <a-input disabled="disabled" v-decorator="['repairNo']" />
           </a-form-item>
         </row-item>
         <row-item>
-          <a-form-item
-            label="故障类别"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-tree-select
-              style="width: 100%"
-              :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
-              :treeData="treeData"
-              :replaceFields="{value:'no'}"
-              :treeNodeFilterProp="'title'"
-              :showSearch="true"
-              v-decorator="['errorTypeId', {rules: [{required: true, message: '故障类别不能为空'}]}]"
-              placeholder="请选择"
-            >
+          <a-form-item label="故障类别" :labelCol="BaseTool.Constant.labelCol" :wrapperCol="BaseTool.Constant.wrapperCol">
+            <a-tree-select style="width: 100%" :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }" :treeData="treeData" :replaceFields="{value:'id'}" :treeNodeFilterProp="'title'" :showSearch="true" v-decorator="['errorTypeId', {rules: [{required: true, message: '故障类别不能为空'}]}]" placeholder="请选择">
             </a-tree-select>
           </a-form-item>
         </row-item>
         <row-item>
-          <a-form-item
-            label="故障描述"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-textarea
-              :rows="4"
-              v-decorator="['errorContent', {rules: [{required: true, message: '故障描述不能为空'}]}]"/>
+          <a-form-item label="故障描述" :labelCol="BaseTool.Constant.labelCol" :wrapperCol="BaseTool.Constant.wrapperCol">
+            <a-textarea :rows="4" v-decorator="['errorContent', {rules: [{required: true, message: '故障描述不能为空'}]}]" />
           </a-form-item>
         </row-item>
         <row-item>
-          <a-form-item
-            label="方案描述"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-textarea
-              :rows="4"
-              v-decorator="['opinion', {rules: [{required: true, message: '方案描述不能为空'}]}]"/>
+          <a-form-item label="方案描述" :labelCol="BaseTool.Constant.labelCol" :wrapperCol="BaseTool.Constant.wrapperCol">
+            <a-textarea :rows="4" v-decorator="['opinion', {rules: [{required: true, message: '方案描述不能为空'}]}]" />
           </a-form-item>
         </row-item>
         <row-item>
-          <a-form-item
-            label="方案图片"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-upload
-              :action="uploadUrl"
-              :multiple="true"
-              list-type="picture"
-              :file-list="this.defaultApplicationFileList"
-              @change="handleApplicationFileChange"
-              accept="image/*"
-              :headers="headers"
-            >
+          <a-form-item label="方案图片" :labelCol="BaseTool.Constant.labelCol" :wrapperCol="BaseTool.Constant.wrapperCol">
+            <a-upload :action="uploadUrl" :multiple="true" list-type="picture" :file-list="this.defaultApplicationFileList" @change="handleApplicationFileChange" 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.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-upload
-              :action="uploadUrl"
-              :multiple="true"
-              :file-list="defaultFileList"
-              @change="handleFileChange"
-              :headers="headers"
-            >
+          <a-form-item label="维修方案" :labelCol="BaseTool.Constant.labelCol" :wrapperCol="BaseTool.Constant.wrapperCol">
+            <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>
@@ -121,7 +62,7 @@ import { fetchErrorTypeTree } from '@/api/repair/errortype'
 
 export default {
   name: 'BaseRepairScheme',
-  data () {
+  data() {
     return {
       confirmLoading: false,
       modalTitle: null,
@@ -135,43 +76,49 @@ export default {
       defaultFileList: [],
       fileList: [],
       headers: {
-        Authorization: 'Bearer ' + Vue.ls.get(ACCESS_TOKEN)
-      }
+        Authorization: 'Bearer ' + Vue.ls.get(ACCESS_TOKEN),
+      },
     }
   },
   props: {},
   components: {
-    uploadUrl
+    uploadUrl,
   },
-  created () {
+  created() {
     // 下拉框map
-    fetchErrorTypeTree().then(res => {
+    fetchErrorTypeTree().then((res) => {
       // 循环获取样式
       this.treeData = res.data
     })
   },
   methods: {
-    base (record) {
+    base(record) {
       this.visible = true
       console.log(record)
       this.defaultFileList = []
       this.applicationFileList = []
-      const { form: { setFieldsValue } } = this
+      const {
+        form: { setFieldsValue },
+      } = this
       // 日期处理
       this.$nextTick(() => {
-        setFieldsValue(Object.assign(pick(record, [
-          'id',
-          'repairId',
-          'sbId',
-          'errorContent',
-          'opinion',
-          'imageList',
-          'errorTypeId',
-          'opinionFile',
-          'status',
-          'deleteFlag',
-          'repairNo'
-        ])))
+        setFieldsValue(
+          Object.assign(
+            pick(record, [
+              'id',
+              'repairId',
+              'sbId',
+              'errorContent',
+              'opinion',
+              'imageList',
+              'errorTypeId',
+              'opinionFile',
+              'status',
+              'deleteFlag',
+              'repairNo',
+            ])
+          )
+        )
       })
       // 如果是空标识添加
       if (this.BaseTool.Object.isBlank(record)) {
@@ -182,8 +129,10 @@ export default {
       this.defaultApplicationFileList = this.BaseTool.UPLOAD.transImg(record.imageList)
       this.defaultFileList = this.BaseTool.UPLOAD.transImg(record.opinionFile)
     },
-    save () {
-      const { form: { validateFieldsAndScroll } } = this
+    save() {
+      const {
+        form: { validateFieldsAndScroll },
+      } = this
       this.confirmLoading = true
       validateFieldsAndScroll((errors, values) => {
         if (errors) {
@@ -197,20 +146,22 @@ export default {
           addRepairScheme(values)
             .then(() => {
               this.handleCancel(values)
-            }).catch(() => {
+            })
+            .catch(() => {
               this.confirmLoading = false
             })
         } else {
           updateRepairScheme(values)
             .then(() => {
               this.handleCancel(values)
-            }).catch(() => {
+            })
+            .catch(() => {
               this.confirmLoading = false
             })
         }
       })
     },
-    handleCancel (values) {
+    handleCancel(values) {
       this.visible = false
       this.confirmLoading = false
       this.form.resetFields()
@@ -221,15 +172,15 @@ export default {
         this.$emit('ok')
       }
     },
-    handleApplicationFileChange (info) {
+    handleApplicationFileChange(info) {
       this.defaultApplicationFileList = info.fileList
       this.applicationFileList = this.setFileList(info, 11)
     },
-    handleFileChange (info) {
+    handleFileChange(info) {
       this.defaultFileList = info.fileList
       this.fileList = this.setFileList(info, 19)
     },
-    setFileList (info, type) {
+    setFileList(info, type) {
       const file = info.file
       const fileList = info.fileList
       if (file.status === 'done') {
@@ -240,7 +191,7 @@ export default {
         this.$message.error('上传失败')
         return []
       }
-    }
-  }
+    },
+  },
 }
 </script>

Some files were not shown because too many files changed in this diff