灵活业务

app/pages/index/index.vue

@@ -154,7 +154,7 @@
 					{
 						auth: false,
 						icon: '../../static/home-icon-06.jpg',
-						text: '车辆消杀',
+						text: '灵活业务',
 						url: '/pages/onely-disinfect/Index',
 						customer:true
 					},

app/pages/onely-disinfect/type-business-edit.vue

@@ -7,10 +7,10 @@
 			<view class="item-line">
 				基本信息
 			</view>
-			<view class="item" v-if="customerId==='1'">
+			<view class="item" v-if="!customerId||customerId=='1'">
 				<view class="l"><text style="color: red;">*</text>客户：</view>
 				<view class="r">
-					<picker  v-if="customer.list.length>0" class="p-picker" @change="customerChange($event)"
+					<picker v-if="customer.list.length>0" class="p-picker" @change="customerChange($event)"
 						:value="customer.index" :range="customer.list" range-key="name">
 						<text class="p-text">{{customer.list[customer.index].name}}</text>
 						<u-icon class="p-icon" name="arrow-down-fill" size="20"></u-icon>
@@ -62,7 +62,10 @@
 									<view slot="minus" class="minus">
 										<u-icon name="minus" size="12"></u-icon>
 									</view>
-									<text slot="input" style="width: 50px;text-align: center;"
+									<text v-if="item.inc==0" slot="input"
+										style="width: 50px;text-align: center;color: #E5E5E5;"
+										class="input">{{item.num}}</text>
+									<text v-else slot="input" style="width: 50px;text-align: center;"
 										class="input">{{item.num}}</text>
 									<view slot="plus" class="plus">
 										<u-icon name="plus" size="12"></u-icon>
@@ -93,7 +96,7 @@
 					index: 1,
 					list: ['空车', '载货']
 				},
