添加订单号

src/views/decoct/pack/index.vue

@@ -27,6 +27,16 @@
         <el-form-item label="快捷查询:">
           <el-input v-model="filterForm.code" placeholder="请输入患者姓名/处方号" size="mini"></el-input>
         </el-form-item>
+        <el-form-item label="" prop="orderNo">
+          <el-input
+            v-model="filterForm.orderNo"
+            class="defwidth"
+            placeholder="请输入订单号"
+            clearable
+            size="small"
+            @keyup.enter.native="handleSearch"
+          />
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" size="mini" @click="handleSearch">搜索</el-button>
           <el-button size="mini" @click="handleClear">清空</el-button>
@@ -42,6 +52,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="hospitalName" label="医疗机构" min-width="180" align="center"></el-table-column>
+        <el-table-column prop="orderNo" label="订单号" min-width="180" align="center"></el-table-column>
         <el-table-column prop="preNo" label="处方号" min-width="200" align="center"></el-table-column>
         <el-table-column prop="name" label="患者" min-width="120" align="center"></el-table-column>
         <el-table-column prop="sex" label="性别" min-width="80" align="center"></el-table-column>
@@ -99,6 +110,7 @@ export default {
         startTime: now,
         endTime: now,
         name: '',
+        orderNo: '',
         code: ''
       },
       tableData: [],
@@ -125,6 +137,7 @@ export default {
         startTime: now,
         endTime: now,
         name: '',
+        orderNo: '',
         code: ''
       }
     },

src/views/decoct/recipe/components/detailPage.vue

@@ -27,6 +27,7 @@
       </div>
       <div class="common-title mt-20">
         <span>处方信息</span>
+        <span style="margin-left: 20px;">订单号：{{detailInfo.orderNo}}</span>
         <span style="margin-left: 20px;">处方号：{{detailInfo.preNo}}</span>
       </div>
       <div class="msg-row">

src/views/decoct/recipe/components/editOption.vue

@@ -24,6 +24,7 @@
       </div>
       <div class="common-title mt-20">
         <span>处方信息</span>
+        <span style="margin-left: 20px;">订单号：{{detailInfo.orderNo}}</span>
         <span style="margin-left: 20px;">处方号：{{ detailInfo.preNo }}</span>
       </div>
       <div class="msg-row">

src/views/decoct/recipe/index.vue

@@ -68,6 +68,16 @@
         <el-form-item label="快捷查询:">
           <el-input v-model="filterForm.code" placeholder="请输入患者姓名/处方号" size="mini"></el-input>
         </el-form-item>
+        <el-form-item label="" prop="orderNo">
+          <el-input
+            v-model="filterForm.orderNo"
+            class="defwidth"
+            placeholder="请输入订单号"
+            clearable
+            size="small"
+            @keyup.enter.native="handleSearch"
+          />
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" size="mini" @click="handleSearch">搜索</el-button>
           <el-button size="mini" @click="handleClear">清空</el-button>
@@ -83,6 +93,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="yijgName" label="医疗机构" width="180" align="center"></el-table-column>
+        <el-table-column prop="orderNo" label="订单号" min-width="180" align="center"></el-table-column>
         <el-table-column prop="preNo" label="处方号" min-width="180" align="center"></el-table-column>
         <el-table-column prop="name" label="患者" min-width="120" align="center"></el-table-column>
         <el-table-column prop="sex" label="性别" min-width="80" align="center"></el-table-column>
@@ -233,6 +244,7 @@ export default {
         printFlag: '',
         schemeConfirmed: '',
         dosageForm: '',
+        orderNo: '',
         code: ''
       },
       tableData: [],
@@ -279,6 +291,7 @@ export default {
         takingMethod: '',
         printFlag: '',
         dosageForm: '',
+        orderNo: '',
         code: ''
       }
     },

src/views/decoct/steep/index.vue

@@ -27,6 +27,16 @@
         <el-form-item label="快捷查询:">
           <el-input v-model="filterForm.code" placeholder="请输入患者姓名/处方号" size="mini"></el-input>
         </el-form-item>
