DJ

src/components/common/MedicalPackageAsbitem.vue

@@ -2,7 +2,7 @@
   <div>
     <div :style="'display: flex;width:' + (window.pageWidth - 45 - 110) + 'px;'">
       <!--未选组合项目-->
-      <div style="display: block; width:250px;">
+      <div style="display: block; width:260px;">
         <div>
           <span style="padding: 5px;font-size: 14px;font-weight: 400;color: #232748;font-family: NotoSansSC-Regular;margin-bottom: 10px;">项目类别</span>
           <el-cascader :options="dict.itemTypeTree" v-model="itemTypeIds"

src/views/common-settings/medicalPackage.vue

@@ -7,80 +7,36 @@
           <span class="contenttitleBold">套餐设置</span>
         </div>
         <div class="seachinput">
-          <el-select
-            v-model="department"
-            placeholder="请选择条码"
-            filterable
-            :filter-method="remoteMethodes"
-            default-first-option
-            @change="quckDepartments"
-            clearable
-            size="small"
-          >
-            <el-option
-              v-for="item in quckDepartment"
-              :key="item.id"
-              :label="item.displayName"
-              :value="item.id"
-            >
+          <el-select v-model="department" placeholder="请选择条码" filterable :filter-method="remoteMethodes"
+            default-first-option @change="quckDepartments" clearable size="small">
+            <el-option v-for="item in quckDepartment" :key="item.id" :label="item.displayName" :value="item.id">
             </el-option>
           </el-select>
         </div>
       </div>
       <!--套餐信息-->
       <div style="display: block; margin-top: 7px; margin-right: 110px">
-        <div
-          style="
+        <div style="
             margin-bottom: 15px;
             background-color: #fff;
             padding: 15px;
             border-radius: 8px;
-          "
-        >
-          <el-table
-            :data="medicalPackages"
-            ref="medicalPackages"
-            row-key="id"
-            :height="
-              window.pageHeight < 600
+          ">
+          <el-table :data="medicalPackages" ref="medicalPackages" row-key="id" :height="window.pageHeight < 600
               ? 210
               : Math.floor((window.pageHeight - 220) / 2)
-            "
-            highlight-current-row
-            :row-class-name="handleRowClassName"
-            @row-click="rowClick"
-            class="el-table__body-wrapper tbody"
-          >
-            <el-table-column
-              type="index"
-              label="序号"
-              min-width="50"
-              align="center"
-            />
+            " highlight-current-row :row-class-name="handleRowClassName" @row-click="rowClick"
+            class="el-table__body-wrapper tbody">
+            <el-table-column type="index" label="序号" min-width="50" align="center" />
             <el-table-column prop="displayName" label="名称" min-width="150" />
-            <el-table-column
-              prop="price"
-              label="价格"
-              min-width="60"
-              align="center"
-            />
-            <el-table-column
-              prop="forSexId"
-              label="适用性别"
-              min-width="60"
-              align="center"
-            >
+            <el-table-column prop="price" label="价格" min-width="60" align="center" />
+            <el-table-column prop="forSexId" label="适用性别" min-width="60" align="center">
               <template slot-scope="scope">
                 {{ dddw(dict.forSex, "id", scope.row.forSexId, "displayName") }}
               </template>
             </el-table-column>
 
