From 99fb88e18fe3786e4bb7556714d4ca427ed17a16 Mon Sep 17 00:00:00 2001
From: Min5203 <2318556978@qq.com>
Date: Fri, 14 Jan 2022 10:22:09 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8D=E7=9A=84=E8=BE=93=E5=85=A5=E6=A1=86=E5=92=8C?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                     |  3 +-
 components/Reviewer/Reviewer.vue | 24 +++++++++--
 pages/submitlist/submitlist.vue  | 70 ++++++++++++++++++++++++++------
 plugins/p-deliver/p-deliver.vue  | 59 +++++++++++++++------------
 4 files changed, 114 insertions(+), 42 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4b3d05..d5713bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 1.0.0 (2022-01-13)
+# 1.0.0 (2022-01-14)
 
 ### 🌟 新功能
 范围|描述|commitId
@@ -41,6 +41,7 @@
 ### 🔨 代码重构
 范围|描述|commitId
 --|--|--
+ - | 原有功能提交别的分支 | [eb02b72](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/eb02b72)
  - | 重构project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df)
  - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87)
 
diff --git a/components/Reviewer/Reviewer.vue b/components/Reviewer/Reviewer.vue
index 9335696..e2537ad 100644
--- a/components/Reviewer/Reviewer.vue
+++ b/components/Reviewer/Reviewer.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="deliverFoot border border-solid border-gray-300 rounded-md mt-3 p-2">
 		<view class="top flex justify-between">
-		    <view class="mr-3">
+		    <view class="mr-3 text-sm">
 		       审核人
 		     </view>
          <!-- 展示选择的审核人 -->
@@ -14,7 +14,7 @@
 		    </view>
           <!-- 点击更换图标 -->
         <view>
-		       <u-icon v-if="isUicon" name="arrow-down" @click="changeIcon"></u-icon>
+		       <u-icon v-if="isUicon" name="arrow-down" @click="isUicon = !isUicon"></u-icon>
 		       <u-icon v-else="isUicon" name="arrow-up" @click="changeIcon"></u-icon>
 		    </view>
 		  </view>
@@ -37,6 +37,10 @@
   import {ref , reactive , computed }from 'vue'
   // 图标切换
   let isUicon = ref('true')
+  let arrList = ref([{
+      checked:true,
+      name:'冯教授'
+    }])
   // 审核人员列表
   const delivers = reactive([
     {
@@ -77,13 +81,27 @@
             arr[3] = {checked:true,name:'...'}
           }
         })
-           return arr
+          return arr
     })
 
+
   // 点击切换箭头图标
   function changeIcon(){
     isUicon.value = !isUicon.value
+     let arr = [];
+    delivers.forEach((item)=>{
+      if(item.checked){
+        arr.push(item)
+      }
+    })
+    arrList.value = arr
+    // console.log(arrList.value)
   }
+  
+  defineExpose({
+    arrList
+  })
+
 </script>
 
 <style lang="scss">
diff --git a/pages/submitlist/submitlist.vue b/pages/submitlist/submitlist.vue
index da416ae..673815f 100644
--- a/pages/submitlist/submitlist.vue
+++ b/pages/submitlist/submitlist.vue
@@ -1,24 +1,70 @@
 <template>
 	<theme class="h-full w-full pt-1">
-      <view class="bg-white mx-5 my-2 rounded-md p-3">
-        <view class="flex justify-between text-gray-400 mb-2">
-          <view>插件名</view> <view>提交时间</view>
+      <view class="bg-white mx-5 my-2 rounded-md p-3 text-gray-400" v-for="item in listRef">
+        <!-- 插件名称和提交时间显示 -->
+        <view class="flex justify-between mb-2">
+          <view>{{item.plugname}}</view>
+          <view>{{item.subtime}}</view>
         </view>
+        <!-- 提交的链接 -->
         <view class="text-blue-400 mb-2">
-          链接
+         {{item.link}}
+        </view>
+        <!-- 该插件物的审核人 -->
+        <view class="mb-2">审核人</view>
+        <view class="flex justify-between" v-for="items in item.reviewer">
+            <view>
+                <view>
+                  {{items.name}}
+                </view>
+                <view>
+                  {{items.advise}}
+                </view>
+                <view>
+                  {{items.item}}
+                </view>
+            </view>
+            <view>
+                {{items}}
+            </view>
         </view>
-        <view class="mb-2 text-gray-400">审核人</view>
       </view>
   </theme>
 </template>
 
-<script>
-	export default {
-		data() {
-			return {
-			};
-		}
-	}
+<script setup>
+  import{ref} from 'vue'
+  const listRef = ref([
+    {
+      plugname:'入职插件V0.8输出',
+      subtime:'12/25 13:01',
+      link:'https://www.baidu.com/'
+      reviewer:[
+        {
+          name:'冯老师',
+          time: '12/25 14:22',
+          advise:'加油！',
+          state:'已通过',
+          grade:80
+        },
+        {
+          name:'宋老师',
+          time: '12/28 8:22',
+          advise:'不详细！',
+          state:'已驳回',
+          grade:''
+        },
+        {
+          name:'张老师',
+          time: '12/30 6:22',
+          advise:'',
+          state:'待审批',
+          grade:''
+        },
+      ]
+    },
+  ])
+
 </script>
 
 <style lang="scss">
