diff --git a/src/views/fee-settings/Item.vue b/src/views/fee-settings/Item.vue
index 401b392..2e31f38 100644
--- a/src/views/fee-settings/Item.vue
+++ b/src/views/fee-settings/Item.vue
@@ -204,6 +204,7 @@
                 v-model="form.unitId"
                 placeholder="请选择"
                 style="width: 100%"
+                filterable
               >
                 <el-option
                   v-for="item in unitId"
@@ -213,6 +214,15 @@
                 >
                 </el-option>
               </el-select>
+              <!-- <el-autocomplete
+                class="inline-input"
+                v-model="unitIdName"
+                :fetch-suggestions="querySearch"
+                value-key="displayName"
+                placeholder="请输入内容"
+                @select="handleSelect"
+              >
+              </el-autocomplete> -->
             </el-form-item>
           </el-col>
           <el-col :span="4">
@@ -253,7 +263,9 @@
               <el-input
                 v-model="form.diagnosisFunction"
                 :disabled="disableddiagnosisFunction"
-              ></el-input>
+              >
+              <el-button slot="append" icon="el-icon-more" v-if="isDiagnosisFunctionBox" @click="diagnosisFunctionBox=true"></el-button>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -283,9 +295,11 @@
               <el-checkbox v-model="isCalculationItemBox" @change="changeBox('isCalculationItem')" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="计算函数" prop="">
-              <el-input v-model="form.calculationFunction"></el-input>
+              <el-input v-model="form.calculationFunction" :disabled="true">
+                <el-button slot="append" icon="el-icon-more" v-if="isCalculationItemBox" @click="calculationFunctionBox=true"></el-button>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -293,7 +307,7 @@
               <el-input v-model="form.inputCheck"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="3">
             <el-form-item label="继续处理" prop="isContinueProcess">
                <el-checkbox v-model="isContinueProcessBox" @change="changeBox('isContinueProcess')" />
             </el-form-item>
@@ -462,30 +476,32 @@
               </template>
             </el-table-column>
             <el-table-column label="诊断">
-              <template> </template>
+              <template slot-scope="scope">
+                {{scope.row.diagnosisId}}
+              </template>
             </el-table-column>
           </el-table>
         </div>
         <div style="margin-top: 5px; margin-left: 15px">
-          <el-button type="primary" @click="increase">添加1</el-button>
+          <el-button type="primary" @click="increase" style="width:100%;">添加</el-button>
           <div style="margin-top: 5px">
-            <el-button type="primary" @click="resultediting">编辑</el-button>
+            <el-button type="primary" @click="resultediting" style="width:100%;">编辑</el-button>
           </div>
           <div style="margin-top: 5px">
-            <el-button type="primary" @click="delemtdelite">删除</el-button>
+            <el-button type="primary" @click="delemtdelite" style="width:100%;">删除</el-button>
           </div>
           <!-- <div style="margin-top: 5px">
             <el-button type="primary" @click="templatecategory"
               >模板类别</el-button
             >
           </div> -->
-          <div style="margin-top: 5px">
-            <el-button type="primary" @click="diagnosticmatching"
-              >诊断匹配</el-button
+          <div style="margin-top: 5px;margin-bottom:14px;">
+            <el-button type="primary" @click="diagnosticmatching" style="width:100%;">诊断匹配</el-button
             >
           </div>
         </div>
       </div>
+      <el-divider></el-divider>
       <span slot="footer" class="dialog-footer">
         <el-button @click="rurestdialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="rurestdialogVisible = false"
@@ -522,7 +538,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="诊断编号">
-              <el-select v-model="rusetform.diagnosisId" placeholder="请选择">
+              <el-select v-model="rusetform.diagnosisId" placeholder="请选择" filterable>
                 <el-option
                   v-for="item in diagnosisId"
                   :key="item.id"
@@ -533,43 +549,22 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="4">
             <el-form-item label="小结名称">
-              <el-select
-                v-model="rusetform.isNameIntoSummary"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in isNameIntoSummary"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
+              <el-checkbox v-model="rusetform.isNameIntoSummary" true-label="Y" false-label="N"/>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="4">
             <el-form-item label="进入小结">
