提交merge1.3

openhis-ui-vue3/src/views/basicmanage/pharmacyDepartment/index.vue

@@ -40,7 +40,7 @@
         >
           <!-- <el-table-column type="selection" width="50" align="center" /> -->
           <el-table-column
-            label="取药科室"
+            label="开立科室"
             align="center"
             key="name"
             prop="name"
@@ -64,6 +64,29 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column
+            label="项目类型"
+            align="center"
+            key="itemCode"
+            prop="itemCode"
+            :show-overflow-tooltip="true"
+            width="300"
+          >
+            <template #default="scope">
+              <div style="display: flex; align-items: center; justify-content: center">
+                <el-select
+                  v-model="scope.row.itemCode"
+                  placeholder="项目类型"
+                  clearable
+                  style="width: 100px"
+                  :class="{ 'error-border': scope.row.error }"
+                >
+                  <el-option label="药品" value="1" />
+                  <el-option label="耗材" value="2" />
+                </el-select>
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             label="药品类别"
             align="center"
@@ -81,12 +104,31 @@
                   style="width: 200px"
                   :class="{ 'error-border': scope.row.error }"
                 >
+<<<<<<< HEAD
                   <el-option
                     v-for="dict in med_category_code"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
                   />
+=======
+                  <template v-if="scope.row.itemCode == '1'">
+                    <el-option
+                      v-for="dict in med_category_code"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </template>
+                  <template v-if="scope.row.itemCode == '2'">
+                    <el-option
+                      v-for="dict in device_category_code"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </template>
+>>>>>>> v1.3
                 </el-select>
               </div>
             </template>
@@ -184,7 +226,15 @@ import {
   deletePharmacyDepartment,
 } from './components/pharmacyDepartment';
 const { proxy } = getCurrentInstance();
+<<<<<<< HEAD
 const { med_category_code } = proxy.useDict('med_category_code');
+=======
+const { distribution_category_code, med_category_code, device_category_code } = proxy.useDict(
+  'distribution_category_code',
+  'med_category_code',
+  'device_category_code'
+);
+>>>>>>> v1.3
 import { nextTick } from 'vue';
 
 const diagnosisTreatmentList = ref([]);
@@ -293,10 +343,6 @@ function handleSelectionChange(selection) {
 }
 
 function openAddPharmacyDepartment() {
-  if (data.isAdding) {
-    proxy.$message.warning('请先保存当前行后再新增！');
-    return;
-  }
   const newRow = {
     id: '',
     organizationId: '',