设备报废、费用上传附件

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -305,18 +305,18 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             runtimeService.createChangeActivityStateBuilder()
                     .processInstanceId(task.getProcessInstanceId())
                     .moveActivityIdsToSingleActivityId(currentIds, flowTaskVo.getTargetKey()).changeState();
-            String currentTaskId = taskService.createTaskQuery().singleResult().getId();
-            List<HistoricTaskInstance> htiList = historyService.createHistoricTaskInstanceQuery()
-                    .processInstanceId(task.getProcessInstanceId()).taskDefinitionKey(flowTaskVo.getTargetKey())
-                    .list();
-            String taskAssignee = "";
-            for (HistoricTaskInstance hti: htiList) {
-                if (!hti.getId().equals(currentTaskId)) {
-                    taskAssignee = hti.getAssignee();
-                    break;
-                }
-            }
-            taskService.setAssignee(currentTaskId, taskAssignee);
+//            String currentTaskId = taskService.createTaskQuery().singleResult().getId();
+//            List<HistoricTaskInstance> htiList = historyService.createHistoricTaskInstanceQuery()
+//                    .processInstanceId(task.getProcessInstanceId()).taskDefinitionKey(flowTaskVo.getTargetKey())
+//                    .list();
+//            String taskAssignee = "";
+//            for (HistoricTaskInstance hti: htiList) {
+//                if (!hti.getId().equals(currentTaskId)) {
+//                    taskAssignee = hti.getAssignee();
+//                    break;
+//                }
+//            }
+//            taskService.setAssignee(currentTaskId, taskAssignee);
         } catch (FlowableObjectNotFoundException e) {
             throw new CustomException("未找到流程实例，流程可能已发生变化");
         } catch (FlowableException e) {

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcCarExpense.java

@@ -40,6 +40,10 @@ public class CmcCarExpense extends BaseEntity
     @Excel(name = "发生日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date occurDate;
 
+    /** 附件 */
+    @Excel(name = "附件")
+    private String document;
+
     public void setCarExpenseId(String carExpenseId) 
     {
         this.carExpenseId = carExpenseId;
@@ -58,6 +62,16 @@ public class CmcCarExpense extends BaseEntity
     {
         return carId;
     }
+    public void setCar(CmcCar car)
+    {
+        this.car = car;
+        this.licensePlate = car.getLicensePlate();
+    }
+
+    public CmcCar getCar()
+    {
+        return car;
+    }
     public void setExpenseType(String expenseType) 
     {
         this.expenseType = expenseType;
@@ -85,6 +99,15 @@ public class CmcCarExpense extends BaseEntity
     {
         return occurDate;
     }
+    public void setDocument(String document)
+    {
+        this.document = document;
+    }
+
+    public String getDocument()
+    {
+        return document;
+    }
 
     @Override
     public String toString() {

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProject.java

@@ -149,6 +149,10 @@ public class CmcProject extends BaseEntity
     @Excel(name = "项目参与人员")
     private String participates;
 
+    /** 项目任务书 */
+    @Excel(name = "项目任务书")
+    private String taskDocument;
+
     public void setProjectId(String projectId)
     {
         this.projectId = projectId;
@@ -275,6 +279,15 @@ public class CmcProject extends BaseEntity
     {
         return organizeDocument;
     }
+    public void setTaskDocument(String taskDocument)
+    {
+        this.taskDocument = taskDocument;
+    }
+
+    public String getTaskDocument()
+    {
+        return taskDocument;
+    }
     public void setUndertakingDeptName(String undertakingDeptName)
     {
         this.undertakingDeptName = undertakingDeptName;
@@ -419,6 +432,10 @@ public class CmcProject extends BaseEntity
     {
         return kmlLat;
     }
+    public void setCars(String cars)
+    {
+        this.cars = cars;
+    }
 
     public String getCars()
     {

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcSettle.java

@@ -132,6 +132,18 @@ public class CmcSettle extends BaseEntity
     @Excel(name = "总经理审核意见")
     private String gmComment;
 
+    /** 原始结算表 */
+    @Excel(name = "原始结算表")
+    private String settleDocument;
+
+    /** 修改结算表 */
+    @Excel(name = "修改结算表")
+    private String modifyDocument;
+
+    /** 最终算表 */
+    @Excel(name = "最终算表")
+    private String finalDocument;
+
     public void setSettleId(String settleId) 
     {
         this.settleId = settleId;
@@ -375,6 +387,33 @@ public class CmcSettle extends BaseEntity
     {
         return gmComment;
     }
+    public void setSettleDocument(String settleDocument)
+    {
+        this.settleDocument = settleDocument;
+    }
+
+    public String getSettleDocument()
+    {
+        return settleDocument;
+    }
+    public void setModifyDocument(String modifyDocument)
+    {
+        this.modifyDocument = modifyDocument;
+    }
+
+    public String getModifyDocument()
+    {
+        return modifyDocument;
+    }
+    public void setFinalDocument(String finalDocument)
+    {
+        this.finalDocument = finalDocument;
+    }
+
+    public String getFinalDocument()
+    {
+        return finalDocument;
+    }
 
     @Override
     public String toString() {

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcCarExpenseMapper.xml

@@ -11,25 +11,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="expense"    column="expense"    />
         <result property="occurDate"    column="occur_date"    />
         <result property="remark"    column="remark"    />
+        <result property="document"    column="document"    />
+        <association property="car"    javaType="CmcCar"         resultMap="CmcCarResult" />
+    </resultMap>
+
+    <resultMap type="CmcCar" id="CmcCarResult">
+        <result property="carId"    column="car_id"    />
+        <result property="licensePlate"    column="license_plate"    />
     </resultMap>
 
     <sql id="selectCmcCarExpenseVo">
-        select car_expense_id, car_id, expense_type, expense, occur_date, remark from cmc_car_expense
+        select ce.car_expense_id, ce.car_id, c.license_plate, ce.expense_type, ce.expense, ce.occur_date, ce.remark, ce.document from cmc_car_expense as ce
+        left join cmc_car as c on c.car_id = ce.car_id
     </sql>
 
     <select id="selectCmcCarExpenseList" parameterType="CmcCarExpense" resultMap="CmcCarExpenseResult">
         <include refid="selectCmcCarExpenseVo"/>
         <where>  
-            <if test="carId != null "> and car_id = #{carId}</if>
-            <if test="expenseType != null  and expenseType != ''"> and expense_type = #{expenseType}</if>
-            <if test="expense != null "> and expense = #{expense}</if>
-            <if test="occurDate != null "> and occur_date = #{occurDate}</if>
+            <if test="carId != null "> and ce.car_id = #{carId}</if>
+            <if test="expenseType != null  and expenseType != ''"> and ce.expense_type = #{expenseType}</if>
+            <if test="expense != null "> and ce.expense = #{expense}</if>
+            <if test="occurDate != null "> and ce.occur_date = #{occurDate}</if>
         </where>
     </select>
     
     <select id="selectCmcCarExpenseByCarExpenseId" parameterType="String" resultMap="CmcCarExpenseResult">
         <include refid="selectCmcCarExpenseVo"/>
-        where car_expense_id = #{carExpenseId}
+        where ce.car_expense_id = #{carExpenseId}
     </select>
         
     <insert id="insertCmcCarExpense" parameterType="CmcCarExpense">
@@ -41,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="expense != null">expense,</if>
             <if test="occurDate != null">occur_date,</if>
             <if test="remark != null">remark,</if>
+            <if test="document != null">document,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="carExpenseId != null">#{carExpenseId},</if>
@@ -49,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="expense != null">#{expense},</if>
             <if test="occurDate != null">#{occurDate},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="document != null">#{document},</if>
          </trim>
     </insert>
 
@@ -60,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="expense != null">expense = #{expense},</if>
             <if test="occurDate != null">occur_date = #{occurDate},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="document != null">document = #{document},</if>
         </trim>
         where car_expense_id = #{carExpenseId}
     </update>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml

@@ -35,6 +35,7 @@
         <result property="drivers"    column="drivers"    />
         <result property="devices"    column="devices"    />
         <result property="participates"    column="participates"    />
+        <result property="taskDocument"    column="task_document"    />
         <association property="projectLeaderUser"    javaType="SysUser"         resultMap="ProjectLeaderResult" />
         <association property="projectRegistrantUser"    javaType="SysUser"         resultMap="ProjectRegistrantResult" />
         <association property="technicalDirectorUser"    javaType="SysUser"         resultMap="TechnicalDirectorResult" />
@@ -65,7 +66,7 @@
         select p.project_id, p.project_number, p.project_name, p.project_leader, u.nick_name as leader_nick_name, p.is_finished, p.project_source, p.party_a, p.contact_person, p.telephone,
                p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.organize_document, p.organize_time,
                p.register_time, p.plan_time, p.entry_time, p.exit_time, p.remark, c.technical_director, u2.nick_name as director_nick_name, c.quality_inspector, u3.nick_name as inspector_nick_name,
-               u3.user_id as inspector_user_id, p.project_kml, p.project_cp, p.kml_lng, p.kml_lat, p.cars, p.drivers, p.devices, p.participates from cmc_project as p
+               u3.user_id as inspector_user_id, p.project_kml, p.project_cp, p.kml_lng, p.kml_lat, p.cars, p.drivers, p.devices, p.participates, p.task_document from cmc_project as p
         left join sys_user as u on u.user_id = p.project_leader
         left join sys_user as u1 on u1.user_id = p.project_registrant
         left join cmc_technical as c on c.project_id = p.project_id
@@ -139,6 +140,7 @@
             <if test="drivers != null">drivers,</if>
             <if test="devices != null">devices,</if>
             <if test="participates != null">participates,</if>
+            <if test="taskDocument != null">task_document,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectId != null">#{projectId},</if>
@@ -171,6 +173,7 @@
             <if test="drivers != null">#{drivers},</if>
             <if test="devices != null">#{devices},</if>
             <if test="participates != null">#{participates},</if>
+            <if test="taskDocument != null">#{taskDocument},</if>
         </trim>
     </insert>
 
@@ -206,6 +209,7 @@
             <if test="drivers != null">drivers = #{drivers},</if>
             <if test="devices != null">devices = #{devices},</if>
             <if test="participates != null">participates = #{participates},</if>
+            <if test="taskDocument != null">task_document = #{taskDocument},</if>
         </trim>
         where project_id = #{projectId}
     </update>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSettleMapper.xml

@@ -32,10 +32,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="gmUserId"    column="gm_user_id"    />
         <result property="gmTime"    column="gm_time"    />
         <result property="gmComment"    column="gm_comment"    />
+        <result property="settleDocument"    column="settle_document"    />
+        <result property="modifyDocument"    column="modify_document"    />
+        <result property="finalDocument"    column="final_document"    />
     </resultMap>
 
     <sql id="selectCmcSettleVo">
-        select settle_id, project_id, workload_report, reporter, report_time, settle_comment, zh_user_id, zh_time, zh_comment, js_user_id, js_time, js_comment, xm_user_id, xm_time, xm_comment, dept_user_id, dept_time, dept_comment, jy_user_id, jy_time, jy_comment, manager_user_id, manager_time, manager_comment, gm_user_id, gm_time, gm_comment from cmc_settle
+        select settle_id, project_id, workload_report, reporter, report_time, settle_comment, zh_user_id, zh_time, zh_comment, js_user_id, js_time, js_comment, xm_user_id, xm_time, xm_comment, dept_user_id, dept_time, dept_comment, jy_user_id, jy_time, jy_comment, manager_user_id, manager_time, manager_comment, gm_user_id, gm_time, gm_comment, settle_document, modify_document, final_document from cmc_settle
     </sql>
 
     <select id="selectCmcSettleList" parameterType="CmcSettle" resultMap="CmcSettleResult">
@@ -106,6 +109,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gmUserId != null">gm_user_id,</if>
             <if test="gmTime != null">gm_time,</if>
             <if test="gmComment != null">gm_comment,</if>
+            <if test="settleDocument != null">settle_document,</if>
+            <if test="modifyDocument != null">modify_document,</if>
+            <if test="finalDocument != null">final_document,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="settleId != null">#{settleId},</if>
@@ -135,6 +141,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gmUserId != null">#{gmUserId},</if>
             <if test="gmTime != null">#{gmTime},</if>
             <if test="gmComment != null">#{gmComment},</if>
+            <if test="settleDocument != null">#{settleDocument},</if>
+            <if test="modifyDocument != null">#{modifyDocument},</if>
+            <if test="finalDocument != null">#{finalDocument},</if>
          </trim>
     </insert>
 
@@ -167,6 +176,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gmUserId != null">gm_user_id = #{gmUserId},</if>
             <if test="gmTime != null">gm_time = #{gmTime},</if>
             <if test="gmComment != null">gm_comment = #{gmComment},</if>
+            <if test="settleDocument != null">settle_document = #{settleDocument},</if>
+            <if test="modifyDocument != null">modify_document = #{modifyDocument},</if>
+            <if test="finalDocument != null">final_document = #{finalDocument},</if>
         </trim>
         where settle_id = #{settleId}
     </update>

oa-ui/src/components/FileUpload/index.vue

@@ -119,6 +119,9 @@ export default {
       deep: true,
       immediate: true,
     },
+    filePathName(newVal){
+      this.additionalData.fileType = newVal
+    }
   },
   computed: {
     // 是否显示提示

oa-ui/src/views/oa/car/detail.vue

@@ -115,7 +115,8 @@
               <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
             </el-col>
             <el-col :span="1.5">
-              <el-button type="info" plain icon="el-icon-s-release" size="mini"@click="handleScrap">{{ scrapButtonName }}</el-button>
+              <el-button type="info" plain icon="el-icon-s-release" size="mini" @click="handleScrap">{{ scrapButtonName
+              }}</el-button>
             </el-col>
           </el-row>
           <el-table v-loading="loading" :data="expenseList" @selection-change="handleSelectionChange">
@@ -137,6 +138,7 @@
               </template>
             </el-table-column>
             <el-table-column width="55" align="center" label="备注" prop="remark" />
+            <el-table-column label="附件" align="center" prop="document" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -198,7 +200,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="expenseForm" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="费用类型" prop="expenseType">
-          <el-select v-model="form.expenseType" placeholder="请选择" clearable>
+          <el-select v-model="form.expenseType" placeholder="请选择" clearable @change="expenseTypePath">
             <el-option label="保险费" value="0"></el-option>
             <el-option label="维修/保养费" value="1"></el-option>
             <el-option label="轮胎费" value="2"></el-option>
@@ -214,6 +216,22 @@
         <el-form-item label="备注说明" prop="remark">
           <el-input type="textarea" v-model="form.remark" placeholder="请输入备注说明" style="width:220px" />
         </el-form-item>
+        <el-form-item label="附件" prop="document">
+          <FileUpload :limit="1" :filePathName="expenseName" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+            @input="getExpensePath"></FileUpload>
+          <div v-if="modifyOpen">
+            <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
+              tag="ul">
+              <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
+                <el-link :href="`${baseUrl}${'/profile/upload' + form.document}`" :underline="false" target="_blank">
+                  <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
+                    {{ getFileName(form.document) }}
+                  </span>
+                </el-link>
+              </li>
+            </transition-group>
+          </div>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -241,7 +259,20 @@
           <el-input v-model="scrapForm.remark" placeholder="请输入备注" />
         </el-form-item>
         <el-form-item label="附件" prop="document">
-          <el-input v-model="scrapForm.document" placeholder="请输入附件" />
+          <FileUpload :limit="1" :filePathName="'车辆/报废'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+            @input="getScrapPath"></FileUpload>
+          <div v-if="scrapModifyOpen">
+            <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
+              tag="ul">
+              <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
+                <el-link :href="`${baseUrl}${'/profile/upload' + scrapForm.document}`" :underline="false" target="_blank">
+                  <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
+                    {{ getFileName(scrapForm.document) }}
+                  </span>
+                </el-link>
+              </li>
+            </transition-group>
+          </div>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -272,6 +303,7 @@ export default {
       }, 100)
     }
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       column: 4,
       carInfo: {},
       expenseList: [],
@@ -289,10 +321,13 @@ export default {
       single: true,
       title: '',
       open: false,
+      modifyOpen: false,
       scrapOpen: false,
+      scrapModifyOpen: false,
       form: {},
       scrapForm: {},
       scrapButtonName: '',
+      expenseName: '',
       rules: {
         expenseType: [
           { required: true, message: '请选择费用类型', trigger: 'change' }
@@ -340,7 +375,7 @@ export default {
       this.$router.push({ path: '/car' });
     },
     getScrapStatus() {
-      this.queryParams.deviceId = this.$route.query.deviceId
+      this.queryParams.carId = this.$route.query.carId
       listDeviceScrap(this.queryParams).then(res => {
         if (res.total > 0)
           this.scrapButtonName = '查看报废信息';
@@ -369,6 +404,7 @@ export default {
       const carExpenseId = row.carExpenseId || this.ids
       getCarExpense(carExpenseId).then(response => {
         this.form = response.data;
+        this.modifyOpen = true;
         this.open = true;
         this.title = "修改车辆明细";
       });
@@ -407,6 +443,7 @@ export default {
             updateCarExpense(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
+              this.modifyOpen = false;
               this.getList();
             });
           } else {
@@ -421,14 +458,37 @@ export default {
     },
     cancel() {
       this.open = false;
+      this.modifyOpen = false;
       this.reset();
     },
+    //费用附件路径
+    getExpensePath(val) {
+      let arr = val.split('/upload')
+      this.form.document = arr[1]
+      if (val == "") {
+        this.form.document = ""
+      }
+    },
+    //报废附件路径
+    getScrapPath(val) {
+      let arr = val.split('/upload')
+      this.scrapForm.document = arr[1]
+      if (val == "") {
+        this.scrapForm.document = ""
+      }
+    },
+    getFileName(name) {
+      if (name) {
+        let arr = name.split('/')
+        return arr[arr.length - 1];
+      }
+    },
     /* 报废记录 */
     handleScrap() {
       if (this.scrapButtonName == '查看报废信息')
-        this.handleUpdateScrap();      
+        this.handleUpdateScrap();
       else
-        this.handleAddScrap();  
+        this.handleAddScrap();
     },
     handleAddScrap() {
       this.resetScrap();
@@ -441,6 +501,7 @@ export default {
       listDeviceScrap(this.scrapForm).then(response => {
         this.scrapForm = response.rows[0];
         this.scrapOpen = true;
+        this.scrapModifyOpen = true;
         this.title = "修改设备报废信息";
       });
     },
@@ -459,13 +520,20 @@ export default {
             updateDeviceScrap(this.scrapForm).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.scrapOpen = false;
-              this.getScrapList();
+              this.scrapModifyOpen = false;
+              getCar(this.$route.query.carId).then(res => {
+                this.carInfo = res.data;
+              });
+              this.getScrapStatus();
             });
           } else {
             addDeviceScrap(this.scrapForm).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.scrapOpen = false;
-              this.getScrapList();
+              getCar(this.$route.query.carId).then(res => {
+                this.carInfo = res.data;
+              });
+              this.getScrapStatus();
             });
           }
         }
@@ -473,11 +541,23 @@ export default {
     },
     scrapCancel() {
       this.scrapOpen = false;
+      this.scrapModifyOpen = false;
       this.resetScrap();
     },
     isNumber(value) {
       return typeof value === 'number' && /^\d+(\.\d+)?$/.test(value);
     },
+    expenseTypePath(val) {
+      if (val == '0') {
+        this.expenseName = '车辆/费用/保险费'
+      }
+      if (val == '1') {
+        this.expenseName = '车辆/费用/维修保养费'
+      }
+      if (val == '2') {
+        this.expenseName = '车辆/费用/轮胎费'
+      }
+    },
     statusTypeText(row) {
       if (row == '0') {
         return '被领用'

oa-ui/src/views/oa/device/detail.vue

@@ -271,7 +271,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="费用类型" prop="expenseType">
-          <el-select v-model="expenseForm.expenseType" placeholder="请选择" clearable>
+          <el-select v-model="expenseForm.expenseType" placeholder="请选择" clearable @change="expenseTypePath">
             <el-option label="保险费" value="0"></el-option>
             <el-option label="维修/保养费" value="1"></el-option>
             <el-option label="检定费" value="2"></el-option>
@@ -289,7 +289,21 @@
           <el-input v-model="expenseForm.remark" placeholder="请输入备注" />
         </el-form-item>
         <el-form-item label="附件" prop="document">
-          <el-input v-model="expenseForm.document" placeholder="请输入附件" />
+          <FileUpload :limit="1" :filePathName="expenseName" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+            @input="getExpensePath"></FileUpload>
+          <div v-if="expenseModifyOpen">
+            <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
+              tag="ul">
+              <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
+                <el-link :href="`${baseUrl}${'/profile/upload' + expenseForm.document}`" :underline="false"
+                  target="_blank">
+                  <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
+                    {{ getFileName(expenseForm.document) }}
+                  </span>
+                </el-link>
+              </li>
+            </transition-group>
+          </div>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -381,7 +395,20 @@
           <el-input v-model="scrapForm.remark" placeholder="请输入备注" />
         </el-form-item>
         <el-form-item label="附件" prop="document">
-          <el-input v-model="scrapForm.document" placeholder="请输入附件" />
+          <FileUpload :limit="1" :filePathName="'设备/报废'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+            @input="getScrapPath"></FileUpload>
+          <div v-if="scrapModifyOpen">
+            <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
+              tag="ul">
+              <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
+                <el-link :href="`${baseUrl}${'/profile/upload' + scrapForm.document}`" :underline="false" target="_blank">
+                  <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
+                    {{ getFileName(scrapForm.document) }}
+                  </span>
+                </el-link>
+              </li>
+            </transition-group>
+          </div>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -415,6 +442,7 @@ export default {
       }, 100)
     }
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -443,8 +471,10 @@ export default {
       title: "",
       // 是否显示弹出层
       expenseOpen: false,
+      expenseModifyOpen: false,
       handoverOpen: false,
       scrapOpen: false,
+      scrapModifyOpen: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -461,7 +491,8 @@ export default {
       },
       loading: false,
       routeType: '',
-      scrapButtonName: ''
+      scrapButtonName: '',
+      expenseName: ''
     }
   },
   created() {
@@ -540,6 +571,28 @@ export default {
       this.$tab.closeOpenPage(obj);
       this.$router.push({ path: '/device/' + this.routeType });
     },
+    //费用附件路径
+    getExpensePath(val) {
+      let arr = val.split('/upload')
+      this.expenseForm.document = arr[1]
+      if (val == "") {
+        this.expenseForm.document = ""
+      }
+    },
+    //报废附件路径
+    getScrapPath(val) {
+      let arr = val.split('/upload')
+      this.scrapForm.document = arr[1]
+      if (val == "") {
+        this.scrapForm.document = ""
+      }
+    },
+    getFileName(name) {
+      if (name) {
+        let arr = name.split('/')
+        return arr[arr.length - 1];
+      }
+    },
     /** 搜索按钮操作 */
     handleExpenseQuery() {
       this.queryParams.pageNum = 1;
@@ -553,16 +606,15 @@ export default {
       this.multiple = !selection.length
     },
     handleAddExpense() {
-      this.resetExpense();
       this.expenseOpen = true;
       this.title = "添加设备费用明细";
     },
     handleUpdateExpense(row) {
-      this.resetExpense();
       const deviceExpenseId = row.deviceExpenseId || this.expenseIds
       getDeviceExpense(deviceExpenseId).then(response => {
         this.expenseForm = response.data;
         this.expenseOpen = true;
+        this.expenseModifyOpen = true;
         this.title = "修改设备费用明细";
       });
     },
@@ -595,6 +647,7 @@ export default {
             updateDeviceExpense(this.expenseForm).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.expenseOpen = false;
+              this.expenseModifyOpen = false;
               this.getExpenseList();
             });
           } else {
@@ -609,6 +662,7 @@ export default {
     },
     expenseCancel() {
       this.expenseOpen = false;
+      this.expenseModifyOpen = false;
       this.resetExpense();
     },
 
@@ -700,9 +754,9 @@ export default {
     /* 报废记录 */
     handleScrap() {
       if (this.scrapButtonName == '查看报废信息')
-        this.handleUpdateScrap();      
+        this.handleUpdateScrap();
       else
-        this.handleAddScrap();  
+        this.handleAddScrap();
     },
     handleAddScrap() {
       this.resetScrap();
@@ -715,6 +769,7 @@ export default {
       listDeviceScrap(this.scrapForm).then(response => {
         this.scrapForm = response.rows[0];
         this.scrapOpen = true;
+        this.scrapModifyOpen = true;
         this.title = "修改设备报废信息";
       });
     },
@@ -733,13 +788,20 @@ export default {
             updateDeviceScrap(this.scrapForm).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.scrapOpen = false;
-              this.getScrapList();
+              this.scrapModifyOpen = false;
+              getDevice(this.$route.query.deviceId).then(res => {
+                this.deviceInfo = res.data;
+              });
+              this.getScrapStatus();
             });
           } else {
             addDeviceScrap(this.scrapForm).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.scrapOpen = false;
-              this.getScrapList();
+              getDevice(this.$route.query.deviceId).then(res => {
+                this.deviceInfo = res.data;
+              });
+              this.getScrapStatus();
             });
           }
         }
@@ -747,11 +809,23 @@ export default {
     },
     scrapCancel() {
       this.scrapOpen = false;
+      this.scrapModifyOpen = false;
       this.resetScrap();
     },
     isNumber(value) {
       return typeof value === 'number' && /^\d+(\.\d+)?$/.test(value);
     },
+    expenseTypePath(val) {
+      if (val == '0') {
+        this.expenseName = '设备/保险费'
+      }
+      if (val == '1') {
+        this.expenseName = '设备/维修保养费'
+      }
+      if (val == '2') {
+        this.expenseName = '设备/检定费'
+      }
+    },
     expenseTypeText(row) {
       if (row == '0') {
         return '保险费'