update

.hbuilderx/launch.json

@@ -14,6 +14,10 @@
      	{
      		"launchtype" : "local"
      	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "local"
+     	},
      	"type" : "uniCloud"
      }
     ]

pages/fileView/reportList.vue

@@ -9,6 +9,7 @@
 				<view class="title">报告编号：{{item.bao_gao_bian_hao_}}</view>
 				<view class="title">样品编号：{{item.yang_pin_bian_hao}}</view>
 				<view class="title">样品名称：{{item.yang_pin_ming_che}}</view>
+				<view class="title">送检批号：{{item.song_jian_pi_hao_}}</view>
 				<view class="title">报告名称：<text style="color: #7349ff;">{{item.FILE_NAME_ || ''}}</text></view>
 				<view class="title">版本号：<text style="color: #7349ff;">{{item.run_qian_lu_jing_ || ''}}</text></view>
 				<view class="title">报告类别：{{item.bao_gao_lei_bie_}}</view>

pages/jiance/list.vue

@@ -22,6 +22,10 @@
 							<view class="title">样品名称：</view>
 							<view> {{item.yang_pin_ming_che}} </view>
 						</view>
+						<view style="display: flex;line-height: 50rpx;">
+							<view class="title">送样批号：</view>
+							<view> {{item.song_jian_pi_hao_}} </view>
+						</view>
 						<view style="display: flex;line-height: 50rpx;">
 							<view class="title">收样时间：</view>
 							<view> {{item.shou_yang_ri_qi_}} </view>
@@ -148,7 +152,7 @@
 				}
 
 				let sql =
-					`select a.id_,a.create_time_,a.yang_pin_ming_che,a.yang_pin_bian_hao,c.fu_kuan_zhuang_ta,c.wei_tuo_bian_hao_,c.wei_tuo_zhuang_ta,b.shou_yang_ri_qi_,b.bei_zhu_,b.yan_shou_jie_guo_,d.ke_hu_zhang_hao_ ` +
+					`select a.id_,a.create_time_,a.yang_pin_ming_che,a.song_jian_pi_hao_,a.yang_pin_bian_hao,c.fu_kuan_zhuang_ta,c.wei_tuo_bian_hao_,c.wei_tuo_zhuang_ta,b.shou_yang_ri_qi_,b.bei_zhu_,b.yan_shou_jie_guo_,d.ke_hu_zhang_hao_ ` +
 					`from t_lhypb a ` +
 					`left join t_lhwtsqb c on a.parent_id_ = c.id_ ` +
 					`left join t_bjd d on c.he_tong_id_ = d.id_ ` +

pages/jiance/manyi.vue

@@ -33,8 +33,8 @@
 			<u-icon class="uni-icon" name="close-circle-fill" color="rgb(192, 196, 204)" size="42" v-if="keHuLianXiRen != ''" @click="keHuLianXiRen = ''"></u-icon>
 		</view>
 		<view class="cu-form-group">
-			<view class="title">客户联系邮箱:</view>
-			<input placeholder="请输入客户联系邮箱" v-model="keHuLianXiYouXian" name="input"></input>
+			<view class="title">备注:</view>
+			<input placeholder="请输入备注" v-model="keHuLianXiYouXian" name="input"></input>
 			<u-icon class="uni-icon" name="close-circle-fill" color="rgb(192, 196, 204)" size="42" v-if="keHuLianXiYouXian != ''" @click="keHuLianXiYouXian = ''"></u-icon>
 		</view>
 		<uni-section title="服务态度" type="line" padding>
@@ -204,7 +204,7 @@
 					this.buMenName = info.user.qq || ''
 					this.lianxidianhua = info.user.mobile || ''
 					this.keHuLianXiRen = info.user.name || ''
-					this.keHuLianXiYouXian = info.user.email || ''
+					// this.keHuLianXiYouXian = info.user.email || ''
 					this.shiWuShuoMing = info.user.qq || ''
 				}
 			},

pages/jiance/order.vue

