1

.hbuilderx/launch.json

@@ -1,16 +1,20 @@
-{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+{
+    // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
     // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
     "version" : "0.0",
-    "configurations": [{
+    "configurations" : [
-     	"app-plus" : 
         {
+            "app-plus" : {
                 "launchtype" : "local"
             },
-     	"default" : 
+            "default" : {
-     	{
                 "launchtype" : "local"
             },
             "type" : "uniCloud"
+        },
+        {
+            "playground" : "standard",
+            "type" : "uni-app:app-android"
         }
     ]
 }

components/tabBar/tabBar.vue

@@ -12,7 +12,7 @@
 				<image mode="aspectFit" src="@/static/icons/tabbar/order.png" v-show="aindex != 2"></image>
 				<image mode="aspectFit" src="@/static/icons/tabbar/order-checked.png" v-show="aindex == 2"></image>
 			</view>
-			<view class="">工单</view>
+			<view class="">{{ title }}</view>
 		</view>
 <!--		<view class="box" :class="{active: aindex == 3}" @click="getgogo(3)">-->
 <!--			<view class="imgs">-->
@@ -57,7 +57,14 @@
 			}
 		},
 		props: {
-			msg: String|Number
+      msg: {
+        type: String|Number,
+        default: ''
+      },
+      title: {
+        type: String,
+        default: '工单'
+      },
 		},
 		onLoad() {
 		  this.userInfo = getUserInfo();

config.js

@@ -1,12 +1,14 @@
 // 应用全局配置
 module.exports = {
 	// baseUrl: 'https://www.nuoyunr.com',
-	// baseUrl: 'http://192.168.1.17:48080',
+	// baseUrl: 'http://124.222.105.7:48080',
-	baseUrl: "http://localhost:48080",
+	baseUrl: 'http://192.168.1.17:48080',
+	// baseUrl: "http://localhost:48080",
 	imagesUrl: 'http://shequ.0315e.com/static/images/pages/',
 	baseImageUrl: 'https://www.nuoyunr.com/minio/',
 	shareUrl: 'https://www.lighting-it.cn/share?inviteId=',
 	wsUrl: 'ws://192.168.1.17:48080',
+	//com.carService.qx
 	// 应用信息
 	appInfo: {
 		// 应用名称

manifest.json

@@ -41,9 +41,27 @@
                 ]
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             /* SDK配置 */
             "sdkConfigs" : {}
+        },
+        "nativePlugins" : {
+            "Ba-KeepAlive" : {
+                "__plugin_info__" : {
+                    "name" : "安卓保活（采用多种主流技术） Ba-KeepAlive",
+                    "description" : "原生保活插件，支持市面上大部分机型，Android4.4到13.0 。为定位、推送、websocket、定时任务、蓝牙、聊天等保驾护航（**注意：**不保证支持所有机型和场景，建议先试用再购买）",
+                    "platforms" : "Android",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=9423",
+                    "android_package_name" : "com.carService.qx",
+                    "ios_bundle_id" : "",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "9423",
+                    "parameters" : {}
+                }
+            }
         }
     },
     /* 快应用特有相关 */

pages-order/orderList/orderList.vue

@@ -34,7 +34,8 @@
         </scroll-view>
       </view>
     </view>
-    <tabBarVue msg="2"></tabBarVue>
+    <tabBarVue v-if="isRepairWarehouse" title="采购单" msg="2"></tabBarVue>
+    <tabBarVue v-else msg="2"></tabBarVue>
   </view>
 </template>
 

pages-repair/apply/newWare.vue

@@ -58,7 +58,7 @@
           <text class="formValue"></text>
         </view>
         <view style="padding-bottom: 60rpx;border-bottom: 1px solid #ddd;" class="formItem">
-          <checkbox-group v-model="checkedCorpIdList">
+          <checkbox-group v-model="checkedCorpIdList" @change="cs">
             <checkbox v-for="(item, index) in allCompanyList" :key="index" :value="item.id" :checked="item.checked">{{ item.corpName }}</checkbox>
           </checkbox-group>
         </view>
@@ -153,6 +153,9 @@ export default {
 
   },
   methods: {
+    cs(e){
+      this.checkedCorpIdList =e.detail.value
+    },
     /**
      * 初始化配件数据
      */
@@ -290,10 +293,14 @@ export default {
         return
       }
       //组装可用的子公司
+
+      console.log(this.allCompanyList,"this.checkedCorpIdList")
+      debugger
       if(this.checkedCorpIdList.length>0){
         this.formData.corpId = this.checkedCorpIdList.join()
       }
       //组装所属分类
+      this.formData.status = "01"
       this.formData.type = this.allTypeList[this.typeIndex].id
       this.formData.unit = this.allUnitList[this.unitIndex].value
       this.formData.dataForm = this.allFromList[this.fromIndex].value

pages-warehouse/home/home.vue

@@ -88,7 +88,7 @@
         </scroll-view>
       </view>
     </view>
-    <tabBarVue msg="1"></tabBarVue>
+    <tabBarVue msg="1" title="采购单"></tabBarVue>
   </view>
 </template>
 

pages-warehouse/inOutWarehouse/inOutWarehouse.vue

@@ -38,7 +38,7 @@
     <view class="footer" v-if="isToBeReviewed">
       <text class="label"></text>
       <text class="repairNum"></text>
-<!--      <view class="submit"  @click="toPart">采购</view>-->
+      <view class="submit"  @click="toPart">采购</view>
       <view class="submit" @click="submit">{{isReceive?'通知领料':'通知退料'}}</view>
     </view>
   </view>

pages-warehouse/inOutWarehouse/part.vue

@@ -5,7 +5,7 @@
       <view class="list">
         <view class="formItem" v-if="!isInput">
           <text class="formLabel">供应商</text>
-          <input type="text" style="text-align: right" v-model="serviceName" placeholder="请选择供应商"/>
+          <input type="text" style="text-align: right" v-model="serviceName" placeholder="请输入供应商名称"/>
           <view @click="searchService">查询</view>
         </view>
         <view class="formItem" v-if="!isInput">
@@ -17,11 +17,11 @@
         </view>
         <uni-card v-for="(item, index) in partList" :key="index" :title="item.name" :extra="'上次价格：'+item.purPrice">
           <view class="formItem">
-            <text class="formLabel">单价</text>
+            <view class="formLabel">单价</view>
             <input type="number" style="text-align: right" v-model="item.newPrice" placeholder="请输入单价"/>
           </view>
           <view class="formItem">
-            <text class="formLabel">数量</text>
+            <view class="formLabel">数量</view>
             <input type="number" style="text-align: right" v-model="item.count" placeholder="请输入数量"/>
           </view>
         </uni-card>
@@ -325,6 +325,7 @@ export default {
 .formLabel {
   font-size: 32rpx;
   color: #333333;
+  width: 50px;
 }
 
 .formValue {

pages/index/index.vue

@@ -10,10 +10,21 @@
 	export default {
 		data() {
 			return {
-
+				keepLive: {
+					channelId: 'Ba-KeepAlive',
+					channelName: "Ba-KeepAlive",
+					title: "汽修小助手正在运行",
+					content: "汽修小助手正在运行",
+					dataResult: "",
+					type: undefined
+				}
 			}
 		},
 		onLoad() {
+		// #ifdef APP
+			//保活技术
+			this.register()
+		// #endif
       if(getToken()){
         //跳转首页
         //判断是否是仓管，仓管需要跳单独的首页
@@ -35,7 +46,18 @@
 		}
 		},
 		methods: {
-
+			register() { //注册
+				console.log(keepAlivePlugin, 'keepAlive');
+				keepAlivePlugin.register({
+						channelId: this.keepLive.channelId,
+						channelName: this.keepLive.channelName,
+						title: this.keepLive.title,
+						content: this.keepLive.content,
+					},
+					(res) => {
+						console.log('保活注册', res);
+					});
+			},
 		}
 	}
 </script>