lsun 维修管理

src/api/repair/testExamine.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询修试审核详细列表
 export function getListTestExamineApply(query) {
   return request({
-    url: '/material/repair_audit_details/list',
+    url: '/material/repair_audit_details/questList',
     method: 'get',
     params: query
   })

src/views/material/lease/outBound/index.vue

@@ -693,6 +693,18 @@ export default {
       this.handleOutQuery();
     },
 
+    //编码出库
+    numOut(row) {
+      // this.title = '编码出库'
+      this.openCode = true;
+      this.resetForm("numOutForm");
+      this.resetForm("outQuery");
+      this.outNum = row.outNum;
+      this.outQuery.typeId = row.typeId;
+      this.outObj = row;
+      this.handleOutQuery();
+    },
+
     // 表单重置
     reset() {
       this.form = {

src/views/material/repair/testExamine/component/homeApply.vue

@@ -21,9 +21,9 @@
         </el-date-picker>
       </el-form-item>
 
-      <el-form-item label="关键字" prop="keyWord">
+      <el-form-item label="关键字" prop="keyword">
         <el-input
-          v-model="queryParams.keyWord"
+          v-model="queryParams.keyword"
           placeholder="请输入关键字"
           clearable
           maxlength="50"
@@ -32,16 +32,16 @@
         />
       </el-form-item>
 
-      <el-form-item label="状态" prop="typeId">
+      <el-form-item label="状态" prop="taskStatus">
         <el-select
-          v-model="queryParams.typeId"
+          v-model="queryParams.taskStatus"
           placeholder="请选择状态"
           clearable
           filterable
           style="width: 240px"
         >
           <el-option
-            v-for="dict in dict.type.lease_apply_status"
+            v-for="dict in dict.type.repair_task_status"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -119,45 +119,45 @@
         align="center"
         width="160"
         label="退料单位"
-        prop="createTime"
+        prop="unitName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="工程名称"
         width="150"
         align="center"
-        prop="createBy"
+        prop="projectName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="维修单号"
         align="center"
-        prop="leaseUnit"
+        prop="repairNum"
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="物资类型"
         align="center"
-        prop="leaseProject"
+        prop="typeName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="维修班组"
         align="center"
-        prop="leaseType"
+        prop="teamName"
         width="110px"
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        label="提交"
+        label="提交人"
         align="center"
-        prop="agreementCode"
+        prop="createBy"
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="提交时间"
         align="center"
-        prop="code"
+        prop="createTime"
         width="110px"
         :show-overflow-tooltip="true"
       >
@@ -166,13 +166,13 @@
       <el-table-column
         label="状态"
         align="center"
-        prop="status"
+        prop="taskStatus"
         :show-overflow-tooltip="true"
       >
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.repair_task_status"
-            :value="scope.row.status"
+            :value="scope.row.taskStatus"
           />
         </template>
       </el-table-column>
@@ -281,8 +281,8 @@ export default {
         pageSize: 10,
         time: null, //申请时间
         name: undefined,
-        typeId: "",
-        keyWord: "",
+        taskStatus: "",
+        keyword: "",
       },
       form: {
         remark: "",
@@ -333,11 +333,12 @@ export default {
     getList() {
       this.loading = true;
       const params = {
-        keyWord: this.queryParams.keyWord,
+        keyword: this.queryParams.keyword,
         startTime: this.queryParams.time && this.queryParams.time[0],
         endTime: this.queryParams.time && this.queryParams.time[1],
         pageSize: this.queryParams.pageSize,
         pageNum: this.queryParams.pageNum,
+        taskStatus:this.queryParams.taskStatus
       };
       getListTestExamineApply(this.addDateRange(params)).then((response) => {
         this.typeList = response.rows;
@@ -354,7 +355,7 @@ export default {
     resetQuery() {
       this.queryParams.time = [];
       this.resetForm("queryForm");
-      this.queryParams.keyWord = "";
+      this.queryParams.keyword = "";
       this.handleQuery();
     },
     /** 新增按钮操作 */
@@ -451,7 +452,10 @@ export default {
     handleExport() {
       this.download(
         "/material/repair_audit_details/export",
-        { ...this.queryParams },
+        { ...this.queryParams,
+          startTime: this.queryParams.time && this.queryParams.time[0],
+          endTime: this.queryParams.time && this.queryParams.time[1]
+        },
         `修试审核_${new Date().getTime()}.xlsx`
       );
     },
@@ -492,8 +496,8 @@ export default {
   watch: {
     $route: {
       handler(to) {
-        if (to.query.keyWord) {
-          this.queryParams.keyWord = to.query.keyWord;
+        if (to.query.keyword) {
+          this.queryParams.keyword = to.query.keyword;
         }
       },
       deep: true,