|
@@ -47,7 +47,7 @@
|
|
|
class="location-icon-btn"
|
|
class="location-icon-btn"
|
|
|
@click="openLeaveLocationInMap"
|
|
@click="openLeaveLocationInMap"
|
|
|
>
|
|
>
|
|
|
- <u-icon name="map-fill" size="28" color="#2979ff" />
|
|
|
|
|
|
|
+ <u-icon name="map-fill" size="23" color="#2979ff" />
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
@@ -91,6 +91,7 @@
|
|
|
<u-button
|
|
<u-button
|
|
|
size="mini"
|
|
size="mini"
|
|
|
type="primary"
|
|
type="primary"
|
|
|
|
|
+ shape="round"
|
|
|
plain
|
|
plain
|
|
|
@tap="handleImageDownload(image)"
|
|
@tap="handleImageDownload(image)"
|
|
|
@click.stop.prevent="handleImageDownloadClick(image, $event)"
|
|
@click.stop.prevent="handleImageDownloadClick(image, $event)"
|
|
@@ -138,6 +139,7 @@
|
|
|
<u-button
|
|
<u-button
|
|
|
size="mini"
|
|
size="mini"
|
|
|
type="primary"
|
|
type="primary"
|
|
|
|
|
+ shape="round"
|
|
|
plain
|
|
plain
|
|
|
@tap="handleDownloadFile(file)"
|
|
@tap="handleDownloadFile(file)"
|
|
|
@click.stop.prevent="handleDownloadFileClick(file, $event)"
|
|
@click.stop.prevent="handleDownloadFileClick(file, $event)"
|
|
@@ -190,7 +192,13 @@
|
|
|
|
|
|
|
|
<u-form-item label="销假地点" prop="cancelLocation" required>
|
|
<u-form-item label="销假地点" prop="cancelLocation" required>
|
|
|
<view class="location-row">
|
|
<view class="location-row">
|
|
|
- <u-button type="primary" size="mini" plain @click="handleGetLocation">
|
|
|
|
|
|
|
+ <u-button
|
|
|
|
|
+ shape="round"
|
|
|
|
|
+ type="info"
|
|
|
|
|
+ size="mini"
|
|
|
|
|
+ plain
|
|
|
|
|
+ @click="handleGetLocation"
|
|
|
|
|
+ >
|
|
|
<u-icon name="map-fill" size="20" color="#2979ff" />
|
|
<u-icon name="map-fill" size="20" color="#2979ff" />
|
|
|
<text style="margin-left: 8rpx">
|
|
<text style="margin-left: 8rpx">
|
|
|
{{ isWechatBrowser ? '微信定位' : '定位' }}
|
|
{{ isWechatBrowser ? '微信定位' : '定位' }}
|
|
@@ -207,7 +215,7 @@
|
|
|
</view>
|
|
</view>
|
|
|
<view class="location-action-container">
|
|
<view class="location-action-container">
|
|
|
<view class="location-icon-btn" @click="openLocationInMap">
|
|
<view class="location-icon-btn" @click="openLocationInMap">
|
|
|
- <u-icon name="map-fill" size="28" color="#2979ff" />
|
|
|
|
|
|
|
+ <u-icon name="map-fill" size="23" color="#2979ff" />
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
@@ -278,6 +286,7 @@
|
|
|
v-if="image.status === 'success'"
|
|
v-if="image.status === 'success'"
|
|
|
size="mini"
|
|
size="mini"
|
|
|
type="primary"
|
|
type="primary"
|
|
|
|
|
+ shape="round"
|
|
|
plain
|
|
plain
|
|
|
@tap="handleImageDownload(image)"
|
|
@tap="handleImageDownload(image)"
|
|
|
@click.stop.prevent="
|
|
@click.stop.prevent="
|
|
@@ -290,6 +299,7 @@
|
|
|
v-if="image.status === 'error'"
|
|
v-if="image.status === 'error'"
|
|
|
size="mini"
|
|
size="mini"
|
|
|
type="warning"
|
|
type="warning"
|
|
|
|
|
+ shape="round"
|
|
|
plain
|
|
plain
|
|
|
@click.stop.prevent="retryUploadFile(image, $event)"
|
|
@click.stop.prevent="retryUploadFile(image, $event)"
|
|
|
>
|
|
>
|
|
@@ -298,6 +308,7 @@
|
|
|
<u-button
|
|
<u-button
|
|
|
size="mini"
|
|
size="mini"
|
|
|
type="error"
|
|
type="error"
|
|
|
|
|
+ shape="round"
|
|
|
plain
|
|
plain
|
|
|
@tap="handleImageDelete(image, index, $event)"
|
|
@tap="handleImageDelete(image, index, $event)"
|
|
|
@click.stop.prevent="
|
|
@click.stop.prevent="
|
|
@@ -374,6 +385,7 @@
|
|
|
<u-button
|
|
<u-button
|
|
|
v-if="file.status === 'success'"
|
|
v-if="file.status === 'success'"
|
|
|
size="mini"
|
|
size="mini"
|
|
|
|
|
+ shape="round"
|
|
|
type="primary"
|
|
type="primary"
|
|
|
plain
|
|
plain
|
|
|
@tap="handleDownloadFile(file)"
|
|
@tap="handleDownloadFile(file)"
|
|
@@ -384,6 +396,7 @@
|
|
|
<u-button
|
|
<u-button
|
|
|
v-if="file.status === 'error'"
|
|
v-if="file.status === 'error'"
|
|
|
size="mini"
|
|
size="mini"
|
|
|
|
|
+ shape="round"
|
|
|
type="warning"
|
|
type="warning"
|
|
|
plain
|
|
plain
|
|
|
@click.stop.prevent="retryUploadFile(file, $event)"
|
|
@click.stop.prevent="retryUploadFile(file, $event)"
|
|
@@ -392,10 +405,13 @@
|
|
|
</u-button>
|
|
</u-button>
|
|
|
<u-button
|
|
<u-button
|
|
|
size="mini"
|
|
size="mini"
|
|
|
|
|
+ shape="round"
|
|
|
type="error"
|
|
type="error"
|
|
|
plain
|
|
plain
|
|
|
@tap="handleRemoveFile(file, index)"
|
|
@tap="handleRemoveFile(file, index)"
|
|
|
- @click.stop.prevent="handleRemoveFileClick(file, index, $event)"
|
|
|
|
|
|
|
+ @click.stop.prevent="
|
|
|
|
|
+ handleRemoveFileClick(file, index, $event)
|
|
|
|
|
+ "
|
|
|
>
|
|
>
|
|
|
删除
|
|
删除
|
|
|
</u-button>
|
|
</u-button>
|
|
@@ -410,7 +426,8 @@
|
|
|
<!-- 统一附件上传按钮 -->
|
|
<!-- 统一附件上传按钮 -->
|
|
|
<view class="doc-upload-section">
|
|
<view class="doc-upload-section">
|
|
|
<u-button
|
|
<u-button
|
|
|
- type="primary"
|
|
|
|
|
|
|
+ type="info"
|
|
|
|
|
+ shape="round"
|
|
|
icon="plus"
|
|
icon="plus"
|
|
|
plain
|
|
plain
|
|
|
@click="handleDocUpload"
|
|
@click="handleDocUpload"
|
|
@@ -1346,14 +1363,14 @@ export default {
|
|
|
// 文档删除按钮点击处理(安全的事件处理)
|
|
// 文档删除按钮点击处理(安全的事件处理)
|
|
|
handleRemoveFileClick(file, index, event) {
|
|
handleRemoveFileClick(file, index, event) {
|
|
|
console.log('销假文档删除按钮被点击:', file, index);
|
|
console.log('销假文档删除按钮被点击:', file, index);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
// 强制阻止事件冒泡和默认行为
|
|
// 强制阻止事件冒泡和默认行为
|
|
|
if (event) {
|
|
if (event) {
|
|
|
event.stopPropagation();
|
|
event.stopPropagation();
|
|
|
event.preventDefault();
|
|
event.preventDefault();
|
|
|
event.stopImmediatePropagation();
|
|
event.stopImmediatePropagation();
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
// 调用实际的删除方法
|
|
// 调用实际的删除方法
|
|
|
this.handleRemoveFile(file, index);
|
|
this.handleRemoveFile(file, index);
|
|
|
},
|
|
},
|
|
@@ -1840,7 +1857,7 @@ export default {
|
|
|
height: 48rpx;
|
|
height: 48rpx;
|
|
|
border-radius: 50%;
|
|
border-radius: 50%;
|
|
|
background: #f5faff;
|
|
background: #f5faff;
|
|
|
- border: 1px solid #e6f1ff;
|
|
|
|
|
|
|
+ /* border: 1px solid #e6f1ff; */
|
|
|
cursor: pointer;
|
|
cursor: pointer;
|
|
|
transition: all 0.2s ease;
|
|
transition: all 0.2s ease;
|
|
|
}
|
|
}
|