展示字段

src/views/hisStore/storeOrder/healthStoreList.vue

@@ -460,6 +460,8 @@
       </el-table-column>
       <el-table-column label="ERP电话" align="center" prop="erpPhone" width="120px" v-if="SFDFopen"/>
       <el-table-column label="ERP账号" align="center" prop="erpAccount" width="120px" v-if="SFDFopen"/>
+      <el-table-column label="所属公司" align="center" prop="companyName" min-width="140" show-overflow-tooltip />
+      <el-table-column label="所属员工" align="center" prop="companyUserNickName" width="120" show-overflow-tooltip />
       <el-table-column label="小程序名称" align="center" prop="miniProgramName"/>
       <el-table-column label="用户昵称" align="center" prop="nickname" width="150px" >
         <template slot-scope="scope">

src/views/system/config/config.vue

@@ -1091,6 +1091,14 @@
           <el-form-item label="快递鸟地址url" prop="kdnAddressUrl">
             <el-input v-model="form13.kdnAddressUrl" label="请输入kdnAddressUrl"></el-input>
           </el-form-item>
+          <el-form-item label="是否开启单号识别" prop="enableLogisticCodeRecognition">
+            <el-switch
+              v-model="form13.enableLogisticCodeRecognition"
+              :active-value="true"
+              :inactive-value="false"
+            />
+            <span style="margin-left: 8px; color: #909399; font-size: 12px;">开启后发货优先用快递鸟按运单号识别承运商，失败则仍按 OMS 承运商编码匹配</span>
+          </el-form-item>
           <el-form-item label="最低定金金额" prop="shares">
             <el-input-number v-model="form13.retainer" :min="100"   label="最低定金金额"></el-input-number>
           </el-form-item>
@@ -3124,7 +3132,8 @@ export default {
       form10: [],
       form12: [],
       form13: {
-        dfAccounts: [] // 初始化代付管家账户数组
+        dfAccounts: [], // 初始化代付管家账户数组
+        enableLogisticCodeRecognition: false
       },
       form14: {},
       form15: {},
@@ -3738,7 +3747,9 @@ export default {
         if (key == 'his.config') {
           this.getCompanyOptions()
           this.form13 = JSON.parse(response.data.configValue)
-
+          if (this.form13.enableLogisticCodeRecognition == null) {
+            this.$set(this.form13, 'enableLogisticCodeRecognition', false)
+          }
         }
         if (key == 'store.config') {
           this.form17 = JSON.parse(response.data.configValue)