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

src/views/common-settings/medicalPackage.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="box">
-    <div style="position: relative;">
+    <div style="position: relative">
       <div class="middlebox">
         <div class="contenttitle">
           基础资料 /
@@ -28,16 +28,48 @@
         </div>
       </div>
       <!--套餐信息-->
-      <div style="display: block; margin-top: 7px;margin-right: 110px;">
-        <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
-              ? 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" />
+      <div style="display: block; margin-top: 7px; margin-right: 110px">
+        <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
+                ? 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"
+            />
             <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>
@@ -61,46 +93,79 @@
                 </template>
               </el-table-column>
                -->
-            <el-table-column prop="isActive" label="启用" min-width="60" align="center">
+            <el-table-column
+              prop="isActive"
+              label="启用"
+              min-width="60"
+              align="center"
+            >
               <template slot-scope="scope">
-                {{ scope.row.isActive == 'Y' ? '是' : '否' }}
+                {{ scope.row.isActive == "Y" ? "是" : "否" }}
               </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">
                 {{
                   scope.row.creationTime
-                  ? moment(scope.row.creationTime).format("yyyy-MM-DD HH:mm:ss")
-                  : ""
+                    ? moment(scope.row.creationTime).format(
+                        "yyyy-MM-DD HH:mm:ss"
+                      )
+                    : ""
                 }}
               </template>
             </el-table-column>
             <el-table-column label="操作" width="40">
               <template>
-                <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>
+                <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>
                 </el-tag>
               </template>
             </el-table-column>
           </el-table>
         </div>
         <!--套餐项目信息-->
-        <div style="background-color: #fff; border-radius: 8px; padding: 15px;position: relative;">
-          <MedicalPackageAsbitem :formData="form" :refreshMoney="refreshMoney" />
+        <div
+          style="
+            background-color: #fff;
+            border-radius: 8px;
+            padding: 15px;
+            position: relative;
+          "
+        >
+          <MedicalPackageAsbitem
+            :formData="form"
+            :refreshMoney="refreshMoney"
+          />
         </div>
       </div>
       <!--按钮-->
-      <div style="margin-left: 10px; margin-top: 40px;position: absolute;top: 0;right: 0;">
+      <div
+        style="
+          margin-left: 10px;
+          margin-top: 40px;
+          position: absolute;
+          top: 0;
+          right: 0;
+        "
+      >
         <div>
           <el-button class="commonbutton" @click="btnAdd">新增</el-button>
         </div>
@@ -117,13 +182,20 @@
           <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">
@@ -138,8 +210,17 @@
           </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>
@@ -162,6 +243,15 @@
             </el-form-item>
           </el-col>
           -->
+          <el-col :span="8">
+            <el-form-item label="网上预约" prop="isActive">
+              <el-checkbox
+                v-model="form.isWebAppoint"
+                true-label="Y"
+                false-label="N"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="启用" prop="isActive">
               <el-radio v-model="form.isActive" label="Y">是</el-radio>
@@ -176,11 +266,15 @@
         </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>
     <!--  -->
@@ -213,8 +307,9 @@ export default {
         price: 0,
         forSexId: "A",
         // maritalStatusId: "A",
-        isActive: 'Y',
+        isActive: "Y",
         remark: "",
+        isWebAppoint: "Y",
       },
       formOri: {},
       formInit: {},
