修改设备、车辆记录

oa-ui/src/views/flowable/form/budget/components/choosePeople.vue

@@ -129,12 +129,10 @@ export default {
       return row.userId;
     },
     confirmChoose() {
-      debugger
       if (this.chooseUser)
         this.$emit('chooseUser', this.chooseUser)
     },
     confirmChooseBySingle() {
-      debugger
       if (!this.multiple) {
         if (this.chooseUser)
           this.$emit('chooseUser', this.chooseUser)

oa-ui/src/views/flowable/form/oa/carForm.vue

@@ -2,13 +2,13 @@
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-19 16:36:07
+ * @LastEditTime: 2024-06-21 14:35:59
 -->
 
 <template>
   <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading">
     <el-row :gutter="20">
-      <el-col :span="18" :xs="24">
+      <el-col :span="flowDisabled ? 18 : 24" :xs="24">
         <el-card>
           <h2 style="text-align: center;">用车申请表</h2>
           <div>
@@ -221,7 +221,7 @@
         </el-card>
 
       </el-col>
-      <el-col :span="6" :xs="24">
+      <el-col :span="6" :xs="24" v-if="flowDisabled">
         <el-card>
           <h2 style="text-align: center;">流程进度</h2>
           <div>
@@ -267,6 +267,15 @@ export default {
     taskForm: {
       type: Object,
       required: true
+    },
+    flowDisabled: {
+      type: Boolean,
+      default: true
+    }
+  },
+  watch:{
+    'taskForm.formId'(){
+      this.initForm();
     }
   },
   created() {
@@ -295,9 +304,10 @@ export default {
     this.getProjectList();
     this.getCarList();
     this.getDriverList();
-    flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
-      this.flowData = res.data;
-    })
+    if (this.flowDisabled)
+      flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
+        this.flowData = res.data;
+      })
   },
   data() {
     return {

oa-ui/src/views/flowable/form/oa/deviceForm.vue

@@ -2,13 +2,13 @@
  * @Author: ysh
  * @Date: 2024-03-07 13:44:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-13 14:19:38
+ * @LastEditTime: 2024-06-21 16:50:43
 -->
 
 <template>
   <div>
     <el-row :gutter="20">
-      <el-col :span="18" :xs="24">
+      <el-col :span="flowDisabled ? 18 : 24" :xs="24">
         <el-card>
           <h2 style="text-align: center;">设备申请表</h2>
           <div>
@@ -178,7 +178,7 @@
         </el-card>
 
       </el-col>
-      <el-col :span="6" :xs="24">
+      <el-col :span="6" :xs="24" v-if="flowDisabled">
         <el-card>
           <h2 style="text-align: center;">流程进度</h2>
           <div>
@@ -226,6 +226,10 @@ export default {
     taskForm: {
       type: Object,
       required: true
+    },
+    flowDisabled: {
+      type: Boolean,
+      default: true
     }
   },
   created() {
@@ -241,6 +245,7 @@ export default {
     this.form.dept.deptName = this.$store.getters.deptName;
     this.getProjectList();
     this.getDeviceList();
+    if(this.flowDisabled)
     flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
       this.flowData = res.data;
     })

oa-ui/src/views/flowable/form/projectProcess/technicalTab.vue

@@ -212,7 +212,6 @@ export default {
       }
     },
     processQualityInspector(form) {
-      debugger
       if (Array.isArray(form.qualityInspector)) {
         // 如果已经是数组，则不需要进一步处理  
         // 除非你想将数组中的字符串元素转换为整数  

oa-ui/src/views/flowable/form/settleForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-07 10:00:28
+ * @LastEditTime: 2024-06-21 13:46:50
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -12,7 +12,7 @@
         :settleList="oldSettleSumList" @cancel="printOpen = false"></settle-print>
     </el-dialog>
     <el-row :gutter="20">
-      <el-col :span="19" :xs="24">
+      <el-col :span="flowDisabled ? 19 : 24" :xs="24">
         <h2 class="text-center">项目结算表</h2>
         <div class="headers">
           项目信息
@@ -58,7 +58,7 @@
                 {{ chooseProject.undertakingDeptName }}
               </el-descriptions-item>
               <el-descriptions-item label="项目登记人" label-class-name="my-label">
-                {{ chooseProject.projectRegistrantUser ? chooseProject.projectRegistrantUser.nickName:"" }}
+                {{ chooseProject.projectRegistrantUser ? chooseProject.projectRegistrantUser.nickName : "" }}
               </el-descriptions-item>
             </el-descriptions>
           </el-form-item>
@@ -435,7 +435,7 @@
           <el-button type="primary" @click="submitNextFlow">提交下一个流程</el-button>
         </div>
       </el-col>
-      <el-col :span="5" :xs="24">
+      <el-col :span="5" :xs="24" v-if="flowDisabled">
         <el-card>
           <h2 style="text-align: center">流程进度</h2>
           <div>
@@ -521,8 +521,17 @@ export default {
       type: Boolean,
       default: false,
     },
+    flowDisabled: {
+      type: Boolean,
+      default: true
+    }
+  },
+  watch: {
+    'taskForm.formId'() {
+
+      this.initForm();
+    }
   },
-  watch: {},
   data() {
     return {
       baseUrl: process.env.VUE_APP_BASE_API,
@@ -590,13 +599,13 @@ export default {
     this.getProjectList(); //获取项目列表
     this.getContractDataList(); //获取合同编码和编号
     this.initForm();
-
-    flowXmlAndNode({
-      procInsId: this.taskForm.procInsId,
-      deployId: this.taskForm.deployId,
-    }).then((res) => {
-      this.flowData = res.data;
-    });
+    if (this.flowDisabled)
+      flowXmlAndNode({
+        procInsId: this.taskForm.procInsId,
+        deployId: this.taskForm.deployId,
+      }).then((res) => {
+        this.flowData = res.data;
+      });
   },
   mounted() {
     if (this.$route.query.projectId) {

oa-ui/src/views/oa/brand/brandProject.vue

@@ -42,9 +42,6 @@
             :percentage="scope.row.percentage" text-color="#fff"></el-progress>
         </template>
       </el-table-column>
-      <el-table-column label="收款进度" align="center">
-        <template slot-scope="scope"></template>
-      </el-table-column>
       <el-table-column label="项目编号" align="center" prop="projectNumber" />
       <el-table-column label="项目名称" align="center" prop="projectName" width="200px" />
       <el-table-column label="甲方单位" align="center" prop="partyA.partyAName" width="200px" />
@@ -304,7 +301,6 @@ export default {
             pageSize: 200,
             projectId: item.projectId
           }).then(res => {
-            debugger
             if (res.rows) {
               let len = res.rows.length
               if (len != 0) {

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

@@ -8,19 +8,23 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="使用部门" prop="useDept">
+      <el-form-item label="申请部门" prop="useDept">
         <el-select v-model="queryParams.useDept" filterable clearable @change="handleQuery">
           <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
             :value="item.deptId">
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="项目id" prop="projectId">
-        <el-input v-model="queryParams.projectId" placeholder="请输入项目id" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="项目编号" prop="projectId">
+        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入项目编号"
+          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
+          <el-option v-for="project in projectList" :key="project.projectId"
+            :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -34,69 +38,48 @@
 
     <el-table v-loading="loading" :data="carApprovalList" @selection-change="handleSelectionChange">
       <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column label="用车申请id" align="center" prop="carApplyId" />
-      <el-table-column label="申请人" align="center" prop="applier" >
-        <template slot-scope="scope">
-          {{ getUserName(scope.row.applier) }}
-        </template>
-      </el-table-column>
-      <el-table-column label="使用部门" align="center" prop="useDept" />
-      <el-table-column label="车辆id" align="center" prop="cars" />
-      <el-table-column label="驾驶员id" align="center" prop="drivers" />
-      <el-table-column label="项目id" align="center" prop="projectId" />
-      <el-table-column label="申请用途" align="center" prop="carUsage" />
-      <el-table-column label="用车事由" align="center" prop="applyReason" />
-      <el-table-column label="人数" align="center" prop="passengers" />
-      <el-table-column label="开始日期" align="center" prop="beginDate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.beginDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="结束日期" align="center" prop="endDate" width="180">
+      <!-- <el-table-column label="用车申请id" align="center" prop="carApplyId" /> -->
+      <el-table-column label="申请类型" align="center" prop="carUsage">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
+          <el-tag :type="setTypeCarUsage(scope.row.carUsage)">
+            {{ setCarUsage(scope.row.carUsage) }}
+          </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="天数" align="center" prop="days" />
-      <el-table-column label="部门审批人" align="center" prop="deptUserId" />
-      <el-table-column label="部门审批意见" align="center" prop="deptComment" />
-      <el-table-column label="部门审批时间" align="center" prop="deptTime" width="180">
+      <el-table-column label="申请人" align="center" prop="applier">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.deptTime, '{y}-{m}-{d}') }}</span>
+          {{ getUserName(scope.row.applier) }}
         </template>
       </el-table-column>
-      <el-table-column label="分管审批人" align="center" prop="managerUserId" />
-      <el-table-column label="分管审批意见" align="center" prop="managerComment" />
-      <el-table-column label="分管审批时间" align="center" prop="managerTime" width="180">
+      <el-table-column label="申请部门" align="center" prop="useDept">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.managerTime, '{y}-{m}-{d}') }}</span>
+          {{ getDeptName(scope.row.useDept) }}
         </template>
       </el-table-column>
-      <el-table-column label="工会审批人" align="center" prop="unionUserId" />
-      <el-table-column label="工会审批意见" align="center" prop="unionComment" />
-      <el-table-column label="工会审批时间" align="center" prop="unionTime" width="180">
+      <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
+      <el-table-column label="项目名称" align="center" prop="project.projectName" width="200px" />
+      <el-table-column label="用车事由" align="center" prop="applyReason" />
+      <el-table-column label="乘车人数" align="center" prop="passengers" />
+      <el-table-column label="开始日期" align="center" prop="beginDate">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.unionTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.beginDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="总经理审批人" align="center" prop="gmUserId" />
-      <el-table-column label="总经理审批意见" align="center" prop="gmComment" />
-      <el-table-column label="总经理审批时间" align="center" prop="gmTime" width="180">
+      <el-table-column label="结束日期" align="center" prop="endDate" >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.gmTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="派车人" align="center" prop="dispatcher" />
-      <el-table-column label="派车审批意见" align="center" prop="dispatchComment" />
-      <el-table-column label="派车审批时间" align="center" prop="dispatchTime" width="180">
+      <el-table-column label="天数" align="center" prop="days" />
+      <el-table-column label="部门审批人" align="center" prop="deptUserId" />
+      <el-table-column label="申请日期" align="center" prop="applyDate">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.dispatchTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="预计用车成本" align="center" prop="estimateCost" />
-      <el-table-column label="申请日期" align="center" prop="applyDate" width="180">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)">查看</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -105,120 +88,19 @@
       @pagination="getList" />
 
     <!-- 添加或修改cmc用车审批对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="申请人" prop="applier">
-          <el-input v-model="form.applier" placeholder="请输入申请人" />
-        </el-form-item>
-        <el-form-item label="使用部门" prop="useDept">
-          <el-input v-model="form.useDept" placeholder="请输入使用部门" />
-        </el-form-item>
-        <el-form-item label="车辆id" prop="cars">
-          <el-input v-model="form.cars" placeholder="请输入车辆id" />
-        </el-form-item>
-        <el-form-item label="驾驶员id" prop="drivers">
-          <el-input v-model="form.drivers" placeholder="请输入驾驶员id" />
-        </el-form-item>
-        <el-form-item label="项目id" prop="projectId">
-          <el-input v-model="form.projectId" placeholder="请输入项目id" />
-        </el-form-item>
-        <el-form-item label="申请用途" prop="carUsage">
-          <el-input v-model="form.carUsage" placeholder="请输入申请用途" />
-        </el-form-item>
-        <el-form-item label="用车事由" prop="applyReason">
-          <el-input v-model="form.applyReason" placeholder="请输入用车事由" />
-        </el-form-item>
-        <el-form-item label="人数" prop="passengers">
-          <el-input v-model="form.passengers" placeholder="请输入人数" />
-        </el-form-item>
-        <el-form-item label="开始日期" prop="beginDate">
-          <el-date-picker clearable v-model="form.beginDate" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择开始日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="结束日期" prop="endDate">
-          <el-date-picker clearable v-model="form.endDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择结束日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="天数" prop="days">
-          <el-input v-model="form.days" placeholder="请输入天数" />
-        </el-form-item>
-        <el-form-item label="部门审批人" prop="deptUserId">
-          <el-input v-model="form.deptUserId" placeholder="请输入部门审批人" />
-        </el-form-item>
-        <el-form-item label="部门审批意见" prop="deptComment">
-          <el-input v-model="form.deptComment" placeholder="请输入部门审批意见" />
-        </el-form-item>
-        <el-form-item label="部门审批时间" prop="deptTime">
-          <el-date-picker clearable v-model="form.deptTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择部门审批时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="分管审批人" prop="managerUserId">
-          <el-input v-model="form.managerUserId" placeholder="请输入分管审批人" />
-        </el-form-item>
-        <el-form-item label="分管审批意见" prop="managerComment">
-          <el-input v-model="form.managerComment" placeholder="请输入分管审批意见" />
-        </el-form-item>
-        <el-form-item label="分管审批时间" prop="managerTime">
-          <el-date-picker clearable v-model="form.managerTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择分管审批时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="工会审批人" prop="unionUserId">
-          <el-input v-model="form.unionUserId" placeholder="请输入工会审批人" />
-        </el-form-item>
-        <el-form-item label="工会审批意见" prop="unionComment">
-          <el-input v-model="form.unionComment" placeholder="请输入工会审批意见" />
-        </el-form-item>
-        <el-form-item label="工会审批时间" prop="unionTime">
-          <el-date-picker clearable v-model="form.unionTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择工会审批时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="总经理审批人" prop="gmUserId">
-          <el-input v-model="form.gmUserId" placeholder="请输入总经理审批人" />
-        </el-form-item>
-        <el-form-item label="总经理审批意见" prop="gmComment">
-          <el-input v-model="form.gmComment" placeholder="请输入总经理审批意见" />
-        </el-form-item>
-        <el-form-item label="总经理审批时间" prop="gmTime">
-          <el-date-picker clearable v-model="form.gmTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择总经理审批时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="派车人" prop="dispatcher">
-          <el-input v-model="form.dispatcher" placeholder="请输入派车人" />
-        </el-form-item>
-        <el-form-item label="派车审批意见" prop="dispatchComment">
-          <el-input v-model="form.dispatchComment" placeholder="请输入派车审批意见" />
-        </el-form-item>
-        <el-form-item label="派车审批时间" prop="dispatchTime">
-          <el-date-picker clearable v-model="form.dispatchTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择派车审批时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="预计用车成本" prop="estimateCost">
-          <el-input v-model="form.estimateCost" placeholder="请输入预计用车成本" />
-        </el-form-item>
-        <el-form-item label="申请日期" prop="applyDate">
-          <el-date-picker clearable v-model="form.applyDate" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择申请日期">
-          </el-date-picker>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
+    <el-dialog :title="title" :visible.sync="open" width="65%" append-to-body>
+      <car-form :taskForm="taskForm" :taskName="''" :flowDisabled="false"></car-form>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { listCarApproval, getCarApproval, delCarApproval, addCarApproval, updateCarApproval } from "@/api/oa/car/carApproval";
+import { listProject } from '@/api/oa/project/project';
+import carForm from '../../flowable/form/oa/carForm.vue';
 
 export default {
+  components: { carForm },
   name: "CarApproval",
   data() {
     return {
@@ -277,6 +159,10 @@ export default {
       form: {},
       // 表单校验
       rules: {
+      },
+      projectList: [],
+      taskForm: {
+        formId: ''
       }
     };
   },
@@ -293,6 +179,15 @@ export default {
         this.loading = false;
       });
     },
+    remoteMethod(val) {
+      listProject({
+        pageNum: 1,
+        pageSize: 20,
+        projectNumber: val
+      }).then(res => {
+        this.projectList = res.rows;
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -355,6 +250,10 @@ export default {
       this.open = true;
       this.title = "添加cmc用车审批";
     },
+    handleView(row) {
+      this.open = true;
+      this.taskForm.formId = row.carApplyId;
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
@@ -400,6 +299,28 @@ export default {
       this.download('oa/carApproval/export', {
         ...this.queryParams
       }, `carApproval_${new Date().getTime()}.xlsx`)
+    },
+    setCarUsage(val) {
+      if (val == '0') {
+        return '项目用车'
+      } else if (val == '1') {
+        return '非项目用车'
+      } else if (val == '2') {
+        return '工会用车'
+      } else if (val == '3') {
+        return '党委用车'
+      } else if (val == '4') {
+        return '团委用车'
+      }
+    },
+    setTypeCarUsage(val) {
+      if (val == '0') {
+        return 'success'
+      } else if (val == '1') {
+        return 'warning'
+      } else {
+        return ''
+      }
     }
   }
 };

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

@@ -1,8 +1,13 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="车辆id" prop="carId">
-        <el-input v-model="queryParams.carId" placeholder="请输入车辆id" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="车牌号" prop="carId">
+        <el-select v-model="queryParams.carId" clearable filterable placeholder="请输入车牌号" :loading="loading"
+          @change="handleQuery">
+          <el-option v-for="car in carList" :key="car.carId" :label="car.licensePlate + '-' + car.brand"
+            :value="car.carId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="负责人" prop="userId">
         <el-select v-model="queryParams.userId" filterable clearable @change="handleQuery">
@@ -44,9 +49,17 @@
 
     <el-table v-loading="loading" :data="deviceExpenseList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="车辆id" align="center" prop="carId" />
-      <el-table-column label="负责人id" align="center" prop="userId" />
-      <el-table-column label="费用类型" align="center" prop="expenseType" />
+      <el-table-column label="车牌号" align="center" prop="car.licensePlate" />
+      <el-table-column label="负责人" align="center" prop="userId">
+        <template slot-scope="scope">
+          {{ getUserName(scope.row.userId) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="费用类型" align="center" prop="expenseType">
+        <template slot-scope="scope">
+          <el-tag :type="typeStyle(scope.row.expenseType)">{{ expenseTypeText(scope.row.expenseType) }}</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="费用金额" align="center" prop="expense" />
       <el-table-column label="发生日期" align="center" prop="occurDate" width="180">
         <template slot-scope="scope">
@@ -54,7 +67,13 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="附件" align="center" prop="document" />
+      <el-table-column label="附件" align="center" prop="document">
+        <template slot-scope="scope">
+          <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + scope.row.document}`)">
+            {{ getFileName(scope.row.document) }}
+          </el-link>
+        </template>
+      </el-table-column>
       <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)"
@@ -71,14 +90,30 @@
     <!-- 添加或修改cmc设备费用对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="设备id" prop="carId">
-          <el-input v-model="form.carId" placeholder="请输入设备id" />
+        <el-form-item label="车牌号" prop="carId">
+          <el-select v-model="form.carId" clearable filterable placeholder="请输入车牌号" :loading="loading">
+            <el-option v-for="car in carList" :key="car.carId" :label="car.licensePlate + '-' + car.brand"
+              :value="car.carId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="负责人" prop="userId">
+          <el-select v-model="form.userId" filterable clearable @change="handleQuery">
+            <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+              :value="item.userId">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="负责人id" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入负责人id" />
+        <el-form-item label="费用类型" prop="expenseType">
+          <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>
+          </el-select>
         </el-form-item>
         <el-form-item label="费用金额" prop="expense">
-          <el-input v-model="form.expense" placeholder="请输入费用金额" />
+          <el-input-number :controls="false" v-model="form.expense" placeholder="请输入费用金额" style="width:150px" />
+          <el-tag>元</el-tag>
         </el-form-item>
         <el-form-item label="发生日期" prop="occurDate">
           <el-date-picker clearable v-model="form.occurDate" type="date" value-format="yyyy-MM-dd"
@@ -86,10 +121,20 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
         </el-form-item>
         <el-form-item label="附件" prop="document">
-          <el-input v-model="form.document" placeholder="请输入附件" />
+          <div v-if="form.document">
+            <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.document}`)">
+              {{ getFileName(form.document) }}
+            </el-link>
+            <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.document}`"
+              :underline="false" target="_blank">
+              <span class="el-icon-download">下载文件</span>
+            </el-link>
+          </div> 
+          <FileUpload :limit="1" :filePathName="expenseName" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+            @input="getExpensePath"></FileUpload>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -102,11 +147,12 @@
 
 <script>
 import { listDeviceExpense, getDeviceExpense, delDeviceExpense, addDeviceExpense, updateDeviceExpense } from "@/api/oa/device/deviceExpense";
-
+import { listCar } from '@/api/oa/car/car'
 export default {
   name: "DeviceExpense",
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -140,10 +186,13 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      carList: [],
+      expenseName:''
     };
   },
   created() {
+    this.remoteMethod();
     this.getList();
   },
   methods: {
@@ -157,6 +206,15 @@ export default {
         this.loading = false;
       });
     },
+    remoteMethod(val) {
+      listCar({
+        pageNum: 1,
+        pageSize: 40,
+        licensePlate: val
+      }).then(res => {
+        this.carList = res.rows;
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -205,7 +263,8 @@ export default {
       getDeviceExpense(deviceExpenseId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改cmc设备费用";
+        this.title = "修改费用详情";
+        expenseTypePath(this.form.expenseType)
       });
     },
     /** 提交按钮 */
@@ -243,7 +302,48 @@ export default {
       this.download('oa/deviceExpense/export', {
         ...this.queryParams
       }, `deviceExpense_${new Date().getTime()}.xlsx`)
-    }
+    },
+    expenseTypeText(row) {
+      if (row == '0') {
+        return '保险费'
+      }
+      if (row == '1') {
+        return '维修/保养费'
+      }
+      if (row == '2') {
+        return '轮胎费'
+      }
+    },
+    typeStyle(row) {
+      if (row == '0') {
+        return 'primary'
+      }
+      if (row == '1') {
+        return 'warning'
+      }
+      if (row == '2') {
+        return 'success'
+      }
+    },
+    expenseTypePath(val) {
+      if (val == '0') {
+        this.expenseName = '车辆/费用/保险费'
+      }
+      if (val == '1') {
+        this.expenseName = '车辆/费用/维修保养费'
+      }
+      if (val == '2') {
+        this.expenseName = '车辆/费用/轮胎费'
+      }
+    },
+    //费用附件路径
+    getExpensePath(val) {
+      let arr = val.split('/upload')
+      this.form.document = arr[1]
+      if (val == "") {
+        this.form.document = ""
+      }
+    },
   }
 };
 </script>

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

@@ -1,8 +1,13 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="车辆id" prop="carId">
-        <el-input v-model="queryParams.carId" placeholder="请输入车辆id" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="车牌号" prop="carId">
+        <el-select v-model="queryParams.carId" clearable filterable placeholder="请输入车牌号" :loading="loading"
+          @change="handleQuery">
+          <el-option v-for="car in carList" :key="car.carId" :label="car.licensePlate + '-' + car.brand"
+            :value="car.carId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="报废日期" prop="scrapDate">
         <el-date-picker clearable v-model="queryParams.scrapDate" type="date" value-format="yyyy-MM-dd"
@@ -37,7 +42,7 @@
 
     <el-table v-loading="loading" :data="deviceScrapList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="车辆id" align="center" prop="carId" />
+      <el-table-column label="车牌号" align="center" prop="car.licensePlate" />
       <el-table-column label="原价值" align="center" prop="cost" />
       <el-table-column label="报废日期" align="center" prop="scrapDate" width="180">
         <template slot-scope="scope">
@@ -47,7 +52,13 @@
       <el-table-column label="报废原因" align="center" prop="reason" />
       <el-table-column label="处理结果" align="center" prop="deal" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="附件" align="center" prop="document" />
+      <el-table-column label="附件" prop="document">
+        <template slot-scope="scope">
+          <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + scope.row.document}`)">
+            {{ getFileName(scope.row.document) }}
+          </el-link>
+        </template>
+      </el-table-column>
       <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)"
@@ -64,11 +75,16 @@
     <!-- 添加或修改cmc设备报废对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="车辆id" prop="carId">
-          <el-input v-model="form.carId" placeholder="请输入车辆id" />
+        <el-form-item label="车牌号" prop="carId">
+          <el-select v-model="form.carId" clearable filterable placeholder="请输入车牌号" :loading="loading">
+            <el-option v-for="car in carList" :key="car.carId" :label="car.licensePlate + '-' + car.brand"
+              :value="car.carId">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="原价值" prop="cost">
-          <el-input v-model="form.cost" placeholder="请输入原价值" />
+          <el-input-number :controls="false" v-model="form.cost" placeholder="请输入原价值" />
+          <el-tag>元</el-tag>
         </el-form-item>
         <el-form-item label="报废日期" prop="scrapDate">
           <el-date-picker clearable v-model="form.scrapDate" type="date" value-format="yyyy-MM-dd"
@@ -85,7 +101,17 @@
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
         <el-form-item label="附件" prop="document">
-          <el-input v-model="form.document" placeholder="请输入附件" />
+          <div v-if="form.document">
+            <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.document}`)">
+              {{ getFileName(form.document) }}
+            </el-link>
+            <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.document}`"
+              :underline="false" target="_blank">
+              <span class="el-icon-download">下载文件</span>
+            </el-link>
+          </div>
+          <FileUpload :limit="1" :filePathName="'车辆/报废'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+            @input="getExpensePath"></FileUpload>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -98,11 +124,13 @@
 
 <script>
 import { listDeviceScrap, getDeviceScrap, delDeviceScrap, addDeviceScrap, updateDeviceScrap } from "@/api/oa/device/deviceScrap";
