feat:更新

components/add-inquiry-dialog/index.vue

@@ -1,10 +1,10 @@
 <template>
 	<view>
-		<u-modal :show="showModal" ref="uModal" :title="editOrAdd === 'edit' ? '编辑' : '新增'" :asyncClose="false" showCancelButton @cancel="closeDialog" cancelColor="#909399" :confirmText="'确定'" confirmColor="#2979ff"@confirm="confirm" @close="closeDialog" :closeOnClickOverlay="false">
+		<u-modal :show="showModal" ref="uModal" :title="editOrAdd === 'edit' ? '编辑' : '新增'" :asyncClose="false" showCancelButton @cancel="closeDialog" cancelColor="#909399" :confirmText="'确定'" confirmColor="#2979ff" @confirm="confirm" @close="closeDialog" :closeOnClickOverlay="false">
             <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></u--input>
+                <u--input placeholder="型号" class="item" border="none" v-model="info.model" clearable @blur="handleModelBlur"></u--input>
                 <text class="divider">|</text>
                 <u--input class="code-input item" placeholder="编码" border="none" v-model="info.code" clearable></u--input>
             </view>
@@ -18,6 +18,10 @@
                 ></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">
+                <qiun-data-charts type="line" :chartData="chartData" canvasId="trendChart" :opts="opts" :ontouch="true"
+                    width="700rpx" height="200rpx" backgroundColor="#ffffff" />
+            </view>
         </u-modal>
         <brandList ref="brandListRef" @selectedBrand="handleSelectedBrand"></brandList>
 	</view>
@@ -49,8 +53,12 @@ export default {
             type: Object,
             default: () => {}
         },
-
+        type: {
+            type: Number,
+            default: 1
+        },
 	},
+    emits: ['submitSuccess'],
 	data() {
 		return {
 			showModal: false,
@@ -68,6 +76,40 @@ export default {
                     { required: true, message: '请输入品牌', trigger: 'blur' }
                 ]
             },
+            chartData:{},
+            opts: {
+                color: ["#f9ae3d"],
+                padding: [10, 10, 0, 0],
+                dataLabel: false,
+                dataPointShape: false,
+                enableScroll: true,
+                legend: {
+                    show: false
+                },
+                xAxis: {
+                    disableGrid: true,
+                    scrollShow: true,
+                    itemCount: 7
+                },
+                yAxis: {
+                    gridType: "dash",
+                    dashLength: 7,
+                    axisLabel:{
+                        show: false
+                    }
+                },
+                extra: {
+                    line: {
+                        type: "curve",
+                        width: 3,
+                        activeType: "hollow",
+                        linearType: "custom",
+                        onShadow: true,
+                        animation: "horizontal"
+                    }
+                }
+            },
+            chartShow: false
 		}
 	},
 	watch: {
@@ -81,9 +123,15 @@ export default {
 	methods: {
         // 编辑回显
         initData() {
-            if (this.editOrAdd === 'edit') {
-                this.info = JSON.parse(JSON.stringify(this.editInfo))
-            }
+            this.$nextTick(()=>{
+                if (this.editOrAdd === 'edit') {
+                    this.info = JSON.parse(JSON.stringify(this.editInfo))
+                    this.showModal = true;
+                    if(this.info.model && this.info.dictValue){
+                        this.getChartData()
+                    }
+                }
+            })
         },
         // 获取删除图片信息
         getDeleteImgInfo(info) {
@@ -130,13 +178,13 @@ export default {
                 })
                 return
             }
-            if(this.info.imgsUrl.length == 0){
-                uni.showToast({
-                    title: '请上传图片',
-                    icon: 'none'
-                })
-                return
-            }
+            // if(this.info.imgsUrl.length == 0){
+            //     uni.showToast({
+            //         title: '请上传图片',
+            //         icon: 'none'
+            //     })
+            //     return
+            // }
             const data = {
                 clueId: this.clueId,
                 dictValue: this.info.dictValue,
@@ -145,7 +193,9 @@ export default {
                 code: this.info.code,
                 id: this.editOrAdd === 'edit' ? this.info.id : '',
                 price: this.editOrAdd === 'edit' ? this.info.price : '',
-                imgsUrl:this.info.imgsUrl
+                imgsUrl:this.info.imgsUrl,
+                status: this.editOrAdd === 'edit' ? '2' : '1',
+                type: this.type
             }
             uni.$u.api.addInquiry(data).then(res => {
                 if (res.code == 200) {
@@ -154,16 +204,16 @@ export default {
                         icon: 'success'
                     })
                     this.closeDialog()
-                    this.$emit('addSuccess')
+                    this.$emit('submitSuccess')
                 }
             })
         },
         showDialog() {
-            this.showModal = true;
             if (this.editOrAdd === 'edit') {
                 this.initData();
             }else{
                 this.clearForm()
+                this.showModal = true;
             }
         },
         clearForm() {
@@ -179,6 +229,41 @@ export default {
         },
         closeDialog() {
             this.showModal = false;
+            this.chartShow = false
+            this.chartData = {}
+        },
+        handleModelBlur() {
+            if (this.info.model !== ''){
+                this.getChartData()
+            }
+        },
+        getChartData() {
+            uni.$u.api.inquiryChart({
+                dictValue: this.info.dictValue,
+                model: this.info.model,
+            }).then(res => {
+                if (res.code == 200) {
+                    
+                    let data = {
+                        categories: res.data.map(item=>item.recycleTime),
+                        series: [
+                            {
+                                name: this.info.model+'价格趋势',
+                                data: res.data.map(item=>item.costPrice),
+                                setShadow: [
+                                    3,
+                                    8,
+                                    15,
+                                    "#f9ae3d"
+                                ],
+                            }
+                        ]
+                    }
+                    this.chartData = JSON.parse(JSON.stringify(data))
+                    this.chartShow = true
+                }
+            })
+            
         },
 	}
 };

components/custom-tab-select/index.vue

@@ -3,14 +3,14 @@
     <view 
       class="tab-item"
       :class="{ 
-        'tab-item--active': isMultiple ? activeValues.includes(item.value) : activeValue === item.value,
+        'tab-item--active': isMultiple ? activeValues.includes(item[valueKey]) : activeValue === item[valueKey],
         'tab-item--multiple': isMultiple
       }"
       v-for="(item, index) in tabList"
       :key="index"
       @click="handleTabClick(item)"
     >
-      <text class="tab-item__text">{{ item.name }}</text>
+      <text class="tab-item__text">{{ item[labelKey] }}</text>
       <!-- <view v-if="isMultiple" class="tab-item__checkbox" :class="{ 'tab-item__checkbox--checked': activeValues.includes(item.value) }">
         <view v-if="activeValues.includes(item.value)" class="tab-item__checkbox-inner"></view>
       </view> -->
