Merge branch 'saas_adminUi' of http://1.14.104.71:10880/txl/ylrz_saas_his_scrm_adminUI into saas_adminUi

src/views/admin/smsApi/index.vue

@@ -11,8 +11,7 @@
       </el-form-item>
       <el-form-item label="服务商" prop="provider">
         <el-select v-model="queryParams.provider" placeholder="请选择" clearable>
-          <el-option label="迈远" value="rf" />
-           
+          <el-option label="迈远" value="my" />
           <el-option label="手机卡" value="card" />
         </el-select>
       </el-form-item>
@@ -119,8 +118,7 @@
           <el-col :span="12">
             <el-form-item label="服务商" prop="provider">
               <el-select v-model="form.provider" placeholder="请选择" style="width:100%">
-                <el-option label="迈远" value="rf" />
-                 
+                <el-option label="迈远" value="my" />
                 <el-option label="手机卡" value="card" />
               </el-select>
             </el-form-item>
@@ -151,12 +149,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if="form.provider === 'rf'" label="接口地址">
-              <el-input v-model="form.url" placeholder="迈远专用" />
+            <el-form-item v-if="form.provider === 'my'" label="接口地址">
+              <el-input v-model="form.url" placeholder="润方专用" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="form.provider === 'rf'" :gutter="20">
+        <el-row v-if="form.provider === 'my'" :gutter="20">
           <el-col :span="12">
             <el-form-item label="扩展码">
               <el-input v-model="form.code" placeholder="迈远专用(旧,端口优先)" />
