feat:仓库新增、开单mock接口

components/custom-tab-select/index.vue

@@ -44,6 +44,10 @@ export default {
       type: [String, Number, Array],
       default: ""
     },
+    isClear: {
+      type: Boolean,
+      default: false
+    }
   },
   computed: {
     isMultiple() {
@@ -97,6 +101,15 @@ export default {
         }
       },
       immediate: true
+    },
+    isClear: {
+      handler(val) {
+        if (val) {
+          this.activeValue = '';
+          this.activeValues = [];
+        }
+      },
+      immediate: true
     }
   },
   methods: {

components/person-picker/index.vue

@@ -30,8 +30,8 @@ export default {
         this.columns = [];
         this.show = false;
     },
-    recyclePersonConfirm({ columnIndex, value, values }) {
-        this.$emit('selectPerson', value[value.length -1]);
+    recyclePersonConfirm({ columnIndex, value, values,index }) {
+        this.$emit('selectPerson', value[value.length - 1] ? value[value.length - 1] : value[value.length - 2]);
         this.close();
     },
     recyclePersonChange(e) {

mock/mockData.js

@@ -291,11 +291,11 @@ const mockDataList = {
           agentPrice:'12345',//代理价格
           stock:'12345',//库存数量
           imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
-          platform:[]//同步平台，此功能暂时不做，先定义一个字段
-        
+          platform:[],//同步平台，此功能暂时不做，先定义一个字段
+          downStatus:'1',//下架状态 0：已下架 1：已上架
         },
         {
-          id:'',//商品库存id
+          id:'123456754',//商品库存id
           name:'Rolex',//商品名称
           model:'Submariner Date 126610LN',//型号
           costPrice:'12345',//成本价格
@@ -304,11 +304,11 @@ const mockDataList = {
           agentPrice:'12345',//代理价格
           stock:'12345',//库存数量
           imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
-          platform:[]//同步平台，此功能暂时不做，先定义一个字段
-        
+          platform:[],//同步平台，此功能暂时不做，先定义一个字段
+          downStatus:'0',//下架状态 0：已下架 1：已上架
         },
         {
-          id:'',//商品库存id
+          id:'123456754',//商品库存id
           name:'Rolex',//商品名称
           model:'Submariner Date 126610LN',//型号
           costPrice:'12345',//成本价格
@@ -317,11 +317,76 @@ const mockDataList = {
           agentPrice:'12345',//代理价格
           stock:'12345',//库存数量
           imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
-          platform:[]//同步平台，此功能暂时不做，先定义一个字段
-        
+          platform:[],//同步平台，此功能暂时不做，先定义一个字段
+          downStatus:'1',//下架状态 0：已下架 1：已上架
+        },
+        {
+          id:'123456754',//商品库存id
+          name:'Rolex',//商品名称
+          model:'Submariner Date 126610LN',//型号
+          costPrice:'12345',//成本价格
+          salesPrice:'12345',//销售价格
+          peerPrice:'12345',//同行价格
+          agentPrice:'12345',//代理价格
+          stock:'12345',//库存数量
+          imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+          platform:[],//同步平台，此功能暂时不做，先定义一个字段
+          downStatus:'0',//下架状态 0：已下架 1：已上架
+        },
+        {
+          id:'123456754',//商品库存id
+          name:'Rolex',//商品名称
+          model:'Submariner Date 126610LN',//型号
+          costPrice:'12345',//成本价格
+          salesPrice:'12345',//销售价格
+          peerPrice:'12345',//同行价格
+          agentPrice:'12345',//代理价格
+          stock:'12345',//库存数量
+          imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+          platform:[],//同步平台，此功能暂时不做，先定义一个字段
+          downStatus:'1',//下架状态 0：已下架 1：已上架
+        },
+        {
+          id:'123456754',//商品库存id
+          name:'Rolex',//商品名称
+          model:'Submariner Date 126610LN',//型号
+          costPrice:'12345',//成本价格
+          salesPrice:'12345',//销售价格
+          peerPrice:'12345',//同行价格
+          agentPrice:'12345',//代理价格
+          stock:'12345',//库存数量
+          imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+          platform:[],//同步平台，此功能暂时不做，先定义一个字段
+          downStatus:'1',//下架状态 0：已下架 1：已上架
+        },
+        {
+          id:'123456754',//商品库存id
+          name:'Rolex',//商品名称
+          model:'Submariner Date 126610LN',//型号
+          costPrice:'12345',//成本价格
+          salesPrice:'12345',//销售价格
+          peerPrice:'12345',//同行价格
+          agentPrice:'12345',//代理价格
+          stock:'12345',//库存数量
+          imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+          platform:[],//同步平台，此功能暂时不做，先定义一个字段
+          downStatus:'1',//下架状态 0：已下架 1：已上架
+        },
+        {
+          id:'123456754',//商品库存id
+          name:'Rolex',//商品名称
+          model:'Submariner Date 126610LN',//型号
+          costPrice:'12345',//成本价格
+          salesPrice:'12345',//销售价格
+          peerPrice:'12345',//同行价格
+          agentPrice:'12345',//代理价格
+          stock:'12345',//库存数量
+          imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+          platform:[],//同步平台，此功能暂时不做，先定义一个字段
+          downStatus:'1',//下架状态 0：已下架 1：已上架
         },
         {
-          id:'',//商品库存id
+          id:'123456754',//商品库存id
           name:'Rolex',//商品名称
           model:'Submariner Date 126610LN',//型号
           costPrice:'12345',//成本价格
@@ -330,10 +395,11 @@ const mockDataList = {
           agentPrice:'12345',//代理价格
           stock:'12345',//库存数量
           imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
-          platform:[]//同步平台，此功能暂时不做，先定义一个字段
+          platform:[],//同步平台，此功能暂时不做，先定义一个字段
+          downStatus:'1',//下架状态 0：已下架 1：已上架
         },
         {
-          id:'',//商品库存id
+          id:'123456754',//商品库存id
           name:'Rolex',//商品名称
           model:'Submariner Date 126610LN',//型号
           costPrice:'12345',//成本价格
@@ -342,10 +408,11 @@ const mockDataList = {
           agentPrice:'12345',//代理价格
           stock:'12345',//库存数量
           imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
-          platform:[]//同步平台，此功能暂时不做，先定义一个字段
+          platform:[],//同步平台，此功能暂时不做，先定义一个字段
+          downStatus:'1',//下架状态 0：已下架 1：已上架
         },
         {
-          id:'',//商品库存id
+          id:'123456754',//商品库存id
           name:'Rolex',//商品名称
           model:'Submariner Date 126610LN',//型号
           costPrice:'12345',//成本价格
@@ -354,10 +421,11 @@ const mockDataList = {
           agentPrice:'12345',//代理价格
           stock:'12345',//库存数量
           imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
-          platform:[]//同步平台，此功能暂时不做，先定义一个字段
+          platform:[],//同步平台，此功能暂时不做，先定义一个字段
+          downStatus:'1',//下架状态 0：已下架 1：已上架
         },
         {
-          id:'',//商品库存id
+          id:'123456754',//商品库存id
           name:'Rolex',//商品名称
           model:'Submariner Date 126610LN',//型号
           costPrice:'12345',//成本价格
@@ -366,10 +434,11 @@ const mockDataList = {
           agentPrice:'12345',//代理价格
           stock:'12345',//库存数量
           imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
-          platform:[]//同步平台，此功能暂时不做，先定义一个字段
+          platform:[],//同步平台，此功能暂时不做，先定义一个字段
+          downStatus:'1',//下架状态 0：已下架 1：已上架
         },
         {
-          id:'',//商品库存id
+          id:'123456754',//商品库存id
           name:'Rolex',//商品名称
           model:'Submariner Date 126610LN',//型号
           costPrice:'12345',//成本价格
@@ -378,10 +447,11 @@ const mockDataList = {
           agentPrice:'12345',//代理价格
           stock:'12345',//库存数量
           imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
-          platform:[]//同步平台，此功能暂时不做，先定义一个字段
+          platform:[],//同步平台，此功能暂时不做，先定义一个字段
+          downStatus:'1',//下架状态 0：已下架 1：已上架
         },
         {
-          id:'',//商品库存id
+          id:'123456754',//商品库存id
           name:'Rolex',//商品名称
           model:'Submariner Date 126610LN',//型号
           costPrice:'12345',//成本价格
@@ -390,10 +460,11 @@ const mockDataList = {
           agentPrice:'12345',//代理价格
           stock:'12345',//库存数量
           imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
-          platform:[]//同步平台，此功能暂时不做，先定义一个字段
+          platform:[],//同步平台，此功能暂时不做，先定义一个字段
+          downStatus:'1',//下架状态 0：已下架 1：已上架
         },
         {
-          id:'',//商品库存id
+          id:'123456754',//商品库存id
           name:'Rolex',//商品名称
           model:'Submariner Date 126610LN',//型号
           costPrice:'12345',//成本价格
@@ -402,8 +473,74 @@ const mockDataList = {
           agentPrice:'12345',//代理价格
           stock:'12345',//库存数量
           imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
-          platform:[]//同步平台，此功能暂时不做，先定义一个字段
-        }
+          platform:[],//同步平台，此功能暂时不做，先定义一个字段
+          downStatus:'1',//下架状态 0：已下架 1：已上架
+        },
+        {
+          id:'123456754',//商品库存id
+          name:'Rolex',//商品名称
+          model:'Submariner Date 126610LN',//型号
+          costPrice:'12345',//成本价格
+          salesPrice:'12345',//销售价格
+          peerPrice:'12345',//同行价格
+          agentPrice:'12345',//代理价格
+          stock:'12345',//库存数量
+          imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+          platform:[],//同步平台，此功能暂时不做，先定义一个字段
+          downStatus:'1',//下架状态 0：已下架 1：已上架
+        },
+        {
+          id:'123456754',//商品库存id
+          name:'Rolex',//商品名称
+          model:'Submariner Date 126610LN',//型号
+          costPrice:'12345',//成本价格
+          salesPrice:'12345',//销售价格
+          peerPrice:'12345',//同行价格
+          agentPrice:'12345',//代理价格
+          stock:'12345',//库存数量
+          imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+          platform:[],//同步平台，此功能暂时不做，先定义一个字段
+          downStatus:'1',//下架状态 0：已下架 1：已上架
+        },
+        {
+          id:'123456754',//商品库存id
+          name:'Rolex',//商品名称
+          model:'Submariner Date 126610LN',//型号
+          costPrice:'12345',//成本价格
+          salesPrice:'12345',//销售价格
+          peerPrice:'12345',//同行价格
+          agentPrice:'12345',//代理价格
+          stock:'12345',//库存数量
+          imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+          platform:[],//同步平台，此功能暂时不做，先定义一个字段
+          downStatus:'1',//下架状态 0：已下架 1：已上架
+        },
+        {
+          id:'123456754',//商品库存id
+          name:'Rolex',//商品名称
+          model:'Submariner Date 126610LN',//型号
+          costPrice:'12345',//成本价格
+          salesPrice:'12345',//销售价格
+          peerPrice:'12345',//同行价格
+          agentPrice:'12345',//代理价格
+          stock:'12345',//库存数量
+          imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+          platform:[],//同步平台，此功能暂时不做，先定义一个字段
+          downStatus:'1',//下架状态 0：已下架 1：已上架
+        },
+        {
+          id:'123456754',//商品库存id
+          name:'Rolex',//商品名称
+          model:'Submariner Date 126610LN',//型号
+          costPrice:'12345',//成本价格
+          salesPrice:'12345',//销售价格
+          peerPrice:'12345',//同行价格
+          agentPrice:'12345',//代理价格
+          stock:'12345',//库存数量
+          imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+          platform:[],//同步平台，此功能暂时不做，先定义一个字段
+          downStatus:'1',//下架状态 0：已下架 1：已上架
+        },
       ],
       total: 20,//总条数
     }
@@ -557,7 +694,52 @@ 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
+      series:'',//系列
+      model:'',//型号
+      dialType:'',//机芯类型
+      caseMaterial:'',//表壳材质
+      dialDiameter:'',//表盘直径
+      material:'',//材质
+      size:'',//尺寸
+      yardage:'',//尺码
+      price:'',//官方指导价
+      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:'',//库存数量
+      costPrice:'',//总成本价
+      samePrice:'',//同行价格
+      agentPrice:'',//代理价格
+      salePrice:'',//销售价格
+      productPosition:'',//商品位置
+      watchYear:'',//手表年份
+      identifyingPerson:'',//鉴定人员
+      identifyingPersonId:'',//鉴定人员id
+      recycleType:'1',//回收类型 1-线上 2-同行 3-门店 4-其它
+      recyclePerson:'',//回收人员
+      recyclePersonId:'',//回收人员id
+      recycleBottomDesc:'',//回收留底图描述
+      recycleBottomFileList:['https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg'],//回收留底图
+      recycleTime:'2026-01-06',//回收时间
+      indentifyCode:'',//独立编码
+      targetAudience:'general',// general-通用 man-男 woman-女
+      productCard:'',//商品保卡 has-有 no-无
+      cardYear:'',//保卡年份 如果有商品保卡就有这个字段，如果没有商品保卡，这个字段为空
+      productCardPicFileList:['https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg'],//商品保卡图片留底
+      productTag:'',//商品标签
+      productAttachment:'',//商品附件
+      productDesc:'',//商品备注
+      productDescPicFileList:['https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg'],//商品备注图片
+      payType:'1',//付款方式 1：微信 2：支付宝 3：银行卡 4：现金 5：数字货币 6：挂账
+      submitType:'inAndUp',//提交类型 onlyIn：仅入库 inAndUp：入库并上架
+      continuousWarehousing:'0',//是否连续入库 1：是 0：否
     },
     url: '/prod-api/crm/warehouse/wareHouseAdd',
     delay: 300,
@@ -565,6 +747,37 @@ const mockDataList = {
       code: 200,
       msg: 'success'
     }
+  },
+  // 仓库模块-详情-开单
+  '/warehouse/wareHouseOpenOrder': {
+    method: 'post',
+    data:{
+      id:'',//商品库存id
+      url:'',//商品图片
+      dictLabel:'Rolex',//商品名称
+      dictValue:'12345',//商品名称id
+      model:'',//型号
+      totalCost:'',//总成本价
+      suggestedPrice:'',//建议价格
+      price:'',//成交金额
+      quantity:'',//开单数量
+      orderType:1,//订单类型 1-零售 2-寄卖 3-同行 4-退货 5-质押
+      warehouseDate:'2026-01-06',//开单日期
+      recyclePerson:'',//销售人员
+      recyclePersonId:'',//销售人员id
+      payType:1,//付款方式 1：微信 2：支付宝 3：银行卡 4：现金 5：数字货币 6：挂账
+      afterSaleTab:[1,2],//售后保障配置 多选 1-假一赔三 2-一年质保 3-一年内八折回收 4-送保养一次 5-原厂配件保证
+      payTypeProofPicFileList:['https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg'],//支付凭证上传图片
+      remark:'',//备注
+      address:'',//收货地址
+      amountReceived:'',//实收
+    },
+    url: '/prod-api/crm/warehouse/wareHouseOpenOrder',
+    delay: 300,
+    response: {
+      code: 200,
+      msg: 'success'
+    }
   }
   
 

pages/wareHouse/components/add.vue

@@ -3,8 +3,8 @@
         <view class="add_page">
             <u-navbar class="nav-bar" title="商品入库" :autoBack="true" :placeholder="true" v-hideNav>
                 <view class="u-nav-slot" slot="right">
-                    <u-checkbox-group v-model="checkboxValue" placement="column" @change="checkboxChange">
-                        <u-checkbox label="连续入库" name="continuous"></u-checkbox>
+                    <u-checkbox-group v-model="continuousWarehousing" placement="column">
+                        <u-checkbox label="连续入库" name="1"></u-checkbox>
                     </u-checkbox-group>
                 </view>
             </u-navbar>
@@ -22,12 +22,17 @@
                         </u--textarea>
                         <view class="btn_group_recognition">
                             <u-button text="清除" @click="clearRecognitionContent()"></u-button>
-                            <u-button text="粘贴识别" type="primary" @click="handlePasteRecognition(recognitionContent)"></u-button>
+                            <u-button text="粘贴识别" type="primary"
+                                @click="handlePasteRecognition(recognitionContent)"></u-button>
                         </view>
                     </u-form-item>
                     <u-form-item label="商品图片" required prop="imgs" borderBottom>
-                        <u-upload :fileList="goodPicFileList" @afterRead="afterReadGoodPic" @delete="deleteGoodPic"
-                            name="3" multiple :maxCount="9" :previewFullImage="true"></u-upload>
+                        <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>
                     </u-form-item>
                     <u-form-item label="商品描述（详细的描述让用户更好的了解您的产品）" required prop="desc" borderBottom>
                         <u--textarea v-model="formData.desc" clearable placeholder="95新 WHZ19219H
@@ -36,11 +41,14 @@
                         配件中溯卡" count autoHeight maxlength="250" height="100" confirmType="done"></u--textarea>
                     </u-form-item>
                     <u-form-item label="商品分类" required prop="type" borderBottom>
-                        <TabSelect :tabList="typeList" @tabChange="handleTabChangeType" :colNum="4" mode="single">
+                        <TabSelect :tabList="typeList" :isClear="typeIsClear" @tabChange="handleTabChangeType"
+                            :colNum="4" mode="single">
                         </TabSelect>
                     </u-form-item>
-                    <u-form-item label="品牌" required prop="brand" class="u-form-item-row" borderBottom @click="showBrandList">
-                        <FormSelectToPage :val="formData.brand"></FormSelectToPage>
+                    <u-form-item label="品牌" required prop="dictLabel" class="u-form-item-row" borderBottom
+                        @click="showBrandList">
+                        <FormSelectToPage :val="formData.dictLabel"></FormSelectToPage>
+                        <BrandList ref="brandListRef" @selectedBrand="handleSelectedBrand"></BrandList>
                     </u-form-item>
                     <u-form-item label="系列" class="u-form-item-row" borderBottom>
                         <u--input v-model="formData.series" placeholder="请输入" clearable border="none"></u--input>
@@ -49,7 +57,7 @@
                         <u--input v-model="formData.model" placeholder="请输入" clearable border="none"></u--input>
                     </u-form-item>
                     <u-form-item label="机芯类型" class="u-form-item-row" borderBottom>
-                        <u--input v-model="formData.brand" placeholder="请输入" clearable border="none"></u--input>
+                        <u--input v-model="formData.dialType" placeholder="请输入" clearable border="none"></u--input>
                     </u-form-item>
                     <u-form-item label="表壳材质" class="u-form-item-row" borderBottom>
                         <u--input v-model="formData.caseMaterial" placeholder="请输入" clearable border="none"></u--input>
@@ -70,14 +78,28 @@
                         <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" :colNum="2" mode="single"
-                            @tabChange="handleTabChangeProductCondition"></TabSelect>
+                        <TabSelect :tabList="productConditionList" :isClear="productConditionIsClear"
+                            @tabChange="handleTabChangeProductCondition" :colNum="2" mode="single"></TabSelect>
                     </u-form-item>
                     <u-form-item label="细节图" borderBottom>
-                        <u-upload :fileList="detailVideoFileList" @afterRead="afterReadDeatilVideo"
-                            @delete="deleteDetailVideo" name="2" multiple :maxCount="10" accept="video"></u-upload>
-                        <u-upload :fileList="detailPicFileList" @afterRead="afterReadDetailPic"
-                            @delete="deleteDetailPic" name="1" multiple :maxCount="10"></u-upload>
+                        <view class="detail_pic_container">
+                            <!-- <view>
+                                <text class="tip">视频：</text>
+                                <ImgsRowScroll v-if="formData.detailVideoFileList.length > 0" :isShowDeleteIcon="true"
+                                    @deleteVideoInfo="getDeleteDetailVideoInfo" imgMode="aspectFill" :totalWidth="400"
+                                    :videos="formData.detailVideoFileList" :previewEnabled="true" :imageWidth="150"
+                                    :imageHeight="150" accept="video"></ImgsRowScroll>
+                                <u-upload @afterRead="afterReadDeatilVideo"  name="2" multiple :maxCount="10" accept="video"></u-upload>
+                            </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>
                     </u-form-item>
                     <u-form-item label="商品标题" borderBottom>
                         <u--textarea v-model="formData.title" clearable :placeholder="titlePlaceholder" count autoHeight
@@ -87,8 +109,9 @@
                         <u--input v-model="formData.productNo" placeholder="请输入" clearable border="none"></u--input>
                     </u-form-item>
                     <u-form-item label="商品属性" required prop="productAttribute" borderBottom>
-                        <TabSelect :tabList="productAttributeList" :colNum="4" mode="single"
-                            @tabChange="handleTabChangeProductAttribute"></TabSelect>
+                        <TabSelect :tabList="productAttributeList"  :colNum="4" mode="single"
+                            :isClear="productAttributeIsClear" @tabChange="handleTabChangeProductAttribute">
+                        </TabSelect>
                     </u-form-item>
                     <u-form-item label="库存数量" required prop="stock" class="u-form-item-row" borderBottom>
                         <u--input v-model="formData.stock" placeholder="请输入" clearable border="none"></u--input>
@@ -112,24 +135,37 @@
                     <u-form-item label="手表年份" class="u-form-item-row" borderBottom>
                         <u--input v-model="formData.watchYear" placeholder="请输入" clearable border="none"></u--input>
                     </u-form-item>
-                    <u-form-item label="鉴定人员" class="u-form-item-row" borderBottom>
-                        <u--input v-model="formData.identifyingPerson" placeholder="请输入" clearable
-                            border="none"></u--input>
+                    <u-form-item label="鉴定人员" class="u-form-item-row" borderBottom @click="identifyingPersonClick">
+                        <FormSelectToPage :val="formData.identifyingPerson" :isDelete="true"
+                            @handleClear="clear('identifyingPerson')"></FormSelectToPage>
+                        <PersonPicker ref="identifyingPersonPickerRef" title="请选择鉴定人员"
+                            @selectPerson="handleSelectIdentifyingPerson"></PersonPicker>
                     </u-form-item>
                     <u-form-item label="回收类型" borderBottom>
-                        <TabSelect :tabList="recycleTypeList" :colNum="4" mode="single"
-                            @tabChange="handleTabChangeRecycleType">
+                        <TabSelect :tabList="recycleTypeList" :colNum="4" mode="single" 
+                            :isClear="recycleTypeIsClear" @tabChange="handleTabChangeRecycleType">
                         </TabSelect>
                     </u-form-item>
-                    <u-form-item label="回收人员" class="u-form-item-row" borderBottom>
-                        <u--input v-model="formData.recyclePerson" disabledColor="#fff" disabled clearable border="none"></u--input>
+                    <u-form-item label="回收人员" class="u-form-item-row" borderBottom @click="recyclePersonClick">
+                        <!-- <u--input v-model="formData.recyclePerson" disabledColor="#fff" disabled clearable
+                            border="none"></u--input> -->
+                        <FormSelectToPage :val="formData.recyclePerson" :isDelete="true"
+                            @handleClear="clear('recyclePerson')"></FormSelectToPage>
+                        <PersonPicker ref="recyclePersonPickerRef" title="请选择回收人员"
+                            @selectPerson="handleSelectRecyclePerson"></PersonPicker>
                     </u-form-item>
                     <u-form-item label="回收留底图" borderBottom>
                         <view class="recycle_bottom_desc">
                             <u--textarea v-model="formData.recycleBottomDesc" clearable count autoHeight maxlength="250"
                                 height="100" confirmType="done"></u--textarea>
-                            <u-upload :fileList="recycleBottomFileList" @afterRead="afterReadRecycleBottom"
-                                @delete="deleteRecycleBottom" name="1" multiple :maxCount="1" accept="image"></u-upload>
+                            <view>
+                                <ImgsRowScroll v-if="formData.recycleBottomPicList.length > 0" :isShowDeleteIcon="true"
+                                    @deleteImgInfo="getDeleteRecycleBottomPicInfo" imgMode="aspectFill"
+                                    :totalWidth="400" :images="formData.recycleBottomPicList" :previewEnabled="true"
+                                    :imageWidth="150" :imageHeight="150"></ImgsRowScroll>
+                                <u-upload @afterRead="afterReadRecycleBottom" name="1" multiple :maxCount="1"
+                                    accept="image"></u-upload>
+                            </view>
                         </view>
                     </u-form-item>
                     <u-form-item label="回收时间" required prop="recycleTime" class="u-form-item-row" borderBottom
@@ -162,8 +198,11 @@
                             border="none"></u--input>
                     </u-form-item>
                     <u-form-item label="保卡图片或独立编码照片留底(仅内部人员可见)" borderBottom>
-                        <u-upload :fileList="productCardFileList" @afterRead="afterReadProductCard"
-                            @delete="deleteProductCard" name="3" multiple :maxCount="9"
+                        <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>
                     </u-form-item>
                     <u-form-item label="商品标签" class="u-form-item-row" borderBottom>
@@ -177,13 +216,19 @@
                         <view class="recycle_bottom_desc">
                             <u--textarea v-model="formData.productDesc" clearable count autoHeight maxlength="250"
                                 height="100" confirmType="done"></u--textarea>
-                            <u-upload :fileList="productCardFileList" @afterRead="afterReadProductCard"
-                                @delete="deleteProductCard" name="1" multiple :maxCount="1" accept="image"></u-upload>
+                            <view>
+                                <ImgsRowScroll v-if="formData.productDescPicFileList.length > 0"
+                                    :isShowDeleteIcon="true" @deleteImgInfo="getDeleteProductDescPicInfo"
+                                    imgMode="aspectFill" :totalWidth="400" :images="formData.productDescPicFileList"
+                                    :previewEnabled="true" :imageWidth="150" :imageHeight="150"></ImgsRowScroll>
+                                <u-upload @afterRead="afterReadProductDescPic" name="1" multiple :maxCount="1"
+                                    accept="image"></u-upload>
+                            </view>
                         </view>
                     </u-form-item>
                     <u-form-item label="付款方式" borderBottom>
-                        <TabSelect :tabList="paymentTabList" :echoInfo="payTypeEcho" :colNum="4" mode="single"
-                            @tabChange="handlePaymentTabChange">
+                        <TabSelect :tabList="paymentTabList" :echoInfo="payTypeEcho" :colNum="4" mode="single" 
+                            :isClear="payTypeIsClear" @tabChange="handlePayTypeTabChange">
                         </TabSelect>
                     </u-form-item>
                 </u--form>
@@ -194,31 +239,36 @@
             <u-button plain type="primary" @click="submitForm('onlyIn')">仅入库</u-button>
             <u-button type="primary" @click="submitForm('inAndUp')">入库并上架</u-button>
         </view>
-        <BrandList ref="brandListRef" @selectedBrand="handleSelectedBrand"></BrandList>
     </view>
 </template>
 <script>
 import TabSelect from '@/components/custom-tab-select/index.vue'
 import FormSelectToPage from '@/components/form-select-to-page/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'
+
 export default {
     components: {
         TabSelect,
         FormSelectToPage,
         BrandList,
+        ImgsRowScroll,
+        PersonPicker
     },
     data() {
         return {
             checkboxValue: [],
             recognitionContent: '',
             formData: {
-                imgs: [],
+                goodPicFileList: [],//商品图片
                 desc: '',
                 type: '',
-                brand: '',
-                brandId: '',
+                dictLabel: '',
+                dictValue: '',
                 series: '',
                 model: '',
+                dialType: '',
                 caseMaterial: '',
                 dialDiameter: '',
                 material: '',
@@ -226,6 +276,8 @@ export default {
                 yardage: '',
                 price: '',
                 productCondition: '',
+                detailPicFileList: [],//细节图片
+                // detailVideoFileList:[],
                 productNo: '',
                 stock: null,
                 costPrice: '',
@@ -235,21 +287,27 @@ export default {
                 productPosition: '',
                 watchYear: '',
                 identifyingPerson: '',
+                identifyingPersonId: '',
                 recycleType: '',
                 recyclePerson: '',
+                recyclePersonId: '',
                 recycleBottomDesc: '',
-                recycleTime: null,
+                recycleBottomPicList: [],//回收留底图
+                recycleTime: this.$dayjs().format('YYYY-MM-DD'),
                 indentifyCode: '',
                 targetAudience: '',
                 productCard: '',
                 cardYear: '',
+                productCardPicFileList: [],//商品保卡图片或独立编码照片留底
                 productTag: '',
                 productAttachment: '',
                 productDesc: '',
-                paymentType: '',
+                productDescPicFileList: [],//商品备注图片
+                payType: '',
             },
+            continuousWarehousing: [],//是否连续入库 1：是 0：否
             rules: {
-                imgs: [
+                goodPicFileList: [
                     { required: true, message: '请上传商品图片', trigger: 'blur' },
                 ],
                 desc: [
@@ -258,7 +316,7 @@ export default {
                 type: [
                     { required: true, message: '请选择商品分类', trigger: 'blur' },
                 ],
-                brand: [
+                dictLabel: [
                     { required: true, message: '请选择品牌', trigger: 'blur' },
                 ],
                 productCondition: [
@@ -337,19 +395,19 @@ export default {
             ],
             recycleTypeList: [
                 {
-                    name: '其它',
+                    name: '线上',
                     value: '1',
                 },
                 {
-                    name: '线上',
+                    name: '同行',
                     value: '2',
                 },
                 {
-                    name: '同行',
+                    name: '门店',
                     value: '3',
                 },
                 {
-                    name: '门店',
+                    name: '其它',
                     value: '4',
                 },
             ],
@@ -379,39 +437,127 @@ export default {
                     value: 6,
                 },
             ],
-            brandToUrl: '/pages/wareHouse/components/brandList',
-            // 上传
-            goodPicFileList: [{ url: 'https://uviewui.com/swiper/1.jpg' }],//商品图片
-            detailPicFileList: [],//细节图片
-            detailVideoFileList: [],//细节视频
-            recycleBottomFileList: [],//回收留底图
-            productCardFileList: [],//商品保卡图片或独立编码照片留底
-            productTagFileList: [],//商品标签图片留底
-            payTypeEcho:''//付款方式识别回显
+            typeIsClear: false,//商品分类是否清空
+            productConditionIsClear: false,//商品成色是否清空
+            productAttributeIsClear: false,//商品属性是否清空
+            recycleTypeIsClear: false,//回收类型是否清空
+            payTypeIsClear: false,//付款方式是否清空
+            payTypeEcho: ''//付款方式识别回显
         }
     },
     methods: {
-        handleSelectedBrand(info) {
-            this.formData.brand = info.dictLabel;
-            this.formData.brandId = info.dictValue;
-        },
-        // 显示品牌列表
-        showBrandList() {
-            this.$refs.brandListRef.showBrandList();
-        },
-        submitForm() {
+        // 提交表单
+        submitForm(submitType) {
             this.$refs.addForm.validate().then((valid) => {
                 if (valid) {
-                    console.log('表单校验通过');
+                    if (this.formData.title == '') {
+                        this.formData.title = this.formData.desc.substring(0, 50);
+                    }
+                    const data = {
+                        ...this.formData,
+                        submitType: submitType, //提交类型 onlyIn：仅入库 inAndUp：入库并上架
+                        continuousWarehousing: this.continuousWarehousing[0] || '0',//是否连续入库 1：是 0：否
+                    }
+                    uni.$u.api.wareHouseAdd(data).then(res => {
+                        console.log(res);
+                        if (res.code === 200) {
+                            uni.$u.toast('新增成功');
+                            if (data.continuousWarehousing == '0') {
+                                setTimeout(() => {
+                                    uni.navigateBack({
+                                        delta: 1
+                                    });
+                                }, 1000);
+                            } else {
+                                this.clearForm();
+                            }
+                        } else {
+                            uni.$u.toast(res.msg);
+                        }
+                    })
                 } else {
                     console.log('表单校验不通过');
                 }
             });
         },
-        handleTabChange(e) {
-            console.log(e);
+        clearForm() {
+            this.formData = {
+                goodPicFileList: [],//商品图片
+                desc: '',
+                type: '',
+                dictLabel: '',
+                dictValue: '',
+                series: '',
+                model: '',
+                dialType: '',
+                caseMaterial: '',
+                dialDiameter: '',
+                material: '',
+                size: '',
+                yardage: '',
+                price: '',
+                productCondition: '',
+                detailPicFileList: [],//细节图片
+                // detailVideoFileList:[],
+                productNo: '',
+                stock: null,
+                costPrice: '',
+                samePrice: '',
+                agentPrice: '',
+                salePrice: '',
+                productPosition: '',
+                watchYear: '',
+                identifyingPerson: '',
+                identifyingPersonId: '',
+                recycleType: '',
+                recyclePerson: '',
+                recyclePersonId: '',
+                recycleBottomDesc: '',
+                recycleBottomPicList: [],//回收留底图
+                recycleTime: this.$dayjs().format('YYYY-MM-DD'),
+                indentifyCode: '',
+                targetAudience: '',
+                productCard: '',
+                cardYear: '',
+                productCardPicFileList: [],//商品保卡图片或独立编码照片留底
+                productTag: '',
+                productAttachment: '',
+                productDesc: '',
+                productDescPicFileList: [],//商品备注图片
+                payType: '',
+            }
+            this.typeIsClear = true;
+            this.productConditionIsClear = true;
+            this.productAttributeIsClear = true;
+            this.recycleTypeIsClear = true;
+            this.payTypeIsClear = true;
+            this.continuousWarehousing = [];
+            this.$refs.addForm.resetFields();
+        },
+        // 选择品牌
+        handleSelectedBrand(info) {
+            this.formData.dictLabel = info.dictLabel;
+            this.formData.dictValue = info.dictValue;
+            this.$refs.addForm.validateField('dictLabel');
+        },
+        // 显示品牌列表
+        showBrandList() {
+            this.$refs.brandListRef.showBrandList();
         },
+        // 清空输入框
         clear(key) {
+            // 鉴定人
+            if (key == 'identifyingPerson') {
+                this.formData.identifyingPerson = '';
+                this.formData.identifyingPersonId = '';
+                return;
+            }
+            // 回收人
+            if (key == 'recyclePerson') {
+                this.formData.recyclePerson = '';
+                this.formData.recyclePersonId = '';
+                return;
+            }
             this.formData[key] = '';
         },
         // 商品分类
@@ -435,90 +581,116 @@ export default {
             this.formData.recycleType = e;
         },
         // 付款方式
-        handlePaymentTabChange(e) {
-            console.log(e);
+        handlePayTypeTabChange(e) {
+            this.formData.payType = e;
         },
+        // 打开回收时间选择器
         clickRecycleTimeRow() {
             this.recycleTimeShow = true;
         },
+        // 确认回收时间
         confirmRecycleTime(val) {
-            this.formData.recycleTime = this.$dayjs(val.value).format('YYYY-MM-DD');
-            console.log(val, this.formData.recycleTime);
-            this.recycleTimeShow = false;
+            this.$nextTick(() => {
+                this.formData.recycleTime = this.$dayjs(val.value).format('YYYY-MM-DD');
+                this.recycleTimeShow = false;
+            })
         },
+        // 关闭回收时间选择器
         closeRecycleTimePicker(val) {
             this.recycleTimeShow = false;
         },
-        cancelRecycleTimePicker(val) {
-            console.log(val);
-            this.recycleTimeShow = false;
+        // 打开鉴定人选择器
+        identifyingPersonClick() {
+            this.$refs.identifyingPersonPickerRef.open();
         },
-        recycleTimeFormatter(value) {
-            if (value) {
-                console.log(value);
-
-            }
-            return ''
+        // 选择鉴定人
+        handleSelectIdentifyingPerson(info) {
+            this.formData.identifyingPerson = info.label;
+            this.formData.identifyingPersonId = info.id;
+        },
+        // 打开回收人选择器
+        recyclePersonClick() {
+            this.$refs.recyclePersonPickerRef.open();
         },
-        // 删除商品图片
-        deleteGoodPic(event) {
-            console.log(event);
-            // this[`fileList${event.name}`].splice(event.index, 1);
+        // 选择回收人
+        handleSelectRecyclePerson(info) {
+            this.formData.recyclePerson = info.label;
+            this.formData.recyclePersonId = info.id;
         },
         // 新增商品图片
         async afterReadGoodPic(event) {
-            console.log(event);
-            // this.fileList = [...this.fileList, ...event.fileList];
-        },
-        // 删除细节视频
-        deleteVideo(event) {
-            console.log(event);
-            // this[`fileList${event.name}`].splice(event.index, 1);
+            event.file.forEach(item => {
+                uni.$u.api.uploadFile(item.url).then((res) => {
+                    this.formData.goodPicFileList.push(res.data.url);
+                    uni.$u.toast("文件上传成功");
+                }).catch(() => {
+                    uni.$u.toast("上传文件失败");
+                })
+            })
         },
-        // 新增细节视频
-        async afterReadVideo(event) {
-            console.log(event);
-            // this.fileList2 = [...this.fileList2, ...event.fileList];
+        // 获取删除商品图片信息
+        getDeleteGoodPicInfo(info) {
+            this.formData.goodPicFileList = info.newImages
         },
-        // 删除细节图片
-        deleteDetailPic(event) {
-            console.log(event);
-            // this[`fileList${event.name}`].splice(event.index, 1);
+        // 获取删除细节图片信息
+        getDeleteDetailPicInfo(info) {
+            this.formData.detailPicFileList = info.newImages
         },
         // 新增细节图片
         async afterReadDetailPic(event) {
-            console.log(event);
-            // this.fileList1 = [...this.fileList1, ...event.fileList];
+            event.file.forEach(item => {
+                uni.$u.api.uploadFile(item.url).then((res) => {
+                    this.formData.detailPicFileList.push(res.data.url);
+                    uni.$u.toast("文件上传成功");
+                }).catch(() => {
+                    uni.$u.toast("上传文件失败");
+                })
+            })
         },
-        // 删除回收留底图
-        deleteRecycleBottom(event) {
-            console.log(event);
-            // this[`fileList${event.name}`].splice(event.index, 1);
+        // 获取删除回收留底图信息
+        getDeleteRecycleBottomPicInfo(info) {
+            this.formData.recycleBottomPicList = info.newImages
         },
         // 新增回收留底图
         async afterReadRecycleBottom(event) {
-            console.log(event);
-            // this.fileList3 = [...this.fileList3, ...event.fileList];
+            event.file.forEach(item => {
+                uni.$u.api.uploadFile(item.url).then((res) => {
+                    this.formData.recycleBottomPicList.push(res.data.url);
+                    uni.$u.toast("文件上传成功");
+                }).catch(() => {
+                    uni.$u.toast("上传文件失败");
+                })
+            })
         },
         // 删除商品保卡图片或独立编码照片留底
-        deleteProductCard(event) {
-            console.log(event);
-            // this[`fileList${event.name}`].splice(event.index, 1);
+        getDeleteProductCardPicInfo(info) {
+            this.formData.productCardPicFileList = info.newImages
         },
         // 新增商品保卡图片或独立编码照片留底
-        async afterReadProductCard(event) {
-            console.log(event);
-            // this.fileList4 = [...this.fileList4, ...event.fileList];
+        async afterReadProductCardPic(event) {
+            event.file.forEach(item => {
+                uni.$u.api.uploadFile(item.url).then((res) => {
+                    this.formData.productCardPicFileList.push(res.data.url);
+                    uni.$u.toast("文件上传成功");
+                }).catch(() => {
+                    uni.$u.toast("上传文件失败");
+                })
+            })
         },
-        // 删除商品标签图片留底
-        deleteProductTag(event) {
-            console.log(event);
-            // this[`fileList${event.name}`].splice(event.index, 1);
+        // 获取删除商品备注图片信息
+        getDeleteProductDescPicInfo(info) {
+            this.formData.productDescPicFileList = info.newImages
         },
-        // 新增商品标签图片留底
-        async afterReadProductTag(event) {
-            console.log(event);
-            // this.fileList5 = [...this.fileList5, ...event.fileList];
+        // 新增商品备注图片
+        async afterReadProductDescPic(event) {
+            event.file.forEach(item => {
+                uni.$u.api.uploadFile(item.url).then((res) => {
+                    this.formData.productDescPicFileList.push(res.data.url);
+                    uni.$u.toast("文件上传成功");
+                }).catch(() => {
+                    uni.$u.toast("上传文件失败");
+                })
+            })
         },
         async handlePasteRecognition(text) {
             // 品牌：浪琴
@@ -534,55 +706,52 @@ export default {
             }
             try {
                 if (!text) return {};
-                
+
                 const result = {};
                 // 支持中文冒号和英文冒号
                 const lines = text.split(/[\n\r]+/);
-                
+
                 lines.forEach(line => {
-                const lineStr = line.trim();
-                if (!lineStr) return;
-                
-                // 尝试中文冒号
-                let separatorIndex = lineStr.indexOf('：');
-                // 如果没有中文冒号，尝试英文冒号
-                if (separatorIndex === -1) {
-                    separatorIndex = lineStr.indexOf(':');
-                }
-                
-                if (separatorIndex > 0) {
-                    const key = lineStr.substring(0, separatorIndex).trim();
-                    const value = lineStr.substring(separatorIndex + 1).trim();
-                    result[key] = value;
-                }
+                    const lineStr = line.trim();
+                    if (!lineStr) return;
+
+                    // 尝试中文冒号
+                    let separatorIndex = lineStr.indexOf('：');
+                    // 如果没有中文冒号，尝试英文冒号
+                    if (separatorIndex === -1) {
+                        separatorIndex = lineStr.indexOf(':');
+                    }
+
+                    if (separatorIndex > 0) {
+                        const key = lineStr.substring(0, separatorIndex).trim();
+                        const value = lineStr.substring(separatorIndex + 1).trim();
+                        result[key] = value;
+                    }
                 });
-                console.log(result);
-                if(result['品牌']){
-                    this.formData.brand = result['品牌'];
+                if (result['品牌']) {
+                    this.formData.dictLabel = result['品牌'];
                 }
-                if(result['来源']){
+                if (result['来源']) {
                     this.formData.desc = result['来源'];
                 }
-                if(result['实价']){
+                if (result['实价']) {
                     this.formData.costPrice = result['实价'];
                 }
-                if(result['型号']){
+                if (result['型号']) {
                     this.formData.model = result['型号'];
                 }
-                if(result['编码']){
+                if (result['编码']) {
                     this.formData.indentifyCode = result['编码'];
                 }
-                if(result['日期']){
+                if (result['日期']) {
                     this.formData.recycleTime = result['日期'];
                 }
-                if(result['备注']){
+                if (result['备注']) {
                     this.formData.productDesc = result['备注'];
                 }
-                if(result['付款方式']){
-                    console.log(result['付款方式']);
-                    
+                if (result['付款方式']) {
                     this.getPaymentType(result['付款方式'])
-                    this.formData.paymentType = result['付款方式'];
+                    this.formData.payType = result['付款方式'];
 
                 }
                 // return result;
@@ -590,15 +759,17 @@ export default {
                 uni.$u.toast("文本识别异常");
             }
         },
-        clearRecognitionContent(){
+        // 清空识别内容
+        clearRecognitionContent() {
             this.recognitionContent = '';
         },
+        // 识别内容 回显付款方式
         getPaymentType(val) {
             let arr = []
-            this.paymentTabList.filter(item=>{
-                if(item.name == val) arr.push(item.value)
+            this.paymentTabList.filter(item => {
+                if (item.name == val) arr.push(item.value)
             })
-            if(arr.length > 0){
+            if (arr.length > 0) {
                 this.payTypeEcho = arr[0]
             }
         }

pages/wareHouse/components/detail.vue

@@ -310,8 +310,20 @@ export default {
                 })
                 return
             }
+            const params = {
+                id: this.goodsId,
+                url: this.imgsUrl[0].url,
+                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,
+                recyclePerson: this.coreInfo.recyclePerson,
+                recyclePersonId: this.coreInfo.recyclePersonId,
+                warehouseDate: this.coreInfo.warehouseDate,
+            }
             uni.navigateTo({
-                url: '/pages/wareHouse/components/openOrder?id=' + this.goodsId
+                url: '/pages/wareHouse/components/openOrder?params=' + JSON.stringify(params),
             });
         },
         viewLog() {

pages/wareHouse/components/openOrder.vue

@@ -6,7 +6,7 @@
             <img :src="openOrderForm.url" alt="">
             <view class="header_box">
                <view class="title">
-                  {{ openOrderForm.title }} | {{ openOrderForm.desc }}
+                  {{ openOrderForm.dictLabel }} | {{ openOrderForm.model }}
                </view>
                <view class="header_detail_box">
                   <view class="total_cost">
@@ -15,7 +15,7 @@
                   </view>
                   <view class="advice_price">
                      <view class="advice_price_title">建议标价</view>
-                     <view class="advice_price_price">￥{{ openOrderForm.advicePrice }}</view>
+                     <view class="advice_price_price">￥{{ openOrderForm.suggestedPrice }}</view>
                   </view>
                </view>
             </view>
@@ -33,28 +33,32 @@
             </view>
             <view class="card_item">
                <u-form-item label="订单类型">
-                  <TabSelect :tabList="tabList" mode="multiple" :colNum="4" :defaultIndex="1"
+                  <TabSelect :tabList="tabList" mode="single" :colNum="4" :defaultIndex="1"
                      @tabChange="changeOrderType">
                   </tabSelect>
                </u-form-item>
             </view>
             <view class="card_item">
                <u-form-item label="销售人员与时间" class="sales_person_box_form">
-                  <view class="sales_person_box" @click="personShow = true">
+                  <view class="sales_person_box" @click="recyclePersonClick">
                      <u-icon name="man-add" size="36rpx" color="#374151"></u-icon>
-                     <view class="text">{{ openOrderForm.salesPerson }}</view>
+                     <view class="text">{{ openOrderForm.recyclePerson }}</view>
+                     <PersonPicker ref="recyclePersonPickerRef" title="请选择回收人员"
+                            @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.date }}</view>
+                     <view class="text">{{ openOrderForm.warehouseDate }}</view>
+                     <u-datetime-picker :show="dateShow" v-model="openOrderForm.warehouseDate" 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="paymentTabList" mode="single" :colNum="4" :defaultIndex="1"
-                     @tabChange="changePaymentTab">
+                  <TabSelect :tabList="payTypeTabList" mode="single" :colNum="4" :defaultIndex="1"
+                     @tabChange="changepayTypeTab">
                   </tabSelect>
                </u-form-item>
             </view>
@@ -67,8 +71,11 @@
             </view>
             <view class="card_item">
                <u-form-item label="支付凭证上传">
-                  <u-upload :fileList="paymentProof" @afterRead="afterReadPaymentProof" @delete="deletePaymentProof"
-                     name="1" multiple :maxCount="10"></u-upload>
+                  <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>
                </u-form-item>
             </view>
             <view class="card_item">
@@ -86,43 +93,43 @@
       <view class="bottom_box">
          <view class="bottom_box_item">
             <view class="bottom_box_item_title">实收总计</view>
-            <view class="bottom_box_item_price">￥{{ openOrderForm.amountReceived }}</view>
+            <view class="bottom_box_item_price">￥{{ openOrderForm.price * openOrderForm.quantity || 0 }}</view>
          </view>
-         <u-button color="#3c9cff" type="primary" @click="submitForm"  icon="checkmark">确认开单</u-button>
+         <u-button color="#3c9cff" type="primary" @click="submitForm" icon="checkmark">确认开单</u-button>
       </view>
-      <u-popup :show="personShow" @close="close" @open="open">
-         人员选择
-      </u-popup>
-      <u-datetime-picker :show="dateShow" v-model="openOrderForm.date" mode="date" @confirm="confirmDate"
-         @close="closeDate" @cancel="closeDate"></u-datetime-picker>
    </view>
 </template>
 <script>
 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'
 export default {
    components: {
       TabSelect,
+      ImgsRowScroll,
+      PersonPicker,
    },
    data() {
       return {
+         payTypeProofPicFileList: [],
          openOrderForm: {
-            url: require('../imgs/1.jpg'),
-            title: 'ROLEX',
-            desc: 'SUBMSRINER DATE 126610LN',
-            totalCost: '82500',
-            advicePrice: '890000',
-            price: null,
-            quantity: 1,
-            salesPerson: 'IT秦',
-            orderType: [],
-            date: '2026-1-1',
-            paymentTab: 1,
-            afterSaleTab: [],
-            remark: '',
-            address: '',
-            amountReceived: 89000,
+            // url: '',
+            // dictLabel: '',
+            // dictValue: '',
+            // model: '',
+            // totalCost: '',
+            // suggestedPrice: '',
+            // price: null,
+            // quantity: 1,
+            // recyclePerson: '',
+            // recyclePersonId: '',
+            // orderType: [],
+            // warehouseDate: '',
+            // payTypeTab: 1,
+            // afterSaleTab: [],
+            // remark: '',
+            // address: '',
          },
-         paymentProof: [],
          tabList: [
             {
                name: '零售',
@@ -145,7 +152,7 @@ export default {
                value: 5,
             },
          ],
-         paymentTabList: [
+         payTypeTabList: [
             {
                name: '微信',
                value: 1,
@@ -198,43 +205,86 @@ export default {
                { required: true, message: '请输入成交金额', trigger: ['blur'] },
             ],
          },
-         personShow: false,
          dateShow: false,
       }
    },
+   onLoad() {
+      const params = this.$route.query.params
+      if (params) {
+         this.openOrderForm = JSON.parse(params)
+         this.openOrderForm.quantity = 1
+         // Object.keys(params).forEach(key => {
+         //    this.openOrderForm[key] = params[key]
+         // })
+      }
+   },
    methods: {
       changeOrderType(val) {
          this.openOrderForm.orderType = val
       },
-      changePaymentTab(val) {
-         this.openOrderForm.paymentTab = val
+      changepayTypeTab(val) {
+         this.openOrderForm.payTypeTab = val
       },
       changeAfterSaleTab(val) {
          this.openOrderForm.afterSaleTab = val
       },
+      // 打开回收人选择器
+      recyclePersonClick() {
+         this.$refs.recyclePersonPickerRef.open();
+      },
+      handleSelectRecyclePerson(person) {
+         this.openOrderForm.recyclePerson = person.label
+         this.openOrderForm.recyclePersonId = person.id
+      },
       handleClickOutside() {
          this.personShow = false
       },
       confirmDate(val) {
-         this.openOrderForm.date = this.$dayjs(val.value).format('YYYY-MM-DD');
-         console.log(this.openOrderForm.date);
-
+         this.$nextTick(() => {
+            this.openOrderForm.warehouseDate = this.$dayjs(val.value).format('YYYY-MM-DD');
+         })
          this.dateShow = false
       },
       closeDate() {
          this.dateShow = false
       },
-      afterReadPaymentProof(file) {
-         // this.paymentProof.push(file)
-      },
-      deletePaymentProof(index) {
-         // this.paymentProof.splice(index, 1)
+      getDeleteGoodPicInfo(info) {
+         this.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("上传文件失败");
+                })
+            })
+        },
       submitForm() {
          this.$refs.openOrderForm.validate().then(res => {
             if (res) {
+               const data = {
+                  ...this.openOrderForm,
+                  payTypeProofPicFileList: this.payTypeProofPicFileList,
+                  amountReceived: Number(this.openOrderForm.price) * Number(this.openOrderForm.quantity),
+               }
+               uni.$u.api.wareHouseOpenOrder(data).then(res => {
+                  if (res.code === 200) {
+                     uni.$u.toast("开单成功");
+                     setTimeout(() => {
+                        uni.navigateBack({
+                              delta: 2
+                        });
+                     }, 1000);
+                  } else {
+                     uni.$u.toast(res.msg);
+                  }
+               }).catch(() => {
+                  uni.$u.toast("开单失败");
+               })
                console.log('提交成功', this.openOrderForm);
-               
+
             }
          })
       },

pages/wareHouse/components/searchFilter.vue

@@ -20,11 +20,11 @@
             </u-form-item>
             <u-form-item label="回收人员" labelWidth="70" @click="recyclePersonClick">
                 <FormSelectToPage :val="formData.recyclePerson" :isDelete="true" borderType="bottom" @handleClear="clear('recyclePerson')"></FormSelectToPage>
-                <personPicker ref="recyclePersonPickerRef" title="请选择回收人员" @selectPerson="handleSelectRecyclePerson"></personPicker>
+                <PersonPicker ref="recyclePersonPickerRef" title="请选择回收人员" @selectPerson="handleSelectRecyclePerson"></PersonPicker>
             </u-form-item>
             <u-form-item label="鉴定人员" labelWidth="70" @click="identifyingPersonClick">
                 <FormSelectToPage :val="formData.identifyingPerson" :isDelete="true" borderType="bottom" @handleClear="clear('identifyingPerson')"></FormSelectToPage>
-                <personPicker ref="identifyingPersonPickerRef" title="请选择鉴定人员" @selectPerson="handleSelectIdentifyingPerson"></personPicker>
+                <PersonPicker ref="identifyingPersonPickerRef" title="请选择鉴定人员" @selectPerson="handleSelectIdentifyingPerson"></PersonPicker>
             </u-form-item>
             <u-form-item label="商品属性" labelWidth="70">
                 <TabSelect :tabList="productAttributeList" :colNum="3" :echoInfo="formData.productAttribute" mode="multiple" @tabChange="handleTabChangeProductAttribute"></TabSelect>
@@ -40,13 +40,13 @@
 <script>
 import FormSelectToPage from '@/components/form-select-to-page/index.vue'
 import BrandList from '@/components/brand-list/index.vue'
-import personPicker from '@/components/person-picker/index.vue'
+import PersonPicker from '@/components/person-picker/index.vue'
 import TabSelect from '@/components/custom-tab-select/index.vue'
 export default {
     components: {
         FormSelectToPage,
         BrandList,
-        personPicker,
+        PersonPicker,
         TabSelect,
     },
     name: 'searchFilter',

pages/wareHouse/index.vue

@@ -27,7 +27,7 @@
 					<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>
@@ -62,8 +62,7 @@
 				<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>
-						<view class="stock-indicator"
-							v-if="goods.stock > 0"></view>
+						<view :class="['stock-indicator', goods.downStatus == '1' ? 'up-indicator' : 'down-indicator']"></view>
 					</view>
 
 					<view class="goods-info">
@@ -128,6 +127,7 @@ export default {
 	data() {
 		return {
 			searchString:'',//搜索编号、名称、品牌...
+			category:1,
 			searchInfo:{},
 			pageNum:1,
 			pageSize:10,
@@ -202,6 +202,16 @@ export default {
 		};
 	},
 	methods: {
+		uploadTestAfter(info){
+			console.log(info);
+			info.file.forEach(item=>{
+				uni.$u.api.uploadFile(item.url).then((res) => {
+					uni.$u.toast("文件上传成功");
+				}).catch(() => {
+					uni.$u.toast("上传文件失败");
+				})
+			})
+		},
 		getList(){
 			uni.$u.api.wareHouseList({
 				pageNum: this.pageNum,
@@ -210,7 +220,8 @@ export default {
 			{
 				searchString:this.searchString,
 				sortType:this.curSortType.id,
-				...this.searchInfo,
+				category:this.category,
+				...this.searchInfo
 			}).then(res => {
 				if(this.pageNum == 1){
 					this.goodsList = res.rows;
@@ -237,7 +248,7 @@ export default {
 			this.getList();
 		},
 		switchTab(item) {
-			this.searchInfo.category = item.id;
+			this.category = item.id;
 			this.handleSearch();
 		},
 		handleToDetail(item) {

pages/wareHouse/styles/add.scss

@@ -12,8 +12,14 @@
             display: flex;
             gap: 20rpx;
         }
+        ::v-deep .detail_pic_container{
+            display: flex;
+            flex-direction: column;
+            .tip{
+                font-size:24rpx;
+            }
+        }
     }
-
 }
 
 .btn_group {

pages/wareHouse/styles/index.scss

@@ -270,9 +270,14 @@
       width: 20rpx;
       height: 20rpx;
       border-radius: 50%;
-      background-color: #09bb07;
       border: 2rpx solid #ffffff;
     }
+    .up-indicator{
+      background-color: #09bb07;
+    }
+    .down-indicator{
+      background-color: #c7d5c7;
+    }
     .goods-info {
       flex: 1;
       .goods-brand {

pages/wareHouse/styles/openOrder.scss

@@ -1,6 +1,6 @@
 .open_order {
+    padding-bottom: 142rpx;
     .open_order_content {
-        margin-bottom:150rpx;
         .header {
             display: flex;
             justify-content: flex-start;

utils/api.js

@@ -130,7 +130,9 @@ const install = (Vue, vm) => {
 		wareHouseLog:(params)=>http.get(mockApi+'/warehouse/wareHouseLog',{ params }),//仓库中心-获取仓库操作日志
 		wareHouseUpdate:(data)=>http.post(mockApi+'/warehouse/wareHouseUpdate',data),//仓库中心-编辑商品库存
 		wareHouseLock:(data)=>http.post(mockApi+'/warehouse/wareHouseLock',data),//仓库中心-锁单
-		wareHouseDown:(data)=>http.post(mockApi+'/warehouse/wareHouseDown',data),//仓库中心-下架
+		wareHouseDown:(data)=>http.post(mockApi+'/warehouse/wareHouseDown',data),//仓库中心-下架商品
+		wareHouseAdd:(data)=>http.post(mockApi+'/warehouse/wareHouseAdd',data),//仓库中心-新增商品
+		wareHouseOpenOrder:(data)=>http.post(mockApi+'/warehouse/wareHouseOpenOrder',data),//仓库中心-开单