Merge branch 'CH-1202-2' of sckj/mz-cloud into master

ruoyi-ui/Dockerfile

@@ -13,7 +13,7 @@ RUN npm install
 
 ADD . /code
 
-RUN npm run build:dev
+RUN npm run build:prod
 
 #环境变量写在build后面否则找不到指令
 ENV PROJECT_ENV production

ruoyi-ui/src/views/business/fwjggl/cwxxtb/index.vue

@@ -110,7 +110,7 @@ import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
 export default {
   name: "Xjgrgl",
-  dicts: [ 'C0038','CH010','CZ035','CWTB001','CWTB003','CWTB004','CWTB005', 'CWTB006'],
+  dicts: [ 'C0038','CH010','CWTB001','CWTB003','CWTB004','CWTB005', 'CWTB006'],
   data() {
     return {
       outerVisible: false,
@@ -148,17 +148,16 @@ export default {
       dictOpt: {
         C0038: [],
         CH010: [],
-        CZ035: [],
         CWTB001: [],
         CWTB004: [],
         CWTB005: [],
         CWTB006: [],
         isOpt: [
           {
-            value: '是', label: '是'
+            value: '1', label: '是'
           },
           {
-            value: '否', label: '否'
+            value: '0', label: '否'
           }
         ],
         gblxOpt: [
@@ -216,7 +215,7 @@ export default {
         },
         {
           label: '机构-其他信息', child: [
-            { key: 'isfl', label: '是否为所有权、经营权分离公办养老机构', value: '', type: 'select', dict: 'CZ035' },
+            { key: 'isfl', label: '是否为所有权、经营权分离公办养老机构', value: '', type: 'select', dict: 'isOpt' },
             // {key:'isrtb',label:'是否设有儿童部',value:'',type:'select',dict:'isOpt'},
             { key: 'yljgzyxkzdjh', label: '医疗机构执业许可证登记号', value: '' },
             { key: 'ylbxddyljgzgzjbm', label: '医疗保险定点医疗机构资格证书编码', value: '' }
@@ -319,7 +318,6 @@ export default {
   mounted(){
     this.dictOpt.C0038=this.dict.tree.C0038;
     this.dictOpt.CH010=this.dict.type.CH010;
-    this.dictOpt.CZ035=this.dict.type.CZ035;
     this.dictOpt.CWTB001=this.dict.type.CWTB001;
     this.dictOpt.CWTB004=this.dict.type.CWTB004;
     this.dictOpt.CWTB005=this.dict.type.CWTB005;

ruoyi-ui/src/views/organization/jggl/cwxxTb/index.vue

@@ -78,7 +78,7 @@
 
   export default {
     name: 'Xjgrgl',
-    dicts: ['C0038', 'CH010', 'CZ035', 'CWTB001', 'CWTB002', 'CWTB003', 'CWTB004', 'CWTB005', 'CWTB006'],
+    dicts: ['C0038', 'CH010', 'CWTB001', 'CWTB002', 'CWTB003', 'CWTB004', 'CWTB005', 'CWTB006'],
     data() {
       return {
         outerVisible: false,
@@ -114,17 +114,16 @@
         dictOpt: {
           C0038: [],
           CH010: [],
-          CZ035: [],
           CWTB001: [],
           CWTB004: [],
           CWTB005: [],
           CWTB006: [],
           isOpt: [
             {
-              value: '是', label: '是'
+              value: '1', label: '是'
             },
             {
-              value: '否', label: '否'
+              value: '0', label: '否'
             }
           ],
           gblxOpt: [
@@ -182,7 +181,7 @@
           },
           {
             label: '机构-其他信息', child: [
-              { key: 'isfl', label: '是否为所有权、- ', value: '', type: 'select', dict: 'CZ035' },
+              { key: 'isfl', label: '是否为所有权、经营权分离公办养老机构', value: '', type: 'select', dict: 'isOpt' },
               // {key:'isrtb',label:'是否设有儿童部',value:'',type:'select',dict:'isOpt'},
               { key: 'yljgzyxkzdjh', label: '医疗机构执业许可证登记号', value: '' },
               { key: 'ylbxddyljgzgzjbm', label: '医疗保险定点医疗机构资格证书编码', value: '' }
@@ -284,7 +283,6 @@
       this.getCwJbxx()
     },
     mounted() {
-      this.dictOpt.CZ035 = this.dict.tree.CZ035
       this.dictOpt.C0038 = this.dict.tree.C0038
       this.dictOpt.CH010 = this.dict.type.CH010
       this.dictOpt.CWTB001 = this.dict.type.CWTB001