fix:bug

pages/wareHouse/components/add.vue

@@ -26,7 +26,7 @@
                                 @click="handlePasteRecognition(recognitionContent)"></u-button>
                         </view>
                     </u-form-item>
-                    <u-form-item label="商品图片" prop="imgs" borderBottom>
+                    <u-form-item required label="商品图片" prop="goodPicFileList" borderBottom>
                         <view class="imgs_scroll">
                             <ImgsRowScroll v-if="formData.goodPicFileList.length > 0" :isShowDeleteIcon="true"
                                 @deleteImgInfo="getDeleteGoodPicInfo" imgMode="aspectFill" :totalWidth="400"
@@ -44,7 +44,7 @@
                     </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">
+                            :colNum="4" mode="single" echoInfo="1">
                         </TabSelect>
                     </u-form-item>
                     <u-form-item label="品牌" required prop="dictLabel" class="u-form-item-row" borderBottom
@@ -81,7 +81,7 @@
                     </u-form-item>
                     <u-form-item label="商品成色" required prop="productCondition" borderBottom>
                         <TabSelect :tabList="productConditionList" :isClear="productConditionIsClear"
-                            @tabChange="handleTabChangeProductCondition" :colNum="2" mode="single"></TabSelect>
+                            @tabChange="handleTabChangeProductCondition" :colNum="2" mode="single" echoInfo="1"></TabSelect>
                     </u-form-item>
                     <u-form-item label="细节图" borderBottom>
                         <!-- <view class="detail_pic_container"> -->
@@ -114,11 +114,11 @@
                     </u-form-item>
                     <u-form-item label="商品属性" required prop="productAttribute" borderBottom>
                         <TabSelect :tabList="productAttributeList"  :colNum="4" mode="single"
-                            :isClear="productAttributeIsClear" @tabChange="handleTabChangeProductAttribute">
+                            :isClear="productAttributeIsClear" @tabChange="handleTabChangeProductAttribute" echoInfo="1">
                         </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>
