供应商画面调整 up by dh

2025-03-25 17:25:30 +08:00
parent 9f3884b414
commit facbd89b40
11 changed files with 236 additions and 109 deletions
--- a/openhis-ui-vue3/src/views/catalog/disease/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/disease/index.vue
@@ -59,10 +59,7 @@
            />
          </el-form-item>
          <el-form-item label="是否停用" prop="statusEnum">
-            <el-select
-              v-model="queryParams.statusEnum"
-              style="width: 240px"
-            >
+            <el-select v-model="queryParams.statusEnum" style="width: 240px">
              <el-option
                v-for="status in statusFlagOptions"
                :key="status.value"
@@ -269,6 +266,54 @@
          </el-col>
        </el-row>
        <el-row>
+          <el-col :span="12">
+            <el-form-item label="医保编码" prop="ybNo">
+              <el-input v-model="form.ybNo" placeholder="" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="医保标记" prop="ybFlag">
+              <!-- <el-input v-model="form.ybFlag" placeholder="" /> -->
+              <el-checkbox v-model="form.ybFlag"></el-checkbox>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="类型" prop="ybNo">
+              <el-select v-model="form.statusEnum" placeholder="请选择">
+                <el-option
+                  v-for="dict in statusFlagOptions"
+                  :key="dict.value"
+                  :label="dict.info"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="医保标记" prop="ybFlag">
+              <el-select v-model="form.statusEnum" placeholder="请选择">
+                <el-option
+                  v-for="dict in statusFlagOptions"
+                  :key="dict.value"
+                  :label="dict.info"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item
+              label="医保对码标记"
+              prop="ybMatchFlag"
+              label-width="100"
+            >
+              <el-checkbox v-model="form.ybMatchFlag"></el-checkbox>
+            </el-form-item>
+          </el-col>
          <!-- <el-col :span="12">
            <el-form-item label="拼音" prop="pyStr">
              <el-input v-model="form.pyStr" maxlength="11" />
@@ -280,6 +325,18 @@
            </el-form-item>
          </el-col> -->
        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="说明" prop="description">
+              <el-input
+                v-model="form.description"
+                :autosize="{ minRows: 4, maxRows: 10 }"
+                type="textarea"
+                placeholder=""
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
      </el-form>
      <template #footer>
        <div class="dialog-footer">
@@ -299,7 +356,7 @@ import {
  getDiseaseCategory,
  getDiseaseOne,
  stopDisease,
-  startDisease
+  startDisease,
 } from "./components/disease";

 const router = useRouter();
@@ -319,6 +376,7 @@ const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
 const conditionDefinitionOptions = ref(undefined);
+const conditionDefinition = ref(undefined);
 // 是否停用
 const statusFlagOptions = ref(undefined);
 // const initPassword = ref(undefined);
@@ -339,6 +397,15 @@ const data = reactive({
    conditionCode: [
      { required: true, message: "编码不能为空", trigger: "blur" },
    ],
+    // typeCode: [
+    //   { required: true, message: "编码不能为空", trigger: "blur" },
+    // ],
+    // description: [
+    //   { required: true, message: "编码不能为空", trigger: "blur" },
+    // ],
+    // conditionCode: [
+    //   { required: true, message: "编码不能为空", trigger: "blur" },
+    // ],
  },
 });

@@ -359,7 +426,6 @@ function getDiseaseCategoryList() {
    console.log(response, "response病种目录分类查询下拉树结构");
    conditionDefinitionOptions.value = response.data.diseaseCategoryList;
    statusFlagOptions.value = response.data.statusFlagOptions;
-
  });
 }
 /** 查询病种目录列表 */
