画面调整，厂商后台调用 up by dh

2025-03-03 17:34:00 +08:00
parent f3d71f95e7
commit 313041483b
8 changed files with 196 additions and 101 deletions
--- a/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
@@ -68,12 +68,7 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="包装规格" prop="size">
-              <el-input
-                v-model="form.size"
-                placeholder=""
-                maxlength="30"
-                :disabled="form.id != undefined"
-              />
+              <el-input v-model="form.size" placeholder="" maxlength="30" />
            </el-form-item>
          </el-col>
          <el-col :span="8">
@@ -82,7 +77,6 @@
                v-model="form.minUnitCode"
                placeholder=""
                maxlength="30"
-                :disabled="form.id != undefined"
              />
            </el-form-item>
          </el-col>
@@ -94,7 +88,6 @@
                v-model="form.partPercent"
                placeholder=""
                maxlength="30"
-                :disabled="form.id != undefined"
              />
            </el-form-item>
          </el-col>
@@ -104,7 +97,6 @@
                v-model="form.modelNumber"
                placeholder=""
                maxlength="30"
-                :disabled="form.id != undefined"
              />
            </el-form-item>
          </el-col>
@@ -266,11 +258,58 @@ const emits = defineEmits(["submit"]); // 声明自定义事件
 const data = reactive({
  form: {},
  rules: {
-    // busNo: [{ required: true, message: "编码不能为空", trigger: "blur" }],
-    // name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
-    // conditionCode: [
-    //   { required: true, message: "编码不能为空", trigger: "blur" },
-    // ],
+    busNo: [{ required: true, message: "编码不能为空", trigger: "blur" }],
+    name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
+    pyStr: [{ required: true, message: "拼音不能为空", trigger: "blur" }],
+    wbStr: [{ required: true, message: "五笔拼音不能为空", trigger: "blur" }],
+    categoryEnum: [
+      { required: true, message: "器材分类不能为空", trigger: "blur" },
+    ],
+    typeCode: [
+      { required: true, message: "器材种类不能为空", trigger: "blur" },
+    ],
+    unitCode: [
+      { required: true, message: "包装单位不能为空", trigger: "blur" },
+    ],
+    size: [{ required: true, message: "包装规格不能为空", trigger: "blur" }],
+    partPercent: [
+      { required: true, message: "拆零比不能为空", trigger: "blur" },
+    ],
+    minUnitCode: [
+      { required: true, message: "最小使用单位不能为空", trigger: "blur" },
+    ],
+    modelNumber: [
+      { required: true, message: "产品型号不能为空", trigger: "blur" },
+    ],
+    hvcmFlag: [
+      { required: true, message: "高值器材标志不能为空", trigger: "blur" },
+    ],
+    salesUnitCode: [
+      { required: true, message: "销售单位不能为空", trigger: "blur" },
+    ],
+    approvalNumber: [
+      { required: true, message: "批准文号不能为空", trigger: "blur" },
+    ],
+    ybFlag: [{ required: true, message: "医保标记不能为空", trigger: "blur" }],
+    // ybNo: [{ required: true, message: "医保编码不能为空", trigger: "blur" }],
+    ybMatchFlag: [
+      { required: true, message: "医保对码标记不能为空", trigger: "blur" },
+    ],
+    statusEnum: [{ required: true, message: "状态不能为空", trigger: "blur" }],
+    manufacturerId: [
+      { required: true, message: "生产厂家不能为空", trigger: "blur" },
+    ],
+    supplyId: [{ required: true, message: "供应商不能为空", trigger: "blur" }],
+    // description: [{ required: true, message: "说明不能为空", trigger: "blur" }],
+    jurisdiction: [
+      { required: true, message: "适用范围不能为空", trigger: "blur" },
+    ],
+    ruleId: [{ required: true, message: "执行科室不能为空", trigger: "blur" }],
+    // version: [{ required: true, message: "器材版本不能为空", trigger: "blur" }],
+    // substanceText: [{ required: true, message: "主要成分不能为空", trigger: "blur" }],
+    allergenFlag: [
+      { required: true, message: "过敏标记不能为空", trigger: "blur" },
+    ],
  },
 });