@@ -47,6 +47,14 @@ export default {
     isClear: {
       type: Boolean,
       default: false
+    },
+    valueKey: {
+      type: String,
+      default: "value"
+    },
+    labelKey: {
+      type: String,
+      default: "name"
     }
   },
   computed: {
@@ -121,15 +129,15 @@ export default {
       }
     },
     handleSingleSelect(item) {
-      this.activeValue = item.value;
-      this.$emit("tabChange", item.value);
+      this.activeValue = item[this.valueKey];
+      this.$emit("tabChange", item[this.valueKey]);
     },
     handleMultipleSelect(item) {
-      const index = this.activeValues.indexOf(item.value);
+      const index = this.activeValues.indexOf(item[this.valueKey]);
       if (index > -1) {
         this.activeValues.splice(index, 1);
       } else {
-        this.activeValues.push(item.value);
+        this.activeValues.push(item[this.valueKey]);
       }
       this.$emit("tabChange", [...this.activeValues]);
     }

components/inquiry-verification-list/index.vue

@@ -6,7 +6,10 @@
             <view class="list_item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
                 <view class="list_item_top">
                     <view class="top_left">
-                        <text class="name">{{ item.dictLabel }}</text>
+                        <view class="name">
+                            <view>{{ item.dictLabel }}</view>
+                            <view v-if="item.price">￥{{ item.price }}</view>
+                        </view>
                         <text class="desc">{{ type == '1' ? '意向' : item.model }}</text>
                     </view>
                     <view class="top_right">
@@ -31,8 +34,7 @@
             <show-emtry v-if="list.length === 0"></show-emtry>
         </scroll-view>
 
-        <add-inquiry-dialog ref="addInquiryDialog" editOrAdd="edit" :editInfo="editInfo" @success="handleInquirySuccess"
-            @addSuccess="handleInquiryCancel" />
+        <add-inquiry-dialog ref="addInquiryDialog" editOrAdd="edit" :editInfo="editInfo" :type="type" @submitSuccess="onRefresh"/>
     </view>
 </template>
 <script>

components/inquiry-verification-list/mixins/inquiryVerificationList.js

@@ -16,10 +16,6 @@ export default {
             total: 0,
         }
     },