+import { listCar } from '@/api/oa/car/car'
 
 export default {
   name: "DeviceScrap",
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -136,11 +164,13 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      carList: []
     };
   },
   created() {
     this.getList();
+    this.remoteMethod();
   },
   methods: {
     /** 查询cmc设备报废列表 */
@@ -153,6 +183,15 @@ export default {
         this.loading = false;
       });
     },
+    remoteMethod(val) {
+      listCar({
+        pageNum: 1,
+        pageSize: 40,
+        licensePlate: val
+      }).then(res => {
+        this.carList = res.rows;
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -239,7 +278,15 @@ export default {
       this.download('oa/deviceScrap/export', {
         ...this.queryParams
       }, `deviceScrap_${new Date().getTime()}.xlsx`)
-    }
+    },
+    //费用附件路径
+    getExpensePath(val) {
+      let arr = val.split('/upload')
+      this.form.document = arr[1]
+      if (val == "") {
+        this.form.document = ""
+      }
+    },
   }
 };
 </script>

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

@@ -15,8 +15,13 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="项目id" prop="projectId">
-        <el-input v-model="queryParams.projectId" placeholder="请输入项目id" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="项目编号" prop="projectId">
+        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入项目编号"
+          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
+          <el-option v-for="project in projectList" :key="project.projectId"
+            :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -33,23 +38,27 @@
     </el-row>
 
     <el-table v-loading="loading" :data="deviceApprovalList" @selection-change="handleSelectionChange">
