物料申购bug修改，指定领料追踪bug修改

src/view/material-manege/material-apply-detail/material-apply-detail.vue

@@ -26,7 +26,7 @@
     </div>
     <div class="border"></div>
     <div class="table-filter">
-      <div class="active" style="width: 7%; text-align: center" @click="fabricAndInkClick('')" :style="technologyType == '' ? 'border:2px solid #0077ff' : ''">
+      <div class="active" style="width: 7%; text-align: center" @click="fabricAndInkClick('')" :style="technologyType === '' ? 'border:2px solid #0077ff' : ''">
         全部
       </div>
       <div class="fabric" :style="technologyType == 5 ? 'border:2px solid #0077ff' : ''" style="width: 50%" @click="fabricAndInkClick(5)">
@@ -38,11 +38,11 @@
         <ul>
           <li>
             卷数
-            <span>{{ getData(5, 'purchaseQty') }}</span>
+            <span>{{ getData(5, 'num') }}</span>
           </li>
           <li>
             米数
-            <span>{{ getData(5, 'num') }}</span>
+            <span>{{ getData(5, 'purchaseQty') }}</span>
           </li>
           <li>
             面积
@@ -67,18 +67,18 @@
       </div>
     </div>
     <div class="fabric-son" v-if="tableModalType">
-      <div class="fabric-sun">
+      <div class="fabric-sun" :style="technologyType === 0 ? 'border:2px solid #0077ff' : ''" @click="fabricAndInkClick(0)">
         <div class="label" style="border-right: 2px solid #dcdcdc">
           <span>直喷</span>
         </div>
         <ul>
           <li>
             卷数
-            <span>{{ getData(0, 'purchaseQty') }}</span>
+            <span>{{ getData(0, 'num') }}</span>
           </li>
           <li>
             米数
-            <span>{{ getData(0, 'num') }}</span>
+            <span>{{ getData(0, 'purchaseQty') }}</span>
           </li>
           <li>
             面积
@@ -86,18 +86,18 @@
           </li>
         </ul>
       </div>
-      <div class="fabric-sun">
+      <div class="fabric-sun" :style="technologyType == 2 ? 'border:2px solid #0077ff' : ''" @click="fabricAndInkClick(2)">
         <div class="label" style="border-right: 2px solid #dcdcdc">
           <span>打纸</span>
         </div>
         <ul>
           <li>
             卷数
-            <span>{{ getData(2, 'purchaseQty') }}</span>
+            <span>{{ getData(2, 'num') }}</span>
           </li>
           <li>
             米数
-            <span>{{ getData(2, 'num') }}</span>
+            <span>{{ getData(2, 'purchaseQty') }}</span>
           </li>
           <li>
             面积
@@ -105,18 +105,18 @@
           </li>
         </ul>
       </div>
-      <div class="fabric-sun">
+      <div class="fabric-sun" :style="technologyType == 1 ? 'border:2px solid #0077ff' : ''" @click="fabricAndInkClick(1)">
         <div class="label" style="border-right: 2px solid #dcdcdc">
           <span>热转</span>
         </div>
         <ul>
           <li>
             卷数
-            <span>{{ getData(1, 'purchaseQty') }}</span>
+            <span>{{ getData(1, 'num') }}</span>
           </li>
           <li>
             米数
-            <span>{{ getData(1, 'num') }}</span>
+            <span>{{ getData(1, 'purchaseQty') }}</span>
           </li>
           <li>
             面积
@@ -124,18 +124,18 @@
           </li>
         </ul>
       </div>
-      <div class="fabric-sun">
+      <div class="fabric-sun" :style="technologyType == 4 ? 'border:2px solid #0077ff' : ''" @click="fabricAndInkClick(4)">
         <div class="label" style="border-right: 2px solid #dcdcdc">
           <span>其他</span>
         </div>
         <ul>
           <li>
             卷数
-            <span>{{ getData(4, 'purchaseQty') }}</span>
+            <span>{{ getData(4, 'num') }}</span>
           </li>
           <li>
             米数
-            <span>{{ getData(4, 'num') }}</span>
+            <span>{{ getData(4, 'purchaseQty') }}</span>
           </li>
           <li>
             面积

src/view/store-manage/store-manage/store-manage-2.vue

@@ -505,7 +505,7 @@ export default {
 				},
 				{
 					title: '物料标签值',
-					key: 'rfid',
+					key: 'rfidCode',
 					tooltip: true,
 					minWidth: 150,
 				},
