wy преди 3 години
родител
ревизия
9d2e80cf67
променени са 2 файла, в които са добавени 7 реда и са изтрити 7 реда
  1. 6 6
      src/views/system/jbdScan/js/manualConfirmationJS.js
  2. 1 1
      src/views/system/jbdScan/js/sampleConfirmationJS.js

+ 6 - 6
src/views/system/jbdScan/js/manualConfirmationJS.js

@@ -20,7 +20,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    
+
     loadDataBySQL(page) {
     loadDataBySQL(page) {
       // 扫码扫到新数据,查询 并分页 回填展示
       // 扫码扫到新数据,查询 并分页 回填展示
       let countSQL = `select count(*) as count from t_mjypb where jie_yang_zhuang_t = '待确认'`
       let countSQL = `select count(*) as count from t_mjypb where jie_yang_zhuang_t = '待确认'`
@@ -239,7 +239,7 @@ export default {
             for (let i in wjAll) {
             for (let i in wjAll) {
               wjAllList.push('{"id_":"' + wjAll[i] + '"}')
               wjAllList.push('{"id_":"' + wjAll[i] + '"}')
             }
             }
-            repostCurd('updates', '{"tableName":"t_mjwtsqb","paramWhere":[' + mjypbWJ + '],"paramCond":{"zhuang_tai_":"任务分配进行中"}}')
+            repostCurd('updates', '{"tableName":"t_mjwtsqb","paramWhere":[' + mjypbWJ + '],"paramCond":{"zhuang_tai_":"已完成"}}')
             let mjwtsqbAllResult = []
             let mjwtsqbAllResult = []
             let mjwtsqbIdList = []
             let mjwtsqbIdList = []
             let mjfbbList = []
             let mjfbbList = []
@@ -268,7 +268,7 @@ export default {
                 index = mjypbList[0].jian_ce_xiang_me_.split(",").length + mjypbList[0].jian_ce_xiang_mu2
                 index = mjypbList[0].jian_ce_xiang_me_.split(",").length + mjypbList[0].jian_ce_xiang_mu2
                 .split(",").length + mjypbList[0].jian_ce_xiang_ms_
                 .split(",").length + mjypbList[0].jian_ce_xiang_ms_
                 .split(",").length+ mjypbList[0].jian_ce_xiang_si_
                 .split(",").length+ mjypbList[0].jian_ce_xiang_si_
-                .split(",").length -1 
+                .split(",").length -1
               }
               }
               console.log('final',mjypbList)
               console.log('final',mjypbList)
               for (var i in mjypbList) {
               for (var i in mjypbList) {
@@ -340,7 +340,7 @@ export default {
 
 
               repostCurd('updates', '{"tableName":"t_mjwtsqb","paramWhere":[' + mjwtsqbIdList + '],"paramCond":{"jian_ce_kai_shi_s":"' + this_.dateFormat() + '"}}')
               repostCurd('updates', '{"tableName":"t_mjwtsqb","paramWhere":[' + mjwtsqbIdList + '],"paramCond":{"jian_ce_kai_shi_s":"' + this_.dateFormat() + '"}}')
               let uidList = []
               let uidList = []
-              for (let item of mjwtsqbAllResult) {  
+              for (let item of mjwtsqbAllResult) {
                 uidList.push(item.ye_mian_zong_zhua)
                 uidList.push(item.ye_mian_zong_zhua)
               }
               }
               uidList = this_.unique(uidList)
               uidList = this_.unique(uidList)
@@ -351,7 +351,7 @@ export default {
                   ups.push('{"shen_qing_id_":"' + t + '"}')
                   ups.push('{"shen_qing_id_":"' + t + '"}')
                 }
                 }
                 repostCurd('updates', '{"tableName":"t_mjwtzsb","paramWhere":[' + ups + '],"paramCond":{"zhuang_tai_":"任务分配进行中"}}')
                 repostCurd('updates', '{"tableName":"t_mjwtzsb","paramWhere":[' + ups + '],"paramCond":{"zhuang_tai_":"任务分配进行中"}}')
-              } 
+              }
             }, 5000)
             }, 5000)
           })
           })
 
 
@@ -407,4 +407,4 @@ export default {
     },
     },
 
 
   }
   }
-}
+}

+ 1 - 1
src/views/system/jbdScan/js/sampleConfirmationJS.js

@@ -236,7 +236,7 @@ export default {
                for(let i in wjAll){
                for(let i in wjAll){
                   wjAllList.push('{"id_":"' + wjAll[i]+ '"}')
                   wjAllList.push('{"id_":"' + wjAll[i]+ '"}')
                }
                }
-                  repostCurd('updates','{"tableName":"t_mjwtsqb","paramWhere":['+mjypbWJ+'],"paramCond":{"zhuang_tai_":"任务分配进行中"}}')
+                  repostCurd('updates','{"tableName":"t_mjwtsqb","paramWhere":['+mjypbWJ+'],"paramCond":{"zhuang_tai_":"已完成"}}')
                  let mjwtsqbAllResult = []
                  let mjwtsqbAllResult = []
                  let mjwtsqbIdList = []
                  let mjwtsqbIdList = []
                  let mjfbbList = []
                  let mjfbbList = []