From 247249352d6c80846735520294a904a8b3dd0c00 Mon Sep 17 00:00:00 2001
From: GPU is all you need <2778335106@qq.com>
Date: Sat, 15 Oct 2022 21:42:41 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:"=E5=A2=9E=E5=8A=A0=E6=8A=A5=E5=A4=87?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=92=8C=E6=8A=A5=E5=A4=87=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/report/detail/reportDetail.ts       | 23 +++++++++++++++----
 .../pages/report/detail/reportDetail.wxml     | 16 ++++++-------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/IOReportSysMP/miniprogram/pages/report/detail/reportDetail.ts b/IOReportSysMP/miniprogram/pages/report/detail/reportDetail.ts
index 395a4cb..fe899dd 100644
--- a/IOReportSysMP/miniprogram/pages/report/detail/reportDetail.ts
+++ b/IOReportSysMP/miniprogram/pages/report/detail/reportDetail.ts
@@ -2,7 +2,18 @@ import { IORecords, QRToken } from '../../../services/baseClass'
 import QR from '../../../utils/weapp-qrcode/weapp-qrcode'
 import services from "../../../services/index"
 import { formatDateTimeStr } from '../../../utils/util'
-
+// 字典数据
+const ioRecordType = ['入','出']
+const ioRecordStatus = {
+  SAVE: '保存',
+  SUBMIT: "提交待审核",
+  HOSPITAL_PASS:'院级审核通过',
+  SCHOOL_PASS:'校级审核通过',
+  VERIFICATION_PASS:'核验通过',
+  HOSPITAL_NOT_PASS:'院级审核不通过',
+  SCHOOL_NOT_PASS:'校级审核不通过',
+  VERIFICATION_NOT_PASS:'核验不通过',
+}
 Page({
 
   /**
@@ -12,7 +23,9 @@ Page({
   data: {
     showQrcode: false,
     ioRecord : IORecords,
-    expireTime:null
+    expireTime:null,
+    ioRecordType,
+    ioRecordStatus,
   },
   onTest() {
     console.log(this.data)
@@ -27,7 +40,7 @@ Page({
     let record = this.data.ioRecord;
     this.startInter();
   },
-  getRecordDetail : async function(){
+  getRecordDetail: async function(){
    const reportID = wx.getStorageSync("myReport/myReport")
    // const reportID = 4;
     let res = await services.API.iORecords.getIORecordByID.request({ID:reportID});    
@@ -84,8 +97,8 @@ Page({
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady() {   
-  },
+  // onReady() {   
+  // },
 
   /**
    * 生命周期函数--监听页面显示
diff --git a/IOReportSysMP/miniprogram/pages/report/detail/reportDetail.wxml b/IOReportSysMP/miniprogram/pages/report/detail/reportDetail.wxml
index 6f25600..2f90a70 100644
--- a/IOReportSysMP/miniprogram/pages/report/detail/reportDetail.wxml
+++ b/IOReportSysMP/miniprogram/pages/report/detail/reportDetail.wxml
@@ -10,19 +10,19 @@
   </view>
   <view class="report-info-container">
     <view class="card-col-1">
-      <yinput onlyRead padding="3px" label="工号:" defaultValue="{{ioRecord.teacherID}}" />
-      <yinput onlyRead padding="3px" label="姓名:" defaultValue="{{ioRecord.teacherID}}" />
+      <yinput onlyRead padding="3px" label="工号:" value="{{ioRecord.teacherID}}" />
+      <yinput onlyRead padding="3px" label="姓名:" value="{{ioRecord.teacherID}}" />
     </view>
-    <yinput onlyRead padding="3px" label="手机号:" defaultValue="{{ioRecord.mobile?ioRecord.mobile:'无'}}" />
+    <yinput onlyRead padding="3px" label="手机号:" value="{{ioRecord.mobile?ioRecord.mobile:'无'}}" />
     <view class="card-col-1">
-      <yinput onlyRead padding="3px" label="类型:" defaultValue="{{ioRecord.ioType}}" />
+      <yinput onlyRead padding="3px" label="类型:" value="{{ioRecordType[ioRecord.ioType]}}" />
       
     </view>
     <view class="card-col-1">
-    <yinput onlyRead padding="3px" label="状态:" defaultValue="{{ioRecord.status}}" />
+    <yinput onlyRead padding="3px" label="状态:" value="{{ioRecordStatus[ioRecord.status]}}" />
     </view>
-    <yinput onlyRead padding="3px" label="校内居住地:" defaultValue="{{ioRecord.innerResidence}}" />
-    <yinput onlyRead padding="3px" label="校外居住地:" defaultValue="{{ioRecord.outerResidence}}" />
-    <yinput onlyRead padding="3px" label="事由:" defaultValue="{{ioRecord.reason}}" />
+    <yinput onlyRead padding="3px" label="校内居住地:" value="{{ioRecord.innerResidence}}" />
+    <yinput onlyRead padding="3px" label="校外居住地:" value="{{ioRecord.outerResidence}}" />
+    <yinput onlyRead padding="3px" label="事由:" value="{{ioRecord.reason}}" />
   </view>
 </view>
\ No newline at end of file
-- 
2.36.2


From 5d9cd7973fef7595a8e97a4e8075b3a2519fa1fe Mon Sep 17 00:00:00 2001
From: GPU is all you need <2778335106@qq.com>
Date: Sun, 16 Oct 2022 22:42:43 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix=20=E5=87=BA=E6=A0=A1=E6=8A=A5=E5=A4=87?=
 =?UTF-8?q?=E4=B8=8A=E6=96=B9=E7=81=B0=E8=89=B2=E5=8D=A1=E7=89=87=E5=8F=AA?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=A7=93=E5=90=8D=E5=92=8C=E6=8A=A5=E5=A4=87?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/report/enter/enterReport.scss       | 23 ++++++++++++++++---
 .../pages/report/enter/enterReport.ts         |  5 ----
 .../pages/report/enter/enterReport.wxml       | 21 +++++------------
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/IOReportSysMP/miniprogram/pages/report/enter/enterReport.scss b/IOReportSysMP/miniprogram/pages/report/enter/enterReport.scss
index 2480f98..ab8b917 100644
--- a/IOReportSysMP/miniprogram/pages/report/enter/enterReport.scss
+++ b/IOReportSysMP/miniprogram/pages/report/enter/enterReport.scss
@@ -1,20 +1,37 @@
 .card-container {
-  margin: 20px;
+  margin: 20rpx;
   background-color: var(--color-gray-0);
   box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
+  font-size: 17px;
+  // font-weight: 550;
 
   .card-col-1 {
+    padding: 24rpx 0;
     display: flex;
+    width: auto;
+
+    & yinput:nth-child(1) {
+      flex: 4 1 50px;
+      margin: 0 5rpx;
+    }
+
+    & yinput:nth-child(2) {
+      flex: 7 1 50px;
+      margin:0 5rpx;
+    }
   }
 
 }
 
+
 .input-container {
   padding-bottom: 80rpx;
+
   .card-col-1 {
     display: flex;
     margin: 0 2px;
-    :nth-child(n){
+
+    :nth-child(n) {
       flex: 1 1 0;
     }
   }
@@ -26,7 +43,7 @@
   left: 0;
   background-color: var(--color-primary);
   color: white;
-  width: 100%; 
+  width: 100%;
   border-radius: 0;
   z-index: 99;
 }
\ No newline at end of file
diff --git a/IOReportSysMP/miniprogram/pages/report/enter/enterReport.ts b/IOReportSysMP/miniprogram/pages/report/enter/enterReport.ts
index 514d2ca..614381b 100644
--- a/IOReportSysMP/miniprogram/pages/report/enter/enterReport.ts
+++ b/IOReportSysMP/miniprogram/pages/report/enter/enterReport.ts
@@ -37,11 +37,6 @@ Page<IPageData,IPage>({
     this.setData({
       applyTime: e.detail.value,
     });
-  },
-  ioTypeChange (e:any) {
-    this.setData({
-      ioType:this.data.ioTypesArray[e.detail.value],
-    });
   },
     // 获取文本框字数
     inputs: function (e: any) {
diff --git a/IOReportSysMP/miniprogram/pages/report/enter/enterReport.wxml b/IOReportSysMP/miniprogram/pages/report/enter/enterReport.wxml
index ca3df90..b40b9b2 100644
--- a/IOReportSysMP/miniprogram/pages/report/enter/enterReport.wxml
+++ b/IOReportSysMP/miniprogram/pages/report/enter/enterReport.wxml
@@ -1,27 +1,18 @@
 <navigationBar title="进校报备"></navigationBar>
 <view class="card-container">
   <view class="card-col-1">
-      <yinput onlyRead padding="16rpx" label="工号：" bindValue="teacherID" defaultValue="{{teacherID}}"></yinput>
-      <yinput onlyRead padding="16rpx" label="姓名：" bindValue="name" defaultValue="{{name}}"></yinput>
+      <yinput onlyRead padding="16rpx" label="工号：" bindValue="teacherID" value="{{teacherID}}" wx:if=""></yinput>
+      <yinput onlyRead padding="0" label="姓名:" bindValue="name" value="{{'殷梁禹加'}}"></yinput>
+      <yinput onlyRead padding="0" label="报备类型:" bindValue="name" value="进校报备"></yinput>
   </view>
-    <yinput onlyRead padding="16rpx" label="联系方式：" bindValue="mobile" defaultValue="{{mobile}}"></yinput>
-    <yinput onlyRead padding="16rpx" label="学院: " bindValue="dept" defaultValue="{{dept.department}}"></yinput>
+    <yinput onlyRead padding="16rpx" label="联系方式：" bindValue="mobile" value="{{mobile}}"  wx:if="" ></yinput>
+    <yinput onlyRead padding="16rpx" label="学院: " bindValue="dept" value="{{dept.department}}"  wx:if=""></yinput>
 </view>
     
 <form bindsubmit="onSubmit" rules="{{rules}}">
   
-    <view class="weui-cells__title">进出校报备信息填写</view>
+    <view class="weui-cells__title"  wx:if="">进出校报备信息填写</view>
     <view class="weui-cells weui-cells_form">
-      <view class="weui-cell weui-cell_active">
-        <view class="weui-cell__hd">
-          <label class="weui-label" style="width: 5em;">报备类型</label>
-        </view>
-        <view class="weui-cell__bd">
-          <picker aria-role="combobox" bindchange="ioTypeChange" range="{{ioTypesArray}}">
-            <view class="weui-select" style="height:24px;line-height: 24px;">{{ioType}}</view>
-          </picker>
-        </view>
-      </view>
       <view class="weui-cell weui-cell_active">
                   <view class="weui-cell__hd">
                       <view class="weui-label" id="js_date" aria-hidden="true">申请日期</view>
-- 
2.36.2


From dc365ce5da272ecf0f1025069977ed6428790061 Mon Sep 17 00:00:00 2001
From: GPU is all you need <2778335106@qq.com>
Date: Sun, 16 Oct 2022 22:44:30 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix=20yinput=E6=9C=89=E6=97=B6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=87=BA=E6=9D=A5=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IOReportSysMP/miniprogram/components/yinput/yinput.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IOReportSysMP/miniprogram/components/yinput/yinput.ts b/IOReportSysMP/miniprogram/components/yinput/yinput.ts
index 30ed8be..41cba2f 100644
--- a/IOReportSysMP/miniprogram/components/yinput/yinput.ts
+++ b/IOReportSysMP/miniprogram/components/yinput/yinput.ts
@@ -30,7 +30,7 @@ Component({
   },
   lifetimes: {
     ready:function(){
-      const initValue = this.data.defaultValue || ''
+      const initValue = this.data.value || this.data.defaultValue || ''
       this.dataset[this.data.bindValue] = initValue
       this.setData({ value: initValue })
     },
-- 
2.36.2