Merge branch 'taskID-261-02' of ssh://121.43.162.141:10022/six.fe/diagnosis.admin into taskID-261-03

# Conflicts:
#	src/views/business/components/AcupointTable.vue

src/views/business/components/AcupointTable.vue

@@ -119,8 +119,8 @@
             :disabled="isLocked"
             @change="onDetailTypesChange"
           >
-            <el-checkbox label="穴位">穴位</el-checkbox>
             <el-checkbox label="经络">经络</el-checkbox>
+            <el-checkbox label="穴位">穴位</el-checkbox>
             <el-checkbox label="耳穴">耳穴</el-checkbox>
             <el-checkbox label="部位">部位</el-checkbox>
             <el-checkbox label="其他详情">其他详情</el-checkbox>
@@ -743,6 +743,8 @@ export default {
   data() {
     return {
       name: "适宜技术处方",
+      // 是否自拟处方
+      isMyMade: true,
       // 配穴相关
       acupointList: [],
       meridianList: [],
@@ -806,7 +808,7 @@ export default {
       return this.useIsUpdateLock && this.innerIsEditable === "0";
     },
     activeDetailTypes() {
-      const validTypes = ["穴位", "经络", "耳穴", "部位", "其他详情"];
+      const validTypes = ["经络", "穴位", "耳穴", "部位", "其他详情"];
       return validTypes.filter((t) => this.innerDetailTypes.includes(t));
     },
     currentPricingUnit() {
@@ -839,6 +841,9 @@ export default {
         .map((v) => CUMULATIVE_MAP[v.trim()])
         .filter(Boolean);
     },
+    saveable() {
+      return this.prescriptions && this.prescriptions.length > 0;
+    },
     // 当前激活项目
     activeProject() {
       return this.prescriptions[this.activeIndex] || null;

src/views/diagnosis/Prescribing.vue

@@ -2747,7 +2747,7 @@ export default {
 
       let zhongPrescriptionVo = [];
       let chengPrescriptionVo = {};
-      let technologyPrescriptionVo = {};
+      let technologyPrescriptionVo = [];
 
       const selected = this.contentTabs[this.container_i];
       const tabs = this.contentTabs.filter(tab => tab.check && tab.id !== selected.id)

src/views/diagnosis/components/submitRecipe.vue

@@ -569,7 +569,7 @@ export default {
       }
 
       if (type == 3) {
-        technology = {};
+        technology = [];
       }
 
       sessionStorage.setItem(