update

pages/fileView/reportList.vue

@@ -17,15 +17,10 @@
 				</view>
 				<view class="btn">
 					<view>
-						<u-button type="warning" size="mini" @click="goDe(item.id_)" style="margin-right: 10rpx;"
-							v-if="item.zhuang_tai_ == '待编制' || item.zhuang_tai_ == '待审核'">修改信息</u-button>
-						<u-button type="warning" size="mini" @click="goto(item.id_,'1')"
-							v-if="item.zhuang_tai_ == '待审核' && item.EXT_ != 'docx'">预览报告</u-button>
-						<u-button type="warning" size="mini" @click="goto(item.id_,'2')" style="margin-right: 10rpx;"
-							v-if="item.zhuang_tai_ == '已完成'">查看报告</u-button>
-						<u-button type="primary" size="mini"
-							v-if="(item.zhuang_tai_ == '已完成') || (item.shi_fou_guo_shen_ == '已编制')"
-							@click="geDownload(item.bao_gao_pdf_,item.FILE_NAME_, item.EXT_)">
+						<u-button type="warning" size="mini" @click="goDe(item.id_)" v-if="item.zhuang_tai_ == '待编制' || item.zhuang_tai_ == '待审核'">修改信息</u-button>
+						<u-button type="warning" size="mini" @click="goto(item.id_,'1')" style="margin-left: 10rpx;" v-if="(item.zhuang_tai_ == '待审核' || item.zhuang_tai_ == '待审批') && item.EXT_ != 'docx'">预览报告</u-button>
+						<u-button type="warning" size="mini" @click="goto(item.id_,'2')" style="margin-left: 10rpx;" v-if="item.zhuang_tai_ == '已完成'">查看报告</u-button>
+						<u-button type="primary" size="mini" @click="geDownload(item.bao_gao_pdf_,item.FILE_NAME_, item.EXT_)" style="margin-left: 10rpx;" v-if="(item.zhuang_tai_ == '已完成') || (item.shi_fou_guo_shen_ == '已编制') || (item.zhuang_tai_ == '待审批') || (item.zhuang_tai_ == '待审核')">
 							下载报告</u-button>
 					</view>
 				</view>
@@ -200,4 +195,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/jiance/jindu.vue

@@ -44,11 +44,11 @@
 				</view>
 
 				<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 class="m-r-15" type="error" size="mini" @click="repulse(item.id_,item.xiu_gai_bei_zhu_)" 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="success" size="mini" @click="editOrder(item.id_,item.he_tong_bian_hao_,'1', 'edit')" v-if="item.wei_tuo_zhuang_ta == '待编制' || item.shi_fou_guo_shen_ == '已退回'">修改</u-button>
-					<u-button class="m-r-15 btn-back-color" type="primary" size="mini" style="" @click="editOrder(item.id_,item.he_tong_bian_hao_,'0', 'detail')">明细
+					<u-button class="m-r-15" type="success" size="mini" @click="editOrder(item.id_,item.he_tong_bian_hao_,'1', 'edit',item.bao_gao_bian_zhi_)" v-if="item.wei_tuo_zhuang_ta == '待编制' || item.shi_fou_guo_shen_ == '已退回'">修改</u-button>
+					<u-button class="m-r-15 btn-back-color" type="primary" size="mini" style="" @click="editOrder(item.id_,item.he_tong_bian_hao_,'0', 'detail',item.bao_gao_bian_zhi_)">明细
 					</u-button>
 					<!-- <u-button type="warning" size="mini" class="m-r-15" @click="getTag(item.id_)">样品标签</u-button>
 					<u-button type="warning" size="mini" @click="goto(item.id_)">查看报告</u-button> -->
@@ -65,7 +65,7 @@
 
 
 		<u-popup v-model="show" mode="bottom" closeable>
-			<apply ref="apply" :id="id" v-if="show" @saveSuccees='saveSuccees'></apply>
+			<apply ref="apply" :id="id" :value="value" v-if="show" @saveSuccees="saveSuccees"></apply>
 		</u-popup>
 	</view>
 </template>
@@ -97,7 +97,8 @@
 				ReachBottomShow: true,
 				showClearIcon: true,
 
-				show: false
+				show: false,
+				value: ''
 			}
 		},
 		// 页面加载
@@ -144,9 +145,9 @@
 			 * @param {Object} buttonFlag
 			 * 页面跳转
 			 */
