Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -203,7 +203,6 @@
           {value: 15, label: "门诊统筹"},
           {value: 16, label: "门诊慢性病"},
           {value: 21, label: "普通住院"},
-
         ],
         form: {
           id: '',
@@ -291,8 +290,7 @@
         }, {
           value: 6,
           label: "城乡居民大病医疗保险"
-        },
-          {
+        }, {
             value: 7,
             label: "生育保险"
           }],
@@ -323,17 +321,13 @@
           birthday: [{required: true, message: "患者出生日期不能为空", trigger: 'blur'}],
           certificates: [{required: true, message: "证件类型不能为空", trigger: 'change'}],
           id_card_type: [{required: true, message: "读卡类型不能为空", trigger: 'change'}],
-
           p_type: [{required: true, message: "处方类型不能为空", trigger: 'change'}],
           sick_type: [{required: true, message: "大病类别不能为空", trigger: 'change'}],
           diagnosis: [{required: true, message: "诊断不能为空", trigger: 'change'}],
-
         },
-
         visibility: false,
         labelPosition: 'right',
         isClose: false,
-
         resetForm: {
           settlement_value: '',
           medical_insurance_card: '',

src/xt_pages/workforce/remind_print.vue

@@ -114,7 +114,7 @@
         td_4_width: '45%',
         modeOptions: null,
         anticoagulants_confit:null,
-        currentDate:'',z
+        currentDate:'',
         org_id:0
       }
     },