+        <el-form-item label="" prop="orderNo">
+          <el-input
+            v-model="filterForm.orderNo"
+            class="defwidth"
+            placeholder="请输入订单号"
+            clearable
+            size="small"
+            @keyup.enter.native="handleSearch"
+          />
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" size="mini" @click="handleSearch">搜索</el-button>
           <el-button size="mini" @click="handleClear">清空</el-button>
@@ -42,6 +52,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="hospitalName" label="医疗机构" min-width="180" align="center"></el-table-column>
+        <el-table-column prop="orderNo" label="订单号" min-width="180" align="center"></el-table-column>
         <el-table-column prop="preNo" label="处方号" min-width="200" align="center"></el-table-column>
         <el-table-column prop="name" label="患者" min-width="120" align="center"></el-table-column>
         <el-table-column prop="sex" label="性别" min-width="80" align="center"></el-table-column>
@@ -98,6 +109,7 @@ export default {
         startTime: now,
         endTime: now,
         name: '',
+        orderNo: '',
         code: ''
       },
       tableData: [],
@@ -124,6 +136,7 @@ export default {
         startTime: now,
         endTime: now,
         name: '',
+        orderNo: '',
         code: ''
       }
     },

src/views/pda/dispatch/index.vue

@@ -15,6 +15,7 @@ export default {
         date: [],
         name: '',
         expressCode: '',
+        orderNo: '',
         preNo: '',
         thread: '',
       },
