工器具退料

src/pages/toolsBack/toolsBack.vue

@@ -61,7 +61,7 @@
                 <div>工程名称: {{ item.proName }}</div>
                 <div>退料人: {{ item.backPerson }}</div>
                 <div>联系电话: {{ item.phone }}</div>
-                <div>已退数量: {{ item.alNum || 0 }}</div>
+                <div>已退数量: {{item.status == 2 ? item.backNum : 0}}</div>
                 <div>备注: {{ item.remark }}</div>
               <div>
                 状态:
@@ -163,7 +163,7 @@ const onClickItem = (item) => {
 //点击详情
 const handleItem = (item) => {
     console.log('🚀 ~ handleItem ~ item:', item)
-    uni.navigateTo({ url: `/pages/toolsBack/toolsDetail?id=${item.id}&taskId=${item.taskId}` })
+    uni.navigateTo({ url: `/pages/toolsBack/toolsDetail?id=${item.id}&taskId=${item.taskId}&status=${item.status}` })
 }
 
 // 滚动事件

src/pages/toolsBack/toolsBackCode.vue

@@ -107,7 +107,7 @@ import { ref, reactive } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'  
 import { getMachine,insertApp } from '../../services/back.js';
 import { baseURL } from '@/utils/http'
-const title = ref('退料接收')
+const title = ref('退料任务')
 const taskInfo = ref({})    
 const maId = ref("")  //编码
 const maCode = ref("")  //编码

src/pages/toolsBack/toolsBackCodeDetail.vue

@@ -18,9 +18,9 @@
             <uni-col :span="4">
                 <view class="search" @click="getCodeList()">查询</view>
             </uni-col>
-            <uni-col :span="8">
+<!--            <uni-col :span="8">-->
-                <view class="addBtn" @click="goCode">编码新增</view>
+<!--                <view class="addBtn" @click="goCode">编码新增</view>-->
-            </uni-col> 
+<!--            </uni-col> -->
         </uni-row> 
         <div class="card" style="margin-top: 10px;">
             <div>退料物资</div>

src/pages/toolsBack/toolsBackNum.vue

@@ -142,9 +142,8 @@
 import { ref, reactive } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'  
 import { getUseType,insertApp } from '../../services/back.js';
-const title = ref('退料接收')
+const title = ref('退料任务')
-const taskInfo = ref({})    
+const taskInfo = ref({})
-
 const maTypeSelectList = ref([])
 const typeId = ref("")//类型
 const maCodeSelectList = ref([])

src/pages/toolsBack/toolsBackNumDetail.vue

@@ -16,8 +16,8 @@
                 <span class="title">任务信息</span>
             </div>
             <uni-forms :model="taskInfo" label-width="160rpx" :border="true">
-                <uni-forms-item label="退料班组：" name="unitName">
+                <uni-forms-item label="退料班组：" name="teamName">
-                    <span style="height: 100%;display: flex;align-items: center;">{{ taskInfo.unitName }}</span>
+                    <span style="height: 100%;display: flex;align-items: center;">{{ taskInfo.teamName }}</span>
                 </uni-forms-item>
                 <uni-forms-item label="工程名称：" name="proName">
                     <span style="height: 100%;display: flex;align-items: center;">{{ taskInfo.proName }}</span>
@@ -101,7 +101,7 @@ const back = () => {
 onLoad((options)=>{
 	console.log(options)
 	taskInfo.value = JSON.parse(options.taskInfo)
-    console.log(taskInfo.value)
+    console.log("123456",taskInfo.value)
     rowData.value = JSON.parse(options.rowData)
     console.log(rowData.value)
     typeList.value = [rowData.value]

src/pages/toolsBack/toolsDetail.vue

@@ -19,13 +19,13 @@
             <uni-col :span="4">
                 <view class="search" @click="getTableList()">查询</view>
             </uni-col>
-            <uni-col :span="5">
+            <uni-col :span="5" v-if="status !== 2">
                 <view class="addBtn" @click="goCode">编码退料</view>
             </uni-col>
-            <uni-col :span="5" style="padding-right: 0;">
+            <uni-col :span="5" style="padding-right: 0;" v-if="status !== 2">
                 <view class="addBtn" @click="goNum">数量退料</view>
             </uni-col>
-        </uni-row> 
+        </uni-row>
         <div class="table-list-item" v-for="(item, index) in tableList" :key="index" @click="handleItem(item)">
             <uni-swipe-action class="swipe-action">
                 <uni-swipe-action-item @click="onClick($event, item)" :right-options="item.manageType==1 ? options:options2">
@@ -46,7 +46,7 @@
                     </uni-row>
                     <uni-row :gutter="24">
                         <uni-col :span="8">已退数量：</uni-col>
-                        <uni-col :span="16"><div class="cont">{{ item.preNum }}</div></uni-col>
+                        <uni-col :span="16"><div class="cont">{{ item.status === '2' ? item.preNum : 0 }}</div></uni-col>
                     </uni-row>
                     <uni-row :gutter="24">
                         <uni-col :span="8">单位：</uni-col>
@@ -72,7 +72,8 @@ import { getBackInfo,deleteNumType } from '../../services/back.js';
 import { onLoad,onShow } from '@dcloudio/uni-app'
 const title = ref('退料任务')
 const keyWord = ref('')
-const id = ref('') 
+const id = ref('')
+const status = ref(0)
 const taskId = ref('')
 const statusList = ref(["2","12"])
 const tableList = ref([])
@@ -96,7 +97,7 @@ const options = ref([
             fontSize: '30rpx',
         },
     },
-]) 
+])
 
 // 右滑按钮组
 const options2 = ref([
@@ -108,29 +109,29 @@ const options2 = ref([
             fontSize: '30rpx',
         },
     },
-    
+
-])  
+])
 //详情数据
