优化处方单和订单样式

src/views/hisStore/storeAfterSales/index.vue

@@ -148,9 +148,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="处方编号" prop="pid">
+      <el-form-item label="处方编号" prop="serialNo">
         <el-input
-          v-model="queryParams.pid"
+          v-model="queryParams.serialNo"
           clearable
           placeholder="请输入处方编号"
           size="small"
@@ -181,7 +181,7 @@
       <el-table-column label="所属公司" align="center" prop="companyName" />
       <el-table-column label="所属员工" align="center" prop="companyUserNickName" />
       <el-table-column label="订单单号" align="center" prop="orderCode" />
-      <el-table-column align="center" label="处方编号" prop="pid"/>
+      <el-table-column align="center" label="处方编号" prop="serialNo"/>
       <el-table-column label="会员手机号" align="center" prop="userPhone" />
       <el-table-column label="退款金额" align="center" prop="refundAmount" />
        <el-table-column label="退款类型" align="center" prop="serviceType" >

src/views/hisStore/storeOrder/healthStoreList.vue

@@ -189,9 +189,9 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="处方编号" prop="pid">
+      <el-form-item label="处方编号" prop="serialNo">
         <el-input
-          v-model="queryParams.pid"
+          v-model="queryParams.serialNo"
           clearable
           placeholder="请输入处方编号"
           size="small"
@@ -339,7 +339,7 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="处方编号" prop="pid"/>
+      <el-table-column align="center" label="处方编号" prop="serialNo"/>
       <!--      <el-table-column label="订单类型" align="center" prop="orderType" >
                 <template slot-scope="scope">
                     <el-tag prop="status" v-for="(item, index) in orderTypeOptions"    v-if="scope.row.orderType==item.dictValue">{{item.dictLabel}}</el-tag>

src/views/hisStore/storeOrder/index.vue

@@ -193,9 +193,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="处方编号" prop="pid">
+      <el-form-item label="处方编号" prop="serialNo">
         <el-input
-          v-model="queryParams.pid"
+          v-model="queryParams.serialNo"
           clearable
           placeholder="请输入处方编号"
           size="small"
@@ -346,7 +346,7 @@
               <el-tag prop="orderType" v-for="(item, index) in orderTypeOptions"    v-if="scope.row.orderType==item.dictValue">{{item.dictLabel}}</el-tag>
           </template>
       </el-table-column>
-      <el-table-column align="center" label="处方编号" prop="pid"/>
+      <el-table-column align="center" label="处方编号" prop="serialNo"/>
       <el-table-column label="订单产品" align="center" width="200px">
         <template slot-scope="scope">
           <div v-if="scope.row.items && scope.row.items.length > 0">

src/views/hisStore/storePrescription/index.vue

@@ -10,18 +10,27 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="药店名称" prop="storeName">
+<!--      <el-form-item label="药店名称" prop="storeName">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.storeName"-->
+<!--          placeholder="请输入药店名称"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="店铺名称" prop="storeSysName">
         <el-input
-          v-model="queryParams.storeName"
-          placeholder="请输入药店名称"
+          v-model="queryParams.storeSysName"
+          placeholder="请输入店铺名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="处方编号" prop="pid">
+      <el-form-item label="处方编号" prop="serialNo">
         <el-input
-          v-model="queryParams.pid"
+          v-model="queryParams.serialNo"
           placeholder="请输入处方编号"
           clearable
           size="small"
@@ -136,10 +145,11 @@
 
     <el-table v-loading="loading" :data="prescriptionList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="处方编号" align="center" prop="pid" />
+      <el-table-column label="处方编号" align="center" prop="serialNo" />
       <el-table-column label="订单编号" align="center" prop="orderCode" />
-      <el-table-column label="医院名称" align="center" prop="hospitalName" />
-      <el-table-column label="药店名称" align="center" prop="storeName" />
+      <el-table-column label="店铺名称" align="center" prop="storeSysName" />
+<!--      <el-table-column label="医院名称(580系统)" align="center" prop="hospitalName" />-->
+<!--      <el-table-column label="药店名称(580系统)" align="center" prop="storeName" />-->
       <el-table-column label="患者姓名" align="center" prop="userFamilyName" />
       <el-table-column label="患者手机号" align="center" prop="userFamilyPhone" />
       <el-table-column label="患者性别" align="center" prop="userFamilyGender">
@@ -210,7 +220,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="药店名称" prop="storeName">
+<!--            <el-form-item label="药店名称" prop="storeName">-->
+<!--              <el-input v-model="form.storeName" placeholder="请输入药店名称" />-->
+<!--            </el-form-item>-->
+            <el-form-item label="店铺名称" prop="storeName">
               <el-input v-model="form.storeName" placeholder="请输入药店名称" />
             </el-form-item>
           </el-col>
@@ -357,6 +370,9 @@ export default {
         storeName: [
           { required: true, message: "药店名称不能为空", trigger: "blur" }
         ],
+        storeSysName: [
+          { required: true, message: "药店名称不能为空", trigger: "blur" }
+        ],
         userFamilyName: [
           { required: true, message: "患者姓名不能为空", trigger: "blur" }
         ],