Merge branch 'develop'

app/Admin/Controllers/PrescriptionPrintController.php

@@ -290,6 +290,7 @@ public function search()
                 'img_url' => $imgUrl,
                 'img_url' => $imgUrl,
                 'drug_info' => $prescription->drug_info,
                 'drug_info' => $prescription->drug_info,
                 'dosage_list' => $dosageList,
                 'dosage_list' => $dosageList,
+                'prescription_type' => $prescription->prescription_type,
             ],
             ],
         ]);
         ]);
         // } catch (\Exception $e) {
         // } catch (\Exception $e) {

resources/views/admin/prescription-print.blade.php

@@ -99,8 +99,9 @@
                         $('#prescription-image').attr('src', response.data.img_url + '?t=' + new Date().getTime());
                         $('#prescription-image').attr('src', response.data.img_url + '?t=' + new Date().getTime());
                         $('#download-btn').data('url', response.data.img_url);
                         $('#download-btn').data('url', response.data.img_url);
                         $('#prescription-container').show();
                         $('#prescription-container').show();
-
-                        this.showEditableForm(response.data.drug_info,response.data.dosage_list);
+                        if (response.data.prescription_type != 1) {
+                            this.showEditableForm(response.data.drug_info,response.data.dosage_list);
+                        }
                     } else {
                     } else {
                         Dcat.error(response.message || '获取处方失败');
                         Dcat.error(response.message || '获取处方失败');
                     }
                     }