-      <el-table-column type="idnex" label="序号" width="55" align="center" />
-      <el-table-column label="申请人" align="center" prop="applier" >
+      <el-table-column type="index" label="序号" width="55" align="center" />
+      <el-table-column label="申请人" align="center" prop="applier">
         <template slot-scope="scope">
           {{ getUserName(scope.row.applier) }}
         </template>
       </el-table-column>
-      <el-table-column label="使用部门" align="center" prop="useDept" />
-      <el-table-column label="设备id" align="center" prop="devices" />
+      <el-table-column label="申请部门" align="center" prop="useDept" >
+        <template slot-scope="scope">
+          {{ getDeptName(scope.row.useDept) }}
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="修改后设备id" align="center" prop="modifyDevices" /> -->
-      <el-table-column label="项目id" align="center" prop="projectId" />
-      <el-table-column label="申领事由" align="center" prop="applyReason" />
-      <el-table-column label="开始日期" align="center" prop="beginDate" width="180">
+      <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
+      <el-table-column label="项目名称" align="center" prop="project.projectName" />
+      <el-table-column label="申领事由" align="center" prop="applyReason" show-overflow-tooltip />
+      <el-table-column label="开始日期" align="center" prop="beginDate" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.beginDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束日期" align="center" prop="endDate" width="180">
+      <el-table-column label="结束日期" align="center" prop="endDate" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -60,17 +69,17 @@
       <el-table-column label="调度员" align="center" prop="dispatcher" />
       <el-table-column label="调度审批意见" align="center" prop="dispatchComment" />
       <el-table-column label="预计设备成本" align="center" prop="estimateCost" /> -->