-			editOrder(editId, heTongBianHao, buttonFlag, type) {
+			editOrder(editId, heTongBianHao, buttonFlag, type, bao_gao_bian_zhi_) {
 				uni.navigateTo({
-					url: `/pages/jiance/order?id=${editId}&buttonFlag=${buttonFlag}&heTongBianHao=${heTongBianHao}&type=${type}`
+					url: `/pages/jiance/order?id=${editId}&buttonFlag=${buttonFlag}&heTongBianHao=${heTongBianHao}&type=${type}&baoGaoBianZhi=${bao_gao_bian_zhi_}`
 				})
 			},
 
@@ -245,8 +246,9 @@
 			 * @param {Object} id
 			 * 退回
 			 */
-			repulse(id) {
+			repulse(id, content) {
 				this.id = id
+				this.value = content
 				this.show = true
 			},
 			/**

pages/jiance/list/apply.vue

@@ -19,11 +19,15 @@
 			id: {
 				type: String,
 				default: ''
+			},
+			value: {
+				type: String,
+				default: ''
 			}
 		},
 		data() {
 			return {
-				value: '',
+				// value: '',
 				userid: '',
 				time: ''
 			}
@@ -32,7 +36,7 @@
 			this.getInit()
 		},
 		methods: {
-			getInit(){
+			getInit() {
 				let info = uni.getStorageSync(USER_INFO);
 				if (info.employee.id) {
 					this.userid = info.employee.id || ''
@@ -92,4 +96,4 @@
 	.btn {
 		margin-top: 30rpx;
 	}
-</style>
+</style>

pages/jiance/list/specimen.vue

@@ -161,7 +161,7 @@
 					</view>
 				</view>
 				<block v-if="showBoolean3">
-					<u-form-item label="样本类③" required>
+					<u-form-item label="样本类型③" required>
 						<u-input v-model="form.yang_pin_lei_san_" />
 						<u-button slot="right" type="success" size="mini" @click="sheetClick('yangpinType3','样本类型')">选择
 						</u-button>

pages/jiance/order.vue

@@ -55,7 +55,7 @@
 						</u-radio-group>
 						<text v-else>{{getButtChange(form.baoGaoLeiXing,reportTypeList)}}</text>
 					</u-form-item>
-					<u-form-item label="出报告要求" prop="name">
+					<u-form-item label="出报告要求" prop="chuJuBaoGaoYaoQiu">
 						<u-radio-group v-model="form.chuJuBaoGaoYaoQiu" v-if="type != 'detail'" @change="getMultiple()">
 							<u-radio v-for="(item, index) in reportRequireList" :key="index" :name="item.name">
 								{{item.name}}
@@ -376,6 +376,16 @@
 			}
 		},
 		onLoad(options) {
+			//获取账号id
+			let info = uni.getStorageSync(USER_INFO)
+			if (info.employee.id) {
+				this.userid = info.employee.id || ''
+			}
+
+			if (options.baoGaoBianZhi) {
+				this.baoGaoBianZhi = options.baoGaoBianZhi
+			}
+
 			let administrator = uni.getStorageSync('administrator')
 			this.administrator = administrator
 			this.getInit()
@@ -383,9 +393,8 @@
 			if (administrator) {
 				this.getAdministrator()
 			}
-
 			if ((administrator && options.id) || !administrator) {
-				this.getDataHetong(options.id)
+				this.getDataHetong(options.id, this.baoGaoBianZhi)
 			}
 
 			//一开始查合同  如果修改或者明细 传option.id
@@ -475,11 +484,7 @@
 			},
 			//初始化
 			getInit() {
-				//获取账号id
 				let info = uni.getStorageSync(USER_INFO)
-				if (info.employee.id) {
-					this.userid = info.employee.id || ''
-				}
 				if (info.org !== null) {
 					this.orgId = info.org.id || ''
 				}
@@ -594,6 +599,7 @@
 						let form = service.getForm(result)
 						this.form = form
 
+
 						if (result.chu_ju_bao_gao_ya == '特急') {
 							this.total = parseFloat(result.zong_jia_) / 1.5
 						} else if (result.chu_ju_bao_gao_ya == '加急') {
@@ -659,11 +665,21 @@
 				if (!this.administrator) {
 					userId = info.user.id
 				}
+				if (!userId) {
+					return
+				}
+				let sql = ``
 				// let sql =
 				// 	`select tb.*,ty.ke_hu_ming_cheng_ as ke_hu_dang_wei from t_bjd tb,t_yxkh ty where tb.ke_hu_ming_cheng_ = ty.id_  and tb.zhuang_tai_='生效中' and tb.shi_fou_guo_shen_ = '已完成'`
 
-				let sql =
+
+				sql =
 					`select tb.*,ty.ke_hu_ming_cheng_ as ke_hu_dang_wei from t_bjd tb,t_yxkh ty where tb.ke_hu_ming_cheng_ = ty.id_ and tb.ke_hu_zhang_hao_ ='${userId}' and tb.zhuang_tai_='生效中' and tb.shi_fou_guo_shen_ = '已完成'`
+
+				// if (this.administrator && this.type == '') {
+				// 	sql =
+				// 		`select tb.*,ty.ke_hu_ming_cheng_ as ke_hu_dang_wei from t_bjd tb,t_yxkh ty where tb.ke_hu_ming_cheng_ = ty.id_ and tb.zhuang_tai_='生效中' and tb.shi_fou_guo_shen_ = '已完成'`
+				// }
 				let requestData = this.$sig(sql)
 				this.$http.post("/ibps/business/v3/sys/universal/inputSqlSelectData", requestData).then(res => {
 					if (res.data.state == 200) {
@@ -700,7 +716,7 @@
 				//从合同中选择付款方式
 				if (e != '') {
 					let data = this.hetongList.find((item, index) => item.id_ == e)
-					if (type == '') {
+					if (!type) {
 						this.form.weiTuoDanLaiYuan = data.wei_tuo_dan_lai_y || ''
 						this.form.weiTuoHeTong = data.he_tong_lei_xing_ || ''
 						this.form.fuKuanFangShi = data.fu_kuan_fang_shi_ || ''
@@ -711,7 +727,6 @@
 						this.form.weiTuoFangMingChe = data.ke_hu_dang_wei || ''
 						this.form.heTongBianHao = data.he_tong_bian_hao_ || ''
 					}
-
 					this.getJiance(e, type, weiTouId)
 					this.getTaoCanList(data.xuan_ze_tao_can_)
 				}
@@ -750,8 +765,8 @@
 									}
 								}
 							})
-
 							result.forEach((item, index) => {
+								item.zhe_hou_jia_ge_ = (parseFloat(item.zhe_hou_jia_ge_)).toFixed(2)
 								this.$set(item, 'checked', false)
 							})
 							this.jianCeList = result
@@ -848,6 +863,7 @@
 				} else {
 					this.form.zongJia = total
 				}
+				this.form.zongJia = (this.form.zongJia).toFixed(2)
 			},
 			//特急 加急 常规
 			getMultiple() {
@@ -980,6 +996,9 @@
 				if (this.form.biaoQianTuPianJudge == '否') {
 					this.form.biaoQianTuPian = '否'
 				}
+				if (!this.administrator) {
+					this.form.baoGaoBianZhiYuan = this.userid
+				}
 
 				this.form.lhypb.forEach((item, index) => {
 					if (this.buttonFlagNum === '3') {
@@ -1314,6 +1333,7 @@
 					let data = meth.getMjypbSin(res, this.jianCeList, this.taoCanList)
 					this.lhypbShow = true
 					this.lhypbIndexData = 'add'
+					this.itemType = true
 					this.$nextTick(() => {
 						this.$refs.lhypbMessage.getInit(data)
 					})
@@ -1326,6 +1346,7 @@
 				} else {
 					this.itemType = true
 				}
+				console.log(type)
 				this.lhypbIndexData = type
 				this.lhypbShow = true
 

pages/jiance/order/meth.js

@@ -45,9 +45,10 @@ export default {
 			weiTuoDanLaiYuan: item.wei_tuo_lei_xing_,
 			weiTuoBianHao: item.wei_tuo_bian_hao_,
 			heTongId: item.he_tong_id_,
+			heTongBianHao: item.he_tong_bian_hao_,
 			weiTuoHeTong: item.wei_tuo_he_tong_,
 			weiTuoDanWei: item.wei_tuo_dan_wei_,
-			songJianDanWei: item.wei_tuo_dan_wei_,
+			songJianDanWei: item.song_jian_dan_wei,
 			qiWangWanChengShi: item.qiWangWanChengShi,
 			lhypb: [],
 			fuKuanFangShi: item.fu_kuan_fang_shi_,