Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/outpatientTool/components/pdetail.vue

@@ -114,7 +114,7 @@
       </el-table-column>
 
       <el-table-column align="center" prop="price" label="单价">
-        <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
+        <template slot-scope="scope">{{scope.row.price}}</template>
       </el-table-column>
 
       <el-table-column align="center" prop="sum" label="金额">
@@ -552,7 +552,6 @@ export default {
                 newObj['item_id'] = orders[c].item_id
                 if (orders[c].p_type == 2) {
                   newObj['type'] = 2
-
                   newObj['item_spec'] = ""
                   newObj['item_name'] = orders[c].item_name
                 } else if (orders[c].p_type == 3) {
@@ -567,126 +566,126 @@ export default {
             tempPatientsTwo.push(obj)
           }
 
-          for (let d = 0; d < tempPatientsTwo.length; d++) {
-            tempPatientsTwo[d]['new_order_info'] = []
-            let project = []
-            let advice = []
-            for (let b = 0; b < tempPatientsTwo[d].order_info.length; b++) {
-              if (tempPatientsTwo[d].order_info[b].type == 1) {
-                advice.push(tempPatientsTwo[d].order_info[b])
-              } else {
-                project.push(tempPatientsTwo[d].order_info[b])
-              }
-            }
-            project = this.uniqueProjectAndAdvice(project)
-            advice = this.uniqueProjectAndAdvice(advice)
-
-            for (let i = 0; i < project.length; i++) {
-              let obj = {}
-              let count = 0
-              for (let a = 0; a < tempPatientsTwo[d].order_info.length; a++) {
-                if (project[i].item_id == tempPatientsTwo[d].order_info[a].item_id && project[i].price == tempPatientsTwo[d].order_info[a].price) {
-                  count = count + tempPatientsTwo[d].order_info[a].count
-                }
-              }
-
-              obj['price'] = project[i].price
-              obj['type'] = project[i].type
-              obj['item_name'] = project[i].item_name
-              obj['item_spec'] = project[i].item_spec
-
-              obj['order_status'] = project[i].order_status
-              obj['setl_time'] = project[i].setl_time
-
-              obj['med_type'] = project[i].med_type
-              obj['record_date'] = project[i].record_date
-              obj['item_cost_type'] = project[i].item_cost_type
-              obj['unit'] = project[i].unit
-
-
-              // obj['item_total'] = project[i].item_total
-
-              obj['item_id'] = project[i].item_id
-              obj['name'] = tempPatientsTwo[d].name
-              obj['patient_id'] = tempPatientsTwo[d].patient_id
-              obj['count'] = count
-              tempPatientsTwo[d].new_order_info.push(obj)
-            }
-
-            for (let i = 0; i < advice.length; i++) {
-              let obj = {}
-              let count = 0
-              for (let a = 0; a < tempPatientsTwo[d].order_info.length; a++) {
-                if (advice[i].item_id == tempPatientsTwo[d].order_info[a].item_id && advice[i].price == tempPatientsTwo[d].order_info[a].price) {
-                  count = count + tempPatientsTwo[d].order_info[a].count
-                }
-              }
-
-              obj['price'] = advice[i].price
-              obj['type'] = advice[i].type
-              obj['item_name'] = advice[i].item_name
-              obj['item_spec'] = advice[i].item_spec
-              obj['item_id'] = advice[i].item_id
-              obj['unit'] = advice[i].unit
-
-              obj['name'] = tempPatientsTwo[d].name
-              obj['order_status'] = advice[i].order_status
-              obj['setl_time'] = advice[i].setl_time
-
-              obj['med_type'] = advice[i].med_type
-              obj['record_date'] = advice[i].record_date
-              obj['item_cost_type'] = advice[i].item_cost_type
-              // obj['item_total'] = advice[i].item_total
-              obj['patient_id'] = tempPatientsTwo[d].patient_id
-              obj['count'] = count
-              tempPatientsTwo[d].new_order_info.push(obj)
-            }
-
-          }
           for (let i = 0; i < tempPatientsTwo.length; i++) {
-            let total = 0
-            for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
-              let new_name = tempPatientsTwo[i].new_order_info[b].item_name
-              if (new_name != undefined) {
-                if (new_name.length != 0) {
-                  console.log(parseFloat(tempPatientsTwo[i].new_order_info[b].count) * parseFloat(tempPatientsTwo[i].new_order_info[b].price))
-                  total = parseFloat(total) + parseFloat((parseFloat(tempPatientsTwo[i].new_order_info[b].count) * parseFloat(tempPatientsTwo[i].new_order_info[b].price)).toFixed(2))
-                }
-
-              }
-
+            for (let b = 0; b < tempPatientsTwo[i].order_info.length; b++) {
+            let obj = {
+              name: tempPatientsTwo[i].name,
+              patient_id: tempPatientsTwo[i].patient_id,
+              price: tempPatientsTwo[i].order_info[b].price,
+              type: tempPatientsTwo[i].order_info[b].type,
+              item_name: tempPatientsTwo[i].order_info[b].item_name,
+              item_id: tempPatientsTwo[i].order_info[b].item_id,
+              count: tempPatientsTwo[i].order_info[b].count,
+              item_spec: tempPatientsTwo[i].order_info[b].item_spec,
+              order_status: tempPatientsTwo[i].order_info[b].order_status,
+              setl_time: tempPatientsTwo[i].order_info[b].setl_time,
+              med_type: tempPatientsTwo[i].order_info[b].med_type,
+              record_date: tempPatientsTwo[i].order_info[b].record_date,
+              item_cost_type: tempPatientsTwo[i].order_info[b].item_cost_type,
+              unit: tempPatientsTwo[i].order_info[b].unit,
+              sum: parseFloat(tempPatientsTwo[i].order_info[b].price * tempPatientsTwo[i].order_info[b].count).toFixed(2),
             }
-            tempPatientsTwo[i]['total'] = total
+            this.tableData.push(obj)
           }
-          for (let i = 0; i < tempPatientsTwo.length; i++) {
-            // console.log(111,tempPatientsTwo[i].total)
-            if (tempPatientsTwo[i].new_order_info.length > 0) {
+        }
 
-              for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
+          // for (let d = 0; d < tempPatientsTwo.length; d++) {
+          //   tempPatientsTwo[d]['new_order_info'] = []
+          //   let project = []
+          //   let advice = []
+          //   for (let b = 0; b < tempPatientsTwo[d].order_info.length; b++) {
+          //     if (tempPatientsTwo[d].order_info[b].type == 1) {
+          //       advice.push(tempPatientsTwo[d].order_info[b])
+          //     } else {
+          //       project.push(tempPatientsTwo[d].order_info[b])
+          //     }
+          //   }
+          //   project = this.uniqueProjectAndAdvice(project)
+          //   advice = this.uniqueProjectAndAdvice(advice)
+          //
+          //   for (let i = 0; i < project.length; i++) {
+          //     let obj = {}
+          //     let count = 0
+          //     for (let a = 0; a < tempPatientsTwo[d].order_info.length; a++) {
+          //       if (project[i].item_id == tempPatientsTwo[d].order_info[a].item_id && project[i].price == tempPatientsTwo[d].order_info[a].price) {
+          //         count = count + tempPatientsTwo[d].order_info[a].count
+          //       }
+          //     }
+          //
+          //     obj['price'] = project[i].price
+          //     obj['type'] = project[i].type
+          //     obj['item_name'] = project[i].item_name
+          //     obj['item_spec'] = project[i].item_spec
+          //
+          //     obj['order_status'] = project[i].order_status
+          //     obj['setl_time'] = project[i].setl_time
+          //
+          //     obj['med_type'] = project[i].med_type
+          //     obj['record_date'] = project[i].record_date
+          //     obj['item_cost_type'] = project[i].item_cost_type
+          //     obj['unit'] = project[i].unit
+          //
+          //
+          //     // obj['item_total'] = project[i].item_total
+          //
+          //     obj['item_id'] = project[i].item_id
+          //     obj['name'] = tempPatientsTwo[d].name
+          //     obj['patient_id'] = tempPatientsTwo[d].patient_id
+          //     obj['count'] = count
+          //     tempPatientsTwo[d].new_order_info.push(obj)
+          //   }
+          //
+          //   for (let i = 0; i < advice.length; i++) {
+          //     let obj = {}
+          //     let count = 0
+          //     for (let a = 0; a < tempPatientsTwo[d].order_info.length; a++) {
+          //       if (advice[i].item_id == tempPatientsTwo[d].order_info[a].item_id && advice[i].price == tempPatientsTwo[d].order_info[a].price) {
+          //         count = count + tempPatientsTwo[d].order_info[a].count
+          //       }
+          //     }
+          //
+          //     obj['price'] = advice[i].price
+          //     obj['type'] = advice[i].type
+          //     obj['item_name'] = advice[i].item_name
+          //     obj['item_spec'] = advice[i].item_spec
+          //     obj['item_id'] = advice[i].item_id
+          //     obj['unit'] = advice[i].unit
+          //
+          //     obj['name'] = tempPatientsTwo[d].name
+          //     obj['order_status'] = advice[i].order_status
+          //     obj['setl_time'] = advice[i].setl_time
+          //
+          //     obj['med_type'] = advice[i].med_type
+          //     obj['record_date'] = advice[i].record_date
+          //     obj['item_cost_type'] = advice[i].item_cost_type
+          //     // obj['item_total'] = advice[i].item_total
+          //     obj['patient_id'] = tempPatientsTwo[d].patient_id
+          //     obj['count'] = count
+          //     tempPatientsTwo[d].new_order_info.push(obj)
+          //   }
+          //
+          // }
+          // for (let i = 0; i < tempPatientsTwo.length; i++) {
+          //   let total = 0
+          //   for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
+          //     let new_name = tempPatientsTwo[i].new_order_info[b].item_name
+          //     if (new_name != undefined) {
+          //       if (new_name.length != 0) {
+          //         console.log(parseFloat(tempPatientsTwo[i].new_order_info[b].count) * parseFloat(tempPatientsTwo[i].new_order_info[b].price))
+          //         total = parseFloat(total) + parseFloat((parseFloat(tempPatientsTwo[i].new_order_info[b].count) * parseFloat(tempPatientsTwo[i].new_order_info[b].price)).toFixed(2))
+          //       }
+          //
+          //     }
+          //
+          //   }
+          //   tempPatientsTwo[i]['total'] = total
+          // }
+          // for (let i = 0; i < tempPatientsTwo.length; i++) {
+          //   // console.log(111,tempPatientsTwo[i].total)
+          //   if (tempPatientsTwo[i].new_order_info.length > 0) {
+          //
 
-                let obj = {
-                  name: tempPatientsTwo[i].name,
-                  patient_id: tempPatientsTwo[i].patient_id,
-                  price: tempPatientsTwo[i].new_order_info[b].price,
-                  type: tempPatientsTwo[i].new_order_info[b].type,
-                  item_name: tempPatientsTwo[i].new_order_info[b].item_name,
-                  item_id: tempPatientsTwo[i].new_order_info[b].item_id,
-                  count: tempPatientsTwo[i].new_order_info[b].count,
-                  item_spec: tempPatientsTwo[i].new_order_info[b].item_spec,
-                  order_status: tempPatientsTwo[i].new_order_info[b].order_status,
-                  setl_time: tempPatientsTwo[i].new_order_info[b].setl_time,
-
-                  med_type: tempPatientsTwo[i].new_order_info[b].med_type,
-                  record_date: tempPatientsTwo[i].new_order_info[b].record_date,
-                  item_cost_type: tempPatientsTwo[i].new_order_info[b].item_cost_type,
-                  unit: tempPatientsTwo[i].new_order_info[b].unit,
-                }
-                obj['sum'] = parseFloat(tempPatientsTwo[i].new_order_info[b].price * tempPatientsTwo[i].new_order_info[b].count).toFixed(2)
-                obj['total'] = tempPatientsTwo[i].total
-                this.tableData.push(obj)
-              }
-            }
-          }
+          // }
           console.log(this.tableData)
           this.handleSpanTempArr()
           console.log(this.tableData)