-      <el-table-column label="申请日期" align="center" prop="applyDate" width="180">
+      <el-table-column label="申请日期" align="center" prop="applyDate" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="确认日期" align="center" prop="confirmDate" width="180">
+      <el-table-column label="确认日期" align="center" prop="confirmDate" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.confirmDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="归还日期" align="center" prop="returnDate" width="180">
+      <el-table-column label="归还日期" align="center" prop="returnDate" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.returnDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -104,103 +113,22 @@
       @pagination="getList" />
 
     <!-- 添加或修改cmc设备审批对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="申请人" prop="applier">
-          <el-input v-model="form.applier" placeholder="请输入申请人" />
-        </el-form-item>
-        <el-form-item label="使用部门" prop="useDept">
-          <el-input v-model="form.useDept" placeholder="请输入使用部门" />
-        </el-form-item>
-        <el-form-item label="设备id" prop="devices">
-          <el-input v-model="form.devices" placeholder="请输入设备id" />
-        </el-form-item>
-        <el-form-item label="修改后设备id" prop="modifyDevices">
-          <el-input v-model="form.modifyDevices" placeholder="请输入修改后设备id" />
-        </el-form-item>
-        <el-form-item label="项目id" prop="projectId">
-          <el-input v-model="form.projectId" placeholder="请输入项目id" />
-        </el-form-item>
-        <el-form-item label="申领事由" prop="applyReason">
-          <el-input v-model="form.applyReason" placeholder="请输入申领事由" />
-        </el-form-item>
-        <el-form-item label="开始日期" prop="beginDate">
-          <el-date-picker clearable v-model="form.beginDate" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择开始日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="结束日期" prop="endDate">
-          <el-date-picker clearable v-model="form.endDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择结束日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="天数" prop="days">
-          <el-input v-model="form.days" placeholder="请输入天数" />
-        </el-form-item>
-        <el-form-item label="分管审批人" prop="managerUserId">
-          <el-input v-model="form.managerUserId" placeholder="请输入分管审批人" />
-        </el-form-item>
-        <el-form-item label="分管审批意见" prop="managerComment">
-          <el-input v-model="form.managerComment" placeholder="请输入分管审批意见" />
-        </el-form-item>
-        <el-form-item label="调度员" prop="dispatcher">
-          <el-input v-model="form.dispatcher" placeholder="请输入调度员" />
-        </el-form-item>
-        <el-form-item label="调度审批意见" prop="dispatchComment">
-          <el-input v-model="form.dispatchComment" placeholder="请输入调度审批意见" />
-        </el-form-item>
-        <el-form-item label="预计设备成本" prop="estimateCost">
-          <el-input v-model="form.estimateCost" placeholder="请输入预计设备成本" />
-        </el-form-item>
-        <el-form-item label="申请日期" prop="applyDate">
-          <el-date-picker clearable v-model="form.applyDate" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择申请日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="确认日期" prop="confirmDate">
-          <el-date-picker clearable v-model="form.confirmDate" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择确认日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="归还日期" prop="returnDate">
-          <el-date-picker clearable v-model="form.returnDate" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择归还日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="需维修设备id" prop="repairDevices">
-          <el-input v-model="form.repairDevices" placeholder="请输入需维修设备id" />
-        </el-form-item>
-        <el-form-item label="备注说明" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注说明" />
-        </el-form-item>
-        <el-form-item label="部门审批时间" prop="deptTime">
-          <el-date-picker clearable v-model="form.deptTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择部门审批时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="分管审批时间" prop="managerTime">
-          <el-date-picker clearable v-model="form.managerTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择分管审批时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="调度审批时间" prop="dispatchTime">
-          <el-date-picker clearable v-model="form.dispatchTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择调度审批时间">
-          </el-date-picker>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
+    <el-dialog :title="title" :visible.sync="open" width="65%" append-to-body>
+      <device-form :taskForm="taskForm" :taskName="''" :flowDisabled="false"></device-form>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { listDeviceApproval, getDeviceApproval, delDeviceApproval, addDeviceApproval, updateDeviceApproval } from "@/api/oa/device/deviceApproval";
+import { listProject } from '@/api/oa/project/project';
+import DeviceForm from '../../flowable/form/oa/deviceForm.vue';
 
 export default {
   name: "DeviceApproval",
+  components: {
+    DeviceForm
+  },
   data() {
     return {
       // 遮罩层
@@ -251,7 +179,11 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      projectList: [],
+      taskForm: {
+        formId: ''
+      },
     };
   },
   created() {
@@ -267,6 +199,15 @@ export default {
         this.loading = false;
       });
     },
