Explorar o código

类型详情和互斥项修改

luolei %!s(int64=5) %!d(string=hai) anos
pai
achega
b231fa4ae5

+ 30 - 15
package-lock.json

@@ -1931,7 +1931,6 @@
     "bindings": {
       "version": "1.5.0",
       "resolved": "https://registry.npm.taobao.org/bindings/download/bindings-1.5.0.tgz",
-      "integrity": "sha1-EDU8npRTNLwFEabZCzj7x8nFBN8=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -4546,7 +4545,6 @@
     "file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/file-uri-to-path/download/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha1-VTp7hEb/b2hDWcRF8eN6BdrMM90=",
       "dev": true,
       "optional": true
     },
@@ -4836,7 +4834,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4857,12 +4856,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4877,17 +4878,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5004,7 +5008,8 @@
         "inherits": {
           "version": "2.0.4",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5016,6 +5021,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5030,6 +5036,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5037,12 +5044,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.9.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5061,6 +5070,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5150,7 +5160,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5162,6 +5173,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5247,7 +5259,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5283,6 +5296,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5302,6 +5316,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5345,12 +5360,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -6410,7 +6427,6 @@
     "jquery": {
       "version": "3.4.1",
       "resolved": "https://registry.npm.taobao.org/jquery/download/jquery-3.4.1.tgz",
-      "integrity": "sha1-cU8fjZ3eS9+lV2S6N+8hRjDYDvI=",
       "dev": true
     },
     "js-levenshtein": {
@@ -7192,7 +7208,6 @@
     "nan": {
       "version": "2.14.0",
       "resolved": "https://registry.npm.taobao.org/nan/download/nan-2.14.0.tgz",
-      "integrity": "sha1-eBj3IgJ7JFmobwKV1DTR/CM2xSw=",
       "dev": true,
       "optional": true
     },

+ 5 - 5
src/api/config.js

@@ -17,8 +17,8 @@ export default {
     'registry': '/api/user/user/registry',
     'getSmsWithResetPassword': '/api/user/userver/getSmsWithResetPassword',
     'resetPassword': '/api/user/user/resetPassword',
-    'getAccessdMenu': '/api/user/user/getUserOrgMenu',  //获取左侧菜单项
-    'getVersionInner':'api/knowledgeman/versionInfo/getVersionInfoInner',  //获取内部版本信息
+    'getAccessdMenu': testUrl+'/api/user/user/getUserOrgMenu',  //获取左侧菜单项
+    'getVersionInner':testUrl+'api/knowledgeman/versionInfo/getVersionInfoInner',  //获取内部版本信息
     'getVersionOuter':'api/knowledgeman/versionInfo/getVersionInfoOuter',  //获取外部版本信息
     'getUserEnumsData': '/api/user/getUserEnumsData',   //获取用户枚举数据
     'getDiagbotManEnumsData':'/api/diagbotman/getDiagbotManEnumsData',      //获取产品枚举类型
@@ -233,10 +233,10 @@ export default {
     
 
 	  /*********预问诊相关接口**********/
-	  'questionList':'/api/precman/questionInfo_prec/page',     //预问诊-填写单列表
-    'questionAdd':'/api/precman/questionInfo_prec/saveOrUpdate',      //预问诊-填写单添加
+	  'questionList':testUrl+'/api/precman/questionInfo_prec/page',     //预问诊-填写单列表
+    'questionAdd':testUrl+'/api/precman/questionInfo_prec/saveOrUpdate',      //预问诊-填写单添加
     'questionSearch':'/api/precman/questionInfo_prec/index',    //预问诊-填写单检索
-    'preTypeList':'/api/precman/dictionaryInfo_prec/getList',   //类型枚举
+    'preTypeList':testUrl+'/api/precman/dictionaryInfo_prec/getList',   //类型枚举
     'questionDel':'/api/precman/questionInfo_prec/delete',      //删除
     'uploadImg':'/api/precman/file_prec/uploadImage',       //图片上传
     'fileDel':'/api/precman/file_prec/deleteRemoteFile',          //图片删除

+ 1 - 1
src/components/preTreat/AddSimpleQuestion.vue

@@ -19,7 +19,7 @@
                 填写单明细:<span v-if="dataPub.region2==2">(互斥项与其他明细内容互斥,互斥项同时只可选择一个)</span>
             </p>
             <PubSelect
-                    v-if="dataPub.region2==1 || dataPub.region2==2 || dataPub.region2==3 || dataPub.region2==11|| dataPub.region2==8"
+                    v-if="dataPub.region2==1 || dataPub.region2==2 || dataPub.region2==3 || dataPub.region2==11|| dataPub.region2==8|| dataPub.region2==10"
                     :ascription="dataPub.region1"
                     :sexType="dataPub.region7"
                     :type="dataPub.region2"

+ 3 - 2
src/components/preTreat/PubSelect.vue

@@ -279,9 +279,10 @@
         this.rows.map((it,x)=>{
           if(x===i){
             it.exclusion = 1;
-          }else{
-            it.exclusion = 0;
           }
+          // else{
+          //   it.exclusion = 0;
+          // }
         });
       },
       emitValues(i){