草药医嘱添加中药煎法

src/pages/entryWrite/page/Entry/prescription/addPrescription/customDiagnostics/grass/grass.vue

@@ -72,7 +72,20 @@
                         </view>
                     </mp-cell>
                 </picker>
-                <picker @change="bindPickerChange5" :value="cookType1" :range="cookType" range-key="descripts">
+                <picker @change="bindPickerChange5" :value="decoctMethod1" :range="decoctMethod" range-key="descripts">
+                    <mp-cell class="diag-form__cell">
+                        <view class="diag-form__line">
+                            <view class="diag-form__label diag-form__label--required">
+                                中药煎法
+                                <view class="redIcon" v-if="!(verification === 'N' || (decoctMethod && decoctMethod[decoctMethod1] && decoctMethod[decoctMethod1].descripts))">
+                                    <van-icon name="warning" color="red" />
+                                </view>
+                            </view>
+                            <view class="diag-form__picker">{{ (decoctMethod && decoctMethod[decoctMethod1] && decoctMethod[decoctMethod1].descripts) || '请选择' }}</view>
+                        </view>
+                    </mp-cell>
+                </picker>
+                <picker @change="bindPickerChange6" :value="cookType1" :range="cookType" range-key="descripts">
                     <mp-cell class="diag-form__cell">
                         <view class="diag-form__line">
                             <view class="diag-form__label">
@@ -85,7 +98,7 @@
                         </view>
                     </mp-cell>
                 </picker>
-                <picker @change="bindPickerChange6" :value="usageExplain1" :range="usageExplain" range-key="descripts">
+                <picker @change="bindPickerChange7" :value="usageExplain1" :range="usageExplain" range-key="descripts">
                     <mp-cell class="diag-form__cell">
                         <view class="diag-form__line">
                             <view class="diag-form__label diag-form__label--required">
@@ -98,7 +111,7 @@
                         </view>
                     </mp-cell>
                 </picker>
-                <picker @change="bindPickerChange7" :value="recLoc1" :range="recLoc" range-key="descripts">
+                <picker @change="bindPickerChange8" :value="recLoc1" :range="recLoc" range-key="descripts">
                     <mp-cell class="diag-form__cell">
                         <view class="diag-form__line">
                             <view class="diag-form__label diag-form__label--required">
@@ -204,6 +217,11 @@ export default {
             usage: [],
 
             //用法
+            decoctMethod1: '',
+
+            decoctMethod: [],
+
+            //中药煎法
             cookType1: '',
 
             cookType: [],
@@ -394,6 +412,7 @@ export default {
                     selectIndex1: this.picakIndex('id', editData.selectData1.id, this.selectData1),
                     frequence1: this.picakIndex('id', editData.frequence.id, this.frequence),
                     usage1: this.picakIndex('id', editData.usage.id, this.usage),
+                    decoctMethod1: this.picakIndex('id', editData.decoctMethod.id, this.decoctMethod),
                     cookType1: this.picakIndex('id', editData.cookType.id, this.cookType),
                     usageExplain1: this.picakIndex('id', editData.usageExplain.id, this.usageExplain),
                     recLoc1: this.picakIndex('id', editData.recLoc.id, this.recLoc),
@@ -505,6 +524,8 @@ export default {
                                 //剂型
                                 usage: res.result.usage || [],
                                 //用法
+                                decoctMethod: res.result.decoctMethod || [],
+                                //中药煎法
                                 cookType: res.result.cookType || [],
                                 //煎药方式
                                 usageExplain: res.result.usageExplain || [],
@@ -516,6 +537,8 @@ export default {
                                 // 默认值
                                 usageExplain1: this.picakIndex('id', res.result.defaultUsageExplainID, res.result.usageExplain),
                                 //默认服用要求
+                                decoctMethod1: this.picakIndex('id', res.result.defaultDecoctMethodID, res.result.decoctMethod),
+                                //默认中药煎法
                                 cookType1: this.picakIndex('id', res.result.defaultCookTypeID, res.result.cookType),
                                 //默认煎药方式
                                 stepper: res.result.defaultDurQty,
@@ -656,8 +679,15 @@ export default {
             });
         },
 
-        // 煎药方式
+        // 中药煎法
         bindPickerChange5: function (e) {
+            this.setData({
+                decoctMethod1: e.detail.value
+            });
+        },
+
+        // 煎药方式
+        bindPickerChange6: function (e) {
             this.setData(
                 {
                     cookType1: e.detail.value
@@ -694,7 +724,7 @@ export default {
                             }
                         });
                         // 修复：切换煎药方式后如果接口没有返回默认科室（defaultFlag='Y'），
-                        // locaID 为空会导致 recLoc1 为 ''，执行科室看起来“没数据”。
+                        // locaID 为空会导致 recLoc1 为 ''，执行科室看起来”没数据”。
                         // 兜底：无默认科室时默认选中第一个有效科室，并保证 recLoc1 有效索引。
                         let recLoc1 = this.picakIndex('id', locaID, newRecLoc);
                         if ((recLoc1 === '' || recLoc1 === false || recLoc1 === undefined || recLoc1 === null) && newRecLoc.length > 0) {
@@ -730,14 +760,14 @@ export default {
         },
 
         // 服用要求
-        bindPickerChange6: function (e) {
+        bindPickerChange7: function (e) {
             this.setData({
                 usageExplain1: e.detail.value
             });
         },
 
         // 执行科室
-        bindPickerChange7: function (e) {
+        bindPickerChange8: function (e) {
             this.setData(
                 {
                     recLoc1: e.detail.value
@@ -875,6 +905,7 @@ export default {
                 frequence1: '',
                 herbalForm1: '',
                 usage1: '',
+                decoctMethod1: '',
                 cookType1: '',
                 usageExplain1: '',
                 recLoc1: '',
@@ -902,6 +933,9 @@ export default {
                 usage1,
                 usage,
                 //用法
+                decoctMethod1,
+                decoctMethod,
+                //中药煎法
                 cookType1,
                 cookType,
                 //煎药方式
@@ -926,6 +960,8 @@ export default {
                 //剂型
                 usage: usage[usage1] || {},
                 //用法
+                decoctMethod: decoctMethod[decoctMethod1] || {},
+                //中药煎法
                 cookType: cookType[cookType1] || {},
                 //煎药方式
                 usageExplain: usageExplain[usageExplain1] || {},
@@ -968,6 +1004,10 @@ export default {
                     message: '用法不能为空',
                     value: obj.usage
                 },
+                {
+                    message: '中药煎法不能为空',
+                    value: obj.decoctMethod
+                },
                 {
                     message: '服用要求不能为空',
                     value: obj.usageExplain
@@ -1037,6 +1077,7 @@ export default {
                             freqID: obj.frequence.id || '', // 频次
                             doseQty: obj.sum || '', // 每次数量
                             usageID: obj.usage.id || '', // 用药方法
+                            decoctMethodID: obj.decoctMethod.id || '', // 中药煎法
                             usageExplainID: obj.usageExplain.id || '', //  服用要求
                             recLocID: obj.recLoc.id || '', // 执行科室
                             herbalFormID: obj.herbalForm.id || '', // 使用剂型