fix:检测档案

src/views/platform/bpmn/bpmInstHis/listType/CMAOjiancedangan.vue

@@ -61,8 +61,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" trigger="click">
@@ -141,7 +142,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" trigger="triggerType">
                   <div
                     class="div_test item"
@@ -219,8 +220,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"
         >
@@ -247,7 +248,7 @@
     data() {
       return {
         runqianId: "",
-        total: 200,
+        total:0,
         currentPage4: 1,
         visible: false,
         reports: {
@@ -317,7 +318,7 @@
       },
     },
     created() {
-      let sql ="select * from t_mjjcbg WHERE wei_tuo_lei_xing_ = '客户委托' AND  (lei_bie_qu_fen_yu ='cma'OR lei_bie_qu_fen_yu ='CMA')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成')  ORDER BY yang_pin_bian_hao, create_time_  DESC limit 0,20";
+      let sql ="select * from t_mjjcbg WHERE wei_tuo_lei_xing_ = '客户委托' AND  (lei_bie_qu_fen_yu ='cma'OR lei_bie_qu_fen_yu ='CMA')  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 ='CMA'OR lei_bie_qu_fen_yu ='cma')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成')";
       curdPost("sql", sumsql).then((response) => {
@@ -369,22 +370,14 @@
           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;
-          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_;
-          console.log(this_.runqianId)
-          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;
+      });
       },
       YubaogaoItem(info) {
         let itemId;
@@ -489,21 +482,19 @@
         var sql =
           "select * from t_mjjcbg " +
           moreSql +
-          " wei_tuo_lei_xing_ = '客户委托' AND (lei_bie_qu_fen_yu ='CMA'OR lei_bie_qu_fen_yu ='cma')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao, create_time_  DESC limit 0,20";
+          " wei_tuo_lei_xing_ = '客户委托' AND (lei_bie_qu_fen_yu ='CMA'OR lei_bie_qu_fen_yu ='cma')  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 ='CMA'OR lei_bie_qu_fen_yu ='cma')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao, create_time_  DESC limit 0," +
+          "select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND (lei_bie_qu_fen_yu ='CMA'OR lei_bie_qu_fen_yu ='cma')  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 ='CMA'OR lei_bie_qu_fen_yu ='cma')   and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao, create_time_  DESC limit " +
-          value +
-          ", 20";
+          "select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND (lei_bie_qu_fen_yu ='CMA'OR lei_bie_qu_fen_yu ='cma')   and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao  DESC limit " +(value-1)*15 +","+value*15;
         this.loadData(sql);
       },
       // 获取附件信息

src/views/platform/bpmn/bpmInstHis/listType/CMAjiancedangan.vue

@@ -61,8 +61,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" trigger="click">
@@ -134,7 +135,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" trigger="triggerType">
                   <div
                     class="div_test item"
@@ -212,8 +213,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"
         >
@@ -240,7 +241,7 @@
     data() {
       return {
         runqianId: "",
-        total: 200,
+        total: 0,
         currentPage4: 1,
         visible: false,
         reports: {
@@ -310,7 +311,7 @@
       },
     },
     created() {
-      let sql ="select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND(lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成')  ORDER BY yang_pin_bian_hao, create_time_ DESC limit 0,20";
+      let sql ="select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND(lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')  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 ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')  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 ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成')";
@@ -363,24 +364,16 @@
           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;
-          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_;
-          console.log(this_.runqianId)
-          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;
-          });
-  
-        });
-      },
-      YubaogaoItem(info) {
+      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;
+      });
+     },
+    YubaogaoItem(info) {
         let itemId;
         let this_ = this;
         var sql =
@@ -480,19 +473,17 @@
       },
       search() {
         let moreSql = this.selectSplit();
-        var sql = "select * from t_mjjcbg " +moreSql + " wei_tuo_lei_xing_ = '客户委托' and(lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao, create_time_ DESC limit 0,20";
+        var sql = "select * from t_mjjcbg " +moreSql + " wei_tuo_lei_xing_ = '客户委托' and(lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')  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 ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao, create_time_ DESC limit 0," + value;
+        let sql ="select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND(lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')  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 ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')   and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao, create_time_ DESC limit " +
-          value +
-          ", 20";
+          "select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND(lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')   and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao DESC limit " +(value-1)*15 +","+value*15;
         this.loadData(sql);
       },
       // 获取附件信息

src/views/platform/bpmn/bpmInstHis/listType/CNASjiancedangan.vue

@@ -60,8 +60,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="150" trigger="click">
@@ -140,7 +141,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" trigger="triggerType">
                 <div
                   class="div_test item"
@@ -218,8 +219,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"
       >
@@ -246,7 +247,7 @@ export default {
   data() {
     return {
       runqianId: "",
-      total: 200,
+      total:0,
       currentPage4: 1,
       visible: false,
       reports: {
@@ -315,7 +316,7 @@ export default {
   },
   created() {
     let sql =
-      "select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND(lei_bie_qu_fen_yu ='cnas'OR lei_bie_qu_fen_yu ='CNAS')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao, yang_pin_bian_hao, create_time_   DESC limit 0,20";
+      "select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND(lei_bie_qu_fen_yu ='cnas'OR lei_bie_qu_fen_yu ='CNAS')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao, yang_pin_bian_hao, create_time_   DESC limit 0,15";
     this.loadData(sql);
 
     let sumsql =
@@ -369,26 +370,16 @@ export default {
         this_.hetong = res.variables.data;
       });
     },
-    juTiItem(info) {
-      let itemId;
+    async juTiItem(info) {
+      let oIds = info.chu_yu_bao_gao_sh;
+      let ids ="'" + oIds.replace(",","','") + "'"
       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;
-        });
-
+      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;
       });
     },
