App读卡功能问题修改

YYC

2023-07-10 b642a88b35271f37e411a603c29a57875111730c

 igds-app/js/admin/inout-in-handle.js

@@ -30,7 +30,8 @@
      "fileName2": "",
      "deHandle": "",
      "lon": "",
      "lat": ""
      "lat": "",
      "handleUser": ""
   }
}

@@ -44,10 +45,13 @@
   uploadUrl = user.url + "/api-phone/v35/upload-img";
   data.tokenAuth = user.tokenAuth;
   data1.tokenAuth = user.tokenAuth;
   data1.data.handleUser = user.cname;
   //获取从上一个页面传递的数据
   var self = plus.webview.currentWebview();
   depotData = self.data;
   data.data.id = depotData.serialNumber;
   data1.data.id = depotData.serialNumber;
   console.log(JSON.stringify(depotData))
   // data.data.intelCard = depotData.intelCard;
   $("#plateNum").html(depotData.plateNum);
   $("#depotName").html(depotData.depotName);
@@ -70,26 +74,22 @@
               //判断该值仓是否处于在值仓状态
               if (result.data.progress == 'HANDLE') {
                  //判断单子是否已经开始进行值仓
                  if (result.data.handelStart == null) {
                     //发送请求，开始值仓
                     mui.ajax(url, {
                        type: "POST",
                        dataType: "json",
                        crossDomain: true,
                        contentType: "application/json;charset=utf-8",
                        data: JSON.stringify(data1),
                        success: function(result) {
                           mui.toast("开始装粮，请上传图片！");
                           //重新请求获取单子详情并渲染
                           getDetail();
                        },
                        error: function() {
                           mui.alert('开始装粮提交失败，请重新操作！', '提示', ["确定"], function() {}, "div");
                        }
                     })
                  } else {
                     mui.toast("已开始装粮！");
                  }

                  //发送请求，开始值仓
                  mui.ajax(url, {
                     type: "POST",
                     dataType: "json",
                     crossDomain: true,
                     contentType: "application/json;charset=utf-8",
                     data: JSON.stringify(data1),
                     success: function(result) {
                        mui.toast("开始装粮，请上传图片！");
                     },
                     error: function() {
                        mui.alert('开始装粮提交失败，请重新操作！', '提示', ["确定"], function() {},
                           "div");
                     }
                  })
               } else {
                  //如果不在值仓状态，给出提示信息，不进行提交
                  mui.alert("该单子不在值仓状态，不能进行值仓！", '提示', ["确定"], function() {}, "div");
@@ -103,6 +103,7 @@
         }
      })
   } else { //结束值仓
      data1.data.type = tag;
      mui.ajax(url, {
         type: "POST",
         dataType: "json",
@@ -113,40 +114,37 @@
            if (result.code == '0000') {
               //判断该值仓是否处于在值仓状态
               if (result.data.progress == 'HANDLE') {
                  //判断单子是否已经开始进行值仓
                  if (result.data.handelStart) {
                     deHandle = $("#number")[0].value;
                     if (fileName1 == null || fileName2 == null) {
                        mui.toast("请先上传图片！");
                     } else {
                        if (deHandle) {
                           data1.data.type = tag;
                           data1.data.fileName1 = fileName1;
                           data1.data.fileName2 = fileName2;
                           data1.data.deHandle = deHandle;
                           mui.ajax(url, {
                              type: "POST",
                              dataType: "json",
                              crossDomain: true,
                              contentType: "application/json;charset=utf-8",
                              data: JSON.stringify(data1),
                              success: function(result) {
                                 mui.toast("值仓完成！");
                                 //返回上一页
                                 mui.back();
                              },
                              error: function(result) {
                                 mui.alert(result.msg, '提示', ["确定"], function() {},
                                    "div");
                              }
                           })
                        } else {
                           mui.toast("请先填写值仓扣重");
                        }
                     }
                  deHandle = $("#number")[0].value;
                  if (fileName1 == null || fileName2 == null) {
                     mui.toast("请先上传图片！");
                  } else {
                     mui.toast("请先点击开始装粮，并上传图片！");
                     if (deHandle) {
                        data1.data.type = tag;
                        data1.data.fileName1 = fileName1;
                        data1.data.fileName2 = fileName2;
                        data1.data.deHandle = deHandle;
                        mui.ajax(url, {
                           type: "POST",
                           dataType: "json",
                           crossDomain: true,
                           contentType: "application/json;charset=utf-8",
                           data: JSON.stringify(data1),
                           success: function(result) {
                              // mui.toast("值仓完成！");
                              mui.toast(result.msg)
                              //返回上一页
                              mui.back();
                           },
                           error: function(result) {
                              mui.alert(result.msg, '提示', ["确定"], function() {},
                                 "div");
                           }
                        })
                     } else {
                        mui.toast("请先填写值仓扣重");
                     }
                  }

               } else {
                  //如果不在值仓状态，给出提示信息，不进行提交
                  mui.alert("该单子不在值仓状态，不能进行值仓！", '提示', ["确定"], function() {}, "div");
@@ -178,26 +176,22 @@
      data: JSON.stringify(data),
      success: function(result) {
         if (result.code == '0000') {
            if (result.data.handleStart != null) {
               var picker = new mui.PopPicker();
               picker.setData([{
                  value: "cameraImg",
                  text: "拍照上传"
               }, {
                  value: "galleryImg",
                  text: "从相册选择"
               }])
               picker.show(function(SelectedItem) {
                  console.log(JSON.stringify(SelectedItem));
                  if (SelectedItem == 'cameraImg') {
                     cameraImg(typeNum);
                  } else {
                     galleryImg(typeNum);
                  }
               })
            } else {
               mui.toast("请先点击开始装粮！");
            }
            var picker = new mui.PopPicker();
            picker.setData([{
               value: "cameraImg",
               text: "拍照上传"
            }, {
               value: "galleryImg",
               text: "从相册选择"
            }])
            picker.show(function(SelectedItem) {
               console.log(JSON.stringify(SelectedItem));
               if (SelectedItem[0].value == 'cameraImg') {
                  cameraImg(typeNum);
               } else {
                  galleryImg(typeNum);
               }
            })
         } else {
            mui.alert(result.msg, '提示', ["确定"], function() {}, "div");
         }
@@ -206,25 +200,10 @@
         mui.alert('系统繁忙,请重试！', '提示', ["确定"], function() {}, "div");
      }
   })
   // var picker = new mui.PopPicker();
   // picker.setData([{
   //    value: "cameraImg",
   //    text: "拍照上传"
   // }, {
   //    value: "galleryImg",
   //    text: "从相册选择"
   // }])
   // picker.show(function(SelectedItem) {
   //    console.log(JSON.stringify(SelectedItem));
   //    if (SelectedItem == 'cameraImg') {
   //       cameraImg(typeNum);
   //    } else {
   //       galleryImg(typeNum);
   //    }
   // })

};

//使用相机拍照
//相机拍照
function cameraImg(typeNum) {
   var cmr = plus.camera.getCamera();
   cmr.captureImage(function(p) {
@@ -282,8 +261,11 @@
            wt.close();
         }
      });
		
   //携带车牌参数
   task.addData("plateNum", depotData.plateNum);
   //业务类型
   task.addData("bizType", "01");
   //图片信息
   task.addFile(path, {
      key: "uploadkey"