普洱修改前端，删除空托盘

时间修改
增加时间修改

src/views/checkManage/Subsection.vue

@@ -121,6 +121,18 @@ export default {
                 return {}
             }
         },
+        startTimestamp: {
+            type: String,
+            default: () => {
+                return {}
+            }
+        },
+        endTimestamp: {
+            type: String,
+            default: () => {
+                return {}
+            }
+        },
         
         
     },
@@ -253,7 +265,7 @@ export default {
             }else if(status == 1 ||status == 5 || status == 6 ){
                 color = '#d81e06'
             }else if(status == 4){
-                color = '#bc55cf'
+                color = '#1afa29'
             }else{
                 color = '#bfbfbf'
             }
@@ -279,6 +291,8 @@ export default {
                     rowEnd: this.random.row[1],
                     streetId: this.streetId,
                     direction: this.direction,
+                    startTimestamp: this.startTimestamp,
+                    endTimestamp: this.endTimestamp,
                     side: this.side,
                     rowTabs: rowTab,
                     columnTabs: columnTab

src/views/checkManage/checkOperation.vue

@@ -85,6 +85,17 @@
                                 <span class="img-box-value">
                                     {{ checkObj[item.key] }}
                                 </span>
+                            </li>
+                             <li class="img-box-item">
+                                <span  class="img-box-title" >
+                                    盘点起止时间:
+                                </span>
+                                <span class="img-box-value">
+                                    
+            <p> {{ checkObj.exportTime }}</p>
+                <p v-if="checkObj.endTime"> {{"~"+ checkObj.endTime }}</p>
+                                   
+                                </span>
                             </li>
                             <!-- <li class="img-box-item">
                                 <span class="img-box-title">
@@ -265,21 +276,14 @@ export default {
                     label: "盘点任务号",
                     key: "checkNum",
                 },
-                {
+                
-                    label: "盘点开始时间",
-                    key: "exportTime",
-                },
-                {
-                    label: "盘点结束时间",
-                    key: "endTime",
-                },
             ],
             statusMap: {
                 0: "未盘点",
                 1: "盘点异常",
                 2: "核对正确",
                 3: "人工核对正确",
-                4: "空托盘",
+                4: "核对正确",
                 5: "品规失败",
                 6: "个数失败",
             },

src/views/checkManage/index.vue

@@ -76,16 +76,15 @@
                 ></a-tag>
                 人工核对
             </span>
-            <span class="info-text">
+          
-                <a-tag
-                    color="#bc55cf"
-                    style="width: 30px; height: 20px; margin-right: 6px"
-                ></a-tag>
-                空托盘
-            </span>
         </div>
 
         <div style="margin: 10px">
+            
+                <a-row :gutter="24">
+                    <a-col :span="4">
+            
+             <a-form-item label="巷道">
             <a-select
                 @change="handleChange"
                 style="width: 200px"
@@ -105,6 +104,30 @@
                     />
                 </a-select-option>
             </a-select>
+             </a-form-item>
+            </a-col>
+            
+                    <a-col :span="8">
+                       
+
+             <a-form-item label="时间">
+                            <a-range-picker
+                                @change="onTimeChange"
+                                v-model="time"
+                                format="YYYY-MM-DD HH:mm"
+                                :show-time="{
+                                  defaultValue: [moment('00:00', 'HH:mm'), moment('23:59', 'HH:mm')],
+                                  //defaultValue: [moment('00:00', 'YYYY-MM-DD HH:mm'), moment('23:59', 'YYYY-MM-DD HH:mm')],
+                                }"
+                            >
+                                <a-icon
+                                    slot="suffixIcon"
+                                    type="calendar"
+                                />
+                            </a-range-picker>
+                        </a-form-item>
+                        </a-col>
+                        </a-row>
         </div>
 
         <a-col :span="24">
@@ -133,6 +156,8 @@
                     :side="leftSide"
                     :direction="1"
                     :streetId="item.id"
+                    :startTimestamp = "startTimestamp.toString()"
+                    :endTimestamp = "endTimestamp.toString()"
                     :streetName="item.name"
                 >
                 </subsection>
