From 8704577cc405f0273a68fe062edcdd1cd2f15087 Mon Sep 17 00:00:00 2001
From: chenwei <chenwei>
Date: Mon, 8 Jul 2024 15:06:29 +0800
Subject: [PATCH] fix:限制图片大小、取消单号长度限制、小区带出省市区

---
 pages/charge/visitsAndFees/createaVisit.vue | 33 ++++++++++++++++++++++++---------
 pages/login/mobile.vue                      |  4 ++--
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/pages/charge/visitsAndFees/createaVisit.vue b/pages/charge/visitsAndFees/createaVisit.vue
index 3f792ae..947e6f3 100644
--- a/pages/charge/visitsAndFees/createaVisit.vue
+++ b/pages/charge/visitsAndFees/createaVisit.vue
@@ -80,7 +80,7 @@
             <u-form-item :required="item.required" :label="item.label" labelWidth="75%" borderBottom
               v-if="item.type === 'file' && item.show" :prop="item.key">
               <u-upload :fileList="fileList" @afterRead="afterRead" @delete="deletePic" name="1" multiple :maxCount="1"
-                :disabled="operationStatus ==='YD'" width="100rpx" height="100rpx"></u-upload>
+                :disabled="operationStatus ==='YD'" width="100rpx" height="100rpx" :maxSize="fileSize"></u-upload>
             </u-form-item>
           </view>
         </view>
@@ -198,7 +198,7 @@
 
     <!-- 字典选择 -->
     <u-picker :show="pickerShow" ref="uPicker" closeOnClickOverlay :columns="columns" @cancel="pickerShow = false"
-      @close="pickerShow = false" keyName="label" @confirm="confirm"></u-picker>
+      @close="pickerShow = false" keyName="label" @confirm="confirm" :defaultIndex="[0]"></u-picker>
 
     <!-- 公司选择 -->
     <u-picker :show="gsShow" ref="gsPicker" closeOnClickOverlay :title="gsName" :columns="companyList"
@@ -208,6 +208,7 @@
     <!-- 时间选择 -->
     <u-datetime-picker :show="datetimeShow" v-model="dataTimeValue" closeOnClickOverlay @confirm="dateConfirm"
       @cancel="datetimeShow = false" @close="datetimeShow = false" mode="date"></u-datetime-picker>
+
     <!-- 省市区街道选择 -->
     <uv-picker ref="regionsPicker" :columns="addressList" @confirm="regionConfirm" keyName="name"
       :loading="regionLoading" @change="regionChange"></uv-picker>
@@ -282,6 +283,7 @@
           remark: "",
           attachmentFile: "",
         },
+        fileSize:20971520, //限制文件大小为20M
         copyModel: {},
         rules: {
           billingPersonName: [{
@@ -706,8 +708,7 @@
           type: "input",
           key: "invoiceNo",
           show: true,
-          mode: "number",
-          max: '10'
+          mode: "text",
         }, {
           label: '收费金额',
           placeholder: "请输入",
@@ -997,7 +998,12 @@
           let col = result.data.map(item => ({
             value: item.vlgOrCmty,
             label: `${item.vlgOrCmty}(${item.urbRurCls})`,
-            urbRurCls: item.urbRurCls
+            urbRurCls: item.urbRurCls,
+            province:item.province,
+            city:item.city,
+            district:item.district,
+            street:item.street,
+            address:`${item.province}${item.city}${item.district}${item.street}`
           }));
           this.columns = [col];
         } else if (item.key === 'userName') {
@@ -1071,6 +1077,11 @@
           this.emptyFill(2);
           this.model[this.currentName] = e.value[0].value;
           this.model.urbRurCls = e.value[0].urbRurCls;
+          this.model.address = e.value[0].address;
+          this.model.userProvince = e.value[0].province;
+          this.model.userCity = e.value[0].city;
+          this.model.userDistrict = e.value[0].district;
+          this.model.userStreet = e.value[0].street;
         } else if (this.currentName === 'userName') {
           this.emptyFill();
           let values = e.values[0][0]
@@ -1327,14 +1338,18 @@
         })
       },
       async uploadAttachment() {
-        console.log("上传附件");
         uni.chooseFile({
           count: 1, //默认100
           type: 'all',
           // extension: ['.doc', '.xlsx', '.docx'],
           success: async (res) => {
-            let tempUrl = res.tempFilePaths[0]
-            console.log(res);
+            let size = res.tempFiles[0].size
+            console.log("上传附件",res);
+            if(size > this.fileSize){
+              uni.$u.toast("请上传20M以内的文件");
+              return
+            }
+            let tempUrl = res.tempFilePaths[0];
             const result = await chargeFile.uploadFile(tempUrl);
             this.attachmentList.push(result);
             console.log(result);
@@ -1474,7 +1489,7 @@
   }
 
   /deep/.u-form-item__body__right__content__slot {
-    justify-content: end;
+    justify-content: flex-end;
     padding-bottom: 5rpx;
   }
 </style>
diff --git a/pages/login/mobile.vue b/pages/login/mobile.vue
index fa48f9e..0810c78 100644
--- a/pages/login/mobile.vue
+++ b/pages/login/mobile.vue
@@ -29,9 +29,9 @@
             v-model="formData.password" placeholder="请输入登录密码" style="width: 610rpx;">
             <u-icon slot="prefix" size="20" style="margin-right: 48rpx;" name="/static/images/icon/pwd.png"></u-icon>
             <template slot="suffix">
-              <u-icon v-if="inputType === 'password'" size="20" color="#666666" name="eye-fill"
+              <u-icon v-if="inputType === 'password'" size="20" color="#666666" name="eye-off"
                 @click="inputType = 'text'"></u-icon>
-              <u-icon v-if="inputType === 'text'" size="20" color="#666666" name="eye-off"
+              <u-icon v-if="inputType === 'text'" size="20" color="#666666" name="eye-fill"
                 @click="inputType = 'password'"></u-icon>
             </template>
           </u-input>
--
libgit2 0.21.2