1.调整新增单据页面样式

src/views/inout/IoNewOrder.vue

@@ -35,7 +35,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item class="query-form-item" label="所属仓库:">
-              <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择所属仓库" clearable="true"
+              <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
                          style="width: 90%"
                          @change="subInvChange"
               >
@@ -50,6 +50,25 @@
             </el-form-item>
           </el-col>
         </el-row>
+
+        <el-row>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="创建时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="width: 90%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div class="top-right-btn">
         <el-button-group>
@@ -77,29 +96,23 @@
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="扫码单据类型" prop="billTypeName">
         </el-table-column>
-        <el-table-column label="订单号" prop="id" show-overflow-tooltip></el-table-column>
+        <el-table-column label="订单号" prop="billNo" show-overflow-tooltip></el-table-column>
         <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
         <el-table-column label="来源" prop="fromType">
           <template slot-scope="scope">
             <span>{{ fromTypeMap[scope.row.fromType] }}</span>
           </template>
-
         </el-table-column>
-        <el-table-column label="往来单位" prop="fromCorp" width="220">
+        <el-table-column label="往来单位" prop="fromCorpName" width="220">
-
         </el-table-column>
         <el-table-column label="当前仓库" prop="invName" width="120">
         </el-table-column>
-        <el-table-column label="当前分库" prop="subInvName" width="120">
+        <el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">
         </el-table-column>
-        <el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">>
+        <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip>
-        </el-table-column>
-
-
-        <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
           <template slot-scope="scope">
             <i class="el-icon-time"></i>
-            <span>{{ scope.row.actDate }}</span>
+            <span>{{ scope.row.createTime }}</span>
           </template>
         </el-table-column>
         <el-table-column label="校验状态" prop="status" width="100">
@@ -235,24 +248,24 @@
           v-on:closeDetailDialog="closeDetailDialog"
         ></codeDetail>
       </el-dialog>
-      <el-pagination
+
-        :page-size="filterQuery.limit"
+      <pagination
-        @current-change="handleCurrentChange"
+        v-show="total>0"
-        layout="prev, pager, next"
         :total="total"
-        :current-page="filterQuery.page"
+        :page.sync="filterQuery.page"
-      ></el-pagination>
+        :limit.sync="filterQuery.limit"
+        @pagination="getList"
+      />
     </el-card>
   </div>
 </template>
 
 <script>
 import {
-  getDraft,
-  filterOrder,
   deleteByOrderId,
   commitOrder,
   updateUnit, mergeOrder,
+  getOrderList
 } from "../../api/inout/order";
 import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
 import draggable from "vuedraggable";
@@ -284,18 +297,19 @@ export default {
         mainAction: null,
         action: null,
         page: 1,
-        status: 10,
+        statusType: "draft",
         limit: 10,
-        locStorageCode: this.$store.getters.locInvCode,
+        invCode: this.$store.getters.locInvCode
-        invWarehouseCode: this.$store.getters.locSubInvCode,
       },
       checkStatus: {
-        '-1': "草稿",
+        1: "草稿",
-        // 1: "等待处理",
+        2: "等待处理",
-        1: "等待处理",
+        3: "等待校验",
-        2: "等待校验",
+        4: "处理异常",
-        3: "校验异常",
+        5: "校验成功",
-        4: "校验成功",
+        6: "校验异常",
+        7: "审核通过",
+        8: "审核拒绝"
       },
       curIndex: "",
       unitquery: {key: "", page: 1, limit: 20},
@@ -350,6 +364,38 @@ export default {
       formData: formJson,
       deleteLoading: false,
       busTypes: [],
+      actDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
     };
   },
   components: {
@@ -364,14 +410,27 @@ export default {
         path: "",
       });
       this.filterQuery = {
-        status: 10,
+        id: "",
+        mainAction: null,
+        action: null,
         page: 1,
+        statusType: "draft",
         limit: 10,
+        invCode: this.$store.getters.locInvCode
       };
+      this.actDateRange = [];
       this.getList();
     },
     onSubmit() {
       this.loading = true;
+      if (this.actDateRange !== null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
+      this.filterQuery.page = 1;
       this.getList();
     },
     hideSearch() {
@@ -487,7 +546,7 @@ export default {
     //获取订单列表
     getList() {
       this.loading = true;
-      getDraft(this.filterQuery)
+      getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
           if (response.code === 20000) {

src/views/inout/IoUnCheckedOrder.vue

@@ -3,14 +3,14 @@
     <el-card class="el-card">
       <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
         <el-row>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item class="query-form-item" label="单号:">
               <el-input v-model="filterQuery.billNo" placeholder="单号:"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item class="query-form-item" label="出入库类型:">
               <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
                 <el-option label="全部" value=""></el-option>
@@ -19,7 +19,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item class="query-form-item" label="单据类型:">
               <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
                          style="width: 90%">
@@ -33,7 +33,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item class="query-form-item" label="所属仓库:">
               <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
                          style="width: 90%"
@@ -52,7 +52,7 @@
         </el-row>
 
         <el-row>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item class="query-form-item" label="创建时间:">
               <el-date-picker
                 :picker-options="pickerOptions"