|
|
@@ -70,10 +70,49 @@
|
|
|
@click="dateClick('inspect',index)" v-if="type != 'detail'" />
|
|
|
<text v-else>{{item.songJianShiJian}}</text>
|
|
|
</u-form-item>
|
|
|
- <u-form-item label="送样要求">
|
|
|
- <u-input placeholder="请输入送样要求" v-model="item.songYangYaoQiu"
|
|
|
+ <u-form-item label="检毕样品处置">
|
|
|
+ <u-input placeholder="请输入检毕样品处置" v-model="item.songYangYaoQiu"
|
|
|
:disabled="type == 'detail'?true :false" />
|
|
|
</u-form-item>
|
|
|
+ <u-form-item label="检测类型" v-if="type != 'detail'">
|
|
|
+ <u-input placeholder="请选择检测类型" type="select" v-model="item.jianCeType"
|
|
|
+ @click="selectClick('jianCeType',index)" />
|
|
|
+ </u-form-item>
|
|
|
+
|
|
|
+ <u-form-item label="检测项目" prop="name" label-position="top">
|
|
|
+ <checkbox-group v-for="(it, x) in item.jianCeList" :key="x" @click="changeIndex(it,index,x)"
|
|
|
+ v-if="type != 'detail'">
|
|
|
+ <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_ || '0'}}元]</text>
|
|
|
+ </view>
|
|
|
+ <view>{{it.yi_ju_de_biao_zhu || ''}}</view>
|
|
|
+ <view>报告周期（工作日）:{{it.bao_gao_zhou_qi_g || '0'}}天</view>
|
|
|
+ <view>送样要求:{{it.yang_pin_tiao_jia || ''}}</view>
|
|
|
+ </view>
|
|
|
+ </label>
|
|
|
+ </checkbox-group>
|
|
|
+ <view v-for="(it, x) in item.jianCeList" :key="x" v-if="it.checked && type=='detail'">
|
|
|
+ <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 || '0'}}天</view>
|
|
|
+ <view>送样要求:{{it.yang_pin_tiao_jia || ''}}</view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </u-form-item>
|
|
|
|
|
|
<view class="qingshe" @click="item.showBoolean1 = !item.showBoolean1">
|
|
|
<view>
|
|
|
@@ -218,43 +257,6 @@
|
|
|
<u-input v-model="item.yangPinZongJia" disabled />
|
|
|
</u-form-item>
|
|
|
|
|
|
- <u-form-item label="检测类型" v-if="type != 'detail'">
|
|
|
- <u-input placeholder="请选择检测类型" type="select" v-model="item.jianCeType"
|
|
|
- @click="selectClick('jianCeType',index)" />
|
|
|
- </u-form-item>
|
|
|
-
|
|
|
- <u-form-item label="检测项目" prop="name" label-position="top">
|
|
|
- <checkbox-group v-for="(it, x) in item.jianCeList" :key="x" @click="changeIndex(it,index,x)"
|
|
|
- v-if="type != 'detail'">
|
|
|
- <label class=" uni-list-cell uni-list-cell-pd" v-show="it.jian_ce_lei_bie_==item.jianCeType"
|
|
|
- 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.xiang_mu_dan_jia_ || '0'}}元]</text>
|
|
|
- </view>
|
|
|
- <view>{{it.yi_ju_de_biao_zhu || ''}}</view>
|
|
|
- <view>报告周期（工作日）:{{it.bao_gao_zhou_qi_g || '0'}}天</view>
|
|
|
- </view>
|
|
|
- </label>
|
|
|
- </checkbox-group>
|
|
|
- <view v-for="(it, x) in item.jianCeList" :key="x" v-if="it.checked && type=='detail'">
|
|
|
- <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.xiang_mu_dan_jia_ || ''}}元]
|
|
|
- </view>
|
|
|
- <view>{{it.yi_ju_de_biao_zhu || ''}}</view>
|
|
|
- <view>报告周期（工作日）:{{it.bao_gao_zhou_qi_g || '0'}}天</view>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- </u-form-item>
|
|
|
-
|
|
|
<u-button type="error" class="btn" @click="deletSing(index)" v-if="type != 'detail'">删除样品{{index+1}}
|
|
|
</u-button>
|
|
|
</uni-group>
|
|
|
@@ -573,6 +575,7 @@
|
|
|
this.jianCeTypeList = result.jianCeTypeList
|
|
|
this.total = result.originalTotal
|
|
|
this.getBeingTimeCount(result.weiTuoBianHao)
|
|
|
+ this.getJiance(result.heTongId, '')
|
|
|
uni.hideLoading()
|
|
|
}
|
|
|
})
|
|
|
@@ -697,11 +700,15 @@
|
|
|
//从合同中选择付款方式
|
|
|
if (e != '') {
|
|
|
let data = this.hetongList.find((item, index) => item.id_ == e)
|
|
|
+ console.log(data)
|
|
|
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_
|
|
|
this.form.weiTuoDanWei = data.zhuan_huan_ke_hu_
|
|
|
this.form.songJianDanWei = data.zhuan_huan_ke_hu_
|
|
|
+ this.form.weiTuoFangLianXiD = data.dian_hua_
|
|
|
+ this.form.weiTuoFangLianXiR = data.lian_xi_ren_
|
|
|
+ this.form.weiTuoFangMingChe = data.ke_hu_dang_wei
|
|
|
this.getJiance(e)
|
|
|
}
|
|
|
},
|
|
|
@@ -959,7 +966,7 @@
|
|
|
this.form.bianZhiRen = this.userid
|
|
|
this.form.bianZhiShiJian = this.time
|
|
|
this.form.bianZhiBuMen = this.orgId
|
|
|
- this.form.weiTuoZhuangTai = '已编制'
|
|
|
+ this.form.weiTuoZhuangTai = '待审核'
|
|
|
this.form.fuKuanZhuangTai = '未结清'
|
|
|
|
|
|
this.form.lhypb.forEach((item, index) => {
|
|
|
@@ -974,6 +981,10 @@
|
|
|
}
|
|
|
})
|
|
|
item.jianCeXiangMu = item.jianCeXiangMu2.join(",")
|
|
|
+
|
|
|
+ item.yangPinZongShu = parseInt(item.shuLiangSi) + parseInt(item.shuLiangSan) + parseInt(item
|
|
|
+ .shuLiangEr) +
|
|
|
+ parseInt(item.shuLiang)
|
|
|
})
|
|
|
|
|
|
//委托提交判断
|
|
|
@@ -1167,6 +1178,7 @@
|
|
|
duration: 2000
|
|
|
})
|
|
|
}
|
|
|
+
|
|
|
this.getLhypbh(res => {
|
|
|
let obj = {
|
|
|
id: '',
|
|
|
@@ -1211,6 +1223,8 @@
|
|
|
lianXiRen: '',
|
|
|
weiTuoDanWei: '',
|
|
|
weiTuoDanHao: '',
|
|
|
+ yangPinZongShu: 0,
|
|
|
+ jieYangZhuangTai: "待接收",
|
|
|
|
|
|
showBoolean1: true,
|
|
|
showBoolean2: false,
|
linweizeng