linweizeng 3 anni fa
parent
commit
e0c4599fa8

+ 1 - 1
pages/hold/hold.vue

@@ -88,7 +88,7 @@
 					page = this.current * 10
 				}
 				let sql =
-					`select id_,bian_zhi_shi_jian,wei_tuo_dan_hao_,bao_cun_biao_ti_ from t_mjsjdzcb where bian_zhi_ren_ = '${useId}' order by create_time_ desc LIMIT ${page},10`
+					`select id_,bian_zhi_shi_jian,wei_tuo_dan_hao_,bao_cun_biao_ti_ from t_mjsjdzcb where bian_zhi_ren_ = '${useId}' and create_time_ > DATE_SUB(NOW(),INTERVAL 3 MONTH) order by create_time_ desc LIMIT ${page},10`
 
 				let requestData = this.$sig(sql)
 				this.$http.post("/ibps/business/v3/sys/universal/inputSqlSelectData", requestData).then(res => {

+ 1 - 1
pages/jiance/jindu.vue

@@ -49,7 +49,7 @@
 				<view style=" width: 100%; text-align: right; padding-top: 5rpx;padding-bottom: 0rpx;">
 					<u-button class="m-r-15" type="error" size="mini" @click="repulse(item.id_)"
 						v-if="(item.wei_tuo_zhuang_ta == '待审核' || item.wei_tuo_zhuang_ta == '待审批') && item.shi_fou_guo_shen_ != '已退回'">
-						退回申请
+						回申请
 					</u-button>
 					<u-button class="m-r-15" type="primary" size="mini" style=""
 						@click="editOrder(item.id_,item.he_tong_bian_hao_,'0', 'detail')">明细

+ 1 - 1
pages/jiance/list.vue

@@ -44,7 +44,7 @@
 					<!-- v-if="item.zhuang_tai_ && (item.zhuang_tai_ == '待运营中心审核' || item.zhuang_tai_ == '待检测中心审核' || item.zhuang_tai_ == '待财务审核' || item.zhuang_tai_ == '待样品接收')" -->
 					<view class="btnList"
 						v-if="item.wei_tuo_zhuang_ta && (item.wei_tuo_zhuang_ta == '待审核' ||item.wei_tuo_zhuang_ta == '已编制' || item.wei_tuo_zhuang_ta == '待财务审核' || item.wei_tuo_zhuang_ta == '待签订' || item.wei_tuo_zhuang_ta == '待样品接收')">
-						<u-button type="warning" size="mini" @click="goto(item.id_)">样品确定</u-button>
+						<u-button type="warning" size="mini" @click="goto(item.id_)">样品修改</u-button>
 					</view>
 				</view>
 			</uni-section>

+ 30 - 3
pages/jiance/order.vue

@@ -33,7 +33,13 @@
 				</u-form-item>
 			</uni-group>
 
-			<uni-group mode="card" :title="'样品' + (index+1)" v-for="(item,index) in form.lhypb" :key="index">
+			<view class="tagBox">
+				<uni-tag class="tagSin" :text="'样品:'+(index+1)" :type="lhypbIndex == index ? 'primary':'warning'"
+					:circle="true" v-for="(item,index) in form.lhypb" :key="index" @click="lhypbIndex = index" />
+			</view>
+
+			<uni-group mode="card" :title="'样品' + (index+1)" v-for="(item,index) in form.lhypb" :key="index"
+				v-if="index == lhypbIndex">
 				<u-form-item label="样品名称" prop="yangPinMingCheng" required>
 					<u-input placeholder="请输入样品名称" v-model="item.yangPinMingCheng"
 						:disabled="type == 'detail'?true :false" />
@@ -354,6 +360,12 @@
 				<autograph @save="save" @clear="clear" @close="close"></autograph>
 			</view>
 		</u-popup>
+
+		<u-popup v-model="lhypbShow" mode="bottom" height="80%">
+			<view>
+				<lhypb-message ref="lhypbMessage" :jianCeTypeList="jianCeTypeList"></lhypb-message>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -363,6 +375,7 @@
 	import autograph from '@/components/autograph/autograph'
 	import popup from '@/components/popup/popup.vue'
 	import order from './order/test.json'
+	import lhypbMessage from '@/pages/jiance/order/lhypbMessage.vue'
 
 	import {
 		ACCESS_TOKEN,
@@ -371,6 +384,9 @@
 	} from "@/common/util/constants"
 	import service from './order/meth.js'
 	export default {
+		components: {
+			lhypbMessage
+		},
 		data() {
 			return {
 				form: {
@@ -493,9 +509,10 @@
 				taskId: '',
 				total: 0,
 				popupShow: false,
-				selectShow: false
-
+				selectShow: false,
 
+				lhypbIndex: 0,
+				lhypbShow: false
 			}
 		},
 		onLoad(options) {
@@ -1338,6 +1355,16 @@
 		margin-top: 25rpx;
 	}
 
+	.tagBox {
+		display: flex;
+		flex-wrap: wrap;
+		margin: 20rpx 10rpx;
+
+		.tagSin {
+			margin: 10rpx;
+		}
+	}
+
 	/deep/ .uni-group__content {
 		padding: 15rpx 25rpx;
 	}

+ 238 - 0
pages/jiance/order/lhypbMessage.vue

@@ -0,0 +1,238 @@
+<template>
+	<view>
+		<view class="u-m-20">
+			<u-form :model="form" ref="form" label-width="220" :error-type="errorType">
+				<u-form-item label="样品名称" prop="yangPinMingCheng" required>
+					<u-input placeholder="请输入样品名称" v-model="form.yangPinMingCheng" />
+				</u-form-item>
+				<u-form-item label="样品编号">
+					<u-input placeholder="请输入样品编号" v-model="form.yangPinBianHao" disabled />
+				</u-form-item>
+				<u-form-item label="姓名">
+					<u-input placeholder="请输入姓名" v-model="form.xingMing" />
+				</u-form-item>
+				<u-form-item label="性别">
+					<u-radio-group v-model="form.xingBie">
+						<u-radio v-for="(it, index) in sexList" :key="index" :name="it.name">
+							{{it.name}}
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item label="年龄">
+					<u-input placeholder="请输入年龄" v-model="form.nianLing" />
+				</u-form-item>
+				<u-form-item label="送检批号/编号" prop="songJianPiHao" required>
+					<u-input placeholder="请输入送检批号/编号" v-model="form.songJianPiHao" />
+				</u-form-item>
+				<u-form-item label="样本状态" prop="yangPinZhuangTai" required>
+					<u-input placeholder="请选择样本状态" type="select" v-model="form.yangPinZhuangTai"
+						@click="sheetClick('state',index)" />
+				</u-form-item>
+				<u-form-item label="送检时间" prop="songJianShiJian" required>
+					<u-input placeholder="请选择送检时间" type="select" v-model="form.songJianShiJian"
+						@click="dateClick('inspect',index)" />
+				</u-form-item>
+				<u-form-item label="备注">
+					<u-input placeholder="请输入备注" v-model="form.beiZhu1" />
+				</u-form-item>
+				<u-form-item label="检测类型">
+					<u-input placeholder="请选择检测类型" type="select" v-model="form.jianCeType"
+						@click="selectClick('jianCeType',index)" />
+				</u-form-item>
+
+				<u-form-item label="检测项目" prop="name" label-position="top">
+					<checkbox-group v-for="(it, x) in form.jianCeList" :key="x" @click="changeIndex(it,index,x)">
+						<label class=" uni-list-cell uni-list-cell-pd"
+							v-show="(it.jian_ce_lei_bie_==item.jianCeType) || it.checked"
+							style="display: flex;margin: 15rpx 10rpx;font-size: 20rpx;line-height: 40rpx;">
+							<view>
+								<checkbox :checked="it.checked" :value="it.id_" />
+							</view>
+							<view style="margin-left: 10rpx;font-size: 28rpx;">
+								<view>
+									{{it.jian_ce_lei_bie_ || ''}}-{{it.jian_ce_xiang_mu_ || ''}}
+									<text style="color: red;">[{{it.zhe_hou_jia_ge_ || '当'}}元]</text>
+								</view>
+								<view>{{it.yi_ju_de_biao_zhu || ''}}</view>
+								<view>报告周期(工作日):{{it.bao_gao_zhou_qi_g || '当'}}天</view>
+								<view>送样要求:{{it.yang_pin_tiao_jia || ''}}</view>
+							</view>
+						</label>
+					</checkbox-group>
+					<view v-for="(it, x) in form.jianCeList" :key="x" v-if="it.checked">
+						<view class="uni-list-cell uni-list-cell-pd">
+							<view
+								style="margin-left: 10rpx;font-size: 28rpx;line-height: 40rpx;background: #eee;padding: 10rpx;">
+								<view>
+									{{it.jian_ce_lei_bie_ || ''}}-{{it.jian_ce_xiang_mu_ || ''}}[{{it.zhe_hou_jia_ge_ || ''}}元]
+								</view>
+								<view>{{it.yi_ju_de_biao_zhu || ''}}</view>
+								<view>报告周期(工作日):{{it.bao_gao_zhou_qi_g || '当'}}天</view>
+								<view>送样要求:{{it.yang_pin_tiao_jia || ''}}</view>
+							</view>
+						</view>
+					</view>
+				</u-form-item>
+
+				<view class="qingshe" @click="form.showBoolean1 = !form.showBoolean1">
+					<view>
+						①
+					</view>
+					<view>
+						<u-icon name="arrow-up" v-if="form.showBoolean1"></u-icon>
+						<u-icon name="arrow-down" v-else></u-icon>
+					</view>
+				</view>
+				<block v-if="form.showBoolean1">
+					<u-form-item label="样品类型①">
+						<u-input placeholder="请选择样品类型①" type="select" v-model="form.yangPinLeiXing"
+							@click="sheetClick('yangpinType1',index)" />
+					</u-form-item>
+					<u-form-item label="样品运输条件①">
+						<u-input placeholder="请选择样品运输条件①" type="select" v-model="form.yangBenYunShuTiao"
+							@click="sheetClick('transportType1',index)" />
+					</u-form-item>
+					<u-form-item label="数量①">
+						<uni-number-box v-model="form.shuLiang"></uni-number-box>
+					</u-form-item>
+					<u-form-item label="样品规格①">
+						<u-input placeholder="请输入样品规格①" v-model="form.yangPinGuiGe" />
+						<u-button slot="right" type="success" size="mini" @click="sheetClick('specification1',index)">规格
+						</u-button>
+					</u-form-item>
+				</block>
+
+				<view class="qingshe" @click="form.showBoolean2 = !form.showBoolean2">
+					<view>
+						②
+					</view>
+					<view>
+						<u-icon name="arrow-up" v-if="form.showBoolean2"></u-icon>
+						<u-icon name="arrow-down" v-else></u-icon>
+					</view>
+				</view>
+				<block v-if="form.showBoolean2">
+					<u-form-item label="样品类型②">
+						<u-input placeholder="请选择样品类型②" type="select" v-model="form.yangPinLeiXingEr"
+							@click="sheetClick('yangpinType2',index)" />
+					</u-form-item>
+					<u-form-item label="样品运输条件②">
+						<u-input placeholder="请选择样品运输条件②" type="select" v-model="form.yangPinYunShuTiao"
+							@click="sheetClick('transportType2',index)" />
+					</u-form-item>
+					<u-form-item label="数量②">
+						<uni-number-box v-model="form.shuLiangEr"></uni-number-box>
+					</u-form-item>
+					<u-form-item label="样品规格②">
+						<u-input placeholder="请输入样品规格②" v-model="form.yangPinGuiGeEr" />
+						<u-button slot="right" type="success" size="mini" @click="sheetClick('specification2',index)">规格
+						</u-button>
+					</u-form-item>
+				</block>
+
+				<view class="qingshe" @click="form.showBoolean3 = !form.showBoolean3">
+					<view>
+						③
+					</view>
+					<view>
+						<u-icon name="arrow-up" v-if="form.showBoolean3"></u-icon>
+						<u-icon name="arrow-down" v-else></u-icon>
+					</view>
+				</view>
+				<block v-if="form.showBoolean3">
+					<u-form-item label="样品类型③">
+						<u-input placeholder="请选择样品类型③" type="select" v-model="form.yangPinLeiXingSan"
+							@click="sheetClick('yangpinType3',index)" />
+					</u-form-item>
+					<u-form-item label="样品运输条件③">
+						<u-input placeholder="请选择样品运输条件③" type="select" v-model="form.yangPinYunShuSan"
+							@click="sheetClick('transportType3',index)" />
+					</u-form-item>
+					<u-form-item label="数量③">
+						<!-- <u-number-box v-model="item.shuLiangSan" v-if="type != 'detail'"></u-number-box> -->
+						<uni-number-box v-model="item.shuLiangSan"></uni-number-box>
+					</u-form-item>
+					<u-form-item label="样品规格③">
+						<u-input placeholder="请输入样品规格③" v-model="form.yangPinGuiGeSan" />
+						<u-button slot="right" type="success" size="mini" @click="sheetClick('specification3',index)">规格
+						</u-button>
+					</u-form-item>
+				</block>
+
+				<view class="qingshe" @click="form.showBoolean4 = !form.showBoolean4">
+					<view>
+						④
+					</view>
+					<view>
+						<u-icon name="arrow-up" v-if="form.showBoolean4"></u-icon>
+						<u-icon name="arrow-down" v-else></u-icon>
+					</view>
+				</view>
+				<block v-if="form.showBoolean4">
+					<u-form-item label="样品类型④">
+						<u-input placeholder="请选择样品类型④" type="select" v-model="form.yangPinLeiXingSi"
+							@click="sheetClick('yangpinType4',index)" />
+					</u-form-item>
+					<u-form-item label="样品运输条件④">
+						<u-input placeholder="请选择样品运输条件④" type="select" v-model="form.yangPinYunShuSi"
+							@click="sheetClick('transportType4',index)" />
+					</u-form-item>
+					<u-form-item label="数量④">
+						<uni-number-box v-model="item.shuLiangSi"></uni-number-box>
+					</u-form-item>
+					<u-form-item label="样品规格④">
+						<u-input placeholder="请输入样品规格④" v-model="item.yangPinGuiGeSi" />
+						<u-button slot="right" type="success" size="mini" @click="sheetClick('specification4',index)">规格
+						</u-button>
+					</u-form-item>
+				</block>
+				<u-form-item label="项目名称" prop="xiangMuMingCheng" v-if="form.weiTuoHeTong == '技术服务协议'">
+					<u-input placeholder="请输入项目名称" v-model="form.xiangMuMingCheng" />
+				</u-form-item>
+				<u-form-item label="样品总价" prop="yangPinZongJia">
+					<u-input v-model="form.yangPinZongJia" disabled />
+				</u-form-item>
+			</u-form>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import order from './test.json'
+	export default {
+		data() {
+			return {
+				errorType: ['toast'],
+				form: {
+
+				},
+				sexList: order.sex,
+				list: []
+			}
+		},
+		methods: {
+			selectClick(type) {
+				this.listType = type
+				this.selectShow = true
+				if (type == 'jianCeType') {
+					this.list = this.jianCeTypeList
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.qingshe {
+		background-color: #f0f9eb;
+		color: #67c23a;
+		padding: 15rpx 20rpx;
+		border-radius: 8rpx;
+
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 25rpx;
+	}
+</style>

+ 1 - 1
pages/jiance/order/meth.js

@@ -101,7 +101,7 @@ export default {
 			let show = jian_ce_xiang_mu2_.some(item => item == '1039826037036285952' || item ==
 				'1040205909151711232')
 			if (show) {
-				itemData.mingChengShow = true
+				obj.mingChengShow = true
 			}
 
 			TList.push(obj)