新增顶部修改

pages/orderDetailNew/components/orderDetailNewView.vue

@@ -20,8 +20,7 @@
         </view>
 
         <ul class="page">
-            <li v-for="(tab, index) in tabs" :key="index" :class="{ 'active': activeIndex === index }"
-                @click="activeIndex = index">{{ tab }}</li>
+            <li v-for="(tab, index) in tabs" :key="index" :class="{ 'active': activeIndex === index }">{{ tab }}</li>
         </ul>
     </view>
 </template>
@@ -152,7 +151,7 @@ export default {
                 // "freight": 30,         //运费page4加上
                 // "checkCodeFee": null,  //查码费
                 // "totalCost": "60230.00",   // 成本合计 =   运费 + 好处费 + 查码费 + 表款(支付总额) + 维修费。
-                "sellingPrice": this.topInfo.price.replace(/,/g, ''),   //实际价格（售价）顶上tab里面的第三栏
+                "sellingPrice": this.topInfo.price,   //实际价格（售价）顶上tab里面的第三栏
                 // "performance": "29772.00",  //sellingPrice - totalCost
                 // "receiptRemark":     //"收单之后还需再跟进", 先不传
                 // "repairAmount": null, //维修总金额 ，先不传
@@ -223,7 +222,7 @@ export default {
                 "freight": warehouseInfo.freight || '',         //运费page4加上
                 "checkCodeFee": warehouseInfo.checkCodeFee || '',  //查码费
                 // "totalCost": "60230.00",   // 成本合计 =   运费 + 好处费 + 查码费 + 表款(支付总额) + 维修费。
-                "sellingPrice": this.topInfo.price.replace(/,/g, ''),   //实际价格（售价）顶上tab里面的第三栏
+                "sellingPrice": this.topInfo.price,   //实际价格（售价）顶上tab里面的第三栏
                 // "performance": "29772.00",  //sellingPrice - totalCost
                 "receiptRemark": warehouseInfo.remarks + ';' + warehouseInfo.uploadedImage || '',//"收单之后还需再跟进", 先不传
                 "repairAmount": warehouseInfo.repairAmount || '', //维修总金额 ，先不传

pages/orderDetailNew/components/pageOne.vue

@@ -152,16 +152,26 @@ export default {
             console.log('电话卡片被点击', '电话号码:', this.orderDetail.phone)
             if (this.orderDetail.phone) {
                 //拨打电话
-                uni.makePhoneCall({
-                    phoneNumber: this.orderDetail.phone,
+                // uni.makePhoneCall({
+                //     phoneNumber: this.orderDetail.phone,
+                //     success: () => {
+                //         this.$store.commit("call/SET_FORM", {
+                //             clueId: this.orderDetail.clueId,
+                //             type: "3",
+                //             callee: this.orderDetail.phone,
+                //         });
+                //     },
+                // });
+                //先暂时复制电话号码
+                uni.setClipboardData({
+                    data: this.orderDetail.phone,
                     success: () => {
-                        this.$store.commit("call/SET_FORM", {
-                            clueId: this.orderDetail.clueId,
-                            type: "3",
-                            callee: this.orderDetail.phone,
-                        });
-                    },
-                });
+                        uni.showToast({
+                            title: '电话号码已复制',
+                            icon: 'none'
+                        })
+                    }
+                })
             } else {
                 uni.showToast({
                     title: '该订单暂时没有电话号码',

pages/orderDetailNew/index.vue

@@ -26,25 +26,28 @@
         <orderDetailNewView :detail="receiptDetail" :topInfo="topInfo" :orderId="orderId"
             :currentReceipt="currentReceipt" />
 
-        <!-- 通用模态窗 -->
-        <custom-modal :visible="modalVisible" :title="modalConfig.title" :value="modalConfig.value"
-            :placeholder="modalConfig.placeholder" @cancel="handleModalCancel" @confirm="handleModalConfirm" />
+
 
         <!-- 加一单选择模态窗 -->
-        <u-modal :show="addOneModelShow" :title="'新增收件信息'" showCancelButton @cancel="addOneModelShow = false"
+        <u-modal :show="addOneModelShow" :title="'加一单'" showCancelButton @cancel="addOneModelShow = false"
             @confirm="handleAddOneConfirm">
-            <u--form>
-                <u-form-item :model="checkModel" label="请选择品牌" prop="brand" borderBottom
-                    @click="showBrandSelector = true;">
-                    <u--input v-model="checkModel.brand" disabled disabledColor="#ffffff" placeholder="请选择品牌"
-                        @click="showBrandSelector = true;" border="none"></u--input>
-                    <u-icon slot="right" name="arrow-right"></u-icon>
-                </u-form-item>
-            </u--form>
+            <u-button type="primary" plain @click="showBrandSelector = true;"
+                :text="currentAddBrand.dictLabel || '点击请选择品牌'"></u-button>
         </u-modal>
-        <!-- 品牌选择器 -->
+        <!-- 加一单品牌选择器 -->
         <u-picker :show="showBrandSelector" @confirm="handleBrandConfirm" :columns="brandColumns"
             @cancel='showBrandSelector = false' keyName="dictLabel"></u-picker>
+
+
+
+        <!-- 修改当前品牌选择器 -->
+        <u-picker :show="editBrandSelector" @confirm="handleEditBrandConfirm" :columns="brandColumns"
+            @cancel='editBrandSelector = false' keyName="dictLabel"></u-picker>
+
+
+        <!-- 修改当前型号、价格弹窗 -->
+        <custom-modal :visible="modalVisible" :title="modalConfig.title" :value="modalConfig.value"
+            :placeholder="modalConfig.placeholder" @cancel="handleModalCancel" @confirm="handleModalConfirm" />
     </view>
 </template>
 
@@ -64,7 +67,6 @@ export default {
                 model: '',
                 price: ''
             },
-            modalVisible: false,
             currentEditField: '',
             modalConfig: {
                 title: '',
@@ -92,8 +94,10 @@ export default {
                 []
             ],
             //当前选择的品牌
-            currentAddBrand: {}
-
+            currentAddBrand: {},
+            //修改当前品牌选择器
+            editBrandSelector: false,
+            modalVisible: false,
         }
     },
     onLoad(option) {
@@ -109,41 +113,73 @@ export default {
         this.getOrderDetail();
         //获取收单列表
         this.getReceiptList();
+
+
     },
     methods: {
         handleBrandClick() {
-            this.openModal('brand', '请输入品牌', this.topInfo.brand, '请输入品牌')
+            //修改当前选中订单的品牌brand
+            //打开品牌选择器
+            this.editBrandSelector = true
+
+            //获取品牌列表
+            this.$getDicts('crm_form_brand').then(res => {
+                this.brandColumns = [res]
+            })
         },
         handleModelClick() {
-            this.openModal('model', '请输入型号', this.topInfo.model, '请输入型号')
+            //修改当前选中订单的型号model
+            //打开型号修改弹窗
+            this.modalConfig = {
+                title: '修改型号',
+                value: this.currentReceipt.model,
+                placeholder: '请输入型号'
+            }
+            this.currentEditField = 'model'
+            this.modalVisible = true
+
         },
         handlePriceClick() {
-            this.openModal('price', '请输入价格', this.topInfo.price, '请输入价格')
-        },
-        openModal(field, title, value, placeholder) {
-            this.currentEditField = field
+            //修改当前选中订单的价格sellingPrice
+            //打开价格修改弹窗
             this.modalConfig = {
-                title,
-                value,
-                placeholder
+                title: '修改价格',
+                value: this.currentReceipt.sellingPrice?.toString(),
+                placeholder: '请输入价格'
             }
+            this.currentEditField = 'price'
             this.modalVisible = true
         },
-        handleModalInput(value) {
-            this.modalConfig.value = value
+
+        async handleModalConfirm(value) {
+            console.log('修改的当前的', this.currentEditField, '是', value)
+            if (this.currentEditField === 'model') {
+                //修改当前选中receiptDetail的型号
+                const res = await uni.$u.api.updateReceiptForm({
+                    model: value,
+                    id: this.currentReceipt.id
+                });
+                if (res.code == 200) {
+                    uni.$u.toast('修改成功')
+                }
+            } else if (this.currentEditField === 'price') {
+                //修改当前选中receiptDetail的价格
+                const res = await uni.$u.api.updateReceiptForm({
+                    sellingPrice: value,
+                    id: this.currentReceipt.id
+                });
+                if (res.code == 200) {
+                    uni.$u.toast('修改成功')
+                }
+            }
+            this.getReceiptList();
+            this.modalVisible = false
         },
         handleModalCancel() {
             this.modalVisible = false
-            this.currentEditField = ''
         },
-        handleModalConfirm(newValue) {
-            if (this.currentEditField) {
-                this.topInfo[this.currentEditField] = newValue
-            }
 
-            this.modalVisible = false
-            this.currentEditField = ''
-        },
+
         async handleAddClick() {
 
             console.log('加一单')
@@ -157,6 +193,21 @@ export default {
                 this.brandColumns = [res]
             })
         },
+        async handleEditBrandConfirm(data) {
+            console.log('修改的当前的品牌是', data.value[0])
+            console.log('修改的当前的品牌的value是', data.value[0].dictValue)
+
+            //修改当前选中receiptDetail的品牌
+            const res = await uni.$u.api.updateReceiptForm({
+                brand: data.value[0].dictValue,
+                id: this.currentReceipt.id
+            });
+            if (res.code === 200) {
+                uni.$u.toast('修改成功')
+            }
+            this.getReceiptList();
+            this.editBrandSelector = false
+        },
         handleBrandConfirm(data) {
             console.log('选择的品牌', data.value[0])
             this.currentAddBrand = data.value[0]

pages/orderDetailNew/mixin/imgUploadAndDownLoad.js

@@ -56,7 +56,7 @@ export default {
                     this.detailImages = response.rows.filter(item => item.sourceId == receiptID) || []
                 }
             } catch (error) {
-                uni.$u.toast(`获取列表失败：${error.message}`)
+                uni.$u.toast(`获取列表失败：${error}`)
                 this.trueUploadList = []
                 this.chatRecordsUploadList = []
             }