和小程序端保持一致

src/views/hisStore/components/productOrder.vue

@@ -257,28 +257,40 @@
 
         <el-table-column label="商品名称" width="300" align="center">
           <template slot-scope="scope">
-            <p>{{JSON.parse(scope.row.jsonInfo).commonName && JSON.parse(scope.row.jsonInfo).commonName !== '-' ? JSON.parse(scope.row.jsonInfo).commonName : JSON.parse(scope.row.jsonInfo).productName}}</p>
+            <p>{{JSON.parse(scope.row.jsonInfo).productName}}</p>
           </template>
         </el-table-column>
 
-        <el-table-column label="生产许可证或备案凭证编号" width="180" align="center">
+        <el-table-column label="通用名称" width="180" align="center">
           <template slot-scope="scope">
-            {{scope.row.prodLicenseNo || '-' }}
+            {{scope.row.commonName}}
           </template>
         </el-table-column>
 
-        <el-table-column label="产品技术要求编号" width="180" align="center">
+        <el-table-column label="生产许可证或备案凭证编号" width="180" align="center">
           <template slot-scope="scope">
-            {{ scope.row.prodTechReqNo || '-' }}
+            {{scope.row.prodLicenseNo || '-' }}
           </template>
         </el-table-column>
 
-        <el-table-column label="产品结构" width="180" align="center">
+        <el-table-column label="生产企业" width="180" align="center">
           <template slot-scope="scope">
-            {{scope.row.productStructure || '-' }}
+            {{scope.row.manufacturer || '-' }}
           </template>
         </el-table-column>
 
+<!--        <el-table-column label="产品技术要求编号" width="180" align="center">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ scope.row.prodTechReqNo || '-' }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+
+<!--        <el-table-column label="产品结构" width="180" align="center">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{scope.row.productStructure || '-' }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+
         <!--        <el-table-column label="商品名称" width="300" align="center">-->
 <!--          <template slot-scope="scope">-->
 <!--            <p>{{JSON.parse(scope.row.jsonInfo).productName}}</p>-->
@@ -305,16 +317,11 @@
             {{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}}