@@ -163,6 +188,8 @@
                     :side="rightSide"
                     :direction="2"
                     :streetId="item.id"
+                    :startTimestamp = "startTimestamp.toString()"
+                    :endTimestamp = "endTimestamp.toString()"
                     :streetName="item.name"
                 >
                 </subsection>
@@ -259,12 +286,16 @@
 <script>
 import Subsection from "./Subsection";
 import message from "ant-design-vue";
+import moment from "moment";
 import { notification } from 'ant-design-vue';
 
 export default {
     name: "checkManage",
     data() {
         return {
+            startTimestamp:"",
+            endTimestamp:"",
+            time: [],
             timer: "",
             leftSide: 1,
             rightSide: 1,
@@ -312,6 +343,29 @@ export default {
         this.websock.close(); //离开路由之后断开websocket连接
     },
     methods: {
+        moment,
+        handleReset() {
+            this.startTimestamp = "";
+            this.endTimestamp = "";
+        },
+        onTimeChange(date, dateString) {
+            this.handleReset();
+            // console.log(date);
+            console.log(dateString);
+            console.log(date[0].format("YYYY-MM-DD HH:mm"));
+            
+
+            this.startTimestamp = date[0].format(
+                "YYYY-MM-DD HH:mm:ss"
+            );
+            this.endTimestamp = date[1].format(
+                "YYYY-MM-DD HH:mm:ss"
+            );
+            console.log(this.startTimestamp);
+            console.log(this.endTimestamp);
+            
+            
+        },
         //获取巷道列表
         requestData() {
             
@@ -642,4 +696,8 @@ export default {
         margin-right: 20px;
     }
 }
+.ant-form-item {
+    display: flex;
+    width: 100%;
+}
 </style>

src/views/historyCheck/index.vue

@@ -120,9 +120,7 @@
                                     人工核对正确
                                 </a-select-option>
                                 
-                                <a-select-option :value=4>
+                                
-                                    空托盘
-                                </a-select-option>
                             </a-select>
                         </a-form-item>
                     </a-col>
@@ -186,6 +184,25 @@
             >
                 {{ statusMap[text.status] }}
             </span>
+            <span
+                slot="wmsCount"
+                slot-scope="text"
+            >
+                {{ text.wmsCount? text.wmsCount:0}}件
+            </span>
+            <span
+                slot="count"
+                slot-scope="text"
+            >
+                {{ text.count? text.count:0}}件
+            </span>
+              <span
+                slot="time"
+                slot-scope="text"
+            >
+            <p> {{ text.createTime }}</p>
+                <p v-if="text.endTime"> {{"~"+ text.endTime }}</p>
+            </span>
             <span
                 slot="pic"
                 slot-scope="text"
@@ -238,7 +255,7 @@ export default {
                 1: "盘点异常",
                 2: "核对正确",
                 3: "人工核对正确",
-                4: "空托盘",
+                4: "核对正确",
                 5: "品规失败",
                 6: "个数失败",
             },
@@ -265,9 +282,11 @@ export default {
             },
             imgUrl: imgUrl,
             columns: [
+               
+               
                 {
-                    title: "盘点批次号",
+                    title: "盘点号",
-                    dataIndex: "lotnum",
+                    dataIndex: "taskId",
                 },
                 {
                     title: "巷道名称",
@@ -283,14 +302,29 @@ export default {
                     title: "盘点状态",
                     scopedSlots: { customRender: "status" },
                 },
+                {
+                    title: "物料编码",
+                    dataIndex: "category",
+                }, {
+                    title: "品规名称",
+                    dataIndex: "wmsCategoryName",
+                }, 
+                {
+                    title: "库存数量",
+                    scopedSlots: { customRender: "wmsCount" },
+                },
+                {
+                    title: "盘点数量",
+                    scopedSlots: { customRender: "count" },
+                },
                 {
                     title: "照片",
                     scopedSlots: { customRender: "pic" },
                     width: 320,
                 },
                 {
-                    title: "更新时间",
+                    title: "起止时间",
-                    dataIndex: "createTime",
+                    scopedSlots: { customRender: "time" },
                 },
             ],
         };