feat：一键复制、二次提示 其他优化

manifest.json

@@ -2,8 +2,8 @@
     "name" : "小葫芦",
     "appid" : "__UNI__DDAE2E0",
     "description" : "",
-    "versionName" : "1.3.0",
-    "versionCode" : 130,
+    "versionName" : "1.3.1",
+    "versionCode" : 131,
     "transformPx" : false,
     "app-plus" : {
         "webView" : {

pages/publicClue/index.vue

@@ -57,6 +57,8 @@
 					<qiun-data-charts type="line" :chartData="chartData" canvasId="trendChart" :opts="opts" :ontouch="true" tooltipFormat="tooltipFormatPrice"
 						width="700rpx" height="500rpx" backgroundColor="#ffffff" @getIndex="handleChartClick" />
 				</view>
+				<u--text v-if="tableData.length > 0" :text="'日期：' + date"></u--text>
+				<Table ref="customTable" v-if="tableData.length > 0" :tableData="tableData" height="100px" :columns="columns" stripe></Table>
 			</view>
 		</u-modal>
 		
@@ -75,6 +77,7 @@
 	import post from "@/pages/clue/post/index.vue";
 	import sort from "@/pages/clue/components/sort.vue";
 	import filterQuery from "@/pages/clue/components/filterQuery.vue";
+	import Table from '@/components/custom-table/index.vue'
 	export default {
 		onPullDownRefresh() {
 			uni.stopPullDownRefresh();
@@ -84,6 +87,7 @@
 			post,
 			sort,
 			filterQuery,
+			Table,
 		},
 		mixins: [clue],
 		onLoad() {

pages/wareHouse/components/edit.vue

@@ -257,9 +257,10 @@
             </view>
         </view>
         <view :class="['btn_group', {'col-2': formData.stockStatus == '1'}]">
-            <u-button plain type="primary" @click="submitForm('onlyIn')">保存</u-button>
-            <u-button type="primary" @click="submitForm('inAndUp')" v-if="formData.stockStatus == '1'">入库并上架</u-button>
+            <u-button plain type="primary" @click="openInfoModal('onlyIn')">保存</u-button>
+            <u-button type="primary" @click="openInfoModal('inAndUp')" v-if="formData.stockStatus == '1'">入库并上架</u-button>
         </view>
+        <moreInfo ref="moreInfoRef" :moreOptions="moreOptions" @confirm="handleMoreInfoConfirm" :isCopy="true" :showCancelButton="true"></moreInfo>
     </view>
 </template>
 <script>
@@ -269,6 +270,7 @@ import BrandList from '@/components/brand-list/index.vue'
 import ImgsRowScroll from '@/components/imgs-row-scroll/index.vue'
 import PersonPicker from '@/components/person-picker/index.vue'
 import { permissionCheck,getRoles } from '@/utils/util.js'
+import moreInfo from './moreInfo.vue'
 import { productConditionList,productAttributeList,stockStatusList,recycleTypeList,labelList,paymentTabList } from '../js/public.js'
 export default {
     components: {
@@ -276,7 +278,8 @@ export default {
         Cell,
         BrandList,
         ImgsRowScroll,
-        PersonPicker
+        PersonPicker,
+        moreInfo
     },
     data() {
         return {
@@ -392,6 +395,8 @@ export default {
             recycleTypeList: recycleTypeList,
             labelList: labelList,
             paymentTabList: paymentTabList,
+            moreOptions: {},
+            
         }
     },
     onLoad(options) {
@@ -463,9 +468,27 @@ export default {
                 this.typeList = res
             })
         },
+        openInfoModal(submitType) {
+            this.$refs.addForm.validate().then(() => {
+                this.submitType = submitType
+                this.moreOptions = {
+                    dictLabel: this.formData.dictLabel || '',
+                    origin: this.formData.origin || '',
+                    actualPrice: this.formData.actualPrice || '',
+                    model: this.formData.model || '',
+                    indentifyCode: this.formData.indentifyCode || '',
+                    cardYear: this.formData.cardYear || '',
+                    productDesc: this.formData.productDesc || '',
+                }
+                this.$refs.moreInfoRef.showMoreInfo();
+            })
+        },
+        handleMoreInfoConfirm() {
+            if(!permissionCheck('WAREHOUSER')) return false
+            this.submitForm(this.submitType)
+        },
         // 提交表单
         submitForm(submitType) {
-            if(!permissionCheck('WAREHOUSER')) return false
             this.$refs.addForm.validate().then((valid) => {
                 if (valid) {
                     if (this.formData.title == '') {
@@ -477,6 +500,7 @@ export default {
                         submitType: submitType, //提交类型 onlyIn：仅入库/暂存入库 inAndUp：入库并上架
                         continuousWarehousing: this.continuousWarehousing[0] || '0',//是否连续入库 1：是 0：否
                     }
+                    this.$refs.moreInfoRef.closeModal();
                     if(this.formType == 'add'){
                         uni.$u.api.wareHouseAdd(data).then(res => {
                             uni.$u.toast('操作成功');

pages/wareHouse/components/moreInfo.vue

@@ -1,36 +1,41 @@
 <template>
     <view class="more-info-wrapper">
-        <u-modal :show="show" @confirm="closeModal">
-            <div class="more-info">
-                <view class="modal-item">
-                    <text>品牌：</text>
-                    <text>{{ moreOptions.dictLabel || '-' }}</text>
+        <u-modal :show="show" @confirm="confirmModal" :showCancelButton="showCancelButton" @cancel="closeModal" @close="closeModal">
+            <view class="modal-content">
+                <view class="more-info">
+                    <view class="modal-item">
+                        <text>品牌：</text>
+                        <text>{{ moreOptions.dictLabel || '-' }}</text>
+                    </view>
+                    <view class="modal-item">
+                        <text>来源：</text>
+                        <text>{{ moreOptions.origin || '-' }}</text>
+                    </view>
+                    <view class="modal-item">
+                        <text>实价：</text>
+                        <text>¥{{ moreOptions.actualPrice || '-' }}</text>
+                    </view>
+                    <view class="modal-item">
+                        <text>型号：</text>
+                        <text>{{ moreOptions.model || '-' }}</text>
+                    </view>
+                    <view class="modal-item">
+                        <text>编码：</text>
+                        <text>{{ moreOptions.indentifyCode || '-' }}</text>
+                    </view>
+                    <view class="modal-item">
+                        <text>日期：</text>
+                        <text>{{ moreOptions.cardYear || '-' }}</text>
+                    </view>
+                    <view class="modal-item">
+                        <text>备注：</text>
+                        <text>{{ moreOptions.productDesc || '-' }}</text>
+                    </view>
                 </view>
-                <view class="modal-item">
-                    <text>来源：</text>
-                    <text>{{ moreOptions.origin || '-' }}</text>
+                <view v-if="isCopy">
+                    <u-button type="primary" text="一键复制" size="small" @click="copy"></u-button>
                 </view>
-                <view class="modal-item">
-                    <text>实价：</text>
-                    <text>¥{{ moreOptions.costPrice || '-' }}</text>
-                </view>
-                <view class="modal-item">
-                    <text>型号：</text>
-                    <text>{{ moreOptions.model || '-' }}</text>
-                </view>
-                <view class="modal-item">
-                    <text>编码：</text>
-                    <text>{{ moreOptions.indentifyCode || '-' }}</text>
-                </view>
-                <view class="modal-item">
-                    <text>日期：</text>
-                    <text>{{ recycleTimeFormatter(moreOptions.recycleTime) || '-' }}</text>
-                </view>
-                <view class="modal-item">
-                    <text>备注：</text>
-                    <text>{{ moreOptions.productDesc || '-' }}</text>
-                </view>
-            </div>
+            </view>
         </u-modal>
     </view>
 </template>
@@ -42,8 +47,17 @@ export default {
         moreOptions: {
             type: Object,
             default: () => { }
-        }
+        },
+        isCopy: {
+            type: Boolean,
+            default: false
+        },
+        showCancelButton: {
+            type: Boolean,
+            default: false
+        },
     },
+    emits: ['confirm'],
     data() {
         return {
             show: false,
@@ -53,14 +67,31 @@ export default {
         showMoreInfo() {
             this.show = true;
         },
-        closeModal() {
+        confirmModal() {
+            this.$emit('confirm', this.moreOptions);
+        },
+        closeModal(){
             this.show = false;
         },
-        recycleTimeFormatter(val) {
-            if (val) {
-                return this.$dayjs(val).format('YYYY-MM-DD HH:mm:ss')
-            }
-            return '-'
+        copy() {
+            const { dictLabel, origin, actualPrice, model, indentifyCode, cardYear, productDesc } = this.moreOptions;
+            const copyText = `品牌：${dictLabel || '-'}\n来源：${origin || '-'}\n实价：¥${actualPrice || '-'}\n型号：${model || '-'}\n编码：${indentifyCode || '-'}\n日期：${cardYear || '-'}\n备注：${productDesc || '-'}`;
+            
+            uni.setClipboardData({
+                data: copyText,
+                success: () => {
+                    uni.showToast({
+                        title: '复制成功',
+                        icon: 'none'
+                    })
+                },
+                fail: () => {
+                    uni.showToast({
+                        title: '复制失败',
+                        icon: 'none'
+                    })
+                }
+            })
         }
     }
 }
@@ -73,4 +104,14 @@ export default {
     height: 0;
     overflow: hidden;
 }
+::v-deep .modal-content{
+    width:90%;
+}
+::v-deep .u-modal__content{
+    padding:24rpx 0;
+}
+.modal-content{
+    display: flex;
+    justify-content: space-between;
+}
 </style>

pages/wareHouse/index.vue

@@ -148,7 +148,7 @@
 		<view class="add-button" @click="handleEdit">
 			<u-icon name="plus" size="36" color="#ffffff"></u-icon>
 		</view>
-		<moreInfo ref="moreInfoRef" :moreOptions="moreOptions"></moreInfo>
+		<moreInfo ref="moreInfoRef" :moreOptions="moreOptions" @confirm="handleMoreInfoConfirm"></moreInfo>
 	</view>
 </template>
 <script>
@@ -250,6 +250,9 @@ export default {
 			this.moreOptions = goods;
 			this.$refs.moreInfoRef.showMoreInfo();
 		},
+		handleMoreInfoConfirm() {
+			this.$refs.moreInfoRef.closeModal();
+		},
 		getTypeList() {
 			this.$getDicts("crm_form_category").then(res => {
 				this.tabList = [...res]