Merge remote-tracking branch 'upstream/master'

src/api/zhu-yuan-yi-sheng/yi-zhu-lu-ru.js

@@ -119,11 +119,11 @@ export function huoQuYiZhuShuJu(data) {
     })
 }
 
-export function huoQuXiangMu(code) {
+export function huoQuXiangMu(code, groupNo) {
     return request({
         url: url + '/huoQuXiangMu',
         method: 'get',
-        params: {code},
+        params: {code, groupNo},
     })
 }
 

src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/yz-edit/YzEditor.vue

@@ -23,7 +23,7 @@
               :disabled="isEdit"
               v-model="yiZhuData.orderName"
               :table-header="tableHeader"
-              :query-data-func="huoQuXiangMu"
+              :query-data-func="searchOrders"
               :current-key="yiZhuData.orderCode + yiZhuData.orderName"
               @rowClick="xuanZhongFeiYong">
             <el-table-column label="说明书">
@@ -312,17 +312,18 @@ let tableHeader = [
   {label: '大输液', prop: 'infusionFlagName'},
   {label: '厂家', prop: 'manuName'},
   {label: '类型', prop: 'orderType'},
-  {label: '毒麻类型', prop: 'drugFlagName'}
+  {label: '毒麻类型', prop: 'drugFlagName'},
+  {label: '药房', prop: 'groupName'},
 ]
 
+const searchOrders = (val) => {
+  return huoQuXiangMu(val, queryParam.value.groupNo)
+}
+
 /*提示信息*/
 const tiShiBiaoTi = ref([])
-
-// 搜索医嘱
+// 填充数据
 const xuanZhongFeiYong = async (row, laiyuan = 1) => {
-  // if (isEdit.value) {
-  //   return
-  // }
   if (row.serial === '0000' && row.groupNo === '0000') {
     props.openGroupOrderTemplate(row.orderCode);
     return;