Merge branch 'feature/250222' into develop

src/api/login.js

@@ -32,7 +32,14 @@ export function getInfo() {
   return request({
     url: '/system/user/getInfo',
     method: 'get'
-  })
+  }).then(res => {
+    try {
+      if (!Array.isArray(res.pharmacyList) || res.pharmacyList.length === 0) {
+        res.pharmacyList = [{id: 18, name: '默认药房'}];
+      }
+    } catch (err) {}
+    return res;
+  });
 }
 
 // 退出方法

src/api/prescription/prescriptionCore.js

@@ -92,6 +92,45 @@ export function getPrescriptionCore(id) {
   })
 }
 
+export function getPrescriptionCore2(id) {
+  return request({
+    url: `/yfc-admin/prescription/prescriptionCore/${id}`,
+    method: 'get',
+  }).then(res => {
+    if (res.code !== 200) throw res.message;
+    const {
+      oralPreItemList = [], oralPre = {},
+      steep = {}, decoct = {}, pack = {},
+      province, city, region,
+      number, ...data
+    } = res.data;
+    for (const [key, value] of Object.entries(data)) {
+      if (value == null || typeof value === 'object') delete data[key];
+    }
+    const location = [];
+    if (province) {
+      location.push(province);
+      if (city) {
+        location.push(city);
+        if (region) location.push(region);
+      }
+    }
+    return {
+      ...data,
+      location,
+      steep: Object.assign({}, steep),
+      decoct: Object.assign({}, decoct),
+      pack: Object.assign({}, pack),
+      prescription: Object.assign({number}, oralPre),
+      medicines: oralPreItemList.map(item => {
+        return Object.assign(item, {
+          drugsSpecsName: item.drugsSpecsName || item.ypggCenter || item.ypggHis,
+        });
+      }),
+    };
+  });
+}
+
 // 新增处方审核
 export function addPrescriptionCore(data) {
   return request({
@@ -144,6 +183,14 @@ export function check(data) {
   })
 }
 
+export function check2(model) {
+  return request({
+    url: '/yfc-admin/prescriptionManage/checkPrescription',
+    method: 'post',
+    data: model,
+  });
+}
+
 //打印次数
 export function addNum(id) {
   return request({

src/components/print/recipe_A5.vue

@@ -3,6 +3,7 @@ import CLodop from '@/libs/print/CLodop';
 import {getDevice} from '@/tools/print.tool';
 import {templateA5} from '@/components/print/template';
 import {selectOrderDetail} from '@/api/prescription/prescriptionAudit';
+import {bignumber, chain, multiply} from 'mathjs';
 
 export default {
   name: 'print_recipe_a5',
@@ -77,11 +78,12 @@ export default {
       return selectOrderDetail({id: this.id}).then((res) => {
         const data = res.data;
         const sign = (index) => { try {return data.operateList[index].operater;} catch (e) {} };
+        const count = bignumber(data['number'] || 0);
         this.model = {
           patient: {
             name: `${data['name']}`,
             gender: `${data['sex']}`,
-            arg: `${data['args']}岁`,
+            arg: data['args'] ? `${data['args']}岁` : '',
             birthday: `${data['patientBirthday']}`,
             phone: `${data['contactNumber']}`,
           },
@@ -94,36 +96,42 @@ export default {
             volume: data['concentration'] && `每次${data['concentration']}`,
             frequency: data['frequency'],
             frequencyTime: data['medicationTime'],
-            decoction: data['isBehalf'] === '1' || +data['daijianNumber'] > 0,
+            decoction: data['isBehalf'] === '1' ? '代煎' : '自煎',
 
             delivery: data['expressExecutor'],
-            address: [data['province'], data['city'], data['region'], data['address']].filter(Boolean).join(''),
+            address: [/*data['province'], data['city'], data['region'],*/ data['address']].filter(Boolean).join(''),
 
             medicineFees: data['prescriptionSum'],
             decoctionFees: data['daijianCost'],
             deliveryFees: data['distributionCost'],
             totalFees: data['prescriptionTotalSum'],
 
+            unitWeight: '',
+            totalWeight: '',
+
             medicines: Array.isArray(data['detailList']) ? data['detailList'].map(item => {
               return {
+                mark: item['locatorNum'],
                 name: item['matName'],
                 dosage: item['matDose'],
                 unit: item['matUnitName'],
                 usage: item['matUsageName'],
+                total: +multiply(count, bignumber(item['matDose'] || 0)).toFixed(2),
               };
             }) : [],
           },
           department: [data['department']].filter(Boolean).join(' '),
           diagnosis: [data['disName']].filter(Boolean).join(' '),
           record: {
-            title: `${data['yljgName']}(处方笺)`,
-            date: `${data['printTime']}`,
+            title: data['yljgName'],
+            date: data['createTime'],
             no: `${data['preNo']}`,
+            bedNo: data['bedNo'],
+            recordNo: data['recordNo'] || data['recipeBh'],
+            serialNumber: data['recipeSerial'],
             category: data['preMzZy'] === '1' ? '门诊' : '住院',
-            remark: '1、本处方当日有效；\r\n2、取药时请您当面核对；\r\n3、延长处方用量时间原由：慢性病 其他老年病 外地 其他',
+            remark: data['remark'] || [data['pharmacistsremarks']].filter(Boolean).join('，'),
           },
-          recordNo: data['recordNo'],
-          bedNo: data['bedNo'],
           sign: {
             field1: sign(1 - 1),
             field2: sign(2 - 1),
@@ -136,7 +144,15 @@ export default {
           },
           field1: {1: '配药', 2: '煎药', 3: '发药', 4: '配送'}[data.state],
         };
-        if (this.model.field1) this.model.field1 = `当前处方状态：${this.model.field1}`;
+
+        let unitWeight = chain(bignumber(0));
+        for (const medicine of this.model.recipe.medicines) {
+          unitWeight = unitWeight.add(bignumber(medicine.dosage));
+        }
+
+        this.model.recipe.unitWeight = +unitWeight.valueOf().toFixed(2);
+        this.model.recipe.totalWeight = +unitWeight.multiply(count).valueOf().toFixed(2);
+
         return this.model;
       });
     },

src/components/print/tag_60_40.vue

@@ -87,14 +87,16 @@ export default {
             total: data['packageNumber'],
             method: data['prescriptionusage'],
             volume: `${data['packageDose']}ml`,
+            delivery: data['expressExecutor'],
+            decoction: data['isBehalf'] === '1' ? '代煎' : '自煎',
           },
           department: [data['department'], data['bedNo']].filter(Boolean).join(' '),
           record: {
-            title: `${data['medicalName']}(代煎中心)`,
+            title: data['medicalName'],
             date: data['createTime'],
             no: data['preNo'],
             category: data['preMzZy'] === '1' ? '门诊' : '住院',
-            remark: [data['frequency'], data['medicationTime']].filter(Boolean).join('，'),
+            remark: data['remark'] || [data['frequency'], data['medicationTime']].filter(Boolean).join('，'),
           },
         };
         this.total = this.model.recipe.total;

src/components/print/tag_80_50.vue

@@ -87,14 +87,19 @@ export default {
             count: data['number'],
             method: data['prescriptionusage'],
             decoction: data['isBehalf'] === '1' ? '是' : '否',
+
+            delivery: data['expressExecutor'],
+            address: [data['province'], data['city'], data['region'], data['address']].filter(Boolean).join(''),
           },
           department: [data['department']].filter(Boolean).join(' '),
           record: {
-            title: `${data['yljgName']}(中药房)`,
-            date: data['printTime'],
+            title: data['yljgName'],
+            date: data['createTime'],
             no: data['preNo'],
+            medicalRecordNumber: data['recipeBh'],
+            serialNumber: data['recipeSerial'],
             category: data['preMzZy'] === '1' ? '门诊' : '住院',
-            remark: [data['pharmacistsremarks']].filter(Boolean).join('，'),
+            remark: data['remark'] || [data['pharmacistsremarks']].filter(Boolean).join('，'),
           },
         };
 

src/components/print/template.js

@@ -10,55 +10,81 @@ export function template60_40(model = {}, title = '') {
   this.PRINT_INITA(0, 0, width, height, title);
   // 宽度按纸张的整宽缩放
   this.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Full-Width');
+  this.SET_PRINT_MODE('FULL_WIDTH_FOR_OVERFLOW', true);
+  this.SET_PRINT_MODE('FULL_HEIGHT_OVERFLOW', true);
   // 设置输出位置以纸张边缘为基点
   this.SET_PRINT_MODE('POS_BASEON_PAPER', true);
 
   let x = margin, y = margin;
   let w = 0, h = 0;
 
-  w = 180;
+  this.SET_PRINT_STYLE('Alignment', 2);
+
+
+  w = 215;
   h = 20;
   this.ADD_PRINT_TEXT(y, x, w, h, template(`{{record.title}}`));
   this.SET_PRINT_STYLEA(0, 'Bold', 1);
-  w = 70;
-  this.ADD_PRINT_TEXT(x, width - w - margin, w, h, template(`{{record.date}}`));
-  this.SET_PRINT_STYLEA(0, 'Alignment', 3);
 
-  w = 180;
   y += h;
-  this.ADD_PRINT_TEXT(y, x, w, h, template(`{{patient.name}}，{{patient.gender}}，{{patient.birthday}}`));
+  this.ADD_PRINT_TEXT(y, x, w, h, template(`{{record.no}}`));
+
+  y += h;
+  w = 115;
+  this.ADD_PRINT_TEXT(y, x, w, h, template(`{{patient.name}}`));
+  this.SET_PRINT_STYLEA(0, 'Bold', 1);
   x += w;
-  w = width - x - margin;
-  this.ADD_PRINT_TEXT(y, x, w, h, template(`{{record.category}}`));
-  this.SET_PRINT_STYLEA(0, 'Alignment', 3);
+  w = 30;
+  this.ADD_PRINT_TEXT(y, x, w, h, template(`{{recipe.count}}`));
+  this.SET_PRINT_STYLEA(0, 'Bold', 1);
+  x += w;
+  w = 20;
+  this.ADD_PRINT_TEXT(y, x, w, h, '帖');
+  x += w;
+  w = 30;
+  this.ADD_PRINT_TEXT(y, x, w, h, template(`{{recipe.total}}`));
+  this.SET_PRINT_STYLEA(0, 'Bold', 1);
+  x += w;
+  w = 20;
+  this.ADD_PRINT_TEXT(y, x, w, h, '包');
 
 
-  x = margin;
-  y = 50 - 4;
-  if (model.record.no) this.ADD_PRINT_BARCODE(y, x, 110, 60, '128Auto', model.record.no);
-  this.SET_PRINT_STYLEA(0, 'FontSize', 6);
+  this.SET_PRINT_STYLE('Alignment', 1);
 
 
-  x = width - 100 - margin;
-  w = 54;
-  this.SET_PRINT_STYLE('FontSize', 8);
-  this.ADD_PRINT_TEXT(y, x, w, h, template(`剂数：{{recipe.count}}`));
-  this.ADD_PRINT_TEXT(y, width - w - margin, w, h, template(`包数：{{recipe.total}}`));
-  this.SET_PRINT_STYLEA(0, 'Alignment', 3);
-  w = 100;
-  y += h;
-  this.ADD_PRINT_TEXT(y, x, w, h, template(`包装量：{{recipe.volume}}`));
   y += h;
-  this.ADD_PRINT_TEXT(y, x, w, h, template(`处方用法：{{recipe.method}}`));
-  this.SET_PRINT_STYLE('FontSize', 9);
+  x = margin;
+  w = 60;
+  this.ADD_PRINT_TEXT(y, x, w, h, '备注：');
+  this.SET_PRINT_STYLE('Alignment', 2);
+  x += w - 2;
+  w = 60;
+  this.ADD_PRINT_TEXT(y, x, w, h, template(`{{recipe.volume}}`));
+  this.SET_PRINT_STYLEA(0, 'Bold', 1);
+  x += w;
+  w = 50;
+  this.ADD_PRINT_TEXT(y, x, w, h, template(`{{recipe.method}}`));
+  this.SET_PRINT_STYLEA(0, 'Bold', 1);
+  x += w;
+  this.ADD_PRINT_TEXT(y, x, w, h, template(`{{recipe.decoction}}`));
+  this.SET_PRINT_STYLEA(0, 'Bold', 1);
+  this.SET_PRINT_STYLE('Alignment', 1);
+
 
-  x = 6;
-  y += h + 4;
-  w = width - margin * 2;
+  this.ADD_PRINT_TEXT(86, margin, 170, 44, template(`{{record.remark}}`));
   this.SET_PRINT_STYLEA(0, 'FontSize', 8);
-  this.ADD_PRINT_TEXT(y, x, w, h, template(`科室/病区：{{department}}`));
-  y += h - 1;
-  this.ADD_PRINT_TEXT(y, x, w, h, template(`备注：{{record.remark}}`));
+  if (model.record.no) this.ADD_PRINT_BARCODE(99, 175, 46, 46, 'QRCode', model.record.no);
+
+  y = 130;
+  x = margin;
+  w = 70;
+  h = 20;
+  this.ADD_PRINT_TEXT(y, x, w, h, template(`{{recipe.delivery}}`));
+  this.SET_PRINT_STYLEA(0, 'Bold', 1);
+  x += w;
+  w = 100;
+  this.ADD_PRINT_TEXT(y, x, w, h, template(`{{record.date}}`));
+  this.SET_PRINT_STYLEA(0, 'Alignment', 2);
 }
 
 export function template80_50(model = {}, title = '') {
@@ -71,59 +97,89 @@ export function template80_50(model = {}, title = '') {
   this.PRINT_INITA(0, 0, width, height, title);
   // 宽度按纸张的整宽缩放
   this.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Full-Width');
+  this.SET_PRINT_MODE('FULL_WIDTH_FOR_OVERFLOW', true);
+  this.SET_PRINT_MODE('FULL_HEIGHT_OVERFLOW', true);
   // 设置输出位置以纸张边缘为基点
   this.SET_PRINT_MODE('POS_BASEON_PAPER', true);
 
   let x = margin, y = margin;
   let w = 0, h = 0;
 
-  y -= 2;
-  w = width - margin * 2;
-  h = 30;
+  w = 290;
+  h = 20;
   this.ADD_PRINT_TEXT(y, x, w, h, template(`{{record.title}}`));
   this.SET_PRINT_STYLEA(0, 'Bold', 1);
-  this.SET_PRINT_STYLEA(0, 'Alignment', 2);
-
-  w = 70;
-  h = 20;
-  y = 40;
-  x = width - w - margin;
-  this.ADD_PRINT_TEXT(y, x, w, h, template(`{{record.category}}`));
-  this.SET_PRINT_STYLEA(0, 'Alignment', 3);
-  w = x - margin;
-  this.ADD_PRINT_TEXT(y, margin, w, h, template(`{{patient.name}}，{{patient.gender}}，{{patient.birthday}}`));
 
-  x = margin;
   y += h;
-  if (model.record.no) this.ADD_PRINT_BARCODE(y, x, 145, 60, '128Auto', model.record.no);
-  this.SET_PRINT_STYLEA(0, 'FontSize', 6);
-
-  this.SET_PRINT_STYLE('FontSize', 8);
-  w = 130;
-  x = width - w - margin;
-  y += 4;
-  this.ADD_PRINT_TEXT(y, x, w, h, template(`手机号：{{patient.phone}}`));
+  w = 196;
+  this.ADD_PRINT_TEXT(y, x, w, h, '中药煎药取药凭证');
   y += h;
-  this.ADD_PRINT_TEXT(y, x, w, h, template(`处方用法：{{recipe.method}}`));
+  w = 50;
+
+  this.ADD_PRINT_TEXT(y, x, w, h, '病历号');
+  x += w - 1;
+  w = 100;
+  this.ADD_PRINT_TEXT(y, x, w, h, template(`{{record.medicalRecordNumber}}`));
+  this.SET_PRINT_STYLEA(0, 'Bold', 1);
+  x += w - 3;
+  w = 50;
+  this.ADD_PRINT_TEXT(y, x, w, h, '处方号');
+  x += w - 6;
+  w = 94 + 6;
+  this.ADD_PRINT_TEXT(y, x, w, h, template(`{{record.no}}`));
+  this.SET_PRINT_STYLEA(0, 'Bold', 1);
+
   y += h;
-  w = 55;
-  this.ADD_PRINT_TEXT(y, x, w, h, template(`剂数：{{recipe.count}}`));
+  x = margin;
+  w = 50;
+  this.ADD_PRINT_TEXT(y, x, w, h, '姓名：');
   x += w;
-  this.ADD_PRINT_TEXT(y, x, width - x - margin, h, template(`是否代煎：{{recipe.decoction}}`));
-  this.SET_PRINT_STYLEA(0, 'Alignment', 3);
-  this.SET_PRINT_STYLE('FontSize', 9);
+  w = 146 + 6;
+  this.ADD_PRINT_TEXT(y, x, w, h, template(`{{patient.name}}`));
+  this.SET_PRINT_STYLEA(0, 'FontSize', 12);
+  this.SET_PRINT_STYLEA(0, 'Bold', 1);
+  x += w;
+  w = 44;
+  this.ADD_PRINT_TEXT(y, x, w, h, '贴数');
+  this.SET_PRINT_STYLEA(0, 'Alignment', 2);
+  x += w;
+  this.ADD_PRINT_TEXT(y, x, w, h, template(`{{recipe.count}}`));
+  this.SET_PRINT_STYLEA(0, 'FontSize', 12);
+  this.SET_PRINT_STYLEA(0, 'Alignment', 2);
+  this.SET_PRINT_STYLEA(0, 'Bold', 1);
 
-  x = margin;
   y += h;
-  w = width - margin * 2;
-  this.ADD_PRINT_TEXT(y, x, w, h, template(`科室/病房：{{department}}`));
-  y += h;
-  h += 6;
-  this.ADD_PRINT_TEXT(y, x, w, h, template(`药师备注：{{record.remark}}`));
+  x = margin;
+  h = 44;
+  this.ADD_PRINT_TEXT(y, x, 230, h, template(`地址：{{recipe.address}}`));
+
+
   y += h;
+  x = margin;
   h = 20;
-  this.ADD_PRINT_TEXT(y, x, w, h, template(`打印时间：{{record.date}}`));
+  w = 50;
+  this.ADD_PRINT_TEXT(y, x, w, h, '取药：');
+  x += w;
+  this.ADD_PRINT_TEXT(y, x, 130, h, template(`{{department}}`));
+  this.SET_PRINT_STYLEA(0, 'FontSize', 10);
+  this.SET_PRINT_STYLEA(0, 'Bold', 1);
+  y += h;
+  x = margin;
+  this.ADD_PRINT_TEXT(y, x, 180, h, template(`{{record.remark}}`));
+  this.SET_PRINT_STYLEA(0, 'FontSize', 8);
+  y += h - 4;
+  x = margin;
+  this.ADD_PRINT_TEXT(y, x, 180, h, template(`{{recipe.method}}`));
+  this.SET_PRINT_STYLEA(0, 'FontSize', 10);
+  this.SET_PRINT_STYLEA(0, 'Bold', 1);
+
+
+  this.ADD_PRINT_TEXT(98, 236, 60, 20, template(`{{recipe.delivery}}`));
+  this.SET_PRINT_STYLEA(0, 'FontSize', 12);
   this.SET_PRINT_STYLEA(0, 'Alignment', 2);
+  this.SET_PRINT_STYLEA(0, 'Bold', 1);
+
+  if (model.record.no) this.ADD_PRINT_BARCODE(133, 189, 107, 50, '128Auto', model.record.no);
 }
 
 /**
@@ -135,13 +191,14 @@ export function template80_50(model = {}, title = '') {
 export function templateA5(model = {}, title = '') {
   const template = renderTemplate.bind(this, model);
 
+  const size = 40;
   const width = 559;
   const height = 794;
   const margin = 12;
 
   this.PRINT_INITA(0, 0, width, height, title);
   // 宽度按纸张的整宽缩放
-  this.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Full-Height');
+  this.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Full-Width');
   // 设置输出位置以纸张边缘为基点
   this.SET_PRINT_MODE('POS_BASEON_PAPER', true);
 
@@ -149,77 +206,82 @@ export function templateA5(model = {}, title = '') {
     let result = [];
     for (let i = 0; i < array.length; i += size) {result.push(array.slice(i, i + size));}
     return result;
-  })(model.recipe['medicines']);
+  })(model.recipe['medicines'], size);
   if (!chunks.length) chunks.push([]);
   const single = chunks.length === 1;
 
   for (const chunk of chunks) {
+    let x = margin, y = margin;
+    let w = 0, h = 0, offset = 0;
     // 绘制头部
-    this.ADD_PRINT_TEXT(margin, margin, 310, 30, template(`{{record.title}}`));
-    this.SET_PRINT_STYLEA(0, 'FontSize', 16);
+    this.ADD_PRINT_TEXT(y, x, 310, 26, template(`{{record.title}}`));
+    this.SET_PRINT_STYLEA(0, 'FontSize', 12);
+    this.SET_PRINT_STYLEA(0, 'Bold', 1);
+
+    y = 37;
+    this.ADD_PRINT_TEXT(y, 117, 100, 20, template(`{{recipe.type}}`));
     this.SET_PRINT_STYLEA(0, 'Alignment', 2);
+
+    this.ADD_PRINT_TEXT(y, 12, 100, 20, template(`{{recipe.decoction}}`));
+    this.SET_PRINT_STYLEA(0, 'FontSize', 12);
     this.SET_PRINT_STYLEA(0, 'Bold', 1);
-    this.ADD_PRINT_TEXT(47, 12, 310, 20, template(`{{recipe.type}}`));
+    this.ADD_PRINT_TEXT(y, 222, 100, 20, template(`{{record.serialNumber}}`));
     this.SET_PRINT_STYLEA(0, 'Alignment', 2);
-    if (model.record.no) this.ADD_PRINT_BARCODE(12, 331, 216, 60, '128Auto', model.record.no);
+    this.SET_PRINT_STYLEA(0, 'Bold', 1);
 
-    // 绘制顶部信息
-    let x = 0, y = 80, h = 20;
-    let rows = [
-      [
-        {left: margin, width: 138, height: 20, text: template(`姓名：{{patient.name}}`)},
-        {width: 60, height: 20, text: template(`性别：{{patient.gender}}`)},
-        {width: 80, height: 20, text: template(`年龄：{{patient.age}}`)},
-        {width: 120, height: 20, text: template(`电话：{{patient.phone}}`)},
-      ],
-      [
-        {left: margin, width: 198, height: 20, text: template(`就诊科室：{{department}}`)},
-        {width: 80, height: 20, text: template(`床号：{{bedNo}}`)},
-        {width: 120, height: 20, text: template(`病历号：{{recordNo}}`)},
-      ],
-      [
-        {left: margin, width: 350, height: 20, text: template(`临床诊断：{{diagnosis}}`)},
-        {leftOffset: 2, width: 350, height: 20, text: template(`开方时间：{{recipe.date}}`)},
-      ],
-      [
-        {left: margin, width: 400, height: 20, text: template(`联系地址：{{recipe.address}}`)},
-        {
-          leftOffset: 2, width: 134, height: 20, text: template(`{{recipe.delivery}}`), style: {
-            Alignment: 3,
-          },
-        },
-      ],
-    ];
-    rows.forEach((row, r) => {
-      row.forEach((col, c) => {
-        if (col.top != null) y = col.top;
-        else if (r && c === 0) { y += (h + 2); }
-
-        if (col.left != null) x = col.left;
-        else if (c) {x += row[c - 1].width + (col.leftOffset || 0);}
-
-        this.ADD_PRINT_TEXT(y, x, col.width, col.height, col.text);
-        for (const [prop, value] of Object.entries(col.style || {})) {
-          this.SET_PRINT_STYLEA(0, prop, value);
-        }
-      });
-    });
+    if (model.record.no) this.ADD_PRINT_BARCODE(12, 331, 216, 50, '128Auto', model.record.no);
 
-    this.ADD_PRINT_TEXT(80, 410, 128, 42, template(`{{field1}}`));
+    // 绘制顶部信息
+    y = 66;
+    h = 20;
+    offset = 2;
+    this.ADD_PRINT_TEXT(y, 12, 45, h, '姓名：');
+    this.ADD_PRINT_TEXT(y, 151, 60, h, template(`性别：{{patient.gender}}`));
+    this.ADD_PRINT_TEXT(y, 211, 80, h, template(`年龄：{{patient.arg}}`));
+    this.ADD_PRINT_TEXT(y, 291, 100, h, template(`床号：{{record.bedNo}}`));
+    this.ADD_PRINT_TEXT(y - 6, 56, 96, h + 6, template(`{{patient.name}}`));
+    this.SET_PRINT_STYLEA(0, 'FontSize', 12);
+    this.SET_PRINT_STYLEA(0, 'Bold', 1);
+    y += h + offset;
+    this.ADD_PRINT_TEXT(y, 12, 200, h, template(`科室：{{department}}`));
+    this.ADD_PRINT_TEXT(y, 211, 150, h, template(`病历号：{{record.recordNo}}`));
+    this.ADD_PRINT_TEXT(y, 370, 175, h, template(`开方日期：{{record.date}}`));
+    this.SET_PRINT_STYLEA(0, 'Alignment', 3);
+    y += h + offset;
+    h = 34;
+    this.ADD_PRINT_TEXT(y, 12, 418, h, template(`地址：{{recipe.address}}`));
+    this.ADD_PRINT_TEXT(y, 430, 120, h, template(`电话：{{patient.phone}}`));
+    this.SET_PRINT_STYLEA(0, 'Alignment', 3);
+    y += h;
+    this.ADD_PRINT_TEXT(y, 12, 418, h, template(`临床诊断：{{diagnosis}}`));
+    this.ADD_PRINT_TEXT(y, 430, 120, h, template(`{{recipe.delivery}}`));
+    this.SET_PRINT_STYLEA(0, 'FontSize', 12);
+    this.SET_PRINT_STYLEA(0, 'Bold', 1);
     this.SET_PRINT_STYLEA(0, 'Alignment', 3);
-    this.SET_PRINT_STYLEA(0, 'Italic', 1);
-    this.SET_PRINT_STYLEA(0, 'Underline', 1);
-
 
     // 分割线
     this.ADD_PRINT_SHAPE(4, 178, 12, 535, 1, 0, 1, '#000000');
-    // RP
-    this.ADD_PRINT_TEXT(192, 12, 50, 30, 'Rp:');
-    this.SET_PRINT_STYLEA(0, 'FontSize', 16);
+
+    y = 188;
+    this.ADD_PRINT_TEXT(y, 48, 120, 20, '药品名');
+    this.SET_PRINT_STYLEA(0, 'Alignment', 2);
+    this.SET_PRINT_STYLEA(0, 'Bold', 1);
+    this.ADD_PRINT_TEXT(y, 168, 50, 20, '单帖量');
+    this.SET_PRINT_STYLEA(0, 'Alignment', 3);
+    this.SET_PRINT_STYLEA(0, 'Bold', 1);
+    this.ADD_PRINT_TEXT(y, 220, 48, 20, '用法');
+    this.SET_PRINT_STYLEA(0, 'Alignment', 2);
+    this.SET_PRINT_STYLEA(0, 'Bold', 1);
+    this.ADD_PRINT_TEXT(y, 291, 120, 20, '药品名');
+    this.SET_PRINT_STYLEA(0, 'Alignment', 2);
+    this.SET_PRINT_STYLEA(0, 'Bold', 1);
+    this.ADD_PRINT_TEXT(y, 411, 50, 20, '单贴量');
+    this.SET_PRINT_STYLEA(0, 'Alignment', 3);
+    this.SET_PRINT_STYLEA(0, 'Bold', 1);
+    this.ADD_PRINT_TEXT(y, 463, 48, 20, '用法');
     this.SET_PRINT_STYLEA(0, 'Bold', 1);
 
     // 绘制药品
-    y = 230 - 20 - 2;
     chunk.forEach((medicine, i) => {
       const template = renderTemplate.bind(this, medicine);
       if (i % 2) {
@@ -236,70 +298,56 @@ export function templateA5(model = {}, title = '') {
       x += 50 + 2;
       this.ADD_PRINT_TEXT(y, x, 48, 16, template(`{{usage}}`));
       this.SET_PRINT_STYLEA(0, 'FontSize', 6);
+      this.SET_PRINT_STYLEA(0, 'Alignment', 2);
     });
 
-    // 绘制处方信息
-    y = Math.max(560, y);
-    y += 20 + 8 * 2;
-    this.SET_PRINT_STYLE('Alignment', 2);
-    this.ADD_PRINT_TEXT(y, margin, 111, 20, template(`剂数：{{recipe.count}} ${model.recipe.decoction ? '(代煎)' : ''}`));
-    this.ADD_PRINT_TEXT(y, 120, 100, 20, template(`{{recipe.category}} ${model.recipe.method ? '({{recipe.method}})' : ''}`));
-    this.ADD_PRINT_TEXT(y, 229, 100, 20, template(`{{recipe.volume}}`));
-    this.ADD_PRINT_TEXT(y, 339, 100, 20, template(`{{recipe.frequency}}`));
-    this.ADD_PRINT_TEXT(y, 448, 100, 20, template(`{{recipe.frequencyTime}}`));
-    this.ADD_PRINT_SHAPE(4, 619, 12, 535, 1, 0, 1, '#000000');
-
-    // 绘制矩形
-    this.ADD_PRINT_RECT(620 + 12, 12, 240, 70, 0, 1);
-    // 第一横行线
-    this.ADD_PRINT_SHAPE(4, 654, 12, 240, 1, 0, 1, '#000000');
-    // 第二横行线
-    this.ADD_PRINT_SHAPE(4, 679, 12, 240, 1, 0, 1, '#000000');
-    // 第二行 竖线
-    this.ADD_PRINT_SHAPE(4, 655, 132, 1, 24, 0, 1, '#000000');
-    this.ADD_PRINT_TEXT(637, 13, 238, 12, template(`药品金额：￥{{recipe.medicineFees}}`));
-    this.ADD_PRINT_TEXT(661, 13, 118, 12, template(`煎药费：￥{{recipe.decoctionFees}}`));
-    this.ADD_PRINT_TEXT(661, 133, 118, 12, template(`配送费：￥{{recipe.deliveryFees}}`));
-    this.ADD_PRINT_TEXT(685, 13, 238, 12, template(`总金额：￥{{recipe.totalFees}}`));
-    this.SET_PRINT_STYLE('Alignment', 1);
-    this.SET_PRINT_STYLE('FontSize', 8);
-
-    y = 620 + 12 + 4;
-    rows = [
-      [
-        {left: 266, text: template(`开方：{{sign.field1}}`)},
-        {left: 408, text: template(`审核：{{sign.field2}}`)},
-      ],
-      [
-        {left: 266, text: template(`调配：{{sign.field3}}`)},
-        {left: 408, text: template(`复核：{{sign.field4}}`)},
-      ],
-      [
-        {left: 266, text: template(`浸泡：{{sign.field5}}`)},
-        {left: 408, text: template(`煎煮：{{sign.field6}}`)},
-      ],
-      [
-        {left: 266, text: template(`打包：{{sign.field7}}`)},
-        {left: 408, text: template(`发药：{{sign.field8}}`)},
-      ],
-    ];
-    for (const row of rows) {
-      for (const col of row) {
-        this.ADD_PRINT_TEXT(y, col.left, 140, 16, col.text);
-        this.ADD_PRINT_TEXT(y, col.left, 140, 16, col.text);
-      }
-      y += 16 + 2;
-    }
-    this.SET_PRINT_STYLE('FontSize', 9);
-    this.ADD_PRINT_SHAPE(4, 714, 12, 535, 1, 0, 1, '#000000');
-
-    if (model.record.remark) {
-      this.ADD_PRINT_TEXT(725, 12, 40, 16, '注：');
-      this.SET_PRINT_STYLEA(0, 'Bold', 1);
-      this.SET_PRINT_STYLEA(0, 'Vorient', 1);
-      this.ADD_PRINT_TEXT(725, 48, 500, 55, template(`{{record.remark}}`));
-      this.SET_PRINT_STYLEA(0, 'Vorient', 1);
-    }
+    y += 20 + 2 + 12;
+
+    this.ADD_PRINT_TEXT(y, 12, 536, 40, template(`备注：{{record.remark}}`));
+
+    y += 40;
+    x = margin;
+    h = 20;
+    w = 130;
+    this.ADD_PRINT_TEXT(y, x, w, h, template(`用法：{{recipe.method}}`));
+    this.ADD_PRINT_TEXT(y, width - margin - w, w, 40, template(`{{recipe.volume}}`));
+    this.SET_PRINT_STYLEA(0, 'FontSize', 12);
+    this.SET_PRINT_STYLEA(0, 'Alignment', 2);
+    this.SET_PRINT_STYLEA(0, 'Bold', 1);
+
+    y += h;
+    x = margin;
+    h = 20;
+    w = 130;
+    offset = 5;
+    this.ADD_PRINT_TEXT(y, x, w, h, template(`金额：{{recipe.totalFees}} 元`));
+    x += w + offset;
+    this.ADD_PRINT_TEXT(y, x, w, h, template(`共 {{recipe.count}} 剂`));
+    this.SET_PRINT_STYLEA(0, 'Alignment', 2);
+    x += w + offset;
+    this.ADD_PRINT_TEXT(y, x, w, h, template(`煎 {{recipe.count}} 剂`));
+    this.SET_PRINT_STYLEA(0, 'Alignment', 2);
+
+    y += h;
+    x = margin;
+    this.ADD_PRINT_TEXT(y, x, w, h, template(`医生：{{sign.field1}}`));
+    x += w + offset;
+    this.ADD_PRINT_TEXT(y, x, w, h, template(`单剂重量：{{recipe.unitWeight}}`));
+    this.SET_PRINT_STYLEA(0, 'Alignment', 2);
+    x += w + offset;
+    this.ADD_PRINT_TEXT(y, x, w, h, template(`总重量：{{recipe.totalWeight}}`));
+    this.SET_PRINT_STYLEA(0, 'Alignment', 2);
+
+    y += h;
+    x = margin;
+    this.ADD_PRINT_TEXT(y, x, w, h, template(`审方人：{{sign.field2}}`));
+    x += w + offset;
+    this.ADD_PRINT_TEXT(y, x, w, h, template(`配药人：{{sign.field3}}`));
+    x += w + offset;
+    this.ADD_PRINT_TEXT(y, x, w, h, template(`复核人：{{sign.field4}}`));
+    x += w + offset;
+    this.ADD_PRINT_TEXT(y, x, w, h, template(`煎药人：{{sign.field6}}`));
+
 
     if (!single) this.NEWPAGEA();
   }
@@ -327,7 +375,7 @@ export function template72(model, title) {
   let x = margin, y = margin;
   let w = 0, h = 0;
 
-  w = 70;
+  w = 60;
   h = 20;
   this.ADD_PRINT_TEXT(y, x, w, h, template(`{{recipe.delivery}}`));
   this.SET_PRINT_STYLEA(0, 'Alignment', 2);
@@ -335,7 +383,7 @@ export function template72(model, title) {
   x += w;
   h = 30;
   this.ADD_PRINT_TEXT(y, x, width - x - margin, h, template(`{{record.title}}`));
-  this.SET_PRINT_STYLEA(0, 'FontSize', 16);
+  this.SET_PRINT_STYLEA(0, 'FontSize', 12);
   this.SET_PRINT_STYLEA(0, 'Alignment', 2);
   this.SET_PRINT_STYLEA(0, 'Bold', 1);
   x = margin;
@@ -368,15 +416,17 @@ export function template72(model, title) {
   if (model.record.no) this.ADD_PRINT_BARCODE(y, x, h, h, 'QRCode', model.record.no);
 
   x = 94;
-  h = 45 * 2;
+  h = 45;
   this.ADD_PRINT_TEXT(y, x, 178, h, template(`备注：{{record.remark}}`));
+  y += h;
+  this.ADD_PRINT_TEXT(y, x, 178, h, template(`另包：`));
 
   x = margin;
   y += h;
 
   w = 72;
   h = 20;
-  this.ADD_PRINT_TEXT(y, x, w, h, `药味：${model.recipe.medicines.length}}`);
+  this.ADD_PRINT_TEXT(y, x, w, h, `药味：${model.recipe.medicines.length}`);
   x += w;
   w = 100;
   this.ADD_PRINT_TEXT(y, x, w, h, template(`帖重：{{recipe.unitWeight}}`));
@@ -390,38 +440,41 @@ export function template72(model, title) {
   w = 100;
   this.ADD_PRINT_TEXT(y, x, w, h, template(`开单：{{doctor}}`));
   x += w;
-  this.ADD_PRINT_TEXT(y, x, width - x - margin, h, template(`共 {{recipe.count}}帖 {{recipe.total}}包`));
+  this.ADD_PRINT_TEXT(y, x, width - x - margin, h, template(`共 {{recipe.count}} 帖 煎 {{recipe.total}} 包`));
   this.SET_PRINT_STYLEA(0, 'Alignment', 3);
 
-  x = margin;
   y += h;
+  this.ADD_PRINT_SHAPE(4, y, 0, 278, 1, 0, 1, '#000000');
+  x = margin;
+  y += 8;
   w = 178;
   h = 20;
   this.ADD_PRINT_TEXT(y, x, w, h, [
-    template(`{{recipe.volume}}`),
     template(`{{recipe.frequency}}`),
     template(`{{recipe.frequencyTime}}`),
   ].filter(Boolean).join('，'));
-
   w = 100;
-  this.ADD_PRINT_TEXT(y, width - w - margin, w, h, '装量：  ML');
+  this.ADD_PRINT_TEXT(y, width - w - margin, w, h, template(`装量：{{recipe.volume}} ML`));
   this.SET_PRINT_STYLEA(0, 'Alignment', 3);
 
-  this.ADD_PRINT_SHAPE(4, 255, 0, 278, 1, 0, 1, '#000000');
-  this.ADD_PRINT_TEXT(265, 0, 60, 20, '库位号');
+  y += h - 2;
+  this.ADD_PRINT_SHAPE(4, y, 0, 278, 1, 0, 1, '#000000');
+  y += 10;
+  this.ADD_PRINT_TEXT(y, 0, 60, 20, '斗号');
   this.SET_PRINT_STYLEA(0, 'Alignment', 2);
-  this.ADD_PRINT_TEXT(265, 53, 86, 20, '药品名');
+  this.ADD_PRINT_TEXT(y, 53, 86, 20, '品名');
   this.SET_PRINT_STYLEA(0, 'Alignment', 2);
-  this.ADD_PRINT_TEXT(265, 136, 36, 20, '单帖');
+  this.ADD_PRINT_TEXT(y, 136, 36, 20, '单帖');
   this.SET_PRINT_STYLEA(0, 'Alignment', 3);
-  this.ADD_PRINT_TEXT(265, 166, 36, 20, '总量');
+  this.ADD_PRINT_TEXT(y, 166, 36, 20, '总量');
   this.SET_PRINT_STYLEA(0, 'Alignment', 3);
-  this.ADD_PRINT_TEXT(265, 196, 36, 20, '单位');
+  this.ADD_PRINT_TEXT(y, 196, 36, 20, '单位');
   this.SET_PRINT_STYLEA(0, 'Alignment', 3);
-  this.ADD_PRINT_TEXT(265, 228, 44, 20, '特煎');
+  this.ADD_PRINT_TEXT(y, 228, 44, 20, '特煎');
   this.SET_PRINT_STYLEA(0, 'Alignment', 3);
-  this.ADD_PRINT_SHAPE(4, 285, 0, 278, 1, 0, 1, '#000000');
-  y = 285 + 12;
+  y += 20;
+  this.ADD_PRINT_SHAPE(4, y, 0, 278, 1, 0, 1, '#000000');
+  y = 285 + h;
 
   this.SET_PRINT_STYLE('FontSize', 8);
   model.recipe.medicines.forEach((medicine, i) => {
@@ -446,7 +499,7 @@ export function template72(model, title) {
     y += h + 2;
   });
   this.SET_PRINT_STYLE('FontSize', 9);
-  y += 12;
+  // y += 2;
   this.ADD_PRINT_SHAPE(4, y, 0, 278, 1, 0, 1, '#000000');
 
 }

src/components/print/ticket_72.vue

@@ -93,7 +93,7 @@ export default {
             total: data['packageNumber'],
             category: data['dosageForm'],
             method: data['prescriptionusage'],
-            volume: data['concentration'] && `每次${data['concentration']}`,
+            volume: data['concentration'] && `${data['concentration']}`,
             frequency: data['frequency'],
             frequencyTime: data['medicationTime'],
             decoction: (data['isBehalf'] === '1' || +data['daijianNumber'] > 0) ? '代煎' : '自煎',

src/store/modules/user.js

@@ -76,7 +76,7 @@ const user = {
           } else {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
-          commit('SET_NAME', user.userName)
+          commit('SET_NAME', user.nickName)
           commit('SET_AVATAR', avatar)
           commit('SET_PHARMACYLIST', pharmacyList)
           resolve(res)

src/views/login.vue

@@ -159,7 +159,9 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <!-- <span>Copyright © 2018-2021 ruoyi.vip All Rights Reserved.</span> -->
+       <span style="color: #2c3e50">
+         重药控股（浙江）有限公司 & 杭州六智科技有限公司
+       </span>
     </div>
   </div>
 </template>

src/views/rescription/prescriptionCore/edit.vue

@@ -1,15 +1,20 @@
 <script>
 import dayjs from 'dayjs';
 import {listMedicalMechanism} from '@/api/medical/mechanism';
-import {transformFlatObjectToNested} from '@/tools/object';
-import {bignumber, chain} from 'mathjs';
-import {addPrescriptionCore2} from '@/api/prescription/prescriptionCore';
+import {transformFlatObjectToNested, transformNestedObjectToFlat} from '@/tools/object';
+import {bignumber, chain, multiply} from 'mathjs';
+import {addPrescriptionCore2, check, check2, getPrescriptionCore2} from '@/api/prescription/prescriptionCore';
 import {mapGetters} from 'vuex';
 
 import regionOptions from '@/utils/options';
+import {getSchemeList} from '@/api/decoct/scheme';
 
 
 export default {
+  props: {
+    id: {type: [String, Number]},
+    mode: {type: String, default: 'edit'},
+  },
   data() {
     const locationValidator = (message) => (rule, value, callback) => {
       if (this.model.expressExecutor === '顺丰') {
@@ -32,7 +37,7 @@ export default {
         consignee: [{validator: locationValidator('请输入收件电话')}],
         contactNumber: [{validator: locationValidator('请输入收件电话')}],
         location: [{validator: locationValidator('请选择所属地域')}],
-        address: [{validator: locationValidator('请输入详细地址')}],
+        address: [{required: true, message: '请输入详细地址'}],
       },
 
       ageOptions: [
@@ -65,33 +70,97 @@ export default {
       concentrationOptions: [],
       frequencyOptions: [],
       medicationTimeOptions: [],
+      expressDechOptions: [],
+      expressPayTypeOptions: [],
+      schemeOptions: [],
+      patternOptions: [],
       regionOptions,
       showPharmacy: false,
       searchTableForSystemColumns: [
         {title: '名称', data: 'drugsName'},
-        {title: '编码', data: 'drugsId'},
-        {title: '规格', data: 'drugsSpecsName'},
-        {title: '产地', data: 'placeName'},
-        {title: '零售价', data: 'retail'},
+        // {title: '编码', data: 'drugsId'},
+        // {title: '规格', data: 'drugsSpecsName'},
+        // {title: '产地', data: 'placeName'},
+        // {title: '零售价', data: 'retail'},
       ],
+      loading: false,
       saving: false,
+
+      tableHeight: 0,
     };
   },
   computed: {
     ...mapGetters(['pharmacyList']),
+    isCheck() { return this.$props.mode !== 'edit';},
     getEmptyMedicineRowIndex() {
       return this.medicines.findIndex(medicine => Object.keys(medicine).length === 0);
     },
+    medicineTotal() {
+      return this.medicines.filter(medicine => medicine && medicine.matCode).length;
+    },
+    medicineDosageTotal() {
+      let total = chain(bignumber(0));
+      for (const medicine of this.medicines) {
+        if (medicine['matDose']) total = total.add(bignumber(medicine['matDose']));
+      }
+      return total.done().toFixed(2);
+    },
+    medicineWholesalePriceTotal() {
+      let total = chain(bignumber(0));
+      for (const medicine of this.medicines) {
+        if (medicine['matDose'] && medicine['matPfj']) total = total.add(multiply(
+          bignumber(medicine['matDose']),
+          bignumber(medicine['matPfj']),
+        ));
+      }
+      return total.done().toFixed(2);
+    },
+    medicinePriceTotal() {
+      let total = chain(bignumber(0));
+      for (const medicine of this.medicines) {
+        if (medicine['matDose'] && medicine['matXsj']) total = total.add(multiply(
+          bignumber(medicine['matDose']),
+          bignumber(medicine['matXsj']),
+        ));
+      }
+      return total.done().toFixed(2);
+    },
   },
   created() {
-    this.formReset();
+    if (this.$props.id) this.load();
+    else this.formReset();
+    this.getMechanismList();
     this.getDicts('dosage_form').then((response) => {this.dosageFormOptions = response.data;});
-    this.getDicts('prescription_usage').then((response) => {this.usageOptions = response.data;});
-    this.getDicts('concentration').then((response) => {this.concentrationOptions = response.data;});
-    this.getDicts('frequency').then((response) => {this.frequencyOptions = response.data;});
-    this.getDicts('medicationTime').then((response) => {this.medicationTimeOptions = response.data;});
+    this.getDicts('pressure_pattern').then((response) => {this.patternOptions = response.data;});
+    this.getDicts('prescription.prescriptionUsage').then((response) => {this.usageOptions = response.data;});
+    this.getDicts('prescription.concentration').then((response) => {this.concentrationOptions = response.data;});
+    this.getDicts('prescription.frequency').then((response) => {this.frequencyOptions = response.data;});
+    this.getDicts('prescription.medicationTime').then((response) => {this.medicationTimeOptions = response.data;});
+    this.getDicts('expressDech').then((response) => {this.expressDechOptions = response.data;});
+    this.getDicts('expressPayType').then((response) => {this.expressPayTypeOptions = response.data;});
+    getSchemeList().then((response) => {this.schemeOptions = response.rows;});
+  },
+  mounted() {
+    const rect = this.$el.getBoundingClientRect();
+    this.tableHeight = rect.height - /* 内边距 */ 12 * 2 - /* 协定方 */ 32 - /* 表尾 */ (20 + 12 * 2) - /* 拒绝原因 */ (this.isCheck ? 54 + 12 : 0) - /* 底部按钮 */ (36 + 12);
   },
   methods: {
+    async load() {
+      this.loading = true;
+      try {
+        const {medicines, ...model} = await getPrescriptionCore2(this.$props.id);
+        this.medicines = medicines;
+        this.model = transformNestedObjectToFlat(model);
+        console.log(this.medicines, this.model, 'log-->');
+      } catch (e) {
+        console.log(e);
+        this.cancel();
+      }
+      this.loading = false;
+      this.appendMedicine();
+      const pharmacies = Array.isArray(this.pharmacyList) ? this.pharmacyList : [];
+      this.showPharmacy = pharmacies.length > 1 || !this.model.yfId;
+    },
     formReset() {
       const pharmacies = Array.isArray(this.pharmacyList) ? this.pharmacyList : [];
       this.model = {
@@ -119,20 +188,44 @@ export default {
         /* 22 服药时间 */ prescription_medicationTime: '',
         /* 23 医嘱     */ prescription_remark: '',
         /* 24 代煎     */ isBehalf: '',
+        /* 24 配送     */ takingMethod: '',
+
         /* 26 配送方式 */ expressExecutor: '',
         /* 27 收件人名 */ consignee: '',
         /* 28 收件电话 */ contactNumber: '',
         location: [],
         /* 29 收件地址 */ address: '',
         /* 30 快递单号 */ expressCode: '',
+        /*            */ expressDech: '',
+        /*            */ expressPayType: '',
+        /*    用药时间 */ expressTime: dayjs().startOf('minute').format('YYYY-MM-DD HH:mm'),
+
+        /*    批发费用 */ // prescription_prescriptionPfSum: '',
+        /*    含税金额 */ // prescription_prescriptionYsSum: '',
         /* 31 处方金额 */ // prescription_prescriptionSum: '',
         /* 32 代煎费用 */ // prescription_daijianCost: '',
         /* 33 配送费用 */ // prescription_distributionCost: '',
         /* 34 总金额 */ // prescription_prescriptionTotleSum: '',
+
+        /*    浸泡水量 */ // steep_soakingWaterValue: '',
+        /*    浸泡时间 */ // steep_soakingTime: '',
+        /*    是否毒性 */ decoct_isPoison: '',
+        /*    煎煮方案 */ decoct_schemeId: '',
+        /*    煎煮剂型 */ decoct_dosageForm: '',
+        /*    压力模式 */ decoct_pressurePattern: '',
+        /*    煎煮时间 */ // decoct_decoctTime: '',
+        /*    先煎时间 */ // decoct_preDecoctTime: '',
+        /*    一煎时间 */ // decoct_firstDecoctTime: '',
+        /*    二煎时间 */ // decoct_secondDecoctTime: '',
+        /*    后下时间 */ // decoct_backDownTime: '',
+        /*    包数     */ // pack_packageNumber: '',
+        /*    包装量   */ // pack_packageDose: '',
+
+        /* 审核理由 */
+        remarks: '',
+        thread: '',
       };
-      this.getMechanismList();
       this.appendMedicine();
-
       this.showPharmacy = pharmacies.length > 1 || !this.model.yfId;
     },
     /** 查询医疗机构列表 */
@@ -154,9 +247,20 @@ export default {
 
         const model = transformFlatObjectToNested(this.model);
         model['prescription'].drugs = medicines;
+        model['prescription'].prescriptionPfSum = +this.medicineWholesalePriceTotal;
+        model['prescription'].prescriptionYsSum = +this.medicineWholesalePriceTotal;
+        model['prescription'].prescriptionSum = +this.medicinePriceTotal;
+
         [model.province = '', model.city = '', model.region = ''] = this.model.location;
+        delete model['location'];
+
+        if (model.steep == null) model.steep = {};
+        if (model.decoct == null) model.decoct = {};
+        if (model.pack == null) model.pack = {};
+
         this.saving = true;
-        await addPrescriptionCore2(model);
+        if (this.isCheck) await check2(model);
+        else await addPrescriptionCore2(model);
         this.$emit('close', true);
       } catch (e) {
         if (e === false) this.$message.warning('请补全表单数据');
@@ -164,6 +268,11 @@ export default {
       }
       this.saving = false;
     },
+    async check(mode) {
+      this.model.thread = mode;
+      this.model.checkState = {110: '1', 120: '2'}[mode];
+      await this.handle();
+    },
     cancel() {
       this.$emit('close', false);
     },
@@ -171,7 +280,16 @@ export default {
       this.$refs.form.clearValidate(validators);
       this.$refs.form.validateField(validators);
     },
-
+    updateJDModel(id) {
+      const model = this.schemeOptions.find(scheme => scheme.id === id) || {};
+      this.model.decoct_pressurePattern = model.pressurePattern;
+      this.model.decoct_dosageForm = model.dosageForm;
+      const keys = ['decoctTime', 'firstDecoctTime', 'secondDecoctTime', 'preDecoctTime', 'backDownTime'];
+      for (const key of keys) {
+        if (model[key]) this.model[`decoct_${key}`] = model[key];
+        else delete model[`decoct_${key}`];
+      }
+    },
     searchMedicinesFormat(res) {
       try {
         if (res.rows) return {totalRow: res.total, list: res.rows};
@@ -187,6 +305,7 @@ export default {
         // row.matDose = '';
         row.matUnitName = value.dosageSizeUnit;
         row.matXsj = value.retail;
+        row.matPfj = value.matPfj;
         row.subtotalMoney = this.calculationMedicinePrice(row);
       } else {
         delete row.matCode;
@@ -196,6 +315,7 @@ export default {
         delete row.matDose;
         delete row.matUnitName;
         delete row.matXsj;
+        delete row.matPfj;
         this.medicines.splice(index, 1, row);
       }
       if (this.getEmptyMedicineRowIndex === -1) this.appendMedicine({}, index + 1);
@@ -213,297 +333,641 @@ export default {
       let price = chain(bignumber(medicine.matXsj || 0));
       return price.multiply(bignumber(medicine.matDose || 0)).value.valueOf();
     },
+    medicinesCellSpan({row, column, rowIndex, columnIndex}) {
+      if (columnIndex >= 2 && !(row && row.matCode)) return {
+        rowspan: 1,
+        colspan: 8,
+      };
+    },
   },
 };
 </script>
 
 <template>
-  <div>
-    <el-form ref="form" :model="model" :rules="rules" label-width="100px">
-      <el-row :gutter="20">
-        <el-col :span="6">
-          <el-form-item label="受理时间" prop="tackleTime">
-            <el-date-picker v-model="model.tackleTime" type="date" value-format="yyyy-MM-dd"
-                            placeholder="请选择受理时间"></el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="序号" prop="recipeSerial">
-            <el-input v-model="model.recipeSerial" placeholder="请输入序号"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="编号" prop="recipeBh">
-            <el-input v-model="model.recipeBh" placeholder="请输入编号"/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="6">
-          <el-form-item label="患者" prop="name">
-            <el-input v-model="model.name" placeholder="请输入患者姓名"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="年龄" prop="age">
-            <div style="display: flex">
-              <el-input-number v-model="model.age" :min="0" label="请输入年龄"></el-input-number>
+  <el-form v-loading="loading" class="wrapper" ref="form"
+           :model="model" :rules="rules" label-position="right" label-width="auto"
+  >
+    <el-row :gutter="20">
+      <el-col class="container" :span="12">
+        <div class="row">
+          <div class="title-container">医疗机构信息</div>
+          <el-row class="form-container" :gutter="8">
+            <el-col :span="8">
+              <el-form-item label="医疗机构" prop="yljgId">
+                <el-select v-model="model.yljgId" placeholder="请选择医疗机构" clearable>
+                  <el-option v-for="item in mechanismOptions" :key="item.code" :value="item.code" :label="item.name"
+                             :disabled="item.disabled"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="门诊住院" prop="preMzZy">
+                <el-select v-model="model.preMzZy" placeholder="请选择" clearable>
+                  <el-option v-for="item in recipeCategoryOptions" :key="item.label" :label="item.label"
+                             :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="编号" prop="recipeBh">
+                <el-input v-model="model.recipeBh" placeholder="请输入编号"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="受理时间" prop="tackleTime">
+                <el-date-picker v-model="model.tackleTime" type="date" value-format="yyyy-MM-dd"
+                                placeholder="请选择受理时间"></el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="处方号" prop="preNo">
+                <el-input v-model="model.preNo" placeholder="请输入处方号"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="序号" prop="recipeSerial">
+                <el-input v-model="model.recipeSerial" placeholder="请输入序号"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="row">
+          <div class="title-container">就诊信息</div>
+          <el-row class="form-container" :gutter="8">
+            <el-col :span="8">
+              <el-form-item label="患者姓名" prop="name">
+                <el-input v-model="model.name" placeholder="请输入患者姓名"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label-width="4em" label="年龄" prop="age">
+                <div style="display: flex">
+                  <el-input-number v-model="model.age" :controls="false" controls-position="right"
+                                   :min="0" placeholder="请输入"
+                  ></el-input-number>
+                </div>
+              </el-form-item>
+              <el-form-item label-width="4em" label="性别" prop="sex">
+                <el-select v-model="model.sex" placeholder="请选择" clearable>
+                  <el-option v-for="item in genderOptions" :key="item.label" :label="item.label"
+                             :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="电话" prop="recipientTel">
+                <el-input type="tel" v-model="model.recipientTel" placeholder="请输入电话" minlength="11"
+                          maxlength="11"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="就诊科室" prop="department">
+                <el-input v-model="model.department" placeholder="请输入就诊科室"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="病区" prop="inpatientArea">
+                <el-input v-model="model.inpatientArea" placeholder="请输入病区"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="病床" prop="bedNo">
+                <el-input v-model="model.bedNo" placeholder="请输入病床"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item label="临床诊断" prop="disName">
+                <el-input v-model="model.disName" placeholder="请输入临床诊断"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="医生" prop="doctor">
+                <el-input v-model="model.doctor" placeholder="请输入医生"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="医院金额" prop="prescription_prescriptionTotleSum">
+                <el-input-number class="full" v-model="model.prescription_prescriptionTotleSum" :controls="false"
+                                 :precision="2" :step="1" :min="0" placeholder="请输入"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="代煎费" prop="prescription_daijianCost">
+                <el-input-number class="full" v-model="model.prescription_daijianCost" :controls="false"
+                                 :precision="2" :step="1" :min="0" placeholder="请输入"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="配送费" prop="prescription_distributionCost">
+                <el-input-number class="full" v-model="model.prescription_distributionCost" :controls="false"
+                                 :precision="2" :step="1" :min="0" placeholder="请输入"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="row">
+          <div class="title-container">处方信息</div>
+          <el-row class="form-container" :gutter="8">
+            <el-col :span="8">
+              <el-form-item label-width="3em" label="剂型" prop="prescription_dosageForm">
+                <el-select v-model="model.prescription_dosageForm" placeholder="请选择" clearable>
+                  <el-option v-for="item in dosageFormOptions" :key="item.dictValue"
+                             :label="item.dictLabel" :value="item.dictValue"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label-width="3em" label="用法" prop="prescription_prescriptionUsage">
+                <el-select v-model="model.prescription_prescriptionUsage" placeholder="请选择" clearable>
+                  <el-option v-for="item in usageOptions" :key="item.dictValue"
+                             :label="item.dictLabel" :value="item.dictValue"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label-width="3em" label="剂数" prop="prescription_number">
+                <el-input-number v-model="model.prescription_number" :controls="false" controls-position="right"
+                                 :min="0" placeholder="请输入"
+                ></el-input-number>
+              </el-form-item>
+              <el-form-item label-width="3em" label="包数" prop="pack_packageNumber">
+                <el-input-number v-model="model.pack_packageNumber" :controls="false" controls-position="right"
+                                 :min="0" placeholder="请输入"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="包装量" prop="pack_packageDose">
+                <div style="display: flex">
+                  <el-input-number class="full" v-model="model.pack_packageDose" :controls="false"
+                                   :precision="2" :step="1" :min="0" placeholder="请输入"
+                  ></el-input-number>
+                  <span style="flex: none; margin-left: 4px;">ml</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label-width="3em" label="代煎" prop="isBehalf">
+                <el-select v-model="model.isBehalf" placeholder="是 / 否" clearable>
+                  <el-option v-for="item in whetherOptions" :key="item.value"
+                             :label="item.label" :value="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label-width="3em" label="配送" prop="takingMethod">
+                <el-select v-model="model.takingMethod" placeholder="是 / 否" clearable>
+                  <el-option label="是" :value="'配送'"></el-option>
+                  <el-option label="否" :value="'自提'"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="服药频次" prop="prescription_frequency">
+                <el-select v-model="model.prescription_frequency" placeholder="请选择服药频次" clearable>
+                  <el-option v-for="item in frequencyOptions" :key="item.dictValue"
+                             :label="item.dictLabel" :value="item.dictValue"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="服药时间" prop="prescription_medicationTime">
+                <el-select v-model="model.prescription_medicationTime" placeholder="请选择服药时间" clearable>
+                  <el-option v-for="item in medicationTimeOptions" :key="item.dictValue"
+                             :label="item.dictLabel" :value="item.dictValue"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col v-if="showPharmacy" :span="8">
+              <el-form-item label="药房" prop="yfId">
+                <el-select v-model="model.yfId" placeholder="请选择药房" clearable>
+                  <el-option v-for="item in pharmacyList" :key="dict.id" :label="dict.name" :value="dict.id"
+                             :disabled="item.disabled"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="showPharmacy ? 16 : 24">
+              <el-form-item label-width="3em" label="医嘱" prop="prescription_remark">
+                <el-input v-model="model.prescription_remark" placeholder="请输入医嘱"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="row">
+          <div class="title-container">配送信息</div>
+          <el-row class="form-container" :gutter="8">
+            <el-col :span="8">
+              <el-form-item label="配送方式" prop="expressExecutor">
+                <el-select v-model="model.expressExecutor" placeholder="请选择配送方式" clearable
+                           @change="updateValidator(['consignee', 'contactNumber', 'location', 'address'])">
+                  <el-option v-for="item in expressExecutorOptions" :key="item.label" :label="item.label"
+                             :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="收件人" prop="consignee">
+                <el-input v-model="model.consignee" placeholder="请输入收件人"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="收件电话" prop="contactNumber">
+                <el-input type="tel" v-model="model.contactNumber" placeholder="请输入收件电话" minlength="11"
+                          maxlength="11"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="收件地址" prop="location">
+                <el-cascader v-model="model.location" :options="regionOptions" :props="{ value: 'label' }"
+                             placeholder="请选择省/市/区" clearable></el-cascader>
+              </el-form-item>
+              <el-form-item label-width="4px" prop="address">
+                <el-input v-model="model.address" placeholder="请输入详细地址"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item style="flex-basis: 70%;" label="快递单号" prop="expressCode">
+                <el-input v-model="model.expressCode" placeholder="请输入快递单号"/>
+              </el-form-item>
+              <el-form-item style="flex-basis: 15%;" label-width="4px" label="" prop="expressDech">
+                <el-select v-model="model.expressDech" placeholder="顺丰标快" clearable>
+                  <el-option v-for="item in expressDechOptions" :key="item.dictValue"
+                             :label="item.dictLabel" :value="item.dictValue"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item style="flex-basis: 10%;" label-width="4px" label="" prop="expressPayType">
+                <el-select v-model="model.expressPayType" placeholder="月结" clearable>
+                  <el-option v-for="item in expressPayTypeOptions" :key="item.dictValue"
+                             :label="item.dictLabel" :value="item.dictValue"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="用药时间" prop="expressTime">
+                <el-date-picker v-model="model.expressTime" type="datetime" value-format="yyyy-MM-dd HH:mm"
+                                placeholder="请选择用药时间" clearable></el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="row">
+          <div class="title-container">煎煮信息</div>
+          <el-row class="form-container" :gutter="8">
+            <el-col :span="8">
+              <el-form-item label="是否毒性" prop="decoct_isPoison">
+                <el-select v-model="model.decoct_isPoison" placeholder="请选择" clearable>
+                  <el-option label="是" :value="'1'"></el-option>
+                  <el-option label="否" :value="'0'"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="浸泡水量" prop="steep_soakingWaterValue">
+                <div style="display: flex">
+                  <el-input-number class="full" v-model="model.steep_soakingWaterValue" :controls="false"
+                                   :precision="2" :step="1" :min="0" placeholder="请输入"
+                  ></el-input-number>
+                  <span style="flex: none; margin-left: 4px;">ml</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="浸泡时间" prop="steep_soakingTime">
+                <div style="display: flex">
+                  <el-input-number class="full" v-model="model.steep_soakingTime" :controls="false"
+                                   :precision="2" :step="1" :min="0" placeholder="请输入"
+                  ></el-input-number>
+                  <span style="flex: none; margin-left: 4px;">min</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="煎药方案" prop="decoct_schemeId">
+                <el-select v-model="model.decoct_schemeId" placeholder="请选择煎药方案" clearable
+                           @change="updateJDModel">
+                  <el-option v-for="item in schemeOptions" :key="item.id"
+                             :label="item.schemeName" :value="item.id"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="压力模式" prop="decoct_pressurePattern">
+                <el-select v-model="model.decoct_pressurePattern" placeholder="请选择压力模式" clearable>
+                  <el-option v-for="item in patternOptions" :key="item.dictCode"
+                             :label="item.dictLabel" :value="item.dictValue"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="煎煮时间" prop="decoct_decoctTime">
+                <div style="display: flex">
+                  <el-input-number class="full" v-model="model.decoct_decoctTime" :controls="false"
+                                   :precision="2" :step="1" :min="0"
+                  ></el-input-number>
+                  <span style="flex: none; margin-left: 4px;">min</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="先煎时间" prop="decoct_preDecoctTime">
+                <div style="display: flex">
+                  <el-input-number class="full" v-model="model.decoct_preDecoctTime" :controls="false"
+                                   :precision="2" :step="1" :min="0"
+                  ></el-input-number>
+                  <span style="flex: none; margin-left: 4px;">min</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="一煎时间" prop="decoct_firstDecoctTime">
+                <div style="display: flex">
+                  <el-input-number class="full" v-model="model.decoct_firstDecoctTime" :controls="false"
+                                   :precision="2" :step="1" :min="0"
+                  ></el-input-number>
+                  <span style="flex: none; margin-left: 4px;">min</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="二煎时间" prop="decoct_secondDecoctTime">
+                <div style="display: flex">
+                  <el-input-number class="full" v-model="model.decoct_secondDecoctTime" :controls="false"
+                                   :precision="2" :step="1" :min="0"
+                  ></el-input-number>
+                  <span style="flex: none; margin-left: 4px;">min</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="后下时间" prop="decoct_backDownTime">
+                <div style="display: flex">
+                  <el-input-number class="full" v-model="model.decoct_backDownTime" :controls="false"
+                                   :precision="2" :step="1" :min="0"
+                  ></el-input-number>
+                  <span style="flex: none; margin-left: 4px;">min</span>
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-col>
+      <el-col class="container" :span="12">
+        <div class="area" style="flex: auto;display: flex;flex-direction: column;">
+          <div style="flex: none;display: flex;justify-content: space-between;align-items: center;">
+            <div style="display: flex;align-items: center;">
+              <span style="flex: none">协定方：</span>
+              <el-input></el-input>
+              <el-button style="margin-left: 8px;" type="primary" size="small">添加</el-button>
             </div>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="性别" prop="sex">
-            <el-select v-model="model.sex" placeholder="请选择性别" clearable>
-              <el-option v-for="item in genderOptions" :key="item.label" :label="item.label"
-                         :value="item.value"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="联系电话" prop="recipientTel">
-            <el-input type="tel" v-model="model.recipientTel" placeholder="请输入联系电话" minlength="11"
-                      maxlength="11"/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="6">
-          <el-form-item label="医院处方号" prop="preNo">
-            <el-input v-model="model.preNo" placeholder="请输入医院处方号"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="医疗机构" prop="yljgId">
-            <el-select v-model="model.yljgId" placeholder="请选择医疗机构" clearable>
-              <el-option v-for="item in mechanismOptions" :key="item.code" :value="item.code" :label="item.name"
-                         :disabled="item.disabled"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="药房" prop="yfId">
-            <el-select v-model="model.yfId" placeholder="请选择药房" clearable>
-              <el-option v-for="item in pharmacyList" :key="dict.id" :label="dict.name" :value="dict.id"
-                         :disabled="item.disabled"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="门诊住院" prop="preMzZy">
-            <el-select v-model="model.preMzZy" placeholder="请选择" clearable>
-              <el-option v-for="item in recipeCategoryOptions" :key="item.label" :label="item.label"
-                         :value="item.value"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="就诊科室" prop="department">
-            <el-input v-model="model.department" placeholder="请输入就诊科室"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="病区" prop="inpatientArea">
-            <el-input v-model="model.inpatientArea" placeholder="请输入病区"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="病床" prop="bedNo">
-            <el-input v-model="model.bedNo" placeholder="请输入病床"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="就诊医生" prop="doctor">
-            <el-input v-model="model.doctor" placeholder="请输入就诊医生"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="临床诊断" prop="disName">
-            <el-input v-model="model.disName" placeholder="请输入临床诊断"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="剂数" prop="prescription_number">
-            <el-input-number v-model="model.prescription_number" :min="0" label="请输入剂数"></el-input-number>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="剂型" prop="prescription_dosageForm">
-            <el-select v-model="model.prescription_dosageForm" placeholder="请选择剂型" clearable>
-              <el-option v-for="item in dosageFormOptions" :key="item.dictValue"
-                         :label="item.dictLabel" :value="item.dictValue"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="处方用法" prop="prescription_prescriptionUsage">
-            <el-select v-model="model.prescription_prescriptionUsage" placeholder="请选择处方用法" clearable>
-              <el-option v-for="item in usageOptions" :key="item.dictValue"
-                         :label="item.dictLabel" :value="item.dictValue"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="浓煎量" prop="prescription_concentration">
-            <el-select v-model="model.prescription_concentration" placeholder="请选择浓煎量" clearable>
-              <el-option v-for="item in concentrationOptions" :key="item.dictValue"
-                         :label="item.dictLabel" :value="item.dictValue"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="服药频次" prop="prescription_frequency">
-            <el-select v-model="model.prescription_frequency" placeholder="请选择服药频次" clearable>
-              <el-option v-for="item in frequencyOptions" :key="item.dictValue"
-                         :label="item.dictLabel" :value="item.dictValue"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="服药时间" prop="prescription_medicationTime">
-            <el-select v-model="model.prescription_medicationTime" placeholder="请选择服药时间" clearable>
-              <el-option v-for="item in medicationTimeOptions" :key="item.dictValue"
-                         :label="item.dictLabel" :value="item.dictValue"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="是否代煎" prop="isBehalf">
-            <el-radio-group v-model="model.isBehalf">
-              <el-radio v-for="item in whetherOptions" :key="item.value" :label="item.value">{{ item.label }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="医嘱" prop="prescription_remark">
-            <el-input v-model="model.prescription_remark" placeholder="请输入医嘱"/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="6">
-          <el-form-item label="配送方式" prop="expressExecutor">
-            <el-select v-model="model.expressExecutor" placeholder="请选择配送方式" clearable
-                       @change="updateValidator(['consignee', 'contactNumber', 'location', 'address'])">
-              <el-option v-for="item in expressExecutorOptions" :key="item.label" :label="item.label"
-                         :value="item.value"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="收件人" prop="consignee">
-            <el-input v-model="model.consignee" placeholder="请输入收件人"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="收件电话" prop="contactNumber">
-            <el-input type="tel" v-model="model.contactNumber" placeholder="请输入收件电话" minlength="11"
-                      maxlength="11"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="所属地域" prop="location">
-            <el-cascader v-model="model.location" :options="regionOptions" :props="{ value: 'label' }"
-                         placeholder="请选择省/市/区" clearable></el-cascader>
-          </el-form-item>
-        </el-col>
-        <el-col :span="18">
-          <el-form-item label="收件地址" prop="address">
-            <el-input v-model="model.address" placeholder="请输入详细地址"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="快递单号" prop="expressCode">
-            <el-input v-model="model.expressCode" placeholder="请输入快递单号"/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="6">
-          <el-form-item label="处方金额" prop="prescription_prescriptionSum">
-            <el-input-number v-model="model.prescription_prescriptionSum" :precision="2" :step="1"
-                             :min="0"></el-input-number>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="代煎费用" prop="prescription_daijianCost">
-            <el-input-number v-model="model.prescription_daijianCost" :precision="2" :step="1"
-                             :min="0"></el-input-number>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="配送费用" prop="prescription_distributionCost">
-            <el-input-number v-model="model.prescription_distributionCost" :precision="2" :step="1"
-                             :min="0"></el-input-number>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="总金额" prop="prescription_prescriptionTotleSum">
-            <el-input-number v-model="model.prescription_prescriptionTotleSum" :precision="2" :step="1"
-                             :min="0"></el-input-number>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <el-table :data="medicines" style="width: 100%">
-      <el-table-column label="序号" type="index" width="65" align="center"></el-table-column>
-      <el-table-column label="药品名称" prop="matName" align="center">
-        <template slot-scope="scope">
-          <template v-if="!scope.row.matCode">
-            <v-selectpage :tb-columns="searchTableForSystemColumns"
-                          key-field="drugsId" v-model="scope.row.matCode"
-                          placeholder="请输入药品名称" title="药品"
-                          data="drugsSearchForSystem" :params="{}" :pagination="false"
-                          :result-format="searchMedicinesFormat"
-                          @values="selectMedicine($event, scope.row, scope.$index)"
-            ></v-selectpage>
-          </template>
-          <a v-else>
-            {{ scope.row.matName }}
-            <i class="icon el-icon-circle-close" @click="selectMedicine([], scope.row, scope.$index)"></i>
-          </a>
-        </template>
-      </el-table-column>
-      <el-table-column label="药品规格" prop="drugsSpecsName" align="center"></el-table-column>
-      <el-table-column label="剂量单位" prop="matUnitName" width="110" align="center"></el-table-column>
-      <el-table-column label="药品用法" prop="matUsageName" align="center">
-        <template slot-scope="scope" v-if="scope.row.matCode">
-          <el-input v-model="scope.row.matUsageName" :disabled="saving"
-                    @input="updateMedicine(scope.row, scope.$index)"></el-input>
-        </template>
-      </el-table-column>
-      <el-table-column label="剂量" prop="matDose" align="center">
-        <template slot-scope="scope" v-if="scope.row.matCode">
-          <el-input-number v-model="scope.row.matDose" :min="0" :precision="2" :controls="false"
-                           :disabled="saving"
-                           @change="updateMedicine(scope.row, scope.$index)"></el-input-number>
-        </template>
-      </el-table-column>
-      <el-table-column label="药品单价" prop="matXsj" width="110" align="center"></el-table-column>
-      <el-table-column label="小计" prop="subtotalMoney" width="110" align="center"></el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="80" fixed="right">
-        <template slot-scope="scope">
-          <el-button style="width: 40px;" type="danger" size="mini"
-                     :disabled="Object.keys(scope.row).length === 0 || saving"
-                     @click="deleteMedicine(scope.row, scope.$index)"
-          >删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="el-dialog__footer">
-      <el-button type="primary" :loading="saving" @click="handle">保 存</el-button>
-      <el-button @click="cancel">取 消</el-button>
-    </div>
-  </div>
+            <div>
+              <span>合计 </span>
+              <span style="font-weight: 700;">{{ medicineTotal }}</span>
+              <span> 味药品，总重 </span>
+              <span style="font-weight: 700;">{{ medicineDosageTotal }}</span>
+            </div>
+          </div>
+          <div v-if="tableHeight" style="flex: auto;margin: 12px 0;">
+            <el-table style="width: 100%;" :height="tableHeight" size="mini" :data="medicines"
+                      :span-method="medicinesCellSpan">
+              <el-table-column label="" width="48" align="center" fixed>
+                <template slot-scope="scope">
+                  <el-button type="danger" icon="el-icon-close" circle size="mini"
+                             :disabled="Object.keys(scope.row).length === 0 || saving"
+                             @click="deleteMedicine(scope.row, scope.$index)"
+                  ></el-button>
+                </template>
+              </el-table-column>
+              <el-table-column label="序号" type="index" width="55" align="center" fixed></el-table-column>
+              <el-table-column label="药品名称" prop="matName" min-width="120px" align="center">
+                <template slot-scope="scope">
+                  <template v-if="!scope.row.matCode">
+                    <v-selectpage :tb-columns="searchTableForSystemColumns"
+                                  key-field="drugsId" v-model="scope.row.matCode"
+                                  placeholder="请输入药品名称" title="药品"
+                                  data="drugsSearchForSystem" :params="{}" :pagination="false"
+                                  :result-format="searchMedicinesFormat"
+                                  @values="selectMedicine($event, scope.row, scope.$index)"
+                    ></v-selectpage>
+                  </template>
+                  <a v-else>
+                    {{ scope.row.matName }}
+                    <i class="icon el-icon-circle-close" @click="selectMedicine([], scope.row, scope.$index)"></i>
+                  </a>
+                </template>
+              </el-table-column>
+              <el-table-column label="规格" prop="drugsSpecsName" min-width="110px" align="center"></el-table-column>
+              <el-table-column label="剂量" prop="matDose" width="110px" align="center">
+                <template slot-scope="scope" v-if="scope.row.matCode">
+                  <el-input-number style="width: 100%;" v-model="scope.row.matDose" :min="0" :precision="2"
+                                   :controls="false"
+                                   :disabled="saving" size="mini"
+                                   @change="updateMedicine(scope.row, scope.$index)"></el-input-number>
+                </template>
+              </el-table-column>
+              <el-table-column label="单位" prop="matUnitName" align="center"></el-table-column>
+              <el-table-column label="用法" prop="matUsageName" width="110px" align="center">
+                <template slot-scope="scope" v-if="scope.row.matCode">
+                  <el-input v-model="scope.row.matUsageName" :disabled="saving"
+                            @input="updateMedicine(scope.row, scope.$index)"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="批发价" prop="matPfj" width="110" align="center"></el-table-column>
+              <el-table-column label="零售价" prop="matXsj" width="110" align="center"></el-table-column>
+              <el-table-column label="小计" prop="subtotalMoney" width="110" align="center"></el-table-column>
+            </el-table>
+          </div>
+          <el-row style="flex: none;" :gutter="8">
+            <el-col :span="8" style="text-align: center;">
+              <span>批发费用：</span>
+              <span style="font-weight: 700;">{{ medicineWholesalePriceTotal }}</span>
+            </el-col>
+            <el-col :span="8" style="text-align: center;">
+              <span>零售费用：</span>
+              <span style="font-weight: 700;">{{ medicinePriceTotal }}</span>
+            </el-col>
+            <el-col :span="8" style="text-align: center;">
+              <span>含税金额：</span>
+              <span style="font-weight: 700;">{{ medicineWholesalePriceTotal }}</span>
+            </el-col>
+          </el-row>
+        </div>
+
+
+        <el-input v-if="isCheck" style="margin-top: 12px;" v-model="model.remarks" type="textarea"
+                  placeholder="若审核拒绝，请输入原因"
+                  :autosize="{ minRows: 2, maxRows: 2}">
+        </el-input>
+        <div class="footer">
+          <div>
+            <template v-if="isCheck">
+              <div v-if="model.remarks">
+                <el-button type="danger" @click="model.remarks && check('120')" :disabled="saving">审核拒绝</el-button>
+              </div>
+              <el-popconfirm v-else title="不通过理由未输入，确定现在提交？" icon="el-icon-info" icon-color="red"
+                             @confirm="check('120')">
+                <template slot="reference">
+                  <el-button type="danger" :disabled="saving">审核拒绝</el-button>
+                </template>
+              </el-popconfirm>
+            </template>
+          </div>
+          <div>
+            <el-button v-if="isCheck" type="primary" @click="check('110')" :disabled="saving">审核通过</el-button>
+            <el-button v-else type="primary" :loading="saving" @click="handle">保 存</el-button>
+            <el-button @click="cancel">取 消</el-button>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+  </el-form>
 </template>
 
 <style scoped lang="scss">
-.el-input, .el-select, .el-cascader {
+.wrapper {
+  display: flex;
+  height: 100%;
+  overflow: hidden;
+
+  .container {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+
+    &:first-of-type {
+      overflow: auto;
+      //justify-content: space-between;
+    }
+  }
+
+
+  .row {
+    display: flex;
+    margin: 12px 0;
+
+    &:first-of-type {
+      margin-top: 0;
+    }
+
+    &:last-of-type {
+      margin-bottom: 0;
+    }
+
+    .title-container {
+      flex: none;
+      display: flex;
+      align-items: center;
+      padding: 12px 6px;
+      width: 2.8em;
+      color: #fff;
+      font-weight: 700;
+      letter-spacing: 0.3em;
+      line-height: 1.5em;
+      text-align: right;
+      box-sizing: content-box;
+      background-color: #1DBFA7;
+    }
+
+    .form-container {
+      flex: auto;
+      padding: 12px 12px 0;
+      background-color: #5AD8A6;
+
+      .el-col {
+        display: flex;
+
+        > .el-form-item {
+          flex: 1 0 50%;
+          width: 100%;
+        }
+      }
+
+      .el-form-item {
+        margin-bottom: 12px;
+
+        ::v-deep {
+          .el-form-item__label {
+            color: #000;
+            padding-right: 6px;
+          }
+
+          .el-input__inner {
+            padding-left: 6px;
+            padding-right: 24px;
+          }
+        }
+
+        .el-date-editor ::v-deep {
+          .el-input__inner {
+            padding-left: 28px;
+          }
+        }
+      }
+    }
+  }
+
+  .area {
+    padding: 12px 6px;
+    color: #000;
+    background-color: #5AD8A6;
+  }
+
+  .el-table {
+    ::v-deep {
+      th {
+        color: #000;
+        background-color: #1DBFA7;
+      }
+
+      tr {
+        color: #000;
+        background-color: #D9EEE5;
+      }
+    }
+  }
+}
+
+.el-input-number--medium:not(.full) {
+  width: min-content;
+  min-width: 100px;
+}
+
+.el-form, .el-input, .el-select, .el-cascader {
   width: 100%;
 }
+
+.footer {
+  flex: none;
+  margin-top: 12px;
+  display: flex;
+  justify-content: space-between;
+}
+</style>
+<style lang="scss">
+.el-dialog {
+  &.prescription-core-edit-container {
+    overflow: hidden;
+  }
+
+  &__header {
+    flex: none;
+    padding: 12px 12px 0;
+  }
+
+  &__body {
+    flex: auto;
+    padding: 12px;
+
+    > * {
+      height: 100%;
+    }
+  }
+}
 </style>

src/views/rescription/prescriptionCore/index.vue

@@ -142,7 +142,7 @@
               >搜索</el-button
             >
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            <el-button icon="el-icon-circle-plus-outline" v-hasPermi="['rescription:prescriptionCore:add']" size="mini" @click="recipeEditOpen = true;">新增处方</el-button>
+            <el-button icon="el-icon-circle-plus-outline" v-hasPermi="['rescription:prescriptionCore:add']" size="mini" @click="handleUpdate(2, {})">新增处方</el-button>
           </el-form-item>
         </div>
       </div>
@@ -158,58 +158,30 @@
     >
       <el-table-column type="index" width="55" align="center" label="序号" />
       <el-table-column label="处方号" align="center" prop="preNo" />
-      <el-table-column
-        label="医疗机构"
-        align="center"
-        prop="yijgName"
-        show-overflow-tooltip
-      />
-      <el-table-column label="门诊/住院" align="center" prop="preMzZy">
-        <template slot-scope="scope">{{
-          scope.row.preMzZy == 1 ? "门诊" : "住院"
-        }}</template>
-      </el-table-column>
+      <el-table-column label="医疗机构" align="center" prop="yijgName" show-overflow-tooltip/>
+      <el-table-column label="就诊科室" align="center" prop="department" show-overflow-tooltip/>
+      <el-table-column label="开方医生" align="center" prop="doctor" />
       <el-table-column label="患者姓名" align="center" prop="name" />
       <el-table-column label="性别" align="center" prop="sex" />
-      <el-table-column label="临床诊断" align="center" prop="symName">
-        <template slot-scope="scope"
-          >{{ scope.row.disName }}
-          <!-- -{{ scope.row.symName }} -->
+      <el-table-column label="审核状态" align="center" prop="checkState">
+        <template slot-scope="scope">
+          {{ {0: '待审核', 1: '审核通过', 2: '审核未通过',}[scope.row.checkState] }}
         </template>
       </el-table-column>
-      <el-table-column label="开方医生" align="center" prop="doctor" />
-      <!-- <el-table-column label="处方名称" align="center" prop="preName" /> -->
-      <el-table-column label="处方类型" align="center">
+      <el-table-column label="是否代煎" align="center" prop="isBehalf">
         <template slot-scope="scope">
-          {{ scope.row.type == 1 ? "中药处方" : "中药制剂" }}
+          {{ {0: '否', 1: '是'}[scope.row.isBehalf] }}
         </template>
       </el-table-column>
-      <el-table-column label="开方时间" align="center" prop="prescriptionTime">
+      <el-table-column label="配送方式" align="center" prop="expressExecutor" />
+      <el-table-column label="收件地址" align="center" prop="address" show-overflow-tooltip/>
+      <el-table-column label="门诊/住院" align="center" prop="preMzZy">
+        <template slot-scope="scope">{{
+          scope.row.preMzZy == 1 ? "门诊" : "住院"
+        }}</template>
       </el-table-column>
-
-      <!-- <el-table-column label="三方状态" align="center" width="78" prop="thirdPartState">
-        <template slot-scope="scope">
-          {{
-            scope.row.thirdPartState == "1"
-              ? "已分配"
-              : scope.row.thirdPartState == "2"
-                ? "已传送"
-                  : ""
-          }}
-        </template>
-      </el-table-column> -->
-
       <el-table-column label="审核人" align="center" prop="checkBy" />
       <el-table-column label="审核时间" align="center" prop="checkTime" />
-
-      <el-table-column label="开方医生备注" align="center" prop="extendedTxt" />
-      <el-table-column
-        label="药师备注"
-        align="center"
-        prop="pharmacistsremarks"
-      />
-      <!--      <el-table-column label="打印次数" align="center" prop="num" />  -->
-
       <el-table-column
         label="操作"
         align="center"
@@ -1303,8 +1275,10 @@
       </div>
     </el-dialog>
 
-    <el-dialog :fullscreen="true" title="新增处方" :visible.sync="recipeEditOpen" width="1180px" append-to-body size="mini" destroy-on-close>
-      <edit @close="recipeEditOpen = false;$event && getList()"></edit>
+    <el-dialog :fullscreen="true" :title="recipeEditId ? '处方审核查看' :　'新增处方'" :visible.sync="recipeEditOpen"
+               custom-class="prescription-core-edit-container" width="1180px" size="mini"
+               append-to-body destroy-on-close @closed="recipeEditId = null;recipeEditShow = false">
+      <edit v-if="recipeEditShow" :id="recipeEditId" :mode="recipeEditId ? 'check' : 'edit'" @close="recipeEditOpen = false;$event && getList()"></edit>
     </el-dialog>
 
     <el-dialog title="打印预览" :visible.sync="showPrint" @closed="showPrintId = ''">
@@ -1373,7 +1347,9 @@ export default {
   data() {
     const now = dayjs().format("YYYY-MM-DD");
     return {
+      recipeEditId: null,
       recipeEditOpen: false,
+      recipeEditShow: false,
 
       curPreNo: "",
       curName: "",
@@ -2043,6 +2019,12 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(num, row) {
+      if (num === 2) {
+        this.recipeEditId = row.id;
+        this.recipeEditShow = true;
+        this.recipeEditOpen = true;
+        return;
+      }
       this.reset();
       const id = row.id || this.ids;
       this.btnState = num;