-              <el-select
-                v-model="rusetform.isResultIntoSummary"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in isResultIntoSummary"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
+              <el-checkbox v-model="rusetform.isResultIntoSummary" true-label="Y" false-label="N" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="9">
             <el-form-item label="结果状态">
               <el-select
                 v-model="rusetform.resultStatusId"
                 placeholder="请选择"
+                filterable
               >
                 <el-option
                   v-for="item in resultStatusId"
@@ -583,6 +578,7 @@
           </el-col>
         </el-row>
       </el-form>
+      <el-divider></el-divider>
       <span slot="footer" class="dialog-footer">
         <el-button @click="ruesttieledialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="rusteronsubmit">确 定</el-button>
@@ -882,8 +878,48 @@
         >
       </span>
     </el-dialog>
-
-    <!--  -->
+    <!-- 诊断函数弹框 -->
+    <el-dialog
+      title="诊断函数设置"
+      :visible.sync="diagnosisFunctionBox"
+      width="50%"
+      :close-on-click-modal="false"
+    >
+    <el-form label-width="110px">
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="诊断函数">
+            <el-input type="textarea" v-model="diagnosisFunctionText"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+        <el-button @click="diagnosisFunctionBox = false,diagnosisFunctionText=''">取 消</el-button>
+        <el-button type="primary" @click="OnsubmitDiagnosis">确 定</el-button>
+    </span>
+    </el-dialog>
+    <!-- 计算函数弹框 -->
+    <el-dialog
+      title="计算函数设置"
+      :visible.sync="calculationFunctionBox"
+      width="50%"
+      :close-on-click-modal="false"
+    >
+    <el-form label-width="110px">
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="诊断函数">
+            <el-input type="textarea" v-model="calculationFunctionText"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+        <el-button @click="calculationFunctionBox = false,calculationFunctionText=''">取 消</el-button>
+        <el-button type="primary" @click="OnsubmitCalculation">确 定</el-button>
+    </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -943,8 +979,8 @@ export default {
         itemId: "",
         result: "",
         diagnosisId: "",
-        isNameIntoSummary: "",
-        isResultIntoSummary: "",
+        isNameIntoSummary: "N",
+        isResultIntoSummary: "Y",
         resultStatusId: "",
         simpleCode: "",
       }, //项目结果模板需要的数据
