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

@@ -126,6 +126,10 @@
       <el-table-column align="center" prop="name" label="是否结算">
         <template slot-scope="scope">{{scope.row.order_status == 2?'已结算':'未结算'}}</template>
       </el-table-column>
+
+      <el-table-column align="center" prop="name" label="结算时间">
+        <template slot-scope="scope">{{scope.row.order_status == 2?scope.row.setl_time:''}}</template>
+      </el-table-column>
     </el-table>
   </div>
 
@@ -528,6 +532,8 @@ export default {
               newObj['price'] = orders[c].pric
 
               newObj['order_status'] = orders[c].order_status
+              newObj['setl_time'] = orders[c].setl_time
+
               newObj['med_type'] = orders[c].med_type
               newObj['record_date'] = orders[c].record_date
               newObj['unit'] = orders[c].unit
@@ -590,6 +596,8 @@ export default {
               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
@@ -623,6 +631,8 @@ export default {
 
               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
@@ -664,6 +674,8 @@ export default {
                   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,