@@ -289,6 +328,7 @@ const props = defineProps({

 // 显示弹框
 function show() {
+  reset();
  // queryParams.roleId = props.roleId;
  // getList();
  title.value = "";
@@ -300,6 +340,7 @@ function show() {
 function edit() {
  // queryParams.roleId = props.roleId;
  // getList();
+  reset();
  title.value = "";
  title.value = props.title;
  form.value = props.item;
@@ -341,11 +382,12 @@ function reset() {

 /** 提交按钮 */
 function submitForm() {
+  form.value.hvcmFlag ? (form.value.hvcmFlag = 1) : (form.value.hvcmFlag = 0);
+  form.value.ybFlag ? (form.value.ybFlag = 1) : (form.value.ybFlag = 0);
+  form.value.ybMatchFlag ? (form.value.ybMatchFlag = 1) : (form.value.ybMatchFlag = 0);
+  form.value.allergenFlag ? (form.value.allergenFlag = 1) : (form.value.allergenFlag = 0);
+  console.log(form.value, "form.value");
  if (form.value.id != undefined) {
-    // form.value.status
-    //   ? (form.value.statusEnum = "3")
-    //   : (form.value.statusEnum = "2");
-    // console.log(form.value, "editDevice", form.value.statusEnum);
    editDevice(form.value).then((response) => {
      // 触发自定义事件，并传递数据给父组件
      emits("submit");
@@ -366,7 +408,7 @@ function submitForm() {

 /** 取消按钮 */
 function cancel() {
-  open.value = false;
+  visible.value = false;
  reset();
 }
 defineExpose({
--- a/openhis-ui-vue3/src/views/catalog/device/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/device/index.vue
@@ -56,11 +56,7 @@
                prop="ybMatchFlag"
                label-width="100"
              >
-                <el-select
-                  v-model="queryParams.ybMatchFlag"
-                  placeholder=""
-                  clearable
-                >
+                <el-select v-model="queryParams.ybMatchFlag" placeholder="">
                  <el-option
                    v-for="item in exeOrganizations"
                    :key="item.value"
@@ -482,7 +478,7 @@ function getList() {
 }
 /** 节点单击事件 */
 function handleNodeClick(data) {
-  queryParams.value.categoryEnum = data.id;
+  queryParams.value.categoryEnum = data.value;
  handleQuery();
 }
 /** 搜索按钮操作 */
@@ -493,7 +489,7 @@ function handleQuery() {

 /** 启用按钮操作 */
 function handleStart() {
-  const stardIds =  ids.value;
+  const stardIds = ids.value;
  //   selectedData
  proxy.$modal
    .confirm("是否确定启用数据！")
@@ -508,7 +504,7 @@ function handleStart() {
 }
 /** 停用按钮操作 */
 function handleClose() {
-  const stopIds =  ids.value;
+  const stopIds = ids.value;
  proxy.$modal
    .confirm("是否确认停用数据！")
    .then(function () {
@@ -535,7 +531,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;
 }
@@ -559,10 +555,24 @@ function openAddDevice() {
 }
 /** 打开编辑弹窗 */
 function openEditDevice(row) {
-  currentData.value = {}
+  currentData.value = {};
  console.log("打开编辑弹窗");
-  currentData.value = row;
+  currentData.value = JSON.parse(JSON.stringify(row));
  console.log(currentData.value, "currentData");
+  currentData.value.hvcmFlag == 1
+    ? (currentData.value.hvcmFlag = true)
+    : (currentData.value.hvcmFlag = false);
+  currentData.value.ybFlag == 1
+    ? (currentData.value.ybFlag = true)
+    : (currentData.value.ybFlag = false);
+  currentData.value.ybMatchFlag == 1
+    ? (currentData.value.ybMatchFlag = true)
+    : (currentData.value.ybMatchFlag = false);
+  currentData.value.allergenFlag == 1
+    ? (currentData.value.allergenFlag = true)
+    : (currentData.value.allergenFlag = false);
+  console.log(currentData.value, "currentDataform");
+
  title.value = "编辑";
  // 确保子组件已经接收到最新的 props
  nextTick(() => {
@@ -575,6 +585,18 @@ function openViewDevice(row) {
  // viewData.value = row;
  getDeviceOne(row.id).then((response) => {
    currentData.value = response.data;
+    currentData.value.hvcmFlag == 1
+      ? (currentData.value.hvcmFlag = true)
+      : (currentData.value.hvcmFlag = false);
+    currentData.value.ybFlag == 1
+      ? (currentData.value.ybFlag = true)
+      : (currentData.value.ybFlag = false);
+    currentData.value.ybMatchFlag == 1
+      ? (currentData.value.ybMatchFlag = true)
+      : (currentData.value.ybMatchFlag = false);
+    currentData.value.allergenFlag == 1
+      ? (currentData.value.allergenFlag = true)
+      : (currentData.value.allergenFlag = false);
    title.value = "查看";
    nextTick(() => {
      proxy.$refs["deviceRef"].edit();
@@ -589,7 +611,6 @@ function openViewDevice(row) {
  // proxy.$refs["deviceRef"].edit();
 }

-
 getDiseaseTreatmentList();
 getList();
 </script>
--- a/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentDialog.vue
@@ -174,9 +174,17 @@ const data = reactive({
  rules: {
    // busNo: [{ required: true, message: "编码不能为空", trigger: "blur" }],
    // name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
-    // conditionCode: [
-    //   { required: true, message: "编码不能为空", trigger: "blur" },
-    // ],
+    // pyStr: [{ required: true, message: "拼音不能为空", trigger: "blur" }],
+    // wbStr: [{ required: true, message: "五笔拼音不能为空", trigger: "blur" }],
+    // categoryEnum: [{ required: true, message: "器材分类不能为空", trigger: "blur" }],
+    // typeCode: [{ required: true, message: "器材种类不能为空", trigger: "blur" }],
+    // unitCode: [{ required: true, message: "包装单位不能为空", trigger: "blur" }],
+    // size: [{ required: true, message: "包装规格不能为空", trigger: "blur" }],
+    // partPercent: [{ required: true, message: "拆零比不能为空", trigger: "blur" }],
+    // minUnitCode: [{ required: true, message: "最小使用单位不能为空", trigger: "blur" }],
+    // modelNumber: [{ required: true, message: "产品型号不能为空", trigger: "blur" }],
+    // hvcmFlag: [{ required: true, message: "高值器材标志不能为空", trigger: "blur" }],    
+    // salesUnitCode: [{ required: true, message: "销售单位不能为空", trigger: "blur" }],
  },
 });

@@ -195,6 +203,7 @@ const props = defineProps({

 // 显示弹框
 function show() {
+  reset();
  // queryParams.roleId = props.roleId;
  // getList();
  title.value = "";
@@ -204,6 +213,7 @@ function show() {
 }
 // 显示弹框
 function edit() {
+  reset();
  // queryParams.roleId = props.roleId;
  // getList();
  title.value = "";
@@ -236,6 +246,9 @@ function reset() {

 /** 提交按钮 */
 function submitForm() {
+  form.value.ybFlag ? (form.value.ybFlag = 1) : (form.value.ybFlag = 0);
+  form.value.ybMatchFlag ? (form.value.ybMatchFlag = 1) : (form.value.ybMatchFlag = 0);
+  form.value.ruleId ? (form.value.ruleId = 1) : (form.value.ruleId = 0);
  if (form.value.id != undefined) {
    editDiagnosisTreatment(form.value).then((response) => {
      // 触发自定义事件，并传递数据给父组件
@@ -256,7 +269,7 @@ function submitForm() {
 }
 /** 取消按钮 */
 function cancel() {
-  open.value = false;
+  visible.value = false;
  reset();
 }
 defineExpose({
--- a/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/index.vue
@@ -40,7 +40,7 @@
            </el-col>
            <el-col :span="4">
              <el-form-item label="状态" prop="statusEnum" label-width="50">
-                <el-select v-model="queryParams.statusEnum" clearable>
+                <el-select v-model="queryParams.statusEnum">
                  <el-option
                    v-for="status in statusFlagOptions"
                    :key="status.value"
@@ -56,11 +56,7 @@
                prop="ybMatchFlag"
                label-width="100"
              >
-                <el-select
-                  v-model="queryParams.ybMatchFlag"
-                  placeholder=""
-                  clearable
-                >
+                <el-select v-model="queryParams.ybMatchFlag" placeholder="">
                  <el-option
                    v-for="item in exeOrganizations"
                    :key="item.value"
@@ -397,7 +393,8 @@ const filterNode = (value, data) => {
 function getDiseaseTreatmentList() {
  getDiseaseTreatmentInit().then((response) => {
    console.log(response, "response器材目录分类查询下拉树结构");
-    diseaseTreatmentCategoryList.value = response.data.diseaseTreatmentCategoryList;
+    diseaseTreatmentCategoryList.value =
+      response.data.diseaseTreatmentCategoryList;
    statusFlagOptions.value = response.data.statusFlagOptions;
    exeOrganizations.value = response.data.exeOrganizations;
  });
@@ -414,18 +411,21 @@ function getList() {
 }
 /** 节点单击事件 */
 function handleNodeClick(data) {
-  queryParams.value.categoryEnum = data.id;
+  console.log(data, "节点单击事件");
+  queryParams.value.categoryEnum = data.value;
+  console.log(queryParams, "queryParams节点单击事件");
  handleQuery();
 }
 /** 搜索按钮操作 */
 function handleQuery() {
  queryParams.value.pageNo = 1;
+  console.log(queryParams, "queryParams搜索");
  getList();
 }

 /** 启用按钮操作 */
 function handleStart() {
-  const stardIds =  ids.value;
+  const stardIds = ids.value;
  //   selectedData
  proxy.$modal
    .confirm("是否确定启用数据！")
@@ -440,7 +440,7 @@ function handleStart() {
 }
 /** 停用按钮操作 */
 function handleClose() {
-  const stopIds =  ids.value;
+  const stopIds = ids.value;
  proxy.$modal
    .confirm("是否确认停用数据！")
    .then(function () {
@@ -467,7 +467,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;
 }
@@ -492,7 +492,13 @@ function openAddDiagnosisTreatment() {
 /** 打开编辑弹窗 */
 function openEditDiagnosisTreatment(row) {
  console.log("打开新增弹窗");
-  currentData.value = row;
+  currentData.value = JSON.parse(JSON.stringify(row));
+  currentData.value.ybFlag == 1
+    ? (currentData.value.ybFlag = true)
+    : (currentData.value.ybFlag = false);
+  currentData.value.ybMatchFlag == 1
+    ? (currentData.value.ybMatchFlag = true)
+    : (currentData.value.ybMatchFlag = false);
  console.log(currentData.value, "currentData");
  title.value = "编辑";
  // 确保子组件已经接收到最新的 props
@@ -506,6 +512,12 @@ function openViewDiagnosisTreatment(row) {
  // viewData.value = row;
  getDiagnosisTreatmentOne(row.id).then((response) => {
    currentData.value = response.data;
+    currentData.value.ybFlag == 1
+      ? (currentData.value.ybFlag = true)
+      : (currentData.value.ybFlag = false);
+    currentData.value.ybMatchFlag == 1
+      ? (currentData.value.ybMatchFlag = true)
+      : (currentData.value.ybMatchFlag = false);
    title.value = "查看";
    nextTick(() => {
      proxy.$refs["diagnosisTreatmentRef"].edit();
@@ -520,7 +532,6 @@ function openViewDiagnosisTreatment(row) {
  // proxy.$refs["diagnosisTreatmentRef"].edit();
 }

-
 getDiseaseTreatmentList();
 getList();
 </script>
--- a/openhis-ui-vue3/src/views/catalog/disease/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/disease/index.vue
@@ -61,7 +61,6 @@
          <el-form-item label="是否停用" prop="statusEnum">
            <el-select
              v-model="queryParams.statusEnum"
-              clearable
              style="width: 240px"
            >
              <el-option
@@ -200,8 +199,8 @@
          <el-table-column
            label="医保对码标志"
            align="center"
-            key="ybMatchflag"
-            prop="ybMatchflag"
+            key="ybMatchFlag"
+            prop="ybMatchFlag"
          />
          <el-table-column
            label="停用"
@@ -380,7 +379,7 @@ function getList() {
 }
 /** 节点单击事件 */
 function handleNodeClick(data) {
-  queryParams.value.sourceEnum = data.id;
+  queryParams.value.sourceEnum = data.value;
  handleQuery();
 }
 /** 搜索按钮操作 */
@@ -489,7 +488,7 @@ function handleAdd() {
 function handleUpdate(row) {
  reset();
  console.log(row, "row");
-  form.value = row;
+  form.value = JSON.parse(JSON.stringify(row));
  open.value = true;
  title.value = "病种编辑";
 }
--- a/openhis-ui-vue3/src/views/catalog/medicine/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/medicine/index.vue
@@ -661,7 +661,7 @@ function openAddMedicine() {
 }
 /** 打开编辑弹窗 */
 function openEditMedicine(row) {
-  currentData.value = row;
+  currentData.value = JSON.parse(JSON.stringify(row));
  console.log(currentData.value, "currentData");
  // 确保子组件已经接收到最新的 props
  nextTick(() => {
@@ -691,7 +691,7 @@ function handleAdd() {
 function handleUpdate(row) {
  reset();
  console.log(row, "row");
-  form.value = row;
+  form.value = JSON.parse(JSON.stringify(row));
  open.value = true;
  title.value = "病种编辑";
 }