Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js
===================================================================
diff -u -r32017 -r32020
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js (.../interfereForeignTousseApplicationForm.js) (revision 32017)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js (.../interfereForeignTousseApplicationForm.js) (revision 32020)
@@ -65,6 +65,72 @@
return showResult;
}
+// 上传照片
+function uploadTousseCameraPhotos(tousses){
+ if(!sstsConfig.showCameraPhoto){
+ return;
+ }
+ var splitMaterialGrid = top.Ext.getCmp("splitMaterialGrid").getStore();
+ top.Ext4.MessageBox.progress('正在上传图片', '请稍候...');
+ //外来器械拆分小包名称带总拆包数量
+ var count = splitMaterialGrid.getCount();
+ var k=0;
+ for ( var i = 0; i < count; i++) {
+ var record = splitMaterialGrid.getAt(i);
+ if(!record.get("partialSplitForeignTousse")){
+ var imageIdsArry = record.data.imageIdsArry;
+ var videoIdsArry = record.data.videoIdsArry;
+ var imageIds = '';
+ var videoIds = '';
+ if(imageIdsArry == undefined && videoIdsArry == undefined){
+ continue;
+ }
+ if(typeof imageIdsArry == 'object'){
+ if(imageIdsArry.length == 0){
+ imageIds = '';
+ }else {
+ imageIds = imageIdsArry.join(',');
+ }
+ }
+ if(typeof videoIdsArry == 'object'){
+ if(videoIdsArry.length == 0){
+ videoIds = '';
+ }else {
+ videoIds = videoIdsArry.join(',');
+ }
+ }
+ if(imageIds !== '' || videoIds !== ''){
+ uploadTousseCameraPhoto(tousses[k].id,imageIds,videoIds);
+ k++;
+ }
+ }
+ }
+ hideMessageBox4(true);
+}
+
+function uploadTousseCameraPhoto(objectId,imageIds,videoIds){
+ var url = WWWROOT + '/disinfectSystem/baseData/uploadImageAndVideoAction!bindingImageVideoFile.do';
+ $.ajax({
+ type: "POST",
+ url: url,
+ async:false,
+ dataType: "json",
+ data: {
+ imageIds :imageIds,
+ videoIds:videoIds,
+ objectId :objectId
+ }
+ }).done(function(o) {
+ if(o.success){
+ message = o.message;
+ showResult(message, null , sstsConfig.messagePauseTimeOnPackingPage);
+ }else{
+ message = o.message;
+ showResult(message, null , sstsConfig.messagePauseTimeOnPackingPage);
+ }
+ })
+}
+
function toRightGrid(){
var records = leftMaterialGridPanel.getSelectionModel().getSelections();
if (records.length == 0) {
@@ -756,7 +822,11 @@
if (rs != null){
var result = Ext.decode(rs);
if (result.success){
- showResult(result.message);
+ // 上传照片
+ uploadTousseCameraPhotos(result.tousses);
+ if(!sstsConfig.showCameraPhoto){
+ showResult(result.message);
+ }
window.close();
}else{
showResult(result.message);
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp
===================================================================
diff -u -r31997 -r32020
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp (.../interfereForeignTousseApplicationView.jsp) (revision 31997)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp (.../interfereForeignTousseApplicationView.jsp) (revision 32020)
@@ -34,6 +34,7 @@
+