|
|
@@ -62,8 +62,9 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="yang_pin_bian_hao" label="样品编号" width="150">
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="yang_pin_ming_che" label="样品名称" width="">
|
|
|
+ <el-table-column prop="yang_pin_ming_che" label="样品名称" width="120">
|
|
|
</el-table-column>
|
|
|
+ <el-table-column prop="shi_fou_yu_bao_ga" label="是否预报告" width=""></el-table-column>
|
|
|
<el-table-column label="操作" align="left" width="100">
|
|
|
<template slot-scope="scope">
|
|
|
<el-popover placement="left" width="200">
|
|
|
@@ -142,7 +143,7 @@
|
|
|
>
|
|
|
<i class="el-icon-s-order"></i> 检测报告审批表
|
|
|
</div>
|
|
|
- <div v-if="scope.row.shi_fou_yu_bao_ga !='否'">
|
|
|
+ <div v-if=false>
|
|
|
<el-popover placement="left" width="200">
|
|
|
<div
|
|
|
class="div_test item"
|
|
|
@@ -225,8 +226,8 @@
|
|
|
@size-change="handleSizeChange"
|
|
|
@current-change="handleCurrentChange"
|
|
|
:current-page.sync="currentPage4"
|
|
|
- :page-sizes="[10, 20, 50, 100]"
|
|
|
- :page-size="20"
|
|
|
+ :page-sizes="[10, 15, 50, 100]"
|
|
|
+ :page-size="15"
|
|
|
layout="total, sizes, prev, pager, next, jumper"
|
|
|
:total="total"
|
|
|
>
|
|
|
@@ -252,7 +253,7 @@
|
|
|
data() {
|
|
|
return {
|
|
|
runqianId: "",
|
|
|
- total: 200,
|
|
|
+ total:0,
|
|
|
currentPage4: 1,
|
|
|
visible: false,
|
|
|
reports: {
|
|
|
@@ -274,7 +275,7 @@
|
|
|
hetong: [],
|
|
|
triggerType: "click",
|
|
|
wTBH: [],
|
|
|
- tongyonglujin: '',// 检测项目通用路径
|
|
|
+ tongyonglujin: '42明鉴/MJT 检测记录.rpx',// 检测项目通用路径
|
|
|
srcUrl: '',
|
|
|
fileUrl: '',
|
|
|
fileType: '',
|
|
|
@@ -320,21 +321,16 @@
|
|
|
},
|
|
|
},
|
|
|
created() {
|
|
|
- let sql ="select * from t_mjjcbg WHERE wei_tuo_lei_xing_ = '客户委托' AND lei_bie_qu_fen_yu ='非' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0,20";
|
|
|
- // let sql ="select * from t_mjjcbg WHERE wei_tuo_lei_xing_ = '客户委托' AND lei_bie_qu_fen_yu ='非' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0,20";
|
|
|
- // curdPost("sql", sql).then((response) => {
|
|
|
- // this_.tableData = response.variables.data;
|
|
|
- // });
|
|
|
+ let sql ="select * from t_mjjcbg WHERE wei_tuo_lei_xing_ = '客户委托' AND lei_bie_qu_fen_yu ='非' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao DESC limit 0,15";
|
|
|
this.loadData(sql);
|
|
|
- let sumsql =
|
|
|
- "select COUNT(*) AS sum FROM t_mjjcbg WHERE wei_tuo_lei_xing_ = '客户委托' AND lei_bie_qu_fen_yu ='非' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成')";
|
|
|
+ let sumsql ="select COUNT(*) AS sum FROM t_mjjcbg WHERE wei_tuo_lei_xing_ = '客户委托' AND lei_bie_qu_fen_yu ='非' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成')";
|
|
|
curdPost("sql", sumsql).then((response) => {
|
|
|
this.total = response.variables.data[0].sum;
|
|
|
});
|
|
|
- let sql2 ="select id_,yuan_shi_ji_lu_ba FROM t_mjjcnlfw WHERE id_ ='f5a95b425d444b549d5a217d4c031855'";
|
|
|
- curdPost("sql", sql2).then((response) => {
|
|
|
- this.tongyonglujin = response.variables.data[0].yuan_shi_ji_lu_ba;
|
|
|
- });
|
|
|
+ // let sql2 ="select id_,yuan_shi_ji_lu_ba FROM t_mjjcnlfw WHERE id_ ='f5a95b425d444b549d5a217d4c031855'";
|
|
|
+ // curdPost("sql", sql2).then((response) => {
|
|
|
+ // this.tongyonglujin = response.variables.data[0].yuan_shi_ji_lu_ba;
|
|
|
+ // });
|
|
|
},
|
|
|
methods: {
|
|
|
// 请求表格数据函数
|
|
|
@@ -377,44 +373,15 @@
|
|
|
this_.hetong = res.variables.data;
|
|
|
});
|
|
|
},
|
|
|
- juTiItem(info) {
|
|
|
- let itemId;
|
|
|
- let this_ = this;
|
|
|
- this.runqianId = "";
|
|
|
- this_.itemInfo =[];
|
|
|
- var sql =`select jian_ce_xiang_mu2,jian_ce_xiang_si_ ,jian_ce_xiang_me_ ,jian_ce_xiang_ms_ FROM t_mjypb WHERE wai_jian_= (SELECT jian_ce_shen_qing FROM t_mjjcbg WHERE id_= '${info.id_}') AND yang_pin_bian_hao = '${info.yang_pin_bian_hao}'`;
|
|
|
- curdPost("sql", sql).then((res) => {
|
|
|
- itemId = res.variables.data;
|
|
|
- if(itemId.length <=0 ||itemId ==null){
|
|
|
- return
|
|
|
- }
|
|
|
- this_.runqianId = itemId[0].jian_ce_xiang_mu2+','+itemId[0].jian_ce_xiang_si_+','+itemId[0].jian_ce_xiang_me_+','+itemId[0].jian_ce_xiang_ms_;
|
|
|
- var itemSql =`select a.id_,a.jian_ce_xiang_mu_ ,b.id_ as shujuid FROM t_mjjcnlfw AS a JOIN t_jchzb AS b ON a.id_ = b.jian_ce_xiang_mu_ WHERE b.yang_pin_bian_hao = '${info.yang_pin_bian_hao}'`;
|
|
|
- curdPost("sql", itemSql).then((res) => {
|
|
|
- this_.itemInfo = res.variables.data;
|
|
|
- });
|
|
|
-
|
|
|
- });
|
|
|
+ async juTiItem(info) {
|
|
|
+ let oIds = info.chu_yu_bao_gao_sh;
|
|
|
+ let ids ="'" + oIds.replace(",","','") + "'"
|
|
|
+ let this_ = this;
|
|
|
+ let sql = `select a.id_,a.jian_ce_xiang_mu_ ,b.id_ as shujuid FROM t_jchzb AS b JOIN t_mjjcnlfw AS a ON b.jian_ce_xiang_mu_ =a.id_ WHERE b.id_ IN(${ids})`
|
|
|
+ await curdPost("sql", sql).then((res) => {
|
|
|
+ this_.itemInfo = res.variables.data;
|
|
|
+ });
|
|
|
},
|
|
|
- // juTiItem(info) {
|
|
|
- // let itemId;
|
|
|
- // let this_ = this;
|
|
|
- // var sql =
|
|
|
- // "select b.id_ ,c.jian_ce_xiang_mu2 FROM t_mjjcbg a JOIN t_jchzb b ON a.jian_ce_shen_qing = b.shen_qing_dan_id_ JOIN t_mjypb c ON a.jian_ce_shen_qing = c.wai_jian_ WHERE a.id_ = '" +
|
|
|
- // info.id_ +
|
|
|
- // "'";
|
|
|
- // curdPost("sql", sql).then((res) => {
|
|
|
- // itemId = res.variables.data;
|
|
|
- // this_.runqianId = itemId[0].id_;
|
|
|
- // var itemSql =
|
|
|
- // "select id_,jian_ce_xiang_mu_ FROM t_mjjcnlfw WHERE id_ IN(" +
|
|
|
- // itemId[0].jian_ce_xiang_mu2 +
|
|
|
- // ")";
|
|
|
- // curdPost("sql", itemSql).then((res) => {
|
|
|
- // this_.itemInfo = res.variables.data;
|
|
|
- // });
|
|
|
- // });
|
|
|
- // },
|
|
|
formEvent(itemId,shujuid) {
|
|
|
var itemSql =`select id_,jian_ce_xiang_mu_,yuan_shi_ji_lu_ba FROM t_mjjcnlfw`;
|
|
|
curdPost("sql", itemSql).then((res) => {
|
|
|
@@ -484,7 +451,6 @@
|
|
|
getjianceFile(row){
|
|
|
let this_ =this;
|
|
|
this.jianceFileList = []
|
|
|
- // const { bao_gao_pdf_, suo_you_yuan_shi_ } = row.suo_you_yuan_shi_
|
|
|
let sql = `select id_ as id, file_name_ as fileName, ext_ as ext from ibps_file_attachment where find_in_set(id_, '${row.jian_ce_yuan_shi_}')`
|
|
|
curdPost('sql', sql).then(res => {
|
|
|
this_.jianceFileList = res.variables && res.variables.data;
|
|
|
@@ -507,21 +473,16 @@
|
|
|
var sql =
|
|
|
"select * from t_mjjcbg " +
|
|
|
moreSql +
|
|
|
- " lei_bie_qu_fen_yu = '非' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0,20";
|
|
|
+ " wei_tuo_lei_xing_ = '客户委托' AND lei_bie_qu_fen_yu = '非' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao DESC limit 0,15";
|
|
|
this.loadData(sql);
|
|
|
},
|
|
|
handleSizeChange(value) {
|
|
|
this.currentPage4 = 1;
|
|
|
- let sql =
|
|
|
- "select * from t_mjjcbg WHERE wei_tuo_lei_xing_ = '客户委托' AND lei_bie_qu_fen_yu ='非' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0," +
|
|
|
- value;
|
|
|
+ let sql ="select * from t_mjjcbg WHERE wei_tuo_lei_xing_ = '客户委托' AND lei_bie_qu_fen_yu ='非' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao DESC limit 0," + value;
|
|
|
this.loadData(sql);
|
|
|
},
|
|
|
handleCurrentChange(value) {
|
|
|
- let sql =
|
|
|
- "select * from t_mjjcbg WHERE wei_tuo_lei_xing_ = '客户委托' AND lei_bie_qu_fen_yu ='非' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit " +
|
|
|
- value +
|
|
|
- ", 20";
|
|
|
+ let sql ="select * from t_mjjcbg WHERE wei_tuo_lei_xing_ = '客户委托' AND lei_bie_qu_fen_yu ='非' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao DESC limit " +(value-1)*15 +","+value*15;
|
|
|
this.loadData(sql);
|
|
|
},
|
|
|
// 获取附件信息
|
cfort