-const getTableList = () => { 
+const getTableList = () => {
 	// let obj = {
 	// 	"id":id.value,
 	// 	// "taskId":taskId.value,
 	// 	// "statusList":statusList.value,
 	// }
 	// console.log(obj)
-	getBackInfo(id.value,keyWord.value).then(res => { 
+	getBackInfo(id.value,keyWord.value).then(res => {
-		console.log(res) 
+		console.log(res)
         taskInfo.value = res.data.backApplyInfo;
 		tableList.value = res.data.backApplyDetailsList;
 		console.log(taskInfo.value)
 	}).catch(error => {
-		console.log(error) 
+		console.log(error)
-	})  
+	})
 }
 const search = () => {
     console.log('🚀 ~ search ~ keyWord:', keyWord.value)
 	getTableList()
-} 
+}
 //编码新增
 const goCode = () => {
     uni.navigateTo({ url: `/pages/toolsBack/toolsBackCode?taskInfo=${JSON.stringify(taskInfo.value)}` })
@@ -155,7 +156,7 @@ const onClick = (e, item) => {
             id:item.id,
             parentId:item.parentId
         }
-        deleteNumType(param).then(res => { 
+        deleteNumType(param).then(res => {
             console.log(res)
             if(res.code==200){
                 uni.showToast({ title: '删除成功', icon: 'none' })
@@ -164,21 +165,23 @@ const onClick = (e, item) => {
                 uni.showToast({ title: '删除失败', icon: 'none' })
             }
         }).catch(error => {
-            console.log(error) 
+            console.log(error)
-        })  
+        })
     }
 }
 
 //点击详情
 const handleItem = (item) => {
     console.log('🚀 ~ handleItem ~ item:', item)
-    if (item.manageType == 0) {
+    // if (item.status!=='2'){
-        //编码接收
+    //     if (item.manageType == 0) {
-        uni.navigateTo({ url: `/pages/toolsBack/toolsBackCode?taskInfo=${JSON.stringify(taskInfo.value)}` })
+    //         //编码接收
-    } else if (item.manageType == 1) {
+    //         uni.navigateTo({ url: `/pages/toolsBack/toolsBackCode?taskInfo=${JSON.stringify(taskInfo.value)}` })
-        //数量接收
+    //     } else if (item.manageType == 1) {
-        uni.navigateTo({ url: `/pages/toolsBack/toolsBackNum?taskInfo=${JSON.stringify(taskInfo.value)}` })
+    //         //数量接收
-    }
+    //         uni.navigateTo({ url: `/pages/toolsBack/toolsBackNum?taskInfo=${JSON.stringify(taskInfo.value)}` })
+    //     }
+    // }
 }
 
 const back = () => {
@@ -191,6 +194,8 @@ onLoad((options)=>{
 	console.log(options)
 	id.value = options.id
 	taskId.value = options.taskId
+    status.value = Number(options.status)
+    console.log("123",status.value)
 	getTableList()
 })
 onShow(()=>{