Merge branch 'ysy_admin' of http://1.14.104.71:10880/root/ylrz_his_scrm_adminUI into ysy_admin

src/views/his/storeOrder/order1.vue

@@ -543,12 +543,15 @@
         <template slot-scope="scope">
           <div class="tag-container">
             <div class="tag-list">
-              <el-tag
-                v-for="name in scope.row.tags"
-                :key="name"
-                type="success"
-                size="small"
-              >
+<!--              <el-tag-->
+<!--                v-for="name in scope.row.tags"-->
+<!--                :key="name"-->
+<!--                type="success"-->
+<!--                size="small"-->
+<!--              >-->
+<!--                {{ name }}-->
+<!--              </el-tag>-->
+              <el-tag v-for="(name, idx) in scope.row.tags" :key="idx">
                 {{ name }}
               </el-tag>
             </div>

src/views/hisStore/storeOrder/index.vue

@@ -1037,7 +1037,7 @@ export default {
         { key: 'companyName', label: '公司名称', checked: true },
         { key: 'companyUserNickName', label: '所属销售', checked: true },
         { key: 'patientName', label: '就诊人', checked: true },
-        { key: 'productName', label: '编号', checked: true },
+        { key: 'productName', label: '产品名称', checked: true },
         { key: 'barCode', label: '药品信息', checked: false },
         { key: 'payMoney', label: '实收金额', checked: true },
         { key: 'payRemain', label: '物流代收金额', checked: false },
@@ -1769,10 +1769,10 @@ export default {
       // 先全不选
       this.unselectAllFields();
       // 然后选择常用字段
-      const defaultFields = ['orderCode', 'prescribeCode', 'companyName', 'companyUserNickName', 
-                           'storeName', 'miniProgramName', 'userName', 'userPhone', 'userAddress', 'totalPrice', 
-                           'totalNum', 'payPrice', 'payMoney', 'createTime', 'payTime', 
-                           'payType', 'status', 'packageName', 'patientName'];
+      const defaultFields = ['orderCode', 'prescribeCode', 'companyName', 'companyUserNickName',
+                           'storeName', 'miniProgramName', 'userName', 'userPhone', 'userAddress', 'totalPrice',
+                           'totalNum', 'payPrice', 'payMoney', 'createTime', 'payTime',
+                           'payType', 'status', 'packageName', 'patientName','productName',];
       this.exportFieldOptions.forEach(field => {
         if (defaultFields.includes(field.key)) {
           field.checked = true;