-				customerId:'1',
+				customerId: '1',
 				customer: {
 					index: 0,
 					list: []
@@ -129,7 +132,7 @@
 		onLoad(options) {
 			this.form.id = options.id;
 			this.getOtherBusinessById();
-			this.customerId=uni.getStorageSync('customerId');
+			this.customerId = uni.getStorageSync('customerId');
 			let that = this;
 			uni.$on('getRemark', data => {
 				that.$nextTick(function() {
@@ -144,12 +147,17 @@
 		},
 		methods: {
 			getCustomerList() {
-				let p={judgeStatus: 2,pageNo:1,pageSize:30,	type: 0}
+				let p = {
+					judgeStatus: 2,
+					pageNo: 1,
+					pageSize: 30,
+					type: 0
+				}
 				this.$api.getCustomerList(p).then(resp => {
-					let list=resp.data;
+					let list = resp.data;
 					this.customer.list = list;
 					console.log(list)
-					this.customer.index=list.map(obj=>obj.id).indexOf(this.form.customerId);
+					this.customer.index = list.map(obj => obj.id).indexOf(this.form.customerId);
 				})
 			},
 			openRemarkFn(data) {
@@ -181,7 +189,7 @@
 				let index = e.detail.value;
 				this.type.index = index //当前picker选中的值
 			},
-			customerChange(e){
+			customerChange(e) {
 				let index = e.detail.value;
 				this.customer.index = index //当前picker选中的值
 			},
@@ -204,10 +212,10 @@
 				this.form.itemTypeId = this.itemType.id;
 				this.form.items = list;
 				this.form.carType = this.type.list[this.type.index]
-				if(this.customerId=='1'){
+				if (this.customerId == '1') {
 					this.form.customerId = this.customer.list[this.customer.index].id;
-				}else{
-					this.form.customerId=this.customerId
+				} else {
+					this.form.customerId = this.customerId
 				}
 				let that = this;
 				let content = '确认修改该业务'

app/pages/onely-disinfect/type-business.vue

@@ -8,7 +8,7 @@
 			<view class="item-line">
 				基本信息
 			</view>
-			<view class="item" v-if="customerId=='1'">
+			<view class="item" v-if="!customerId||customerId=='1'">
 				<view class="l"><text style="color: red;">*</text>客户：</view>
 				<view class="r">
 					<picker v-if="customer.list.length>0" class="p-picker" @change="customerChange($event)"
@@ -63,8 +63,10 @@
 									<view slot="minus" class="minus">
 										<u-icon name="minus" size="12"></u-icon>
 									</view>
-									<text slot="input" style="width: 50px;text-align: center;"
+									<text v-if="item.inc==0" slot="input" style="width: 50px;text-align: center;color: #E5E5E5;"
 										class="input">{{item.num}}</text>
+										<text v-else slot="input" style="width: 50px;text-align: center;"
+											class="input">{{item.num}}</text>
 									<view slot="plus" class="plus">
 										<u-icon name="plus" size="12"></u-icon>
 									</view>

sp-admin/sa-view/tb-item-type/tb-item-list.html

@@ -24,7 +24,8 @@
 					<sa-item type="text" name="名称" v-model="p.itemName"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 					<sa-item type="fast-btn" show="reset" style="display: inline;"></sa-item>
-					<el-button v-if="sa.isAuth('tb-item-manager-add')" type="primary" icon="el-icon-plus" @click="add()">新增
+					<el-button v-if="sa.isAuth('tb-item-manager-add')" type="primary" icon="el-icon-plus"
+						@click="add()">新增
 					</el-button>
 					<br />
 				</el-form>
@@ -33,11 +34,11 @@
 					<el-table-column type="index" width="50">
 					</el-table-column>
 					<sa-td name="明细名称" prop="itemName" width="300px"></sa-td>
-					<sa-td name="业务类型" prop="businessTypeName" ></sa-td>
+					<sa-td name="业务类型" prop="businessTypeName"></sa-td>
 					<sa-td name="收费类型" prop="payTypeName"></sa-td>
 					<sa-td name="价格" prop="price"></sa-td>
 					<sa-td name="计价单位" prop="unit"></sa-td>
-						<sa-td name="税率(%)" prop="taxRate"></sa-td>
+					<sa-td name="税率(%)" prop="taxRate"></sa-td>
 					<sa-td name="适合规格（米）">
 						<template slot-scope="s">
 							<label>{{s.row.minLength}}—{{s.row.carLength}}</label>
@@ -52,11 +53,11 @@
 						<template slot-scope="s">
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看
 							</el-button>
-							<el-button v-if="sa.isAuth('tb-item-manager-edit')" class="c-btn" type="primary" icon="el-icon-edit"
-								@click="update(s.row)">修改
+							<el-button v-if="sa.isAuth('tb-item-manager-edit')" class="c-btn" type="primary"
+								icon="el-icon-edit" @click="update(s.row)">修改
 							</el-button>
-							<el-button v-if="sa.isAuth('tb-item-manager-del')" class="c-btn" type="danger" icon="el-icon-delete"
-								@click="del(s.row)">删除
+							<el-button v-if="sa.isAuth('tb-item-manager-del')" class="c-btn" type="danger"
+								icon="el-icon-delete" @click="del(s.row)">删除
 							</el-button>
 						</template>
 					</el-table-column>
@@ -111,7 +112,7 @@
 					add: function(data) {
 						sa.showIframe('新增数据', 'tb-item-add.html?id=-1', '600px', '70%');
 					},
-					get(data){
+					get(data) {
 						sa.showIframe('数据详情', 'tb-item-info.html?id=' + data.id, '600px', '60%');
 					},
 					// 删除

sp-admin/static/sa.js

@@ -22,7 +22,7 @@ var sa = {
 		api_url: 'https://dxkaa1.bgigc.com/pro',
 		web_url: 'http://www.baidu.com'
 	}
-	sa.cfg = cfg_dev; // 最终环境 , 上线前请选择正确的环境
+	sa.cfg = cfg_test; // 最终环境 , 上线前请选择正确的环境
 })();
 
 

sp-server/app.pid

@@ -1 +1 @@
-22156
+27420

sp-server/src/main/java/com/pj/project/tb_item/TbItemMapper.xml

@@ -60,7 +60,7 @@
             a.min_weight,
             a.max_weight,
             b.need,b.type_id,b.need_remark,b.must_remark,
-            a.unit,b.inc,a.business_type,a.business_type_name,a.pay_type,a.pay_type_name,a.tax_rate
+            a.unit,b.inc,a.business_type,a.business_type_name,a.pay_type,a.pay_type_name,a.tax_rate,a.type_name,a.type_id
         FROM
             tb_item a,
             relation_type_item b