优化新购入库审核问题

.env.development

@@ -0,0 +1,7 @@
+# 开发环境配置
+ENV = 'development'
+
+# 若依管理系统/开发环境
+VUE_APP_BASE_API = '/dev-api'
+
+

.env.production

@@ -0,0 +1,5 @@
+# 生产环境配置
+ENV = 'production'
+
+# 若依管理系统/生产环境
+VUE_APP_BASE_API = '/dev-api'

App.vue

@@ -4,6 +4,8 @@
 			// app内禁止横屏
 			plus.screen.lockOrientation('portrait-primary')
 			console.log('App Launch')
+			
+			console.log(process.env.NODE_ENV,'当前运行环境····')
 		},
 		onShow: function() {
 			console.log('App Show')

apis/http.js

@@ -1,6 +1,8 @@
+
+const ENV = process.env.NODE_ENV
 class HttpConfig {
 	// #ifdef H5
-	baseUrl = "/api"
+	// baseUrl = "/api"
 	// #endif
 	// #ifdef APP-PLUS
 	// baseUrl = "http://112.29.103.165:21624"
@@ -15,17 +17,20 @@ class HttpConfig {
 	// baseUrl = "http://10.40.92.52:28080"
 	// baseUrl = "http://10.40.92.140:28080"
 	// baseUrl = "https://z.csgmall.com.cn/gl"
-	baseUrl = "http://192.168.2.160:39080" // 梁超
+	// baseUrl = "http://192.168.2.160:39080" // 梁超
+	// baseUrl = "http://192.168.2.218:39080" // 福
+	target = "http://192.168.2.218:39080"   // 开发阶段后台ip
 	// #endif
 	// 基地址 （部署时使用 需要加 dev-api）
 	// authPath = `${this.baseUrl}/dev-api/auth`
 	// systemPath = `${this.baseUrl}/dev-api/system`
 	// basePath = `${this.baseUrl}/dev-api/base`
 	// materialPath = `${this.baseUrl}/dev-api/material`
-	authPath = `${this.baseUrl}/auth`
-	systemPath = `${this.baseUrl}/system`
-	basePath = `${this.baseUrl}/material/base`
-	materialPath = `${this.baseUrl}/material`
+	baseUrl = ENV === 'production' ? '/api' : target
+	authPath = ENV === 'production' ? `${this.baseUrl}/dev-api/auth` : `${this.baseUrl}/auth`
+	systemPath = ENV === 'production' ? `${this.baseUrl}/dev-api/system` : `${this.baseUrl}/system`
+	basePath = ENV === 'production' ? `${this.baseUrl}/dev-api/material/base` : `${this.baseUrl}/material/base`
+	materialPath = ENV === 'production' ? `${this.baseUrl}/dev-api/material` : `${this.baseUrl}/material`
 	// 短链
 	serviceUrl = {
 		login: {
@@ -115,10 +120,10 @@ class HttpConfig {
 			backMaterialReceiveList: '/backReceive/getbackReceiveList', // 获取退料接收列表
 			backMaterialReceiveDetail: '/backReceive/receiveView',
 			backMaterialSetNumBack: '/backReceive/setNumBack',
-		    backMaterialQrcodeQuery:'/backReceive/qrcodeQuery',
-		    backMaterialSetCodeBack:'/backReceive/setCodeBack',
-			backReceiveCodeQuery:"/backReceive/codeQuery",
-			backReceiveEndBack:"/backReceive/endBack",
+			backMaterialQrcodeQuery: '/backReceive/qrcodeQuery',
+			backMaterialSetCodeBack: '/backReceive/setCodeBack',
+			backReceiveCodeQuery: "/backReceive/codeQuery",
+			backReceiveEndBack: "/backReceive/endBack",
 			seeBackMaterialDetail: '/backReceive/backReceiveRecord', // 查看退料明细
 			searchRfid: '/backReceive/rfidCodeQuery', // 查询rfid
 			subRfid: '/backReceive/setRfidCodeBack', // rfid接收

pages/newBuyDetail/newBuyDetail.vue

@@ -3,12 +3,12 @@
         <view class="dataInfo">
             <view class="dataList" v-for="(item, index) in list" :key="index">
                 <view class="info-upper">
-                    <checkbox-group
+                    <!-- <checkbox-group
                         @change="checkClick(item)"
                         style="margin-right: 15rpx"
                         v-show="item.status == '0'">
                         <checkbox :checked="item.checked" />
-                    </checkbox-group>
+                    </checkbox-group> -->
                     <view class="details">
                         <view class="text">
                             <text
@@ -23,7 +23,7 @@
                                     >规格型号</span
                                 >{{ item.specificationType }}</text
                             >
-                            <text
+                            <text v-if="item.CNstatus !== '已入库'"
                                 ><span
                                     style="padding-right: 20rpx; color: #a6a6a6"
                                     >待入库数量</span
@@ -65,22 +65,23 @@
         </view>
         <!-- <button @click="delCart">删除</button> -->
         <view class="buy">
-            <view class="checked">
+            <!-- <view class="checked">
                 <checkbox-group @tap="checkAll">
                     <checkbox :checked="allChecked" />
                 </checkbox-group>
                 <text>全选</text>
-            </view>
-            <view style="display: flex">
-                <!-- <view class="total" style="margin-right: 15rpx;">
+            </view> -->
+            <!-- <view style="display: flex"> -->
+            <!-- <view class="total" style="margin-right: 15rpx;">
 					<view class="bill" @click="bindCode">
 						<text>绑定</text>
 					</view>
 				</view> -->
-                <view class="total">
-                    <view class="bill" @click="finishCart">
-                        <text>审核</text>
-                    </view>
+
+            <!-- </view> -->
+            <view class="total">
+                <view class="bill" @click="finishCart">
+                    <text>审核</text>
                 </view>
             </view>
         </view>
@@ -101,10 +102,10 @@
                         font-weight: normal;
                         text-align: center;
                     ">
-                    是否通过审批？
+                    是否确认入库？
                 </h4>
                 <view class="select-area">
-                    <view @click="modalConfirm">通过</view>
+                    <view @click="modalConfirm">确认</view>
                     <view @click="modalReject">驳回</view>
                     <!-- <uni-forms ref="examForm" :modelValue="examFormData" :rules="rules" label-position="top">
 						<uni-forms-item name="ifPass" required label="是否通过" label-width="150">
@@ -208,20 +209,30 @@
             },
             finishCart() {
                 let that = this;
-                that.totalGoods = that.list
-                    .filter((item) => {
-                        return item.checked == true;
-                    })
-                    .map((subItem) => {
-                        return {
-                            typeId: subItem["typeId"],
-                            maId: subItem["maId"],
-                            maCode: subItem["maCode"],
-                            inputNum: subItem["checkNum"],
-                            companyId: subItem["companyId"],
-                            manageType: subItem["manageType"],
-                        };
-                    });
+                // that.totalGoods = that.list
+                //     .filter((item) => {
+                //         return item.checked == true;
+                //     })
+                //     .map((subItem) => {
+                //         return {
+                //             typeId: subItem["typeId"],
+                //             maId: subItem["maId"],
+                //             maCode: subItem["maCode"],
+                //             inputNum: subItem["checkNum"],
+                //             companyId: subItem["companyId"],
+                //             manageType: subItem["manageType"],
+                //         };
+                //     });
+                that.totalGoods = that.list.map((subItem) => {
+                    return {
+                        typeId: subItem["typeId"],
+                        maId: subItem["maId"],
+                        maCode: subItem["maCode"],
+                        inputNum: subItem["checkNum"],
+                        companyId: subItem["companyId"],
+                        manageType: subItem["manageType"],
+                    };
+                });
                 if (that.totalGoods.length == 0) {
                     uni.showToast({
                         icon: "none",
@@ -337,7 +348,7 @@
                                 title: res.data.msg,
                                 success: () => {
                                     that.closePopup();
-                                    uni.navigateBack();
+                                    // uni.navigateBack();
                                 },
                             });
                         } else {
@@ -346,14 +357,15 @@
                                 icon: "none",
                                 title: res.data.msg,
                             });
-
-                            setTimeout(() => {
-                                uni.navigateBack();
-                            }, 500);
                         }
                     })
                     .catch((err) => {
                         console.log(err);
+                    })
+                    .finally(() => {
+                        setTimeout(() => {
+                            uni.navigateBack();
+                        }, 500);
                     });
             },
             fetchNewList() {
@@ -545,7 +557,7 @@
     .buy {
         display: flex;
         align-items: center;
-        justify-content: space-between;
+        justify-content: flex-end;
         position: fixed;
         left: 50%;
         bottom: 0;
@@ -566,9 +578,10 @@
     }
 
     .buy .total {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
+        // display: flex;
+        // align-items: center;
+        // justify-content: space-between;
+        margin-bottom: 10rpx;
     }
 
     .buy .total .price {