fix:检测档案bug修改

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

@@ -23,7 +23,6 @@
       </div>
       <el-table
         :data="tableData"
-        border
         :stripe="true"
         style="width: 100%"
         height="75vh"
@@ -279,6 +278,7 @@
         fileType: '',
         fileOption: {user: {}},
         jianceFileList:[],
+        pageSize:15,
       };
     },
     components: {
@@ -487,14 +487,12 @@
       },
       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  DESC limit 0," +
-          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  DESC limit 0," + value;
+        this.pageSize =Number(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  DESC limit " +(value-1)*15 +","+value*15;
+        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 " + (value-1) * this.pageSize +","+ this.pageSize;
         this.loadData(sql);
       },
       // 获取附件信息

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

@@ -23,7 +23,6 @@
       </div>
       <el-table
         :data="tableData"
-        border
         :stripe="true"
         style="width: 100%"
         height="75vh"
@@ -272,6 +271,7 @@
         fileType: '',
         fileOption: {user: {}},
         jianceFileList:[],
+        pageSize:15
       };
     },
     components: {
@@ -479,11 +479,12 @@
       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 DESC limit 0," + value;
+        this.pageSize =Number(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 DESC limit " +(value-1)*15 +","+value*15;
+        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 " + (value-1) * this.pageSize +","+ this.pageSize;
+        
         this.loadData(sql);
       },
       // 获取附件信息

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

@@ -23,9 +23,9 @@
     </div>
     <el-table
       :data="tableData"
-      border
       :stripe="true"
-      style="width: 100%"
+      style="width: 100%;"
+      height="75vh"
       :header-cell-style="{
         color: '#000',
         'font-size': '14px',
@@ -47,38 +47,25 @@
       </el-table-column>
       <el-table-column prop="jian_ce_kai_shi_s" label="检测时间" width="100">
       </el-table-column>
-      <el-table-column
-        prop="wei_tuo_zhan_shi_"
-        label="检测委托单号"
-        width="180"
-      >
+      <el-table-column  prop="wei_tuo_zhan_shi_"  label="检测委托单号"  width="180">
         <template slot-scope="scope">
           {{ scope.row.wei_tuo_zhan_shi_ | returnweituobianhao(wTBH) }}
         </template>
       </el-table-column>
       <el-table-column prop="wei_tuo_ri_qi_" label="委托日期" width="100">
       </el-table-column>
-      <el-table-column prop="yang_pin_bian_hao" label="样品编号" width="150">
+      <el-table-column prop="yang_pin_bian_hao" label="样品编号" width="135">
       </el-table-column>
-      <el-table-column prop="yang_pin_ming_che" label="样品名称" width="120">
+      <el-table-column prop="yang_pin_ming_che" label="样品名称" width="145">
       </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">
+      <el-table-column label="操作"  width="100">
         <template slot-scope="scope">
           <el-popover placement="left" width="150" trigger="click">
             <div slot="reference" class="more">
               <i class="el-icon-caret-bottom"></i>查阅
             </div>
-            <div
-              class="item"
-              style="color: #85ce61"
-              @click="
-                alertReport(
-                  reports.jianceshenqingdan,
-                  scope.row.jian_ce_shen_qing
-                )
-              "
-            >
+            <div class="item" style="color:#85ce61" @click="alertReport(reports.jianceshenqingdan,scope.row.jian_ce_shen_qing)">
               <i class="el-icon-s-order"></i> 检测委托单
             </div>
             <!-- <div
@@ -92,21 +79,11 @@
             </div> -->
             <div>
               <el-popover placement="left" width="200" trigger="click">
-                <div
-                  class="div_test item"
-                  style="color: #85ce61"
-                  slot="reference"
-                  @click="juTiItem(scope.row)"
-                >
+                <div class="div_test item" style="color: #85ce61" slot="reference" @click="juTiItem(scope.row)">
                   <i class="el-icon-s-order"></i> 检测记录
                 </div>
                 <div class="three-item">
-                  <div
-                    style="color: #85ce61; cursor: pointer"
-                    v-for="it in itemInfo"
-                    :key="it.id_"
-                    @click="formEvent(it.id_,it.shujuid)"
-                  >
+                  <div style="color: #85ce61; cursor: pointer" v-for="it in itemInfo" :key="it.id_" @click="formEvent(it.id_,it.shujuid)" >
                     {{ it.jian_ce_xiang_mu_ }}记录
                   </div>
                 </div>
@@ -114,12 +91,7 @@
             </div>
             <div>
               <el-popover placement="left" width="200" trigger="click">
-                <div
-                  class="div_test item"
-                  style="color: #85ce61"
-                  slot="reference"
-                  @click="getjianceFile(scope.row)"
-                >
+                <div  class="div_test item" style="color: #85ce61" slot="reference" @click="getjianceFile(scope.row)">
                   <i class="el-icon-s-order"></i> 检测附件
                 </div>
                 <div class="three-item">
@@ -278,6 +250,7 @@ export default {
       fileType: '',
       fileOption: {user: {}},
       jianceFileList:[],
+      pageSize :15,
     };
   },
   components: {
@@ -364,8 +337,7 @@ export default {
       });
       sqlStr = sqlStr.substring(0, sqlStr.length - 1);
       sqlStr = "(" + sqlStr + ")";