@@ -111,6 +112,16 @@ export default {
               ></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="订单号" prop="orderNo">
+            <el-input
+              v-model="queryParams.orderNo"
+              class="defwidth"
+              placeholder="请输入订单号"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
           <el-form-item label="处方号" prop="preNo">
             <el-input
               style="width:160px"
@@ -125,7 +136,7 @@ export default {
             <el-input
               style="width:160px"
               v-model="queryParams.name"
-              placeholder="请输入处方号"
+              placeholder="请输入患者姓名"
               clearable
               size="small"
               @keyup.enter.native="handleQuery"
@@ -152,6 +163,7 @@ export default {
     <el-table v-loading="loading" :data="dataset" size="mini" border>
       <el-table-column type="index" width="55" align="center" label="序号"/>
       <el-table-column label="系统id" align="center" prop="id"/>
+      <el-table-column label="订单号" align="center" prop="orderNo"/>
       <el-table-column label="处方号" align="center" prop="preNo"/>
       <el-table-column label="医疗机构" align="center" prop="hospitalName"/>
       <el-table-column label="下单时间" align="center" prop="printTime"/>

src/views/pda/pack/twice.vue

@@ -18,6 +18,7 @@ export default {
         date: [],
         yljgId: '',
         name: '',
+        orderNo: '',
         code: '',
       },
       // 遮罩层
@@ -130,6 +131,16 @@ export default {
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+          <el-form-item label="" prop="orderNo">
+            <el-input
+              v-model="queryParams.orderNo"
+              class="defwidth"
+              placeholder="请输入订单号"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -145,6 +156,7 @@ export default {
       <el-table-column label="门诊/住院" align="center" prop="preMzZy">
         <template slot-scope="scope">{{ scope.row.preMzZy == 1 ? '门诊' : '住院' }}</template>
       </el-table-column>
+      <el-table-column label="订单号" align="center" prop="orderNo"/>
       <el-table-column label="处方号" align="center" prop="preNo"/>
       <el-table-column label="患者姓名" align="center" prop="name"/>
       <el-table-column label="性别" align="center" prop="sex"/>

src/views/pharmacyManagement/business/blend/index.vue

@@ -83,6 +83,16 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+          <el-form-item label="" prop="orderNo">
+            <el-input
+              v-model="queryParams.orderNo"
+              class="defwidth"
+              placeholder="请输入订单号"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
           <el-form-item>
             <el-button
               type="primary"
@@ -110,6 +120,7 @@
     >
       <el-table-column type="index" width="55" align="center" label="序号"/>
       <el-table-column label="医疗机构" align="center" prop="yijgName" show-overflow-tooltip/>
+      <el-table-column label="订单号" align="center" prop="orderNo"/>
       <el-table-column label="处方号" align="center" prop="preNo"/>
       <el-table-column label="门诊/住院" align="center" prop="preMzZy">
         <template slot-scope="scope">{{ scope.row.preMzZy == 1 ? '门诊' : '住院' }}</template>
@@ -203,6 +214,7 @@
       <div>
         <div style="display: flex; align-items: center;margin-bottom:20px;">
           <h3>处方信息</h3>
+          <div style="margin: 0 0 0 30px">订单号：{{ detailData.orderNo }}</div>
           <div style="margin: 0 0 0 30px">处方号：{{ detailData.preNo }}</div>
         </div>
         <div style="display: flex; align-items: center;">
@@ -497,6 +509,7 @@ export default {
         token: null,
         // 患者姓名/处方号
         reqStr: null,
+        orderNo: null,
         preNo: null,
         preName: null,
         name: null,

src/views/pharmacyManagement/business/deploy/index.vue

@@ -24,7 +24,16 @@
               ></el-option>
             </el-select>
           </el-form-item>
-
+          <el-form-item label="" prop="orderNo">
+            <el-input
+              v-model="queryParams.orderNo"
+              class="defwidth"
+              placeholder="请输入订单号"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
           <el-form-item label="" prop="preNo">
             <el-input
               style="width:160px"
@@ -97,6 +106,7 @@
       size="mini"
     >
       <el-table-column type="index" width="55" align="center" label="序号"/>
+      <el-table-column label="订单号" align="center" prop="orderNo" />
       <el-table-column label="处方号" align="center" prop="preNo" />
       <el-table-column label="医疗机构" align="center" prop="yijgName" />
       <el-table-column label="门诊/住院" align="center" prop="premzzy">
@@ -187,6 +197,7 @@
       <div>
         <div style="display: flex; align-items: center;margin-bottom:20px;">
           <h3>处方信息</h3>
+          <div style="margin: 0 0 0 30px">订单号：{{detailData.orderNo}}</div>
           <div style="margin: 0 0 0 30px">处方号：{{detailData.preNo}}</div>
         </div>
 
@@ -739,6 +750,7 @@ export default {
         yljgId: null,
         timeStamp: null,
         token: null,
+        orderNo: null,
         preNo: null,
         preName: null,
         name: null,
@@ -840,6 +852,7 @@ export default {
         yfId: null,
         timeStamp: null,
         token: null,
+        orderNo: null,
         preNo: null,
         preName: null,
         name: null,

src/views/rescription/Dispensing/index.vue

@@ -39,7 +39,16 @@
               ></el-option>
             </el-select>
           </el-form-item>
-
+          <el-form-item label="" prop="orderNo">
+            <el-input
+              v-model="queryParams.orderNo"
+              placeholder="请输入订单号"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+              style="width: 150px"
+            />
+          </el-form-item>
           <el-form-item label="" prop="preNo">
             <el-input
               v-model="queryParams.preNo"
@@ -193,6 +202,7 @@
       size="mini"
     >
       <el-table-column type="index" width="55" align="center" label="序号" />
+      <el-table-column label="订单号" show-overflow-tooltip align="center" prop="orderNo" />
       <el-table-column label="处方号" show-overflow-tooltip align="center" prop="preNo" />
       <el-table-column label="医疗机构" show-overflow-tooltip align="center" prop="yljgId" />
       <el-table-column label="科室" align="center" prop="department" />
@@ -299,6 +309,7 @@
        <div>
         <div style="display: flex; align-items: center;margin-bottom:20px;">
           <h3>处方信息</h3>
+          <div style="margin: 0 0 0 30px">订单号：{{detailData.orderNo}}</div>
           <div style="margin: 0 0 0 30px">处方号：{{detailData.preNo}}</div>
         </div>
         <div style="display: flex; align-items: center;">
@@ -344,7 +355,7 @@
               <el-descriptions-item label="煎药方式">{{
                 detailData.oralPre && detailData.oralPre.decoctingMethod
               }} <span v-if="detailData.oralPre && detailData.oralPre.decoctingMethod=='浓煎'">{{detailData.oralPre && detailData.oralPre.concentration}}</span></el-descriptions-item>
-              
+
               <!-- <el-descriptions-item
                 label="取药方式
               "
@@ -397,12 +408,12 @@
                 detailData.oralPre && detailData.oralPre.prescriptionTotleSum
               }}</el-descriptions-item>
             </el-descriptions>
-            <el-descriptions>  
+            <el-descriptions>
               <el-descriptions-item label="嘱托">{{
                 detailData.oralPre && detailData.oralPre.entrust
               }}</el-descriptions-item>
             </el-descriptions>
-            <el-descriptions>  
+            <el-descriptions>
               <el-descriptions-item label="收货地址">{{
                 detailData.address
               }}</el-descriptions-item>
@@ -627,6 +638,7 @@ export default {
         yljgId: null,
         timeStamp: null,
         token: null,
+        orderNo: null,
         preNo: null,
         preName: null,
         name: null,
@@ -854,4 +866,4 @@ h3 {
   width: 160px;
   margin: 0 auto;
 }
-</style> 
+</style>

src/views/rescription/prescriptionCore/index.vue

@@ -97,6 +97,16 @@
             </el-select>
           </el-form-item>
 
+          <el-form-item label="" prop="orderNo">
+            <el-input
+              v-model="queryParams.orderNo"
+              class="defwidth"
+              placeholder="请输入订单号"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
           <el-form-item label="" prop="preNo">
             <el-input
               v-model="queryParams.preNo"
@@ -157,6 +167,7 @@
       :row-class-name="tableRowClassName"
     >
       <el-table-column type="index" width="55" align="center" label="序号" />
+      <el-table-column label="订单号" align="center" prop="orderNo" />
       <el-table-column label="处方号" align="center" prop="preNo" />
       <el-table-column label="医疗机构" align="center" prop="yijgName" show-overflow-tooltip/>
       <el-table-column label="就诊科室" align="center" prop="department" show-overflow-tooltip/>
@@ -253,6 +264,7 @@
         <div class="_left">
           <div style="display: flex; align-items: center; margin-bottom: 20px">
             <h3>处方信息</h3>
+            <div style="margin: 0 0 0 30px">订单号：{{ detailData.orderNo }}</div>
             <div style="margin: 0 0 0 30px">处方号：{{ detailData.preNo }}</div>
             <div v-if="detailData.tzqyflag==1 && detailData.thread!=175" style="margin: 0 0 0 30px;color: red;">待取药</div>
           </div>
@@ -1472,6 +1484,7 @@ export default {
         timeStamp: null,
         token: null,
         preNo: null,
+        orderNo: null,
         preName: null,
         name: null,
         sex: null,

src/views/rescription/windows/index.vue

@@ -82,8 +82,11 @@
             >
             </el-date-picker>
           </el-form-item>
+          <el-form-item label="" prop="orderNo">
+            <el-input v-model="queryParams.orderNo" placeholder="订单号" @keyup.enter.native="handleQuery"></el-input>
+          </el-form-item>
           <el-form-item label="" prop="name">
-            <el-input v-model="queryParams.name" placeholder="处方名/姓名"></el-input>
+            <el-input v-model="queryParams.name" placeholder="处方名/姓名" @keyup.enter.native="handleQuery"></el-input>
           </el-form-item>
           <el-form-item>
             <el-button
@@ -401,6 +404,7 @@ export default {
         takingMethod: null,
         yfId: window.localStorage.getItem("pharmacyId"),
         type: null,
+        orderNo: '',
         name: ''
       },
       // 表单参数
@@ -642,4 +646,4 @@ export default {
 h3 {
   margin: 0;
 }
-</style> 
+</style>