Merge branch 'master' of http://119.23.210.103:3000/wy/mj_firm_former

src/views/system/jbdScan/goods/sampleTag.vue

@@ -327,7 +327,7 @@ export default {
   // justify-content: space-around;
   // flex-direction: column;
   // margin: 10px 5px;
-  margin: 10px 300px;
+  margin: 10px 10px;
   border-radius: 4px;
   background-color: #fff;
 }

src/views/system/jbdScan/js/manualConfirmationJS.js

@@ -239,7 +239,7 @@ export default {
             for (let i in wjAll) {
               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 mjwtsqbIdList = []
             let mjfbbList = []

src/views/system/jbdScan/js/sampleConfirmationJS.js

@@ -236,7 +236,7 @@ export default {
                for(let i in wjAll){
                   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 mjwtsqbIdList = []
                  let mjfbbList = []