@@ -516,31 +516,47 @@ export default {
 				},
 				{
 					title: '入库时间',
-					key: 'addStorageTime',
+					key: 'createTime',
 					minWidth: 150,
 				},
 				{
 					title: '在库时间',
-					key: 'inStorageDay',
+					key: 'inStockTime',
 					minWidth: 150,
+					render: (h, params) => {
+						return h(
+							'span',
+							{
+								style:{
+									color:params.row.inStockTime > 30 ? 'orange' : ''
+								},
+							},
+							params.row.inStockTime
+						)
+					},
 				},
 				{
 					title: '所在仓库',
-					key: 'stockHouseName',
+					key: 'houseName',
+					minWidth: 150,
+				},
+				{
+					title: '库位',
+					key: 'areaName',
 					minWidth: 150,
 				},
 				{
 					title: '质检状态',
-					key: 'quantityState',
+					key: 'quantityCheckState',
 					minWidth: 150,
 					render: (h, params) => {
 						return h(
 							'span',
-							params.row.quantityState === 0
+							params.row.quantityCheckState === 0
 								? '未质检'
-								: params.row.quantityState === 1
+								: params.row.quantityCheckState === 1
 								? '已质检'
-								: params.row.quantityState === 2
+								: params.row.quantityCheckState === 2
 								? '无需质检'
 								: ''
 						)
@@ -713,13 +729,20 @@ export default {
 		},
 		open(item) {
 			if (!item.storageDetails) {
-				GetStockTagDetailList({
-					materialCode: item.materialCode,
-				}).then((res) => {
-					if (res.code === 0) {
-						this.$set(item, 'storageDetails', res.result)
-					}
-				})
+				axios
+					.post('/cloudApi/stockWater/inStockList', {
+						materialCode:item.materialCode,
+					})
+					.then((res) => {
+						this.$set(item, 'storageDetails', res.data.data)
+					})
+				// GetStockTagDetailList({
+				// 	materialCode: item.materialCode,
+				// }).then((res) => {
+				// 	if (res.code === 0) {
+				// 		this.$set(item, 'storageDetails', res.result)
+				// 	}
+				// })
 			}
 		},
 		openTag(item) {

src/view/store-out-manage/picking-tracking/picking-tracking.vue

@@ -6,7 +6,8 @@
         <span style="font-size: 14px;font-weight: bold;color: black">指定领料追踪</span>
       </div>
       <div class="date-filter-wrap">
-        <div class="date-filter">
+        <date-select v-model="params" @change="dateClick"></date-select>
+        <!-- <div class="date-filter">
           <div class="date-tab" v-for="item in dateTabs" :key="item.type" :class="item.type === type ? 'active' : ''" @click="dateTabToggle(item.type)">
             {{ item.label }}
           </div>
@@ -18,7 +19,7 @@
           placement="bottom-end"
           placeholder="请选择日期"
           style="width: 200px;margin-left: 10px;"
-        ></DatePicker>
+        ></DatePicker> -->
       </div>
     </div>
     <div class="border"></div>
@@ -43,11 +44,11 @@
       </div>
       <div class="item">
         <div class="label">指定领料未领卷数</div>
-        <p class="value" style="color: red; text-decoration:underline">{{ statistical.appointNotClaimedNum }}</p>
+        <p class="value" style="color: red; text-decoration:underline;cursor: pointer;" @click="openDtl(2)">{{ statistical.appointNotClaimedNum }}</p>
       </div>
       <div class="item" style="border-right: 1px solid #e6e6e6;">
         <div class="label">额外领料卷数</div>
-        <p class="value" style="color: red; text-decoration:underline">{{ statistical.additionalNum }}</p>
+        <p class="value" style="color: red; text-decoration:underline;cursor: pointer;"  @click="openDtl(3)">{{ statistical.additionalNum }}</p>
       </div>
       <div class="item">
         <div class="label">排班米数</div>
@@ -96,8 +97,8 @@
         :rowData="rowData"
         :parameter="{
           type: type,
-          beginTime: beginTime,
-          endTime: endTime,
+          beginTime: params.beginTime,
+          endTime: params.endTime,
           jobNo: jobNo,
           pickingType: pickingType
         }"
@@ -110,10 +111,10 @@
 import axios from 'axios'
 import MyTable from '_c/my-table/my-table'
 import DetailsModal from './details-modal'
-
+import  dateSelect  from '@/components/dateSelect/dateSelect'
 export default {
   name: 'picking_tracking',
-  components: { MyTable, DetailsModal },
+  components: { MyTable, DetailsModal,dateSelect },
   data() {
     return {
       dataArea: [],
@@ -129,7 +130,9 @@ export default {
       params: {
         pageIndex: 1,
         pageSize: 20,
-        total: 0
+        total: 0,
+        beginTime: '',
+        endTime: '',
       },
       btnIndex: 0,
       jobNo: '',
@@ -266,6 +269,7 @@ export default {
                           },
                           on: {
                             click(e) {
+                              console.log(e)
                               e.stopPropagation()
                               _this.pickingType = '2'
                               _this.detailsTitle = '指定领料未领卷数'
@@ -636,6 +640,13 @@ export default {
     this.dateTabToggle('1')
   },
   methods: {
+    openDtl(_type){
+      const _this = this
+      _this.pickingType = _type
+      _this.detailsTitle = _type == '2' ? '指定领料未领卷数' : '额外领料卷数'
+      _this.rowData = {code:''}
+      _this.openDetails = true
+    },
     handleSpan({ row, column, rowIndex, columnIndex }) {
       console.log(row, column, rowIndex, columnIndex)
       if (rowIndex === 0 && columnIndex === 0) {
@@ -656,9 +667,9 @@ export default {
       }
     },
     dateClick(date) {
-      this.beginTime = date[0]
-      this.endTime = date[1]
-      this.type = '99'
+      // this.beginTime = date[0]
+      // this.endTime = date[1]
+      // this.type = '99'
       this.getUserList()
       this.getList()
     },
@@ -709,8 +720,8 @@ export default {
       axios
         .post('/cloudApi/stockDetail/pickingTrackingUserStatistics', {
           type: this.type,
-          beginTime: this.beginTime,
-          endTime: this.endTime
+          beginTime: this.params.beginTime,
+          endTime: this.params.endTime
         })
         .then(res => {
           this.userList = res.data.data
@@ -720,8 +731,8 @@ export default {
       axios
         .post('/cloudApi/stockDetail/pickingTrackingNumStatistics', {
           type: this.type,
-          beginTime: this.beginTime,
-          endTime: this.endTime,
+          beginTime: this.params.beginTime,
+          endTime: this.params.endTime,
           jobNo: this.jobNo
         })
         .then(res => {
@@ -730,8 +741,8 @@ export default {
       axios
         .post('/cloudApi/stockDetail/pickingTrackingList', {
           type: this.type,
-          beginTime: this.beginTime,
-          endTime: this.endTime,
+          beginTime: this.params.beginTime,
+          endTime: this.params.endTime,
           jobNo: this.jobNo
         })
         .then(res => {