@@ -378,6 +444,7 @@ function getList() {
 /** 节点单击事件 */
 function handleNodeClick(data) {
  queryParams.value.sourceEnum = data.value;
+  conditionDefinition.value = data.value;
  handleQuery();
 }
 /** 搜索按钮操作 */
@@ -447,7 +514,7 @@ function handleExport() {
 function handleSelectionChange(selection) {
  console.log(selection, "selection");
  // selectedData.value = selection.map((item) => ({ ...item })); // 存储选择的行数据
-  ids.value = selection.map(item => item.id);
+  ids.value = selection.map((item) => item.id);
  single.value = selection.length != 1;
  multiple.value = !selection.length;
 }
@@ -468,6 +535,12 @@ function reset() {
    pyStr: undefined,
    status: undefined,
    statusEnum: undefined,
+    sourceEnum: undefined,
+    typeCode: undefined,
+    description: undefined,
+    ybFlag: undefined,
+    ybNo: undefined,
+    ybMatchFlag: undefined,
  };
  proxy.resetForm("diseaseRef");
 }
@@ -478,6 +551,9 @@ function cancel() {
 }
 /** 新增按钮操作 */
 function handleAdd() {
+  if (conditionDefinition.value === undefined) {
+    return proxy.$modal.msgError("请选择病种目录分类");
+  }
  reset();
  open.value = true;
  title.value = "新增";
@@ -487,6 +563,12 @@ function handleUpdate(row) {
  reset();
  console.log(row, "row");
  form.value = JSON.parse(JSON.stringify(row));
+  form.value.ybFlag == 1
+    ? (form.value.ybFlag = true)
+    : (form.value.ybFlag = false);
+  form.value.ybMatchFlag == 1
+    ? (form.value.ybMatchFlag = true)
+    : (form.value.ybMatchFlag = false);
  open.value = true;
  title.value = "病种编辑";
 }
@@ -494,6 +576,11 @@ function handleUpdate(row) {
 function submitForm() {
  proxy.$refs["diseaseRef"].validate((valid) => {
    if (valid) {
+      form.value.sourceEnum = conditionDefinition.value;
+      form.value.ybFlag ? (form.value.ybFlag = 1) : (form.value.ybFlag = 0);
+      form.value.ybMatchFlag
+        ? (form.value.ybMatchFlag = 1)
+        : (form.value.ybMatchFlag = 0);
      if (form.value.id != undefined) {
        // form.value.status
        //   ? (form.value.statusEnum = "3")
--- a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
@@ -51,10 +51,7 @@
            <el-row :gutter="24">
              <el-col :span="6">
                <el-form-item label="通用名称" prop="name">
-                  <el-input
-                    v-model="form.name"
-                    placeholder=""
-                  />
+                  <el-input v-model="form.name" placeholder="" />
                </el-form-item>
              </el-col>
              <el-col :span="6">
@@ -125,7 +122,7 @@
                    :disabled="form.id != undefined"
                  >
                    <el-option
-                      v-for="category in medicine_category"
+                      v-for="category in fin_type_code"
                      :key="category.value"
                      :label="category.label"
                      :value="category.value"
@@ -173,7 +170,7 @@
                    :disabled="form.id != undefined"
                  >
                    <el-option
-                      v-for="category in medicine_unit"
+                      v-for="category in unit_code"
                      :key="category.value"
                      :label="category.label"
                      :value="category.value"
@@ -209,7 +206,7 @@
                    :disabled="form.id != undefined"
                  >
                    <el-option
-                      v-for="category in medicine_unit"
+                      v-for="category in unit_code"
                      :key="category.value"
                      :label="category.label"
                      :value="category.value"
@@ -241,7 +238,7 @@
                    :disabled="form.id != undefined"
                  >
                    <el-option
-                      v-for="category in medicine_unit"
+                      v-for="category in unit_code"
                      :key="category.value"
                      :label="category.label"
                      :value="category.value"
@@ -259,7 +256,7 @@
                    :disabled="form.id != undefined"
                  >
                    <el-option
-                      v-for="category in medicine_unit"
+                      v-for="category in unit_code"
                      :key="category.value"
                      :label="category.label"
                      :value="category.value"
@@ -425,6 +422,23 @@
                  <el-input v-model="form.partPercent" placeholder="" />
                </el-form-item>
              </el-col>
+              <el-col :span="6">
+                <el-form-item label="医保类别" prop="ybType">
+                  <el-select
+                    v-model="form.ybType"
+                    placeholder="医保类别"
+                    clearable
+                    style="width: 240px"
+                  >
+                    <el-option
+                      v-for="dict in yb_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
            </el-row>
            <el-row :gutter="24">
              <el-col :span="6">
@@ -653,28 +667,30 @@ const {
  medicine_category,
  system_categories,
  medicine_properties,
-  medicine_unit,
+  unit_code,
  medicine_formulation,
-  medical_insurance_types,
+  yb_type,
  medicine_default_usage,
  medicine_default_frequency,
  medicine_basic_flag,
  sys_normal_disable,
  rate_code,
  method_code,
+  fin_type_code
 } = proxy.useDict(
  "medicine_category",
  "system_categories",
  "medicine_properties",
-  "medicine_unit",
+  "unit_code",
  "medicine_formulation",
-  "medical_insurance_types",
+  "yb_type",
  "medicine_default_usage",
  "medicine_default_frequency",
  "medicine_basic_flag",
  "sys_normal_disable",
  "rate_code",
-  "method_code"
+  "method_code",
+  "fin_type_code"
 );

 const title = ref("");
--- a/openhis-ui-vue3/src/views/catalog/medicine/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/medicine/index.vue
@@ -36,7 +36,7 @@
          label-width="68px"
        >
          <el-row :gutter="24">
-            <el-col :span="6">
+            <el-col :span="5">
              <el-form-item label="药品" prop="searchKey" label-width="40">
                <el-input
                  v-model="queryParams.searchKey"
@@ -47,70 +47,34 @@
                />
              </el-form-item>
            </el-col>
-            <el-col :span="4">
+            <el-col :span="5">
              <el-form-item
-                label="是否系统预置"
-                prop="status"
+                label="状态"
+                prop="statusEnum"
                label-width="100"
              >
                <el-select v-model="queryParams.statusEnum" clearable>
                  <el-option
-                    v-for="dict in sys_normal_disable"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
+                    v-for="status in statusFlagOptions"
+                    :key="status.value"
+                    :label="status.info"
+                    :value="status.value"
                  />
                </el-select>
              </el-form-item>
            </el-col>
            <el-col :span="4">
-              <el-form-item
-                label="医保是否对码"
-                prop="status"
-                label-width="100"
-              >
+              <el-form-item label="医保对码" prop="ybMatchFlag" label-width="80">
                <el-select
                  v-model="queryParams.ybMatchFlag"
                  placeholder=""
                  clearable
                >
                  <el-option
-                    v-for="dict in sys_normal_disable"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <!-- <el-col :span="4">
-              <el-form-item label="已发生业务" prop="status" label-width="100">
-                <el-select
-                  v-model="queryParams.status"
-                  placeholder="用户状态"
-                  clearable
-                >
-                  <el-option
-                    v-for="dict in sys_normal_disable"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col> -->
-            <el-col :span="4">
-              <el-form-item label="医保等级" prop="status" label-width="80">
-                <el-select
-                  v-model="queryParams.status"
-                  placeholder="用户状态"
-                  clearable
-                >
-                  <el-option
-                    v-for="dict in sys_normal_disable"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
+                    v-for="domainEnum in domainEnumOptions"
+                    :key="domainEnum.value"
+                    :label="domainEnum.info"
+                    :value="domainEnum.value"
                  />
                </el-select>
              </el-form-item>
@@ -630,6 +594,7 @@ const title = ref("");
 const medicationOptions = ref(undefined);
 const statusFlagOptions = ref(undefined);
 const domainEnumOptions = ref(undefined);
+const supplierListOptions = ref(undefined);
 // 使用 ref 定义当前药品数据
 const currentData = ref({});
 // 使用 ref 定义当前查看药品数据
@@ -671,9 +636,10 @@ const filterNode = (value, data) => {
 function getMedicationCategoryList() {
  getMedicationCategory().then((response) => {
    console.log(response, "response药品目录分类查询下拉树结构");
-    medicationOptions.value = response.data.medicationOptions;
+    medicationOptions.value = response.data.medicationListOptions;
    statusFlagOptions.value = response.data.statusFlagOptions;
    domainEnumOptions.value = response.data.domainFlagOptions;
+    supplierListOptions.value = response.data.supplierListOptions;
  });
 }
 /** 查询病种目录列表 */