From 912e0d40859dbe0d70bcaeb2801ea9d84dd5d8ca Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Wed, 24 Mar 2021 12:11:03 +0800
Subject: [PATCH] =?UTF-8?q?20210324=E6=96=B0=E5=A2=9E=E4=B8=8A=E6=9E=B6?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emr/service/ipml/PaperPostionService.java |  2 +
 .../js/lastVerifyList/lastVerifyList.js       | 73 +++++++------------
 2 files changed, 27 insertions(+), 48 deletions(-)

diff --git a/src/main/java/com/emr/service/ipml/PaperPostionService.java b/src/main/java/com/emr/service/ipml/PaperPostionService.java
index 942aba7..91464b4 100644
--- a/src/main/java/com/emr/service/ipml/PaperPostionService.java
+++ b/src/main/java/com/emr/service/ipml/PaperPostionService.java
@@ -53,6 +53,8 @@ public class PaperPostionService {
                             typeValues.append(",");
                         }
                         typeValues.append(obj.getTypevalue());
+                        vo.setInt1(obj.getInt1());
+                        vo.setInt2(obj.getInt2());
                     }
                 }
                 vo.setTypevalue(typeValues.toString());
diff --git a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js
index 5dd43f6..c4aad5f 100644
--- a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js
+++ b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js
@@ -400,47 +400,10 @@ $("#verifyBtn").on('click', function () {
         });
     }else{
         //只有一个直接提交
-        var ids = $("#archiveId").val();
-        var paperPosition = null;
-        var paperPosition1 = null;
-        var paperPosition2 = null;
-        var paperPosition3 = null;
-        var paperPosition4 = null;
-        //获取纸质输入类型
-        var paperPostionValue = $("#paperPostionValue").val();
-        if(paperPostionValue == 1){
-            //定义输入个数
-            var valueLength = 0;
-            //获取柜子列个数
-            var paperPostionValueLength = $("#paperPostionValueLength").val();
-            if(paperPostionValueLength >= 1){
-                paperPosition1 = $("#paperPosition1").val();
-                if('' != paperPosition1){
-                    valueLength ++;
-                }
-            }
-            if(paperPostionValueLength >= 2){
-                paperPosition2 = $("#paperPosition2").val();
-                if('' != paperPosition2){
-                    valueLength ++;
-                }
-            }
-            if(paperPostionValueLength >= 3){
-                paperPosition3 = $("#paperPosition3").val();
-                if('' != paperPosition3){
-                    valueLength ++;
-                }
-            }
-            if(paperPostionValueLength >= 4){
-                paperPosition4 = $("#paperPosition4").val();
-                if('' != paperPosition4){
-                    valueLength ++;
-                }
-            }
-            //判断只输入一个
-            if(valueLength > 0 && valueLength < paperPostionValueLength){
-                toastr.warning("纸质信息必须输入全部");
-                return false;
+        //获取柜子列个数
+        var paperPostionValueLength = $("#paperPostionValueLength").val();
+        if(paperPostionValueLength >= 1){
+            for(var i = 1;i<=paperPostionValueLength;i++) {
             }
         }
         //判断是否有扫描纸质
@@ -750,14 +713,28 @@ function selectPaperPositonDictionary(){
         success:function(data){
             if(null != data) {
                 for (var i = 0; i < data.length; i++) {
-                    selectValue += '<select id="paperPosition'+(i+1)+'"><option value="">请选择</option>';
-                    //取出选择值集合
-                    var typeValues = data[i].typevalue.split(",");
-                    for(var j = 0;j < typeValues.length;j++){
-                        selectValue += '<option value="'+typeValues[j]+'">'+typeValues[j]+'</option>';
+                    //获取输入框类型
+                    //1选择框 2输入框
+                    var inputType = data[i].int1;
+                    //组织id
+                    var id = 'paperPosition'+(i+1);
+                    //获取是否必填 1是0否
+                    var isRequire = data[i].int2;
+                    if(inputType == 1){
+                        //选择框
+                        selectValue += '<select id="'+id+'" data="'+isRequire+'"><option value="">请选择</option>';
+                        //取出选择值集合
+                        var typeValues = data[i].typevalue.split(",");
+                        for(var j = 0;j < typeValues.length;j++){
+                            selectValue += '<option value="'+typeValues[j]+'">'+typeValues[j]+'</option>';
+                        }
+                        selectValue += '</select>';
+                        selectValue += data[i].typename;
+                    }else if(inputType == 2){
+                        //输入框
+                        selectValue += '<input id="'+id+'" maxlength="16" data="'+isRequire+'"/>';
+                        selectValue += data[i].typename;
                     }
-                    selectValue += '</select>';
-                    selectValue += data[i].typename;
                 }
                 $("#paperPostionValueLength").val(data.length);
             }