1111

src/api/project/project.js

@@ -199,6 +199,17 @@ export function DeleteProject(id,params){
   })
 }
 
+export function DeleteDrug(id,params){
+
+  return request({
+    url:"/api/his/deletedrug?id="+id,
+    methods:"Get",
+    params:params
+  })
+}
+
+
+
 
 export function getHisProject(params){
 
@@ -553,18 +564,18 @@ export function getAllGoodInfoList(params){
 
 
 export function saveGoodList(params,data){
-  
+
   return request({
     url:"/api/savegoodlist",
     method:"post",
     params:params,
     data:data,
-   
+
   })
 }
 
 export function getGoodList(params){
- 
+
   return request({
     url:"/api/getgoodlist",
     method:"get",
@@ -574,7 +585,7 @@ export function getGoodList(params){
 
 
 export function getGoodNameDetail(id,params){
-  
+
   return request({
     url:"/api/getgoodnamedetail?id="+id,
     method:"get",
@@ -589,12 +600,12 @@ export function updateGoodList(params,data){
     method:"post",
     params:params,
     data:data,
-   
+
   })
 }
 
 export function DeleteGoodTeam(id,params){
- 
+
   return  request({
     url:"/api/deletegoodteam?id="+id,
     method:"Get",
@@ -603,10 +614,10 @@ export function DeleteGoodTeam(id,params){
 }
 
 export function DeleteGood(id,params){
- 
+
   return request({
     url:"/api/deletegood?id="+id,
     method:"get",
     params:params
   })
-}
+}

src/store/modules/globalConfig.js

@@ -68300,7 +68300,7 @@ const global_config = {
         id: 4,
         name: '丧偶'
       }
-      
+
     ],
     reimbursement_ways: [ // 报销方式
       {

src/xt_pages/data/components/addInspection.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :title="formTitle"
-    width="900px"
+    width="1200px"
     :visible.sync="visible"
     :before-close="_close"
   >
@@ -101,31 +101,98 @@
             filterable
             placeholder="请选择"
             @change="changeProject"
-            
+
           >
             <el-option
               v-for="item in projectList"
               :key="item.new_id"
-              :label="item.project_name"
+              :label="item.type == 1 ?item.drug_name :item.project_name"
               :value="item.new_id"
             >
             </el-option>
           </el-select>
         </el-form-item>
 
-        <el-form-item label="数量" style="width: 50%">
-          <div style="display: flex">
-            <el-input
-              v-model="form.number"
-              style="margin-right: 10px"
-            ></el-input>
+<!--        <el-form-item label="数量" style="width: 50%">-->
+<!--          <div style="display: flex">-->
+<!--            <el-input-->
+<!--              v-model="form.number"-->
+<!--              style="margin-right: 10px"-->
+<!--            ></el-input>-->
             <el-button type="primary" @click="addProjectList">添加</el-button>
-          </div>
-        </el-form-item>
+<!--          </div>-->
+<!--        </el-form-item>-->
       </el-form>
       <el-form>
+<!--        <el-table-->
+<!--          :data="tableData"-->
+<!--          max-height="300"-->
+<!--          border-->
+<!--          style="100%"-->
+<!--          :row-style="{ color: '#303133' }"-->
+<!--          :header-cell-style="{-->
+<!--            backgroundColor: 'rgb(245, 247, 250)',-->
+<!--            color: '#606266',-->
+<!--          }"-->
+<!--          highlight-current-row-->
+<!--          ref="tab"-->
+<!--        >-->
+<!--          <el-table-column align="center" prop="name" label="分类" width="120">-->
+<!--            <template slot-scope="scope">-->
+<!--              <div>-->
+<!--                {{-->
+<!--                  scope.row.type == 2-->
+<!--                    ? getId(scope.row.statistical_classification)-->
+<!--                    : "耗材"-->
+<!--                }}-->
+<!--              </div>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            align="center"-->
+<!--            prop="name"-->
+<!--            label="组套明细"-->
+<!--            width="120"-->
+<!--          >-->
+<!--            <template slot-scope="scope">{{ scope.row.project_name }}</template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column align="center" prop="name" label="数量" width="120">-->
+<!--            <template slot-scope="scope">{{ scope.row.number }}</template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column align="center" prop="name" label="单位" width="120">-->
+<!--            <template slot-scope="scope">-->
+<!--              <div v-if="scope.row.type == 2">{{ scope.row.unit }}</div>-->
+<!--              <div v-if="scope.row.type == 3">-->
+<!--               {{ scope.row.unit }}-->
+<!--              </div>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column align="center" prop="name" label="单价" width="120">-->
+<!--            <template slot-scope="scope">{{ scope.row.price }}</template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column align="center" prop="name" label="操作" >-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-tooltip-->
+<!--                class="item"-->
+<!--                effect="dark"-->
+<!--                content="删除"-->
+<!--                placement="top"-->
+<!--              >-->
+<!--                <el-button-->
+<!--                  type="danger"-->
+<!--                  icon="el-icon-delete"-->
+<!--                  size="small"-->
+<!--                  @click="DeleteProject(scope.row.id, scope.$index,scope.row.type)"-->
+<!--                ></el-button>-->
+<!--              </el-tooltip>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--        </el-table>-->
+
+
         <el-table
-          :data="tableData"
+          :data="drug_tableData"
+          max-height="300"
           border
           style="100%"
           :row-style="{ color: '#303133' }"
@@ -136,40 +203,149 @@
           highlight-current-row
           ref="tab"
         >
-          <el-table-column align="center" prop="name" label="分类" width="120">
+          <el-table-column align="center"  label="名称" fixed>
+            <template slot-scope="scope"><span>{{ scope.row.type == 1?scope.row.drug_name: scope.row.project_name}}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" prop="drug_name" width="100" label="规格">
             <template slot-scope="scope">
-              <div>
-                {{
-                  scope.row.type == 2
-                    ? getId(scope.row.statistical_classification)
-                    : "耗材"
-                }}
-              </div>
+                  <span v-if="scope.row.type == 1">
+                    {{ scope.row.dose }}{{ scope.row.dose_unit }}*{{ scope.row.min_number }}{{ scope.row.min_unit }}/{{ scope.row.max_unit }}
+                  </span>
+                <span v-if="scope.row.type == 2">
+                    {{ "次" }}
+
+                  </span>
+              <span v-if="scope.row.type == 3">
+                    {{ scope.row.specification_name }}
+                  </span>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="name"
-            label="组套明细"
-            width="120"
-          >
-            <template slot-scope="scope">{{ scope.row.project_name }}</template>
+          <el-table-column align="center" prop="single_dose" width="180" label="单次用量">
+            <template slot-scope="scope">
+              <div style="display:flex;align-items:center;" v-if="scope.row.type == 1">
+                <el-input  v-model="scope.row.single_dose" @input="getAllChangeTwo(scope)"
+                          style="width:50%;"></el-input>
+                <!-- <div>{{scope.row.single_dose_unit}}</div> -->
+                <el-select v-model="scope.row.single_dose_unit" placeholder="请选择" style="width:50%;"
+                           @change="getAllChangeTwo(scope)"  >
+                  <el-option :label="scope.row.min_unit" :value="scope.row.min_unit"></el-option>
+                  <el-option :label="scope.row.min_unit" :value="scope.row.min_unit"></el-option>
+
+                  <el-option :label="scope.row.dose_unit"
+                             v-if="scope.row.dose_unit != scope.row.min_unit"
+                             :value="scope.row.dose_unit"></el-option>
+                </el-select>
+              </div>
+              <span v-if="scope.row.type == 2">
+                  </span>
+              <span v-if="scope.row.type == 3">
+                  </span>
+            </template>
           </el-table-column>
-          <el-table-column align="center" prop="name" label="数量" width="120">
-            <template slot-scope="scope">{{ scope.row.number }}</template>
+          <el-table-column align="center" prop="delivery_way" width="100" label="用法">
+            <template slot-scope="scope">
+              <div v-if="scope.row.type == 1">
+              <el-select v-model="scope.row.delivery_way" placeholder="请选择">
+                <el-option
+                  v-for="(item,index) in drugways"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.name">
+                </el-option>
+              </el-select>
+              </div>
+              <div v-if="scope.row.type == 2">
+
+              </div>
+              <div v-if="scope.row.type == 3">
+
+              </div>
+            </template>
           </el-table-column>
-          <el-table-column align="center" prop="name" label="单位" width="120">
+          <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
             <template slot-scope="scope">
-              <div v-if="scope.row.type == 2">{{ scope.row.unit }}</div>
+              <div v-if="scope.row.type == 1">
+              <el-select  v-model="scope.row.execution_frequency" placeholder="请选择" @change="getAllChangeTwo(scope)">
+                <el-option
+                  v-for="item,index in efs"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.name">
+                </el-option>
+              </el-select>
+              </div>
+              <div v-if="scope.row.type == 2">
+
+              </div>
               <div v-if="scope.row.type == 3">
-               {{ scope.row.unit }}
+
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="name" label="单价" width="120">
-            <template slot-scope="scope">{{ scope.row.price }}</template>
+
+          <el-table-column align="center" prop="day" width="100" label="天数">
+            <template slot-scope="scope">
+              <div style="display:flex;align-items:center;" v-if="scope.row.type == 1">
+                <el-input  v-model="scope.row.day" @input="getAllChangeTwo(scope)" placeholder=""></el-input>
+                {{'天'}}
+              </div>
+              <div style="display:flex;align-items:center;" v-if="scope.row.type == 2">
+<!--                {{'1天'}}-->
+              </div>
+              <div style="display:flex;align-items:center;" v-if="scope.row.type == 3">
+<!--                {{'1天'}}-->
+              </div>
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" prop="prescribing_number" width="150" label="总量">
+            <template slot-scope="scope">
+              <div style="display:flex;align-items:center;" v-if="scope.row.type == 1">
+                <el-input v-model="scope.row.prescribing_number"
+                          style="width:50%" placeholder=""></el-input>
+                <!-- <div> {{scope.row.prescribing_number_unit}}</div> -->
+                <el-select v-model="scope.row.prescribing_number_unit" placeholder="请选择" style="width:50%;"
+                           @change="getPrescribingNumberUnit(scope)">
+                  <el-option :label="scope.row.min_unit" :value="scope.row.min_unit"></el-option>
+                  <el-option :label="scope.row.max_unit"
+                             v-if="scope.row.min_unit != scope.row.max_unit"
+                             :value="scope.row.max_unit"></el-option>
+                </el-select>
+              </div>
+              <div style="display:flex;align-items:center;" v-if="scope.row.type == 2">
+                <el-input v-model="scope.row.prescribing_number"
+                          style="width:50%" placeholder=""></el-input>
+                <div>{{scope.row.unit }}</div>
+              </div>
+              <div style="display:flex;align-items:center;" v-if="scope.row.type == 3">
+                <el-input v-model="scope.row.prescribing_number"
+                          style="width:50%" placeholder=""></el-input>
+                <div>{{scope.row.unit }}</div>
+              </div>
+            </template>
           </el-table-column>
-          <el-table-column align="center" prop="name" label="操作">
+          <el-table-column align="center" prop="retail_price" width="100" label="单价">
+            <template slot-scope="scope">
+              <div style="display:flex;align-items:center;" v-if="scope.row.type == 1">
+                <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
+                <div>{{'元'}}</div>
+              </div>
+
+              <div style="display:flex;align-items:center;" v-if="scope.row.type == 2">
+                <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
+                <div>{{'元'}}</div>
+<!--                <div>{{scope.row.price }}</div>-->
+              </div>
+              <div style="display:flex;align-items:center;" v-if="scope.row.type == 3">
+                <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
+                <div>{{'元'}}</div>
+              </div>
+
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="name" label="操作" >
             <template slot-scope="scope">
               <el-tooltip
                 class="item"
@@ -181,12 +357,13 @@
                   type="danger"
                   icon="el-icon-delete"
                   size="small"
-                  @click="DeleteProject(scope.row.id, scope.$index)"
+                  @click="DeleteProject(scope.row.id, scope.$index,scope.row.type)"
                 ></el-button>
               </el-tooltip>
             </template>
           </el-table-column>
         </el-table>
+
       </el-form>
     </div>
 
@@ -207,11 +384,14 @@ import {
   saveProjectTeam,
 } from "@/api/project/project";
 
-import { saveTeam } from "@/api/his/his";
+
+import { getInitData,saveTeam } from "@/api/his/his";
 
 export default {
   data() {
     return {
+      drugways: [],
+      efs: [],
       project_name: "",
       visible: false,
       formTitle: "",
@@ -244,12 +424,127 @@ export default {
         //team_type: [{ required: true, message: '请填写组套类型', trigger: 'change' }]
       },
       tableData: [],
+      drug_tableData: [],
+
       projectList: [],
+      drugList: [],
+      changeObj:{},
       tabList: [],
       itemList: [],
     };
   },
   methods: {
+    // getNum(execution_frequency) {
+    //   let arr = [
+    //     { name: '立即执行', count: 1 },
+    //     { name: '透析时', count: 1 },
+    //     { name: '透析1h一次', count: 1 },
+    //     { name: '透析2h一次', count: 1 },
+    //     { name: '透析3h一次', count: 1 },
+    //     { name: '每日一次', count: 12 },
+    //     { name: '每日两次', count: 6 },
+    //     { name: '每日三次', count: 4 },
+    //     { name: '每晚一次', count: 1 },
+    //     { name: '每晚', count: 1 },
+    //     { name: '上机前', count: 1 },
+    //     { name: '下机前', count: 1 },
+    //     { name: '透析后立即', count: 1 },
+    //     { name: '持续使用', count: 1 },
+    //     { name: '临时开药', count: 1 },
+    //     { name: '临睡前', count: 1 },
+    //     { name: '隔日一次', count: 1 },
+    //     { name: '隔三日一次', count: 1 },
+    //     { name: '每二小时一次', count: 12 },
+    //     { name: '每四小时一次', count: 6 },
+    //     { name: '每六小时一次', count: 4 },
+    //     { name: '每八小时一次', count: 3 }
+    //   ]
+    //   let num = ''
+    //   arr.map(item => {
+    //     if (item.name == execution_frequency) {
+    //       num = item.count
+    //     }
+    //   })
+    //   if (num == '') {
+    //     num = 1
+    //   }
+    //   return num
+    // },
+
+    getAllChange(scope) {
+      if(this.$store.getters.xt_user.org_id != 10206) {
+        if (scope.row.min_unit == scope.row.single_dose_unit) {
+          if (scope.row.prescribing_number_unit == scope.row.min_unit) {
+            console.log(1)
+            scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
+          } else {
+            console.log(12)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1)) * (scope.row.day ? scope.row.day : 1) / scope.row.min_number)
+          }
+        } else {
+          if (scope.row.prescribing_number_unit == scope.row.min_unit) {
+            console.log(123)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.dose)
+          } else {
+            console.log(1234)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.dose / scope.row.min_number)
+          }
+        }
+        if (scope.row.prescribing_number == 0) {
+          scope.row.prescribing_number = 1
+        }
+
+      }
+
+    },
+    getInitData() {
+      getInitData().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.drugways = response.data.data.drugways
+          this.efs = response.data.data.efs
+
+        }
+      })
+
+    },
+    getAllChangeTwo(scope) {
+      if(this.$store.getters.xt_user.org_id != 10206) {
+        console.log('yyyyyyyy',scope);
+        if (scope.row.min_unit == scope.row.single_dose_unit) {
+          if (scope.row.prescribing_number_unit == scope.row.min_unit) {
+            console.log(1)
+            scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
+          } else {
+            console.log(12)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1)) * (scope.row.day ? scope.row.day : 1) / scope.row.min_number)
+          }
+        } else {
+          if (scope.row.prescribing_number_unit == scope.row.min_unit) {
+            console.log('123',scope.row.dose,scope.row.execution_frequency,scope.row.min_unit)
+            // 单次用量single_dose，用量单位single_dose_unit，用法delivery_way，频率execution_frequency 总量prescribing_number，规格drug.dose
+            scope.row.prescribing_number = Math.ceil((parseInt(scope.row.single_dose) * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / parseInt(this.getdrugdose(scope.row.dose)) ) //  / scope.row.drug.dose
+          } else {
+            console.log(1234,scope.row.dose)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / (scope.row.dose*1) / (scope.row.min_number*1))//
+          }
+        }
+        if (scope.row.prescribing_number == 0) {
+          scope.row.prescribing_number = 1
+        }
+      }
+    },
+    getPrescribingNumberUnit(scope) {
+      if (scope.row.prescribing_number_unit == scope.row.min_unit) {
+        scope.row.retail_price = scope.row.drug.min_price
+      } else {
+        scope.row.retail_price = scope.row.drug.retail_price
+      }
+      console.log(scope.row)
+
+    },
     getUnit(id) {
       var arr = getDataConfig("hemodialysis", "units");
       for (let i = 0; i < arr.length; i++) {
@@ -259,6 +554,7 @@ export default {
       }
     },
     changeProject(val) {
+      this.changeObj = val
       this.form.number = 1;
     },
     querySearch(queryString, cb) {
@@ -279,7 +575,7 @@ export default {
       };
     },
     handleSelect(val) {
-     
+
       this.project_name = val.project_name;
       this.form.project_detail = val.id;
     },
@@ -297,8 +593,10 @@ export default {
       this.form.name = "";
       this.form.intro = "";
     },
-    show(id) {
+    show() {
       this.visible = true;
+      this.drug_tableData = []
+      this.tableData = []
       this.formTitle = "新增";
     },
     hide() {
@@ -316,13 +614,29 @@ export default {
           remark: this.form.remark,
           sort:parseInt(this.form.sort),
         };
+        this.tableData = []
+        this.drug_tableDatas = []
+
+
+        for(let i = 0;i < this.drug_tableData.length;i++){
+          if(this.drug_tableData[i].type != 1){
+            this.tableData.push(this.drug_tableData[i])
+          }
+        }
+
+        for(let i = 0;i < this.drug_tableData.length;i++){
+          if(this.drug_tableData[i].type == 1){
+            this.drug_tableDatas.push(this.drug_tableData[i])
+          }
+        }
         let data = {
           info: this.tableData,
+          drug_info:this.drug_tableDatas
         };
         saveTeam(data, params).then((response) => {
           if (response.data.state == 1) {
             var projectTeam = response.data.data.projectTeam;
-           
+
             this.$message.success("保存成功");
             this.visible = false;
             this.form.project_team = "",
@@ -350,16 +664,18 @@ export default {
         if (response.data.state == 1) {
           var projectList = response.data.data.projectList;
           var goodInfos = response.data.data.good_info;
-    
+          var drug_infos = response.data.data.drug;
+
+
           for (let i = 0; i < projectList.length; i++) {
             let obj = {
               id: projectList[i].id,
               statistical_classification:
               projectList[i].statistical_classification,
-              number: "1",
+              prescribing_number: 1,
               project_name: projectList[i].project_name,
               unit: projectList[i].unit,
-              price: projectList[i].price,
+              retail_price: projectList[i].price,
               type: 2,
               new_id: Math.floor(
                 (Math.random() + Math.floor(Math.random() * 9 + 1)) *
@@ -373,10 +689,10 @@ export default {
             let obj = {
               id: goodInfos[i].id,
               statistical_classification:goodInfos[i].statistical_classification,
-              number: "1",
+              prescribing_number: 1,
               project_name:goodInfos[i].good_name + " " + goodInfos[i].specification_name,
               unit: goodInfos[i].packing_unit,
-              price: goodInfos[i].retail_price,
+              retail_price: goodInfos[i].retail_price,
               type: 3,
               new_id: Math.floor(
                 (Math.random() + Math.floor(Math.random() * 9 + 1)) *
@@ -386,7 +702,34 @@ export default {
             this.projectList.push(obj);
           }
 
-         
+          for (let i = 0; i < drug_infos.length; i++) {
+            let obj = {
+              id: drug_infos[i].id,
+              drug_name: drug_infos[i].drug_name,
+              single_dose: drug_infos[i].single_dose.toString(),
+              delivery_way: drug_infos[i].delivery_way,
+              execution_frequency: drug_infos[i].execution_frequency,
+              dose: drug_infos[i].dose,
+              dose_unit: drug_infos[i].dose_unit,
+              min_number: drug_infos[i].min_number,
+              min_unit: drug_infos[i].min_unit,
+              max_unit: drug_infos[i].max_unit,
+              min_price: drug_infos[i].min_price,
+              type: 1,
+              retail_price: drug_infos[i].retail_price.toString(),
+              remark: '',
+              day: '1',
+              is_medicine:0,
+              prescribing_number: drug_infos[i].prescribing_number,
+              single_dose_unit: drug_infos[i].dose_unit,
+              prescribing_number_unit: drug_infos[i].prescribing_number_unit,
+              medical_insurance_number: drug_infos[i].medical_insurance_number,
+              new_id: Math.floor(
+                (Math.random() + Math.floor(Math.random() * 9 + 1)) *
+                Math.pow(10, 10 - 1)),
+            };
+            this.projectList.push(obj);
+          }
         }
       });
     },
@@ -411,56 +754,81 @@ export default {
           var projectdetail = response.data.data.projecDetail;
 
           this.tableData.push(projectdetail);
+          this.drug_tableData.push(projectdetail)
         }
       });
     },
     addProjectList() {
         if(this.tableData.length > 0){
           for(let i=0;i<this.tableData.length;i++){
-            if(this.tableData[i].new_id == this.form.project_detail){
+            if(this.tableData[i].new_id == this.form.project_detail && this.projectList[i].type != 1){
                this.$message.error("项目名称已存在")
                return
             }
           }
         }
-        console.log("project_232332323232323232",this.projectList)
         for (let i = 0; i < this.projectList.length; i++) {
-          if (this.form.project_detail == this.projectList[i].new_id) {
-            this.projectList[i].number = this.form.number
-            this.projectList[i].number = this.projectList[i].number.toString()
-            
+          if (this.form.project_detail == this.projectList[i].new_id  && this.projectList[i].type != 1) {
+            this.projectList[i].prescribing_number = 1
+            this.projectList[i].prescribing_number = this.projectList[i].prescribing_number.toString()
             this.tableData.push(this.projectList[i])
+            this.drug_tableData.push(this.projectList[i])
+
             this.form.project_detail = ''
             this.form.number = 1
           }
         }
-       
-      },
-    DeleteProject(id, index) {
+
+      for (let i = 0; i < this.projectList.length; i++) {
+
+        if (this.form.project_detail == this.projectList[i].new_id  && this.projectList[i].type == 1) {
+          console.log(this.projectList[i])
+
+          this.projectList[i].prescribing_number =  "1"
+          this.drug_tableData.push(this.projectList[i])
+          this.form.project_detail = ''
+          this.form.number = 1
+        }
+      }
+
+
+    },
+    DeleteProject(id, index,type) {
+
       this.$confirm("确认删除此项目吗?", "删除", {
         confirmButtonText: "确 定",
         cancelButtonText: "取 消",
         type: "warning",
       })
         .then(() => {
-          this.tableData.splice(index, 1);
+          if (type == 1){
+            this.drug_tableData.splice(index, 1);
+          }else{
+            this.tableData.splice(index, 1);
+            this.drug_tableData.splice(index, 1);
+
+
+          }
         })
         .catch(() => {});
     },
   },
   created() {
     //获取所以的项目
+    this.getInitData()
+    this.drug_tableDatas = []
+    this.tableData = []
     this.getlist();
   },
   watch: {
-    tableData: function () {
+    drug_tableData: function () {
       let c = 0;
       this.form.price = 0;
-      for (let i = 0; i < this.tableData.length; i++) {
-        let a = parseFloat(this.tableData[i].number).toFixed(2);
-        let b = parseFloat(this.tableData[i].price).toFixed(2);
-
+      for (let i = 0; i < this.drug_tableData.length; i++) {
+        let a = parseFloat(this.drug_tableData[i].prescribing_number).toFixed(2);
+        let b = parseFloat(this.drug_tableData[i].retail_price).toFixed(2);
         c = c + this.form.price + a * b;
+        console.log(c)
       }
       this.form.price = c.toFixed(2);
     },

src/xt_pages/data/components/editInspection.vue

@@ -1,7 +1,7 @@
 <template>
     <el-dialog
             :title="formTitle"
-            width="900px"
+            width="1200px"
             :visible.sync="visible"
             :before-close="_close"
     >
@@ -56,61 +56,228 @@
                         <el-option
                                 v-for="item,index in projectList"
                                 :key="index"
-                                :label="item.project_name"
+                                :label="item.type == 1 ? item.drug_name : item.project_name"
                                 :value="item.new_id">
                         </el-option>
                     </el-select>
 
                 </el-form-item>
-                <el-form-item label="数量" style="width:50%;">
+                <el-form-item label="操作" style="width:50%;">
                     <div style="display:flex;">
-                        <el-input v-model="form.number" style="margin-right:10px;"></el-input>
+<!--                        <el-input v-model="form.number" style="margin-right:10px;"></el-input>-->
                         <el-button type="primary" @click="addProjectList">添加</el-button>
                     </div>
                 </el-form-item>
             </el-form>
             <el-form>
-                <el-table :data="tableData" border style="100%" :row-style="{ color: '#303133' }"
-                          :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-                          highlight-current-row ref="tab">
-                    <el-table-column align="center" prop="name" label="分类" width="120">
-                        <template slot-scope="scope">
-                            <div>{{scope.row.type == 2?getId(scope.row.statistical_classification):'耗材'}}</div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="组套明细" width="120">
-                        <template slot-scope="scope">{{scope.row.project_name}}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="数量" width="120">
-                        <template slot-scope="scope">{{scope.row.number}}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="单位" width="120">
-                        <template slot-scope="scope">
-                            <div v-if="scope.row.type == 2">{{scope.row.unit}}</div>
-                            <div v-if="scope.row.type == 3">{{scope.row.unit}}</div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="单价" width="120">
-                        <template slot-scope="scope">{{scope.row.price}}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="操作">
-                        <template slot-scope="scope">
-                            <el-tooltip
-                                    class="item"
-                                    effect="dark"
-                                    content="删除"
-                                    placement="top"
-                            >
-                                <el-button
-                                        type="danger"
-                                        icon="el-icon-delete"
-                                        size="small"
-                                        @click="DeleteProject(scope.row.m_id,scope.$index)"
-                                ></el-button>
-                            </el-tooltip>
-                        </template>
-                    </el-table-column>
-                </el-table>
+<!--                <el-table :data="tableData" border style="100%" :row-style="{ color: '#303133' }"-->
+<!--                          :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"-->
+<!--                          highlight-current-row ref="tab">-->
+<!--                    <el-table-column align="center" prop="name" label="分类" width="120">-->
+<!--                        <template slot-scope="scope">-->
+<!--                            <div>{{scope.row.type == 2?getId(scope.row.statistical_classification):'耗材'}}</div>-->
+<!--                        </template>-->
+<!--                    </el-table-column>-->
+<!--                    <el-table-column align="center" prop="name" label="组套明细" width="120">-->
+<!--                        <template slot-scope="scope">{{scope.row.project_name}}</template>-->
+<!--                    </el-table-column>-->
+<!--                    <el-table-column align="center" prop="name" label="数量" width="120">-->
+<!--                        <template slot-scope="scope">{{scope.row.number}}</template>-->
+<!--                    </el-table-column>-->
+<!--                    <el-table-column align="center" prop="name" label="单位" width="120">-->
+<!--                        <template slot-scope="scope">-->
+<!--                            <div v-if="scope.row.type == 2">{{scope.row.unit}}</div>-->
+<!--                            <div v-if="scope.row.type == 3">{{scope.row.unit}}</div>-->
+<!--                        </template>-->
+<!--                    </el-table-column>-->
+<!--                    <el-table-column align="center" prop="name" label="单价" width="120">-->
+<!--                        <template slot-scope="scope">{{scope.row.price}}</template>-->
+<!--                    </el-table-column>-->
+<!--                    <el-table-column align="center" prop="name" label="操作">-->
+<!--                        <template slot-scope="scope">-->
+<!--                            <el-tooltip-->
+<!--                                    class="item"-->
+<!--                                    effect="dark"-->
+<!--                                    content="删除"-->
+<!--                                    placement="top"-->
+<!--                            >-->
+<!--                                <el-button-->
+<!--                                        type="danger"-->
+<!--                                        icon="el-icon-delete"-->
+<!--                                        size="small"-->
+<!--                                        @click="DeleteProject(scope.row.m_id,scope.$index,scope.row.type)"-->
+<!--                                ></el-button>-->
+<!--                            </el-tooltip>-->
+<!--                        </template>-->
+<!--                    </el-table-column>-->
+<!--                </el-table>-->
+
+              <el-table
+                :data="drug_tableData"
+                max-height="300"
+                border
+                style="100%"
+                :row-style="{ color: '#303133' }"
+                :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+            color: '#606266',
+          }"
+                highlight-current-row
+                ref="tab"
+              >
+                <el-table-column align="center" prop="drug_name" label="名称" fixed>
+                    <template slot-scope="scope"><span>{{ scope.row.type == 1?scope.row.drug_name: scope.row.project_name}}</span>
+                    </template>
+                </el-table-column>
+
+                <el-table-column align="center" prop="drug_name" width="100" label="规格">
+                  <template slot-scope="scope">
+                  <span v-if="scope.row.type == 1" >
+                    {{ scope.row.dose }}{{ scope.row.dose_unit }}*{{ scope.row.min_number }}{{ scope.row.min_unit }}/{{ scope.row.max_unit }}
+                  </span>
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" prop="single_dose" width="180" label="单次用量">
+                  <template slot-scope="scope">
+                    <div style="display:flex;align-items:center;" v-if="scope.row.type == 1">
+                      <el-input  v-model="scope.row.single_dose" @input="getAllChangeTwo(scope)"
+                                 style="width:50%;"></el-input>
+                      <!-- <div>{{scope.row.single_dose_unit}}</div> -->
+                      <el-select v-model="scope.row.single_dose_unit" placeholder="请选择" style="width:50%;"
+                                 @change="getAllChangeTwo(scope)"  >
+                        <el-option :label="scope.row.min_unit" :value="scope.row.min_unit"></el-option>
+                        <el-option :label="scope.row.min_unit" :value="scope.row.min_unit"></el-option>
+
+                        <el-option :label="scope.row.dose_unit"
+                                   v-if="scope.row.dose_unit != scope.row.min_unit"
+                                   :value="scope.row.dose_unit"></el-option>
+                      </el-select>
+                    </div>
+                    <span v-if="scope.row.type == 2">
+                  </span>
+                    <span v-if="scope.row.type == 3">
+                  </span>
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" prop="delivery_way" width="100" label="用法">
+                  <template slot-scope="scope">
+                    <div v-if="scope.row.type == 1">
+                      <el-select v-model="scope.row.delivery_way" placeholder="请选择">
+                        <el-option
+                          v-for="(item,index) in drugways"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                        </el-option>
+                      </el-select>
+                    </div>
+                    <div v-if="scope.row.type == 2">
+
+                    </div>
+                    <div v-if="scope.row.type == 3">
+
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
+                  <template slot-scope="scope">
+                    <div v-if="scope.row.type == 1">
+                      <el-select  v-model="scope.row.execution_frequency" placeholder="请选择" @change="getAllChangeTwo(scope)">
+                        <el-option
+                          v-for="item,index in efs"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                        </el-option>
+                      </el-select>
+                    </div>
+                    <div v-if="scope.row.type == 2">
+
+                    </div>
+                    <div v-if="scope.row.type == 3">
+
+                    </div>
+                  </template>
+                </el-table-column>
+
+                <el-table-column align="center" prop="day" width="100" label="天数">
+                  <template slot-scope="scope">
+                    <div style="display:flex;align-items:center;" v-if="scope.row.type == 1">
+                      <el-input  v-model="scope.row.day" @input="getAllChangeTwo(scope)" placeholder=""></el-input>
+                      {{'天'}}
+                    </div>
+                    <div style="display:flex;align-items:center;" v-if="scope.row.type == 2">
+                      <!--                {{'1天'}}-->
+                    </div>
+                    <div style="display:flex;align-items:center;" v-if="scope.row.type == 3">
+                      <!--                {{'1天'}}-->
+                    </div>
+                  </template>
+                </el-table-column>
+
+                <el-table-column align="center" prop="prescribing_number" width="150" label="总量">
+                  <template slot-scope="scope">
+                    <div style="display:flex;align-items:center;" v-if="scope.row.type == 1">
+                      <el-input v-model="scope.row.prescribing_number"
+                                style="width:50%" placeholder=""></el-input>
+                      <!-- <div> {{scope.row.prescribing_number_unit}}</div> -->
+                      <el-select v-model="scope.row.prescribing_number_unit" placeholder="请选择" style="width:50%;"
+                                 @change="getPrescribingNumberUnit(scope)">
+                        <el-option :label="scope.row.min_unit" :value="scope.row.min_unit"></el-option>
+                        <el-option :label="scope.row.max_unit"
+                                   v-if="scope.row.min_unit != scope.row.max_unit"
+                                   :value="scope.row.max_unit"></el-option>
+                      </el-select>
+                    </div>
+                    <div style="display:flex;align-items:center;" v-if="scope.row.type == 2">
+                      <el-input v-model="scope.row.number"
+                                style="width:50%" placeholder=""></el-input>
+                      <div>{{scope.row.unit }}</div>
+                    </div>
+                    <div style="display:flex;align-items:center;" v-if="scope.row.type == 3">
+                      <el-input v-model="scope.row.number"
+                                style="width:50%" placeholder=""></el-input>
+                      <div>{{scope.row.unit }}</div>
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" prop="retail_price" width="100" label="单价">
+                  <template slot-scope="scope">
+                    <div style="display:flex;align-items:center;" v-if="scope.row.type == 1">
+                      <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
+                      <div>{{'元'}}</div>
+                    </div>
+
+                    <div style="display:flex;align-items:center;" v-if="scope.row.type == 2">
+                      <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
+                      <div>{{'元'}}</div>
+                      <!--                <div>{{scope.row.price }}</div>-->
+                    </div>
+                    <div style="display:flex;align-items:center;" v-if="scope.row.type == 3">
+                      <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
+                      <div>{{'元'}}</div>
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="操作" >
+                  <template slot-scope="scope">
+                    <el-tooltip
+                      class="item"
+                      effect="dark"
+                      content="删除"
+                      placement="top"
+                    >
+                      <el-button
+                        type="danger"
+                        icon="el-icon-delete"
+                        size="small"
+                        @click="DeleteProject(scope.row.m_id, scope.$index,scope.row.type)"
+                      ></el-button>
+                    </el-tooltip>
+                  </template>
+                </el-table-column>
+              </el-table>
+
             </el-form>
         </div>
 
@@ -124,11 +291,13 @@
 
 <script>
   import {
+    getInitData,
     editTeam
   } from '@/api/his/his'
   import {
     addProjectList,
     DeleteProject,
+    DeleteDrug,
     getAllProjectList,
     getProjectTeamDetail,
     updatedProjectTeam
@@ -172,11 +341,124 @@
           //team_type: [{ required: true, message: '请填写组套类型', trigger: 'change' }]
         },
         tableData: [],
+        drug_tableData:[],
         item_id: [],
-        projectList: []
+        projectList: [],
+        drugways: [],
+        efs: [],
       }
     },
     methods: {
+      // getNum(execution_frequency) {
+      //   let arr = [
+      //     { name: '立即执行', count: 1 },
+      //     { name: '透析时', count: 1 },
+      //     { name: '透析1h一次', count: 1 },
+      //     { name: '透析2h一次', count: 1 },
+      //     { name: '透析3h一次', count: 1 },
+      //     { name: '每日一次', count: 12 },
+      //     { name: '每日两次', count: 6 },
+      //     { name: '每日三次', count: 4 },
+      //     { name: '每晚一次', count: 1 },
+      //     { name: '每晚', count: 1 },
+      //     { name: '上机前', count: 1 },
+      //     { name: '下机前', count: 1 },
+      //     { name: '透析后立即', count: 1 },
+      //     { name: '持续使用', count: 1 },
+      //     { name: '临时开药', count: 1 },
+      //     { name: '临睡前', count: 1 },
+      //     { name: '隔日一次', count: 1 },
+      //     { name: '隔三日一次', count: 1 },
+      //     { name: '每二小时一次', count: 12 },
+      //     { name: '每四小时一次', count: 6 },
+      //     { name: '每六小时一次', count: 4 },
+      //     { name: '每八小时一次', count: 3 }
+      //   ]
+      //   let num = ''
+      //   arr.map(item => {
+      //     if (item.name == execution_frequency) {
+      //       num = item.count
+      //     }
+      //   })
+      //   if (num == '') {
+      //     num = 1
+      //   }
+      //   return num
+      // },
+
+      getAllChange(scope) {
+        if(this.$store.getters.xt_user.org_id != 10206) {
+          if (scope.row.min_unit == scope.row.single_dose_unit) {
+            if (scope.row.prescribing_number_unit == scope.row.min_unit) {
+              console.log(1)
+              scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
+            } else {
+              console.log(12)
+              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1)) * (scope.row.day ? scope.row.day : 1) / scope.row.min_number)
+            }
+          } else {
+            if (scope.row.prescribing_number_unit == scope.row.min_unit) {
+              console.log(123)
+              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.dose)
+            } else {
+              console.log(1234)
+              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.dose / scope.row.min_number)
+            }
+          }
+          if (scope.row.prescribing_number == 0) {
+            scope.row.prescribing_number = 1
+          }
+
+        }
+
+      },
+      getInitData() {
+        getInitData().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.drugways = response.data.data.drugways
+            this.efs = response.data.data.efs
+
+          }
+        })
+
+      },
+      getAllChangeTwo(scope) {
+        if(this.$store.getters.xt_user.org_id != 10206) {
+          console.log('yyyyyyyy',scope);
+          if (scope.row.min_unit == scope.row.single_dose_unit) {
+            if (scope.row.prescribing_number_unit == scope.row.min_unit) {
+              console.log(1)
+              scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
+            } else {
+              console.log(12)
+              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1)) * (scope.row.day ? scope.row.day : 1) / scope.row.min_number)
+            }
+          } else {
+            if (scope.row.prescribing_number_unit == scope.row.min_unit) {
+              console.log('123',scope.row.dose,scope.row.execution_frequency,scope.row.min_unit)
+              // 单次用量single_dose，用量单位single_dose_unit，用法delivery_way，频率execution_frequency 总量prescribing_number，规格drug.dose
+              scope.row.prescribing_number = Math.ceil((parseInt(scope.row.single_dose) * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / parseInt(this.getdrugdose(scope.row.dose)) ) //  / scope.row.drug.dose
+            } else {
+              console.log(1234,scope.row.dose)
+              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / (scope.row.dose*1) / (scope.row.min_number*1))//
+            }
+          }
+          if (scope.row.prescribing_number == 0) {
+            scope.row.prescribing_number = 1
+          }
+        }
+      },
+      getPrescribingNumberUnit(scope) {
+
+        if (scope.row.prescribing_number_unit == scope.row.min_unit) {
+          scope.row.retail_price = scope.row.drug.min_price
+        } else {
+          scope.row.retail_price = scope.row.drug.retail_price
+        }
+      },
       getUnit(id){
         var arr =  getDataConfig('hemodialysis','units')
         for(let i = 0;i < arr.length; i++){
@@ -206,17 +488,22 @@
       show(id) {
         this.visible = true
         this.formTitle = '编辑'
+        this.getInitData()
         this.getlist(id)
         this.getProjectTeamDetail(id)
         this.projectList = []
-      }, 
+      },
       getlist(id) {
 
         getAllProjectList().then(response => {
           if (response.data.state == 1) {
-         
+
             var projectList = response.data.data.projectList
             var goodInfos = response.data.data.good_info
+
+            var drug_infos = response.data.data.drug;
+
+
             console.log("332323232323232",goodInfos)
             for (let i = 0; i < projectList.length; i++) {
               let obj = {
@@ -251,7 +538,35 @@
               }
               this.projectList.push(obj)
             }
-             console.log("编辑项目23332232323",this.projectList)
+
+            for (let i = 0; i < drug_infos.length; i++) {
+              let obj = {
+                id: drug_infos[i].id,
+                m_id: 0,
+                drug_name: drug_infos[i].drug_name,
+                single_dose: drug_infos[i].single_dose.toString(),
+                delivery_way: drug_infos[i].delivery_way,
+                execution_frequency: drug_infos[i].execution_frequency,
+                dose: drug_infos[i].dose,
+                dose_unit: drug_infos[i].dose_unit,
+                min_number: drug_infos[i].min_number,
+                min_unit: drug_infos[i].min_unit,
+                max_unit: drug_infos[i].max_unit,
+                type: 1,
+                retail_price: drug_infos[i].retail_price.toString(),
+                remark: '',
+                day: '1',
+                prescribing_number: drug_infos[i].prescribing_number,
+                single_dose_unit: drug_infos[i].dose_unit,
+                prescribing_number_unit: drug_infos[i].prescribing_number_unit,
+                medical_insurance_number: drug_infos[i].medical_insurance_number,
+                new_id: Math.floor(
+                  (Math.random() + Math.floor(Math.random() * 9 + 1)) *
+                  Math.pow(10, 10 - 1)),
+              };
+              this.projectList.push(obj);
+            }
+
           }
         })
       },
@@ -263,11 +578,15 @@
         getProjectTeamDetail(id).then(response => {
           if (response.data.state == 1) {
             this.tableData = []
+            this.drug_tableData = []
+
             var projectTeamDetail = response.data.data.projectTeamDetail
             var hisList = response.data.data.hisList
 
-            for (let i = 0; i < hisList.length; i++) {
+            var hisList_drug = response.data.data.hisList_drug
 
+
+            for (let i = 0; i < hisList.length; i++) {
               let obj = {
                 m_id: hisList[i].id,
                 id: hisList[i].project_id,
@@ -275,17 +594,40 @@
                 type: hisList[i].type
               }
               if (hisList[i].type == 2) {
-                obj['statistical_classification'] = hisList[i].project.statistical_classification
                 obj['project_name'] = hisList[i].project.project_name
                 obj['unit'] = hisList[i].project.unit
                 obj['price'] = hisList[i].project.price
-
               } else {
                 obj['project_name'] = hisList[i].good_info.good_name
                 obj['unit'] = hisList[i].good_info.packing_unit
                 obj['price'] = hisList[i].good_info.retail_price
               }
               this.tableData.push(obj)
+              this.drug_tableData.push(obj)
+            }
+            for (let i = 0; i < hisList_drug.length; i++) {
+
+              let obj = {
+                m_id: hisList_drug[i].id,
+                id: hisList_drug[i].drug_id,
+                drug_name: hisList_drug[i].drug.drug_name,
+                single_dose: hisList_drug[i].single_dose.toString(),
+                delivery_way: hisList_drug[i].delivery_way,
+                execution_frequency: hisList_drug[i].execution_frequency,
+                dose: hisList_drug[i].drug.dose,
+                dose_unit: hisList_drug[i].drug.dose_unit,
+                min_number: hisList_drug[i].drug.min_number,
+                min_unit: hisList_drug[i].drug.min_unit,
+                max_unit: hisList_drug[i].drug.max_unit,
+                type: 1,
+                retail_price: hisList_drug[i].drug.retail_price.toString(),
+                remark: '',
+                day: hisList_drug[i].day_count,
+                prescribing_number: hisList_drug[i].prescribing_number,
+                single_dose_unit: hisList_drug[i].single_dose_unit,
+                prescribing_number_unit: hisList_drug[i].prescribing_number_unit,
+              }
+              this.drug_tableData.push(obj)
             }
             this.form.id = projectTeamDetail.id
             this.form.project_team = projectTeamDetail.project_team
@@ -316,6 +658,51 @@
             }
           }
 
+         var drug_tableDatas = []
+          var tableDatas = []
+
+
+          for (let i = 0; i < this.drug_tableData.length; i++) {
+
+
+
+            if (this.drug_tableData[i].type == 1) {
+              drug_tableDatas.push(this.drug_tableData[i])
+            }else{
+              this.drug_tableData[i].number =  this.drug_tableData[i].number.toString()
+              tableDatas.push(this.drug_tableData[i])
+            }
+          }
+
+          if(isNaN(this.form.price)){
+            this.form.price = 0
+            let c = 0
+            for (let i = 0; i < this.drug_tableData.length; i++) {
+              if(this.drug_tableData[i].type == 1){
+                if(this.drug_tableData[i].retail_price == ""){
+                  this.drug_tableData[i].retail_price = 0
+                }
+                let a = parseFloat(this.drug_tableData[i].prescribing_number).toFixed(2)
+                let b = parseFloat(this.drug_tableData[i].retail_price).toFixed(2)
+                c = c + this.form.price + (a * b)
+              }else{
+                if(this.drug_tableData[i].price == ""){
+                  this.drug_tableData[i].price = 0
+                }
+                let a = parseFloat(this.drug_tableData[i].number).toFixed(2)
+                let b = parseFloat(this.drug_tableData[i].price).toFixed(2)
+                c = c + this.form.price + (a * b)
+              }
+
+            }
+            console.log(c)
+
+            this.form.price = c.toFixed(2)
+
+          }
+
+
+
           if (valid) {
             var params = {
               id: this.form.id,
@@ -329,7 +716,8 @@
               sort:parseInt(this.form.sort)
             }
             let data = {
-              'info': arr
+              'info': tableDatas,
+              "drug_info": drug_tableDatas,
             }            // console.log("params",params)
             editTeam(params, data).then(response => {
               if (response.data.state == 1) {
@@ -357,41 +745,60 @@
         return name
       },
       addProjectList() {
-       
+
         var project_name = ""
         for(let i=0;i<this.projectList.length;i++){
-          if(this.form.project_detail == this.projectList[i].new_id){
+          if(this.form.project_detail == this.projectList[i].new_id && this.projectList[i].type != 1){
              project_name = this.projectList[i].project_name
           }
         }
         if(this.tableData.length > 0){
           for(let i=0;i<this.tableData.length;i++){
-            if(this.tableData[i].project_name == project_name){
+            if(this.tableData[i].project_name == project_name && this.projectList[i].type != 1){
                this.$message.error("项目名称已存在")
                return
             }
           }
         }
         for (let i = 0; i < this.projectList.length; i++) {
-          if (this.form.project_detail == this.projectList[i].new_id) {
+          if (this.form.project_detail == this.projectList[i].new_id && this.projectList[i].type != 1) {
             this.projectList[i].number = this.form.number
             this.projectList[i].number = this.projectList[i].number.toString()
             this.tableData.push(this.projectList[i])
+            this.drug_tableData.push(this.projectList[i])
+
+            this.form.project_detail = ''
+            this.form.number = ''
+          }
+        }
+        for (let i = 0; i < this.projectList.length; i++) {
+          if (this.form.project_detail == this.projectList[i].new_id && this.projectList[i].type == 1) {
+            this.projectList[i].prescribing_number = this.form.number.toString()
+            this.projectList[i].m_id = 0
+            this.drug_tableData.push(this.projectList[i])
             this.form.project_detail = ''
             this.form.number = ''
           }
         }
 
       },
-      DeleteProject(id, index) {
+      DeleteProject(id, index,type) {
+        console.log(id)
 
         if (id == 0) {
+
           this.$confirm('确认删除此项目吗?', '删除', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
             type: 'warning'
           }).then(() => {
-            this.tableData.splice(index, 1)
+            if(type == 1){
+              this.drug_tableData.splice(index, 1)
+            }else{
+              this.tableData.splice(index, 1)
+              this.drug_tableData.splice(index, 1)
+
+            }
 
           })
             .catch(() => {
@@ -403,14 +810,27 @@
             cancelButtonText: '取 消',
             type: 'warning'
           }).then(() => {
-            DeleteProject(id).then(response => {
-              if (response.data.state == 1) {
-                this.tableData.splice(index, 1)
+            if(type == 1){
+              DeleteDrug(id).then(response => {
+                if (response.data.state == 1) {
+                  this.drug_tableData.splice(index, 1)
+                } else {
+                }
+              })
 
-              } else {
+            }else{
+              DeleteProject(id).then(response => {
+                if (response.data.state == 1) {
+                  this.tableData.splice(index, 1)
+                  this.drug_tableData.splice(index, 1)
+
+                } else {
+
+                }
+              })
+
+            }
 
-              }
-            })
           })
             .catch(() => {
             })
@@ -423,17 +843,20 @@
       this.getlist()
     },
     watch: {
-      'tableData': function() {
+      'drug_tableData': function() {
         let c = 0
         this.form.price  = 0
-        for (let i = 0; i < this.tableData.length; i++) {
-          let a = parseFloat(this.tableData[i].number).toFixed(2)
-          let b = parseFloat(this.tableData[i].price).toFixed(2)
-          console.log(a)
-          console.log(b)
-
+        for (let i = 0; i < this.drug_tableData.length; i++) {
+          if(this.drug_tableData[i].type == 1){
+            let a = parseFloat(this.drug_tableData[i].prescribing_number).toFixed(2)
+            let b = parseFloat(this.drug_tableData[i].retail_price).toFixed(2)
+            c = c + this.form.price + (a * b)
+          }else{
+            let a = parseFloat(this.drug_tableData[i].number).toFixed(2)
+            let b = parseFloat(this.drug_tableData[i].price).toFixed(2)
+            c = c + this.form.price + (a * b)
 
-          c = c + this.form.price + (a * b)
+          }
 
         }
         this.form.price = c.toFixed(2)

src/xt_pages/eleFaPiao/settleDetail.vue

@@ -1029,45 +1029,73 @@ export default {
         this.$message.error("请勾选需要开票的数据");
         return
       }
-      let params = {
-        id: ids,
-        admin_user_id: this.$store.getters.xt_user.user.id,
-      };
-      var that = this;
-      that.isbatchloading = true
 
-      axios.get('http://127.0.0.1:9532/api/bwfapiao/batchopen',{params:params}).then(function(response) {
-        if (response.data.state == 0) {
-          this.isbatchloading = false
+      var sum = 0
+      for (var i = 0; i < this.selection.length; i++){
+          sum = sum + this.selection[i].medfee_sumamt
+      }
+      sum = sum.toFixed(2)
+      this
+        .$confirm("当前所选开票总金额为" + sum+"元,是否批量开票", '信息', {
+          confirmButtonText: '确 定',
+          type: 'warning'
+        })
+        .then(() => {
+          let ids  = ""
+          for (var i = 0; i < this.selection.length; i++){
+            if (ids.length == 0){
+              ids = this.selection[i].id
+            }else{
+              ids = ids + "," + this.selection[i].id
+            }
+          }
+          if(ids.length == 0 ){
+            this.$message.error("请勾选需要开票的数据");
+            return
+          }
+          let params = {
+            id: ids,
+            admin_user_id: this.$store.getters.xt_user.user.id,
+          };
+          var that = this;
+          that.isbatchloading = true
+
+          axios.get('http://127.0.0.1:9532/api/bwfapiao/batchopen',{params:params}).then(function(response) {
+            if (response.data.state == 0) {
+              this.isbatchloading = false
+
+              that.$message.error(response.data.data.msg);
+              return false
+            } else {
+              that.isbatchloading = false
+              if(response.data.data.failed_code == -10){
+                that.$confirm(response.data.data.msg, '错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
 
-          that.$message.error(response.data.data.msg);
-          return false
-        } else {
-          that.isbatchloading = false
-          if(response.data.data.failed_code == -10){
-            that.$confirm(response.data.data.msg, '错误信息', {
-              confirmButtonText: '确 定',
-              type: 'warning'
-            }).then(() => {
+                }).catch(() => {
+                })
+              }else{
+                that.$confirm(response.data.data.msg, '上传信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+                  // that.$message.success( response.data.data.msg)
+                  that.getHisOrderList()
+                }).catch(() => {
+                  that.getHisOrderList()
+                })
+              }
+            }
+          }).catch(function(error) {
+            that.isbatchloading = false
 
-            }).catch(() => {
-            })
-          }else{
-            that.$confirm(response.data.data.msg, '上传信息', {
-              confirmButtonText: '确 定',
-              type: 'warning'
-            }).then(() => {
-              // that.$message.success( response.data.data.msg)
-              that.getHisOrderList()
-            }).catch(() => {
-              that.getHisOrderList()
-            })
-          }
-        }
-      }).catch(function(error) {
-        that.isbatchloading = false
+          })
+        })
+        .catch(() => {
 
-      })
+        })
     },
     handleSelectionChange(val) {
       this.selecting_schs = val

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -119,7 +119,7 @@
 
             <el-button v-loading="loadingone" size="small"
                        @click="open(40)"
-                       v-if="org_id == 10191 || org_id == 10318 || org_id == 10567  || org_id == 10375 || org_id == 10480 || org_id == 10721 || org_id == 10724 || org_id == 9478"
+                       v-if="org_id == 10191 || org_id == 10318 || org_id == 10567  || org_id == 10375 || org_id == 10480 || org_id == 10721 || org_id == 10724 || org_id == 9478 || org_id == 10768"
                        type="primary">登陆
             </el-button>
 
@@ -6379,6 +6379,12 @@ export default {
               this.editableTabsValue = this.getPName(this.big_prescriptions[0].med_type, 1)
             }
 
+            this.big_prescriptions.sort((a, b) => {
+              if (a.med_type === 14 && b.med_type !== 14) return -1;
+              if (b.med_type === 14 && a.med_type !== 14) return 1;
+              return a.med_type - b.med_type; // 其他情况按med_type升序排列
+            });
+
           }
         })
 

src/xt_pages/outpatientCharges/summary.vue

@@ -134,6 +134,20 @@
           </div>
 
 
+          <div style="margin-left: 5px;">
+            <el-select v-model="feeTypeVal" @change="handleMedChange"
+                       placeholder="请选择费用类型" style="width: 100%;"
+            >
+              <el-option
+                v-for="item in fee_options"
+                :key="item.id"
+                :label="item.text"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </div>
+
+
         </div>
         <div class="content_button">
           <el-button size="small" type="primary" @click="export_detail_three" v-if="$store.getters.xt_user.org_id == 10265 || $store.getters.xt_user.org_id == 0">报表下载12</el-button>
@@ -717,6 +731,10 @@ export default {
         { id: 0, text: '全部' },
         { id: 11, text: '普通门诊' },
         { id: 14, text: '门诊特殊病' }
+      ], fee_options: [
+        { id: 0, text: '全部' },
+        { id: 1, text: '医保' },
+        { id: 2, text: '自费' }
       ],
       zone_options: [
         { id: 0, text: '全部分区' }
@@ -743,6 +761,7 @@ export default {
       sch_type: '0',//班次
       zoneVal: 0,//分区
       medTypeVal: 0,
+      feeTypeVal:0,
       start_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
       end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
       pay_time:"",
@@ -2098,7 +2117,7 @@ export default {
           var tarList = []
           for (let i = 0; i < list.length; i++) {
             let obj = {
-              '周期': '2024年第四季度',
+              '周期': '2025年第一季度',
               '类别': '门诊',
               '医保目录编码': list[i].code,
               '医保目录名称': list[i].name,
@@ -4127,7 +4146,8 @@ export default {
         sort_type: this.sort_type,
         sch_type: this.sch_type,
         zone_type: this.zoneVal,
-        med_type: this.medTypeVal
+        med_type: this.medTypeVal,
+        fee_type: this.feeTypeVal
       }
       getHisOrderList(params).then((response) => {
         if (response.data.state == 0) {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -315,10 +315,13 @@
           </el-tab-pane>
           <el-tab-pane label="项目" :name="2">
 
+          </el-tab-pane>
+
+          <el-tab-pane label="项目组套" :name="3">
+
           </el-tab-pane>
           <div style="height:100%;" v-show="showOne">
             <el-tabs class="rightTabs" v-model="drug_activeName">
-              <el-tab-pane label="药品列表" name="1">
                 <div style="margin-bottom:5px;display:flex;">
                   <el-input style="width:50%;" @input="searchAction"
                             @keyup.enter.native='searchAction'
@@ -340,7 +343,7 @@
                 </div>
                 <div style="width: 100%;flex:1;overflow: hidden;" ref="rightTable">
                   <el-table ref="multipleTable"
-                            :height="multipleTableHeight != '' ? multipleTableHeight : '200'"
+                            :height="multipleTableHeight != '' ? multipleTableHeight : '700'"
                             :data="drugs" border @select='selectDrugs'
                             :row-style="{ color: '#303133' }"
                             @select-all="changeAllGoodInfoTableData"
@@ -401,8 +404,6 @@
                   </el-table>
                   <!-- <div>{{3*(2/3)}}</div> -->
                 </div>
-
-              </el-tab-pane>
               <!--<el-tab-pane label="医嘱模板" name="2">-->
               <!--<div style="margin-bottom:5px;">-->
               <!--&lt;!&ndash;<el-input style="width:50%;" v-model="input" placeholder=""></el-input>&ndash;&gt;-->
@@ -443,9 +444,9 @@
               <!--</el-tab-pane>-->
             </el-tabs>
           </div>
+
           <div style="height:100%;" v-show="showTwo">
             <el-tabs class="rightTabs" v-model="activeName">
-              <el-tab-pane label="项目列表" name="1">
                 <div style="margin-bottom:5px;">
                   <!--<el-input style="width:50%;" v-model="input" placeholder=""></el-input>-->
                   <el-input style="width:50%;" @input="searchProjectAction"
@@ -469,7 +470,7 @@
                 </div>
                 <div style="width: 100%;flex:1;overflow-y: auto;">
                   <el-table ref="tables"
-                            :height="multipleTableHeight != '' ? multipleTableHeight : '200'"
+                            :height="multipleTableHeight != '' ? multipleTableHeight : '700'"
                             :data="tabProject" border @select='selectChange'
                             :row-style="{ color: '#303133' }"
                             @select-all="changeAllGoodInfoTableDataTwo"
@@ -505,15 +506,18 @@
                     </el-table-column>
                   </el-table>
                 </div>
-              </el-tab-pane>
-              <el-tab-pane label="项目组套" name="2">
+            </el-tabs>
+          </div>
+
+          <div style="height:100%;" v-show="showThree">
+            <el-tabs class="rightTabs" v-model="activeName_two">
                 <el-input style="width:50%;" @input="searchProjectTeamAction"
                           @keyup.enter.native='searchProjectTeamAction'
                           v-model.trim="search_project_team_keyword"
                           placeholder="请输入项目组套名称" :clearable="true"></el-input>
                 <div style="width: 100%;flex:1;overflow-y: auto;">
                   <el-table :data="tabPrjectTeam" border ref="tabProjectTeam"
-                            :height="multipleTableHeight != '' ? multipleTableHeight : '200'"
+                            :height="multipleTableHeight != '' ? multipleTableHeight : '700'"
                             :row-style="{ color: '#303133' }"
                             :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                             highlight-current-row
@@ -524,9 +528,9 @@
                     </el-table-column>
                   </el-table>
                 </div>
-              </el-tab-pane>
             </el-tabs>
           </div>
+
         </el-tabs>
         <template>
 
@@ -737,6 +741,7 @@ export default {
       currenet_inedx: 0,
       rightTab: 1,
       activeName: '1',
+      activeName_two:'3',
       drug_activeName: '1',
       curPrescriptions: null,
       curMonthPrescriptions: this.month_prescriptions[0],
@@ -757,6 +762,7 @@ export default {
       strids: '',
       showOne: true,
       showTwo: false,
+      showThree:false,
       tableData: [],
       tabPrjectTeam: [],
       allTabPrjectTeam: [],
@@ -1621,6 +1627,7 @@ export default {
             this.rightTab = 1
             this.showOne = true
             this.showTwo = false
+            this.showThree = false
           }
           if (this.prescriptions[0].advices.length == 0 && this.prescriptions[0].project.length > 0) {
             this.customTabIndex = 2
@@ -1628,6 +1635,8 @@ export default {
             this.rightTab = 2
             this.showTwo = true
             this.showOne = false
+            this.showThree = false
+
           }
         }
       }
@@ -1686,6 +1695,8 @@ export default {
             this.rightTab = 1
             this.showOne = true
             this.showTwo = false
+            this.showThree = false
+
           }
 
           if (this.prescriptions[0].advices.length == 0 && this.prescriptions[0].project.length > 0) {
@@ -1694,6 +1705,8 @@ export default {
             this.rightTab = 2
             this.showTwo = true
             this.showOne = false
+            this.showThree = false
+
           }
         }
       }
@@ -2153,6 +2166,8 @@ export default {
             this.rightTab = 1
             this.showOne = true
             this.showTwo = false
+            this.showThree = false
+
           }
           if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0) {
 
@@ -2162,6 +2177,8 @@ export default {
 
             this.showTwo = true
             this.showOne = false
+            this.showThree = false
+
           }
 
           if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
@@ -2298,6 +2315,8 @@ export default {
         this.rightTab = 1
         this.showOne = true
         this.showTwo = false
+        this.showThree = false
+
       }
 
       if (this.curPrescriptions.project.length > 0 && this.curPrescriptions.advices.length == 0) {
@@ -2306,6 +2325,8 @@ export default {
         this.rightTab = 2
         this.showOne = false
         this.showTwo = true
+        this.showThree = false
+
       }
 
       if (this.curPrescriptions.project.length == 0 && this.curPrescriptions.advices.length == 0) {
@@ -2314,6 +2335,8 @@ export default {
         this.rightTab = 1
         this.showOne = true
         this.showTwo = false
+        this.showThree = false
+
       }
 
       if (info.prescription_status == 0) {
@@ -2357,6 +2380,7 @@ export default {
 
       //
       // if (this.org_id == 10598 || this.org_id == 0) {
+      // if (this.org_id == 10598 || this.org_id == 0) {
       //   this.state1 = 662
       // }
 
@@ -2489,7 +2513,7 @@ export default {
         this.state1 = 607
       }
 
-      if (this.org_id == 10598 || this.org_id == 0) {
+      if (this.org_id == 10598 ) {
         this.state1 = 693
       }
 
@@ -2500,13 +2524,26 @@ export default {
         }
       }
 
-      if (this.org_id == 10206 || this.org_id == 0) {
+      if (this.org_id == 10206) {
         this.departmentValue = 263
         if (this.diagnose.length == 0) {
           this.diagnose.push(716)
         }
       }
 
+      if (this.org_id == 10726) {
+        this.doctorValue = 5835
+
+      }
+
+      if (this.org_id == 9478 ) {
+        this.state1 = 827
+      }
+
+      if (this.patientInfo.id == 38626 ) {
+        this.state1 = 828
+      }
+
     },
     setMonthData(info, admin_info, doctors, department, hisPatientInfo, month_data, last_info) {
       // this.start_time = moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD')
@@ -3675,6 +3712,8 @@ export default {
 
         this.showOne = true
         this.showTwo = false
+        this.showThree = false
+
         this.$nextTick(() => {
           this.$refs.prescription_tables.setNewData(this.prescriptions[this.prescriptions.length - 1])
         })
@@ -3686,6 +3725,22 @@ export default {
 
         this.showTwo = true
         this.showOne = false
+        this.showThree = false
+
+        this.$nextTick(() => {
+          this.$refs.prescription_tables.setNewData(this.prescriptions[this.prescriptions.length - 1])
+        })
+        this.customTabIndex = 2
+      }
+
+      if (index == 3) {
+        this.curDrugs = []
+        this.$refs.multipleTable.clearSelection()
+
+        this.showTwo = false
+        this.showOne = false
+        this.showThree = true
+
         this.$nextTick(() => {
           this.$refs.prescription_tables.setNewData(this.prescriptions[this.prescriptions.length - 1])
         })
@@ -3705,8 +3760,8 @@ export default {
       }
       if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
         // this.customTabIndex = this.rightTab
-        this.customTabIndex = index
-        this.curStatus = 0
+        this.customTabIndex = 2
+        this.curStatus = 2
 
       }
 
@@ -3891,15 +3946,6 @@ export default {
         }
       }
 
-      // for (let i = 0; i < templateDrugs.length; i++) {
-      //   for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
-      //     if (this.templateDrugs[i].drug_id == this.curPrescriptions.advices[i].id) {
-      //       this.$message.error('改处方存在相同的药品，无法添加相同的药品')
-      //       return
-      //
-      //     }
-      //   }
-      // }
 
       //大丰限制用药提醒逻辑
       var temp = this.deepClone(this.curDrugs)
@@ -4112,7 +4158,7 @@ export default {
           if (this.prescriptions[i].name == this.editableTabsValue) {
             var temp = this.deepClone(this.curDrugs)
             var temp2 = this.deepClone(this.teamList)
-
+            console.log(this.teamList)
             var temp3 = this.deepClone(templateDrugs)
 
             if (temp3.length > 0) {
@@ -4128,7 +4174,6 @@ export default {
                   remark: '',
                   day: '1',
                   is_medicine:0,
-
                   prescribing_number: temp3[b].prescribing_number,
                   single_dose_unit: temp3[b].drug.drug_dose_unit,
                   prescribing_number_unit: temp3[b].drug.prescribing_number_unit,
@@ -4227,61 +4272,131 @@ export default {
 
             }
 
+            var advices = []
             if (temp2.length > 0) {
               for (let b = 0; b < temp2.length; b++) {
-                let obj = {
-                  id: 0,
-                  project_id: temp2[b].id,
-                  project_name: temp2[b].project_name,
-                  statistical_classification: '',
-                  single_dose: temp2[b].single_dose.toString(),
-                  delivery_way: temp2[b].delivery_way,
-                  execution_frequency: temp2[b].execution_frequency,
-                  number_days: temp2[b].number_days.toString(),
-                  total: temp2[b].cus_total,
-                  price: temp2[b].price,
-                  remark: '',
-                  medical_code: temp2[b].medical_code,
-                  type: temp2[b].type,
-                  execution_state: 2
+                if(temp2[b].type == 1){
+                    if (temp2[b].max_unit == temp2[b].min_unit) {
+                      temp2[b].retail_price = temp2[b].min_price
+                    }
+                    let temp_index = 0
+                    if (this.org_id == 0 || this.org_id == 10206) {
+                      temp_index = maxIndexAdvice.groupno
+                    } else {
+                      temp_index = b + 1
+                    }
+                    let obj = {
+                      advice_id: 0,
+                      id: temp2[b].id,
+                      drug_name: temp2[b].drug.drug_name,
+                      single_dose: temp2[b].single_dose,
+                      delivery_way: temp2[b].delivery_way,
+                      execution_frequency: temp2[b].execution_frequency,
+                      retail_price: temp2[b].prescribing_number_unit == temp2[b].drug.max_unit ? temp2[b].drug.retail_price.toString() : temp2[b].drug.min_price.toString(),
+                      remark: '',
+                      day: temp2[b].day,
+                      prescribing_number: temp2[b].prescribing_number,
+                      single_dose_unit: temp2[b].single_dose_unit,
+                      prescribing_number_unit: temp2[b].prescribing_number_unit,
+                      medical_insurance_number: temp2[b].medical_insurance_number,
+                      drug: temp2[b].drug,
+                      groupno: index + temp_index,
+                      hosp_appr_flag: '1',
+                      execution_state: 2,
+                      is_medicine:0,
+                    }
+                    if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
+                      obj.prescribing_number = 1
+                    }
+                  advices.push(obj)
+                }else{
+                  let obj = {
+                    id: 0,
+                    project_id: temp2[b].id,
+                    project_name: temp2[b].project_name,
+                    statistical_classification: '',
+                    single_dose: temp2[b].single_dose.toString(),
+                    delivery_way: temp2[b].delivery_way,
+                    execution_frequency: temp2[b].execution_frequency,
+                    number_days: temp2[b].number_days.toString(),
+                    total: temp2[b].cus_total,
+                    price: temp2[b].price,
+                    remark: '',
+                    medical_code: temp2[b].medical_code,
+                    type: temp2[b].type,
+                    execution_state: 2
 
-                }
+                  }
+                  if (temp2[b].type == 2) {
+                    obj['project'] = temp2[b].project
+                    obj['unit'] = temp2[b].project.unit
 
-                if (temp2[b].type == 2) {
-                  obj['project'] = temp2[b].project
-                  obj['unit'] = temp2[b].project.unit
+                  } else if (temp2[b].type == 3) {
+                    obj['good_info'] = temp2[b].good_info
+                    obj['unit'] = temp2[b].good_info.packing_unit
 
-                } else if (temp2[b].type == 3) {
-                  obj['good_info'] = temp2[b].good_info
-                  obj['unit'] = temp2[b].good_info.packing_unit
+                  }
+                  if (temp2[b].team_id == undefined) {
+                    obj['team_id'] = 0
+                  } else {
+                    obj['team_id'] = temp2[b].team_id
+                  }
+                  if (obj.total == 0 || obj.total == undefined) {
+                    obj.total = 1
+                  }
+                  if (obj.type == 3) {
+                    obj.single_dose = 1
+                  }
 
+                  this.prescriptions[i].project.push(obj)
                 }
-                if (temp2[b].team_id == undefined) {
-                  obj['team_id'] = 0
+                this.curStatus = 2
+              }
+            }
+
+            var nowDate = new Date()
+            var nowYear = nowDate.getFullYear()
+            var nowMonth = nowDate.getMonth() + 1
+            var nowDay = nowDate.getDate()
+            var hours = nowDate.getHours()
+            var min = nowDate.getMinutes()
+            var nowTime =
+              nowYear +
+              '-' +
+              (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+              '-' +
+              (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (hours < 10 ? '0' + hours : hours) +
+              ':' + (min < 10 ? '0' + min : min)
+            if(advices.length > 0){
+              let index = this.prescriptions.length + 1
+              let obj = {
+                id: 0,
+                name: '处方' + index,
+                advices: advices,
+                project: [],
+                addition: [],
+                diagnose: [],
+                order_status: 0,
+                pre_time: nowTime,
+                med_type: "",
+                is_medicine_status: 0,
+              }
+              if (obj.med_type == 0 || obj.med_type == '') {
+                if (this.org_id != 10206) {
+                  obj.med_type = 14
+                  if (this.org_id == 10721 || this.org_id == 0){
+
+                    obj.med_type = 992102
+                  }
                 } else {
-                  obj['team_id'] = temp2[b].team_id
+                  obj.med_type = 1
                 }
-                if (obj.total == 0 || obj.total == undefined) {
-                  obj.total = 1
-                }
-                if (obj.type == 3) {
-                  obj.single_dose = 1
+              }else{
+                if (this.org_id == 10721 || this.org_id == 0){
+                  obj.med_type = 992102
                 }
-                // 针对灵山圣康
-                // if (this.org_id == 0 || this.org_id == 10375) {
-
-                //   if (this.prescriptions[i] != null) {
-
-                //     if (this.prescriptions[i].project.length >= 5) {
-                //       this.$message.error('添加条数已经大于5条,添加失败!')
-                //       return false
-                //     }
-
-                //   }
-                // }
-                this.prescriptions[i].project.push(obj)
               }
-              this.curStatus = 2
+              this.prescriptions.push(obj)
             }
 
             this.curPrescriptions = this.prescriptions[i]
@@ -4515,11 +4630,14 @@ export default {
       for (let i = 0; i < row.length; i++) {
         let team_id = row[i].id
         const params = {
-          project_id: row[i].item_id
+          project_id: row[i].item_id,
+          drug_id: row[i].drug_item_id,
         }
         getPojectListById(params).then(response => {
           if (response.data.state == 1) {
             var project = response.data.data.project
+            var advice = response.data.data.advice
+
             let num = 0
             for (let i = 0; i < project.length; i++) {
               if (project[i].type == 2 && project[i].status == 1) {
@@ -4589,6 +4707,49 @@ export default {
               }
             }
 
+            for (let i = 0; i < advice.length; i++) {
+                if (advice[i].drug.sum_count <= 0 && this.org_id != 10206) {
+                  num++
+                  this.$refs.tabProjectTeam.toggleRowSelection(row)
+                  this.$message.error(advice[i].drug.drug_name  + '库存不足')
+                }
+
+                if (project[i].good_info.zuobiao_stock_num <= 0 && this.org_id == 10206) {
+                  num++
+                  this.$refs.tabProjectTeam.toggleRowSelection(row)
+                  this.$message.error(advice[i].drug.drug_name + '库存不足')
+                }
+
+                if (num > 0) {
+                  this.$refs.tabProjectTeam.clearSelection()
+                }
+
+                let obj = {
+                  advice_id: 0,
+                  id: advice[i].drug_id,
+                  drug_name: advice[i].drug_name,
+                  single_dose: advice[i].single_dose,
+                  delivery_way: advice[i].delivery_way,
+                  execution_frequency: advice[i].execution_frequency,
+                  retail_price: advice[i].prescribing_number_unit == advice[i].drug.max_unit ? advice[i].drug.retail_price.toString() : advice[i].drug.min_price.toString(),
+                  remark: '',
+                  day: advice[i].day_count,
+                  prescribing_number: advice[i].prescribing_number,
+                  single_dose_unit: advice[i].single_dose_unit,
+                  prescribing_number_unit: advice[i].prescribing_number_unit,
+                  medical_insurance_number: advice[i].drug.medical_insurance_number,
+                  drug: advice[i].drug,
+                  groupno: i,
+                  type:1,
+                  hosp_appr_flag: '1',
+                  execution_state: 2,
+                  is_medicine:0,
+                }
+                if (obj.cus_total == 0 || obj.cus_total == undefined) {
+                  obj.cus_total = 1
+                }
+                teamList.push(obj)
+            }
             this.teamList = teamList
           }
         })
@@ -5184,7 +5345,7 @@ p {
 }
 
 .el-tabs__item {
-  width: 50%;
+  width: 30%;
   text-align: center;
 }