@@ -284,7 +282,7 @@ export default {
       return map[type] || '未知'
     },
     providerFormat(p) {
-      const map = { rf: '迈远',    card: '手机卡' }
+      const map = { my: '迈远', card: '手机卡' }
       return map[p] || p
     },
     getList() {
@@ -300,7 +298,7 @@ export default {
     },
     resetForm() {
       this.form = {
-        apiId: undefined, apiName: '', smsType: 1, provider: 'rf',
+        apiId: undefined, apiName: '', smsType: 1, provider: 'my',
         account: '', password: '', url: '', code: '', sign: '',
         costPrice: 0, isDefault: 0, status: 1, remark: ''
       }

src/views/admin/smsApiTenant/index.vue

@@ -190,7 +190,7 @@ export default {
       return map[type] || '未知'
     },
     providerFormat(p) {
-      const map = { rf: '迈远',    card: '手机卡' }
+      const map = { my: '迈远', card: '手机卡' }
       return map[p] || p
     },
     calcProfit(row) {

src/views/company/companySmsLogs/index.vue

@@ -91,8 +91,7 @@
       <el-table-column label="手机号" align="center"  width="150px" prop="phone" />
       <el-table-column label="服务商" align="center" prop="type" >
         <template slot-scope="scope">
-            <span v-if="scope.row.type === 'rf'">润芳</span>
-            <span v-else-if="scope.row.type === 'dh'">大汉</span>
+            <span v-if="scope.row.type === 'my'">迈远</span>
         </template>
       </el-table-column>
       <el-table-column label="短信内容" show-overflow-tooltip align="center" prop="content" />
@@ -145,11 +144,8 @@ export default {
       statusOptions:[],
       typeOptions:[
         {
-          value: 'rf',
-          label: '润芳'
-        }, {
-          value: 'dh',
-          label: '大汉'
+          value: 'my',
+          label: '迈远'
         },
       ],
       // 遮罩层

src/views/system/config/config2.vue

@@ -629,53 +629,37 @@
         <el-form ref="form14" :model="form14"  label-width="150px">
           <el-form-item label="短信服务商" prop="type">
              <el-radio-group v-model="form14.type">
-              <el-radio label="rf">重庆润芳</el-radio>
-              <el-radio label="dh">重庆大汉</el-radio>
+              <el-radio label="my">迈远</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item  v-if="form14.type=='rf'" label="润芳通知账号" prop="rfAccount1">
-              <el-input   v-model="form14.rfAccount1"  label="请输入润芳通知账号"></el-input>
+          <el-form-item  v-if="form14.type=='my'" label="迈远通知账号" prop="rfAccount1">
+              <el-input   v-model="form14.rfAccount1"  label="请输入迈远通知账号"></el-input>
           </el-form-item>
-          <el-form-item  v-if="form14.type=='rf'" label="润芳通知code" prop="rfCode1">
-              <el-input   v-model="form14.rfCode1"  label="请输入润芳通知code"></el-input>
+          <el-form-item  v-if="form14.type=='my'" label="迈远通知code" prop="rfCode1">
+              <el-input   v-model="form14.rfCode1"  label="请输入迈远通知code"></el-input>
           </el-form-item>
-          <el-form-item  v-if="form14.type=='rf'" label="润芳通知密码" prop="rfPassword1">
-              <el-input   v-model="form14.rfPassword1"  label="请输入润芳通知密码"></el-input>
+          <el-form-item  v-if="form14.type=='my'" label="迈远通知密码" prop="rfPassword1">
+              <el-input   v-model="form14.rfPassword1"  label="请输入迈远通知密码"></el-input>
           </el-form-item>
-          <el-form-item  v-if="form14.type=='rf'" label="润芳通知地址" prop="rfUrl1">
-              <el-input   v-model="form14.rfUrl1"  label="请输入润芳通知地址"></el-input>
+          <el-form-item  v-if="form14.type=='my'" label="迈远通知地址" prop="rfUrl1">
+              <el-input   v-model="form14.rfUrl1"  label="请输入迈远通知地址"></el-input>
           </el-form-item>
-          <el-form-item  v-if="form14.type=='rf'" label="润芳营销账号" prop="rfAccount2">
-              <el-input   v-model="form14.rfAccount2"  label="请输入润芳营销账号"></el-input>
+          <el-form-item  v-if="form14.type=='my'" label="迈远营销账号" prop="rfAccount2">
+              <el-input   v-model="form14.rfAccount2"  label="请输入迈远营销账号"></el-input>
           </el-form-item>
-          <el-form-item  v-if="form14.type=='rf'" label="润芳营销code" prop="rfCode2">
-              <el-input   v-model="form14.rfCode2"  label="请输入润芳营销code"></el-input>
+          <el-form-item  v-if="form14.type=='my'" label="迈远营销code" prop="rfCode2">
+              <el-input   v-model="form14.rfCode2"  label="请输入迈远营销code"></el-input>
           </el-form-item>
-          <el-form-item  v-if="form14.type=='rf'" label="润芳通知密码" prop="rfPassword2">
-              <el-input   v-model="form14.rfPassword2"  label="请输入润芳通知密码"></el-input>
+          <el-form-item  v-if="form14.type=='my'" label="迈远通知密码" prop="rfPassword2">
+              <el-input   v-model="form14.rfPassword2"  label="请输入迈远通知密码"></el-input>
           </el-form-item>
-          <el-form-item  v-if="form14.type=='rf'" label="润芳通知地址" prop="rfUrl2">
-              <el-input   v-model="form14.rfUrl2"  label="请输入润芳营销地址"></el-input>
+          <el-form-item  v-if="form14.type=='my'" label="迈远通知地址" prop="rfUrl2">
+              <el-input   v-model="form14.rfUrl2"  label="请输入迈远营销地址"></el-input>
           </el-form-item>
-          <el-form-item  v-if="form14.type=='rf'" label="润芳签名" prop="rfSign">
-              <el-input   v-model="form14.rfSign"  label="请输入润芳签名"></el-input>
+          <el-form-item  v-if="form14.type=='my'" label="迈远签名" prop="rfSign">
+              <el-input   v-model="form14.rfSign"  label="请输入迈远签名"></el-input>
           </el-form-item>
 
-          <el-form-item  v-if="form14.type=='dh'" label="大汉通知账号" prop="dhAccount1">
-              <el-input   v-model="form14.dhAccount1"  label="请输入大汉通知账号"></el-input>
-          </el-form-item>
-          <el-form-item  v-if="form14.type=='dh'" label="大汉通知密码" prop="dhPassword1">
-              <el-input   v-model="form14.dhPassword1"  label="请输入大汉通知密码"></el-input>
-          </el-form-item>
-          <el-form-item  v-if="form14.type=='dh'" label="大汉营销账号" prop="dhAccount2">
-              <el-input   v-model="form14.dhAccount2"  label="请输入大汉营销账号"></el-input>
-          </el-form-item>
-          <el-form-item  v-if="form14.type=='dh'" label="大汉通知密码" prop="dhPassword2">
-              <el-input   v-model="form14.dhPassword2"  label="请输入大汉通知密码"></el-input>
-          </el-form-item>
-          <el-form-item  v-if="form14.type=='dh'" label="大汉签名" prop="dhSign">
-              <el-input   v-model="form14.dhSign"  label="请输入大汉签名"></el-input>
-          </el-form-item>
           <div class="footer">
             <el-button type="primary" @click="submitForm14">提  交</el-button>
           </div>