-    mounted() {
-        this.getList();
-    },
-    
     methods: {
         onRefresh() {
             this.queryParams.pageNum = 1;
@@ -46,13 +42,11 @@ export default {
             this.getList();
         },
         formtterStatus(status) {
-            switch (status) {
-                case '1':
-                    return '待询价'
-                case '2':
-                    return '待核价'//待核价=询价完成
-                case '3':
-                    return '核价完成'
+            if(this.type == 1){
+                return status == '1' ? '待询价' : '询价完成'
+            }
+            if(this.type == 2){
+                return status == '1' ? '待核价' : '核价完成'
             }
         },
         handleClick(item) {

components/inquiry-verification-list/styles/index.scss

@@ -34,6 +34,9 @@
                         font-size: 32rpx;
                         font-weight: bold;
                         color: #111827;
+                        display: flex;
+                        align-items: center;
+                        gap: 10rpx;
                     }
 
                     .desc {

mock/mockData.js

@@ -694,11 +694,11 @@ const mockDataList = {
   '/warehouse/wareHouseAdd': {
     method: 'post',
     data:{
-      goodPicFileList:['https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg'],//商品图片
-      desc:'',//商品描述
-      type:'1',//商品分类 1-腕表 2-箱包 3-珠宝 4-鞋靴 5-配饰 6-服饰 7-其他
-      dictLabel:'Rolex',//商品名称
-      dictValue:'12345',//商品名称id
+      goodPicFileList:['https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg'],//商品图片 必填
+      desc:'',//商品描述 必填
+      type:'1244',//商品分类 必填 1244-收单类  1245-维修类 1246-销售类
+      dictLabel:'Rolex',//商品名称 必填
+      dictValue:'12345',//商品名称id 必填
       series:'',//系列
       model:'',//型号
       dialType:'',//机芯类型
@@ -708,14 +708,14 @@ const mockDataList = {
       size:'',//尺寸
       yardage:'',//尺码
       price:'',//官方指导价
-      productCondition:'',//商品成色 1-闲置未使用 2-二手
+      productCondition:'',//商品成色 必填 1-闲置未使用 2-二手 
       detailPicFileList:['https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg'],//细节图片
       title:'',//商品标题
       productNo:'',//商品货号
-      productAttribute:'1',//商品属性 1-自有商品 2-寄卖商品 3-质押商品 4-其它
-      stock:'',//库存数量
+      productAttribute:'1',//商品属性 必填 1-自有商品 2-寄卖商品 3-质押商品 4-其它
+      stock:'',//库存数量 必填
       costPrice:'',//总成本价
-      samePrice:'',//同行价格
+      peerPrice:'',//同行价格
       agentPrice:'',//代理价格
       salePrice:'',//销售价格
       productPosition:'',//商品位置
@@ -723,12 +723,12 @@ const mockDataList = {
       identifyingPerson:'',//鉴定人员
       identifyingPersonId:'',//鉴定人员id
       recycleType:'1',//回收类型 1-线上 2-同行 3-门店 4-其它
-      label:'1',//标签 1-完美 2-假货 3-重复 4-亏损 5-其他
+      label:'1',//标签 1-完美 2-普通 3-瑕疵 4-假货 5-亏损
       recyclePerson:'',//回收人员
       recyclePersonId:'',//回收人员id
       recycleBottomDesc:'',//回收留底图描述
       recycleBottomFileList:['https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg'],//回收留底图
-      recycleTime:'2026-01-06',//回收时间
+      recycleTime:'2026-01-06',//回收时间 必填
       indentifyCode:'',//独立编码
       targetAudience:'general',// general-通用 man-男 woman-女
       productCard:'',//商品保卡 has-有 no-无

pages/clue/post/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="post_item">
 		<view class="post_top">
-			<view class="top_left">{{ item.name }}</view>
+			<view class="top_left">{{ item.name }}  <text v-if="item.price">￥{{ item.price }}</text></view>
 			<view class="top_right">{{ item.assignStateCode === '1' ? "已分配" : "未分配" }}</view>
 		</view>
 		<view class="post_info">
@@ -58,7 +58,7 @@
 			<image src='/static/publicClue/littlePlane.png' mode="aspectFit" class="sendOrder_img"></image>
 			<view>发单</view>
 		</view>
-		<add-inquiry-dialog ref="inquiryDialog" :clueId="clueId" editOrAdd="add" @success="handleInquirySuccess" @cancel="handleInquiryCancel"/>
+		<add-inquiry-dialog ref="inquiryDialog" :clueId="clueId" :editOrAdd="editOrAdd" :editInfo="editInfo" @success="handleInquirySuccess" @cancel="handleInquiryCancel" :type="1"/>
 	</view>
 </template>
 
@@ -89,6 +89,8 @@ export default {
 		return {
 			caseStatusDicts: [],
 			clueId: '',
+			editOrAdd: 'add',
+			editInfo: {}
 		}
 	},
 	methods: {
@@ -162,7 +164,24 @@ export default {
 		// 询价
 		async handleInquiry(item) {
 			this.clueId = item.id
-			this.$refs.inquiryDialog.showDialog()
+			if(Number(item.count) > 0){//count 默认是0，新增之后变为1，之后每编辑一次就会+1
+				const data = {
+					clueId: item.id,
+					type:1
+				}
+				this.editOrAdd = 'edit'
+				uni.$u.api.inquiryDetail(data).then(res=>{
+					if(res.code === 200){
+						this.$nextTick(()=>{
+							this.editInfo = res.data
+							this.$refs.inquiryDialog.showDialog()
+						})
+					}
+				})
+			}else if(!item.count){
+				this.editOrAdd = 'add'
+				this.$refs.inquiryDialog.showDialog()
+			}
 		},
 		// 询价成功
 		handleInquirySuccess() {

pages/inquiry/index.vue

@@ -1,6 +1,6 @@
 <template>
     <view class="page-container">
-        <inquiryVerificationList :type="type" ref="inquiryVerificationListRef"></inquiryVerificationList>
+        <inquiryVerificationList :type="type" ref="inquiryRef"></inquiryVerificationList>
     </view>
 </template>
 <script>
@@ -15,8 +15,15 @@
             }
         },
         onPullDownRefresh() {
-            this.$refs.inquiryVerificationListRef.onRefresh();
-            uni.stopPullDownRefresh();
+            this.$nextTick(()=>{
+                this.$refs.inquiryRef.onRefresh();
+                uni.stopPullDownRefresh();
+            })
+        },
+        onShow() {
+            this.$nextTick(()=>{
+                this.$refs.inquiryRef.getList();
+            })
         },
     }
 </script>

pages/setting/index.vue

@@ -71,9 +71,9 @@
 			},
 			confirm() {
 				// 停止电话监听
-				// this.$store.dispatch("call/stopPhoneListener").catch(error => {
-				// 	console.error('退出登录时停止电话监听失败:', error);
-				// });
+				this.$store.dispatch("call/stopPhoneListener").catch(error => {
+					console.error('退出登录时停止电话监听失败:', error);
+				});
 				
 				this.$store.dispatch("user/logout").then(()=>{
 					uni.$u.toast("退出成功");

pages/verification/index.vue

@@ -1,6 +1,6 @@
 <template>
     <view class="page-container">
-        <inquiryVerificationList :type="type" ref="inquiryVerificationListRef"></inquiryVerificationList>
+        <inquiryVerificationList :type="type" ref="verificationRef"></inquiryVerificationList>
     </view>
 </template>
 <script>
@@ -15,8 +15,15 @@
             }
         },
         onPullDownRefresh() {
-            this.$refs.inquiryVerificationListRef.onRefresh();
-            uni.stopPullDownRefresh();
+            this.$nextTick(()=>{
+                this.$refs.verificationRef.onRefresh();
+                uni.stopPullDownRefresh();
+            })
+        },
+        onShow() {
+            this.$nextTick(()=>{
+                this.$refs.verificationRef.getList();
+            })
         },
     }
 </script>

pages/wareHouse/components/add.vue

@@ -27,12 +27,14 @@
                         </view>
                     </u-form-item>
                     <u-form-item label="商品图片" prop="imgs" borderBottom>
-                        <ImgsRowScroll v-if="formData.goodPicFileList.length > 0" :isShowDeleteIcon="true"
-                            @deleteImgInfo="getDeleteGoodPicInfo" imgMode="aspectFill" :totalWidth="400"
-                            :images="formData.goodPicFileList" :previewEnabled="true" :imageWidth="150"
-                            :imageHeight="150"></ImgsRowScroll>
-                        <u-upload @afterRead="afterReadGoodPic" name="3" multiple :maxCount="9"
-                            :previewFullImage="true"></u-upload>
+                        <view class="imgs_scroll">
+                            <ImgsRowScroll v-if="formData.goodPicFileList.length > 0" :isShowDeleteIcon="true"
+                                @deleteImgInfo="getDeleteGoodPicInfo" imgMode="aspectFill" :totalWidth="400"
+                                :images="formData.goodPicFileList" :previewEnabled="true" :imageWidth="150"
+                                :imageHeight="150"></ImgsRowScroll>
+                            <u-upload @afterRead="afterReadGoodPic" name="3" multiple :maxCount="9"
+                                :previewFullImage="true"></u-upload>
+                        </view>
                     </u-form-item>
                     <u-form-item label="商品描述（详细的描述让用户更好的了解您的产品）" required prop="desc" borderBottom>
                         <u--textarea v-model="formData.desc" clearable placeholder="95新 WHZ19219H
@@ -41,7 +43,7 @@
                         配件中溯卡" count autoHeight maxlength="250" height="100" confirmType="done"></u--textarea>
                     </u-form-item>
                     <u-form-item label="商品分类" required prop="type" borderBottom>
-                        <TabSelect :tabList="typeList" :isClear="typeIsClear" @tabChange="handleTabChangeType"
+                        <TabSelect :tabList="typeList" :isClear="typeIsClear" @tabChange="handleTabChangeType" labelKey="dictLabel" valueKey="dictValue"
                             :colNum="4" mode="single">
                         </TabSelect>
                     </u-form-item>
@@ -82,7 +84,7 @@
                             @tabChange="handleTabChangeProductCondition" :colNum="2" mode="single"></TabSelect>
                     </u-form-item>
                     <u-form-item label="细节图" borderBottom>
-                        <view class="detail_pic_container">
+                        <!-- <view class="detail_pic_container"> -->
                             <!-- <view>
                                 <text class="tip">视频：</text>
                                 <ImgsRowScroll v-if="formData.detailVideoFileList.length > 0" :isShowDeleteIcon="true"
@@ -91,15 +93,17 @@
                                     :imageHeight="150" accept="video"></ImgsRowScroll>
                                 <u-upload @afterRead="afterReadDeatilVideo"  name="2" multiple :maxCount="10" accept="video"></u-upload>
                             </view> -->
-                            <view>
+                            <!-- <view> -->
                                 <!-- <text class="tip">图片：</text> -->
-                                <ImgsRowScroll v-if="formData.detailPicFileList.length > 0" :isShowDeleteIcon="true"
-                                    @deleteImgInfo="getDeleteDetailPicInfo" imgMode="aspectFill" :totalWidth="400"
-                                    :images="formData.detailPicFileList" :previewEnabled="true" :imageWidth="150"
-                                    :imageHeight="150"></ImgsRowScroll>
-                                <u-upload @afterRead="afterReadDetailPic" name="1" multiple :maxCount="10"></u-upload>
-                            </view>
-                        </view>
+                                <view class="imgs_scroll">
+                                    <ImgsRowScroll v-if="formData.detailPicFileList.length > 0" :isShowDeleteIcon="true"
+                                        @deleteImgInfo="getDeleteDetailPicInfo" imgMode="aspectFill" :totalWidth="400"
+                                        :images="formData.detailPicFileList" :previewEnabled="true" :imageWidth="150"
+                                        :imageHeight="150"></ImgsRowScroll>
+                                    <u-upload @afterRead="afterReadDetailPic" name="1" multiple :maxCount="10"></u-upload>
+                                </view>
+                            <!-- </view> -->
+                        <!-- </view> -->
                     </u-form-item>
                     <u-form-item label="商品标题" borderBottom>
                         <u--textarea v-model="formData.title" clearable :placeholder="titlePlaceholder" count autoHeight
@@ -120,7 +124,7 @@
                         <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>
-                        <u--input v-model="formData.samePrice" placeholder="请输入" clearable border="none"></u--input>
+                        <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.agentPrice" placeholder="请输入" clearable border="none"></u--input>
@@ -161,7 +165,7 @@
                         <view class="recycle_bottom_desc">
                             <u--textarea v-model="formData.recycleBottomDesc" clearable count autoHeight maxlength="250"
                                 height="100" confirmType="done"></u--textarea>
-                            <view>
+                            <view class="imgs_scroll">
                                 <ImgsRowScroll v-if="formData.recycleBottomPicList.length > 0" :isShowDeleteIcon="true"
                                     @deleteImgInfo="getDeleteRecycleBottomPicInfo" imgMode="aspectFill"
                                     :totalWidth="400" :images="formData.recycleBottomPicList" :previewEnabled="true"
@@ -200,12 +204,14 @@
                             border="none"></u--input>
                     </u-form-item>
                     <u-form-item label="保卡图片或独立编码照片留底(仅内部人员可见)" borderBottom>
-                        <ImgsRowScroll v-if="formData.productCardPicFileList.length > 0" :isShowDeleteIcon="true"
-                            @deleteImgInfo="getDeleteProductCardPicInfo" imgMode="aspectFill" :totalWidth="400"
-                            :images="formData.productCardPicFileList" :previewEnabled="true" :imageWidth="150"
-                            :imageHeight="150"></ImgsRowScroll>
-                        <u-upload @afterRead="afterReadProductCardPic" name="3" multiple :maxCount="9"
-                            :previewFullImage="true"></u-upload>
+                        <view class="imgs_scroll">
+                            <ImgsRowScroll v-if="formData.productCardPicFileList.length > 0" :isShowDeleteIcon="true"
+                                @deleteImgInfo="getDeleteProductCardPicInfo" imgMode="aspectFill" :totalWidth="400"
+                                :images="formData.productCardPicFileList" :previewEnabled="true" :imageWidth="150"
+                                :imageHeight="150"></ImgsRowScroll>
+                            <u-upload @afterRead="afterReadProductCardPic" name="3" multiple :maxCount="9"
+                                :previewFullImage="true"></u-upload>
+                        </view>
                     </u-form-item>
                     <u-form-item label="商品标签" class="u-form-item-row" borderBottom>
                         <u--input v-model="formData.productTag" placeholder="请输入" clearable border="none"></u--input>
@@ -218,7 +224,7 @@
                         <view class="recycle_bottom_desc">
                             <u--textarea v-model="formData.productDesc" clearable count autoHeight maxlength="250"
                                 height="100" confirmType="done"></u--textarea>
-                            <view>
+                            <view class="imgs_scroll">
                                 <ImgsRowScroll v-if="formData.productDescPicFileList.length > 0"
                                     :isShowDeleteIcon="true" @deleteImgInfo="getDeleteProductDescPicInfo"
                                     imgMode="aspectFill" :totalWidth="400" :images="formData.productDescPicFileList"
@@ -337,36 +343,7 @@ export default {
             },
             recycleTimeShow: false,
             titlePlaceholder: '如不填，自动截取商品描述前50字',
-            typeList: [
-                {
-                    name: '腕表',
-                    value: '1',
-                },
-                {
-                    name: '箱包',
-                    value: '2',
-                },
-                {
-                    name: '珠宝',
-                    value: '3',
-                },
-                {
-                    name: '鞋靴',
-                    value: '4',
-                },
-                {
-                    name: '配饰',
-                    value: '5',
-                },
-                {
-                    name: '服饰',
-                    value: '6',
-                },
-                {
-                    name: '其他',
-                    value: '7',
-                },
-            ],
+            typeList: [],
             productConditionList: [
                 {
                     name: '闲置未使用',
@@ -471,7 +448,15 @@ export default {
 
         }
     },
+    onLoad() {
+        this.getTypeList();
+    },
     methods: {
+        getTypeList(){
+            this.$getDicts("crm_form_category").then(res => {
+                this.typeList = res
+            })
+        },
         // 提交表单
         submitForm(submitType) {
             this.$refs.addForm.validate().then((valid) => {
@@ -479,11 +464,14 @@ export default {
                     if (this.formData.title == '') {
                         this.formData.title = this.formData.desc.substring(0, 50);
                     }
+                    this.formData.recycleTime = this.$dayjs(this.formData.recycleTime).format('YYYY-MM-DD')
                     const data = {
                         ...this.formData,
                         submitType: submitType, //提交类型 onlyIn：仅入库 inAndUp：入库并上架
                         continuousWarehousing: this.continuousWarehousing[0] || '0',//是否连续入库 1：是 0：否
                     }
+                    console.log(data);
+                    
                     uni.$u.api.wareHouseAdd(data).then(res => {
                         console.log(res);
                         if (res.code === 200) {
@@ -597,7 +585,6 @@ export default {
         // 商品分类
         handleTabChangeType(e) {
             this.formData.type = e;
-            console.log(e, this.formData.type);
             this.$refs.addForm.validateField('type')
         },
         // 商品成色

pages/wareHouse/components/detail.vue

@@ -66,26 +66,26 @@
             </view>
             <view class="info_row">
                 <view class="info_label">独立编码</view>
-                <view class="info_value code" @click.stop="toggleEditField('code', coreInfo.code)">
-                    <u-input v-if="editMode.code" v-model="tempValues.code" :autoFocus="true"
-                        @blur="!globalEditMode && saveEditField('code', tempValues.code, 'code')" />
-                    <span v-else>{{ coreInfo.code || '-' }}</span>
+                <view class="info_value code" @click.stop="toggleEditField('indentifyCode', coreInfo.indentifyCode)">
+                    <u-input v-if="editMode.indentifyCode" v-model="tempValues.indentifyCode" :autoFocus="true"
+                        @blur="!globalEditMode && saveEditField('indentifyCode', tempValues.indentifyCode, 'indentifyCode')" />
+                    <span v-else>{{ coreInfo.indentifyCode || '-' }}</span>
                 </view>
             </view>
             <view class="info_row">
                 <view class="info_label">入库日期</view>
-                <view class="info_value">{{ coreInfo.warehouseDate || '-' }}</view>
+                <view class="info_value">{{ coreInfo.createTime || '-' }}</view>
             </view>
             <view class="info_row">
                 <view class="info_label">付款方式</view>
-                <view class="info_value">{{ coreInfo.payType || '-' }}</view>
+                <view class="info_value">{{ payTypeFormatter(coreInfo.payType) }}</view>
             </view>
             <view class="info_row col">
                 <view class="info_label">备注信息</view>
-                <view class="info_value note" @click.stop="toggleEditField('note', coreInfo.note)">
-                    <textarea v-if="editMode.note" v-model="tempValues.note" :autoFocus="true" rows="3"
-                        @blur="!globalEditMode && saveEditField('note', tempValues.note, 'note')" />
-                    <span v-else>{{ coreInfo.note || '-' }}</span>
+                <view class="info_value note" @click.stop="toggleEditField('desc', coreInfo.desc)">
+                    <textarea v-if="editMode.desc" v-model="tempValues.desc" :autoFocus="true" rows="3"
+                        @blur="!globalEditMode && saveEditField('desc', tempValues.desc, 'desc')" />
+                    <span v-else>{{ coreInfo.desc || '-' }}</span>
                 </view>
             </view>
         </view>
@@ -95,21 +95,21 @@
             <view class="section_title">财务与价格</view>
             <view class="price_group">
                 <view class="price_item">
-                    <view class="price_label">原始成本</view>
+                    <view class="price_label">总成本价</view>
                     <view class="price_value original"
-                        @click.stop="toggleEditField('originalCost', coreInfo.originalCost)">
-                        <u-input v-if="editMode.originalCost" v-model="tempValues.originalCost" :autoFocus="true"
-                            @blur="!globalEditMode && saveEditField('originalCost', tempValues.originalCost, 'originalCost')" />
-                        <span v-else>￥{{ coreInfo.originalCost || '-' }}</span>
+                        @click.stop="toggleEditField('costPrice', coreInfo.costPrice)">
+                        <u-input v-if="editMode.costPrice" v-model="tempValues.costPrice" :autoFocus="true"
+                            @blur="!globalEditMode && saveEditField('costPrice', tempValues.costPrice, 'costPrice')" />
+                        <span v-else>￥{{ coreInfo.costPrice || '-' }}</span>
                     </view>
                 </view>
                 <view class="price_item">
-                    <view class="price_label">附加成本</view>
+                    <view class="price_label">同行价格</view>
                     <view class="price_value additional"
-                        @click.stop="toggleEditField('additionalCost', coreInfo.additionalCost)">
-                        <u-input v-if="editMode.additionalCost" v-model="tempValues.additionalCost" :autoFocus="true"
-                            @blur="!globalEditMode && saveEditField('additionalCost', tempValues.additionalCost, 'additionalCost')" />
-                        <span v-else>￥{{ coreInfo.additionalCost || '-' }}</span>
+                        @click.stop="toggleEditField('peerPrice', coreInfo.peerPrice)">
+                        <u-input v-if="editMode.peerPrice" v-model="tempValues.peerPrice" :autoFocus="true"
+                            @blur="!globalEditMode && saveEditField('peerPrice', tempValues.peerPrice, 'peerPrice')" />
+                        <span v-else>￥{{ coreInfo.peerPrice || '-' }}</span>
                     </view>
                 </view>
             </view>
@@ -123,32 +123,42 @@
                     </view>
                 </view>
                 <view class="price_item">
-                    <view class="price_label">建议售价</view>
+                    <view class="price_label">销售价格</view>
                     <view class="price_value suggested"
-                        @click.stop="toggleEditField('suggestedPrice', coreInfo.suggestedPrice)">
-                        <u-input v-if="editMode.suggestedPrice" v-model="tempValues.suggestedPrice" :autoFocus="true"
-                            @blur="!globalEditMode && saveEditField('suggestedPrice', tempValues.suggestedPrice, 'suggestedPrice')" />
-                        <span v-else>￥{{ coreInfo.suggestedPrice || '-' }}</span>
+                        @click.stop="toggleEditField('salePrice', coreInfo.salePrice)">
+                        <u-input v-if="editMode.price" v-model="tempValues.salePrice" :autoFocus="true"
+                            @blur="!globalEditMode && saveEditField('salePrice', tempValues.salePrice, 'salePrice')" />
+                        <span v-else>￥{{ coreInfo.salePrice || '-' }}</span>
                     </view>
                 </view>
             </view>
+            <view class="price_group">
+                <view class="price_item">
+                    <view class="price_label">官方指导价</view>
+                    <view class="price_value original" @click.stop="toggleEditField('price', coreInfo.price)">
+                        <u-input v-if="editMode.price" v-model="tempValues.price" :autoFocus="true"
+                            @blur="!globalEditMode && saveEditField('price', tempValues.price, 'price')" />
+                        <span v-else>￥{{ coreInfo.price || '-' }}</span>
+                    </view>
+                </view>
+                <view class="price_item"></view>
+            </view>
         </view>
 
         <!-- 溯源与位置区域 -->
-        <view class="traceability_location">
+        <view class="traceability_productPosition">
             <view class="section_title">溯源与位置</view>
             <view class="info_row">
                 <view class="info_label">商品位置</view>
-                <view class="info_value" @click.stop="toggleEditField('location', coreInfo.location)">
-                    <u-input v-if="editMode.location" v-model="tempValues.location" :autoFocus="true"
-                        @blur="!globalEditMode && saveEditField('location', tempValues.location, 'location')" />
-                    <span v-else>{{ coreInfo.location || '-' }}</span>
+                <view class="info_value" @click.stop="toggleEditField('productPosition', coreInfo.productPosition)">
+                    <u-input v-if="editMode.productPosition" v-model="tempValues.productPosition" :autoFocus="true"
+                        @blur="!globalEditMode && saveEditField('productPosition', tempValues.productPosition, 'productPosition')" />
+                    <span v-else>{{ coreInfo.productPosition || '-' }}</span>
                 </view>
             </view>
             <view class="info_row">
                 <view class="info_label">回收人员</view>
                 <view class="info_value" @click.stop="showRecyclePersonPicker">
-                    <!-- <u-input v-if="editMode.recyclePerson" v-model="tempValues.recyclePerson" :autoFocus="true" @blur="!globalEditMode && saveEditField('recyclePerson', tempValues.recyclePerson, 'recyclePerson')" /> -->
                     <span>{{ coreInfo.recyclePerson || '-' }}</span>
                     <personPicker ref="recyclePersonPickerRef" title="请选择回收人员"
                         @selectPerson="handleSelectRecyclePerson">
@@ -158,7 +168,6 @@
             <view class="info_row">
                 <view class="info_label">鉴定人员</view>
                 <view class="info_value" @click.stop="showIdentifyingPersonPicker">
-                    <!-- <u-input v-if="editMode.identifyingPerson" v-model="tempValues.identifyingPerson" :autoFocus="true" @blur="!globalEditMode && saveEditField('identifyingPerson', tempValues.identifyingPerson, 'identifyingPerson')" /> -->
                     <span>{{ coreInfo.identifyingPerson || '-' }}</span>
                     <personPicker ref="identifyingPersonPickerRef" title="请选择鉴定人员"
                         @selectPerson="handleSelectIdentifyingPerson"></personPicker>
@@ -220,13 +229,14 @@ export default {
             // 编辑状态管理
             editMode: {
                 model: false,
-                code: false,
-                note: false,
-                originalCost: false,
-                additionalCost: false,
+                indentifyCode: false,
+                desc: false,
+                costPrice: false,
+                peerPrice: false,
                 agentPrice: false,
-                suggestedPrice: false,
-                location: false,
+                salePrice: false,
+                price: false,
+                productPosition: false,
             },
             // 全局编辑模式
             globalEditMode: false,
@@ -247,6 +257,24 @@ export default {
         this.getGoodsDetail();
     },
     methods: {
+        payTypeFormatter(val){
+            switch (val) {
+                case '1':
+                    return '微信'
+                case '2':
+                    return '支付宝'
+                case '3':
+                    return '银行卡'
+                case '4':
+                    return '现金'
+                case '5':
+                    return '数字货币'
+                case '6':
+                    return '挂账'
+                default:
+                    return '-'
+            }
+        },
         // 锁单
         lockGoods() {
             uni.$u.api.wareHouseLock({
@@ -296,7 +324,7 @@ export default {
                 userId: this.$store.state.user.userInfo.userId,
             }).then(res => {
                 this.coreInfo = res.data;
-                this.imgsUrl = res.data.imgsUrl || [];
+                this.imgsUrl = res.data.goodPicFileList || [];
                 this.lockStatus = res.data.lockStatus;
                 this.downStatus = res.data.downStatus;
             });
@@ -316,11 +344,11 @@ export default {
                 dictLabel: this.coreInfo.dictLabel,
                 dictValue: this.coreInfo.dictValue,
                 model: this.coreInfo.model,
-                totalCost: Number(this.coreInfo.originalCost) + Number(this.coreInfo.additionalCost),
-                suggestedPrice: this.coreInfo.suggestedPrice,
+                agentPrice: this.coreInfo.agentPrice,
+                price: this.coreInfo.price,
                 recyclePerson: this.coreInfo.recyclePerson,
                 recyclePersonId: this.coreInfo.recyclePersonId,
-                warehouseDate: this.coreInfo.warehouseDate,
+                createTime: this.coreInfo.createTime,
             }
             uni.navigateTo({
                 url: '/pages/wareHouse/components/openOrder?params=' + JSON.stringify(params),
@@ -338,6 +366,13 @@ export default {
 
         // 立即下架按钮
         handleOffShelf() {
+            if (this.lockStatus === '1') {
+                uni.showToast({
+                    title: '已锁单，不能下架',
+                    icon: 'none'
+                })
+                return
+            }
             uni.$u.api.wareHouseDown({
                 id: this.goodsId,
                 downStatus: this.downStatus === '1' ? '0' : '1',
@@ -375,13 +410,14 @@ export default {
             // 设置所有可编辑字段为编辑状态
             this.editMode = {
                 model: true,
-                code: true,
-                note: true,
-                originalCost: true,
-                additionalCost: true,
+                indentifyCode: true,
+                desc: true,
+                costPrice: true,
+                peerPrice: true,
                 agentPrice: true,
-                suggestedPrice: true,
-                location: true,
+                salePrice: true,
+                price: true,
+                productPosition: true,
             };
             // 保存所有字段的临时值
             this.tempValues = { ...this.coreInfo }
@@ -395,19 +431,20 @@ export default {
         submitEdit(info) {
             const data = {
                 id: this.goodsId,
-                imgsUrl: this.imgsUrl,
+                goodPicFileList: this.imgsUrl,
                 dictLabel: info.dictLabel,
                 dictValue: info.dictValue,
                 model: info.model,
-                code: info.code,
-                warehouseDate: info.warehouseDate,
+                indentifyCode: info.indentifyCode,
+                createTime: info.createTime,
                 payType: info.payType,
-                note: info.note,
-                originalCost: info.originalCost,
-                additionalCost: info.additionalCost,
+                desc: info.desc,
+                costPrice: info.costPrice,
+                peerPrice: info.peerPrice,
                 agentPrice: info.agentPrice,
-                suggestedPrice: info.suggestedPrice,
-                location: info.location,
+                salePrice: info.salePrice,
+                price: info.price,
+                productPosition: info.productPosition,
                 recyclePerson: info.recyclePerson,
                 recyclePersonId: info.recyclePersonId,
                 identifyingPerson: info.identifyingPerson,

pages/wareHouse/components/openOrder.vue

@@ -3,7 +3,7 @@
       <u-navbar class="nav-bar" title="销售业务开单" :autoBack="true" :placeholder="true" v-hideNav></u-navbar>
       <view class="open_order_content">
          <view class="header">
-            <image class="header_img" :src="openOrderForm.url" alt=""></image>
+            <image class="header_img" :src="openOrderForm.url || '/static/no-img.png'" alt=""></image>
             <view class="header_box">
                <view class="title">
                   {{ openOrderForm.dictLabel }} | {{ openOrderForm.model }}
@@ -11,29 +11,29 @@
                <view class="header_detail_box">
                   <view class="total_cost">
                      <view class="total_cost_title">系统总成本</view>
-                     <view class="total_cost_price">￥{{ openOrderForm.totalCost }}</view>
+                     <view class="total_cost_price">￥{{ openOrderForm.agentPrice }}</view>
                   </view>
                   <view class="advice_price">
                      <view class="advice_price_title">建议标价</view>
-                     <view class="advice_price_price">￥{{ openOrderForm.suggestedPrice }}</view>
+                     <view class="advice_price_price">￥<u--input v-model="openOrderForm.price" placeholder="请输入建议标价" border="none" type="number"></u--input></view>
                   </view>
                </view>
             </view>
          </view>
          <u--form labelPosition="top" :model="openOrderForm" :rules="rules" ref="openOrderForm" label-width="200rpx">
             <view class="card_item">
-               <u-form-item label="成交金额" required prop="price">
-                  ￥<u--input v-model="openOrderForm.price" border="none" type="number"></u--input>
+               <u-form-item label="成交金额" required prop="dealPrice">
+                  ￥<u--input v-model="openOrderForm.dealPrice" placeholder="请输入成交金额" border="none" type="number"></u--input>
                </u-form-item>
             </view>
             <view class="card_item">
                <u-form-item label="开单数量">
-                  <u-number-box v-model="openOrderForm.quantity"></u-number-box>
+                  <u-number-box v-model="openOrderForm.quantity" button-size="26"></u-number-box>
                </u-form-item>
             </view>
             <view class="card_item">
                <u-form-item label="订单类型">
-                  <TabSelect :tabList="tabList" mode="single" :colNum="4" :defaultIndex="1"
+                  <TabSelect :tabList="orderTypeList" mode="single" :colNum="4" :defaultIndex="1" labelKey="dictLabel" valueKey="dictValue"
                      @tabChange="changeOrderType">
                   </tabSelect>
                </u-form-item>
@@ -48,8 +48,8 @@
                   </view>
                   <view class="sales_person_box" @click="dateShow = true">
                      <u-icon name="calendar" size="36rpx" color="#374151"></u-icon>
-                     <view class="text">{{ openOrderForm.warehouseDate }}</view>
-                     <u-datetime-picker :show="dateShow" v-model="openOrderForm.warehouseDate" mode="date" @confirm="confirmDate"
+                     <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>
                   </view>
 
@@ -71,11 +71,13 @@
             </view>
             <view class="card_item">
                <u-form-item label="支付凭证上传">
-                  <ImgsRowScroll v-if="payTypeProofPicFileList.length > 0" :isShowDeleteIcon="true"
-                     @deleteImgInfo="getDeleteGoodPicInfo" imgMode="aspectFill" :totalWidth="400"
-                     :images="payTypeProofPicFileList" :previewEnabled="true" :imageWidth="150" :imageHeight="150">
-                  </ImgsRowScroll>
-                  <u-upload @afterRead="afterReadpayTypeProofPic" name="1" multiple :maxCount="10"></u-upload>
+                  <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>
+                     <u-upload @afterRead="afterReadpayTypeProofPic" name="1" multiple :maxCount="10"></u-upload>
+                  </view>
                </u-form-item>
             </view>
             <view class="card_item">
@@ -93,7 +95,7 @@
       <view class="bottom_box">
          <view class="bottom_box_item">
             <view class="bottom_box_item_title">实收总计</view>
-            <view class="bottom_box_item_price">￥{{ openOrderForm.price * openOrderForm.quantity || 0 }}</view>
+            <view class="bottom_box_item_price">￥{{ openOrderForm.dealPrice * openOrderForm.quantity || 0 }}</view>
          </view>
          <u-button color="#3c9cff" type="primary" @click="submitForm" icon="checkmark">确认开单</u-button>
       </view>
@@ -113,45 +115,24 @@ export default {
       return {
          payTypeProofPicFileList: [],
          openOrderForm: {
-            // url: '',
-            // dictLabel: '',
-            // dictValue: '',
-            // model: '',
-            // totalCost: '',
-            // suggestedPrice: '',
-            // price: null,
-            // quantity: 1,
-            // recyclePerson: '',
-            // recyclePersonId: '',
-            // orderType: [],
-            // warehouseDate: '',
-            // payTypeTab: 1,
-            // afterSaleTab: [],
-            // remark: '',
-            // address: '',
+            url: '',
+            dictLabel: '',
+            dictValue: '',
+            model: '',
+            agentPrice: '',
+            price: null,
+            dealPrice: null,
+            quantity: 1,
+            recyclePerson: '',
+            recyclePersonId: '',
+            orderType: '',
+            orderDate: this.$dayjs().format('YYYY-MM-DD'),
+            payTypeTab: 1,
+            afterSaleTab: [],
+            remark: '',
+            address: '',
          },
-         tabList: [
-            {
-               name: '零售',
-               value: 1,
-            },
-            {
-               name: '寄卖',
-               value: 2,
-            },
-            {
-               name: '同行',
-               value: 3,
-            },
-            {
-               name: '退货',
-               value: 4,
-            },
-            {
-               name: '质押',
-               value: 5,
-            },
-         ],
+         orderTypeList: [],
          payTypeTabList: [
             {
                name: '微信',
@@ -201,7 +182,7 @@ export default {
             },
          ],
          rules: {
-            price: [
+            dealPrice: [
                { required: true, message: '请输入成交金额', trigger: ['blur'] },
             ],
          },
@@ -211,14 +192,19 @@ export default {
    onLoad() {
       const params = this.$route.query.params
       if (params) {
-         // this.openOrderForm = 
          this.openOrderForm.quantity = 1
          Object.keys(JSON.parse(params)).forEach(key => {
             this.openOrderForm[key] = JSON.parse(params)[key]
          })
+         this.getOrderTypeList()
       }
    },
    methods: {
+      getOrderTypeList() {
+         this.$getDicts("crm_sendOrder_type").then(res => {
+            this.orderTypeList = res
+         })
+      },
       changeOrderType(val) {
          this.openOrderForm.orderType = val
       },
@@ -235,13 +221,15 @@ export default {
       handleSelectRecyclePerson(person) {
          this.openOrderForm.recyclePerson = person.label
          this.openOrderForm.recyclePersonId = person.id
+         console.log(this.openOrderForm);
+         
       },
       handleClickOutside() {
          this.personShow = false
       },
       confirmDate(val) {
          this.$nextTick(() => {
-            this.openOrderForm.warehouseDate = this.$dayjs(val.value).format('YYYY-MM-DD');
+            this.openOrderForm.orderDate = this.$dayjs(val.value).format('YYYY-MM-DD');
          })
          this.dateShow = false
       },
@@ -267,7 +255,7 @@ export default {
                const data = {
                   ...this.openOrderForm,
                   payTypeProofPicFileList: this.payTypeProofPicFileList,
-                  amountReceived: Number(this.openOrderForm.price) * Number(this.openOrderForm.quantity),
+                  amountReceived: Number(this.openOrderForm.dealPrice) * Number(this.openOrderForm.quantity),
                }
                uni.$u.api.wareHouseOpenOrder(data).then(res => {
                   if (res.code === 200) {

pages/wareHouse/index.vue

@@ -34,7 +34,7 @@
 			</view>
 
 			<view class="category-tabs-wrap">
-				<u-tabs :list="tabList" :is-scroll="true" active-color="#007aff" inactive-color="#666666" font-size="28rpx"
+				<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>
 
@@ -61,12 +61,13 @@
 			<scroll-view class="goods-list" scroll-y @scrolltolower="handleLoadMore" enable-back-to-top>
 				<view @click="handleToDetail(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" mode="aspectFill" lazy-load></image>
+						<image class="goods-img" :src="goods.goodPicFileList[0] ? goods.goodPicFileList[0] : '/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="goods-info">
-						<text class="goods-brand">{{ goods.name || '' }}</text>
+						<text class="goods-brand">{{ goods.dictLabel || '' }}</text>
 						<text class="goods-name">{{ goods.model || '' }}</text>
 
 						<view class="price-group">
@@ -77,7 +78,7 @@
 								</view>
 								<view class="price-item">
 									<text class="price-type">销售价</text>
-									<text class="price sales">¥{{ priceVisible ? goods.salesPrice || '-' : '****' }}</text>
+									<text class="price sales">¥{{ priceVisible ? goods.salePrice || '-' : '****' }}</text>
 								</view>
 							</view>
 							<view class="price-items">
@@ -92,11 +93,11 @@
 							</view>
 						</view>
 
-						<view class="others">
+						<!-- <view class="others">
 							<view class="other-item stock" >得</view>
 							<view class="other-item">得</view>
 							<view class="other-item">得</view>
-						</view>
+						</view> -->
 					</view>
 					<view class="more">
 						<view></view>
@@ -127,7 +128,7 @@ export default {
 	data() {
 		return {
 			searchString:'',//搜索编号、名称、品牌...
-			category:1,
+			type:'',
 			searchInfo:{},
 			pageNum:1,
 			pageSize:10,
@@ -141,16 +142,7 @@ export default {
 				outStockToday: '-',
 				totalNum: '-'
 			},
-			tabList: [
-				{ name: "全部", id: 1 },
-				{ name: "腕表", id: 2 },
-				{ name: "箱包", id: 3 },
-				{ name: "珠宝", id: 4 },
-				{ name: "鞋靴", id: 5 },
-				{ name: "配饰", id: 6 },
-				{ name: "服饰", id: 7 },
-				{ name: "其它", id: 8 }
-			],
+			tabList: [],
 			goodsList: [
 				// {
 				// 	id:'123456754',//商品库存id
@@ -201,7 +193,16 @@ export default {
 			total:0
 		};
 	},
+	onLoad() {
+		this.getTypeList();
+	},
 	methods: {
+		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=>{
@@ -220,7 +221,7 @@ export default {
 			{
 				searchString:this.searchString,
 				sortType:this.curSortType.id,
-				category:this.category,
+				type:this.type,
 				...this.searchInfo
 			}).then(res => {
 				if(this.pageNum == 1){
@@ -248,7 +249,7 @@ export default {
 			this.getList();
 		},
 		switchTab(item) {
-			this.category = item.id;
+			this.type = item.dictValue;
 			this.handleSearch();
 		},
 		handleToDetail(item) {

pages/wareHouse/styles/add.scss

@@ -19,6 +19,11 @@
                 font-size:24rpx;
             }
         }
+        .imgs_scroll{
+            width: calc(100vw - 80rpx);
+            display: flex;
+            gap: 20rpx;
+        }
     }
 }
 

pages/wareHouse/styles/detail.scss

@@ -234,8 +234,8 @@
         }
         
         .price_group {
-            display: flex;
-            justify-content: space-between;
+            display: grid;
+            grid-template-columns: 1fr 1fr;
             margin-bottom: 24rpx;
             
             &:last-child {
@@ -287,7 +287,7 @@
     }
     
     // 溯源与位置区域样式
-    .traceability_location {
+    .traceability_productPosition {
         background-color: #ffffff;
         margin: 20rpx;
         padding: 30rpx;

pages/wareHouse/styles/openOrder.scss

@@ -40,8 +40,8 @@
                 }
 
                 .header_detail_box {
-                    display: flex;
-                    justify-content: space-between;
+                    display: grid;
+                    grid-template-columns: 1fr 1fr;
                     align-items: center;
                     padding: 20rpx 0;
                     width: 100%;
@@ -79,9 +79,15 @@
                         }
 
                         .advice_price_price {
+                            display: flex;
+                            align-items: center;
                             color: #d0a10d;
                             font-size: 30rpx;
                             font-weight: 600;
+                            ::v-deep .uni-input-input {
+                                width: 100rpx;
+                                color: #d0a10d;
+                            }
                         }
                     }
                 }
@@ -117,6 +123,11 @@
                     .uni-input-wrapper {
                         font-size: 40rpx;
                     }
+                    .imgs_scroll{
+                        width: calc(100vw - 80rpx);
+                        display: flex;
+                        gap: 20rpx;
+                    }
                 }
             }
 

utils/api.js

@@ -123,7 +123,9 @@ const install = (Vue, vm) => {
 		getPersonLatestClue:(params)=>http.get(store.state.user.path+'/personCenter/getPersonLatestClue',{ params }),//个人中心-获取最新线索
 		getPersonRanking:(params)=>http.get(store.state.user.path+'/personCenter/getPersonRanking',{ params }),//个人中心-获取个人排名
 		getWareHouseCard:(params)=>http.get(store.state.user.path+'/warehouse/getWareHouseCard',{ params }),//仓库中心-获取仓库信息
-		addInquiry:(data)=>http.post(store.state.user.path+'/inquiryCenter/addInquiry',data),//添加询价
+		inquiryChart:(data)=>http.post(store.state.user.path+'/wareHouse/getPriceChart',data),//询价中心-获取询价图表数据
+		addInquiry:(data)=>http.post(store.state.user.path+'/inquiryCenter/addInquiry',data),//添加/编辑询价 有id是编辑 没有id是添加
+		inquiryDetail:(data)=>http.post(store.state.user.path+'/inquiryCenter/getInquiryDetail',data),//询价详情
 		inquiryVerificationList:(params,data)=>http.post(store.state.user.path+'/inquiryCenter/inquiryVerificationList?' + qs.stringify(params), data),//  询价/核价列表
 		wareHouseList:(params,data)=>http.post(store.state.user.path+'/warehouse/wareHouseList?' + qs.stringify(params), data),//仓库中心-获取仓库列表
 		wareHouseDetail:(params)=>http.get(store.state.user.path+'/warehouse/wareHouseDetail',{ params }),//仓库中心-获取仓库详情