+    remoteMethod(val) {
+      listProject({
+        pageNum: 1,
+        pageSize: 20,
+        projectNumber: val
+      }).then(res => {
+        this.projectList = res.rows;
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -323,8 +264,9 @@ export default {
       this.open = true;
       this.title = "添加cmc设备审批";
     },
-    handleView(row){
-
+    handleView(row) {
+      this.open = true;
+      this.taskForm.formId = row.deviceApplyId
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

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

@@ -1,8 +1,13 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备id" prop="deviceId">
-        <el-input v-model="queryParams.deviceId" placeholder="请输入设备id" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="设备品牌" prop="deviceId">
+        <el-select v-model="queryParams.deviceId" clearable filterable remote reserve-keyword placeholder="请输入设备品牌"
+          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
+          <el-option v-for="device in deviceList" :key="device.deviceId"
+            :label="device.name + '-' + device.series + '-' + device.code" :value="device.deviceId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="负责人" prop="userId">
         <el-select v-model="queryParams.userId" filterable clearable @change="handleQuery">
@@ -44,13 +49,21 @@
 
     <el-table v-loading="loading" :data="deviceExpenseList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="设备id" align="center" prop="deviceId" />
+      <el-table-column label="设备类型" align="center" prop="device.name" />
+      <el-table-column label="设备品牌" align="center" prop="device.brand" />
+      <el-table-column label="规格型号" align="center" prop="device.series" />
+      <el-table-column label="出厂编号" align="center" prop="device.code" />
       <el-table-column label="负责人" align="center" prop="userId">
         <template slot-scope="scope">
           {{ getUserName(scope.row.userId) }}
         </template>
       </el-table-column>
-      <el-table-column label="费用类型" align="center" prop="expenseType" />
+      <el-table-column label="费用类型" align="center" prop="expenseType">
+        <template slot-scope="scope">
+          <el-tag :type="expenseTypeStyle(scope.row.expenseType)">{{ expenseTypeText(scope.row.expenseType)
+            }}</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="费用金额" align="center" prop="expense" />
       <el-table-column label="发生日期" align="center" prop="occurDate" width="180">
         <template slot-scope="scope">
@@ -58,11 +71,15 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="附件" align="center" prop="document" />
+      <el-table-column label="附件" align="center" prop="document">
+        <template slot-scope="scope">
+          <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + scope.row.document}`)">
+            {{ getFileName(scope.row.document) }}
+          </el-link>
+        </template>
+      </el-table-column>
       <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="handleView(scope.row)"
-            v-hasPermi="['device:record:query']">查看</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['device:record:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -75,16 +92,33 @@
       @pagination="getList" />
 
     <!-- 添加或修改cmc设备费用对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="设备id" prop="deviceId">
-          <el-input v-model="form.deviceId" placeholder="请输入设备id" />
+        <el-form-item label="设备" prop="deviceId">
+          <el-select style="width: 90%;" v-model="form.deviceId" filterable placeholder="请选择" clearable disabled>
+            <el-option v-for="item in alldeviceList" :key="item.deviceId" :disabled="item.status != 1" :label="item.name + '【' + (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series + '】' : '')
+      + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place" :value="item.deviceId">
+            </el-option>
+          </el-select>
+          <el-button type="primary" icon="el-icon-plus" size="mini" @click="openDevice = true">选择设备</el-button>
+        </el-form-item>
+        <el-form-item label="负责人" prop="userId">
+          <el-select v-model="form.userId" filterable clearable @change="handleQuery">
+            <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+              :value="item.userId">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="负责人id" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入负责人id" />
+        <el-form-item label="费用类型" prop="expenseType">
+          <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>
+          </el-select>
         </el-form-item>
         <el-form-item label="费用金额" prop="expense">
-          <el-input v-model="form.expense" placeholder="请输入费用金额" />
+          <el-input-number :controls="false" v-model="form.expense" placeholder="请输入费用金额" style="width:150px" />
+          <el-tag>元</el-tag>
         </el-form-item>
         <el-form-item label="发生日期" prop="occurDate">
           <el-date-picker clearable v-model="form.occurDate" type="date" value-format="yyyy-MM-dd"
@@ -92,10 +126,20 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
         </el-form-item>
         <el-form-item label="附件" prop="document">
-          <el-input v-model="form.document" placeholder="请输入附件" />
+          <div v-if="form.document">
+            <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.document}`)">
+              {{ getFileName(form.document) }}
+            </el-link>
+            <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.document}`"
+              :underline="false" target="_blank">
+              <span class="el-icon-download">下载文件</span>
+            </el-link>
+          </div>
+          <FileUpload :limit="1" :filePathName="expenseName" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+            @input="getExpensePath"></FileUpload>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -103,16 +147,26 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog title="选择设备" :visible.sync="openDevice" width="70%" append-to-body>
+      <choose-device @chooseList="confirmDevice"></choose-device>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listDeviceExpense, getDeviceExpense, delDeviceExpense, addDeviceExpense, updateDeviceExpense } from "@/api/oa/device/deviceExpense";
+import { listDevice } from "@/api/oa/device/device"
+import ChooseDevice from '../../flowable/form/budget/components/chooseDevice.vue';
 
 export default {
   name: "DeviceExpense",
+  components: {
+    ChooseDevice
+  },
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -146,11 +200,16 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      deviceList: [],
+      alldeviceList: [],
+      openDevice: false,
+      expenseName:''
     };
   },
   created() {
     this.getList();
+    this.getAllDevice();
   },
   methods: {
     /** 查询cmc设备费用列表 */
@@ -163,6 +222,23 @@ export default {
         this.loading = false;
       });
     },
+    getAllDevice() {
+      listDevice({
+        pageNum: 1,
+        pageSize: 99999,
+      }).then(res => {
+        this.alldeviceList = res.rows;
+      })
+    },
+    remoteMethod(val) {
+      listDevice({
+        pageNum: 1,
+        pageSize: 50,
+        brand: val
+      }).then(res => {
+        this.deviceList = res.rows;
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -202,9 +278,9 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加cmc设备费用";
+      this.title = "新增设备维保记录";
     },
-    handleView(row){
+    handleView(row) {
 
     },
     /** 修改按钮操作 */
@@ -214,7 +290,8 @@ export default {
       getDeviceExpense(deviceExpenseId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改cmc设备费用";
+        this.title = "修改设备维保记录";
+        expenseTypePath(this.form.expenseType);
       });
     },
     /** 提交按钮 */
@@ -252,7 +329,59 @@ export default {
       this.download('oa/deviceExpense/export', {
         ...this.queryParams
       }, `deviceExpense_${new Date().getTime()}.xlsx`)
-    }
+    },
+    expenseTypeText(row) {
+      if (row == '0') {
+        return '保险费'
+      }
+      if (row == '1') {
+        return '维修/保养费'
+      }
+      if (row == '2') {
+        return '检定费'
+      }
+    },
+    expenseTypeStyle(row) {
+      if (row == '0') {
+        return 'primary'
+      }
+      if (row == '1') {
+        return 'warning'
+      }
+      if (row == '2') {
+        return 'success'
+      }
+    },
+    expenseTypePath(val) {
+      if (val == '0') {
+        this.expenseName = '设备/保险费'
+      }
+      if (val == '1') {
+        this.expenseName = '设备/维修保养费'
+      }
+      if (val == '2') {
+        this.expenseName = '设备/检定费'
+      }
+    },
+    confirmDevice(val) {
+      if (val && val.length > 1) {
+        return this.$message.error('请选择一个设备')
+      }
+
+      this.form.deviceId = val[0].deviceId
+      this.openDevice = false;
+    },
+    //费用附件路径
+    getExpensePath(val) {
+      let arr = val.split('/upload')
+      this.form.document = arr[1]
+      if (val == "") {
+        this.form.document = ""
+      }
+    },
   }
 };
 </script>
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+</style>

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

@@ -1,8 +1,13 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备id" prop="deviceId">
-        <el-input v-model="queryParams.deviceId" placeholder="请输入设备id" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="设备品牌" prop="deviceId">
+        <el-select v-model="queryParams.deviceId" clearable filterable remote reserve-keyword placeholder="请输入设备品牌"
+          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
+          <el-option v-for="device in deviceList" :key="device.deviceId"
+            :label="device.name + '-' + device.series + '-' + device.code" :value="device.deviceId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="报废日期" prop="scrapDate">
         <el-date-picker clearable v-model="queryParams.scrapDate" type="date" value-format="yyyy-MM-dd"
@@ -37,7 +42,10 @@
 
     <el-table v-loading="loading" :data="deviceScrapList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="设备id" align="center" prop="deviceId" />
+      <el-table-column label="设备类型" align="center" prop="device.name" />
+      <el-table-column label="设备品牌" align="center" prop="device.brand" />
+      <el-table-column label="规格型号" align="center" prop="device.series" />
+      <el-table-column label="出厂编号" align="center" prop="device.code" />
       <el-table-column label="原价值" align="center" prop="cost" />
       <el-table-column label="报废日期" align="center" prop="scrapDate" width="180">
         <template slot-scope="scope">
@@ -47,7 +55,13 @@
       <el-table-column label="报废原因" align="center" prop="reason" />
       <el-table-column label="处理结果" align="center" prop="deal" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="附件" align="center" prop="document" />
+      <el-table-column label="附件" prop="document">
+        <template slot-scope="scope">
+          <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + scope.row.document}`)">
+            {{ getFileName(scope.row.document) }}
+          </el-link>
+        </template>
+      </el-table-column>
       <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)"
