浏览代码

气瓶流转步骤搜索

qianduan 1 年之前
父节点
当前提交
46775de1ab
共有 3 个文件被更改,包括 29 次插入7 次删除
  1. 1 0
      src/utils/request.js
  2. 5 0
      src/views/manufacture/vehicle.vue
  3. 23 7
      src/views/manufacture/wanderAbout.vue

+ 1 - 0
src/utils/request.js

@@ -69,6 +69,7 @@ request.interceptors.response.use((response) => {
       store.dispatch('Logout').then(() => {
         router.push('/login');
       })
+      return Message.error(res.msg || res.message)
     }
     if (res.Code == 200 || res.code == 200 || res.code == 404) {
       return res

+ 5 - 0
src/views/manufacture/vehicle.vue

@@ -102,6 +102,11 @@
       // 搜索
       searchProtocol(value) {
         this.searchValue = value
+        if (value.transportTime) {
+          this.searchValue.startTransportTime = value.transportTime[0]
+          this.searchValue.endTransportTime = value.transportTime[1]
+          delete this.searchValue.transportTime
+        }
         this.getList()
       },
       // 获取车辆列表

+ 23 - 7
src/views/manufacture/wanderAbout.vue

@@ -1,7 +1,8 @@
 <template>
   <!-- 气瓶流转步骤 -->
   <div>
-    <actionBar menuTitle="气瓶流转步骤" :formList="formList" :ruleForm="searchRuleForm"></actionBar>
+    <actionBar menuTitle="气瓶流转步骤" :formList="formList" :ruleForm="searchRuleForm" @searchProtocol="searchProtocol">
+    </actionBar>
     <tables :key="Math.random()" :suspension="false" :tableList="tableList" :tableData="tableData"></tables>
     <!-- 分页 -->
     <div class="paging_bottom" v-if="Total">
@@ -21,7 +22,10 @@
   import pagination from '@/components/pagination'
   import {
     employee
-  } from "./roam.js";
+  } from "./roam.js"
+  import {
+    process
+  } from '@/assets/js/blockSort'
   export default {
     components: {
       actionBar,
@@ -38,12 +42,19 @@
         },
         formList: [{
           type: 'input',
-          label: '客户姓名',
-          field: 'name',
-          placeholder: '客户姓名',
-        }],
+          label: '单位内编码',
+          field: 'innerCode',
+          placeholder: '单位内编码',
+        }, {
+          type: 'select',
+          label: '步骤',
+          field: 'optType',
+          placeholder: '选择步骤',
+          options: process(),
+        }, ],
         searchRuleForm: {
-          name: '',
+          innerCode: '',
+          optType: '',
         },
         tableList: employee(),
         tableData: [],
@@ -57,6 +68,11 @@
       this.getList()
     },
     methods: {
+      // 搜索
+      searchProtocol(value) {
+        this.searchValue = value
+        this.getList()
+      },
       // 获取气瓶流转步骤列表
       getList() {
         var params = {