-      let sql =
-        "select he_tong_bian_hao_,id_ from t_bjd WHERE id_ in " + sqlStr;
+      let sql ="select he_tong_bian_hao_,id_ from t_bjd WHERE id_ in " + sqlStr;
       curdPost("sql", sql).then((res) => {
         this_.hetong = res.variables.data;
       });
@@ -477,25 +449,27 @@ export default {
     },
     search() {
       let moreSql = this.selectSplit();
-      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  DESC limit 0,15";
+      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  DESC limit 0,15";
+      console.log(sql,"21")
       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'  and zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成'  ORDER BY yang_pin_bian_hao  DESC limit 0,15" +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.pageSize =Number(value);
       this.loadData(sql);
     },
     handleCurrentChange(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 " +(value-1)*15 +","+value*15;
+      console.log(this.pageSize)
+      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) * this.pageSize +","+ this.pageSize;
+      console.log(sql,"1")
       this.loadData(sql);
     },
     // 获取附件信息
     getFile (data) {
         this.fileList = []
         let sql = `select id_ as id, file_name_ as fileName, ext_ as ext from ibps_file_attachment where find_in_set(id_, '${data}')`
+
         curdPost('sql', sql).then(res => {
             this.fileList = res.variables && res.variables.data
         })

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

@@ -24,7 +24,6 @@
       </div>
       <el-table
         :data="tableData"
-        border
         :stripe="true"
         style="width: 100%"
         height="75vh"
@@ -284,6 +283,7 @@
         fileType: '',
         fileOption: {user: {}},
         jianceFileList:[],
+        pageSize:15
       };
     },
     mixins: [GetReport],
@@ -479,10 +479,11 @@
       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  DESC limit 0," + value;
+        this.pageSize =Number(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  DESC limit " +(value-1)*15 +","+value*15;
+        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) * this.pageSize +","+ this.pageSize;
         this.loadData(sql);
       },
       // 获取附件信息

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

@@ -24,7 +24,6 @@
     </div>
     <el-table
       :data="tableData"
-      border
       :stripe="true"
       style="width: 100%"
       height="75vh"
@@ -284,6 +283,7 @@ export default {
       fileType: '',
       fileOption: {user: {}},
       jianceFileList:[],
+      pageSize:15
     };
   },
   mixins: [GetReport],
@@ -502,14 +502,12 @@ export default {
     },
     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  DESC limit 0," +
-        value;
+      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," + value;
+      this.pageSize =Number(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  DESC limit " +(value-1)*15 +","+value*15;
+      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 " + (value-1) * this.pageSize +","+ this.pageSize;
       this.loadData(sql);
     },
     // 获取附件信息

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

@@ -24,7 +24,6 @@
     </div>
     <el-table
       :data="tableData"
-      border
       :stripe="true"
       style="width: 100%"
       height="75vh"
@@ -284,6 +283,7 @@ export default {
       fileType: '',
       fileOption: {user: {}},
       jianceFileList:[],
+      pageSize:15
     };
   },
   mixins: [GetReport],
@@ -502,14 +502,12 @@ export default {
     },
     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 DESC limit 0," +
-        value;
+      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," + value;
+      this.pageSize =Number(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 DESC limit " +(value-1)*15 +","+value*15;
+      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 " + (value-1) * this.pageSize +","+ this.pageSize;
       this.loadData(sql);
     },
     // 获取附件信息