diff --git a/plugins/p-deliver/p-deliver.vue b/plugins/p-deliver/p-deliver.vue
index 38b4637..64fbb05 100644
--- a/plugins/p-deliver/p-deliver.vue
+++ b/plugins/p-deliver/p-deliver.vue
@@ -4,15 +4,18 @@
  <view class="my-2 bg-white p-2 rounded-md relative"  @longpress="logoTime" v-if="deliverRef">
     <!-- 插件名称输入和提交 -->
     <view class=" flex item-center justify-between py-3 pl-2" :class="inputRef">
-     <u-input v-model="iptValue" type="text" :border="false" placeholder="请编辑交付物名称" />
-     <view class="self-center" :class="viewRef">{{iptValue}}</view>
+    <!-- <u-input v-model="iptValue" type="text" :border="false" placeholder="请编辑交付物名称" /> -->
+    <view v-model="textValue" class="flex-1">
+      {{textValue}}
+    </view>
+     <view class="self-center" :class="viewRef">{{textValue}}</view>
      <u-button type="primary" size="mini" @click="submit" class="self-center" :disabled="sbumitState">提交</u-button>
       <u-icon v-show="historyIcon" name="arrow-right" class="ml-1" @click="historical"></u-icon>
     </view>
     <view :class="viewRef" class="py-3 pl-2">
       <span class="relative px-1">
       <u-badge :is-dot="true" is-center></u-badge>
-      {{iptValue}}
+      {{textValue}}
       </span>
     </view>
     <!-- 插件上传方式 -->
@@ -26,7 +29,6 @@
       </view>
     </view>
     <!-- 提示框 -->
-    <u-toast ref="tips" />
 
     <!-- 取消和确定 -->
     <u-mask :show="showRef" @click="showRef = false">
@@ -56,30 +58,30 @@
         <view class="bg-red-500 text-white w-12 h-12 text-center leading-12 rounded-w-12 mx-8" @click="deletePlugin" @tap.stop>删除</view>
     </view>
     <!-- 插件审核人员选择 -->
-     <Reviewer/>
+     <Reviewer ref="reviewerData"></Reviewer>
  </view>
 
-
-
 </template>
 
 <script setup>
   import {ref,computed,reactive} from 'vue'
  // 插件名称
-  const deliverRef = ref(true)
-  const iptValue = ref('')
-  const linkValue = ref('')
-  const historyIcon = ref(false)
-  const tips = ref('')
-  const showRef = ref(false)
-  const maskRef = ref('hidden')
-  const inputRef = ref('block')
-  const viewRef = ref('hidden')
-  const newInputRef = ref('')
-  const submitHistory = reactive([])
+  const deliverRef = ref(true)  //交付物插件的显示与销毁
+  const textValue = ref('入职插件V0.8原型输出')  // 插件名的值
+  const linkValue = ref('')       //链接的值
+  const historyIcon = ref(false)   //查看历史记录的图标
+  const showRef = ref(false)      //编辑和删除页面
+  const maskRef = ref('hidden')  //带模态框的遮罩
+  const inputRef = ref('block')  //未点击提交按钮的状态框
+  const viewRef = ref('hidden') // 点击提交按钮后的状态框
+  const newInputRef = ref('')   //修改的插件名的值
+  const submitHistory = reactive([])  //提交的历史记录列表
+  const reviewerData = ref()
+
+  // const aa = this.$reviewer.arrList
 
   // 判断提交按钮的状态
-  const sbumitState = computed(()=>!(iptValue.value && linkValue.value))
+  const sbumitState = computed(()=>!( linkValue.value))
 
   // 获取当前时间
   function getTime(){
@@ -87,8 +89,7 @@
     const DD = uni.$dayjs().$D
     const HH = uni.$dayjs().$H
     const mm = uni.$dayjs().$m
-    const getTime = MM + '/' + DD + ' ' + HH + ':' + (mm < 10 ? '0' + mm : mm)
-    return getTime
+    return (MM + '/' + DD + ' ' + HH + ':' + (mm < 10 ? '0' + mm : mm))
   }
   // 提交后验证链接并修改状态
   function submit(){
@@ -99,21 +100,27 @@
     }else{
       inputRef.value = 'hidden'
       viewRef.value = 'block'
-      const time = getTime()
+
+      // 创建提交的历史对象
       const obj = {}
-      obj.name = iptValue.value
+      const time = getTime()
+      obj.name = textValue.value
       obj.time = time
       obj.link = linkValue.value
+      obj.deliver = reviewerData.value.arrList
       submitHistory.push(obj)
-      console.log(submitHistory)
+      // console.log(submitHistory)
+      // console.log(reviewerData.value.arrList)
     }
   }
 
   // 查看历史记录
   function historical(){
+    let editItem = submitHistory
     uni.navigateTo({
-      url: '/pages/submitList/submitList'
+      url: '/pages/submitList/submitList?editItem=' + encodeURIComponent(JSON.stringify(editItem))
     });
+    // console.log(editItem)
 
   }
 
@@ -171,7 +178,7 @@ function cancelClick(){
 }
 // 修改界面的确定按钮事件
 function sureClick (){
-    iptValue.value = newInputRef.value
+    textValue.value = newInputRef.value
     newInputRef.value = ''
     inputRef.value = 'block'
     viewRef.value = 'hidden'