Merge branch 'master' of http://140.143.162.39:3000/shentun/peisweb

src/views/common-settings/medicalPackage.vue

@@ -74,7 +74,7 @@
                 {{ dddw(dict.forSex, "id", scope.row.forSexId, "displayName") }}
               </template>
             </el-table-column>
-            <!--
+            
               <el-table-column
                 prop="maritalStatusId"
                 label="适用婚姻状况"
@@ -92,7 +92,7 @@
                   }}
                 </template>
               </el-table-column>
-               -->
+              
             <el-table-column
               prop="isActive"
               label="启用"
@@ -225,8 +225,8 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <!--
-          <el-col :span="8">            
+          
+          <el-col :span="6">            
             <el-form-item label="婚姻状况">
               <el-select
                 v-model="form.maritalStatusId"
@@ -242,8 +242,8 @@
               </el-select>
             </el-form-item>
           </el-col>
-          -->
-          <el-col :span="8">
+         
+          <el-col :span="4">
             <el-form-item label="网上预约" prop="isActive">
               <el-checkbox
                 v-model="form.isWebAppoint"
@@ -252,7 +252,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="启用" prop="isActive">
               <el-radio v-model="form.isActive" label="Y">是</el-radio>
               <el-radio v-model="form.isActive" label="N">否</el-radio>
@@ -306,7 +306,7 @@ export default {
         displayName: "",
         price: 0,
         forSexId: "A",
-        // maritalStatusId: "A",
+        maritalStatusId: "",
         isActive: "Y",
         remark: "",
         isWebAppoint: "Y",
@@ -322,7 +322,7 @@ export default {
       dialogVisible: false,
       department: "",
       quckDepartment: [],
-      initTableData: [],
+      initTableData: []
     };
   },
   computed: {

src/views/fee-settings/Asbitem.vue

@@ -1209,7 +1209,7 @@ export default {
         barcodeMode:"0",
         isWebAppoint:"Y",
         warn:"",
-        diseaseScreeningTypeId:"",
+        diseaseScreeningTypeId:null,
         isDiagnosisFunctionBox: false
       },
       forSexId: [], //性别