筹建完善

src/api/preparation/preparation.js

@@ -133,3 +133,17 @@ export function dispatchModelByDTO (parameter) {
     data: parameter
   })
 }
+
+/**
+ * finish func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function finish (parameter) {
+  return axios({
+    url: '/preparation/preparations/finish/' + parameter.id,
+    method: 'PUT',
+    data: parameter
+  })
+}

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

@@ -24,21 +24,22 @@
       <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="创建人" >{{ model.createdUserName }}</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" >
+        <div v-if="model.imageList != null && model.imageList.length > 0">
+          <viewer :images="model.imageList" @inited="inited" ref="viewer" :index="1" >
             <img
-              v-for="item in model.applicationFileList"
+              v-for="item in model.imageList"
               :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>
+        <div v-if="model.imageList == null || model.imageList.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 v-for="item in model.fileList" :key="item.id" :href="item.url" target="downloadFile" :download="item.name">{{ item.name }}</a>
       </a-descriptions-item>
     </a-descriptions>
     <div class="btn">
@@ -63,7 +64,8 @@ export default {
   components: {
     DetailList,
     DetailListItem,
-    AssignForm
+    AssignForm,
+    FinishForm
   },
   data () {
     return {
@@ -75,9 +77,9 @@ export default {
       // 下拉框map
       model: {
         'id': null,
-        'positionId': null,
-        'userId': null,
-        'departId': null,
+        'positionName': null,
+        'companyName': null,
+        'deptName': null,
         'applyTime': null,
         'content': null,
         'status': null,
@@ -93,7 +95,9 @@ export default {
         'repairContent': null,
         'limitHours': null,
         'fee': null,
-        'feeFile': null
+        'imageList': null,
+        'fileList': null,
+        'dispatchUserName': null
       }
     }
   },

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

@@ -15,62 +15,23 @@
       <row-list :col="2">
         <row-item>
           <a-form-item
-            label="工单类别"
+            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']"
+            <a-input-number
               style="width: 100%"
-              :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
-            />
+              :min="0"
+              :formatter="BaseTool.Amount.formatter"
+              :parser="BaseTool.Amount.parser"
+              v-decorator="['fee', {rules: [{required: true, message: '费用预算不能为空'}]}]" />
           </a-form-item>
         </row-item>
       </row-list>
       <row-list :col="1">
         <row-item>
           <a-form-item
-            label="维修图片"
+            label="图片"
             :labelCol="BaseTool.Constant.labelCol2"
             :wrapperCol="BaseTool.Constant.wrapperCol2"
           >
@@ -89,7 +50,7 @@
         </row-item>
         <row-item>
           <a-form-item
-            label="维修文件"
+            label="文件"
             :labelCol="BaseTool.Constant.labelCol2"
             :wrapperCol="BaseTool.Constant.wrapperCol2"
           >
@@ -110,12 +71,11 @@
             :labelCol="BaseTool.Constant.labelCol2"
             :wrapperCol="BaseTool.Constant.wrapperCol2"
           >
-            <a-textarea v-decorator="['remark']"/>
+            <a-textarea v-decorator="['repairContent']"/>
           </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>
@@ -124,14 +84,10 @@
 
 <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 { finish } from '@/api/preparation/preparation'
 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',
@@ -142,19 +98,10 @@ export default {
       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: [], // 维修图片,
@@ -164,26 +111,16 @@ export default {
     }
   },
   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 = []
       // 如果是空标识添加
@@ -203,34 +140,10 @@ export default {
       }
       this.$nextTick(() => {
         setFieldsValue(Object.assign(pick(record, [
-          'id',
-          'needStop',
-          'level',
-          'category',
-          'repairErrorTypeId',
-          'repairEndTime',
-          'dispatchUserId'
+          'id'
         ])))
       })
     },
-    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)
@@ -260,12 +173,10 @@ export default {
           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)
+        values.imageList = this.repairFileList
+        values.fileList = this.fileList // 维修文件
         finish(values).then(() => {
-          this.$message.info('维修已提交，等待工程师审核')
+          this.$message.info('已完成筹建维修')
           this.handleCancel(values)
         }).catch(() => {
           this.confirmLoading = false
@@ -281,51 +192,7 @@ export default {
       } 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>