From 66f214e66e4066999f4148224af93e0288fcea93 Mon Sep 17 00:00:00 2001
From: jyx <2012969435@qq.com>
Date: Thu, 19 Sep 2024 09:38:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86h5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/login.js           |  8 +++++
 src/pages/detail/index.vue | 11 +++---
 src/pages/index/index.vue  | 72 ++++++++++++++++++++++++++++++--------
 src/pages/login/index.vue  |  2 +-
 4 files changed, 73 insertions(+), 20 deletions(-)

diff --git a/src/api/login.js b/src/api/login.js
index 4faa8a5..213fd72 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -39,4 +39,12 @@ export const outbound = (data) => {
     data,
   });
 };
+//查询哪些画作可以拿来添加或者更换
+export const creChangepainting = (data) => {
+  return request({
+    url: "/containeradm/v1/painting_bucket/select_painting",
+    method: "POST",
+    data,
+  });
+};
   
\ No newline at end of file
diff --git a/src/pages/detail/index.vue b/src/pages/detail/index.vue
index 1909b0f..7312837 100644
--- a/src/pages/detail/index.vue
+++ b/src/pages/detail/index.vue
@@ -1,14 +1,14 @@
 <template>
     <view class="content">
       <navBar v-if="state.boxRelBucketStatus == 1"> 出库 </navBar>
-      <navBar v-if="state.boxRelBucketStatus == 2"> 画作详情 </navBar>
+      <navBar v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==3"> 画作详情 </navBar>
       <view class="container-box" >
         <span style="font-weight: bold;text-align: center;" v-if="state.boxRelBucketStatus == 1">
             保存要出库{{state.locateAddress}}的 
         </span>
         <span style="font-weight: bold;text-align: center;margin-top: 20rpx;" v-if="state.boxRelBucketStatus == 1"> {{state.pid}}画筒吗？</span>
-        <span style="font-weight: bold;text-align: center;" v-if="state.boxRelBucketStatus == 2">画筒号：{{state.pid}}</span>
-        <span style="font-weight: bold;text-align: center;margin-top: 20rpx;" v-if="state.boxRelBucketStatus == 2">所在位置：</span>
+        <span style="font-weight: bold;text-align: center;" v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==3">画筒号：{{state.pid}}</span>
+        <span style="font-weight: bold;text-align: center;margin-top: 20rpx;" v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==3">所在位置：{{ state.locateAddress }}</span>
         <view class="painting-box" >
           <span>画作名称：{{ state.drawName }}</span>
           <span style="margin-top: 20rpx;">画家：{{ state.drawerName }}</span>
@@ -45,7 +45,7 @@
         throttleTime="5"
         
         @click="login"
-        v-if="state.boxRelBucketStatus == 2"
+        v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==3"
         >返回继续扫码</up-button
       >
       </view>
@@ -69,6 +69,7 @@
   drawerName:"",
   drawThumbnail:"",
   locateAddress:"",
+  boxUid:"",
 });
   onLoad((options) =>{
     state.id = options.id;
@@ -87,6 +88,7 @@
     state.drawerName = res.data.drawerName;
     state.drawThumbnail = res.data.drawThumbnail;
     state.locateAddress = res.data.locateAddress;
+    state.boxUid = res.data.boxUid;
     }
 
 };
