feat:开单记录

components/add-inquiry-dialog/index.vue

@@ -1,11 +1,10 @@
 <template>
 	<view>
 		<u-modal :show="showModal" ref="uModal" :title="(editOrAdd === 'add' || editOrAdd === 'receptFormAdd') ? '新增' : '编辑'" :asyncClose="false" showCancelButton @cancel="closeDialog" cancelColor="#909399" :confirmText="'确定'" confirmColor="#2979ff" @confirm="confirm" @close="closeDialog" :closeOnClickOverlay="false">
-            <u--text type="info" text="输入型号可查看价格趋势"></u--text>
             <view class="modal_wrap">
                 <text @click="handleBrandClick" class="item" :class="info.dictLabel ? 'brand' : 'brand placeholder'">{{ info.dictLabel || '品牌' }}</text>
                 <text class="divider">|</text>
-                <u--input placeholder="型号" class="item" border="none" v-model="info.model" clearable @blur="handleModelBlur"></u--input>
+                <u--input placeholder="型号" class="item" border="none" v-model="info.model" clearable></u--input>
                 <text class="divider">|</text>
                 <u--input class="code-input item" placeholder="编码" border="none" v-model="info.code" clearable></u--input>
             </view>
@@ -19,12 +18,6 @@
                 ></u-upload>
             </view>
             <u--input v-if="editOrAdd === 'edit'" class="price" placeholder="价格" border="bottom" v-model="info.price" clearable></u--input>
-            <view class="charts_box" v-show="chartShow">
-                 <u--text type="primary" :text="`最大价格：${Math.max(...maxPrice)}元`"></u--text>
-                 <u--text type="warning" :text="`最小价格：${Math.min(...minPrice)}元`"></u--text>
-                <qiun-data-charts type="line" :chartData="chartData" canvasId="trendChart" :opts="opts" :ontouch="true" tooltipFormat="tooltipFormatPrice"
-                    width="700rpx" height="500rpx" backgroundColor="#ffffff" />
-            </view>
         </u-modal>
         <brandList ref="brandListRef" @selectedBrand="handleSelectedBrand"></brandList>
 	</view>
@@ -79,58 +72,7 @@ export default {
                     { required: true, message: '请输入品牌', trigger: 'blur' }
                 ]
             },
-            chartData:{},
-            color:[],
-            opts: {
-                color: this.color,
-                padding: [20, 10, 20, 0],
-                dataLabel: true,
-                dataPointShape: true,
-                enableScroll: true,
-                
-                xAxis: {
-                    disableGrid: true,
-                    scrollShow: true,
-                    itemCount: 10,
-                    rotateLabel: true,
-                    rotateAngle: 45,
-                },
-                yAxis: {
-                    gridType: "dash",
-                    dashLength: 7,
-                },
-                legend: {
-                    show: false,
-                    type: 'scroll',
-                    orient: 'horizontal',
-                    pageSize: 3,
-                    pageIconSize: 12,
-                    pageIconColor: '#666',
-                    pageIconInactiveColor: '#ccc',
-                    pageTextStyle: {
-                        color: '#666',
-                        fontSize: 12
-                    },
-                    bottom: 0
-                },
-                extra: {
-                    line: {
-                        type: "curve",
-                        width: 3,
-                        activeType: "hollow",
-                        linearType: "custom",
-                        onShadow: true,
-                        animation: "horizontal"
-                    },
-                    tooltip:{
-                        legendShow: true,
-                        bgOpacity: 0.6
-                    }
-                }
-            },
-            chartShow: false,
-            maxPrice: [],
-            minPrice: [],
+            
 		}
 	},
 	watch: {
@@ -142,133 +84,11 @@ export default {
 		}
 	},
 	methods: {
-        getChartData() {
-            uni.$u.api.inquiryChart({
-                model: this.info.model,
-            }).then(res => {
-                if (res.code == 200) {
-                    const response = res.data
-                    this.maxPrice = []
-                    this.minPrice = []
-                    // const response = [
-                    //     {
-                    //         model:'AAA',
-                    //         list:[
-                    //             {
-                    //                 recycleTime: '2023-07-30',
-                    //                 price: 300,
-                    //             },
-                    //             {
-                    //                 recycleTime: '2023-07-31',
-                    //                 price: 500,
-                    //             },
-                    //             {
-                    //                 recycleTime: '2023-08-01',
-                    //                 price: null,
-                    //             },
-                    //             {
-                    //                 recycleTime: '2023-08-02',
-                    //                 price: 200,
-                    //             },
-                    //             {
-                    //                 recycleTime: '2023-08-03',
-                    //                 price: 300,
-                    //             }
-                    //         ]
-                    //     },
-                    //     {
-                    //         model:'BBB',
-                    //         list:[
-                    //             {
-                    //                 recycleTime: '2023-08-01',
-                    //                 price:400,
-                    //             },
-                    //             {
-                    //                 recycleTime: '2023-08-02',
-                    //                 price: 100,
-                    //             },
-                    //             {
-                    //                 recycleTime: '2023-08-03',
-                    //                 price: 200,
-                    //             }
-                    //         ]
-                    //     },
-                    //     {
-                    //         model:'CCC',
-                    //         list:[
-                    //             {
-                    //                 recycleTime: '2023-08-01',
-                    //                 price: 500,
-                    //             },
-                    //             {
-                    //                 recycleTime: '2023-08-02',
-                    //                 price: 400,
-                    //             },
-                    //             {
-                    //                 recycleTime: '2023-08-03',
-                    //                 price: 600,
-                    //             }
-                    //         ]
-                    //     }
-                    // ]
-                    this.color = []
-                    const categories = []
-                    const dateMap = {}
-                    response.forEach(item => {
-                        this.maxPrice.push(item.max)
-                        this.minPrice.push(item.min)
-                        item.list.forEach(i => {
-                            if (!dateMap[i.recycleTime]) {
-                                dateMap[i.recycleTime] = true
-                                categories.push(i.recycleTime)
-                            }
-                        })
-                    })
-                    const series = response.map((item) => {
-                        const color = this.getRandomColor()
-                        this.color.push(color)
-                        const data = categories.map(date => {
-                            const itemData = item.list.find(i => i.recycleTime === date)
-                            return itemData ? itemData.price : null
-                        })
-                        return {
-                            name: item.model,
-                            data: data,
-                            setShadow: [
-                                3,
-                                8,
-                                15,
-                                color
-                            ],
-                        }
-                    })
-                    this.opts.color = this.color
-                    const chartData = {
-                        categories: categories,
-                        series: series
-                    }
-                    this.chartData = JSON.parse(JSON.stringify(chartData))
-                    this.chartShow = true
-                }
-            })
-            
-        },
-        getRandomColor(){
-            var letters = '0123456789ABCDEF';
-            var color = '#';
-            for (var i = 0; i < 6; i++) {
-                color += letters[Math.floor(Math.random() * 16)];
-            }
-            return color;
-        },
         // 编辑回显
         initData() {
             this.$nextTick(()=>{
                 this.info = JSON.parse(JSON.stringify(this.editInfo))
                 this.showModal = true;
-                if(this.info.model && this.info.dictValue){
-                    this.getChartData()
-                }
             })
         },
         // 获取删除图片信息
@@ -343,14 +163,11 @@ export default {
                 type: this.type
             }
             uni.$u.api.addInquiry(data).then(res => {
-                if (res.code == 200) {
-                    uni.showToast({
-                        title: '添加成功',
-                        icon: 'success'
-                    })
-                    this.closeDialog()
-                    this.$emit('submitSuccess')
-                }
+                uni.$u.toast(this.type == 1 ? "询价成功" : "核价成功")
+                this.closeDialog()
+                this.$emit('submitSuccess')
+            }).catch((err) => {
+                uni.$u.toast(err)
             })
         },
         showDialog() {
@@ -374,14 +191,8 @@ export default {
         },
         closeDialog() {
             this.showModal = false;
-            this.chartShow = false
-            this.chartData = {}
-        },
-        handleModelBlur() {
-            if (this.info.model !== ''){
-                this.getChartData()
-            }
         },
+        
 	}
 };
 </script>

components/custom-tab-select/index.vue

@@ -3,7 +3,7 @@
     <view 
       class="tab-item"
       :class="{ 
-        'tab-item--active': isMultiple ? activeValues.includes(item[valueKey]) : activeValue === item[valueKey],
+        'tab-item--active': isMultiple ? activeValues.includes(item[valueKey]) : activeValue == item[valueKey],
         'tab-item--multiple': isMultiple
       }"
       v-for="(item, index) in tabList"