@@ -62,13 +76,19 @@
       @pagination="getList" />
 
     <!-- 添加或修改cmc设备报废对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="设备id" prop="deviceId">
-          <el-input v-model="form.deviceId" placeholder="请输入设备id" />
+        <el-form-item label="设备" prop="deviceId">
+          <el-select style="width: 90%;" v-model="form.deviceId" filterable placeholder="请选择" clearable disabled>
+            <el-option v-for="item in alldeviceList" :key="item.deviceId" :disabled="item.status != 1" :label="item.name + '【' + (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series + '】' : '')
+      + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place" :value="item.deviceId">
+            </el-option>
+          </el-select>
+          <el-button type="primary" icon="el-icon-plus" size="mini" @click="openDevice = true">选择设备</el-button>
         </el-form-item>
         <el-form-item label="原价值" prop="cost">
-          <el-input v-model="form.cost" placeholder="请输入原价值" />
+          <el-input-number :controls="false" v-model="form.cost" placeholder="请输入原价值" />
+          <el-tag>元</el-tag>
         </el-form-item>
         <el-form-item label="报废日期" prop="scrapDate">
           <el-date-picker clearable v-model="form.scrapDate" type="date" value-format="yyyy-MM-dd"
@@ -82,10 +102,20 @@
           <el-input v-model="form.deal" placeholder="请输入处理结果" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
         </el-form-item>
         <el-form-item label="附件" prop="document">
-          <el-input v-model="form.document" placeholder="请输入附件" />
+          <div v-if="form.document">
+            <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.document}`)">
+              {{ getFileName(form.document) }}
+            </el-link>
+            <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.document}`"
+              :underline="false" target="_blank">
+              <span class="el-icon-download">下载文件</span>
+            </el-link>
+          </div>
+          <FileUpload :limit="1" :filePathName="'设备/报废'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+            @input="getExpensePath"></FileUpload>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -93,16 +123,26 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog title="选择设备" :visible.sync="openDevice" width="70%" append-to-body>
+      <choose-device @chooseList="confirmDevice"></choose-device>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listDeviceScrap, getDeviceScrap, delDeviceScrap, addDeviceScrap, updateDeviceScrap } from "@/api/oa/device/deviceScrap";
+import { listDevice } from "@/api/oa/device/device"
+import ChooseDevice from '../../flowable/form/budget/components/chooseDevice.vue';
 
 export default {
   name: "DeviceScrap",
+  components: {
+    ChooseDevice
+  },
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -136,11 +176,16 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      deviceList: [],
+      alldeviceList: [],
+      openDevice: false,
+      expenseName: ''
     };
   },
   created() {
     this.getList();
+    this.getAllDevice();
   },
   methods: {
     /** 查询cmc设备报废列表 */
@@ -153,6 +198,23 @@ export default {
         this.loading = false;
       });
     },
+    getAllDevice() {
+      listDevice({
+        pageNum: 1,
+        pageSize: 99999,
+      }).then(res => {
+        this.alldeviceList = res.rows;
+      })
+    },
+    remoteMethod(val) {
+      listDevice({
+        pageNum: 1,
+        pageSize: 50,
+        brand: val
+      }).then(res => {
+        this.deviceList = res.rows;
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -192,7 +254,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加cmc设备报废";
+      this.title = "添加报废设备";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -201,7 +263,7 @@ export default {
       getDeviceScrap(deviceScrapId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改cmc设备报废";
+        this.title = "修改报废设备";
       });
     },
     /** 提交按钮 */
@@ -239,7 +301,26 @@ export default {
       this.download('oa/deviceScrap/export', {
         ...this.queryParams
       }, `deviceScrap_${new Date().getTime()}.xlsx`)
-    }
+    },
+    confirmDevice(val) {
+      if (val && val.length > 1) {
+        return this.$message.error('请选择一个设备')
+      }
+
+      this.form.deviceId = val[0].deviceId
+      this.openDevice = false;
+    },
+    //费用附件路径
+    getExpensePath(val) {
+      let arr = val.split('/upload')
+      this.form.document = arr[1]
+      if (val == "") {
+        this.form.document = ""
+      }
+    },
   }
 };
 </script>
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+</style>