@@ -227,7 +322,7 @@ export default {
       dialogVisible: false,
       department: "",
       quckDepartment: [],
-      initTableData:[]
+      initTableData: [],
     };
   },
   computed: {
@@ -243,14 +338,15 @@ export default {
   },
   methods: {
     moment,
-    dddw, deepCopy,
+    dddw,
+    deepCopy,
     quckDepartments(e) {
       if (e) {
-        this.medicalPackages.forEach((item,index) => {
+        this.medicalPackages.forEach((item, index) => {
           if (e == item.id) {
             this.$refs["medicalPackages"].setCurrentRow(item);
             this.rowClick(item);
-            this.searchup(item,index)
+            this.searchup(item, index);
           }
         });
       } else {
@@ -276,9 +372,9 @@ export default {
     },
     searchup(data, index) {
       this.$nextTick(() => {
-         if(index==0){
-          index=1
-         }
+        if (index == 0) {
+          index = 1;
+        }
         const targetTop = this.$refs["medicalPackages"].$el
           .querySelectorAll(".el-table__body tr")
           [index - 1].getBoundingClientRect().top;
@@ -294,8 +390,8 @@ export default {
     //刷新套餐价格（供子组件调用）
     refreshMoney(formData) {
       //console.log('this is parent')
-      let lfind = arrayExistObj(this.medicalPackages, 'id', formData.id)
-      if (lfind > -1) this.medicalPackages[lfind].price = formData.price
+      let lfind = arrayExistObj(this.medicalPackages, "id", formData.id);
+      if (lfind > -1) this.medicalPackages[lfind].price = formData.price;
     },
 
     //确定排序
@@ -324,7 +420,9 @@ export default {
           handle: ".move",
           animation: 300,
           onChoose({ oldIndex }) {
-            that.$refs["medicalPackages"].setCurrentRow(that.medicalPackages[oldIndex]);
+            that.$refs["medicalPackages"].setCurrentRow(
+              that.medicalPackages[oldIndex]
+            );
           },
           //拖拽结束
           onEnd({ newIndex, oldIndex }) {
@@ -337,50 +435,47 @@ export default {
       });
     },
 
-
     //置底
     btnSetBottom() {
       if (!this.form.id) {
         this.$message.warning("请选择操作的数据");
-        return
+        return;
       }
-      let lfind = arrayExistObj(this.medicalPackages, 'id', this.form.id)
-      let currentRow = {}
+      let lfind = arrayExistObj(this.medicalPackages, "id", this.form.id);
+      let currentRow = {};
 
       putapi(
         `/api/app/medicalpackage/updatemanysort?id=${this.form.id}&SortType=2`
       ).then((res) => {
         if (res.code != -1) {
-          currentRow = this.medicalPackages.splice(lfind, 1)[0]  //删除并赋值
-          this.medicalPackages.push(currentRow)
-          this.$refs['medicalPackages'].setCurrentRow(currentRow);
+          currentRow = this.medicalPackages.splice(lfind, 1)[0]; //删除并赋值
+          this.medicalPackages.push(currentRow);
+          this.$refs["medicalPackages"].setCurrentRow(currentRow);
           //this.$message.success('操作成功')
         }
       });
-
     },
 
     //置顶
     btnSetTop() {
       if (!this.form.id) {
         this.$message.warning("请选择操作的数据");
-        return
+        return;
       }
 
-      let lfind = arrayExistObj(this.medicalPackages, 'id', this.form.id)
-      let currentRow = {}
+      let lfind = arrayExistObj(this.medicalPackages, "id", this.form.id);
+      let currentRow = {};
 
       putapi(
         `/api/app/medicalpackage/updatemanysort?id=${this.form.id}&SortType=1`
       ).then((res) => {
         if (res.code != -1) {
-          currentRow = this.medicalPackages.splice(lfind, 1)[0]
-          this.medicalPackages.unshift(currentRow)
-          this.$refs['medicalPackages'].setCurrentRow(currentRow);
+          currentRow = this.medicalPackages.splice(lfind, 1)[0];
+          this.medicalPackages.unshift(currentRow);
+          this.$refs["medicalPackages"].setCurrentRow(currentRow);
           //this.$message.success('操作成功')
         }
       });
-
     },
 
     //选中颜色
@@ -389,40 +484,38 @@ export default {
       //console.log(rowIndex, row)
       //return row.highLightBg == 'selected' ? 'high-light-bg' : '';
       if (row.choosed) {
-        return 'current-row';
+        return "current-row";
       } else {
-        return '';
+        return "";
       }
-
     },
 
     //获取初始数据
     dictInit() {
-
       //获取适用性别
       getapi("/api/app/for-sex").then((res) => {
         if (res.code != -1) {
           this.dict.forSex = res.data;
         }
       });
-      this.getPackages()
+      this.getPackages();
     },
 
     getPackages() {
       // /api/app/medicalpackage/getlist
-      postapi("/api/app/medicalpackage/GetBasicList", {}).then(res => {
+      postapi("/api/app/medicalpackage/GetBasicList", {}).then((res) => {
         if (res.code != -1) {
-          this.medicalPackages = res.data
+          this.medicalPackages = res.data;
           this.initTableData = [...res.data];
           this.quckDepartment = [...res.data];
         }
-      })
+      });
     },
 
     //点击套餐
     rowClick(row) {
       objCopy(row, this.form);
-      this.formOri = Object.assign({}, row)
+      this.formOri = Object.assign({}, row);
     },
 
     //新增弹框
@@ -453,7 +546,12 @@ export default {
         this.$message.warning("请选择需要操作的数据");
         return;
       }
-      this.dialogVisible = true;
+      getapi(`/api/app/medicalpackage/getmodel?id=${this.form.id}`).then((res=>{
+        if(res.code!=-1){
+          this.form={...res.data}
+          this.dialogVisible = true;
+        }
+      }))
     },
 
     //删除
@@ -468,26 +566,25 @@ export default {
         cancelButtonText: "  否  ",
         type: "warning",
         cancelButtonClass: "difference",
-        confirmButtonClass: "commonbutton"
-      }).then(() => {
-        return postapi(`/api/app/medicalpackage/delete?id=${this.form.id}`);
-      }).then((res) => {
-        if (res.code != -1) {
-          let lfind = arrayExistObj(
-            this.medicalPackages,
-            "id",
-            this.form.id
-          );
-          if (lfind > -1) this.medicalPackages.splice(lfind, 1);
-          objCopy(this.formInit, this.form)
-          this.isDrag = false
-          //this.$message.success('删除成功')
-        }
-      }).catch((err) => {
-        if (err == "cancel") {
-          this.$message.info("已取消删除");
-        }
-      });
+        confirmButtonClass: "commonbutton",
+      })
+        .then(() => {
+          return postapi(`/api/app/medicalpackage/delete?id=${this.form.id}`);
+        })
+        .then((res) => {
+          if (res.code != -1) {
+            let lfind = arrayExistObj(this.medicalPackages, "id", this.form.id);
+            if (lfind > -1) this.medicalPackages.splice(lfind, 1);
+            objCopy(this.formInit, this.form);
+            this.isDrag = false;
+            //this.$message.success('删除成功')
+          }
+        })
+        .catch((err) => {
+          if (err == "cancel") {
+            this.$message.info("已取消删除");
+          }
+        });
     },
 
     onSubmit(formName) {
@@ -500,10 +597,9 @@ export default {
         let body = deepCopy(this.form);
         delete body.id;
 
-
         if (this.form.id) {
-          let medicalPackageId = this.form.id
-          let medicalPackageAsbitems = [] //分组包含的套餐
+          let medicalPackageId = this.form.id;
+          let medicalPackageAsbitems = []; //分组包含的套餐
 
           //编辑
           postapi(`/api/app/medicalpackage/update?id=${this.form.id}`, body).then(res => {
@@ -526,7 +622,6 @@ export default {
                   medicalPackageId,
                   details: this.madeNewPackageAsbitems(medicalPackageAsbitems, this.form.price)
                 }
-                return postapi('/api/app/medicalPackagedetail/createmedicalPackagedetailmany', detailsBody)
               }
             }
           }).then(res => {
@@ -546,14 +641,13 @@ export default {
 
         } else {
           //新增
-          postapi(
-            "/api/app/medicalpackage/create",
-            body
-          ).then((res) => {
+          postapi("/api/app/medicalpackage/create", body).then((res) => {
             if (res.code != -1) {
               this.form.id = res.data.id;
               this.medicalPackages.push(deepCopy(res.data));
-              this.$refs['medicalPackages'].setCurrentRow(this.medicalPackages[this.medicalPackages.length - 1]);
+              this.$refs["medicalPackages"].setCurrentRow(
+                this.medicalPackages[this.medicalPackages.length - 1]
+              );
               this.dialogVisible = false;
               //this.$message.success('操作成功！')
             }
@@ -563,88 +657,105 @@ export default {
     },
     computePrice() {
       if (!this.form.id) {
-        this.$message.warning("尚未保存信息，不可执行此操作！")
-        return
+        this.$message.warning("尚未保存信息，不可执行此操作！");
+        return;
       }
-      let medicalPackageId = this.form.id
-      let medicalPackageAsbitems = [] //套餐包含的套餐
-
-
-      postapi('/api/app/medicalPackagedetail/getmedicalPackagedetailinasbitem', { medicalPackageId })
-        .then(res => {
+      let medicalPackageId = this.form.id;
+      let medicalPackageAsbitems = []; //套餐包含的套餐
+
+      postapi(
+        "/api/app/medicalPackagedetail/getmedicalPackagedetailinasbitem",
+        { medicalPackageId }
+      )
+        .then((res) => {
           if (res.code != -1) {
             medicalPackageAsbitems = res.data;
 
             if (medicalPackageAsbitems.length < 1) {
-              this.$message.warning("当前套餐尚未设置组合项目，不可执行此操作！")
+              this.$message.warning(
+                "当前套餐尚未设置组合项目，不可执行此操作！"
+              );
             } else {
               let body = {
                 medicalPackageId,
-                details: this.madeNewPackageAsbitems(medicalPackageAsbitems, this.form.price)
-              }
-              return postapi('/api/app/medicalPackagedetail/createmedicalPackagedetailmany', body)
+                details: this.madeNewPackageAsbitems(
+                  medicalPackageAsbitems,
+                  this.form.price
+                ),
+              };
+              return postapi(
+                "/api/app/medicalPackagedetail/createmedicalPackagedetailmany",
+                body
+              );
             }
           }
-        }).then(res => {
+        })
+        .then((res) => {
           if (res.code != -1) {
             //console.log("操作成功");
             //触发套餐明细刷新
-            this.form.id = ''
+            this.form.id = "";
             //要做延时处理，否则不会触发监听
             setTimeout(() => {
               this.form.id = medicalPackageId;
-              this.onSubmit('form')
-            }, 100)
-
+              this.onSubmit("form");
+            }, 100);
           }
-        })
-
+        });
     },
 
     madeNewPackageAsbitems(oldPackageAsbitems, newTotal) {
-      newTotal = Math.round(Number(newTotal) * 100) / 100
-      let newPackageAsbitems = []
-      let oldTotal = Number(0)
-      oldPackageAsbitems.forEach(e => {
-        oldTotal += Number(e.asbitemMoney) //medicalPackageDetailMoney
-      })
-      oldTotal = Math.round(Number(oldTotal) * 100) / 100
-
-      let discount = 0
-      if (oldTotal != 0) discount = Math.round(newTotal * 10000 / oldTotal) / 100
-
-      oldTotal = Number(0)
-      oldPackageAsbitems.forEach(e => {
-        e.medicalPackageDetailPrice = Math.round(e.price * discount) / 100
-        e.medicalPackageDetailMoney = Math.round(e.medicalPackageDetailPrice * e.medicalPackageDetailAmount * 100) / 100
-        oldTotal += Number(e.medicalPackageDetailMoney)
-      })
-      oldTotal = Math.round(Number(oldTotal) * 100) / 100
+      newTotal = Math.round(Number(newTotal) * 100) / 100;
+      let newPackageAsbitems = [];
+      let oldTotal = Number(0);
+      oldPackageAsbitems.forEach((e) => {
+        oldTotal += Number(e.asbitemMoney); //medicalPackageDetailMoney
+      });
+      oldTotal = Math.round(Number(oldTotal) * 100) / 100;
+
+      let discount = 0;
+      if (oldTotal != 0)
+        discount = Math.round((newTotal * 10000) / oldTotal) / 100;
+
+      oldTotal = Number(0);
+      oldPackageAsbitems.forEach((e) => {
+        e.medicalPackageDetailPrice = Math.round(e.price * discount) / 100;
+        e.medicalPackageDetailMoney =
+          Math.round(
+            e.medicalPackageDetailPrice * e.medicalPackageDetailAmount * 100
+          ) / 100;
+        oldTotal += Number(e.medicalPackageDetailMoney);
+      });
+      oldTotal = Math.round(Number(oldTotal) * 100) / 100;
 
       //console.log('discount,oldTotal',discount,oldTotal)
 
-      let didTotal = Math.round(Number(newTotal - oldTotal) * 100) / 100
+      let didTotal = Math.round(Number(newTotal - oldTotal) * 100) / 100;
       if (didTotal != 0) {
         for (let i = 0; i < oldPackageAsbitems.length; i++) {
           if (oldPackageAsbitems[i].medicalPackageDetailAmount == 1) {
-            oldPackageAsbitems[i].medicalPackageDetailPrice = Math.round((Number(oldPackageAsbitems[i].medicalPackageDetailPrice) + Number(didTotal)) * 100) / 100
-            break
+            oldPackageAsbitems[i].medicalPackageDetailPrice =
+              Math.round(
+                (Number(oldPackageAsbitems[i].medicalPackageDetailPrice) +
+                  Number(didTotal)) *
+                  100
+              ) / 100;
+            break;
           }
         }
       }
 
-      oldPackageAsbitems.forEach(e => {
+      oldPackageAsbitems.forEach((e) => {
         newPackageAsbitems.push({
           medicalPackageId: this.form.id, // e.medicalPackageId,
           asbitemId: e.id, // e.asbitemId
           price: e.medicalPackageDetailPrice,
-          amount: e.medicalPackageDetailAmount
-        })
-      })
+          amount: e.medicalPackageDetailAmount,
+        });
+      });
 
-      return newPackageAsbitems
+      return newPackageAsbitems;
     },
-
   },
 };
 </script>

src/views/fee-settings/Asbitem.vue

@@ -648,8 +648,9 @@
                     </el-option>
                   </el-select> -->
               <el-checkbox
-                v-model="form.isItemResultMergerBox"
-                @change="changeBox('isItemResultMerger')"
+                v-model="form.isItemResultMerger"
+                true-label="Y"
+                false-label="N"
               />
             </el-form-item>
           </el-col>
@@ -665,8 +666,9 @@
                     </el-option>
                   </el-select> -->
               <el-checkbox
-                v-model="form.isBeforeEatBox"
-                @change="changeBox('isBeforeEat')"
+                v-model="form.isBeforeEat"
+                true-label="Y"
+                false-label="N"
               />
             </el-form-item>
           </el-col>
@@ -722,8 +724,9 @@
                     </el-option>
                   </el-select> -->
               <el-checkbox
-                v-model="form.isDiagnosisFunctionBox"
-                @change="changeBox('isDiagnosisFunction')"
+                v-model="form.isDiagnosisFunction"
+                true-label="Y"
+                false-label="N"
               />
             </el-form-item>
           </el-col>
@@ -762,8 +765,9 @@
                     </el-option>
                   </el-select> -->
               <el-checkbox
-                v-model="form.isContinueProcessBox"
-                @change="changeBox('isContinueProcess')"
+                v-model="form.isContinueProcess"
+                true-label="Y"
+                false-label="N"
               />
             </el-form-item>
           </el-col>
@@ -810,8 +814,27 @@
                     </el-option>
                   </el-select> -->
               <el-checkbox
-                v-model="form.isPictureRotateBox"
-                @change="changeBox('isPictureRotate')"
+                v-model="form.isPictureRotate"
+                true-label="Y"
+                false-label="N"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="网上预约" prop="">
+              <!-- <el-select v-model="form.isCheck" placeholder="请选择">
+                    <el-option
+                      v-for="item in isCheck"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select> -->
+              <el-checkbox
+                v-model="form.isWebAppoint"
+                true-label="Y"
+                false-label="N"
               />
             </el-form-item>
           </el-col>
@@ -827,8 +850,9 @@
                     </el-option>
                   </el-select> -->
               <el-checkbox
-                v-model="form.isCheckBox"
-                @change="changeBox('isCheck')"
+                v-model="form.isCheck"
+                true-label="Y"
+                false-label="N"
               />
             </el-form-item>
           </el-col>
@@ -844,8 +868,9 @@
                     </el-option>
                   </el-select> -->
               <el-checkbox
-                v-model="form.isActiveBox"
-                @change="changeBox('isActive')"
+                v-model="form.isActive"
+                true-label="Y"
+                false-label="N"
               />
             </el-form-item>
           </el-col>
@@ -1153,15 +1178,9 @@ export default {
         isPictureRotate: "N",
         isCheck: "N",
         isActive: "Y",
-        isActiveBox: true,
-        isBeforeEatBox: false,
-        isCheckBox: true,
-        isContinueProcessBox: false,
-        isDiagnosisFunctionBox: false,
-        isItemResultMergerBox: false,
-        isPictureRotateBox: false,
         collectItemTypeId:"",
-        barcodeMode:"0"
+        barcodeMode:"0",
+        isWebAppoint:"Y"
       },
       forSexId: [], //性别
       itemTypeId: [], //项目类别
@@ -1413,16 +1432,6 @@ export default {
     quckRusetform(e) {
       this.$forceUpdate();
     },
-    changeBox(type) {
-      //赋值
-      if (this.form[type + "Box"]) {
-        this.$delete(this.form, type);
-        this.$set(this.form, type, "Y");
-      } else {
-        this.$delete(this.form, type);
-        this.$set(this.form, type, "N");
-      }
-    },
     typeid() {
       projectlist().then((res) => {
         if (res.code != -1) {
@@ -2096,42 +2105,7 @@ export default {
         }
         asbitemgetid(this.form.id).then((res) => {
           if (res.code != -1) {
-            this.form = res.data;
-            if (res.data.isItemResultMerger == "Y") {
-              this.form.isItemResultMergerBox = true;
-            } else {
-              this.form.isItemResultMergerBox = false;
-            }
-            if (res.data.isBeforeEat == "Y") {
-              this.form.isBeforeEatBox = true;
-            } else {
-              this.form.isBeforeEatBox = false;
-            }
-            if (res.data.isDiagnosisFunction == "Y") {
-              this.form.isDiagnosisFunctionBox = true;
-            } else {
-              this.form.isDiagnosisFunctionBox = false;
-            }
-            if (res.data.isContinueProcess == "Y") {
-              this.form.isContinueProcessBox = true;
-            } else {
-              this.form.isContinueProcessBox = false;
-            }
-            if (res.data.isPictureRotate == "Y") {
-              this.form.isPictureRotateBox = true;
-            } else {
-              this.form.isPictureRotateBox = false;
-            }
-            if (res.data.isCheck == "Y") {
-              this.form.isCheckBox = true;
-            } else {
-              this.form.isCheckBox = false;
-            }
-            if (res.data.isActive == "Y") {
-              this.form.isActiveBox = true;
-            } else {
-              this.form.isActiveBox = false;
-            }
+            this.form = {...res.data};
           }
         });
         //性别
@@ -2196,7 +2170,8 @@ export default {
               isCheck: this.form.isCheck,
               isActive: this.form.isActive,
               collectItemTypeId:this.form.collectItemTypeId,
-              barcodeMode:this.form.barcodeMode
+              barcodeMode:this.form.barcodeMode,
+              isWebAppoint:this.form.isWebAppoint
             };
             newcombination(obj).then((res) => {
               if (res.code != -1) {
@@ -2231,7 +2206,8 @@ export default {
               isCheck: this.form.isCheck,
               isActive: this.form.isActive,
               collectItemTypeId:this.form.collectItemTypeId,
-              barcodeMode:this.form.barcodeMode
+              barcodeMode:this.form.barcodeMode,
+              isWebAppoint:this.form.isWebAppoint
             };
             updateombination(this.form.id, obj).then((res) => {
               if (res.code != -1) {