maotao пре 10 месеци
родитељ
комит
a9957d94b2

+ 3 - 1
pages/receiptpage/receiptpage.vue

@@ -1358,7 +1358,9 @@
1358 1358
                   associationTypeValue
1359 1359
                 }&type1=${res.type}&id=${data.id}&status=600&msg=${
1360 1360
                   res.msg
1361
-                }&isKs=${isKs}&model=${encodeURIComponent(
1361
+                }&taskTypeId=${
1362
+									this.infoDATA.taskType.id
1363
+								}&isKs=${isKs}&model=${encodeURIComponent(
1362 1364
                   JSON.stringify(res)
1363 1365
                 )}&qrcode=${this.currentCode}`,
1364 1366
                 });

+ 0 - 1
pages/scanning_Result/scanning_Result.vue

@@ -925,7 +925,6 @@
925 925
       } else if (options.model) {
926 926
         this.infoDATA = JSON.parse(options.model);
927 927
       }
928
-			console.log(this.infoDATA , "result");
929 928
       if (options.accountObj && options.accountObj != "undefined") {
930 929
         this.accountObj = JSON.parse(options.accountObj);
931 930
       }

+ 21 - 7
pages/scanning_code/scanning_code.vue

@@ -811,7 +811,9 @@
811 811
               this.queryObj.deptCode
812 812
             }&dept=${
813 813
               this.queryObj.dept
814
-            }&deptId=${this.deptId}&id=${this.dataId}&model=${encodeURIComponent(
814
+            }&taskTypeId=${
815
+							this.infoDATA.taskType.id
816
+						}&deptId=${this.deptId}&id=${this.dataId}&model=${encodeURIComponent(
815 817
               JSON.stringify(ress)
816 818
             )}&speNum=${res.specimenCount}`,
817 819
             });
@@ -913,7 +915,9 @@
913 915
                         this.queryObj.deptCode
914 916
                       }&dept=${
915 917
                         this.queryObj.dept
916
-                      }&id=${this.dataId}&model=${encodeURIComponent(
918
+                      }&taskTypeId=${
919
+												this.infoDATA.taskType.id
920
+												}&id=${this.dataId}&model=${encodeURIComponent(
917 921
                         JSON.stringify(ress)
918 922
                       )}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}&deptId=${this.deptId}&handover=${this.handover}`,
919 923
                     });
@@ -950,7 +954,9 @@
950 954
                             this.queryObj.deptCode
951 955
                           }&dept=${
952 956
                             this.queryObj.dept
953
-                          }&id=${this.dataId}&model=${encodeURIComponent(
957
+                          }&taskTypeId=${
958
+														this.infoDATA.taskType.id
959
+													}&id=${this.dataId}&model=${encodeURIComponent(
954 960
                             JSON.stringify(ress)
955 961
                           )}`,
956 962
                           });
@@ -966,7 +972,9 @@
966 972
                             this.queryObj.deptCode
967 973
                           }&dept=${
968 974
                             this.queryObj.dept
969
-                          }&deptId=${this.deptId}&id=${this.dataId}&model=${encodeURIComponent(
975
+                          }&taskTypeId=${
976
+														this.infoDATA.taskType.id
977
+													}&deptId=${this.deptId}&id=${this.dataId}&model=${encodeURIComponent(
970 978
                             JSON.stringify(ress)
971 979
                           )}&speNum=${ress.specimenCount}&scanOrHand=${type}`,
972 980
                           });
@@ -995,7 +1003,9 @@
995 1003
                           this.queryObj.deptCode
996 1004
                         }&dept=${
997 1005
                           this.queryObj.dept
998
-                        }&id=${this.dataId}&model=${encodeURIComponent(
1006
+                        }&taskTypeId=${
1007
+													his.infoDATA.taskType.id
1008
+												}&id=${this.dataId}&model=${encodeURIComponent(
999 1009
                           JSON.stringify(ress)
1000 1010
                         )}`,
1001 1011
                         });
@@ -1011,7 +1021,9 @@
1011 1021
                           this.queryObj.deptCode
1012 1022
                         }&dept=${
1013 1023
                           this.queryObj.dept
1014
-                        }&deptId=${this.deptId}&id=${this.dataId}&model=${encodeURIComponent(
1024
+                        }&taskTypeId=${
1025
+													this.infoDATA.taskType.id
1026
+												}&deptId=${this.deptId}&id=${this.dataId}&model=${encodeURIComponent(
1015 1027
                           JSON.stringify(ress)
1016 1028
                         )}&speNum=${ress.specimenCount}&scanOrHand=${type}`,
1017 1029
                         });
@@ -1028,7 +1040,9 @@
1028 1040
                     ress.msg
1029 1041
                   }&deptCode=${this.queryObj.deptCode}&dept=${
1030 1042
                     this.queryObj.dept
1031
-                  }&id=${this.dataId}&model=${encodeURIComponent(
1043
+                  }&taskTypeId=${
1044
+										this.infoDATA.taskType.id
1045
+									}&id=${this.dataId}&model=${encodeURIComponent(
1032 1046
                     JSON.stringify(ress)
1033 1047
                   )}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}&deptId=${this.deptId}&handover=${this.handover}&scanOrHand=${type}&qrcode=${this.currentCode}`,
1034 1048
                   });