oa-ui/src/views/oa/settle/index.vue

@@ -1,8 +1,13 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="项目id" prop="projectId">
-        <el-input v-model="queryParams.projectId" placeholder="请输入项目id" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="项目编号" prop="projectId">
+        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入项目编号"
+          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
+          <el-option v-for="project in projectList" :key="project.projectId"
+            :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="上报人" prop="reporter">
         <el-select v-model="queryParams.reporter" filterable clearable @change="handleQuery">
@@ -18,12 +23,11 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
           v-hasPermi="['oa:settle:add']">新增</el-button>
       </el-col>
@@ -34,7 +38,7 @@
       <el-col :span="1.5">
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['oa:settle:remove']">删除</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['oa:settle:export']">导出</el-button>
@@ -45,7 +49,11 @@
     <el-table v-loading="loading" :data="settleList" @selection-change="handleSelectionChange">
       <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column label="项目id" align="center" prop="projectId" />
-      <el-table-column label="上报人" align="center" prop="reporter" />
+      <el-table-column label="上报人" align="center" prop="reporter">
+        <template slot-scope="scope">
+          {{ getUserName(scope.row.reporter) }}
+        </template>
+      </el-table-column>
       <el-table-column label="上报日期" align="center" prop="reportTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.reportTime, '{y}-{m}-{d}') }}</span>
@@ -53,55 +61,6 @@
       </el-table-column>
       <el-table-column label="工作量上报说明" align="center" prop="workloadReport" />
       <el-table-column label="结算说明" align="center" prop="settleComment" />
-      <!-- <el-table-column label="综合事务部审核人" align="center" prop="zhUserId" />
-      <el-table-column label="综合事务部审核日期" align="center" prop="zhTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.zhTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="综合事务部审核意见" align="center" prop="zhComment" />
-      <el-table-column label="技术质量部审核人" align="center" prop="jsUserId" />
-      <el-table-column label="技术质量部审核日期" align="center" prop="jsTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.jsTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="技术质量部审核意见" align="center" prop="jsComment" />
-      <el-table-column label="项目管理部审核人" align="center" prop="xmUserId" />
-      <el-table-column label="项目管理部审核日期" align="center" prop="xmTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.xmTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="项目管理部审核意见" align="center" prop="xmComment" />
-      <el-table-column label="承担部门审核人" align="center" prop="deptUserId" />
-      <el-table-column label="承担部门审核日期" align="center" prop="deptTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.deptTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="承担部门审核意见" align="center" prop="deptComment" />
-      <el-table-column label="经营发展部审核人" align="center" prop="jyUserId" />
-      <el-table-column label="经营发展部审核日期" align="center" prop="jyTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.jyTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="经营发展部审核意见" align="center" prop="jyComment" />
-      <el-table-column label="分管审核人" align="center" prop="managerUserId" />
-      <el-table-column label="分管审核日期" align="center" prop="managerTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.managerTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="分管审核意见" align="center" prop="managerComment" />
-      <el-table-column label="总经理审核人" align="center" prop="gmUserId" />
-      <el-table-column label="总经理审核日期" align="center" prop="gmTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.gmTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="总经理审核意见" align="center" prop="gmComment" /> -->
       <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-view" @click="handleView(scope.row)"
@@ -118,115 +77,19 @@
       @pagination="getList" />
 
     <!-- 添加或修改cmc结算审批对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="项目id" prop="projectId">
-          <el-input v-model="form.projectId" placeholder="请输入项目id" />
-        </el-form-item>
-        <el-form-item label="工作量上报说明" prop="workloadReport">
-          <el-input v-model="form.workloadReport" placeholder="请输入工作量上报说明" />
-        </el-form-item>
-        <el-form-item label="上报人" prop="reporter">
-          <el-input v-model="form.reporter" placeholder="请输入上报人" />
-        </el-form-item>
-        <el-form-item label="上报日期" prop="reportTime">
-          <el-date-picker clearable v-model="form.reportTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择上报日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="结算说明" prop="settleComment">
-          <el-input v-model="form.settleComment" placeholder="请输入结算说明" />
-        </el-form-item>
-        <el-form-item label="综合事务部审核人" prop="zhUserId">
-          <el-input v-model="form.zhUserId" placeholder="请输入综合事务部审核人" />
-        </el-form-item>
-        <el-form-item label="综合事务部审核日期" prop="zhTime">
-          <el-date-picker clearable v-model="form.zhTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择综合事务部审核日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="综合事务部审核意见" prop="zhComment">
-          <el-input v-model="form.zhComment" placeholder="请输入综合事务部审核意见" />
-        </el-form-item>
-        <el-form-item label="技术质量部审核人" prop="jsUserId">
-          <el-input v-model="form.jsUserId" placeholder="请输入技术质量部审核人" />
-        </el-form-item>
-        <el-form-item label="技术质量部审核日期" prop="jsTime">
-          <el-date-picker clearable v-model="form.jsTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择技术质量部审核日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="技术质量部审核意见" prop="jsComment">
-          <el-input v-model="form.jsComment" placeholder="请输入技术质量部审核意见" />
-        </el-form-item>
-        <el-form-item label="项目管理部审核人" prop="xmUserId">
-          <el-input v-model="form.xmUserId" placeholder="请输入项目管理部审核人" />
-        </el-form-item>
-        <el-form-item label="项目管理部审核日期" prop="xmTime">
-          <el-date-picker clearable v-model="form.xmTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择项目管理部审核日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="项目管理部审核意见" prop="xmComment">
-          <el-input v-model="form.xmComment" placeholder="请输入项目管理部审核意见" />
-        </el-form-item>
-        <el-form-item label="承担部门审核人" prop="deptUserId">
-          <el-input v-model="form.deptUserId" placeholder="请输入承担部门审核人" />
-        </el-form-item>
-        <el-form-item label="承担部门审核日期" prop="deptTime">
-          <el-date-picker clearable v-model="form.deptTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择承担部门审核日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="承担部门审核意见" prop="deptComment">
-          <el-input v-model="form.deptComment" placeholder="请输入承担部门审核意见" />
-        </el-form-item>
-        <el-form-item label="经营发展部审核人" prop="jyUserId">
-          <el-input v-model="form.jyUserId" placeholder="请输入经营发展部审核人" />
-        </el-form-item>
-        <el-form-item label="经营发展部审核日期" prop="jyTime">
-          <el-date-picker clearable v-model="form.jyTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择经营发展部审核日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="经营发展部审核意见" prop="jyComment">
-          <el-input v-model="form.jyComment" placeholder="请输入经营发展部审核意见" />
-        </el-form-item>
-        <el-form-item label="分管审核人" prop="managerUserId">
-          <el-input v-model="form.managerUserId" placeholder="请输入分管审核人" />
-        </el-form-item>
-        <el-form-item label="分管审核日期" prop="managerTime">
-          <el-date-picker clearable v-model="form.managerTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择分管审核日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="分管审核意见" prop="managerComment">
-          <el-input v-model="form.managerComment" placeholder="请输入分管审核意见" />
-        </el-form-item>
-        <el-form-item label="总经理审核人" prop="gmUserId">
-          <el-input v-model="form.gmUserId" placeholder="请输入总经理审核人" />
-        </el-form-item>
-        <el-form-item label="总经理审核日期" prop="gmTime">
-          <el-date-picker clearable v-model="form.gmTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择总经理审核日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="总经理审核意见" prop="gmComment">
-          <el-input v-model="form.gmComment" placeholder="请输入总经理审核意见" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
+    <el-dialog :title="title" :visible.sync="open" width="65%" append-to-body>
+      <settle-form :taskForm="taskForm" :taskName="''" :flowDisabled="false" :disabled="true"></settle-form>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { listSettle, getSettle, delSettle, addSettle, updateSettle } from "@/api/oa/settle/settle";
+import { listProject } from '@/api/oa/project/project';
+import settleForm from '../../flowable/form/settleForm.vue';
 
 export default {
+  components: { settleForm },
   name: "Settle",
   data() {
     return {
@@ -283,6 +146,10 @@ export default {
       form: {},
       // 表单校验
       rules: {
+      },
+      projectList: [],
+      taskForm: {
+        formId: ''
       }
     };
   },
@@ -299,6 +166,15 @@ export default {
         this.loading = false;
       });
     },
