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

src/views/fee-settings/Item.vue

@@ -389,11 +389,9 @@
                 {{ scope.row.id }}
               </template>
             </el-table-column>
-          <el-table-column label="诊断">
-              <template>
-              
-            </template>
-          </el-table-column>
+            <el-table-column label="诊断">
+              <template> </template>
+            </el-table-column>
           </el-table>
         </div>
         <div style="margin-top: 5px; margin-left: 15px">
@@ -431,7 +429,7 @@
     >
       <el-form :model="rusetform" ref="rusetform" label-width="100px">
         <el-row>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <el-form-item label="项目">
               <el-select v-model="rusetform.itemId" placeholder="请选择">
                 <el-option
@@ -443,7 +441,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="8">
             <el-form-item label="结果">
               <el-input v-model="rusetform.result"></el-input>
@@ -576,19 +574,33 @@
                   ></el-input>
                 </template>
               </el-table-column>
-
-              <el-table-column label="参考下限">
-                <template>
-                  <el-input></el-input>
+              <el-table-column label="参考范围值">
+                <template slot-scope="item">
+                  <el-input v-model="item.row.displayName"></el-input>
+                </template>
+              </el-table-column>
+              <!-- <el-table-column label="警告下限"></el-table-column> -->
+              <el-table-column label="警告范围">
+                <template slot-scope="item">
+                  <el-input v-model="item.row.aaa"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="诊断范围">
+                  <template slot-scope="scope">
+                  <el-select
+                    v-model="value[scope.row.displayName - 1]"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in scopediagnostic"
+                      :key="item.id"
+                      :label="item.displayName"
+                      :value="item.id"
+                    >
+                    </el-option>
+                  </el-select>
                 </template>
               </el-table-column>
-              <el-table-column label="参考上限">
-                <template> <el-input></el-input> </template
-              ></el-table-column>
-              <el-table-column label="警告下限"></el-table-column>
-              <el-table-column label="警告上限"></el-table-column>
-              <el-table-column label="偏低诊断"></el-table-column>
-              <el-table-column label="偏高诊断"></el-table-column>
             </el-table>
           </el-card>
         </div>
@@ -638,6 +650,8 @@
         </div>
       </div>
       <!-- 数字型参考范围 -->
+      <!-- 性激素参考范围 -->
+      <div v-if="referencerangevalue == 2"></div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="referencerangedialogVisible = false"
           >取 消</el-button
@@ -1154,6 +1168,7 @@ export default {
       ssdate: [],
       fssubdex: "",
       resultitemtype: [], //项目类别
+      scopediagnostic:[],//诊断范围下拉框
     };
   },
   created() {
@@ -1324,7 +1339,7 @@ export default {
     //结果模板新增或者修改
     rusteronsubmit() {
       if (this.ruesttiele == 1) {
-        postapi("/api/app/item-result-template", this.rusetform).then((res) => {
+        postapi(`/api/app/item-result-template`, this.rusetform).then((res) => {
           this.$message.success("新增成功");
           this.ruesttieledialogVisible = false;
           this.resultlist();
@@ -1347,13 +1362,13 @@ export default {
       this.$router.push({ path: "/diagnosis" });
     },
     digitaladdion() {
-      this.referencerangedata.push({
-        gender: "全部",
-        agewise: "200",
-        underage: "下",
-        onreference: "0",
-        underreference: "上",
-      });
+      // this.referencerangedata.push({
+      //   gender: "全部",
+      //   agewise: "200",
+      //   underage: "下",
+      //   onreference: "0",
+      //   underreference: "上",
+      // });
     },
     //参考范围下拉选择
     selecttype(v) {
@@ -1364,8 +1379,10 @@ export default {
           console.log(res);
           this.sexid = res.data;
         });
-        console.log(this.sexid);
-        console.log("我是数字类型");
+        postapi('/api/app/diagnosis/getlistinfilter').then(res=>{
+          this.scopediagnostic=res.data.items
+          console.log(res);
+        })   
       }
     },
     //参考范围
@@ -1396,8 +1413,10 @@ export default {
     increase() {
       this.addoredit();
       this.ruesttiele = 1;
+      this.rusetform.itemId = this.form.id;
+      console.log(this.rusetform.id);
       this.ruesttieledialogVisible = true;
-      this.rusetform = {};
+      // this.rusetform = {};
     },
     //获取项目类别列表
     getmedicalconclusionlist() {
@@ -1471,11 +1490,13 @@ export default {
         this.$message.warning("请选择操作的数据");
       } else {
         this.rurestdialogVisible = true;
-        getapi("/api/app/item-result-template").then((res) => {
-          this.reusttableData = res.data.items;
-          console.log("2222222222222222");
-          console.log(res);
-        });
+        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;

src/views/fee-settings/SysParmType.vue

@@ -24,11 +24,29 @@
           </el-col>
         </el-row>
         <!-- table列表 -->
-        <el-table :data="tableData" style="width: 100%; margin-top: 30px">
+        <el-table
+          :data="tableData"
+          style="width: 100%; margin-top: 30px"
+          @row-click="rowclick"
+        >
           <el-table-column prop="displayName" label="名称" width="180">
           </el-table-column>
           <el-table-column prop="simpleCode" label="快捷码" width="180">
           </el-table-column>
+          <el-table-column prop="parmValue" label="参数值" width="180">
+          </el-table-column>
+          <el-table-column prop="remark" label="备注" width="180">
+          </el-table-column>
+          <el-table-column label="创建者" prop="creatorName"></el-table-column>
+          <el-table-column label="创建时间">
+            <template slot-scope="scope">
+              {{ scope.row.creationTime | dateFormat }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="修改者"
+            prop="lastModifierName"
+          ></el-table-column>
         </el-table>
       </el-card>
     </div>
@@ -42,6 +60,9 @@ export default {
       organizationvalue: "",
       organizationdata: [],
       tableData: [],
+      form: {
+        id: "",
+      },
     };
   },
   created() {
@@ -49,6 +70,10 @@ export default {
     this.getoraniztion();
   },
   methods: {
+    //c每一列点击
+    rowclick(row) {
+      console.log(row);
+    },
     //获取组织数据
     getoraniztion() {
       getapi("/api/app/organization-units/organization-unit-by-is-peis").then(
@@ -59,11 +84,11 @@ export default {
     },
     //组织下拉框值发生变化
     changvalue(v) {
-      getapi(`/api/app/sys-parm/in-sys-parm-value-name/${v}`).then(res=>{
-        this.tableData=res.data
+      getapi(`/api/app/sys-parm/in-sys-parm-value-name/${v}`).then((res) => {
+        this.tableData = res.data;
         console.log(res);
-      })
-      console.log(v);
+      });
+      console.log(v);     
     },
     // getlist() {
     //   getapi("/api/app/sys-parm-type").then((res) => {