@@ -1012,6 +1048,9 @@ export default {
       isCalculationItemBox:false,
       isContinueProcessBox:false,
       isActiveBox:true,
+      // unitIdName:"",
+      diagnosisFunctionBox:false,
+      calculationFunctionBox:false,
       form: {
         displayName: "",
         englishShortName: "",
@@ -1030,7 +1069,7 @@ export default {
         isContinueProcess: "",
         resultTemplateTypeFlag: "",
         inputCheck: "",
-        isActive: "",
+        isActive: ""
       },
 
       referenceRangeTypeFlag: [
@@ -1234,6 +1273,14 @@ export default {
           value: "4",
           label: "无",
         },
+        {
+          value: "5",
+          label: "(—)",
+        },
+        {
+          value: "6",
+          label: "­-",
+        },
       ], //默认结果
       ssdate: [],
       fssubdex: "",
@@ -1241,8 +1288,10 @@ export default {
       scopediagnostic: [], //诊断范围下拉框
       reference: [], //参考范围
       resulttemp: [], // 结果模板
-      disableddiagnosisFunction: false,
+      disableddiagnosisFunction: true,
       curRow: {},
+      diagnosisFunctionText:"",
+      calculationFunctionText:""
     };
   },
   created() {
@@ -1486,19 +1535,21 @@ export default {
         // this.result = res.data.items;
         this.resultStatusId = res.data.items;
       });
-      postapi("/api/app/diagnosis/getlistinfilter").then((res) => {
-        console.log(res);
-        this.diagnosisId = res.data.items;
+      // let diagnosisObj={
+      //   itemTypeId:this.form.itemTypeId
+      // }
+      postapi("/api/app/diagnosis/getlistinsuggestion").then((res) => {
+        this.diagnosisId = res.data;
       });
     },
     //结果模板添加
     increase() {
       this.addoredit();
       this.ruesttiele = 1;
+      Object.assign(this.$data.rusetform, this.$options.data().rusetform)
       this.rusetform.itemId = this.form.id;
-      console.log(this.rusetform.id);
       this.ruesttieledialogVisible = true;
-      // this.rusetform = {};
+      console.log(this.rusetform)
     },
     //获取项目类别列表
     getmedicalconclusionlist() {
@@ -1580,13 +1631,14 @@ export default {
       cb(tableDatas);
     },
     resultlist() {
-      getapi("/api/app/item-result-template").then((res) => {
-        this.reusttableData = res.data.items;
-
-        console.log(res);
-      });
+      getapi(`/api/app/item-result-template/in-item-id/${this.form.id}`).then(
+          (res) => {
+            this.reusttableData = res.data;
+          }
+        );
     },
     resulttemplate() {
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
@@ -1594,15 +1646,12 @@ export default {
         getapi(`/api/app/item-result-template/in-item-id/${this.form.id}`).then(
           (res) => {
             this.reusttableData = res.data;
-            console.log("2222222222222222");
-            console.log(res);
           }
         );
-        //// 获取项目类别
-        getapi("/api/app/item-type/by-code-all").then((res) => {
-          this.resultitemtype = res.data;
-          console.log(res);
-        });
+        // // 获取项目类别
+        // getapi("/api/app/item-type/by-code-all").then((res) => {
+        //   this.resultitemtype = res.data;
+        // });
       }
     },
     //取消排序
@@ -1714,15 +1763,20 @@ export default {
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
-        this.$nextTick(()=>{
-         this.$refs.form.resetFields();
-        })
         this.form.price = Number(this.form.price);
         this.addorgropdata();
         this.title = 2;
         this.dialogVisible = true;
+        if (this.$refs.form !== undefined){
+          this.$refs.form.resetFields()
+        } 
         posjrctid(this.form.id).then((res) => {
           this.form = res.data;
+          // this.unitId.forEach((item)=>{
+          //   if(res.data.unitId==item.id){
+          //     this.unitIdName=item.displayName
+          //   }
+          // })
           if (res.data.isProduceSummary == 'Y') {
             this.isProduceSummaryBox = true;
           } else {
@@ -1760,13 +1814,38 @@ export default {
     //编辑弹框勾选重新赋值
     changeBox(type) {
       //赋值
-      console.log(type)
       if(this[type+'Box']){
         this.form[type] = 'Y';
       }else{
         this.form[type] = 'N';
       }
     },
+    // querySearch(queryString, cb) {
+    //     var restaurants = this.unitId;
+    //     var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+    //     // 调用 callback 返回建议列表的数据
+    //     cb(results);
+    //   },
+    //   createFilter(queryString) {
+    //     return (restaurant) => {
+    //       return (restaurant.displayName.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+    //     };
+    //   },
+    //   handleSelect(item) {
+    //     this.form.unitId=item.id
+    //   },
+      OnsubmitDiagnosis(){
+        this.form.diagnosisFunction=this.diagnosisFunctionText
+        this.diagnosisFunctionText=''
+        this.diagnosisFunctionBox=false
+        this.$message.success("设置诊断函数成功");
+      },
+      OnsubmitCalculation(){
+        this.form.calculationFunction=this.calculationFunctionText
+        this.calculationFunctionText=''
+        this.calculationFunctionBox=false
+        this.$message.success("设置计算函数成功");
+      },
     //确定新增或者编辑
     Onsubmit() {
       this.$refs.form.validate((v) => {
@@ -1793,19 +1872,19 @@ export default {
     },
     //新增弹框
     add() {
-      this.$nextTick(()=>{
-       this.$refs.form.resetFields();
-      })
       this.form.price = Number(this.form.price);
       this.title = 1;
       this.dialogVisible = true;
-      this.form = {};
+      if (this.$refs.form !== undefined){
+          this.$refs.form.resetFields()
+        } 
       this.isProduceSummaryBox=true,
       this.isNameIntoSummaryBox=true,
       this.isDiagnosisFunctionBox=false,
       this.isCalculationItemBox=false,
       this.isContinueProcessBox=false,
       this.isActiveBox=true,
+      // this.unitIdName=""
       this.$nextTick(() => {
         this.$refs.refinput.focus();
       });
@@ -1896,4 +1975,7 @@ export default {
 :deep .downText{
   display: flex!important;
 }
+:deep .el-input-group__append {
+  padding: 0 11px;
+}
 </style>