Merge branch 'CH-1101-GS' 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/organization/jggl/jcxx/index.vue

@@ -1621,56 +1621,57 @@ export default {
       handleUpdate(id) {
         this.reset()
         this.loading = true
-        getJgjs(id).then(response => {
-            if(response.data!=null) {
-              this.form2 = response.data;
+        getJgjs(id).then(response1 => {
+            if(response1.data!=null) {
+              this.form2 = response1.data;
               this.form2.zt="1";
             }else{
               this.form2.zt="0";
             }
+          getJcxx(id).then(response => {
+            this.loading = false
+            let data = decryptData_ECB(response.data, ["frxm", "frzjhm", "frlxfs", "txdz"], [1, 2, 3, 4]);
+            this.form = {...this.form2,isYljgzyxk:'',isYlbxddzg:'', szlrlx: '', nsyljg: '', yljgqyhz: '', fcyhznr: '', ...data }
+            this.form.szlrlx = this.form.szlrlx ? this.form.szlrlx.split(',') : []
+            this.form.nsyljg = this.form.nsyljg ? this.form.nsyljg.split(',') : []
+            this.form.yljgqyhz = this.form.yljgqyhz ? this.form.yljgqyhz.split(',') : []
+            this.form.fcyhznr = this.form.fcyhznr ? this.form.fcyhznr.split(',') : []
+
+            this.getSzlrlx(this.form.szlrlx)
+            this.changeIsXfsyZt(this.form.isXfsyZt)
+            this.changeIsSpxkZt(this.form.isSpxkZt)
+            this.changeIsTgjjylsmfw(this.form.isTgjjylsmfw)
+            this.changeIsTgsqylfw(this.form.isTgsqylfw)
+            this.changeIsQtsf(this.form.isQtsf)
+            this.changeFrzjlx('frzjhm',this.form.frzjlx)
+            this.changeIsChxddjg(this.form.isChxddjg)
+            this.changeIsKzylfw(this.form.isKzylfw)
+            this.changeDwxz(this.form.dwxz)
+            if (this.form.szxzqhName) {
+              this.form.szxzqh = JSON.stringify(this.form.szxzqhName.split(','))
+            } else {
+              this.form.szxzqh = ''
+            }
+            if (this.form.tyshxydm && this.form.tyshxydm == '000000000000000000') {
+              this.checked = true
+              this.form.tyshxydm = ''
+              this.rules.tyshxydm = []
+            }
+            this.szxzqhNames=this.form.szxzqhNames
+            let copyData = {
+              ...this.form,
+              cwzs: parseInt(this.form.cwzs),
+              szlrlx: this.form.szlrlx.join(','),
+              nsyljg: this.form.nsyljg.join(','),
+              yljgqyhz: this.form.yljgqyhz.join(','),
+              fcyhznr: this.form.fcyhznr.join(','),
+              // dwxz:this.form.dwxz.join(','),
+              szxzqh: this.form.szxzqh ? JSON.parse(this.form.szxzqh)[JSON.parse(this.form.szxzqh).length - 1] : ''
+            }
+            this.copyForm = this.deepCopy(copyData)
+          })
         })
-        getJcxx(id).then(response => {
-          this.loading = false
-          let data = decryptData_ECB(response.data, ["frxm", "frzjhm", "frlxfs", "txdz"], [1, 2, 3, 4]);
-          this.form = {...this.form2,isYljgzyxk:'',isYlbxddzg:'', szlrlx: '', nsyljg: '', yljgqyhz: '', fcyhznr: '', ...data }
-          this.form.szlrlx = this.form.szlrlx ? this.form.szlrlx.split(',') : []
-          this.form.nsyljg = this.form.nsyljg ? this.form.nsyljg.split(',') : []
-          this.form.yljgqyhz = this.form.yljgqyhz ? this.form.yljgqyhz.split(',') : []
-          this.form.fcyhznr = this.form.fcyhznr ? this.form.fcyhznr.split(',') : []
-
-          this.getSzlrlx(this.form.szlrlx)
-          this.changeIsXfsyZt(this.form.isXfsyZt)
-          this.changeIsSpxkZt(this.form.isSpxkZt)
-          this.changeIsTgjjylsmfw(this.form.isTgjjylsmfw)
-          this.changeIsTgsqylfw(this.form.isTgsqylfw)
-          this.changeIsQtsf(this.form.isQtsf)
-          this.changeFrzjlx('frzjhm',this.form.frzjlx)
-          this.changeIsChxddjg(this.form.isChxddjg)
-          this.changeIsKzylfw(this.form.isKzylfw)
-	        this.changeDwxz(this.form.dwxz)
-          if (this.form.szxzqhName) {
-            this.form.szxzqh = JSON.stringify(this.form.szxzqhName.split(','))
-          } else {
-            this.form.szxzqh = ''
-          }
-          if (this.form.tyshxydm && this.form.tyshxydm == '000000000000000000') {
-            this.checked = true
-            this.form.tyshxydm = ''
-            this.rules.tyshxydm = []
-          }
-          this.szxzqhNames=this.form.szxzqhNames
-          let copyData = {
-            ...this.form,
-            cwzs: parseInt(this.form.cwzs),
-            szlrlx: this.form.szlrlx.join(','),
-            nsyljg: this.form.nsyljg.join(','),
-            yljgqyhz: this.form.yljgqyhz.join(','),
-            fcyhznr: this.form.fcyhznr.join(','),
-            // dwxz:this.form.dwxz.join(','),
-            szxzqh: this.form.szxzqh ? JSON.parse(this.form.szxzqh)[JSON.parse(this.form.szxzqh).length - 1] : ''
-          }
-          this.copyForm = this.deepCopy(copyData)
-        })
+
       },
       /** 提交按钮 */
       submitForm() {

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

@@ -1983,86 +1983,87 @@ export default {
       handleUpdate(id) {
         this.reset()
         this.loading = true
-        getJgjs(id).then(response => {
-          if(response.data!=null) {
-            this.form2 = response.data;
+        getJgjs(id).then(response1 => {
+          if(response1.data!=null) {
+            this.form2 = response1.data;
             this.form2.zt="1";
           }else{
             this.form2.zt="0";
           }
-        })
-        let getData=getSqJcxx;
-        if(this.sqJgId)
-        {
-          getData=businessGetSqJcxx
-        }
-        getData(id).then(response => {
-
-          this.loading = false
-          let data = decryptData_ECB(response.data, ["frxm", "frzjhm", "frlxfs", "txdz"], [1, 2, 3, 4]);
-          this.form = {...this.form2,szlrlx:'',nsyljg:'',yljgqyhz:'',fcyhznr:'',szlrlxQt:'',...response.data}
-          const router = this.$route.path.split('/');
-          if( (router[2]==='sqJcxx' && router[3]===undefined) && this.form.isSqst=='1'){
-            this.disSqstZt=false;
-            this.disCsxz=true;
-          }else if((router[2]==='sqJcxx' && router[3]===undefined) && this.form.isSqst!=='1'){
-            this.disStjszt=false;
+          let getData=getSqJcxx;
+          if(this.sqJgId)
+          {
+            getData=businessGetSqJcxx
           }
+          getData(id).then(response => {
 
-          this.form.szlrlx = this.form.szlrlx ? this.form.szlrlx.split(',') : []
-          this.form.nsyljg = this.form.nsyljg ? this.form.nsyljg.split(',') : []
-          this.form.yljgqyhz = this.form.yljgqyhz ? this.form.yljgqyhz.split(',') : []
-          this.form.fcyhznr = this.form.fcyhznr ? this.form.fcyhznr.split(',') : []
-	        this.form.fxlb = this.form.fxlb ? this.form.fxlb.split(',') : []
-	        this.oldFxlb = this.form.fxlb
-	        this.fxlbChange(this.form.fxlb)
-          this.getSzlrlx(this.form.szlrlx)
-          this.changeIsXfsyZt(this.form.isXfsyZt)
-          this.changeIsSpxkZt(this.form.isSpxkZt)
-          this.changeIsTgjjylsmfw(this.form.isTgjjylsmfw)
-          // this.changeIsTgsqylfw(this.form.isTgsqylfw);
-          this.changeFrzjlx(this.form.frzjlx)
-          this.changeIsKzylfw(this.form.isKzylfw)
-          this.szxzqhNames=this.form.szxzqhNames
-          if (this.form.nsyljg && this.form.nsyljg.length > 0) {
-            this.isZS = false
-            this.rules.isYljgzyxk = [
-              { required: true, message: '是否取得医疗机构执业许可证书不能为空', trigger: 'blur' }
-            ]
-            this.rules.isYlbxddzg = [
-              { required: true, message: '是否取得医疗保险定点医疗机构资格证书不能为空', trigger: 'blur' }
-            ]
-            this.rules.yljgqyhz = []
-          } else {
-            this.isZS = true
-          }
-          if (this.form.yljgqyhz && this.form.yljgqyhz.length > 0) {
-            this.rules.nsyljg = []
-          }
-          if (this.form.szxzqh) {
-            this.form.szxzqh = JSON.stringify(this.form.szxzqh.split(','))
-          } else {
-            this.form.szxzqh = ''
-          }
-          if (this.form.tyshxydm&&this.form.tyshxydm=='000000000000000000') {
-            this.checked = true
-            this.form.tyshxydm='';
-            this.rules.tyshxydm = []
-          }
-          if(this.user.userData.userType && this.user.userData.userType == '00'){
-            this.isStjszt = false;
-          }
-          let copyData = {
-            ...this.form,
-            cwzs:parseInt(this.form.cwzs),
-            szlrlx :this.form.szlrlx.join(','),
-            nsyljg:this.form.nsyljg.join(','),
-            yljgqyhz:this.form.yljgqyhz.join(','),
-            fcyhznr:this.form.fcyhznr.join(','),
-            szxzqh: this.form.szxzqh ? JSON.parse(this.form.szxzqh)[JSON.parse(this.form.szxzqh).length - 1] : ''
-          }
-          this.copyForm = this.deepCopy(copyData)
+            this.loading = false
+            let data = decryptData_ECB(response.data, ["frxm", "frzjhm", "frlxfs", "txdz"], [1, 2, 3, 4]);
+            this.form = {...this.form2,szlrlx:'',nsyljg:'',yljgqyhz:'',fcyhznr:'',szlrlxQt:'',...response.data}
+            const router = this.$route.path.split('/');
+            if( (router[2]==='sqJcxx' && router[3]===undefined) && this.form.isSqst=='1'){
+              this.disSqstZt=false;
+              this.disCsxz=true;
+            }else if((router[2]==='sqJcxx' && router[3]===undefined) && this.form.isSqst!=='1'){
+              this.disStjszt=false;
+            }
+
+            this.form.szlrlx = this.form.szlrlx ? this.form.szlrlx.split(',') : []
+            this.form.nsyljg = this.form.nsyljg ? this.form.nsyljg.split(',') : []
+            this.form.yljgqyhz = this.form.yljgqyhz ? this.form.yljgqyhz.split(',') : []
+            this.form.fcyhznr = this.form.fcyhznr ? this.form.fcyhznr.split(',') : []
+            this.form.fxlb = this.form.fxlb ? this.form.fxlb.split(',') : []
+            this.oldFxlb = this.form.fxlb
+            this.fxlbChange(this.form.fxlb)
+            this.getSzlrlx(this.form.szlrlx)
+            this.changeIsXfsyZt(this.form.isXfsyZt)
+            this.changeIsSpxkZt(this.form.isSpxkZt)
+            this.changeIsTgjjylsmfw(this.form.isTgjjylsmfw)
+            // this.changeIsTgsqylfw(this.form.isTgsqylfw);
+            this.changeFrzjlx(this.form.frzjlx)
+            this.changeIsKzylfw(this.form.isKzylfw)
+            this.szxzqhNames=this.form.szxzqhNames
+            if (this.form.nsyljg && this.form.nsyljg.length > 0) {
+              this.isZS = false
+              this.rules.isYljgzyxk = [
+                { required: true, message: '是否取得医疗机构执业许可证书不能为空', trigger: 'blur' }
+              ]
+              this.rules.isYlbxddzg = [
+                { required: true, message: '是否取得医疗保险定点医疗机构资格证书不能为空', trigger: 'blur' }
+              ]
+              this.rules.yljgqyhz = []
+            } else {
+              this.isZS = true
+            }
+            if (this.form.yljgqyhz && this.form.yljgqyhz.length > 0) {
+              this.rules.nsyljg = []
+            }
+            if (this.form.szxzqh) {
+              this.form.szxzqh = JSON.stringify(this.form.szxzqh.split(','))
+            } else {
+              this.form.szxzqh = ''
+            }
+            if (this.form.tyshxydm&&this.form.tyshxydm=='000000000000000000') {
+              this.checked = true
+              this.form.tyshxydm='';
+              this.rules.tyshxydm = []
+            }
+            if(this.user.userData.userType && this.user.userData.userType == '00'){
+              this.isStjszt = false;
+            }
+            let copyData = {
+              ...this.form,
+              cwzs:parseInt(this.form.cwzs),
+              szlrlx :this.form.szlrlx.join(','),
+              nsyljg:this.form.nsyljg.join(','),
+              yljgqyhz:this.form.yljgqyhz.join(','),
+              fcyhznr:this.form.fcyhznr.join(','),
+              szxzqh: this.form.szxzqh ? JSON.parse(this.form.szxzqh)[JSON.parse(this.form.szxzqh).length - 1] : ''
+            }
+            this.copyForm = this.deepCopy(copyData)
+          })
         })
+
       },
       /** 提交按钮 */
       submitForm() {