+                        <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>
@@ -271,9 +271,9 @@ export default {
             formData: {
                 goodPicFileList: [],//商品图片
                 desc: '',
-                type: '',
-                dictLabel: '',
-                dictValue: '',
+                type: '1',
+                dictLabel: '艾美',
+                dictValue: '88',
                 series: '',
                 model: '',
                 dialType: '',
@@ -283,11 +283,12 @@ export default {
                 size: '',
                 yardage: '',
                 price: '',
-                productCondition: '',
+                productCondition: '1',
                 detailPicFileList: [],//细节图片
                 // detailVideoFileList:[],
                 productNo: '',
-                stock: null,
+                productAttribute: '1',
+                stock: 1,
                 costPrice: '',
                 samePrice: '',
                 agentPrice: '',
@@ -316,7 +317,7 @@ export default {
             continuousWarehousing: [],//是否连续入库 1：是 0：否
             rules: {
                 goodPicFileList: [
-                    { required: true, message: '请上传商品图片', trigger: 'blur' },
+                    { required: true, message: '请上传商品图片', trigger: 'change' },
                 ],
                 desc: [
                     { required: true, message: '请输入商品描述', trigger: 'blur' },
@@ -334,7 +335,7 @@ export default {
                     { required: true, message: '请选择商品属性', trigger: 'blur' },
                 ],
                 stock: [
-                    { required: true, message: '请输入库存数量', trigger: 'blur' },
+                    { required: true, message: '请输入库存数量' },
                 ],
                 recycleTime: [
                     { required: true, message: '请选择回收时间', trigger: 'blur' },
@@ -459,6 +460,8 @@ export default {
         },
         // 提交表单
         submitForm(submitType) {
+            console.log(this.formData);
+            
             this.$refs.addForm.validate().then((valid) => {
                 if (valid) {
                     if (this.formData.title == '') {
@@ -498,9 +501,9 @@ export default {
             this.formData = {
                 goodPicFileList: [],//商品图片
                 desc: '',
-                type: '',
-                dictLabel: '',
-                dictValue: '',
+                type: '1',
+                dictLabel: '艾美',
+                dictValue: '88',
                 series: '',
                 model: '',
                 dialType: '',
@@ -510,11 +513,12 @@ export default {
                 size: '',
                 yardage: '',
                 price: '',
-                productCondition: '',
+                productCondition: '1',
                 detailPicFileList: [],//细节图片
                 // detailVideoFileList:[],
                 productNo: '',
-                stock: null,
+                productAttribute: '1',
+                stock: 1,
                 costPrice: '',
                 samePrice: '',
                 agentPrice: '',

pages/wareHouse/components/detail.vue

@@ -12,7 +12,7 @@
 
         <!-- 立即下架按钮 -->
         <view class="immediate_off_shelf">
-            <u-button type="error" shape="circle" size="large" @click="handleOffShelf">
+            <u-button type="error" shape="circle" size="large" @click="handleOffShelf" :disabled="lockStatus === '1'">
                 <u-icon :name="downStatus == '0' ? 'arrow-upward' : 'arrow-downward'" size="38rpx"
                     color="#ffffff"></u-icon>
                 <text>{{ downStatus == '0' ? '立即上架' : '立即下架' }}</text>
@@ -25,7 +25,7 @@
                 <u-icon name="download" size="44rpx" color="#606266"></u-icon>
                 <text class="action_text">下载图文</text>
             </view>
-            <view class="action_item">
+            <view class="action_item" @click="handleShare">
                 <u-icon name="share" size="44rpx" color="#606266"></u-icon>
                 <text class="action_text">分享</text>
             </view>
@@ -39,7 +39,7 @@
                     <u-upload @afterRead="afterRead" multiple></u-upload>
                 </u-modal>
             </view>
-            <view class="action_item">
+            <view class="action_item" @click="handleCutImg">
                 <u-icon name="cut" size="44rpx" color="#606266"></u-icon>
                 <text class="action_text">智能抠图</text>
             </view>
@@ -126,7 +126,7 @@
                     <view class="price_label">销售价格</view>
                     <view class="price_value suggested"
                         @click.stop="toggleEditField('salePrice', coreInfo.salePrice)">
-                        <u-input v-if="editMode.price" v-model="tempValues.salePrice" :autoFocus="true"
+                        <u-input v-if="editMode.salePrice" v-model="tempValues.salePrice" :autoFocus="true"
                             @blur="!globalEditMode && saveEditField('salePrice', tempValues.salePrice, 'salePrice')" />
                         <span v-else>￥{{ coreInfo.salePrice || '-' }}</span>
                     </view>
@@ -257,6 +257,20 @@ export default {
         this.getGoodsDetail();
     },
     methods: {
+        // 分享
+        handleShare() {
+            uni.showToast({
+                title: '分享功能暂未开放',
+                icon: 'none'
+            })
+        },
+        // 智能抠图
+        handleCutImg() {
+            uni.showToast({
+                title: '智能抠图功能暂未开放',
+                icon: 'none'
+            })
+        },
         payTypeFormatter(val){
             switch (val) {
                 case '1':
@@ -281,11 +295,20 @@ export default {
                 id: this.goodsId,
                 lockStatus: this.lockStatus === '1' ? '0' : '1',
             }).then(res => {
-                uni.showToast({
-                    title: this.lockStatus === '1' ? '解锁成功' : '锁单成功',
-                    icon: 'success'
-                })
-                this.getGoodsDetail();
+                if(res.code === 200){
+                    uni.showToast({
+                        type: "success",
+                        title: this.lockStatus === '1' ? '解锁成功' : '锁单成功',
+                        icon: 'success'
+                    })
+                    this.getGoodsDetail();
+                }else{
+                    uni.showToast({
+                        type: "error",
+                        title: res.msg || '操作失败',
+                        icon: false
+                    })
+                }
             })
         },
         showRecyclePersonPicker() {
@@ -376,9 +399,9 @@ export default {
             uni.$u.api.wareHouseDown({
                 id: this.goodsId,
                 downStatus: this.downStatus === '1' ? '0' : '1',
-            }).then(res => {
+            }).then(() => {
                 uni.showToast({
-                    title: this.downStatus === '1' ? '上架成功' : '下架成功',
+                    title: this.downStatus === '1' ? '下架成功' : '上架成功',
                     icon: 'success'
                 })
                 this.getGoodsDetail();
@@ -450,6 +473,8 @@ export default {
                 identifyingPerson: info.identifyingPerson,
                 identifyingPersonId: info.identifyingPersonId,
             }
+            console.log('修改图片',data);
+            
             uni.$u.api.wareHouseUpdate(data).then(res => {
                 uni.showToast({
                     title: '编辑成功',
@@ -556,7 +581,6 @@ export default {
                 uni.$u.api.uploadFile(item.url).then((res) => {
                     this.tempImgsUrl.push({url:res.data.url});
                     uni.$u.toast("文件上传成功");
-                    this.showEditImgsModal = false;
                 }).catch(() => {
                     uni.$u.toast("上传文件失败");
                 })

pages/wareHouse/components/openOrder.vue

@@ -15,7 +15,7 @@
                   </view>
                   <view class="advice_price">
                      <view class="advice_price_title">建议标价</view>
-                     <view class="advice_price_price">￥<u--input v-model="openOrderForm.price" placeholder="请输入建议标价" border="none" type="number"></u--input></view>
+                     <view class="advice_price_price">￥<u--input v-model="openOrderForm.price" placeholder="建议标价" border="none" type="number"></u--input></view>
                   </view>
                </view>
             </view>
@@ -23,7 +23,7 @@
          <u--form labelPosition="top" :model="openOrderForm" :rules="rules" ref="openOrderForm" label-width="200rpx">
             <view class="card_item">
                <u-form-item label="成交金额" required prop="dealPrice">
-                  ￥<u--input v-model="openOrderForm.dealPrice" placeholder="请输入成交金额" border="none" type="number"></u--input>
+                  ￥<u--input v-model="openOrderForm.dealPrice" placeholder="成交金额" border="none" type="number"></u--input>
                </u-form-item>
             </view>
             <view class="card_item">
@@ -189,13 +189,16 @@ export default {
          dateShow: false,
       }
    },
-   onLoad() {
-      const params = this.$route.query.params
+   onLoad(options) {
+      const params = options.params || '{}'
+      
       if (params) {
          this.openOrderForm.quantity = 1
          Object.keys(JSON.parse(params)).forEach(key => {
             this.openOrderForm[key] = JSON.parse(params)[key]
          })
+         console.log(this.openOrderForm);
+         
          this.getOrderTypeList()
       }
    },

pages/wareHouse/index.vue

@@ -102,9 +102,7 @@
 					<view class="more">
 						<view></view>
 						<!-- <u-icon name="more-dot-fill" size="16" color="#666666"></u-icon> -->
-						<text class="goods-stock"
-							v-if="goods.stock !== null && goods.stock !== undefined && goods.stock > 0">数量:{{ goods.stock
-							}}</text>
+						<text class="goods-stock">数量:{{ goods.stock}}</text>
 					</view>
 				</view>
 				<show-emtry v-if="goodsList.length === 0"></show-emtry>
@@ -199,8 +197,8 @@ export default {
 	methods: {
 		getTypeList(){
             this.$getDicts("crm_form_category").then(res => {
-                this.tabList = res
-				this.tabList.unshift({ dictLabel: "全部", dictValue: '' })
+                this.tabList = [...res]
+                this.tabList.unshift({ dictLabel: "全部", dictValue: '' })
             })
         },
 		uploadTestAfter(info){

utils/api.js

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