+    remoteMethod(val) {
+      listProject({
+        pageNum: 1,
+        pageSize: 20,
+        projectNumber: val
+      }).then(res => {
+        this.projectList = res.rows;
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -360,8 +236,9 @@ export default {
       this.title = "添加cmc结算审批";
     },
     // 查看详情
-    handleView(row){
-
+    handleView(row) {
+      this.open = true;
+      this.taskForm.formId = row.settleId;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

oa-ui/src/views/oa/supply/handover.vue

@@ -1,8 +1,13 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备id" prop="deviceId">
-        <el-input v-model="queryParams.deviceId" placeholder="请输入设备id" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="设备品牌" prop="deviceId">
+        <el-select v-model="queryParams.deviceId" clearable filterable remote reserve-keyword placeholder="请输入设备品牌"
+          :remote-method="remoteMethod" :loading="loading" style="width: 300px;">
+          <el-option v-for="device in deviceList" :key="device.deviceId"
+            :label="device.name + '-' + device.series + '-' + device.code" :value="device.deviceId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="移交部门" prop="handoverDeptId">
         <el-select v-model="queryParams.handoverDeptId" filterable clearable @change="handleQuery">
@@ -18,11 +23,6 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="移交日期" prop="handoverDate">
-        <el-date-picker clearable v-model="queryParams.handoverDate" type="date" value-format="yyyy-MM-dd"
-          placeholder="请选择移交日期">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item label="接收部门" prop="receiveDeptId">
         <el-select v-model="queryParams.receiveDeptId" filterable clearable @change="handleQuery">
           <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
@@ -39,7 +39,6 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -65,17 +64,19 @@
 
     <el-table v-loading="loading" :data="deviceHandoverList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="设备移交id" align="center" prop="deviceHandoverId" />
-      <el-table-column label="设备id" align="center" prop="deviceId" />
-      <el-table-column label="移交部门id" align="center" prop="handoverDeptId" />
-      <el-table-column label="移交人id" align="center" prop="handoverUserId" />
+      <el-table-column label="设备类型" align="center" prop="device.name" />
+      <el-table-column label="设备品牌" align="center" prop="device.brand" />
+      <el-table-column label="规格型号" align="center" prop="device.series" />
+      <el-table-column label="出厂编号" align="center" prop="device.code" />
+      <el-table-column label="移交部门" align="center" prop="handoverDept.deptName" />
+      <el-table-column label="移交人" align="center" prop="handoverUser.nickName" />
       <el-table-column label="移交日期" align="center" prop="handoverDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.handoverDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="接收部门id" align="center" prop="receiveDeptId" />
-      <el-table-column label="接收人id" align="center" prop="receiveUserId" />
+      <el-table-column label="接收部门" align="center" prop="receiveDept.deptName" />
+      <el-table-column label="接收人" align="center" prop="receiveUser.nickName" />
       <el-table-column label="设备软件说明" align="center" prop="description" />
       <el-table-column label="交接原因" align="center" prop="reason" />
       <el-table-column label="备注" align="center" prop="remark" />
@@ -93,36 +94,57 @@
       @pagination="getList" />
 
     <!-- 添加或修改cmc设备移交对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="设备id" prop="deviceId">
-          <el-input v-model="form.deviceId" placeholder="请输入设备id" />
+        <el-form-item label="设备" prop="deviceId">
+          <el-select style="width: 90%;" v-model="form.deviceId" filterable placeholder="请选择" clearable disabled>
+            <el-option v-for="item in alldeviceList" :key="item.deviceId" :disabled="item.status != 1" :label="item.name + '【' + (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series + '】' : '')
+      + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place" :value="item.deviceId">
+            </el-option>
+          </el-select>
+          <el-button type="primary" icon="el-icon-plus" size="mini" @click="openDevice = true">选择设备</el-button>
         </el-form-item>
-        <el-form-item label="移交部门id" prop="handoverDeptId">
-          <el-input v-model="form.handoverDeptId" placeholder="请输入移交部门id" />
+        <el-form-item label="移交部门" prop="handoverDeptId">
+          <el-select v-model="form.handoverDeptId" filterable clearable>
+            <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
+              :value="item.deptId">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="移交人id" prop="handoverUserId">
-          <el-input v-model="form.handoverUserId" placeholder="请输入移交人id" />
+        <el-form-item label="移交人" prop="handoverUserId">
+          <el-select v-model="form.handoverUserId" filterable clearable>
+            <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+              :value="item.userId">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="移交日期" prop="handoverDate">
           <el-date-picker clearable v-model="form.handoverDate" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择移交日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="接收部门id" prop="receiveDeptId">
-          <el-input v-model="form.receiveDeptId" placeholder="请输入接收部门id" />
+        <el-form-item label="接收部门" prop="receiveDeptId">
+          <el-select v-model="form.receiveDeptId" filterable clearable>
+            <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
+              :value="item.deptId">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="接收人id" prop="receiveUserId">
-          <el-input v-model="form.receiveUserId" placeholder="请输入接收人id" />
+        <el-form-item label="接收人" prop="receiveUserId">
+          <el-select v-model="form.receiveUserId" filterable clearable>
+            <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+              :value="item.userId">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="设备软件说明" prop="description">
-          <el-input v-model="form.description" placeholder="请输入设备软件说明" />
+          <el-input v-model="form.description" type="textarea" placeholder="请输入设备软件说明" />
         </el-form-item>
         <el-form-item label="交接原因" prop="reason">
-          <el-input v-model="form.reason" placeholder="请输入交接原因" />
+          <el-input v-model="form.reason" type="textarea" placeholder="请输入交接原因" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -130,14 +152,22 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="选择设备" :visible.sync="openDevice" width="70%" append-to-body>
+      <choose-device @chooseList="confirmDevice"></choose-device>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listDeviceHandover, getDeviceHandover, delDeviceHandover, addDeviceHandover, updateDeviceHandover } from "@/api/oa/device/deviceHandover";
+import { listDevice } from "@/api/oa/device/device"
+import ChooseDevice from '../../flowable/form/budget/components/chooseDevice.vue';
 
 export default {
   name: "DeviceHandover",
+  components: {
+    ChooseDevice
+  },
   data() {
     return {
       // 遮罩层
@@ -175,11 +205,16 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      deviceList: [],
+      alldeviceList: [],
+      openDevice: false,
+      expenseName: ''
     };
   },
   created() {
     this.getList();
+    this.getAllDevice();
   },
   methods: {
     /** 查询cmc设备移交列表 */
@@ -191,6 +226,23 @@ export default {
         this.loading = false;
       });
     },
+    getAllDevice() {
+      listDevice({
+        pageNum: 1,
+        pageSize: 99999,
+      }).then(res => {
+        this.alldeviceList = res.rows;
+      })
+    },
+    remoteMethod(val) {
+      listDevice({
+        pageNum: 1,
+        pageSize: 50,
+        brand: val
+      }).then(res => {
+        this.deviceList = res.rows;
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -279,7 +331,19 @@ export default {
       this.download('oa/deviceHandover/export', {
         ...this.queryParams
       }, `deviceHandover_${new Date().getTime()}.xlsx`)
-    }
+    },
+    confirmDevice(val) {
+      if (val && val.length > 1) {
+        return this.$message.error('请选择一个设备')
+      }
+
+      this.form.deviceId = val[0].deviceId
+      this.openDevice = false;
+    },
   }
 };
 </script>
+
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+</style>