Merge remote-tracking branch 'remotes/master/master'

src/main/resources/static/js/wffzkyxsInsert.js

@@ -75,18 +75,19 @@ function comboboxXszl(){
 
 function submit(flag,type){
     if(type == 0) {
+        //标识号类型(线索种类)
+        var xszl = $('#xszl').combobox('getText');
+        if (!xszl) {
+            $.messager.alert({title: '提示', msg: '标识号类型不能为空'});
+            return;
+        }
         //标识号
         var xsvalue = $("#xsvalue").val();
         if (!xsvalue) {
             $.messager.alert({title: '提示', msg: '标识号不能为空'});
             return;
         }
-        //线索种类
-        var xszl = $('#xszl').combobox('getText');
-        if (!xszl) {
-            $.messager.alert({title: '提示', msg: '线索种类不能为空'});
-            return;
-        }
+
         //发现时间
         var fxsj = $("#fxsj").val();
         if (fxsj == null || fxsj == '') {
@@ -138,23 +139,13 @@ function submit(flag,type){
         success: function (data) {
             layer.close(index);
             if(data.code==0){
-                var index1=layer.confirm('操作成功!', {
-                    btn: ['确定'] //按钮
-                }, function(){
-                    layer.close(index1);
                     saveOrUpdateWffzkyxs(flag);
-                });
             }else{
-              var index1=  layer.confirm('操作失败!', {
-                    btn: ['重新抓取'] //按钮
-                }, function(){
-                    layer.close(index1);
                     submit(flag,1);
-                });
             }
         },
         error: function (e) {
-            layer.alert('提示',"操作出错："+e);
+            layer.alert("操作出错:"+e,"提示");
         }
     });
 
@@ -175,13 +166,13 @@ function saveOrUpdateWffzkyxs(flag) {
         data: serializeObject($("form[name='wfqdzczlForm']")),
         success: function (data) {
             if(data.data==true){
-                $.messager.alert({title:'提示',msg:'操作成功'});
+                layer.alert("保存成功！","提示");
             }else{
-                $.messager.alert({title:'提示',msg:'操作失败'});
+                layer.alert("保存失败！","提示");
             }
         },
         error: function (e) {
-            $.messager.alert({title:'提示',msg:"出错："+e});
+            layer.alert("保存出错:"+e,"提示");
         }
     });
 }