@@ -95,6 +97,7 @@ const doneSet = async () => {
   const res = await outbound({
     id: state.id,
     pid: state.pid,
+    boxUid:state.boxUid,
   });
   if (res.status === 0) {
     showMessage({ type: "sucess", message: "出库成功" });
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 5767eb0..4019b34 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -3,7 +3,7 @@
     <navBar> 添加画作 </navBar>
     <view class="container-box">
       <span style="font-weight: bold">
-        已扫画筒号：{{ }}
+        已扫画筒号：{{state.pid }}
       </span>
       <view style="display: flex; align-items: center;">
         <up-input class="login-input" placeholder="画家姓名/编号/画作编号/画作名称" style="flex: 1; margin-right: 10rpx;" clearable>
@@ -14,24 +14,28 @@
           margin-top: 15rpx;
           margin-left: 15rpx;" color="#EFC54E" throttleTime="5" :loading="loading" @click="login">搜索</up-button>
       </view>
-      <view class="painting-box" >
-        <span style="display: flex; align-items: center;">
-          <up-image :show-loading="true" :src="src" width="100px" height="100px" @click="click"></up-image>
+      <view class="painting-box" v-for="(painting,index) in state.tableData" :key="index">
+        <span style="display: flex; align-items: center;position: relative;" >
+          <up-image :show-loading="true" :src="painting.HdPic" width="100px" height="100px" @click="click"></up-image>
           <span style="display: flex; flex-direction: column; margin-left: 10px;">
-            <span style="font-weight: bold;" >画作名称</span>
-            <span style="color:#BCBCBC;font-size: 16px;">画作编号：</span>
-            <span style="color:#BCBCBC;font-size: 16px;">画家编号：</span>
-            <span style="color:#BCBCBC;font-size: 16px;">画家姓名：</span>
-            <span style="color:#BCBCBC;font-size: 16px;">平尺（寸）：</span>
+            <span style="font-weight: bold;" >{{painting.ArtworkName}}</span>
+            <span style="color:#BCBCBC;font-size: 16px;">画作编号：{{ painting.Tfnum }}</span>
+            <span style="color:#BCBCBC;font-size: 16px;">画家编号：{{ painting.Tnum }}</span>
+            <span style="color:#BCBCBC;font-size: 16px;">画家姓名：{{ painting.ArtistName }}</span>
+            <span style="color:#BCBCBC;font-size: 16px;">平尺（寸）：{{ painting.Ruler }}</span>
           </span>
-          <span style="margin-bottom: 180rpx;">
           <up-radio-group 
-            v-model="value"
-            placement="right">
-	          <up-radio  label=""></up-radio>
+            v-model="painting.ArtistUuid"
+            style="position: absolute;
+            left: 550rpx;
+            bottom: 150rpx;
+            "
+            placement="right"
+             @change="groupChange"
+            >
+	          <up-radio  :name="painting.ArtistUuid"></up-radio>
           </up-radio-group>
         </span>
-        </span>
       </view>
     
     </view>
@@ -56,7 +60,45 @@
 
 
 <script setup>
-import { ref } from "vue";
+import { ref, reactive, onBeforeMount } from "vue";
+import useToast from "@/hooks/toast/useToast.js";
+import { onLoad } from "@dcloudio/uni-app";
+import { creChangepainting } from "@/api/login.js";
+const { showMessage } = useToast();
+const value = ref(null)  
+const loading = ref(false);
+const state = reactive({
+  id: "",
+  pid: "",
+  tableData:[],
+});
+onLoad((options) => {
+state.id = options.id;
+state.pid = options.pid;
+paintingList()
+});
+const groupChange =(e) =>{
+  console.log(e)
+}
+// 获取可添加的画作列表
+const paintingList = async (param) => {
+  loading.value = true;
+  const res = await creChangepainting({
+    Tfnum: "",
+    ArtworkName: "",
+    Tnum: "",
+    ArtistName: "",
+    ...param,
+  });
+  if (res.status === 0) {
+        loading.value = false
+        state.tableData = res.data.Data
+        console.log("1111",state.tableData)
+      } else {
+        showMessage({ type: "error", message: res.msg });
+      }
+      loading.value = false
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 6bac430..7c17b22 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -154,7 +154,7 @@ const paintingDetail = async () => {
         },
       });
     } else {
-      if (res.data.boxRelBucketStatus == 3) {
+      if (res.data.boxRelBucketStatus == 3 && res.data.LocateAddress == '公司内') {
         uni.navigateTo({
           url: "/pages/painting/index?id=" + state.id + "&pid=" + state.pid,
           success: () => {