Merge pull request 'master' (#149) from master into test

Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/149

src/views/phone-traffic-management/address-book-management/index.vue

@@ -283,13 +283,13 @@ const handleEdit = (row) => {
 const getDetail = (row) => {
   getContactDetail(row.contactsId).then(res => {
     if (res.code === 1000) {
-      ElMessage.success(res.msg)
       nextTick(() => {
         formDialogRef.value.getFormInstance().setValues(res.data)
         // 清空校验
         formDialogRef.value.getFormInstance().clearValidate()
       })
     } else {
+      ElMessage.success(res.msg)
     }
   })
 }

src/views/system/config/index.vue

@@ -34,10 +34,10 @@
     </el-form>
     <div class="query-btn">
       <el-button type="primary" v-perm="['admin:config:add']" @click="handleAdd" :icon="Plus" plain>新增</el-button>
-      <el-button type="danger" v-perm="['admin:config:del']" @click="handleMoreDelete(configIds,configNameList)"
+<!--      <el-button type="danger" v-perm="['admin:config:del']" @click="handleMoreDelete(configIds,configNameList)"-->
-                 :icon="Delete" plain
+<!--                 :icon="Delete" plain-->
-                 :disabled="disabled">删除
+<!--                 :disabled="disabled">删除-->
-      </el-button>
+<!--      </el-button>-->
 <!--      <el-button type="warning" v-perm="['admin:config:export']" @click="handleExport" :icon="Download" plain>导出-->
 <!--      </el-button>-->
     </div>
@@ -51,7 +51,7 @@
           @select="handleSelect"
           v-tabh
       >
-        <el-table-column type="selection" width="55"/>
+<!--        <el-table-column type="selection" width="55"/>-->
         <el-table-column label="序号" type="index" width="60"/>
         <el-table-column prop="configName" label="参数名称" align="center"/>
         <el-table-column prop="configKey" label="参数键名" align="center"/>
@@ -247,6 +247,9 @@ const handleSubmit = async (instance) => {
         }
       })
     } else {
+      if(form.value.configType==1){
+        delete form.value.extraConfigType
+      }
       editConfig(form.value).then(res => {
         if (res.code === 1000) {
           ElMessage.success(res.msg)
@@ -274,6 +277,7 @@ const handleEdit = async (configId) => {
   restFrom()
   getConfigDetails(configId).then(res => {
     if (res.code === 1000) {
+      res.data.configType= res.data.configType+''
       form.value = res.data
       title.value = "编辑参数配置表"
       isVisited.value = true

src/views/system/user/index.vue

@@ -71,7 +71,7 @@ const tableConfig = reactive({
   api: '/user',
   params: {},
   btns: [
-    {name: '新增', key: 'add', type: 'primary'},
+    // {name: '新增', key: 'add', type: 'primary'},
   ]
 })
 const formRules = reactive({

src/views/voice-management/sensitive-words/index.vue

@@ -229,13 +229,13 @@ const handleEdit = (row) => {
 const getDetail = (row) => {
   getSensitiveDetail(row.sensitiveId).then(res => {
     if (res.code === 1000) {
-      ElMessage.success(res.msg)
       nextTick(() => {
         formDialogRef.value.getFormInstance().setValues(res.data)
         // 清空校验
         formDialogRef.value.getFormInstance().clearValidate()
       })
     } else {
+      ElMessage.success(res.msg)
     }
   })
 }