Browse Source

fix:检测档案类型数据修改

zhangjingyuan 3 years ago
parent
commit
8a02c7e940

+ 8 - 8
src/views/platform/bpmn/bpmInstHis/listType/CMAjiancedangan.vue

@@ -141,13 +141,13 @@
                 </div>
               </el-popover>
             </div>
-            <div
+            <!-- <div
               class="item"
               style="color: #85ce61"
               @click="alertReport(reports.jiancebaogao, scope.row.id_)"
             >
             <i class="el-icon-s-order"></i> 检测报告
-            </div>
+            </div> -->
               <div v-if="scope.row && scope.row.shou_quan_qian_z">
                 <el-popover placement="left" width="200" trigger="click">
                   <div
@@ -156,7 +156,7 @@
                     slot="reference"
                     @click="getFile(scope.row.shou_quan_qian_z)"
                   >
-                    <i class="el-icon-s-order"></i> 授权签字人PDF
+                    <i class="el-icon-s-order"></i> 已盖章报告
                   </div>
                   <div class="three-item">
                     <div
@@ -281,9 +281,9 @@ export default {
     },
   },
   created() {
-    let sql ="select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and 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 shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNASCMA')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成')  ORDER BY create_time_ DESC limit 0,20";
     this.loadData(sql);
-    let sumsql ="select COUNT(*) AS sum  FROM t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and lei_bie_qu_fen_yu ='cnas/CMA' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成')";
+    let sumsql ="select COUNT(*) AS sum  FROM t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNASCMA')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成')";
     curdPost("sql", sumsql).then((response) => {
       this.total = response.variables.data[0].sum;
     });
@@ -536,19 +536,19 @@ export default {
       var sql =
         "select * from t_mjjcbg " +
         moreSql +
-        " shi_fou_yu_bao_ga='否' and lei_bie_qu_fen_yu = 'cnas/CMA' and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0,20";
+        " shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNASCMA')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0,20";
       this.loadData(sql);
     },
     handleSizeChange(value) {
       this.currentPage4 = 1;
       let sql =
-        "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and lei_bie_qu_fen_yu ='cnas/CMA' and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0," +
+        "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNASCMA')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0," +
         value;
       this.loadData(sql);
     },
     handleCurrentChange(value) {
       let sql =
-        "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and lei_bie_qu_fen_yu ='cnas/CMA'  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit " +
+        "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNASCMA')   and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit " +
         value +
         ", 20";
       this.loadData(sql);

+ 7 - 7
src/views/platform/bpmn/bpmInstHis/listType/CNASjiancedangan.vue

@@ -140,13 +140,13 @@
                 </div>
               </el-popover>
             </div> -->
-            <div
+            <!-- <div
               class="item"
               style="color: #85ce61"
               @click="alertReport(reports.jiancebaogao, scope.row.id_)"
             >
               <i class="el-icon-s-order"></i> 检测报告
-            </div>
+            </div> -->
               <div v-if="scope.row && scope.row.shou_quan_qian_z">
                 <el-popover placement="left" width="200" trigger="click">
                   <div
@@ -155,7 +155,7 @@
                     slot="reference"
                     @click="getFile(scope.row.shou_quan_qian_z)"
                   >
-                    <i class="el-icon-s-order"></i> 授权签字人PDF
+                    <i class="el-icon-s-order"></i> 已盖章报告
                   </div>
                   <div class="three-item">
                     <div
@@ -279,11 +279,11 @@ export default {
   },
   created() {
     let sql =
-      "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and 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 shi_fou_yu_bao_ga='否' 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";
     this.loadData(sql);
 
     let sumsql =
-      "select COUNT(*) AS sum  FROM t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and lei_bie_qu_fen_yu ='cnas' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成')";
+      "select COUNT(*) AS sum  FROM t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='cnas'OR lei_bie_qu_fen_yu ='CNAS')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成')";
     curdPost("sql", sumsql).then((response) => {
       this.total = response.variables.data[0].sum;
     });
@@ -545,13 +545,13 @@ export default {
     handleSizeChange(value) {
       this.currentPage4 = 1;
       let sql =
-        "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and lei_bie_qu_fen_yu ='cnas' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0," +
+        "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' 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;
       this.loadData(sql);
     },
     handleCurrentChange(value) {
       let sql =
-        "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and lei_bie_qu_fen_yu ='cnas' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit " +
+        "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' 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";
       this.loadData(sql);

+ 3 - 3
src/views/platform/bpmn/bpmInstHis/listType/feijiancedangan.vue

@@ -142,13 +142,13 @@
                 </div>
               </el-popover>
             </div>
-            <div
+            <!-- <div
               class="item"
               style="color: #85ce61"
               @click="alertReport(reports.jiancebaogao, scope.row.id_)"
             >
             <i class="el-icon-s-order"></i> 检测报告
-            </div>
+            </div> -->
               <div v-if="scope.row && scope.row.shou_quan_qian_z">
                 <el-popover placement="left" width="200" trigger="click">
                   <div
@@ -157,7 +157,7 @@
                     slot="reference"
                     @click="getFile(scope.row.shou_quan_qian_z)"
                   >
-                    <i class="el-icon-s-order"></i> 授权签字人PDF
+                    <i class="el-icon-s-order"></i> 已盖章报告
                   </div>
                   <div class="three-item">
                     <div