Merge branch 'master' of http://git.xdadan.loc/tanex/emis-frontend

src/views/emis/emisTmsScanRecord/coPackageScanning.vue

@@ -15,10 +15,15 @@
               <span slot="label">
                 <span style="color: red">{{$t('合包号')}}</span>
               </span>
-              <!-- <el-input v-model="form.bagNo" placeholder="请输入" >
-              </el-input> -->
               <EmisPackNoPicker v-model="form.bagNo"   ></EmisPackNoPicker>
-
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="总重量" prop="scanWeight" label-width="80px">
+              <span slot="label">
+                <span style="color: red">{{$t('总重量')}}</span>
+              </span>
+              <el-input v-model="form.scanWeight"  ></el-input>
             </el-form-item>
           </el-col>
       </el-row>

src/views/emis/emisTmsScanRecord/signAndRecord.vue

@@ -557,8 +557,30 @@ export default {
         this.playNoticeTone(1);
         return;
       }
-      this.getDetail(this.form.billCode)
+
-      this.form.billCode =null;
+      let scanInfo = {
+        scanType:"50",
+        opType:1,
+        scanData:[
+          {
+            billCode:this.form.billCode
+          }
+        ]
+      };
+
+      doScan(scanInfo).then(response => {
+        console.log(response);
+        let scanRstItem = response.data.scanResult[0];
+        console.log(scanRstItem);
+        if(scanRstItem.result != 'success'){
+          this.$modal.msgError(scanRstItem.message);
+          return;
+        }
+
+        this.getDetail(this.form.billCode)
+        this.form.billCode =null;
+      });
+
     },
     getDetail(billCode, isBatch){
       getWaybillDetail(billCode).then(response => {