-    YubaogaoItem(info) { 保留
+    YubaogaoItem(info) { 
       let itemId;
       let this_ = this;
       var sql =
@@ -489,16 +480,16 @@ export default {
       var sql =
         "select * from t_mjjcbg " +
         moreSql +
-        " wei_tuo_lei_xing_ = '客户委托' AND lei_bie_qu_fen_yu = 'cnas' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao, create_time_  DESC limit 0,20";
+        " wei_tuo_lei_xing_ = '客户委托' AND lei_bie_qu_fen_yu = 'cnas' 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 ='cnas'OR lei_bie_qu_fen_yu ='CNAS')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao, create_time_  DESC limit 0," +value;
+      let sql ="select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND  lei_bie_qu_fen_yu ='CNAS'  and zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成'  ORDER BY yang_pin_bian_hao  DESC limit 0,15" +value;
       this.loadData(sql);
     },
     handleCurrentChange(value) {
-      let sql ="select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND(lei_bie_qu_fen_yu ='cnas'OR lei_bie_qu_fen_yu ='CNAS')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao, create_time_  DESC limit " +value +", 20";
+      let sql ="select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND lei_bie_qu_fen_yu ='CNAS'  and zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成' ORDER BY yang_pin_bian_hao  DESC limit " +(value-1)*15 +","+value*15;
       this.loadData(sql);
     },
     // 获取附件信息

src/views/platform/bpmn/bpmInstHis/listType/feijiancedangan.vue

@@ -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: {
@@ -320,14 +321,9 @@
       },
     },
     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 yang_pin_bian_hao, 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 yang_pin_bian_hao, 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;
       });
@@ -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 +
-          " wei_tuo_lei_xing_ = '客户委托' AND lei_bie_qu_fen_yu = '非' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao, 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 yang_pin_bian_hao, 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 yang_pin_bian_hao, 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);
       },
       // 获取附件信息

src/views/platform/bpmn/bpmInstHis/listType/nenglljiancedangan.vue

@@ -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 @@ export default {
   data() {
     return {
       runqianId: "",
-      total: 200,
+      total: 0,
       currentPage4: 1,
       visible: false,
       reports: {
@@ -320,8 +321,7 @@ export default {
     },
   },
   created() {
-    let sql ="select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '能力验证' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao, create_time_  DESC limit 0,20";
-    // let sql ="select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '能力验证' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao, create_time_  DESC limit 0,20";
+    let sql ="select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '能力验证' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao  DESC limit 0,15";
     // curdPost("sql", sql).then((response) => {
     //   this_.tableData = response.variables.data;
     // });
@@ -377,23 +377,13 @@ export default {
         this_.hetong = res.variables.data;
       });
     },
-    juTiItem(info) {
-      let itemId;
+    async  juTiItem(info) {
+      let oIds = info.chu_yu_bao_gao_sh;
+      let ids ="'" + oIds.replace(",","','") + "'"
       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) => {
+      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) {
@@ -507,21 +497,19 @@ export default {
       var sql =
         "select * from t_mjjcbg " +
         moreSql +
-        " wei_tuo_lei_xing_ = '能力验证' and  lei_bie_qu_fen_yu = '非' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao, 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 (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao, create_time_  DESC limit 0," +
+        "select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '能力验证' 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 (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao, create_time_  DESC limit " +
-        value +
-        ", 20";
+        "select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '能力验证' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao  DESC limit " +(value-1)*15 +","+value*15;
       this.loadData(sql);
     },
     // 获取附件信息

src/views/platform/bpmn/bpmInstHis/listType/zhikongJancedangan.vue

@@ -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="120s">
       </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 @@ export default {
   data() {
     return {
       runqianId: "",
-      total: 200,
+      total: 0,
       currentPage4: 1,
       visible: false,
       reports: {
@@ -320,7 +321,7 @@ export default {
     },
   },
   created() {
-    let sql ="select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '内部质控' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao, create_time_ DESC limit 0,20";
+    let sql ="select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '内部质控' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao DESC limit 0,15";
     // curdPost("sql", sql).then((response) => {
     //   this_.tableData = response.variables.data;
     // });
@@ -376,23 +377,13 @@ export default {
         this_.hetong = res.variables.data;
       });
     },
-    juTiItem(info) {
-      let itemId;
+    async juTiItem(info) {
+      let oIds = info.chu_yu_bao_gao_sh;
+      let ids ="'" + oIds.replace(",","','") + "'"
       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) => {
+      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) {
@@ -506,21 +497,19 @@ export default {
       var sql =
         "select * from t_mjjcbg " +
         moreSql +
-        " wei_tuo_lei_xing_ = '内部质控' and lei_bie_qu_fen_yu = '非' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao, 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 (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao, create_time_ DESC limit 0," +
+        "select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '内部质控' 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 (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao, create_time_ DESC limit " +
-        value +
-        ", 20";
+        "select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '内部质控' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao DESC limit " +(value-1)*15 +","+value*15;
       this.loadData(sql);
     },
     // 获取附件信息