Ver código fonte

溯源码相关逻辑优化

yjwang 3 semanas atrás
pai
commit
07546f688e

+ 2 - 5
src/views/components/store/storeAfterSalesDetails.vue

@@ -54,6 +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>
 </el-card>
 </div>
@@ -89,11 +91,6 @@
          <p>{{JSON.parse(scope.row.jsonInfo).productName}}</p>
        </template>
      </el-table-column>
-     <el-table-column label="溯源码" width="300" align="center">
-       <template slot-scope="scope">
-         <p>{{JSON.parse(scope.row.jsonInfo).verifyCods}}</p>
-       </template>
-     </el-table-column>
      <el-table-column label="单价" width="240" align="center">
        <template slot-scope="scope">
          <p>¥{{JSON.parse(scope.row.jsonInfo).price.toFixed(2)}}</p>

+ 10 - 5
src/views/components/store/storeOrderDetails.vue

@@ -161,6 +161,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>
         <div style="margin: 20px 0px"  v-if="order!=null && certificates != null">
         <span class="font-small">
@@ -206,11 +216,6 @@
               <p>{{JSON.parse(scope.row.jsonInfo).productName}}</p>
             </template>
           </el-table-column>
-          <el-table-column label="溯源码" width="300" align="center">
-            <template slot-scope="scope">
-              <p>{{JSON.parse(scope.row.jsonInfo).verifyCods}}</p>
-            </template>
-          </el-table-column>
           <el-table-column label="单价" width="240" align="center">
             <template slot-scope="scope">
               <p>¥{{JSON.parse(scope.row.jsonInfo).price.toFixed(2)}}</p>

+ 13 - 4
src/views/store/storeAfterSales/index.vue

@@ -56,16 +56,24 @@
         />
       </el-form-item>
 
-      <el-form-item label="溯源码" prop="verifyCodes">
+      <el-form-item label="溯源码" prop="verifyCode">
         <el-input
-          v-model="queryParams.verifyCodes"
+          v-model="queryParams.verifyCode"
           clearable
           placeholder="请输入溯源码"
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
+      <el-form-item label="产品批号" prop="batchNumber">
+        <el-input
+          v-model="queryParams.batchNumber"
+          clearable
+          placeholder="请输入产品批号"
+          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>
@@ -94,7 +102,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="订单编号" align="center" prop="orderCode" width="180px"/>
       <el-table-column align="center" label="处方编码" prop="serialNo" width="180px"/>
-      <el-table-column label="溯源码" align="center" prop="verifyCodes" 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" />
       <el-table-column label="所属公司" align="center" prop="companyName" />
       <el-table-column label="所属员工" align="center" prop="companyUserNickName" />

+ 17 - 5
src/views/store/storeOrder/index.vue

@@ -89,15 +89,24 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="溯源码" prop="verifyCodes">
+      <el-form-item label="溯源码" prop="verifyCode">
         <el-input
-          v-model="queryParams.verifyCodes"
+          v-model="queryParams.verifyCode"
           clearable
           placeholder="请输入溯源码"
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="产品批号" prop="batchNumber">
+        <el-input
+          v-model="queryParams.batchNumber"
+          clearable
+          placeholder="请输入产品批号"
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -137,7 +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="verifyCodes" 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"/>
@@ -356,7 +366,8 @@ export default {
         tuiUserId: null,
         orderCreateType: null,
         companyUserName: null,
-        companyName: null
+        companyName: null,
+        batchNumber:null,
       },
       // 表单参数
       form: {},
@@ -542,7 +553,8 @@ export default {
         tuiMoney: null,
         tuiMoneyStatus: 0,
         tuiUserId: null,
-        orderCreateType: null
+        orderCreateType: null,
+        batchNumber:null
       }
       this.resetForm('form')
     },