fix:预报告

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

@@ -317,7 +317,7 @@
       },
     },
     created() {
-      let sql ="select * from t_mjjcbg WHERE  (lei_bie_qu_fen_yu ='cma'OR lei_bie_qu_fen_yu ='CMA')  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 ='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";
       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) => {
@@ -489,19 +489,19 @@
         var sql =
           "select * from t_mjjcbg " +
           moreSql +
-          " (lei_bie_qu_fen_yu ='CMA'OR lei_bie_qu_fen_yu ='cma')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY 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, create_time_  DESC limit 0,20";
         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 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, create_time_  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 create_time_ DESC limit " +
+          "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";
         this.loadData(sql);

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

@@ -310,8 +310,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 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 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, create_time_ DESC limit 0,20";
       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_ = '完成')";
@@ -481,18 +480,17 @@
       },
       search() {
         let moreSql = this.selectSplit();
-        var sql = "select * from t_mjjcbg " +moreSql + "(lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0,20";
-        // var sql = "select * from t_mjjcbg " +moreSql + " (lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY 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, create_time_ DESC limit 0,20";
         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 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, create_time_ 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 create_time_ DESC limit " +
+          "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";
         this.loadData(sql);

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

@@ -315,7 +315,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 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,20";
     this.loadData(sql);
 
     let sumsql =
@@ -489,16 +489,16 @@ export default {
       var sql =
         "select * from t_mjjcbg " +
         moreSql +
-        " lei_bie_qu_fen_yu = 'cnas' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY 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, create_time_  DESC limit 0,20";
       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 create_time_ DESC limit 0," +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 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'OR lei_bie_qu_fen_yu ='CNAS')  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 ='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";
       this.loadData(sql);
     },
     // 获取附件信息

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

@@ -142,7 +142,7 @@
               >
                 <i class="el-icon-s-order"></i> 检测报告审批表
               </div>
-              <div v-if="scope.row.shi_fou_yu_bao_ga !='否'">
+              <div v-if="scope.row.shi_fou_yu_bao_ga!='是'">
                 <el-popover placement="left" width="200">
                   <div
                     class="div_test item"
@@ -320,8 +320,8 @@
       },
     },
     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";
+      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;
       // });
@@ -507,19 +507,19 @@
         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, create_time_  DESC limit 0,20";
         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," +
+          "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;
         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 " +
+          "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";
         this.loadData(sql);

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

@@ -320,8 +320,8 @@ export default {
     },
   },
   created() {
-    let sql ="select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '能力验证' 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 (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 (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";
     // curdPost("sql", sql).then((response) => {
     //   this_.tableData = response.variables.data;
     // });
@@ -507,19 +507,19 @@ export default {
       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, create_time_  DESC limit 0,20";
       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 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, create_time_  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 create_time_ DESC limit " +
+        "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";
       this.loadData(sql);

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

@@ -320,8 +320,7 @@ export default {
     },
   },
   created() {
-    let sql ="select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '内部质控' 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 (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 (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;
     // });
@@ -507,19 +506,19 @@ export default {
       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, create_time_ DESC limit 0,20";
       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 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, create_time_ 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 create_time_ DESC limit " +
+        "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";
       this.loadData(sql);