@@ -59,7 +59,7 @@ export default {
   },
   computed: {
     isMultiple() {
-      return this.mode === "multiple";
+      return this.mode == "multiple";
     }
   },
   data() {
@@ -100,7 +100,7 @@ export default {
       handler(newMode) {
         // 当 mode 变化时，重新初始化选中值
         const initialValue = this.echoInfo || this.defaultActive;
-        if (newMode === 'multiple') {
+        if (newMode == 'multiple') {
           this.activeValues = Array.isArray(initialValue) ? initialValue : [];
           this.activeValue = '';
         } else {
@@ -129,8 +129,16 @@ export default {
       }
     },
     handleSingleSelect(item) {
-      this.activeValue = item[this.valueKey];
-      this.$emit("tabChange", item[this.valueKey]);
+      const itemValue = item[this.valueKey];
+      // 如果当前项已经被选中，则取消选中
+      if (this.activeValue === itemValue) {
+        this.activeValue = '';
+        this.$emit("tabChange", '');
+      } else {
+        // 否则设置为当前项的值
+        this.activeValue = itemValue;
+        this.$emit("tabChange", itemValue);
+      }
     },
     handleMultipleSelect(item) {
       const index = this.activeValues.indexOf(item[this.valueKey]);

components/person-picker/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="">
+  <view>
     <u-picker :show="show" :title="title" :columns="columns" keyName="label" ref="uPicker"
                 @confirm="recyclePersonConfirm" @change="recyclePersonChange" @cancel='close'></u-picker>
   </view>
@@ -81,9 +81,7 @@ export default {
     recyclePersonClick() {
         uni.$u.api.getCustomerManagerAllList().then(res => {
             this.columns = [res.data] || [];
-            
-            // 如果第一层只有一个选项，自动处理下一层级
-            if (res.data && res.data.length === 1) {
+            if (res.data && res.data.length > 0) {
                 // 如果当前项不是用户且有子级，添加下一层
                 if (!res.data[0].isUser && res.data[0].children && res.data[0].children.length > 0) {
                     this.columns.push(res.data[0].children);

pages/clue/mixins/clue.js

@@ -127,8 +127,62 @@ export default {
 				advId: "",
 				promotionId: "",
 				titleId: "",
-				videoId: ""
+				videoId: "",
 			},
+			trendModal: false,
+			chartData:{},
+			color:[],
+			opts: {
+				color: this.color,
+				padding: [20, 10, 20, 0],
+				dataLabel: true,
+				dataPointShape: true,
+				enableScroll: true,
+				
+				xAxis: {
+					disableGrid: true,
+					scrollShow: true,
+					itemCount: 10,
+					rotateLabel: true,
+					rotateAngle: 45,
+				},
+				yAxis: {
+					gridType: "dash",
+					dashLength: 7,
+				},
+				legend: {
+					show: false,
+					type: 'scroll',
+					orient: 'horizontal',
+					pageSize: 3,
+					pageIconSize: 12,
+					pageIconColor: '#666',
+					pageIconInactiveColor: '#ccc',
+					pageTextStyle: {
+						color: '#666',
+						fontSize: 12
+					},
+					bottom: 0
+				},
+				extra: {
+					line: {
+						type: "curve",
+						width: 3,
+						activeType: "hollow",
+						linearType: "custom",
+						onShadow: true,
+						animation: "horizontal"
+					},
+					tooltip:{
+						legendShow: true,
+						bgOpacity: 0.6,
+					}
+				}
+			},
+			model: "",
+			maxPrice: [],
+			minPrice: [],
+			chartShow: false,
 		}
 	},
 	onPullDownRefresh() {
@@ -153,25 +207,96 @@ export default {
 	// onShow() {
 	// 	this.resetData();
 	// },
-	methods: {
-		handleAddClue() {
-			uni.navigateTo({
-				url: "/pages/addClue/index"
-			})
-		},
-		handleClueStateClick(item) {
-			this.queryParams.clueState = item.clueState;
-			this.resetData();
-		},
-		handleKeyword() {
-			this.resetData();
-		},
-		handleKeywordClear() {
-			// 组件有bug 清空后的值还是存在
-			this.queryParams.conditionContent = "";
-			this.resetData();
-		},
-		handleShowTag() {
+		methods: {
+			handleTrend() {
+				this.trendModal = true;
+			},
+			handleTrendConfirm() {
+				this.model = ""
+				this.chartShow = false
+				this.trendModal = false;
+			},
+			searchTrend(val) {
+				if (val !== ''){
+					uni.$u.api.inquiryChart({
+						model: val,
+					}).then(res => {
+						if(res.data.length == 0){
+							uni.$u.toast("暂无数据")
+							return
+						}
+						const response = res.data
+						this.maxPrice = []
+						this.minPrice = []
+						this.color = []
+						const categories = []
+						const dateMap = {}
+						response.forEach(item => {
+							this.maxPrice.push(item.max)
+							this.minPrice.push(item.min)
+							item.list.forEach(i => {
+								if (!dateMap[i.recycleTime]) {
+									dateMap[i.recycleTime] = true
+									categories.push(i.recycleTime)
+								}
+							})
+						})
+						const series = response.map((item) => {
+							const color = this.getRandomColor()
+							this.color.push(color)
+							const data = categories.map(date => {
+								const itemData = item.list.find(i => i.recycleTime === date)
+								return itemData ? itemData.price : null
+							})
+							return {
+								name: item.model,
+								data: data,
+								setShadow: [
+									3,
+									8,
+									15,
+									color
+								],
+							}
+						})
+						this.opts.color = this.color
+						const chartData = {
+							categories: categories,
+							series: series
+						}
+						this.chartData = JSON.parse(JSON.stringify(chartData))
+						this.chartShow = true
+					}).catch((err) => {
+						uni.$u.toast(err)
+					})
+				}
+			},
+			getRandomColor(){
+				var letters = '0123456789ABCDEF';
+				var color = '#';
+				for (var i = 0; i < 6; i++) {
+					color += letters[Math.floor(Math.random() * 16)];
+				}
+				return color;
+			},
+			handleAddClue() {
+				uni.navigateTo({
+					url: "/pages/addClue/index"
+				})
+			},
+			handleClueStateClick(item) {
+				this.queryParams.clueState = item.clueState;
+				this.resetData();
+			},
+			handleKeyword() {
+				this.resetData();
+			},
+			handleKeywordClear() {
+				// 组件有bug 清空后的值还是存在
+				this.queryParams.conditionContent = "";
+				this.resetData();
+			},
+			handleShowTag() {
 			this.$refs.clueTag.showModal();
 		},
 		async handleClueTagConfirm() {

pages/clue/scss/clue.scss

@@ -11,6 +11,11 @@
 	background-color: #4c8afe;
 }
 
+.trend {
+	bottom: 320rpx;
+	background-color: #fe9c4c;
+}
+
 .clueDetail_tabber {
 	::v-deep .u-tabbar__content {
 		background: #108cff;
@@ -101,4 +106,10 @@
 	.case_main_wrap {
 		padding: 15px;
 	}
+}
+.trend_modal{
+	width:100%;
+	display: flex;
+	flex-direction: column;
+	gap: 20rpx;
 }

pages/publicClue/index.vue

@@ -48,8 +48,21 @@
 			groupChild="clueTagDataList" label-key="name" value-key="id" placeholder="请选择线索标签"
 			v-model="queryParams.allTagList" multiple clearable ref="clueTag"
 			@confirm="handleClueTagConfirm"></group-select>
-			
-			
+		<u-modal :show="trendModal" title="价格趋势" @confirm="handleTrendConfirm" confirmText="关闭弹窗">
+			<view class="trend_modal">
+				<u-search placeholder="请输入型号" v-model="model" @custom="searchTrend"></u-search>
+				<view class="charts_box" v-if="chartShow">
+					<u--text type="primary" :text="`最大价格：${Math.max(...maxPrice)}元`"></u--text>
+					<u--text type="warning" :text="`最小价格：${Math.min(...minPrice)}元`"></u--text>
+					<qiun-data-charts type="line" :chartData="chartData" canvasId="trendChart" :opts="opts" :ontouch="true" tooltipFormat="tooltipFormatPrice"
+						width="700rpx" height="500rpx" backgroundColor="#ffffff" />
+				</view>
+			</view>
+		</u-modal>
+		
+		<view class="suspension_button trend" @click="handleTrend">
+			趋势
+		</view>
 		<view class="suspension_button" @click="handleAddClue">
 			新增
 		</view>

pages/setting/index.vue

@@ -120,7 +120,6 @@
 				})
 			},
 			confirmSwitchRole(e) {
-				console.log(e);
 				uni.navigateBack({
 					delta: 1
 				}).then(()=>{

pages/wareHouse/components/detail.vue

@@ -146,7 +146,15 @@
                         <span v-else>￥{{ coreInfo.salePrice || '-' }}</span>
                     </view>
                 </view>
-                <view class="price_item"></view>
+                <view class="price_item">
+                    <view class="price_label">实价</view>
+                    <view class="price_value suggested"
+                        @click.stop="toggleEditField('actualPrice', coreInfo.actualPrice)">
+                        <u-input v-if="editMode.actualPrice" v-model="tempValues.actualPrice" :autoFocus="true"
+                            @blur="!globalEditMode && saveEditField('actualPrice', tempValues.actualPrice, 'actualPrice')" />
+                        <span v-else>￥{{ coreInfo.actualPrice || '-' }}</span>
+                    </view>
+                </view>
             </view>
         </view>
 
@@ -247,6 +255,7 @@ export default {
                 peerPrice: false,
                 agentPrice: false,
                 salePrice: false,
+                actualPrice: false,
                 price: false,
                 productPosition: false,
             },
@@ -414,7 +423,7 @@ export default {
                 price: this.coreInfo.price,
                 recyclePerson: this.coreInfo.recyclePerson,
                 recyclePersonId: this.coreInfo.recyclePersonId,
-                createTime: this.coreInfo.createTime,
+                type: this.coreInfo.type,
             }
             uni.navigateTo({
                 url: '/pages/wareHouse/components/openOrder?params=' + JSON.stringify(params),

pages/wareHouse/components/edit.vue

@@ -78,9 +78,6 @@
                     <u-form-item label="尺码" class="u-form-item-row" borderBottom>
                         <u--input v-model="formData.yardage" placeholder="请输入" clearable border="none"></u--input>
                     </u-form-item>
-                    <u-form-item label="官方指导价" class="u-form-item-row" borderBottom>
-                        <u--input v-model="formData.price" placeholder="请输入" clearable border="none"></u--input>
-                    </u-form-item>
                     <u-form-item label="商品成色" required prop="productCondition" borderBottom>
                         <TabSelect :tabList="productConditionList" :isClear="productConditionIsClear"
                             @tabChange="handleTabChangeProductCondition" :colNum="2" mode="single" :echoInfo="echoInfoProductCondition">
@@ -125,12 +122,18 @@
                         <u--input v-model="formData.stock" placeholder="请输入" clearable border="none"
                             type="number"></u--input>
                     </u-form-item>
+                    <u-form-item label="官方指导价" required prop="price" class="u-form-item-row" borderBottom>
+                        <u--input v-model="formData.price" placeholder="请输入" clearable border="none"></u--input>
+                    </u-form-item>
                     <u-form-item label="总成本价" class="u-form-item-row" borderBottom v-if="isWareHouser">
                         <u--input v-model="formData.costPrice" placeholder="请输入" clearable border="none"></u--input>
                     </u-form-item>
                     <u-form-item label="同行价格" class="u-form-item-row" borderBottom v-if="isWareHouser">
                         <u--input v-model="formData.peerPrice" placeholder="请输入" clearable border="none"></u--input>
                     </u-form-item>
+                    <u-form-item label="实价" class="u-form-item-row" borderBottom>
+                        <u--input v-model="formData.actualPrice" placeholder="请输入" clearable border="none" type="number" @blur="handleBlurActualPrice"></u--input>
+                    </u-form-item>
                     <u-form-item label="代理价格" class="u-form-item-row" borderBottom>
                         <u--input v-model="formData.agentPrice" placeholder="请输入" clearable border="none"></u--input>
                     </u-form-item>
@@ -265,7 +268,8 @@ import Cell from '@/components/custom-cell/index.vue'
 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 } from '@/utils/util.js'
+import { permissionCheck,getRoles } from '@/utils/util.js'
+import { productConditionList,productAttributeList,stockStatusList,recycleTypeList,labelList,paymentTabList } from '../js/public.js'
 export default {
     components: {
         TabSelect,
@@ -293,7 +297,7 @@ export default {
                 material: '',
                 size: '',
                 yardage: '',
-                price: '',
+                price: 0,
                 productCondition: '1',
                 detailPicFileList: [],//细节图片
                 // detailVideoFileList:[],
@@ -302,7 +306,8 @@ export default {
                 productAttribute: '1',
                 stock: 1,
                 costPrice: '',
-                samePrice: '',
+                peerPrice: '',
+                actualPrice: '',
                 agentPrice: '',
                 salePrice: '',
                 productPosition: '',
@@ -348,7 +353,10 @@ export default {
                     { required: true, message: '请选择商品属性', trigger: ['blur', 'change'] },
                 ],
                 stock: [
-                    { required: true, message: '请输入库存数量' },
+                    { required: true, message: '请输入库存数量' }
+                ],
+                price: [
+                    { required: true, message: '请输入官方指导价' }
                 ],
                 stockStatus: [
                     { required: true, message: '请选择是否入库', trigger: [ 'change'] },
@@ -361,110 +369,6 @@ export default {
             recycleTimeShow: false,
             titlePlaceholder: '如不填，自动截取商品描述前50字',
             typeList: [],
-            productConditionList: [
-                {
-                    name: '闲置未使用',
-                    value: '1',
-                },
-                {
-                    name: '二手',
-                    value: '2',
-                },
-            ],
-            productAttributeList: [
-                {
-                    name: '自有商品',
-                    value: '1',
-                },
-                {
-                    name: '寄卖商品',
-                    value: '2',
-                },
-                {
-                    name: '质押商品',
-                    value: '3',
-                },
-                {
-                    name: '其它',
-                    value: '4',
-                },
-            ],
-            stockStatusList: [
-                {
-                    name: '待入库',
-                    value: '0',
-                },
-                {
-                    name: '已入库',
-                    value: '1',
-                },
-            ],
-            recycleTypeList: [
-                {
-                    name: '线上',
-                    value: '1',
-                },
-                {
-                    name: '同行',
-                    value: '2',
-                },
-                {
-                    name: '门店',
-                    value: '3',
-                },
-                {
-                    name: '其它',
-                    value: '4',
-                },
-            ],
-            labelList: [
-                {
-                    name: '完美',
-                    value: '1',
-                },
-                {
-                    name: '普通',
-                    value: '2',
-                },
-                {
-                    name: '瑕疵',
-                    value: '3',
-                },
-                {
-                    name: '假货',
-                    value: '4',
-                },
-                {
-                    name: '亏损',
-                    value: '5',
-                },
-            ],
-            paymentTabList: [
-                {
-                    name: '微信',
-                    value: "1",
-                },
-                {
-                    name: '支付宝',
-                    value: "2",
-                },
-                {
-                    name: '银行卡',
-                    value: "3",
-                },
-                {
-                    name: '现金',
-                    value: "4",
-                },
-                {
-                    name: '数字货币',
-                    value: "5",
-                },
-                {
-                    name: '挂账',
-                    value: "6",
-                },
-            ],
             typeIsClear: false,//商品分类是否清空
             productConditionIsClear: false,//商品成色是否清空
             productAttributeIsClear: false,//商品属性是否清空
@@ -481,10 +385,18 @@ export default {
             echoInfoStockStatus:'',//入库回显的时候 是否入库回显
             isWareHouser: permissionCheck('WAREHOUSER',false),
             formType: '',//表单类型 add：新增 edit：编辑
+            xhlSystemSetList: [],//系统设置-列表
+            productConditionList:productConditionList,
+            productAttributeList: productAttributeList,
+            stockStatusList: stockStatusList,
+            recycleTypeList: recycleTypeList,
+            labelList: labelList,
+            paymentTabList: paymentTabList,
         }
     },
     onLoad(options) {
         this.getTypeList();
+        this.getXhlSystemSetList()
         this.$nextTick(async()=>{
             this.formType = options.formType
             if(options.formType == 'add'){
@@ -505,12 +417,13 @@ export default {
                 this.echoInfoStockStatus = res.data.stockStatus || '0'//是否入库回显
                 this.formData.stockStatus = res.data.stockStatus || '0'//是否入库校验
                 this.formData.stock = res.data.stock ? res.data.stock : 1//入库数量校验
+                this.formData.price = res.data.price || 0//官方指导价校验
                 this.echoInfoPayType = res.data.payType//付款方式回显
                 this.echoInfoRecycleType = res.data.recycleType//回收类型回显
                 this.echoInfoLabel = res.data.label//商品标签回显
                 this.recognitionContent = `品牌：${res.data.dictLabel || '-'}
 来源：${res.data.origin || '-'}
-实价：${res.data.costPrice || '-'}
+实价：${res.data.actualPrice || '-'}
 型号：${res.data.model || '-'}
 编码：${res.data.indentifyCode || '-'}
 日期：${res.data.recycleTime || '-'}
@@ -521,6 +434,30 @@ export default {
         })
     },
     methods: {
+        getXhlSystemSetList(){
+            uni.$u.api.xhlSystemSetList({
+                pageNum: 1,
+                pageSize: 99,
+            }).then(res => {
+                this.xhlSystemSetList = res.rows || []
+            })
+        },
+        handleBlurActualPrice() {
+            if (this.formData.actualPrice) {
+                const actualPrice = Number(this.formData.actualPrice)
+                let obj = {}
+                // 只要账号权限里面有销售权限，就按照销售的计算规则，没有就固定计算
+                if(getRoles().includes('SALESMAN')){
+                    obj = this.xhlSystemSetList.find(item => item.agentType == 'SALESMAN') || {}
+                }else{
+                    obj = {
+                        goodsRate: 0.003,
+                        goodsAmount: 500,
+                    }
+                }
+                this.formData.agentPrice = (actualPrice + actualPrice*obj.goodsRate + obj.goodsAmount).toFixed(2)
+            }
+        },
         getTypeList() {
             this.$getDicts("crm_form_category").then(res => {
                 this.typeList = res
@@ -592,7 +529,7 @@ export default {
                 material: '',
                 size: '',
                 yardage: '',
-                price: '',
+                price: 0,
                 productCondition: '1',
                 detailPicFileList: [],//细节图片
                 // detailVideoFileList:[],
@@ -852,7 +789,7 @@ export default {
                     this.formData.origin = result['来源'];
                 }
                 if (result['实价']) {
-                    this.formData.costPrice = result['实价'];
+                    this.formData.actualPrice = result['实价'];
                 }
                 if (result['型号']) {
                     this.formData.model = result['型号'];

pages/wareHouse/components/openOrder.vue

@@ -15,7 +15,8 @@
                   </view>
                   <view class="advice_price">
                      <view class="advice_price_title">建议标价</view>
-                     <view class="advice_price_price">￥<u--input v-model="openOrderForm.price" placeholder="建议标价" border="none" type="number"></u--input></view>
+                     <view class="advice_price_price">￥<u--input v-model="openOrderForm.price" placeholder="建议标价"
+                           border="none" type="number"></u--input></view>
                   </view>
                </view>
             </view>
@@ -23,7 +24,8 @@
          <u--form labelPosition="top" :model="openOrderForm" :rules="rules" ref="openOrderForm" label-width="200rpx">
             <view class="card_item">
                <u-form-item label="成交金额" required prop="dealPrice">
-                  ￥<u--input v-model="openOrderForm.dealPrice" placeholder="成交金额" border="none" type="number"></u--input>
+                  ￥<u--input v-model="openOrderForm.dealPrice" placeholder="成交金额" border="none"
+                     type="number"></u--input>
                </u-form-item>
             </view>
             <view class="card_item">
@@ -33,8 +35,8 @@
             </view>
             <view class="card_item">
                <u-form-item label="订单类型">
-                  <TabSelect :tabList="orderTypeList" mode="single" :colNum="4" :defaultIndex="1" labelKey="dictLabel" valueKey="dictValue"
-                     @tabChange="changeOrderType">
+                  <TabSelect :tabList="orderTypeList" mode="single" :colNum="4" :defaultIndex="1" labelKey="dictLabel"
+                     valueKey="dictValue" @tabChange="changeOrderType">
                   </tabSelect>
                </u-form-item>
             </view>
@@ -44,20 +46,20 @@
                      <u-icon name="man-add" size="36rpx" color="#374151"></u-icon>
                      <view class="text">{{ openOrderForm.recyclePerson }}</view>
                      <PersonPicker ref="recyclePersonPickerRef" title="请选择回收人员"
-                            @selectPerson="handleSelectRecyclePerson"></PersonPicker>
+                        @selectPerson="handleSelectRecyclePerson"></PersonPicker>
                   </view>
                   <view class="sales_person_box" @click="dateShow = true">
                      <u-icon name="calendar" size="36rpx" color="#374151"></u-icon>
                      <view class="text">{{ openOrderForm.orderDate }}</view>
-                     <u-datetime-picker :show="dateShow" v-model="openOrderForm.orderDate" mode="date" @confirm="confirmDate"
-                        @close="closeDate" @cancel="closeDate"></u-datetime-picker>
+                     <u-datetime-picker :show="dateShow" v-model="openOrderForm.orderDate" mode="date"
+                        @confirm="confirmDate" @close="closeDate" @cancel="closeDate"></u-datetime-picker>
                   </view>
 
                </u-form-item>
             </view>
             <view class="card_item">
                <u-form-item label="收款方式">
-                  <TabSelect :tabList="payTypeList" mode="single" :colNum="4" :defaultIndex="1"
+                  <TabSelect :tabList="paymentTabList" mode="single" :colNum="4" :defaultIndex="1"
                      @tabChange="changepayType">
                   </tabSelect>
                </u-form-item>
@@ -70,11 +72,12 @@
                </u-form-item>
             </view>
             <view class="card_item">
-               <u-form-item label="支付凭证上传">
+               <u-form-item label="支付凭证图片">
                   <view class="imgs_scroll">
-                     <ImgsRowScroll v-if="payTypeProofPicFileList.length > 0" :isShowDeleteIcon="true"
-                        @deleteImgInfo="getDeleteGoodPicInfo" imgMode="aspectFill" :totalWidth="400"
-                        :images="payTypeProofPicFileList" :previewEnabled="true" :imageWidth="150" :imageHeight="150">
+                     <ImgsRowScroll :isShowDeleteIcon="true"
+                        @deleteImgInfo="getDeletePayTypeProofPicInfo" imgMode="aspectFill" :totalWidth="400"
+                        :images="openOrderForm.payTypeProofPicFileList" :previewEnabled="true" :imageWidth="150"
+                        :imageHeight="150">
                      </ImgsRowScroll>
                      <u-upload @afterRead="afterReadpayTypeProofPic" name="1" multiple :maxCount="10"></u-upload>
                   </view>
@@ -105,6 +108,7 @@
 import TabSelect from '@/components/custom-tab-select/index.vue'
 import ImgsRowScroll from '@/components/imgs-row-scroll/index.vue'
 import PersonPicker from '@/components/person-picker/index.vue'
+import { afterSaleTabList, paymentTabList } from '../js/public.js'
 export default {
    components: {
       TabSelect,
@@ -131,56 +135,11 @@ export default {
             afterSaleTab: [],
             remark: '',
             address: '',
+            type: '',
          },
+         afterSaleTabList: afterSaleTabList,
+         paymentTabList: paymentTabList,
          orderTypeList: [],
-         payTypeList: [
-            {
-               name: '微信',
-               value: 1,
-            },
-            {
-               name: '支付宝',
-               value: 2,
-            },
-            {
-               name: '银行卡',
-               value: 3,
-            },
-            {
-               name: '现金',
-               value: 4,
-            },
-            {
-               name: '数字货币',
-               value: 5,
-            },
-            {
-               name: '挂账',
-               value: 6,
-            },
-         ],
-         afterSaleTabList: [
-            {
-               name: '假一赔三',
-               value: 1,
-            },
-            {
-               name: '一年质保',
-               value: 2,
-            },
-            {
-               name: '一年内八折回收',
-               value: 3,
-            },
-            {
-               name: '送保养一次',
-               value: 4,
-            },
-            {
-               name: '原厂配件保证',
-               value: 5,
-            },
-         ],
          rules: {
             dealPrice: [
                { required: true, message: '请输入成交金额', trigger: ['blur'] },
@@ -191,14 +150,12 @@ export default {
    },
    onLoad(options) {
       const params = options.params || '{}'
-      
+
       if (params) {
          this.openOrderForm.quantity = 1
          Object.keys(JSON.parse(params)).forEach(key => {
             this.openOrderForm[key] = JSON.parse(params)[key]
          })
-         console.log(this.openOrderForm);
-         
          this.getOrderTypeList()
       }
    },
@@ -224,8 +181,6 @@ export default {
       handleSelectRecyclePerson(person) {
          this.openOrderForm.recyclePerson = person.label
          this.openOrderForm.recyclePersonId = person.id
-         console.log(this.openOrderForm);
-         
       },
       handleClickOutside() {
          this.personShow = false
@@ -239,19 +194,19 @@ export default {
       closeDate() {
          this.dateShow = false
       },
-      getDeleteGoodPicInfo(info) {
-         this.payTypeProofPicFileList = info.newImages
+      getDeletePayTypeProofPicInfo(info) {
+         this.openOrderForm.payTypeProofPicFileList = info.newImages
       },
-       async afterReadpayTypeProofPic(event) {
-            event.file.forEach(item => {
-                uni.$u.api.uploadFile(item.url).then((res) => {
-                    this.payTypeProofPicFileList.push(res.data.url);
-                    uni.$u.toast("文件上传成功");
-                }).catch(() => {
-                    uni.$u.toast("上传文件失败");
-                })
+      async afterReadPayTypeProofPic(event) {
+         event.file.forEach(item => {
+            uni.$u.api.uploadFile(item.url).then((res) => {
+               this.openOrderForm.payTypeProofPicFileList.push(res.data.url);
+               uni.$u.toast("文件上传成功");
+            }).catch(() => {
+               uni.$u.toast("上传文件失败");
             })
-        },
+         })
+      },
       submitForm() {
          this.$refs.openOrderForm.validate().then(res => {
             if (res) {
@@ -264,7 +219,7 @@ export default {
                   uni.$u.toast("开单成功");
                   setTimeout(() => {
                      uni.navigateBack({
-                           delta: 2
+                        delta: 2
                      });
                   }, 1000);
                }).catch((error) => {

pages/wareHouse/components/orderList/edit.vue

@@ -0,0 +1,273 @@
+<template>
+    <u-modal :show="show" :title="title" :showCancelButton="true" @cancel="hideModal" @confirm="confirmEdit">
+        <view class="form-container">
+            <u-form :model="info" ref="formRef" labelPosition="top">
+                <u-form-item label="品牌" class="u-form-item-row" borderBottom @click="showBrandList" labelWidth="70">
+                    <Cell :val="info.dictLabel" :isDelete="true" @handleClear="clear('brand')"></Cell>
+                    <BrandList ref="brandListRef" @selectedBrand="handleSelectedBrand"></BrandList>
+                </u-form-item>
+                <u-form-item label="付款方式" borderBottom labelWidth="70">
+                    <TabSelect :tabList="paymentTabList" :echoInfo="info.payType"
+                        :colNum="3" mode="single"
+                        :isClear="payTypeIsClear" @tabChange="handlePayTypeTabChange">
+                    </TabSelect>
+                </u-form-item>
+                <u-form-item label="开单人" class="u-form-item-row" borderBottom labelWidth="70"
+                    @click="showRecyclePersonPicker">
+                    <Cell :val="info.recyclePerson" :isDelete="true" @handleClear="clear('recyclePerson')"></Cell>
+                    <PersonPicker ref="recyclePersonPickerRef" title="请选择回收人员"
+                        @selectPerson="handleSelectRecyclePerson">
+                    </PersonPicker>
+                </u-form-item>
+                <u-form-item label="开单数量" class="u-form-item-row" labelWidth="70" borderBottom>
+                    <u-number-box v-model="info.quantity" button-size="26"></u-number-box>
+                </u-form-item>
+                <u-form-item label="开单日期" class="u-form-item-row" labelWidth="70" borderBottom
+                    @click="showOrderDatePicker">
+                    <Cell :val="info.orderDate" :isDelete="true" @handleClear="clear('orderDate')"></Cell>
+                    <u-datetime-picker @confirm="confirmOrderDate" @close="closeOrderDatePicker"
+                        @cancel="closeOrderDatePicker" :show="orderDateShow" v-model="info.orderDate"
+                        mode="date"></u-datetime-picker>
+                </u-form-item>
+                <u-form-item label="订单类型" borderBottom labelWidth="70">
+                    <TabSelect :tabList="orderTypeList" :isClear="orderTypeIsClear" mode="single" :colNum="4"
+                        :echoInfo="info.orderType" labelKey="dictLabel" valueKey="dictValue"
+                        @tabChange="changeOrderType">
+                    </TabSelect>
+                </u-form-item>
+                <u-form-item label="商品分类" labelWidth="70" borderBottom>
+                    <TabSelect :tabList="typeList" :isClear="typeIsClear" @tabChange="handleTabChangeType"
+                        labelKey="dictLabel" valueKey="dictValue" :colNum="4" mode="single" :echoInfo="info.type">
+                    </TabSelect>
+                </u-form-item>
+                <u-form-item label="成交金额" class="u-form-item-row" labelWidth="70" borderBottom>
+                    ￥<u--input v-model="info.dealPrice" placeholder="成交金额" border="none" type="number"></u--input>元
+                </u-form-item>
+                <u-form-item label="实收总计" class="u-form-item-row" labelWidth="70" borderBottom>
+                    ￥<u--input v-model="info.amountReceived" placeholder="实收总计" border="none" type="number"></u--input>元
+                </u-form-item>
+                <u-form-item label="开单备注" labelWidth="70" borderBottom>
+                    <u--textarea v-model="info.orderRemark" clearable placeholder="备注" count autoHeight maxlength="50"
+                        height="100" confirmType="done"></u--textarea>
+                </u-form-item>
+                <u-form-item label="收货地址" labelWidth="70" borderBottom>
+                    <u--textarea v-model="info.address" clearable placeholder="收货地址" count autoHeight maxlength="50"
+                        height="100" confirmType="done"></u--textarea>
+                </u-form-item>
+                <u-form-item label="售后保障配置" labelWidth="100">
+                    <TabSelect :tabList="afterSaleTabList" :echoInfo="info.afterSaleTab" mode="multiple" :colNum="2"
+                        @tabChange="changeAfterSaleTab">
+                    </TabSelect>
+                </u-form-item>
+                <u-form-item label="支付凭证图片" labelWidth="100">
+                  <view class="imgs_scroll">
+                     <ImgsRowScroll :isShowDeleteIcon="true"
+                        @deleteImgInfo="getDeletePayTypeProofPicInfo" imgMode="aspectFill" :totalWidth="400"
+                        :images="info.payTypeProofPicFileList" :previewEnabled="true" :imageWidth="150" :imageHeight="150">
+                     </ImgsRowScroll>
+                     <u-upload @afterRead="afterReadPayTypeProofPic" name="1" multiple :maxCount="10"></u-upload>
+                  </view>
+               </u-form-item>
+            </u-form>
+        </view>
+    </u-modal>
+</template>
+
+<script>
+import { afterSaleTabList, paymentTabList } from '../../js/public.js'
+import Cell from '@/components/custom-cell/index.vue'
+import BrandList from '@/components/brand-list/index.vue'
+import TabSelect from '@/components/custom-tab-select/index.vue'
+import PersonPicker from '@/components/person-picker/index.vue'
+import ImgsRowScroll from '@/components/imgs-row-scroll/index.vue'
+export default {
+    name: 'OrderListEdit',
+    components: {
+        Cell,
+        BrandList,
+        TabSelect,
+        PersonPicker,
+        ImgsRowScroll
+    },
+    data() {
+        return {
+            show: false,
+            info: {
+                dictValue: '',
+                dictLabel: '',
+                payType: '',
+                recyclePerson: '',
+                recyclePersonId: '',
+                quantity: 0,
+                orderDate: this.$dayjs().format('YYYY-MM-DD'),
+                orderType: '',
+                type: '',
+                dealPrice: 0,
+                amountReceived: 0,
+                orderRemark: '',
+                address: '',
+                afterSaleTab: [],
+            },
+            paymentTabList: paymentTabList,
+            afterSaleTabList: afterSaleTabList,
+            payTypeIsClear: true,
+            orderTypeIsClear: true,
+            typeIsClear: true,
+            orderDateShow: false,
+            orderTypeList: [],
+            typeList: [],
+        }
+    },
+    props: {
+        title: {
+            type: String,
+            default: '编辑'
+        },
+        orderInfo: {
+            type: Object,
+            default: () => { }
+        }
+    },
+    emits: ['confirm'],
+    methods: {
+        showModal() {
+            this.getOrderTypeList();
+            this.getTypeList();
+            uni.$u.api.wareHouseOrderDetail({
+                id: this.orderInfo.id
+            }).then(res => {
+                this.show = true;
+                this.$nextTick(() => {
+                    this.info = res.data;
+                    this.info.payType = res.data.payType || '';
+                    this.info.orderDate = this.$dayjs(this.info.orderDate).format('YYYY-MM-DD');
+                })
+            })
+        },
+        hideModal() {
+            this.show = false;
+            this.info= {
+                dictValue: '',
+                dictLabel: '',
+                payType: '',
+                recyclePerson: '',
+                recyclePersonId: '',
+                quantity: 0,
+                orderDate: '',
+                orderType: '',
+                type: '',
+                dealPrice: 0,
+                amountReceived: 0,
+                orderRemark: '',
+                address: '',
+                afterSaleTab: [],
+            }
+        },
+        confirmEdit() {
+            uni.$u.api.wareHouseOrderUpdate({
+                id: this.info.id,
+                dictValue: this.info.dictValue,
+                dictLabel: this.info.dictLabel,
+                payType: this.info.payType,
+                recyclePerson: this.info.recyclePerson,
+                recyclePersonId: this.info.recyclePersonId,
+                quantity: this.info.quantity,
+                orderDate: this.info.orderDate,
+                orderType: this.info.orderType,
+                type: this.info.type,
+                dealPrice: this.info.dealPrice,
+                amountReceived: this.info.amountReceived,
+                orderRemark: this.info.orderRemark,
+                address: this.info.address,
+                afterSaleTab: this.info.afterSaleTab,
+                payTypeProofPicFileList: this.info.payTypeProofPicFileList,
+            }).then(() => {
+                uni.$u.toast('更新成功');
+                this.$emit('confirm');
+                this.hideModal();
+            }).catch(err => {
+                uni.$u.toast(err);
+            })
+        },
+        showBrandList() {
+            this.$refs.brandListRef.showBrandList();
+        },
+        handleSelectedBrand(info) {
+            this.$set(this.info, 'dictLabel', info.dictLabel);
+            this.$set(this.info, 'dictValue', info.dictValue);
+        },
+        handlePayTypeTabChange(e) {
+            this.info.payType = e;
+        },
+        showRecyclePersonPicker() {
+            this.$refs.recyclePersonPickerRef.open();
+        },
+        handleSelectRecyclePerson(info) {
+            this.info.recyclePerson = info.label;
+            this.info.recyclePersonId = info.id;
+        },
+        clear(field) {
+            if (field === 'brand') {
+                this.info.dictLabel = '';
+                this.info.dictValue = '';
+            }
+            if (field === 'recyclePerson') {
+                this.info.recyclePerson = '';
+                this.info.recyclePersonId = '';
+            }
+            this.info[field] = '';
+        },
+        confirmOrderDate() {
+            this.$nextTick(() => {
+                this.info.orderDate = this.$dayjs(this.info.orderDate).format('YYYY-MM-DD');
+                this.orderDateShow = false;
+            })
+        },
+        showOrderDatePicker() {
+            this.$nextTick(() => {
+                this.orderDateShow = true;
+            })
+        },
+        closeOrderDatePicker() {
+            this.orderDateShow = false;
+        },
+        getOrderTypeList() {
+            this.$getDicts("crm_sendOrder_type").then(res => {
+                this.orderTypeList = res
+            })
+        },
+        getTypeList() {
+            this.$getDicts("crm_form_category").then(res => {
+                this.typeList = res
+            })
+        },
+        changeOrderType(val) {
+            this.info.orderType = val
+        },
+        handleTabChangeType(e) {
+            this.info.type = e;
+        },
+        changeAfterSaleTab(val) {
+            this.info.afterSaleTab = val
+        },
+        getDeletePayTypeProofPicInfo(info) {
+            this.openOrderForm.payTypeProofPicFileList = info.newImages
+        },
+        afterReadPayTypeProofPic(event) {
+            event.file.forEach(item => {
+                uni.$u.api.uploadFile(item.url).then((res) => {
+                    this.info.payTypeProofPicFileList.push(res.data.url);
+                    uni.$u.toast("文件上传成功");
+                }).catch(() => {
+                    uni.$u.toast("上传文件失败");
+                })
+            })
+        },
+
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '../../styles/orderList/edit.scss';
+</style>

pages/wareHouse/components/searchFilter.vue

@@ -5,7 +5,7 @@
                 <Cell :val="formData.dictLabel" :isDelete="true" :border="true" @handleClear="clear('dictLabel')"></Cell>
                 <BrandList ref="brandListRef" @selectedBrand="handleSelectedBrand"></BrandList>
             </u-form-item>
-            <u-form-item label="价格范围" labelWidth="70">
+            <u-form-item label="实价范围" labelWidth="70">
                 <u-input v-model="formData.minPrice" placeholder="最小价格" fontSize="14" border="bottom" clearable></u-input>
                 &nbsp;&nbsp;——&nbsp;&nbsp;
                 <u-input v-model="formData.maxPrice" placeholder="最大价格" fontSize="14" border="bottom" clearable></u-input>
@@ -30,7 +30,7 @@
                 <TabSelect :tabList="productAttributeList" :colNum="3" :echoInfo="formData.productAttribute" mode="multiple" @tabChange="handleTabChangeProductAttribute"></TabSelect>
             </u-form-item>
             <u-form-item label="是否入库" labelWidth="70">
-                <TabSelect :tabList="stockStatusList" :colNum="4" :echoInfo="formData.stockStatus" mode="single" @tabChange="handleTabChangeStockStatus"></TabSelect>
+                <TabSelect :tabList="stockStatusListAll" :colNum="4" :echoInfo="formData.stockStatus" mode="single" @tabChange="handleTabChangeStockStatus"></TabSelect>
             </u-form-item>
         </u--form>
         <view class="btns">
@@ -45,6 +45,7 @@ import Cell from '@/components/custom-cell/index.vue'
 import BrandList from '@/components/brand-list/index.vue'
 import PersonPicker from '@/components/person-picker/index.vue'
 import TabSelect from '@/components/custom-tab-select/index.vue'
+import { productAttributeList, stockStatusListAll } from '../js/public.js'
 export default {
     components: {
         Cell,
@@ -74,39 +75,10 @@ export default {
             recycleTimeDefault: new Date().getTime(),
             recycleTimeShow: false,
             recyclePersonList: [],
-            productAttributeList: [
-                {
-                    name: '自有商品',
-                    value: '1',
-                },
-                {
-                    name: '寄卖商品',
-                    value: '2',
-                },
-                {
-                    name: '质押商品',
-                    value: '3',
-                },
-                {
-                    name: '其它',
-                    value: '4',
-                },
-            ],
-            stockStatusList: [
-                {
-                    name: '全部',
-                    value: '',
-                },
-                {
-                    name: '待入库',
-                    value: '0',
-                },
-                {
-                    name: '已入库',
-                    value: '1',
-                },
-
-            ],
+            // 将导入的变量在data中重新定义，确保模板能够访问
+            productAttributeList: productAttributeList,
+            stockStatusListAll: stockStatusListAll,
+            
         }
     },
     props: {

pages/wareHouse/index.vue

@@ -11,7 +11,12 @@
 					</view>
 					<text class="asset-value">{{ wareHouseCard.totalCost }}</text>
 				</view>
-				<u-button class="view-btn" type="text" size="mini" @click="navigateToFakeRegistration">假货登记</u-button>
+				<view class="btn-group">
+					<u-button type="success" shape="circle" plain size="mini" @click="openOrderList">开单记录</u-button>
+					<order-list ref="orderListRef"></order-list>
+					<u-button type="primary" shape="circle" plain size="mini"
+						@click="navigateToFakeRegistration">假货登记</u-button>
+				</view>
 			</view>
 			<view class="data-cards">
 				<view class="card-item">
@@ -27,27 +32,30 @@
 					<text class="card-value">{{ wareHouseCard.totalNum }}</text>
 				</view>
 			</view>
-			<!-- <u-upload @afterRead="uploadTestAfter" name="1" multiple :maxCount="10"></u-upload> -->
 			<view class="search-wrapper">
 				<u-search placeholder="搜索编号、名称、品牌..." v-model="searchString" bg-color="#f9fafb" border-radius="4rpx"
-					:show-action="false" class="search-input-wrap" showAction @clear="handleSearch" @custom="handleSearch"></u-search>
+					:show-action="false" class="search-input-wrap" showAction @clear="handleSearch"
+					@custom="handleSearch"></u-search>
 			</view>
 
 			<view class="category-tabs-wrap">
-				<u-tabs :list="tabList" :is-scroll="true" active-color="#007aff" inactive-color="#666666" font-size="28rpx" keyName="dictLabel"
-					border-bottom="none" @change="switchTab" class="u-tabs-custom"></u-tabs>
+				<u-tabs :list="tabList" :is-scroll="true" active-color="#007aff" inactive-color="#666666"
+					font-size="28rpx" keyName="dictLabel" border-bottom="none" @change="switchTab"
+					class="u-tabs-custom"></u-tabs>
 			</view>
 
 			<view class="filter-bar">
 				<view class="sort-btn" @click="sortPickerShow = true">
 					<text class="sort-text">{{ curSortType.label }}</text>
 					<u-icon name="arrow-down" size="12" color="#666666" class="sort-icon"></u-icon>
-					<u-picker :show="sortPickerShow" :columns="sortColumns" keyName="label" @confirm="handleSortChange" @cancel="sortPickerShow = false"></u-picker>
+					<u-picker :show="sortPickerShow" :columns="sortColumns" keyName="label" @confirm="handleSortChange"
+						@cancel="sortPickerShow = false"></u-picker>
 				</view>
 
 				<view class="price-layout-btn">
 					<view class="price-btn" type="text" @click="priceVisibleChange">
-						<u-icon :name="priceVisible ? 'eye' : 'eye-off'" size="18" color="#1890ff" class="price-icon"></u-icon>
+						<u-icon :name="priceVisible ? 'eye' : 'eye-off'" size="18" color="#1890ff"
+							class="price-icon"></u-icon>
 						<text class="price-text">价格可见</text>
 					</view>
 					<view class="layout-btn" type="text" size="mini" @click="openSearchFilter">
@@ -59,52 +67,80 @@
 			</view>
 
 			<scroll-view class="goods-list" scroll-y @scrolltolower="handleLoadMore" enable-back-to-top>
-				<view @click="clickItem(goods)" class="goods-item" v-for="(goods, goodsIndex) in goodsList" :key="`goods-${goodsIndex}`">
-					<view class="goods-img-container">
-						<image class="goods-img" :src="goods.imgUrl ? goods.imgUrl : '/static/no-img.png'" mode="aspectFill" lazy-load></image>
-						<!-- <image class="goods-img" src="/static/no-img.png" mode="aspectFill" lazy-load></image> -->
-						<view :class="['stock-indicator', goods.downStatus == '1' ? 'up-indicator' : 'down-indicator']"></view>
-					</view>
+				<view @click.stop="clickItem(goods)" class="goods-item" v-for="(goods, goodsIndex) in goodsList"
+					:key="`goods-${goodsIndex}`">
+					<u-swipe-action>
+						<u-swipe-action-item :options="swipeOptions" @click="(e) => handleSwipeClick(e, goods)">
+							<view class="goods-info">
+								<view class="goods-img-container">
+									<image class="goods-img" :src="goods.imgUrl ? goods.imgUrl : '/static/no-img.png'"
+										mode="aspectFill" lazy-load></image>
+									<!-- <image class="goods-img" src="/static/no-img.png" mode="aspectFill" lazy-load></image> -->
+									<view
+										:class="['stock-indicator', goods.downStatus == '1' ? 'up-indicator' : 'down-indicator']">
+									</view>
+								</view>
+								<view class="info-content">
+									<view class="goods-brand">
+										<view>
+											{{ goods.dictLabel || '' }}
+										</view>
+										<image v-if="goods.indentifyCode" src="../../static/icons/code.png"
+											class="code-icon" mode="aspectFill" lazy-load></image>
+										<view>
+											{{ goods.indentifyCode || '' }}
+										</view>
+									</view>
+									<text class="goods-name">{{ goods.model || '' }}</text>
 
-					<view class="goods-info">
-						<text class="goods-brand">{{ goods.dictLabel || '' }}</text>
-						<text class="goods-name">{{ goods.model || '' }}</text>
+									<view class="price-group">
+										<view class="price-item" v-if="isWareHouseRole">
+											<text class="price-type">成本价</text>
+											<text class="price">¥{{ priceVisible ? goods.costPrice || '-' : '****'
+												}}</text>
+										</view>
+										<view class="price-item" v-if="isWareHouseRole">
+											<text class="price-type">销售价</text>
+											<text class="price sales">¥{{ priceVisible ? goods.salePrice || '-' : '****'
+												}}</text>
+										</view>
+										<view class="price-item" v-if="isWareHouseRole">
+											<text class="price-type">同行价</text>
+											<text class="price">¥{{ priceVisible ? goods.peerPrice || '-' : '****'
+												}}</text>
+										</view>
+										<view class="price-item">
+											<text class="price-type">代理价</text>
+											<text class="price">¥{{ priceVisible ? goods.agentPrice || '-' : '****'
+												}}</text>
+										</view>
+										<view class="price-item" v-if="isWareHouseRole">
+											<text class="price-type">实价</text>
+											<text class="price">¥{{ priceVisible ? goods.actualPrice || '-' : '****'
+												}}</text>
+										</view>
+										<view class="price-item" v-if="isWareHouseRole">
+											<text class="price-type">指导价</text>
+											<text class="price">¥{{ priceVisible ? goods.price || '-' : '****' }}</text>
+										</view>
 
-						<view class="price-group">
-							<view class="price-items" v-if="isWareHouseRole">
-								<view class="price-item">
-									<text class="price-type">成本价</text>
-									<text class="price">¥{{ priceVisible ? goods.costPrice || '-' : '****' }}</text>
-								</view>
-								<view class="price-item">
-									<text class="price-type">销售价</text>
-									<text class="price sales">¥{{ priceVisible ? goods.salePrice || '-' : '****' }}</text>
-								</view>
-							</view>
-							<view class="price-items">
-								<view class="price-item" v-if="isWareHouseRole">
-									<text class="price-type">同行价</text>
-									<text class="price">¥{{ priceVisible ? goods.peerPrice || '-' : '****' }}</text>
+									</view>
+
+									<!-- <view class="others">
+									<view class="other-item stock" >得</view>
+									<view class="other-item">得</view>
+									<view class="other-item">得</view>
+								</view> -->
 								</view>
-								<view class="price-item">
-									<text class="price-type">代理价</text>
-									<text class="price">¥{{ priceVisible ? goods.agentPrice || '-' : '****' }}</text>
+								<view class="more">
+									<view @click.stop="showMoreOptions(goods)">
+										<u-icon name="more-dot-fill" size="16" color="#666666"></u-icon>
+									</view>
+									<text class="goods-stock">数量:{{ goods.stock || 0 }}</text>
 								</view>
 							</view>
-						</view>
-
-						<!-- <view class="others">
-							<view class="other-item stock" >得</view>
-							<view class="other-item">得</view>
-							<view class="other-item">得</view>
-						</view> -->
-					</view>
-					<view class="more">
-						<view @click.stop="showMoreOptions(goods)">
-							<u-icon name="more-dot-fill" size="16" color="#666666"></u-icon>
-						</view>
-						<text class="goods-stock">数量:{{ goods.stock}}</text>
-					</view>
+						</u-swipe-action-item>
+					</u-swipe-action>
 				</view>
 			</scroll-view>
 		</view>
@@ -116,26 +152,28 @@
 	</view>
 </template>
 <script>
-	import searchFilter from './components/searchFilter.vue'
-	import moreInfo from './components/moreInfo.vue'
-	import { permissionCheck } from '../../utils/util.js'
+import searchFilter from './components/searchFilter.vue'
+import moreInfo from './components/moreInfo.vue'
+import { permissionCheck } from '../../utils/util.js'
+import orderList from './components/orderList/index.vue'
 export default {
 	components: {
 		searchFilter,
 		moreInfo,
+		orderList,
 	},
 	data() {
 		return {
-			searchString:'',//搜索编号、名称、品牌...
-			type:'',
-			searchInfo:{},
-			pageNum:1,
-			pageSize:10,
-			curSortType:{
-				id:4,
+			searchString: '',//搜索编号、名称、品牌...
+			type: '',
+			searchInfo: {},
+			pageNum: 1,
+			pageSize: 10,
+			curSortType: {
+				id: 4,
 				label: '按入库最新',
 			},
-			wareHouseCard:{
+			wareHouseCard: {
 				totalCost: '-',
 				uploadCostToday: '-',
 				outStockToday: '-',
@@ -159,96 +197,95 @@ export default {
 			sortPickerShow: false,
 			sortColumns: [[
 				{
-					label:'按最久未下载',
-					id:1
+					label: '按最久未下载',
+					id: 1
 				},
 				{
-					label:'按最近更新',
-					id:2
+					label: '按最近更新',
+					id: 2
 				},
 				{
-					label:'按最久更新',
-					id:3
+					label: '按最久更新',
+					id: 3
 				},
 				{
-					label:'按入库最新',
-					id:4
+					label: '按入库最新',
+					id: 4
 				},
 				{
-					label:'按入库最久',
-					id:5
+					label: '按入库最久',
+					id: 5
 				},
 				{
-					label:'按价格最高',
-					id:6
+					label: '按价格最高',
+					id: 6
 				},
 				{
-					label:'按价格最低',
-					id:7
+					label: '按价格最低',
+					id: 7
 				},
 			]],
-			priceVisible:true,
-			searchPopShow:false,
-			total:0,
-			moreOptions:{},
-			moreOptionsShow:false,
-			isWareHouseRole:permissionCheck('WAREHOUSER',false),
+			priceVisible: true,
+			searchPopShow: false,
+			total: 0,
+			moreOptions: {},
+			moreOptionsShow: false,
+			isWareHouseRole: permissionCheck('WAREHOUSER', false),
+			swipeOptions: [
+				{
+					text: '删除',
+					style: {
+						backgroundColor: '#f56c6c'
+					}
+				},
+			],
+			isSwipeClick: false,
 		};
 	},
 	onLoad() {
 		this.getTypeList();
 	},
 	methods: {
-		showMoreOptions(goods){
+		showMoreOptions(goods) {
 			this.moreOptions = goods;
 			this.$refs.moreInfoRef.showMoreInfo();
 		},
-		getTypeList(){
-            this.$getDicts("crm_form_category").then(res => {
-                this.tabList = [...res]
-                this.tabList.unshift({ dictLabel: "全部", dictValue: '' })
-            })
-        },
-		uploadTestAfter(info){
-			console.log(info);
-			info.file.forEach(item=>{
-				uni.$u.api.uploadFile(item.url).then((res) => {
-					uni.$u.toast("文件上传成功");
-				}).catch(() => {
-					uni.$u.toast("上传文件失败");
-				})
+		getTypeList() {
+			this.$getDicts("crm_form_category").then(res => {
+				this.tabList = [...res]
+				this.tabList.unshift({ dictLabel: "全部", dictValue: '' })
 			})
 		},
-		getList(){
+		getList() {
 			uni.$u.api.wareHouseList({
 				pageNum: this.pageNum,
 				pageSize: this.pageSize,
 			},
-			{
-				searchString:this.searchString,
-				sortType:this.curSortType.id,
-				type:this.type,
-				...this.searchInfo
-			}).then(res => {
-				if(this.pageNum == 1){
-					this.goodsList = res.rows;
-				}else{
-					this.goodsList = this.goodsList.concat(res.rows);
-				}
-				this.total = res.total;
-			});
+				{
+					searchString: this.searchString,
+					sortType: this.curSortType.id,
+					type: this.type,
+					...this.searchInfo
+				}).then(res => {
+					if (this.pageNum == 1) {
+						this.goodsList = res.rows;
+					} else {
+						this.goodsList = this.goodsList.concat(res.rows);
+					}
+					this.total = res.total;
+				});
 		},
 		// 加载更多
 		handleLoadMore() {
 			console.log("加载更多");
-			if(this.goodsList.length >= this.total){
+			if (this.goodsList.length >= this.total) {
 				uni.$u.toast("没有更多了");
 				return;
 			}
 			this.pageNum++;
 			this.getList();
 		},
-		handleSearch(info){
+		handleSearch(info) {
 			this.pageNum = 1;
 			this.searchInfo = info;
 			this.goodsList = [];
@@ -258,25 +295,42 @@ export default {
 			this.type = item.dictValue;
 			this.handleSearch();
 		},
-		clickItem(item){
+		clickItem(item) {
+			if (this.isSwipeClick) {
+				this.isSwipeClick = false;
+				return;
+			}
 			// 如果是待入库商品，点击后跳转到添加页面补全信息
-			if(item.stockStatus === '0'){
+			if (item.stockStatus == '0') {
 				this.handleEdit(item)
-			}else{
+			} else {
 				this.handleToDetail(item);
 			}
 		},
+		handleSwipeClick(e, item) {
+			if (e.index == 0) {//删除
+				this.isSwipeClick = true;
+				uni.$u.api.wareHouseDelete({
+					id: item.id
+				}).then(() => {
+					uni.$u.toast("删除成功");
+					this.handleSearch();
+				}).catch((err) => {
+					uni.$u.toast(err);
+				});
+			}
+		},
 		handleToDetail(item) {
 			uni.navigateTo({
 				url: `/pages/wareHouse/components/detail?id=${item.id}`,
 			});
 		},
 		handleEdit(item) {
-			if(item.id){
+			if (item.id) {
 				uni.navigateTo({
 					url: `/pages/wareHouse/components/edit?formType=edit&id=${item.id}`
 				});
-			}else{
+			} else {
 				uni.navigateTo({
 					url: `/pages/wareHouse/components/edit?formType=add`
 				});
@@ -290,15 +344,15 @@ export default {
 				}
 			});
 		},
-		handleSortChange(e){
+		handleSortChange(e) {
 			this.curSortType = e.value[0];
 			this.sortPickerShow = false;
 			this.handleSearch();
 		},
-		priceVisibleChange(){
+		priceVisibleChange() {
 			this.priceVisible = !this.priceVisible;
 		},
-		openSearchFilter(){
+		openSearchFilter() {
 			this.$refs.searchFilter.open();
 		},
 		navigateToFakeRegistration() {
@@ -306,6 +360,9 @@ export default {
 				url: '/pages/wareHouse/components/fakeRegistration',
 			});
 		},
+		openOrderList() {
+			this.$refs.orderListRef.openList();
+		},
 	},
 	onShow() {
 		this.pageNum = 1;

pages/wareHouse/js/public.js

@@ -0,0 +1,182 @@
+export const afterSaleTabList = [
+    {
+        name: '假一赔三',
+        value: 1,
+    },
+    {
+        name: '一年质保',
+        value: 2,
+    },
+    {
+        name: '一年内八折回收',
+        value: 3,
+    },
+    {
+        name: '送保养一次',
+        value: 4,
+    },
+    {
+        name: '原厂配件保证',
+        value: 5,
+    },
+]
+export const productConditionList = [
+    {
+        name: '闲置未使用',
+        value: '1',
+    },
+    {
+        name: '二手',
+        value: '2',
+    },
+]
+export const productAttributeList = [
+    {
+        name: '自有商品',
+        value: '1',
+    },
+    {
+        name: '寄卖商品',
+        value: '2',
+    },
+    {
+        name: '质押商品',
+        value: '3',
+    },
+    {
+        name: '其它',
+        value: '4',
+    },
+]
+export const stockStatusList = [
+    {
+        name: '待入库',
+        value: '0',
+    },
+    {
+        name: '已入库',
+        value: '1',
+    },
+]
+export const stockStatusListAll = [
+    {
+        name: '全部',
+        value: '',
+    },
+    {
+        name: '待入库',
+        value: '0',
+    },
+    {
+        name: '已入库',
+        value: '1',
+    },
+
+]
+export const recycleTypeList = [
+    {
+        name: '线上',
+        value: '1',
+    },
+    {
+        name: '同行',
+        value: '2',
+    },
+    {
+        name: '门店',
+        value: '3',
+    },
+    {
+        name: '其它',
+        value: '4',
+    },
+]
+export const labelList = [
+    {
+        name: '完美',
+        value: '1',
+    },
+    {
+        name: '普通',
+        value: '2',
+    },
+    {
+        name: '瑕疵',
+        value: '3',
+    },
+    {
+        name: '假货',
+        value: '4',
+    },
+    {
+        name: '亏损',
+        value: '5',
+    },
+]
+export const paymentTabList = [
+    {
+        name: '微信',
+        value: "1",
+    },
+    {
+        name: '支付宝',
+        value: "2",
+    },
+    {
+        name: '银行卡',
+        value: "3",
+    },
+    {
+        name: '现金',
+        value: "4",
+    },
+    {
+        name: '数字货币',
+        value: "5",
+    },
+    {
+        name: '挂账',
+        value: "6",
+    },
+]
+export const shortTimeList = [{
+    unit: 'day',
+    key: '全部',
+    value: 0
+},
+{
+    unit: 'day',
+    key: '今天',
+    value: 1
+},
+{
+    unit: 'day',
+    key: '昨天',
+    value: -1
+},
+{
+    unit: 'day',
+    key: '近3天',
+    value: 3
+},
+{
+    unit: 'day',
+    key: '近7天',
+    value: 7
+},
+{
+    unit: 'day',
+    key: '近15天',
+    value: 15
+},
+{
+    unit: 'month',
+    key: '本月',
+    value: 1
+},
+{
+    unit: 'month',
+    key: '上月',
+    value: -1
+},
+]

pages/wareHouse/styles/index.scss

@@ -1,22 +1,25 @@
 /* 页面容器 */
-.page{
+.page {
   width: 100%;
   height: 100vh;
   background-color: #fff;
   display: flex;
   flex-direction: column;
 }
+
 .page-container {
   flex: 1;
   display: flex;
   flex-direction: column;
   background-color: #f9fafb;
-  padding-bottom:20rpx;
+  padding-bottom: 20rpx;
   overflow: hidden;
 }
-.nav-bar{
+
+.nav-bar {
   border-bottom: 1px solid #f7f6f6 !important;
 }
+
 /* 总资产区域 */
 .asset-header {
   width: 100%;
@@ -32,11 +35,20 @@
   .asset-text-wrap {
     flex: 1;
   }
-  .asset-title-con{
-      display: flex;
-      align-items: center;
-      justify-content: flex-start;
-      margin-bottom: 12rpx;
+
+  .btn-group {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    gap: 10rpx;
+  }
+
+  .asset-title-con {
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    margin-bottom: 12rpx;
+
     .asset-title {
       font-size: 26rpx;
       color: #999999;
@@ -52,20 +64,6 @@
     font-weight: 600;
     letter-spacing: 2rpx;
   }
-
-  .view-btn {
-    width: auto;
-    padding: 0 25rpx;
-    background-color: #e3eefd;
-    color: #0d83f1;
-    font-size: 20rpx;
-    border-radius: 30rpx;
-    font-weight: 500;
-    text-align: center;
-    border: none;
-    margin: 0;
-    float: none;
-  }
 }
 
 /* 数据卡片 */
@@ -75,6 +73,7 @@
   padding-bottom: 20rpx;
   background-color: #fff;
   padding: 8rpx 15rpx;
+
   .card-item {
     flex: 1;
     text-align: center;
@@ -82,29 +81,34 @@
     padding: 24rpx 0;
     margin: 0 10rpx;
     border-radius: 24rpx;
+
     .card-label {
       font-size: 26rpx;
       color: #666;
       display: block;
       margin-bottom: 8rpx;
     }
+
     .card-value {
       font-size: 36rpx;
       font-weight: 700;
       color: #333;
       display: block;
+
       &.green {
         color: #09bb07;
       }
     }
-	&:nth-of-type(1){
-		margin-left:0;
-	}
-	&:nth-last-of-type(1){
-		margin-right:0;
-	}
+
+    &:nth-of-type(1) {
+      margin-left: 0;
+    }
+
+    &:nth-last-of-type(1) {
+      margin-right: 0;
+    }
   }
-	
+
 }
 
 /* 搜索框区域 */
@@ -116,6 +120,7 @@
   justify-content: space-between;
   align-items: center;
   background-color: #fff;
+
   .search-input-wrap {
     height: 100%;
     --u-search-bg-color: #ffffff !important;
@@ -127,6 +132,7 @@
     border: none !important;
     box-shadow: none !important;
   }
+
   .search-filter-btn {
     margin-left: 20rpx;
     width: 60rpx;
@@ -145,9 +151,10 @@
   padding: 8rpx 15rpx;
   margin-bottom: 20rpx;
   background: #ffffff !important;
+
   .u-tabs-custom {
     --u-tabs-bg-color: #ffffff !important;
-    background: #ffffff !important; 
+    background: #ffffff !important;
     --u-tabs-border-bottom: none !important;
     --u-tabs-item-padding: 10rpx 20rpx !important;
     --u-tabs-item-margin: 0 10rpx !important;
@@ -200,10 +207,12 @@
       }
     }
   }
-  .price-layout-btn{
+
+  .price-layout-btn {
     display: flex;
     justify-content: space-between;
     align-items: center;
+
     .price-btn {
       background: transparent;
       padding: 0;
@@ -246,9 +255,11 @@
   background-color: #f9fafb;
   overflow: hidden;
   height: 100%;
-  ::v-deep .uni-scroll-view{
+
+  ::v-deep .uni-scroll-view {
     height: 100%;
   }
+
   .goods-item {
     margin: 10rpx 15rpx;
     background-color: #fff;
@@ -259,6 +270,18 @@
     align-items: stretch;
     gap: 20rpx;
 
+    .u-swipe-action {
+      flex: 1;
+      display: flex;
+      align-items: stretch;
+    }
+
+    .u-swipe-action-item {
+      flex: 1;
+      display: flex;
+      align-items: stretch;
+    }
+
     .goods-img-container {
       position: relative;
       flex-shrink: 0;
@@ -273,96 +296,123 @@
 
     .stock-indicator {
       position: absolute;
-      bottom: 14rpx;
-      right: 6rpx;
+      top: 140rpx;
+      right: 0;
       width: 20rpx;
       height: 20rpx;
       border-radius: 50%;
       border: 2rpx solid #ffffff;
     }
-    .up-indicator{
+
+    .up-indicator {
       background-color: #09bb07;
     }
-    .down-indicator{
+
+    .down-indicator {
       background-color: #c7d5c7;
     }
+
     .goods-info {
       flex: 1;
-      .goods-brand {
-        font-size: 32rpx;
-        font-weight: 700;
-        color: #333333;
-        display: block;
-        line-height: 1.2;
-      }
+      display: flex;
+      align-items: stretch;
+      gap: 20rpx;
 
-      .goods-name {
-        font-size: 26rpx;
-        color: #666666;
-        display: block;
-        font-weight: 600;
-        line-height: 1.4;
-        word-break: break-all;
-      }
-      .price-group{
-        .price-items{
+      .info-content {
+        flex: 1;
+
+        .goods-brand {
+          font-size: 32rpx;
+          font-weight: 700;
+          color: #333333;
+          display: block;
+          line-height: 1.2;
           display: flex;
-          justify-content: space-between;
-          .price-item{
-            display: flex;
-            flex-direction: column;
-            justify-content: flex-start;
-            .price-type{
-              color: #d1d5db;
-              font-size: 24rpx;
-            }
-            .price{
-              font-weight: 700;
-            }
-            .sales{
-              color: red;
-            }
+          align-items: center;
+          gap: 8rpx;
+
+          .code-icon {
+            width: 28rpx;
+            height: 22rpx;
           }
         }
-      }
-      .others{
-        margin-top: 20rpx;
-        display: flex;
-        align-items: center;
-        gap: 12rpx;
-        .other-item{
+
+        .goods-name {
+          font-size: 26rpx;
+          color: #666666;
+          display: block;
+          font-weight: 600;
+          line-height: 1.4;
+          word-break: break-all;
+        }
+
+        .price-group {
+          display: grid;
+          grid-template-columns: repeat(2, 1fr);
+            .price-item {
+              display: flex;
+              flex-direction: column;
+              justify-content: flex-start;
+
+              .price-type {
+                color: #d1d5db;
+                font-size: 24rpx;
+              }
+
+              .price {
+                font-weight: 700;
+              }
+
+              .sales {
+                color: red;
+              }
+            }
+        }
+
+        .others {
+          margin-top: 20rpx;
           display: flex;
           align-items: center;
-          justify-content: center;
-          width: 26rpx;
-          height: 26rpx;
-          font-size: 20rpx;
-          color: #c5c3c3;
-          background-color: #f5f5f5;
-          padding:6rpx;
-          border-radius:50%;
-          &.stock{
-            background-color: #007aff;
-            color: #fff;
+          gap: 12rpx;
+
+          .other-item {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            width: 26rpx;
+            height: 26rpx;
+            font-size: 20rpx;
+            color: #c5c3c3;
+            background-color: #f5f5f5;
+            padding: 6rpx;
+            border-radius: 50%;
+
+            &.stock {
+              background-color: #007aff;
+              color: #fff;
+            }
           }
         }
       }
-    }
-    .more{
-      display: flex;
-      flex-direction: column;
-      align-items: flex-end;
-      justify-content: space-between;
-      gap: 20rpx;
-      .goods-stock {
-        font-size: 24rpx;
-        color: #666666;
-        align-self: flex-end;
-        flex-shrink: 0;
-        padding-left: 10rpx;
+
+      .more {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-end;
+        justify-content: space-between;
+        gap: 20rpx;
+
+        .goods-stock {
+          font-size: 24rpx;
+          color: #666666;
+          align-self: flex-end;
+          flex-shrink: 0;
+          padding-left: 10rpx;
+        }
       }
     }
   }
+
 }
 
 /* 添加按钮 */
@@ -378,12 +428,11 @@
   align-items: center;
   justify-content: center;
   box-shadow: 0 20px 25px -5px rgb(0 0 0 / 0.1);
-  z-index: 999;
+  z-index: 20;
   cursor: pointer;
   transition: all 0.3s ease;
-  
+
   &:active {
     transform: scale(0.95);
   }
-}
-
+}

pages/wareHouse/styles/orderList/edit.scss

@@ -0,0 +1,40 @@
+.form-container {
+    max-height: 70vh;
+    overflow: auto;
+    padding-right: 10rpx;
+    
+    &::-webkit-scrollbar {
+        width: 6rpx;
+    }
+    
+    &::-webkit-scrollbar-track {
+        background: #f1f1f1;
+        border-radius: 3rpx;
+    }
+    
+    &::-webkit-scrollbar-thumb {
+        background: #c1c1c1;
+        border-radius: 3rpx;
+    }
+    
+    &::-webkit-scrollbar-thumb:hover {
+        background: #a1a1a1;
+    }
+}
+
+::v-deep .u-form {
+    width: 100%;
+
+    .u-form-item {
+
+        &.u-form-item-row {
+            .u-form-item__body {
+                flex-direction: row !important;
+
+                .u-form-item__body__left {
+                    width: auto !important;
+                }
+            }
+        }
+    }
+}

pages/wareHouse/styles/orderList/index.scss

@@ -0,0 +1,48 @@
+::v-deep .u-transition{
+    z-index: 999 !important;//解决预览图片层级问题
+}
+::v-deep .order_list{
+    overflow: hidden;
+    padding:0 20rpx;
+    font-size: 28rpx;
+    .search_form{
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 10rpx;
+    }
+    .btns{
+        display: flex;
+        gap:20rpx;
+        padding: 20rpx;
+    }
+    .list_wrap{
+        margin-top: 20rpx;
+        overflow: auto;
+        height: calc(100vh - 200rpx);
+        width: 100%;
+        .order_item{
+            background-color: #ffffff;
+            border-radius: 20rpx;
+            padding: 20rpx;
+            margin-bottom: 20rpx;
+            border: 1px solid #f7f6f6;
+            box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1);
+            line-height: 44rpx;
+            .order_col_1{
+                display: grid;
+                flex:1;
+            }
+            .order_col_2{
+                display: grid;
+                grid-template-columns: repeat(2, 1fr);
+            }
+            .scroll_img{
+                width: calc(100vw - 80rpx);
+            }
+        }
+    }
+    .search_pop{
+        padding: 40rpx 20rpx;
+    }
+}

uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js

@@ -72,7 +72,7 @@ const cfu = {
       }
     },
 	'tooltipFormatPrice':function(item, category, index, opts){
-		return item.name + category.substring(2) + '：' + item.data + '元'
+		return item.name + '  ' + category.substring(2) + '：' + item.data + '元'
     },
   },
   //这里演示了自定义您的图表类型的option，可以随意命名，之后在组件上 type="demotype" 后，组件会调用这个花括号里的option，如果组件上还存在opts参数，会将demotype与opts中option合并后渲染图表。

utils/api.js

@@ -3,7 +3,7 @@ import qs from 'qs';
 
 import store from "../store/index.js";
 import config from '../uni_modules/uview-ui/libs/config/config.js';
-const mockApi = 'http://192.168.0.243:3001/mock-api/prod-api/crm';
+const mockApi = 'http://192.168.0.243:3001/mock-api/prod-api/crm';//本地mock服务地址
 
 const install = (Vue, vm) => {
 	vm.$u.api = {
@@ -115,10 +115,7 @@ const install = (Vue, vm) => {
 		// 支付相关接口
 		saveOrderFileAndTransfer:(data={})=>http.post(store.state.user.path + '/storeInfo/saveOrderFileAndTransfer',data),
 
-		// ========== Mock接口（开发环境使用，本地Mock服务器）==========
-		// 服务器地址: http://192.168.0.243:3001
-		// 手机预览时需要使用电脑局域网IP，不能用localhost
-		// 切换真实接口时，将 baseUrl 改为真实接口地址即可
+		//启动mock服务，把store.state.user.path换成mockApi 手机预览时需要使用电脑局域网IP，不能用localhost
 		getPersonCards:(params)=>http.get(store.state.user.path+'/personCenter/getPersonCards',{ params }),//个人中心-获取个人中心数据
 		getPersonLatestClue:(params)=>http.get(store.state.user.path+'/personCenter/getPersonLatestClue',{ params }),//个人中心-获取最新线索
 		getPersonRanking:(params)=>http.get(store.state.user.path+'/personCenter/getPersonRanking',{ params }),//个人中心-获取个人排名
@@ -138,17 +135,17 @@ const install = (Vue, vm) => {
 		wareHouseFakeAdd:(data)=>http.post(store.state.user.path+'/warehouse/wareHouseFakeAdd',data),//仓库中心-假货新增
 		wareHouseFakeEdit:(data)=>http.post(store.state.user.path+'/warehouse/wareHouseFakeEdit',data),//仓库中心-假货编辑
 		wareHouseFakeList:(params,data)=>http.post(store.state.user.path+'/warehouse/wareHouseFakeList?' + qs.stringify(params), data),//仓库中心-假货列表
-
-
-
+		xhlSystemSetList:(data)=>http.post(store.state.user.path+'/xhlSystemSet/list', data),//系统设置-列表
+		wareHouseOrderList:(data)=>http.post(store.state.user.path+'/wareHouseOrder/list',data),//开单列表
+		wareHouseOrderDelete:(data)=>http.delete(store.state.user.path+'/wareHouseOrder/' + data.id ),//删除开单
+		wareHouseOrderDetail:(params)=>http.get(store.state.user.path+'/wareHouseOrder/'+params.id),//开单详情
+		wareHouseOrderUpdate:(data)=>http.put(store.state.user.path+'/wareHouseOrder',data),//开单编辑
+		wareHouseDelete:(data)=>http.delete(store.state.user.path+'/warehouse/' + data.id ),//仓库删除
 		saveOrderFileAndTransfer: (data = {}) => http.post(store.state.user.path + '/storeInfo/saveOrderFileAndTransfer', data),
 
 		// 删除订单分成数据
 		deleteClueCommissionForm: (id, config = {}) => http.delete(store.state.user.path + '/clueCommissionForm/' + id),
 
-
-
-
 	}
 }
 

utils/util.js

@@ -406,5 +406,7 @@ export function permissionCheck(roleKey,isShowToast = true) {
     if(!getRoles().includes(roleKey)){
         if(isShowToast) uni.$u.toast('无权限');
         return false
-    }
+    }else{
+		return true
+	}
 }