chenyuehu %!s(int64=4) %!d(string=hai) anos
pai
achega
7ca9daded9

+ 1 - 1
src/views/repair/application-form/modules/DetailRepairOut.vue

@@ -19,7 +19,7 @@
           <a-divider orientation="left">委外详情</a-divider>
           <detail-list title="" :col="3">
             <detail-list-item term="委外单号">{{ model.no }}</detail-list-item>
-            <detail-list-item term="委外单号">{{ outTypeMap[model.outType] }}</detail-list-item>
+            <detail-list-item term="委外类别">{{ outTypeMap[model.outType] }}</detail-list-item>
             <detail-list-item term="委外时间">{{ model.applyTime }}</detail-list-item>
             <detail-list-item term="委外状态"><badge :text="BaseTool.Object.getField(statusMap,model.status)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_STATUS[model.status]"/></detail-list-item>
           </detail-list>

+ 7 - 2
src/views/repair/application-form/modules/FinishForm.vue

@@ -134,6 +134,8 @@ 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'
 
 export default {
   name: 'BaseRepairApplicationForm',
@@ -147,6 +149,9 @@ export default {
       // 下拉框map
       treeData: [],
       descripitionMap: {},
+      headers: {
+        Authorization: 'Bearer ' + Vue.ls.get(ACCESS_TOKEN)
+      },
       sourceMap: {},
       levelMap: {},
       needStopMap: {},
@@ -180,7 +185,7 @@ export default {
         this.modalTitle = '添加'
         return
       }
-      this.modalTitle = '编辑'
+      this.modalTitle = '维修完成'
       const { form: { setFieldsValue } } = this
       // 日期处理
       record.applyTime = this.BaseTool.Moment(record.applyTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
@@ -199,7 +204,7 @@ export default {
         this.userList = res.data
       })
     },
-    handleApplicationFileChange (info) {
+    handleRepairFileChange (info) {
       this.defaultRepairFileList = info.fileList
       this.repairFileList = this.setFileList(info, 12)
     },

+ 10 - 2
src/views/repair/application-form/modules/FinishOutForm.vue

@@ -97,6 +97,8 @@ 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'
 
 export default {
   name: 'BaseRepairApplicationForm',
@@ -111,9 +113,13 @@ export default {
       treeData: [],
       descripitionMap: {},
       sourceMap: {},
+      outTypeMap: {},
       levelMap: {},
       needStopMap: {},
       statusMap: {},
+      headers: {
+        Authorization: 'Bearer ' + Vue.ls.get(ACCESS_TOKEN)
+      },
       uploadUrl: uploadUrl,
       defaultRepairFileList: [],
       repairFileList: [], // 维修图片,
@@ -132,6 +138,7 @@ export default {
     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.outTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_OUT_TYPE)
   },
   methods: {
     base (record) {
@@ -143,7 +150,7 @@ export default {
         this.modalTitle = '添加'
         return
       }
-      this.modalTitle = '编辑'
+      this.modalTitle = '委外完成'
       const { form: { setFieldsValue } } = this
       // 日期处理
       this.$nextTick(() => {
@@ -160,7 +167,7 @@ export default {
         this.userList = res.data
       })
     },
-    handleApplicationFileChange (info) {
+    handleRepairFileChange (info) {
       this.defaultRepairFileList = info.fileList
       this.repairFileList = this.setFileList(info, 12)
     },
@@ -186,6 +193,7 @@ export default {
         }
         // 日期处理
         values.repairFileList = this.repairFileList
+        console.log(values)
         finish(values).then(() => {
           this.handleCancel(values)
         }).catch(() => {