-              <el-table-column
-                prop="maritalStatusId"
-                label="适用婚姻状况"
-                min-width="80"
-                align="center"
-              >
+            <el-table-column prop="maritalStatusId" label="适用婚姻状况" min-width="80" align="center">
               <template slot-scope="scope">
                 {{
                   dddw(
@@ -92,24 +48,23 @@
                 }}
               </template>
             </el-table-column>
-              
-            <el-table-column
-              prop="isActive"
-              label="启用"
-              min-width="60"
-              align="center"
-            >
+            <el-table-column prop="isWebAppoint" label="网上预约" min-width="60" align="center">
+              <template slot-scope="scope">
+                <div style="font-family: 'Microsoft YaHei';">{{ scope.row.isWebAppoint == "Y" ? "√" : "" }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="isBasicRecommend" label="推荐套餐" min-width="60" align="center">
+              <template slot-scope="scope">
+                <div style="font-family: 'Microsoft YaHei';">{{ scope.row.isBasicRecommend == "Y" ? "√" : "" }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="isActive" label="启用" min-width="60" align="center">
               <template slot-scope="scope">
-                {{ scope.row.isActive == "Y" ? "是" : "否" }}
+                <div style="font-family: 'Microsoft YaHei';">{{ scope.row.isActive == "Y" ? "√" : "否" }}</div>
               </template>
             </el-table-column>
 
-            <el-table-column
-              prop="creatorName"
-              label="创建者"
-              min-width="60"
-              align="center"
-            />
+            <el-table-column prop="creatorName" label="创建者" min-width="60" align="center" />
             <el-table-column label="创建时间" min-width="150" align="center">
               <template slot-scope="scope">
                 {{
@@ -123,49 +78,35 @@
             </el-table-column>
             <el-table-column label="操作" width="40">
               <template>
-                <el-tag
-                  class="move"
-                  style="
+                <el-tag class="move" style="
                     cursor: move;
                     background-color: rgb(245, 245, 245);
                     border: none;
-                  "
-                  draggable="true"
-                >
-                  <i
-                    class="el-icon-d-caret"
-                    style="width: 1rem; height: 1rem; color: rgb(113, 113, 113)"
-                  ></i>
+                  " draggable="true">
+                  <i class="el-icon-d-caret" style="width: 1rem; height: 1rem; color: rgb(113, 113, 113)"></i>
                 </el-tag>
               </template>
             </el-table-column>
           </el-table>
         </div>
         <!--套餐项目信息-->
-        <div
-          style="
+        <div style="
             background-color: #fff;
             border-radius: 8px;
             padding: 15px;
             position: relative;
-          "
-        >
-          <MedicalPackageAsbitem
-            :formData="form"
-            :refreshMoney="refreshMoney"
-          />
+          ">
+          <MedicalPackageAsbitem :formData="form" :refreshMoney="refreshMoney" />
         </div>
       </div>
       <!--按钮-->
-      <div
-        style="
+      <div style="
           margin-left: 10px;
           margin-top: 40px;
           position: absolute;
           top: 0;
           right: 0;
-        "
-      >
+        ">
         <div>
           <el-button class="commonbutton" @click="btnAdd">新增</el-button>
         </div>
@@ -182,20 +123,13 @@
           <el-button class="commonbutton" @click="btnSetBottom">置低</el-button>
         </div>
         <div style="margin-top: 10px">
-          <el-button class="commonbutton" @click="btnSort" :disabled="!isDrag"
-            >保存排序</el-button
-          >
+          <el-button class="commonbutton" @click="btnSort" :disabled="!isDrag">保存排序</el-button>
         </div>
       </div>
     </div>
 
     <!-- 新增或者编辑弹框 -->
-    <el-dialog
-      :title="form.id ? '编辑' : '新增'"
-      :close-on-click-modal="false"
-      :visible.sync="dialogVisible"
-      width="800px"
-    >
+    <el-dialog :title="form.id ? '编辑' : '新增'" :close-on-click-modal="false" :visible.sync="dialogVisible" width="800px">
       <el-form :model="form" label-width="80px" :rules="rules" ref="form">
         <el-row>
           <el-col :span="8">
@@ -210,55 +144,41 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="适用性别">
-              <el-select
-                v-model="form.forSexId"
-                placeholder="请选择"
-                size="small"
-              >
-                <el-option
-                  v-for="item in dict.forSex"
-                  :key="item.id"
-                  :label="item.displayName"
-                  :value="item.id"
-                >
+              <el-select v-model="form.forSexId" placeholder="请选择" size="small">
+                <el-option v-for="item in dict.forSex" :key="item.id" :label="item.displayName" :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          
+        </el-row>
+        <el-row>
           <el-col :span="6">
             <el-form-item label="婚姻状况">
-              <el-select
-                v-model="form.maritalStatusId"
-                placeholder="请选择"
-                style="width: 100%" size="small" >
-                <el-option
-                  v-for="item in dict.forMaritalStatus"
-                  :key="item.id"
-                  :label="item.displayName"
-                  :value="item.id"
-                >
+              <el-select v-model="form.maritalStatusId" placeholder="请选择" style="width: 100%" size="small">
+                <el-option v-for="item in dict.forMaritalStatus" :key="item.id" :label="item.displayName"
+                  :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
-         
-          <el-col :span="4">
-            <el-form-item label="网上预约" prop="isActive">
-              <el-checkbox
-                v-model="form.isWebAppoint"
-                true-label="Y"
-                false-label="N"
-              />
+          <el-col :span="6">
+            <el-form-item label="网上预约" prop="isWebAppoint">
+              <el-checkbox v-model="form.isWebAppoint" true-label="Y" false-label="N" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="推荐套餐" prop="isBasicRecommend">
+              <el-checkbox v-model="form.isBasicRecommend" true-label="Y" false-label="N" />
             </el-form-item>
           </el-col>
           <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>
+              <el-checkbox v-model="form.isActive" true-label="Y" false-label="N" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+        </el-row>
+        <el-row>
+          <el-col :span="24">
             <el-form-item label="备注">
               <el-input v-model="form.remark" size="small" />
             </el-form-item>
@@ -266,15 +186,11 @@
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false" class="difference"
-          >取消</el-button
-        >
+        <el-button @click="dialogVisible = false" class="difference">取消</el-button>
         <!--
         <el-button type="success" @click="computePrice">同比折算套餐项目价格</el-button>
         -->
-        <el-button type="primary" @click="onSubmit('form')" class="commonbutton"
-          >确定</el-button
-        >
+        <el-button type="primary" @click="onSubmit('form')" class="commonbutton">确定</el-button>
       </span>
     </el-dialog>
     <!--  -->
@@ -310,6 +226,7 @@ export default {
         isActive: "Y",
         remark: "",
         isWebAppoint: "Y",
+        isBasicRecommend: 'N'
       },
       formOri: {},
       formInit: {},
@@ -503,7 +420,7 @@ export default {
 
     getPackages() {
       // /api/app/medicalpackage/getlist
-      postapi("/api/app/medicalpackage/GetBasicList", {}).then((res) => {
+      postapi("/api/app/medicalpackage/getmedicalpackagelist", {}).then((res) => {
         if (res.code != -1) {
           this.medicalPackages = res.data;
           this.initTableData = [...res.data];
@@ -800,10 +717,12 @@ export default {
 :deep .el-dialog__footer {
   padding: 0px 20px 14px;
 }
+
 .seachinput {
   width: 250px;
   margin-right: 110px;
 }
+
 :deep .seachinput .el-select {
   width: 100%;
 }

src/views/customerOrg/CustomerOrgGroupEdit.vue

@@ -20,6 +20,8 @@
             </el-select>
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="8">
           <el-form-item label="婚姻状况">
             <el-select v-model="form.maritalStatusId" placeholder="请选择" style="width: 100%" size="small">
@@ -38,6 +40,8 @@
             <el-input v-model="form.ageUpperLimit" type="number" min="1" max="200" size="small" />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="8">
           <el-form-item label="适用职务">
             <el-input v-model="form.jobPost" size="small" />
@@ -49,6 +53,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
+          <el-form-item label="可自选金额">
+            <el-input type="number" v-model="form.canAddMoney" size="small" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
           <el-form-item label="备注">
             <el-input v-model="form.remark" size="small" />
           </el-form-item>
@@ -100,6 +111,7 @@ export default {
         maritalStatusId: "A",
         ageLowerLimit: 0,
         ageUpperLimit: 200,
+        canAddMoney:0,
         jobPost: "",
         jobTitle: "",
         remark: "",

src/views/customerOrg/customerOrgGroup.vue

@@ -35,6 +35,7 @@
               <el-table-column label="id" prop="id" min-width="200" align="center" />
               <el-table-column prop="displayName" label="名称" min-width="150" />
               <el-table-column prop="price" label="价格" min-width="60" align="center" />
+              <el-table-column prop="canAddMoney" label="可自选金额" min-width="80" align="center" />
               <el-table-column prop="forSexId" label="适用性别" min-width="60" align="center">
                 <template slot-scope="scope">
                   {{ dddw(dict.forSex, "id", scope.row.forSexId, "displayName") }}