From d5d225702d3b4deb6b0930445c610ec7c0693003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Mon, 28 Oct 2024 11:19:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A1=A5=E6=96=99=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=202024/8/6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/issue/job/issueJob.vue         |  2 +-
 src/pages/repleinsh/job/repleinshJob.vue | 82 +++++++++++++++++++++++-
 2 files changed, 80 insertions(+), 4 deletions(-)

diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index 6923209f..5414a161 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -449,7 +449,7 @@ const getDataListByType = (code) => {
     .then((res) => {
       uni.hideLoading()
       if (res.data.list.length == 0) {
-        showMessage('未查找到' + `【${code}】的收货任务`)
+        showMessage('未查找到发料任务');
       } else if (res.data.list.length == 1) {
         openJobDetail(res.data.list[0])
       }
diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue
index fce7bbc3..1dcf3674 100644
--- a/src/pages/repleinsh/job/repleinshJob.vue
+++ b/src/pages/repleinsh/job/repleinshJob.vue
@@ -1,7 +1,12 @@
 <template>
   <view class="">
     <com-empty-view v-if="jobList.length == 0"></com-empty-view>
-    <job-filter :isShowFromLocationCode="true" ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday" @switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday" :isShowItemCode="true" :checkedWaitTask="checkedWaitTask" @fromLocationCode="fromLocationCode"> </job-filter>
+    <job-filter :isShowFromLocationCode="true" :isShowProductionLineCode="true" :productionline="productionlineList"
+                ref="filter" otherTitle="" @switchChangeToday="switchChangeToday" @switchChangeWait="switchChangeWait"
+                @onScanNumber="getScanNumber" :checkedToday="checkedToday" :checkedWaitTask="checkedWaitTask"
+                :isShowItemCode="true" @productionLineCode="productionLineCode" @fromLocationCode="fromLocationCode"
+                @onQuery="getListByFilter">
+    </job-filter>
     <view v-if="jobList.length > 0" class="u-m-20">
       <u-swipe-action :show="item.show" :index="index" v-for="(item, index) in jobList" :key="index" :options="item.status == '2' ? detailGiveupOptions : item.status == '1' ? detailCloseOptions : detailOptions" bg-color="rgba(255,255,255,0)" class="u-m-b-20" @click="swipeClick">
         <com-repleinsh-job-card :dataContent="item" @click="openJobDetail(item)"></com-repleinsh-job-card>
@@ -20,7 +25,7 @@
 import { ref, getCurrentInstance, nextTick } from 'vue'
 import { onLoad, onShow, onNavigationBarButtonTap, onReady, onBackPress, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
 
-import { getRepleinshJobList, cancleTakeRepleinshJob, closeTakeRepleinshJob } from '@/api/request2.js'
+import {getRepleinshJobList, cancleTakeRepleinshJob, closeTakeRepleinshJob, getIssueJobList} from '@/api/request2.js'
 
 import { goHome, updateTitle } from '@/common/basic.js'
 
@@ -64,9 +69,12 @@ const jobListPopupRef = ref()
 const businessTypeCode = ref('Repleinment')
 const businessType = ref(null)
 const scanBalance = ref({})
+const scanPopup = ref('')
 const outInventoryStatus = ref("")
 const inInventoryStatus = ref("")
 const checkedWaitTask = ref(false)
+const productionLineCode = ref('')
+const productionlineList = ref([])
 onShow(() => {
   nextTick(() => {
     getList('refresh')
@@ -190,7 +198,7 @@ const selectedItem = (item) => {
   openJobDetail(item)
 }
 const showItemList = (itemList) => {
-  scanList.value.openPopup(itemList)
+  jobListPopupRef.value.openPopup(itemList)
 }
 const swipeClick = (index, index1) => {
   // var text = clearTirmAndWrap(requestList.value[index].options[index].text)
@@ -325,6 +333,74 @@ const openScanPopup = () => {
     scanPopup.value.openScanPopup(businessType.value)
   }
 }
+const getListByFilter = ( param )=>{
+  uni.showLoading({
+    title: "加载中­....",
+    mask: true
+  });
+  let filters = []
+  if (checkedToday.value) {
+    filters.push({
+      column: "create_time",
+      action: "betweeen",
+      value: todayTime.value
+    })
+  }
+
+  filters.push({
+    column: "status",
+    action: "in",
+    value: status.value
+  })
+
+  filters.push({
+    column: "accept_user_id",
+    action: "==",
+    value:store.id
+  })
+
+  if (param.fromLocationCode) {
+    // 来源库位
+    filters.push({
+      column: "fromLocationCode",
+      action: "==",
+      value: param.fromLocationCode
+    })
+  }
+  if (param.productionLine) {
+    // 生产线
+    filters.push({
+      column: "productionLineCode",
+      action: "==",
+      value: param.productionLine
+    })
+  }
+  if (param.itemCode) {
+    // 生产线
+    filters.push({
+      column: "itemCode",
+      action: "like",
+      value: param.itemCode
+    })
+  }
+  let params = {
+    filters: filters,
+    pageNo: 1,
+    pageSize: 100,
+  }
+  getIssueJobList(params).then(res => {
+    uni.hideLoading();
+    if (res.data.total == 0) {
+      showMessage('未查找到补料任务');
+    } else if (res.data.total == 1) {
+      openJobDetail(res.data.list[0]);
+    } else {
+      showItemList(res.data.list);
+    }
+  }).catch(error => {
+    showMessage(error)
+  })
+}
 const selectItem = (item) => {
   scanPopup.value.closeScanPopup()
   openJobDetail(item, scanMessage.value)