2/26 优化1.0

src/views/collect/IocCollectOrderCheckCode.vue

@@ -136,7 +136,34 @@
 
       <el-tabs type="border-card" style="margin: 15px">
         <!--单据业务详情-->
-
+        <el-tab-pane>
+          <span slot="label">单据 {{ orderData.billNo }}-追溯码详情</span>
+          <el-table :data="detailList" style="width: 100%;" highlight-current-row="true" border ref="multipleTable"
+                    :row-style="rowStyle"
+          >
+            <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column label="追溯码" prop="udiCode" width="160"></el-table-column>
+            <el-table-column label="产品编码" prop="nameCode"></el-table-column>
+            <el-table-column label="产品通用名称" prop="cpmctymc" width="110"></el-table-column>
+              <el-table-column label="制剂规格" prop="prepnSpec" width="160">
+              </el-table-column>
+            <el-table-column label="包装规格" prop="ggxh" width="100"></el-table-column>
+            <el-table-column label="扫码实际数量" prop="scanActCount" width="110"></el-table-column>
+            <el-table-column label="批次号" prop="batchNo"></el-table-column>
+            <el-table-column label="生产日期" prop="productDate" width="80"></el-table-column>
+            <el-table-column label="失效日期" prop="expireDate" width="80"></el-table-column>
+            <el-table-column label="序列号" prop="serialNo"></el-table-column>
+            <!--<el-table-column label="扫码数量" prop="scanActCount"></el-table-column>-->
+            <el-table-column label="批准文号" prop="zczbhhzbapzbh"></el-table-column>
+          </el-table>
+          <pagination
+            v-show="resultTotal>0"
+            :total="resultTotal"
+            :limit.sync="codeQuery.limit"
+            :page.sync="codeQuery.page"
+            @pagination="getCodeList"
+          ></pagination>
+        </el-tab-pane>
         <el-tab-pane>
           <span slot="label">单据 {{ orderData.billNo }}-业务详情</span>
           <el-table :data="busDataList" style="width: 100%;" highlight-current-row="true" border ref="multipleTable"
@@ -144,11 +171,8 @@
           >
             <el-table-column label="序号" type="index"></el-table-column>
             <el-table-column label="产品通用名" prop="cpmctymc" width="160"></el-table-column>
-            <el-table-column label="制剂规格" prop="prepnSpec" width="160">
-              <template #default="scope">
-                <span v-if="scope.row.prepnSpec!== null">{{ scope.row.prepnSpec }}</span>
-              </template>
-            </el-table-column>
+              <el-table-column label="制剂规格" prop="prepnSpec" width="160">
+              </el-table-column>
             <el-table-column label="包装规格" prop="spec" width="100"></el-table-column>
             <!--            <el-table-column label="扫码数量" prop="scanActCount" width="80"></el-table-column>-->
             <!--            <el-table-column label="单据数量" prop="count" width="80"></el-table-column>-->
@@ -209,40 +233,6 @@
             @pagination="getBizDetailList"
           ></pagination>
         </el-tab-pane>
-
-
-        <el-tab-pane>
-          <span slot="label">单据 {{ orderData.billNo }}-追溯码详情</span>
-          <el-table :data="detailList" style="width: 100%;" highlight-current-row="true" border ref="multipleTable"
-                    :row-style="rowStyle"
-          >
-            <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column label="追溯码" prop="udiCode" width="160"></el-table-column>
-            <el-table-column label="产品编码" prop="nameCode"></el-table-column>
-            <el-table-column label="产品通用名称" prop="cpmctymc" width="110"></el-table-column>
-            <el-table-column label="制剂规格" prop="prepnSpec" width="160">
-              <template #default="scope">
-                <span v-if="scope.row.prepnSpec!== null">{{ scope.row.prepnSpec }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="包装规格" prop="ggxh" width="100"></el-table-column>
-            <el-table-column label="扫码实际数量" prop="scanActCount" width="110"></el-table-column>
-            <el-table-column label="批次号" prop="batchNo"></el-table-column>
-            <el-table-column label="生产日期" prop="productDate" width="80"></el-table-column>
-            <el-table-column label="失效日期" prop="expireDate" width="80"></el-table-column>
-            <el-table-column label="序列号" prop="serialNo"></el-table-column>
-            <!--<el-table-column label="扫码数量" prop="scanActCount"></el-table-column>-->
-            <el-table-column label="批准文号" prop="zczbhhzbapzbh"></el-table-column>
-          </el-table>
-          <pagination
-            v-show="resultTotal>0"
-            :total="resultTotal"
-            :limit.sync="codeQuery.limit"
-            :page.sync="codeQuery.page"
-            @pagination="getCodeList"
-          ></pagination>
-        </el-tab-pane>
-
       </el-tabs>
 
 
@@ -351,7 +341,8 @@ export default {
       codeCount: 0,
       selectPrescriptionVisible: false,
       viewType: 1,
-      collectSet: {}
+      collectSet: {},
+      productsType: 2
     }
   },
   methods: {
@@ -759,6 +750,7 @@ export default {
           this.detailList = res.data.list
           this.codeList = this.detailList.map(item => item.udiCode)
           this.resultTotal = res.data.total || 0
+          this.productsType = this.detailList[0].this.detailList
           // this.codeLoading = false
         }).catch(() => {
           // this.codeLoading = false