Merge remote-tracking branch 'origin/yjb_storeScrm' into yjb_storeScrm

src/views/components/store/storeAfterSalesDetails.vue

@@ -54,8 +54,8 @@
          <el-descriptions-item label="售后状态"  ><dict-tag :options="afterSalesStatusOptions" :value="item.salesStatus"/> </el-descriptions-item>
          <el-descriptions-item label="物流单号"  ><span>{{item.deliverySn}} </span></el-descriptions-item>
          <el-descriptions-item label="物流名称"  ><span>{{item.deliveryName}} </span></el-descriptions-item>
-          <el-descriptions-item label="溯源码" align="center"><span>{{item.verifyCode}}</span></el-descriptions-item>
-          <el-descriptions-item label="产品批次号" align="center"><span>{{item.batchNumber}}</span></el-descriptions-item>
+<!--          <el-descriptions-item label="溯源码" align="center"><span>{{item.verifyCode}}</span></el-descriptions-item>-->
+<!--          <el-descriptions-item label="产品批次号" align="center"><span>{{item.batchNumber}}</span></el-descriptions-item>-->
      </el-descriptions>
 </el-card>
 </div>
@@ -81,14 +81,46 @@
          <p>{{JSON.parse(scope.row.jsonInfo).barCode}}</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>{{JSON.parse(scope.row.jsonInfo).groupBarCode}}</p>-->
+<!--       </template>-->
+<!--     </el-table-column>-->
+
+     <el-table-column label="商品名称" width="300" align="center">
        <template slot-scope="scope">
-         <p>{{JSON.parse(scope.row.jsonInfo).groupBarCode}}</p>
+         <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">
-         <p>{{JSON.parse(scope.row.jsonInfo).productName}}</p>
+         {{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">
+       <template slot-scope="scope">
+         <p>{{scope.row.batchNumber}}</p>
        </template>
      </el-table-column>
      <el-table-column label="单价" width="240" align="center">
@@ -111,16 +143,7 @@
          {{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.drugRegCertNo}}

src/views/components/store/storeOrderDetails.vue

@@ -164,16 +164,16 @@
                   {{order.mark}}
                 </span>
           </el-descriptions-item>
-          <el-descriptions-item label="溯源码"  >
-               <span v-if="order!=null">
-                  {{order.verifyCode}}
-                </span>
-          </el-descriptions-item>
-          <el-descriptions-item label="产品批号"  >
-               <span v-if="order!=null">
-                  {{order.batchNumber}}
-                </span>
-          </el-descriptions-item>
+<!--          <el-descriptions-item label="溯源码"  >-->
+<!--               <span v-if="order!=null">-->
+<!--                  {{order.verifyCode}}-->
+<!--                </span>-->
+<!--          </el-descriptions-item>-->
+<!--          <el-descriptions-item label="产品批号"  >-->
+<!--               <span v-if="order!=null">-->
+<!--                  {{order.batchNumber}}-->
+<!--                </span>-->
+<!--          </el-descriptions-item>-->
         </el-descriptions>
         <div style="margin: 20px 0px"  v-if="order!=null && certificates != null">
         <span class="font-small">
@@ -209,14 +209,45 @@
               <p>{{JSON.parse(scope.row.jsonInfo).barCode}}</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>{{JSON.parse(scope.row.jsonInfo).groupBarCode}}</p>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+
+          <el-table-column label="商品名称" width="300" align="center">
             <template slot-scope="scope">
-              <p>{{JSON.parse(scope.row.jsonInfo).groupBarCode}}</p>
+              <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">
-              <p>{{JSON.parse(scope.row.jsonInfo).productName}}</p>
+              {{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">
+            <template slot-scope="scope">
+              <p>{{scope.row.batchNumber}}</p>
             </template>
           </el-table-column>
           <el-table-column label="单价" width="240" align="center">
@@ -239,16 +270,7 @@
               {{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.drugRegCertNo}}

src/views/store/storeOrder/index.vue

@@ -89,20 +89,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"
         />
@@ -146,8 +146,8 @@
       <el-table-column align="center" type="selection" width="55"/>
       <el-table-column align="center" label="药品订单号" prop="orderCode" width="180px"/>
       <el-table-column align="center" label="处方编码" prop="serialNo" width="180px"/>
-      <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"/>
       <!--     <el-table-column label="员工" align="center" prop="companyUserName" />-->
       <el-table-column align="center" label="就诊人" prop="patientName"/>