修改列名

src/views/hisStore/components/productAfterSalesOrder.vue

@@ -143,12 +143,31 @@
               <p>{{JSON.parse(scope.row.jsonInfo).productName}}</p>
             </template>
           </el-table-column>
-          <el-table-column label="溯源码" width="300" align="center">
+
+          <el-table-column label="通用名称" width="180" align="center">
+            <template slot-scope="scope">
+              {{scope.row.commonName}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="生产许可证或备案凭证编号" width="180" align="center">
+            <template slot-scope="scope">
+              {{scope.row.prodLicenseNo || '-' }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="生产企业" width="180" align="center">
+            <template slot-scope="scope">
+              {{scope.row.manufacturer || '-' }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="溯源码/有效期" width="300" align="center">
             <template slot-scope="scope">
               <p>{{scope.row.verifyCode}}</p>
             </template>
           </el-table-column>
-          <el-table-column label="批次号" width="300" align="center">
+          <el-table-column label="生产批号/序列号" width="300" align="center">
             <template slot-scope="scope">
               <p>{{scope.row.batchNumber}}</p>
             </template>
@@ -173,16 +192,13 @@
               {{scope.row.dosageForm}}
             </template>
           </el-table-column>
-          <el-table-column label="通用名称" width="180" align="center">
-            <template slot-scope="scope">
-              {{scope.row.commonName}}
-            </template>
-          </el-table-column>
-          <el-table-column label="批号" width="180" align="center">
-            <template slot-scope="scope">
-              {{scope.row.batchNumber}}
-            </template>
-          </el-table-column>
+
+<!--          <el-table-column label="批号" width="180" align="center">-->
+<!--            <template slot-scope="scope">-->
+<!--              {{scope.row.batchNumber}}-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+
           <el-table-column label="注册证书编号" width="180" align="center">
             <template slot-scope="scope">
               {{scope.row.drugRegCertNo}}

src/views/hisStore/components/productOrder.vue

@@ -243,13 +243,13 @@
 <!--            <p>{{JSON.parse(scope.row.jsonInfo).groupBarCode}}</p>-->
 <!--          </template>-->
 <!--        </el-table-column>-->
-        <el-table-column label="溯源码" width="300" align="center">
+        <el-table-column label="溯源码/有效期" width="300" align="center">
           <template slot-scope="scope">
             <p>{{scope.row.verifyCode}}</p>
           </template>
         </el-table-column>
 
-        <el-table-column label="批次号" width="300" align="center">
+        <el-table-column label="生产批号/序列号" width="300" align="center">
           <template slot-scope="scope">
             <p>{{scope.row.batchNumber}}</p>
           </template>

src/views/hisStore/platformProduct/index.vue

@@ -2714,7 +2714,7 @@ export default {
       } else if (this.ids.length > 0) {
         this.currentProductId = this.ids[0];
         if (this.ids.length > 1) {
-          this.$message.warning('溯源码管理仅支持单个商品操作，已默认选择第一个商品');
+          this.$message.warning('溯源码/有效期管理仅支持单个商品操作，已默认选择第一个商品');
         }
       } else {
         this.$message.error('请先选择需要管理溯源码的商品');

src/views/hisStore/storeAfterSales/index.vue

@@ -259,20 +259,20 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="溯源码" prop="verifyCode">
+      <el-form-item label="溯源码/有效期" prop="verifyCode">
         <el-input
           v-model="queryParams.verifyCode"
           clearable
-          placeholder="请输入溯源码"
+          placeholder="请输入溯源码/有效期"
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="产品批次号" prop="batchNumber">
+      <el-form-item label="生产批号/序列号" prop="batchNumber">
         <el-input
           v-model="queryParams.batchNumber"
           clearable
-          placeholder="请输入溯源码"
+          placeholder="请输入生产批号/序列号"
           size="small"
           @keyup.enter.native="handleQuery"
         />
@@ -304,8 +304,8 @@
       <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 label="溯源码" align="center" prop="verifyCode" width="200px" />
-      <el-table-column label="产品批次号" align="center" prop="batchNumber" width="200px" />
+      <el-table-column label="溯源码/有效期" align="center" prop="verifyCode" width="200px" />
+      <el-table-column label="生产批号/序列号" align="center" prop="batchNumber" width="200px" />
       <el-table-column align="center" label="处方编号" prop="serialNo"/>
       <el-table-column label="会员手机号" align="center" prop="userPhone" />
       <el-table-column label="退款金额" align="center" prop="refundAmount" />

src/views/hisStore/storeOrder/healthStoreList.vue

@@ -300,20 +300,20 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="溯源码" prop="verifyCode">
+      <el-form-item label="溯源码/有效期" prop="verifyCode">
         <el-input
           v-model="queryParams.verifyCode"
           clearable
-          placeholder="请输入溯源码"
+          placeholder="请输入溯源码/有效期"
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="产品批次号" prop="batchNumber">
+      <el-form-item label="生产批号/序列号" prop="batchNumber">
         <el-input
           v-model="queryParams.batchNumber"
           clearable
-          placeholder="请输入溯源码"
+          placeholder="请输入生产批号/序列号"
           size="small"
           @keyup.enter.native="handleQuery"
         />
@@ -427,8 +427,8 @@
     <el-table v-loading="loading" :data="storeOrderList" border height="500" @selection-change="handleSelectionChange">
       <el-table-column align="center" type="selection" width="55"/>
       <el-table-column align="center" label="订单号" prop="orderCode" width="200px"/>
-      <el-table-column label="溯源码" align="center" prop="verifyCode" width="200px" />
-      <el-table-column label="产品批次号" align="center" prop="batchNumber" width="200px" />
+      <el-table-column label="溯源码/有效期" align="center" prop="verifyCode" width="200px" />
+      <el-table-column label="生产批号/序列号" align="center" prop="batchNumber" width="200px" />
       <el-table-column align="center" label="店铺名称" prop="storeName" width="150px">
         <template slot-scope="scope">
           <span>{{ scope.row.storeName }} </span>

src/views/hisStore/storeOrder/index.vue

@@ -304,11 +304,11 @@
         />
       </el-form-item>
 
-      <el-form-item label="溯源码" prop="verifyCode">
+      <el-form-item label="溯源码/有效期" prop="verifyCode">
         <el-input
           v-model="queryParams.verifyCode"
           clearable
-          placeholder="请输入溯源码"
+          placeholder="请输入溯源码/有效期"
           size="small"
           @keyup.enter.native="handleQuery"
         />
@@ -421,8 +421,8 @@
     <el-table  height="500" border v-loading="loading" :data="storeOrderList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="订单号" align="center" prop="orderCode" width="200px" />
-      <el-table-column label="溯源码" align="center" prop="verifyCode" width="200px" />
-      <el-table-column label="产品批次号" align="center" prop="batchNumber" width="200px" />
+      <el-table-column label="溯源码/有效期" align="center" prop="verifyCode" width="200px" />
+      <el-table-column label="生产批号/序列号" align="center" prop="batchNumber" width="200px" />
       <el-table-column label="店铺名称" align="center" prop="storeName" width="150px" >
         <template slot-scope="scope">
           <span>{{scope.row.storeName}} </span>