feat:仓库数据如果未入库点击进入编辑页面，如果已经入库进入详情页面

components/add-inquiry-dialog/index.vue

@@ -89,14 +89,13 @@ export default {
                 xAxis: {
                     disableGrid: true,
                     scrollShow: true,
-                    itemCount: 7
+                    itemCount: 10,
+                    rotateLabel: true,
+                    rotateAngle: 45,
                 },
                 yAxis: {
                     gridType: "dash",
                     dashLength: 7,
-                    axisLabel:{
-                        show: false
-                    }
                 },
                 extra: {
                     line: {
@@ -244,17 +243,16 @@ export default {
         },
         getChartData() {
             uni.$u.api.inquiryChart({
-                dictValue: this.info.dictValue,
                 model: this.info.model,
             }).then(res => {
                 if (res.code == 200) {
-                    
+                    const reverseData = res.data.reverse()
                     let data = {
-                        categories: res.data.map(item=>item.recycleTime),
+                        categories: reverseData.map(item=>item.recycleTime),
                         series: [
                             {
-                                name: this.info.model+'价格趋势',
-                                data: res.data.map(item=>item.costPrice),
+                                name: this.info.model+'价格',
+                                data: reverseData.map(item=>item.price),
                                 setShadow: [
                                     3,
                                     8,

pages.json

@@ -174,9 +174,9 @@
 			}
 		},
 		{
-			"path": "pages/wareHouse/components/add",
+			"path": "pages/wareHouse/components/edit",
 			"style": {
-				"navigationBarTitleText": "仓库新增",
+				"navigationBarTitleText": "仓库编辑",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}

pages/wareHouse/components/detail.vue

@@ -12,7 +12,7 @@
 
         <!-- 立即下架按钮 -->
         <view class="immediate_off_shelf">
-            <u-button type="error" shape="circle" size="large" @click="handleOffShelf" :disabled="lockStatus === '1'">
+            <u-button type="error" shape="circle" size="large" @click="handleOffShelf" :disabled="lockStatus === '1' || globalEditMode">
                 <u-icon :name="downStatus == '0' ? 'arrow-upward' : 'arrow-downward'" size="38rpx"
                     color="#ffffff"></u-icon>
                 <text>{{ downStatus == '0' ? '立即上架' : '立即下架' }}</text>
@@ -73,6 +73,10 @@
                 </view>
             </view>
             <view class="info_row">
+                <view class="info_label">是否入库</view>
+                <view class="info_value">{{ stockStatusFormatter(coreInfo.stockStatus) }}</view>
+            </view>
+            <view class="info_row">
                 <view class="info_label">入库日期</view>
                 <view class="info_value">{{ coreInfo.createTime || '-' }}</view>
             </view>
@@ -188,22 +192,28 @@
         </view>
 
         <!-- 底部功能按钮栏 -->
-        <view class="bottom_bar">
-            <view class="bar_item" @click.stop="globalEditMode ? handleClickOutside() : enterGlobalEdit()">
+        <view :class="['bottom_bar', { 'fourPart': coreInfo.stockStatus === '1', 'fivePart': coreInfo.stockStatus === '0' }]">
+            <view class="bar_item" @click.stop="globalEditMode ? confirmGlobalEdit() : enterGlobalEdit()">
                 <u-icon :name="globalEditMode ? 'checkbox-mark' : 'edit-pen'" size="46rpx"
                     :color="globalEditMode ? '#10b981' : '#9ca3af'"></u-icon>
                 <text class="bar_text">{{ globalEditMode ? '确定' : '编辑' }}</text>
             </view>
-            <view class="bar_item" @click.stop="lockGoods">
+            <view :class="['bar_item', { 'disabled': globalEditMode}]" @click.stop="lockGoods">
                 <u-icon :name="lockStatus === '1' ? 'lock-open' : 'lock'" size="46rpx" color="#9ca3af"></u-icon>
                 <text class="bar_text">{{ lockStatus === '1' ? '解锁' : '锁单' }}</text>
             </view>
-            <view class="bar_item">
-                <image class="bar_icon" src="../../../static//icons/print.png" alt=""></image>
+            <view :class="['bar_item', { 'disabled': globalEditMode}]">
+                <image class="bar_icon" src="../../../static/icons/print.png" alt=""></image>
                 <text class="bar_text">打印</text>
             </view>
-            <view :class="['bar_item', { 'disabled': lockStatus === '1' }]" @click="handleOpenOrder">
-                <view class="primary">
+            <view class="bar_item" v-if="coreInfo.stockStatus === '0'" @click.stop="handleConfirmStockIn">
+                <view class="primary blue">
+                    <image class="bar_img" src="../../../static/icons/stockIn.png" alt=""></image>
+                    <text class="bar_text">确认入库</text>
+                </view>
+            </view>
+            <view :class="['bar_item', { 'disabled': lockStatus === '1' ||  globalEditMode}]" @click="handleOpenOrder">
+                <view class="primary orange">
                     <u-icon name="bag" size="44rpx" color="#fff"></u-icon>
                     <text class="bar_text">开单</text>
                 </view>
@@ -271,6 +281,17 @@ export default {
                 icon: 'none'
             })
         },
+        // 是否入库格式化
+        stockStatusFormatter(val){
+            switch (val) {
+                case '1':
+                    return '已入库'
+                case '0':
+                    return '未入库'
+                default:
+                    return '-'
+            }
+        },
         payTypeFormatter(val){
             switch (val) {
                 case '1':
@@ -291,6 +312,13 @@ export default {
         },
         // 锁单
         lockGoods() {
+            if (this.globalEditMode) {
+                uni.showToast({
+                    title: '编辑状态下不能操作',
+                    icon: 'none'
+                })
+                return
+            }
             uni.$u.api.wareHouseLock({
                 id: this.goodsId,
                 lockStatus: this.lockStatus === '1' ? '0' : '1',
@@ -358,6 +386,13 @@ export default {
                 })
                 return
             }
+            if (this.globalEditMode) {
+                uni.showToast({
+                    title: '编辑状态下不能开单',
+                    icon: 'none'
+                })
+                return
+            }
             const params = {
                 id: this.goodsId,
                 url: this.imgsUrl[0]?.url,
@@ -374,6 +409,10 @@ export default {
                 url: '/pages/wareHouse/components/openOrder?params=' + JSON.stringify(params),
             });
         },
+        handleConfirmStockIn(){
+            this.coreInfo.stockStatus = '1';
+            this.submitEdit(this.coreInfo)
+        },
         viewLog() {
             uni.$u.api.wareHouseLog({
                 id: this.goodsId,
@@ -393,6 +432,13 @@ export default {
                 })
                 return
             }
+            if (this.globalEditMode) {
+                uni.showToast({
+                    title: '编辑状态下不能操作',
+                    icon: 'none'
+                })
+                return
+            }
             uni.$u.api.wareHouseDown({
                 id: this.goodsId,
                 downStatus: this.downStatus === '1' ? '0' : '1',
@@ -474,6 +520,7 @@ export default {
                 recyclePersonId: info.recyclePersonId,
                 identifyingPerson: info.identifyingPerson,
                 identifyingPersonId: info.identifyingPersonId,
+                stockStatus: info.stockStatus,
             }
             uni.$u.api.wareHouseUpdate(data).then(res => {
                 uni.showToast({
@@ -491,16 +538,7 @@ export default {
         },
         // 点击页面其他地方保存所有编辑
         handleClickOutside() {
-            if (this.globalEditMode) {
-                this.submitEdit(this.tempValues)
-                // 全局编辑模式下，点击外部区域重置所有编辑
-                this.globalEditMode = false;
-                // 退出所有编辑状态
-                this.resetEditMode();
-                // 清空临时值，恢复初始状态
-                this.tempValues = {};
-
-            } else {
+            if (!this.globalEditMode) {
                 // 保存当前正在编辑的字段
                 Object.keys(this.editMode).forEach(key => {
                     if (this.editMode[key]) {
@@ -508,8 +546,19 @@ export default {
                     }
                 });
             }
+            // 当globalEditMode为true时，不执行任何操作
 
         },
+        // 确认全局编辑
+        confirmGlobalEdit() {
+            this.submitEdit(this.tempValues)
+            // 重置全局编辑模式
+            this.globalEditMode = false;
+            // 退出所有编辑状态
+            this.resetEditMode();
+            // 清空临时值，恢复初始状态
+            this.tempValues = {};
+        },
         handleDownload() {
             if (this.imgsUrl.length == 0) {
                 uni.showToast({

pages/wareHouse/components/add.vue

@@ -37,14 +37,16 @@
                         </view>
                     </u-form-item>
                     <u-form-item label="商品描述（详细的描述让用户更好的了解您的产品）" required prop="desc" borderBottom>
-                        <u--textarea v-model="formData.desc" clearable placeholder="95新 WHZ19219H
-                        CHANEL香奈儿链条单肩包
+                        <u--textarea v-model="formData.desc" clearable placeholder="95新 WHZ19219H CHANEL香奈儿链条单肩包
                         21开 牛皮 尺寸25 4 15
                         配件中溯卡" count autoHeight maxlength="250" height="100" confirmType="done"></u--textarea>
                     </u-form-item>
+                    <u-form-item label="来源" prop="origin" borderBottom>
+                        <u--textarea v-model="formData.origin" clearable placeholder="请输入来源" 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" labelKey="dictLabel" valueKey="dictValue"
-                            :colNum="4" mode="single" echoInfo="1">
+                        <TabSelect :tabList="typeList" :isClear="typeIsClear" @tabChange="handleTabChangeType"
+                            labelKey="dictLabel" valueKey="dictValue" :colNum="4" mode="single" :echoInfo="echoInfoType">
                         </TabSelect>
                     </u-form-item>
                     <u-form-item label="品牌" required prop="dictLabel" class="u-form-item-row" borderBottom
@@ -81,11 +83,12 @@
                     </u-form-item>
                     <u-form-item label="商品成色" required prop="productCondition" borderBottom>
                         <TabSelect :tabList="productConditionList" :isClear="productConditionIsClear"
-                            @tabChange="handleTabChangeProductCondition" :colNum="2" mode="single" echoInfo="1"></TabSelect>
+                            @tabChange="handleTabChangeProductCondition" :colNum="2" mode="single" :echoInfo="echoInfoProductCondition">
+                        </TabSelect>
                     </u-form-item>
                     <u-form-item label="细节图" borderBottom>
                         <!-- <view class="detail_pic_container"> -->
-                            <!-- <view>
+                        <!-- <view>
                                 <text class="tip">视频：</text>
                                 <ImgsRowScroll v-if="formData.detailVideoFileList.length > 0" :isShowDeleteIcon="true"
                                     @deleteVideoInfo="getDeleteDetailVideoInfo" imgMode="aspectFill" :totalWidth="400"
@@ -93,16 +96,16 @@
                                     :imageHeight="150" accept="video"></ImgsRowScroll>
                                 <u-upload @afterRead="afterReadDeatilVideo"  name="2" multiple :maxCount="10" accept="video"></u-upload>
                             </view> -->
-                            <!-- <view> -->
-                                <!-- <text class="tip">图片：</text> -->
-                                <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> -->
+                        <!-- <text class="tip">图片：</text> -->
+                        <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>
@@ -113,12 +116,14 @@
                         <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"
-                            :isClear="productAttributeIsClear" @tabChange="handleTabChangeProductAttribute" echoInfo="1">
+                        <TabSelect :tabList="productAttributeList" :colNum="4" mode="single"
+                            :isClear="productAttributeIsClear" @tabChange="handleTabChangeProductAttribute"
+                            :echoInfo="echoInfoProductAttribute">
                         </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" type="number"></u--input>
+                        <u--input v-model="formData.stock" placeholder="请输入" clearable border="none"
+                            type="number"></u--input>
                     </u-form-item>
                     <u-form-item label="总成本价" class="u-form-item-row" borderBottom>
                         <u--input v-model="formData.costPrice" placeholder="请输入" clearable border="none"></u--input>
@@ -140,24 +145,30 @@
                         <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 @click="identifyingPersonClick">
-                        <Cell :val="formData.identifyingPerson" :isDelete="true" @handleClear="clear('identifyingPerson')"></Cell>
+                        <Cell :val="formData.identifyingPerson" :isDelete="true"
+                            @handleClear="clear('identifyingPerson')"></Cell>
                         <PersonPicker ref="identifyingPersonPickerRef" title="请选择鉴定人员"
                             @selectPerson="handleSelectIdentifyingPerson"></PersonPicker>
                     </u-form-item>
+                    <u-form-item label="是否入库" borderBottom required prop="stockStatus">
+                        <TabSelect :tabList="stockStatusList" :colNum="2" mode="single" :isClear="stockStatusIsClear" :echoInfo="echoInfoStockStatus"
+                            @tabChange="handleTabChangeStockStatus"></TabSelect>
+                    </u-form-item>
                     <u-form-item label="回收类型" borderBottom>
-                        <TabSelect :tabList="recycleTypeList" :colNum="4" mode="single" 
-                            :isClear="recycleTypeIsClear" @tabChange="handleTabChangeRecycleType">
+                        <TabSelect :tabList="recycleTypeList" :colNum="4" mode="single" :isClear="recycleTypeIsClear"
+                            @tabChange="handleTabChangeRecycleType">
                         </TabSelect>
                     </u-form-item>
                     <u-form-item label="标签" borderBottom>
-                        <TabSelect :tabList="labelList" :colNum="4" mode="single" 
-                            :isClear="labelIsClear" @tabChange="handleTabChangeLabel">
+                        <TabSelect :tabList="labelList" :colNum="5" mode="single" :isClear="labelIsClear"
+                            @tabChange="handleTabChangeLabel">
                         </TabSelect>
                     </u-form-item>
                     <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> -->
-                        <Cell :val="formData.recyclePerson" :isDelete="true" @handleClear="clear('recyclePerson')"></Cell>
+                        <Cell :val="formData.recyclePerson" :isDelete="true" @handleClear="clear('recyclePerson')">
+                        </Cell>
                         <PersonPicker ref="recyclePersonPickerRef" title="请选择回收人员"
                             @selectPerson="handleSelectRecyclePerson"></PersonPicker>
                     </u-form-item>
@@ -235,17 +246,16 @@
                         </view>
                     </u-form-item>
                     <u-form-item label="付款方式">
-                        <TabSelect :tabList="paymentTabList" :echoInfo="payTypeEcho" :colNum="4" mode="single" 
+                        <TabSelect :tabList="paymentTabList" :echoInfo="payTypeEcho" :colNum="4" mode="single"
                             :isClear="payTypeIsClear" @tabChange="handlePayTypeTabChange">
                         </TabSelect>
                     </u-form-item>
                 </u--form>
             </view>
-
         </view>
-        <view class="btn_group">
-            <u-button plain type="primary" @click="submitForm('onlyIn')">仅入库</u-button>
-            <u-button type="primary" @click="submitForm('inAndUp')">入库并上架</u-button>
+        <view :class="['btn_group', {'col-2': formData.stockStatus == '1'}]">
+            <u-button plain type="primary" @click="submitForm('onlyIn')">{{ formData.stockStatus == '0' ? '待入库' : '仅入库' }}</u-button>
+            <u-button type="primary" @click="submitForm('inAndUp')" v-if="formData.stockStatus == '1'">入库并上架</u-button>
         </view>
     </view>
 </template>
@@ -271,6 +281,7 @@ export default {
             formData: {
                 goodPicFileList: [],//商品图片
                 desc: '',
+                origin: '',
                 type: '1',
                 dictLabel: '艾美',
                 dictValue: '88',
@@ -297,6 +308,7 @@ export default {
                 watchYear: '',
                 identifyingPerson: '',
                 identifyingPersonId: '',
+                stockStatus: '0',
                 recycleType: '',
                 recyclePerson: '',
                 recyclePersonId: '',
@@ -320,25 +332,28 @@ export default {
                     { required: true, message: '请上传商品图片' },
                 ],
                 desc: [
-                    { required: true, message: '请输入商品描述', trigger: 'blur' },
+                    { required: true, message: '请输入商品描述', trigger: ['blur', 'change'] },
                 ],
                 type: [
-                    { required: true, message: '请选择商品分类', trigger: 'blur' },
+                    { required: true, message: '请选择商品分类', trigger: ['blur', 'change'] },
                 ],
                 dictLabel: [
-                    { required: true, message: '请选择品牌', trigger: 'blur' },
+                    { required: true, message: '请选择品牌', trigger: ['blur', 'change'] },
                 ],
                 productCondition: [
-                    { required: true, message: '请选择商品成色', trigger: 'blur' },
+                    { required: true, message: '请选择商品成色', trigger: ['blur', 'change'] },
                 ],
                 productAttribute: [
-                    { required: true, message: '请选择商品属性', trigger: 'blur' },
+                    { required: true, message: '请选择商品属性', trigger: ['blur', 'change'] },
                 ],
                 stock: [
                     { required: true, message: '请输入库存数量' },
                 ],
+                stockStatus: [
+                    { required: true, message: '请选择是否入库', trigger: [ 'change'] },
+                ],
                 recycleTime: [
-                    { required: true, message: '请选择回收时间', trigger: 'blur' },
+                    { required: true, message: '请选择回收时间', trigger: ['blur', 'change'] },
                 ],
 
             },
@@ -373,6 +388,16 @@ export default {
                     value: '4',
                 },
             ],
+            stockStatusList: [
+                {
+                    name: '待入库',
+                    value: '0',
+                },
+                {
+                    name: '已入库',
+                    value: '1',
+                },
+            ],
             recycleTypeList: [
                 {
                     name: '线上',
@@ -391,26 +416,26 @@ export default {
                     value: '4',
                 },
             ],
-            labelList:[
+            labelList: [
                 {
-                    name:'完美',
-                    value:'1',
+                    name: '完美',
+                    value: '1',
                 },
                 {
-                    name:'普通',
-                    value:'2',
+                    name: '普通',
+                    value: '2',
                 },
                 {
-                    name:'瑕疵',
-                    value:'3',
+                    name: '瑕疵',
+                    value: '3',
                 },
                 {
-                    name:'假货',
-                    value:'4',
+                    name: '假货',
+                    value: '4',
                 },
                 {
-                    name:'亏损',
-                    value:'5',
+                    name: '亏损',
+                    value: '5',
                 },
             ],
             paymentTabList: [
@@ -443,25 +468,44 @@ export default {
             productConditionIsClear: false,//商品成色是否清空
             productAttributeIsClear: false,//商品属性是否清空
             recycleTypeIsClear: false,//回收类型是否清空
+            stockStatusIsClear: false,//是否入库是否清空
             labelIsClear: false,//商品标签是否清空
             payTypeIsClear: false,//付款方式是否清空
-            payTypeEcho: ''//付款方式识别回显
-
+            payTypeEcho: '',//付款方式识别回显
+            echoInfoType:'',//入库回显的时候 类型回显
+            echoInfoProductAttribute:'',//入库回显的时候 商品属性回显
+            echoInfoProductCondition:'',//入库回显的时候 商品成色回显
+            echoInfoStockStatus:'',//入库回显的时候 是否入库回显
         }
     },
-    onLoad() {
+    onLoad(options) {
         this.getTypeList();
+        this.$nextTick(()=>{
+            if(options.formType == 'add'){
+                this.clearForm()
+            }else if(options.formType == 'edit'){
+                uni.$u.api.wareHouseDetail({
+                    id: options.id,
+                    userId: this.$store.state.user.userInfo.userId,
+                }).then(res => {
+                    const key = ['costPrice','dictLabel','dictValue','goodPicFileList','indexntifuCode','origin','stockStatus']
+                    key.forEach(item => {
+                        this.formData[item] = res.data[item]
+                    })
+                    this.recycleTime = this.$dayjs(res.data.recycleTime).format('YYYY-MM-DD') || ''
+                    this.echoInfoType = res.data.type || '1'
+                });
+            }
+        })
     },
     methods: {
-        getTypeList(){
+        getTypeList() {
             this.$getDicts("crm_form_category").then(res => {
                 this.typeList = res
             })
         },
         // 提交表单
         submitForm(submitType) {
-            console.log(this.formData);
-            
             this.$refs.addForm.validate().then((valid) => {
                 if (valid) {
                     if (this.formData.title == '') {
@@ -470,13 +514,10 @@ export default {
                     this.formData.recycleTime = this.$dayjs(this.formData.recycleTime).format('YYYY-MM-DD')
                     const data = {
                         ...this.formData,
-                        submitType: submitType, //提交类型 onlyIn：仅入库 inAndUp：入库并上架
+                        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) {
                             uni.$u.toast('新增成功');
                             if (data.continuousWarehousing == '0') {
@@ -501,6 +542,7 @@ export default {
             this.formData = {
                 goodPicFileList: [],//商品图片
                 desc: '',
+                origin: '',
                 type: '1',
                 dictLabel: '艾美',
                 dictValue: '88',
@@ -527,6 +569,7 @@ export default {
                 watchYear: '',
                 identifyingPerson: '',
                 identifyingPersonId: '',
+                stockStatus: '0',
                 recycleType: '',
                 label: '',
                 recyclePerson: '',
@@ -545,14 +588,17 @@ export default {
                 productDescPicFileList: [],//商品备注图片
                 payType: '',
             }
-            this.typeIsClear = true;
-            this.productConditionIsClear = true;
-            this.productAttributeIsClear = true;
             this.recycleTypeIsClear = true;
             this.payTypeIsClear = true;
             this.labelIsClear = true;
+            this.echoInfoType = '1';//类型默认第一项
+            this.echoInfoProductCondition = '1';//商品成色默认第一项
+            this.echoInfoProductAttribute = '1';//商品属性默认第一项
+            this.echoInfoStockStatus = '0';//是否入库默认第一项
             this.continuousWarehousing = [];
-            this.$refs.addForm.resetFields();
+            this.$nextTick(()=>{
+                this.$refs.addForm.resetFields();
+            })
         },
         // 选择品牌
         handleSelectedBrand(info) {
@@ -601,6 +647,10 @@ export default {
             this.formData.productAttribute = e;
             this.$refs.addForm.validateField('productAttribute')
         },
+        // 是否入库
+        handleTabChangeStockStatus(e) {
+            this.formData.stockStatus = e;
+        },
         // 回收类型
         handleTabChangeRecycleType(e) {
             this.formData.recycleType = e;
@@ -761,7 +811,7 @@ export default {
                     this.formData.dictLabel = result['品牌'];
                 }
                 if (result['来源']) {
-                    this.formData.desc = result['来源'];
+                    this.formData.origin = result['来源'];
                 }
                 if (result['实价']) {
                     this.formData.costPrice = result['实价'];
@@ -806,5 +856,5 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-@import '../styles/add.scss';
+@import '../styles/edit.scss';
 </style>

pages/wareHouse/components/moreInfo.vue

@@ -0,0 +1,64 @@
+<template>
+    <u-modal :show="show">
+        <div class="more-info">
+            <view class="modal-item">
+                <text>品牌：</text>
+                <text>{{ moreOptions.dictLabel || '-' }}</text>
+            </view>
+            <view class="modal-item">
+                <text>来源：</text>
+                <text>{{ moreOptions.origin || '-' }}</text>
+            </view>
+            <view class="modal-item">
+                <text>实价：</text>
+                <text>¥{{ moreOptions.costPrice || '-' }}</text>
+            </view>
+            <view class="modal-item">
+                <text>型号：</text>
+                <text>{{ moreOptions.model || '-' }}</text>
+            </view>
+            <view class="modal-item">
+                <text>编码：</text>
+                <text>{{ moreOptions.indentifyCode || '-' }}</text>
+            </view>
+            <view class="modal-item">
+                <text>日期：</text>
+                <text>{{ recycleTimeFormatter(moreOptions.recycleTime) || '-' }}</text>
+            </view>
+            <view class="modal-item">
+                <text>备注：</text>
+                <text>{{ moreOptions.productDesc || '-' }}</text>
+            </view>
+        </div>
+    </u-modal>
+</template>
+
+<script>
+export default {
+    name: 'MoreInfo',
+    props: {
+        moreOptions: {
+            type: Object,
+            default: () => { }
+        }
+    },
+    data() {
+        return {
+            show: false,
+        }
+    },
+    methods: {
+        showMoreInfo() {
+            this.show = true;
+        },
+        recycleTimeFormatter(val) {
+            if (val) {
+                return this.$dayjs(val).format('YYYY-MM-DD HH:mm:ss')
+            }
+            return '-'
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped></style>

pages/wareHouse/components/searchFilter.vue

@@ -29,6 +29,9 @@
             <u-form-item label="商品属性" labelWidth="70">
                 <TabSelect :tabList="productAttributeList" :colNum="3" :echoInfo="formData.productAttribute" mode="multiple" @tabChange="handleTabChangeProductAttribute"></TabSelect>
             </u-form-item>
+            <u-form-item label="是否入库" labelWidth="70">
+                <TabSelect :tabList="stockStatusList" :colNum="4" :echoInfo="formData.stockStatus" mode="single" @tabChange="handleTabChangeStockStatus"></TabSelect>
+            </u-form-item>
         </u--form>
         <view class="btns">
             <u-button text="重置" @click="resetForm"></u-button>
@@ -66,6 +69,7 @@ export default {
                 identifyingPerson:'',
                 identifyingPersonId: '',
                 productAttribute: [],
+                stockStatus: '',
             },
             recycleTimeDefault: new Date().getTime(),
             recycleTimeShow: false,
@@ -88,6 +92,21 @@ export default {
                     value: '4',
                 },
             ],
+            stockStatusList: [
+                {
+                    name: '全部',
+                    value: '',
+                },
+                {
+                    name: '待入库',
+                    value: '0',
+                },
+                {
+                    name: '已入库',
+                    value: '1',
+                },
+
+            ],
         }
     },
     props: {
@@ -110,7 +129,8 @@ export default {
                 recyclePersonId: '',
                 identifyingPerson:'',
                 identifyingPersonId: '',
-                productAttribute: '',
+                productAttribute: [],
+                stockStatus: '',
             };
             this.recycleTimeDefault = new Date().getTime();
         },
@@ -173,6 +193,9 @@ export default {
         handleTabChangeProductAttribute(e) {
             this.formData.productAttribute = e;
         },
+        handleTabChangeStockStatus(e) {
+            this.formData.stockStatus = e;
+        },
     }
 }
 </script>

pages/wareHouse/index.vue

@@ -59,7 +59,7 @@
 			</view>
 
 			<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 @click="clickItem(goods)" class="goods-item" v-for="(goods, goodsIndex) in goodsList" :key="`goods-${goodsIndex}`">
 					<view class="goods-img-container">
 						<image class="goods-img" :src="goods.imgUrl ? goods.imgUrl : '/static/no-img.png'" mode="aspectFill" lazy-load></image>
 						<!-- <image class="goods-img" src="/static/no-img.png" mode="aspectFill" lazy-load></image> -->
@@ -100,28 +100,26 @@
 						</view> -->
 					</view>
 					<view class="more">
-						<view></view>
-						<!-- <u-icon name="more-dot-fill" size="16" color="#666666"></u-icon> -->
+						<u-icon name="more-dot-fill" size="16" color="#666666" @click="showMoreOptions(goods)"></u-icon>
 						<text class="goods-stock">数量:{{ goods.stock}}</text>
 					</view>
 				</view>
-				<show-emtry v-if="goodsList.length === 0"></show-emtry>
 			</scroll-view>
-			
 		</view>
 		<!-- 添加按钮 -->
-		<view class="add-button" @click="handleAdd">
+		<view class="add-button" @click="handleEdit">
 			<u-icon name="plus" size="36" color="#ffffff"></u-icon>
 		</view>
+		<!-- <moreInfo ref="moreInfoRef" :moreOptions="moreOptions"></moreInfo> -->
 	</view>
-	
 </template>
-
 <script>
 	import searchFilter from './components/searchFilter.vue'
+	import moreInfo from './components/moreInfo.vue'
 export default {
 	components: {
 		searchFilter,
+		moreInfo,
 	},
 	data() {
 		return {
@@ -188,13 +186,19 @@ export default {
 			]],
 			priceVisible:true,
 			searchPopShow:false,
-			total:0
+			total:0,
+			moreOptions:{},
+			moreOptionsShow:false,	
 		};
 	},
 	onLoad() {
 		this.getTypeList();
 	},
 	methods: {
+		showMoreOptions(goods){
+			this.moreOptions = goods;
+			this.$refs.moreInfoRef.showMoreInfo();
+		},
 		getTypeList(){
             this.$getDicts("crm_form_category").then(res => {
                 this.tabList = [...res]
@@ -250,15 +254,29 @@ export default {
 			this.type = item.dictValue;
 			this.handleSearch();
 		},
+		clickItem(item){
+			// 如果是待入库商品，点击后跳转到添加页面补全信息
+			if(item.stockStatus === '0'){
+				this.handleEdit(item)
+			}else{
+				this.handleToDetail(item);
+			}
+		},
 		handleToDetail(item) {
 			uni.navigateTo({
 				url: `/pages/wareHouse/components/detail?id=${item.id}`,
 			});
 		},
-		handleAdd() {
-			uni.navigateTo({
-				url: `/pages/wareHouse/components/add`
-			});
+		handleEdit(item) {
+			if(item.id){
+				uni.navigateTo({
+					url: `/pages/wareHouse/components/edit?formType=edit&id=${item.id}`
+				});
+			}else{
+				uni.navigateTo({
+					url: `/pages/wareHouse/components/edit?formType=add`
+				});
+			}
 		},
 		// 获取仓库卡片数据
 		getCard() {

pages/wareHouse/styles/detail.scss

@@ -114,11 +114,15 @@
         right: 0;
         height: 120rpx;
         background-color: #fff;
-        display: flex;
-        align-items: center;
-        justify-content: space-around;
+        display: grid;
+        padding-right:10rpx;
         box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1);
-        
+        &.fourPart{
+            grid-template-columns: 1fr 1fr 1fr 1fr;
+        }
+        &.fivePart{
+            grid-template-columns: 1fr 1fr 1fr 1.5fr 1fr;
+        }
         .bar_item{
             flex: 1;
             height: 100%;
@@ -133,14 +137,26 @@
                 gap: 8rpx;
                 padding: 14rpx 22rpx;
                 border-radius: 20rpx;
-                background-color: #ca8a04;
-                box-shadow: 0 10px 15px -3px #fef08a, 0 4px 6px -4px #fef08a;
+                height:46rpx;
                 .bar_text{
                     margin-top: 0;
                     color: #ffffff;
                     font-size: 23rpx;
                 }
             }
+            .orange{
+                background-color: #ca8a04;
+                box-shadow: 0 10px 15px -3px #fef08a, 0 4px 6px -4px #fef08a;
+            }
+
+            .blue{
+                background-color: #007bff;
+                box-shadow: 0 10px 15px -3px #93c5fd, 0 4px 6px -4px #93c5fd;
+                .bar_img{
+                    width: 34rpx;
+                    height: 40rpx;
+                }
+            }
             
             .bar_text{
                 margin-top: 8rpx;

pages/wareHouse/styles/add.scss

@@ -32,12 +32,14 @@
     bottom: 0;
     padding: 20rpx;
     display: grid;
-    grid-template-columns: 1fr 1fr;
     gap: 10px;
     box-shadow: 0 4px 25px 2px rgba(0, 0, 0, 0.1);
     background: #fff;
     z-index: 1;
     width:fill-available;
+    &.col-2{
+        grid-template-columns: 1fr 1fr;
+    }
 }
 
 ::v-deep .u-form-item {

store/modules/user.js

@@ -28,8 +28,8 @@ export default {
 		netConfig: {
 			// http://59.42.9.166:9520/proxy
 			// http://10.0.7.100:9500
-			ip: "https://crm.nanjingshiyu.com/prod-api", // ip
-			// ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
+			// ip: "https://crm.nanjingshiyu.com/prod-api", // ip
+			ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
 			// ip : "/api", // 测试环境ip
 			// ip : "http://47.113.184.101", // 测试环境ip
 			// ip: "http://172.16.7.200", // ip