礼赞订单优化

src/views/his/lifeSaluteOrder/index.vue

@@ -10,24 +10,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="商家订单号" prop="merchantOrderNo">
-        <el-input
-          v-model="queryParams.merchantOrderNo"
-          placeholder="请输入商家订单号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="平台订单号" prop="platformOrderNo">
-        <el-input
-          v-model="queryParams.platformOrderNo"
-          placeholder="请输入平台订单号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="运单号" prop="waybillNo">
         <el-input
           v-model="queryParams.waybillNo"
@@ -102,12 +84,11 @@
 
     <el-table v-loading="loading" border :data="orderList">
       <el-table-column label="系统订单号" align="center" prop="orderNo" width="180" show-overflow-tooltip />
-      <el-table-column label="商家订单号" align="center" prop="merchantOrderNo" width="150" show-overflow-tooltip />
-      <el-table-column label="平台订单号" align="center" prop="platformOrderNo" width="150" show-overflow-tooltip />
-      <el-table-column label="预制运单号" align="center" prop="preWaybillNo" width="150" show-overflow-tooltip />
+      <el-table-column label="销售姓名" align="center" prop="companyUserName" width="110" />
+      <el-table-column label="销售手机" align="center" width="130">
+        <template slot-scope="scope">{{ maskPhone(scope.row.companyUserPhone) }}</template>
+      </el-table-column>
       <el-table-column label="运单号" align="center" prop="waybillNo" width="150" show-overflow-tooltip />
-      <el-table-column label="处方编号" align="center" prop="prescriptionNo" width="150" show-overflow-tooltip />
-      <el-table-column label="处方人姓名" align="center" prop="prescriptionName" width="120" show-overflow-tooltip />
       <el-table-column label="患者年龄" align="center" prop="age" width="80" />
       <el-table-column label="患者性别" align="center" prop="sex" width="80" />
       <el-table-column label="病情描述" align="center" prop="illnessCondition" width="120" show-overflow-tooltip />
@@ -182,35 +163,16 @@
 
     <el-dialog v-if="open" :title="title" :visible.sync="open" width="900px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
-        <el-divider content-position="left">基础信息</el-divider>
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="预制运单号" prop="preWaybillNo">
-              <el-input v-model="form.preWaybillNo" placeholder="请输入预制运单号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="商家订单号" prop="merchantOrderNo">
-              <el-input v-model="form.merchantOrderNo" placeholder="请输入商家订单号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="平台订单号" prop="platformOrderNo">
-              <el-input v-model="form.platformOrderNo" placeholder="请输入平台订单号" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-divider content-position="left">处方信息</el-divider>
+        <el-divider content-position="left">销售信息</el-divider>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="处方编号" prop="prescriptionNo">
-              <el-input v-model="form.prescriptionNo" placeholder="请输入处方编号" />
+            <el-form-item label="销售姓名">
+              <el-input v-model="form.companyUserName" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="处方人姓名" prop="prescriptionName">
-              <el-input v-model="form.prescriptionName" placeholder="请输入处方人姓名" />
+            <el-form-item label="销售手机号">
+              <el-input v-model="form.companyUserPhone" :disabled="true" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -598,17 +560,8 @@
           <el-col :span="8">
             <el-form-item label="系统订单号">{{ details.data.orderNo }}</el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="商家订单号">{{ details.data.merchantOrderNo }}</el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="平台订单号">{{ details.data.platformOrderNo }}</el-form-item>
-          </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="预制运单号">{{ details.data.preWaybillNo }}</el-form-item>
-          </el-col>
           <el-col :span="8">
             <el-form-item label="运单号">{{ details.data.waybillNo }}</el-form-item>
           </el-col>
@@ -869,11 +822,8 @@ import { getToken } from '@/utils/auth'
 
 function getDefaultForm() {
   return {
-    preWaybillNo: null,
-    merchantOrderNo: null,
-    platformOrderNo: null,
-    prescriptionNo: null,
-    prescriptionName: null,
+    companyUserName: null,
+    companyUserPhone: null,
     senderName: null,
     senderMobile: null,
     senderTel: null,
@@ -950,12 +900,6 @@ export default {
       },
       form: getDefaultForm(),
       rules: {
-        prescriptionNo: [
-          { required: true, message: '请输入处方编号', trigger: 'blur' }
-        ],
-        prescriptionName: [
-          { required: true, message: '请输入处方人姓名', trigger: 'blur' }
-        ],
         senderName: [
           { required: true, message: '请输入寄件人姓名', trigger: 'blur' }
         ],
@@ -1079,6 +1023,8 @@ export default {
           this.form.senderName = response.data.senderName || null
           this.form.senderMobile = response.data.senderPhone || null
         }
+        this.form.companyUserName = response.userName || null
+        this.form.companyUserPhone = response.userPhone || null
       })
     },
     handleDetails(row) {