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

src/views/basic-dictionary/ThirdPartyInterfaces.vue

@@ -70,11 +70,7 @@
               >
                 <template slot-scope="scope">
                   <div>
-                    {{
-                      scope.row.thirdInterfaceType == "01"
-                        ? "LIS申请"
-                        : "收费申请"
-                    }}
+                    {{ dddw(thirdInterfaceType, "id", scope.row.thirdInterfaceType, "displayName") }}
                   </div>
                 </template>
               </el-table-column>
@@ -243,10 +239,10 @@
                   placeholder="请选择接口类型"
                   size="small"
                 >
-                  <el-option label="LIS申请" value="01" />
-                  <el-option label="收费申请" value="02" />
-                  <el-option label="检验结果导入" value="03" />
-                  <el-option label="Pacs结果导入" value="04" />
+                  <el-option v-for="item in thirdInterfaceType"
+                    :key="item.id"
+                    :label="item.displayName"
+                    :value="item.id"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -341,6 +337,7 @@ import {
   examinationdragging,
 } from "../../request/systemapi";
 import { getapi, postapi, putapi } from "@/api/api";
+import { dddw } from "../../utlis/proFunc";
 export default {
   data() {
     return {
@@ -360,7 +357,23 @@ export default {
       department: "",
       quckDepartment: [],
       medicalCenter: [],
-    };
+      thirdInterfaceType:[{
+        id:"01",
+        displayName:"LIS申请"
+      },
+      {
+        id:"02",
+        displayName:"收费申请"
+      },
+      {
+        id:"03",
+        displayName:"检验结果导入"
+      },
+      {
+        id:"04",
+        displayName:"Pacs结果导入"
+      }]
+    }
   },
   created() {
     this.getmedicalCenter();
@@ -373,6 +386,7 @@ export default {
     ...mapState(["window"]),
   },
   methods: {
+    dddw,
     getTreeName(list, id) {
       for (let i = 0; i < list.length; i++) {
         if (list[i].id === id) {

src/views/fee-settings/Asbitem.vue

@@ -777,6 +777,24 @@
               ></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="条码模式" prop="">
+              <el-select
+                v-model="form.barcodeMode"
+                placeholder="请选择"
+                size="small"
+                @change="quckRusetform"
+              >
+                <el-option
+                  v-for="item in barcodeMode"
+                  :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="" size="small">
               <!-- <el-select
@@ -1142,7 +1160,8 @@ export default {
         isDiagnosisFunctionBox: false,
         isItemResultMergerBox: false,
         isPictureRotateBox: false,
-        collectItemTypeId:""
+        collectItemTypeId:"",
+        barcodeMode:"0"
       },
       forSexId: [], //性别
       itemTypeId: [], //项目类别
@@ -1299,7 +1318,19 @@ export default {
         ],
         guide: [{ required: true, message: "请输入指引信息", trigger: "blur" }],
       },
-      collectItemType:[]
+      collectItemType:[],
+      barcodeMode:[{
+        id:"0",
+        displayName:"使用项目类别设置"
+      },
+      {
+        id:"1",
+        displayName:"打印人员登记号"
+      },
+      {
+        id:"2",
+        displayName:"不打印"
+      }]
     };
   },
   created() {
@@ -2164,7 +2195,8 @@ export default {
               isPictureRotate: this.form.isPictureRotate,
               isCheck: this.form.isCheck,
               isActive: this.form.isActive,
-              collectItemTypeId:this.form.collectItemTypeId
+              collectItemTypeId:this.form.collectItemTypeId,
+              barcodeMode:this.form.barcodeMode
             };
             newcombination(obj).then((res) => {
               if (res.code != -1) {
@@ -2198,7 +2230,8 @@ export default {
               isPictureRotate: this.form.isPictureRotate,
               isCheck: this.form.isCheck,
               isActive: this.form.isActive,
-              collectItemTypeId:this.form.collectItemTypeId
+              collectItemTypeId:this.form.collectItemTypeId,
+              barcodeMode:this.form.barcodeMode
             };
             updateombination(this.form.id, obj).then((res) => {
               if (res.code != -1) {