@@ -450,13 +450,19 @@
 			//超级用户 获取全部客户信息
 			getAdministrator() {
 				let sql =
-					`select ID_,NAME_ from ibps_party_employee where GROUP_ID_ = '1041786072788369408' and STATUS_ = 'actived'`
+					`select ID_,NAME_,qq_,GROUP_ID_ from ibps_party_employee where STATUS_ = 'actived' and ID_ != '-1' and ID_ != '702117247933480960' and ID_ != '1115242459127873536' and ID_ != '1115242765924433920' and ID_ != '1100468240921919488' order by FIELD(GROUP_ID_, '1041786072788369408') desc,create_time_ desc`
+				// `select ID_,NAME_ from ibps_party_employee where GROUP_ID_ = '1041786072788369408' and STATUS_ = 'actived'`
 				let requestData = this.$sig(sql)
 				this.$http.post("/ibps/business/v3/sys/universal/inputSqlSelectData", requestData).then(res => {
 					if (res.data.state == 200) {
 						let result = res.data.variables.data
 						result.forEach((item, index) => {
-							this.$set(item, 'text', item.NAME_)
+							if (item.GROUP_ID_ == '1041786072788369408') {
+								this.$set(item, 'text', `${item.NAME_} (${item.qq_})`)
+							} else {
+								this.$set(item, 'text', `${item.NAME_} (内部)`)
+							}
+
 							this.$set(item, 'value', item.ID_)
 						})
 						this.userList = result
@@ -1466,6 +1472,7 @@
 				this.activeNum = index
 			},
 			userListChange(e) {
+				this.hetongList = []
 				this.getDataHetong('', e)
 			},
 			chuBaoGaoChange(e) {

pages/wallet/wallet.vue

@@ -129,7 +129,7 @@
 				let useId = info.user.id
 
 				let sql =
-					`select tc.* from t_czjl tc left join  t_khqb tk on tc.parent_id_ = tk.id_ and tk.xuan_ze_ke_hu_ = '${useId}' order by tc.create_time_ desc`
+					`select tc.* from t_czjl tc left join  t_khqb tk on tc.parent_id_ = tk.id_ where tk.xuan_ze_ke_hu_ = '${useId}' order by tc.create_time_ desc`
 				let requestData = this.$sig(sql)
 				this.$http.post("/ibps/business/v3/sys/universal/inputSqlSelectData", requestData).then(res => {
 					if (res.data.state == 200) {
@@ -145,7 +145,7 @@
 				let useId = info.user.id
 
 				let sql =
-					`select tc.* from t_kfjl tc left join  t_khqb tk on tc.parent_id_ = tk.id_ and tk.xuan_ze_ke_hu_ = '${useId}' order by tc.create_time_ desc`
+					`select tc.* from t_kfjl tc left join  t_khqb tk on tc.parent_id_ = tk.id_ where tk.xuan_ze_ke_hu_ = '${useId}' order by tc.create_time_ desc`
 				let requestData = this.$sig(sql)
 				this.$http.post("/ibps/business/v3/sys/universal/inputSqlSelectData", requestData).then(res => {
 					if (res.data.state == 200) {
@@ -294,4 +294,4 @@
 		background-color: #ffffff !important;
 		color: #2f72ff !important;
 	}
-</style>
+</style>

store/index.js

@@ -79,19 +79,22 @@ export default new Vuex.Store({
 													resolve(res)
 													return
 												}
-												if (info && info.org && info.org.id == '1041786072788369408') {
-													uni.setStorageSync('administrator', false)
-													resolve(res)
-													return
-												} else {
-													uni.showToast({
-														title: '该账户不是客户账号',
-														icon: 'none',
-														duration: 2000
-													})
-													reject(res)
-													return
-												}
+												// if (info && info.org && info.org.id == '1041786072788369408') {
+												// 	uni.setStorageSync('administrator', false)
+												// 	resolve(res)
+												// 	return
+												// } else {
+												// 	uni.showToast({
+												// 		title: '该账户不是客户账号',
+												// 		icon: 'none',
+												// 		duration: 2000
+												// 	})
+												// 	reject(res)
+												// 	return
+												// }
+												uni.setStorageSync('administrator', false)
+												resolve(res)
+												return
 											} else {
 												reject(res)
 											}

uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue

@@ -18,10 +18,8 @@
 						<view class="uni-select__selector-empty" v-if="mixinDatacomResData.length === 0">
 							<text>{{emptyTips}}</text>
 						</view>
-						<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData"
-							:key="index" @click="change(item)">
-							<text
-								:class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
+						<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData" :key="index" @click="change(item)">
+							<text :class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
 						</view>
 					</scroll-view>
 				</view>
@@ -447,4 +445,9 @@
 		-o-text-overflow: ellipsis;
 		overflow: hidden;
 	}
-</style>
+
+
+	.input-text {
+		width: 100%;
+	}
+</style>