新分支

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -1227,6 +1227,7 @@
             <td>医嘱</td>
             <td width='80'>执行时间</td>
             <td width='80'>执行者签名</td>
+            <td width='80'>核对人签名</td>
           </tr>
           <tr v-for="(advice, advice_index) in tableAdvice" :key="advice_index" >
             <td>{{ getTime(advice.start_time, "{y}-{m}-{d}") }}</td>
@@ -1259,6 +1260,14 @@
                 <img style="height:30px;" :src="setAdminUserES(advice.execution_staff)" alt srcset />
               </span>
             </td>
+            <td>
+              <span v-if="setAdminUserES(advice.checker) == ''">
+                {{ getAdminUser(advice.checker) }}
+              </span>
+              <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+                <img style="height:30px;" :src="setAdminUserES(advice.checker)" alt srcset />
+              </span>
+            </td>
           </tr>
         </table>
       </div>

src/xt_pages/outpatientTool/components/detail.vue

@@ -27,6 +27,19 @@
                           :value="item.id">
                   </el-option>
               </el-select>
+
+            <el-select size="small" v-model="item_time_type" placeholder="请选择"
+                       style="width:150px;margin-left:10px;" @change="changeTimeItem">
+              <el-option
+                label="处方时间"
+                value="0">
+              </el-option>
+              <el-option
+                label="结算时间"
+                value="1">
+              </el-option>
+            </el-select>
+
               <el-date-picker
                       v-model="chargeDate"
                       type="daterange"
@@ -137,6 +150,7 @@ export default {
       tableData: [],
       chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
       item_type: '0',
+      item_time_type:'0',
       items: [
         { id: 1, name: '药品' },
         { id: 2, name: '项目' },
@@ -287,6 +301,10 @@ export default {
     },
     changeItem() {
       this.getSummaryDetailList()
+    },changeTimeItem(){
+
+      this.getSummaryDetailList()
+
     },
     searchAction() {
       this.item_type = '0'
@@ -392,7 +410,8 @@ export default {
         start_time: start_time,
         end_time: end_time,
         type: this.item_type,
-        keyword: this.keywords
+        keyword: this.keywords,
+        time_type:this.item_time_type
       }
       GetSummaryDetail(params).then(response => {
         if (response.data.state == 0) {

src/xt_pages/outpatientTool/components/gather.vue

@@ -24,6 +24,17 @@
             :value="item.id">
           </el-option>
         </el-select>
+        <el-select size="small" v-model="item_time_type" placeholder="请选择"
+                   style="width:150px;margin-left:10px;" @change="changeTimeItem">
+          <el-option
+            label="处方时间"
+            value="0">
+          </el-option>
+          <el-option
+            label="结算时间"
+            value="1">
+          </el-option>
+        </el-select>
         <el-date-picker
           v-model="chargeDate"
           type="daterange"
@@ -105,6 +116,7 @@ export default {
       tableData: [],
       chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
       item_type: '0',
+      item_time_type:'0',
       items: [
         { id: 1, name: '药品' },
         { id: 2, name: '项目' },
@@ -138,6 +150,8 @@ export default {
     changeDate() {
       // console.log(this.chargeDate)
       this.getSummaryDetailList()
+    },changeTimeItem(){
+      this.getSummaryDetailList()
     },
     changeItem() {
       this.getSummaryDetailList()
@@ -157,7 +171,8 @@ export default {
         start_time: start_time,
         end_time: end_time,
         type: this.item_type,
-        keyword: this.keywords
+        keyword: this.keywords,
+        time_type:this.item_time_type,
       }
       GetSummaryDetail(params).then(response => {
         if (response.data.state == 0) {