Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/udi/trace/searchLive/index.vue

src/api/udi/udiTrace.js

@@ -84,7 +84,7 @@ export function filterylqxzcrbarmc(query) {
 //任务列表
 export function getTraceTaskList(query) {
   return axios({
-    url: 'udi/trace/task/filter',
+    url: '/udi/trace/task/filter',
     method: 'get',
     params: query
   })

src/views/system/notice/index.vue

@@ -299,6 +299,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
+      this.$message.error(this.ids);
       const noticeIds = row.noticeId || this.ids
       this.$modal.confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项？').then(function() {
         return delNotice(noticeIds);

src/views/userInformation.vue

@@ -74,7 +74,7 @@
             v-model="firmForm.companyName"
           ></el-input>
         </el-form-item>
-        <el-form-item label="社会统一信用号" prop="creditNum">
+        <el-form-item label="统一社会信用号" prop="creditNum">
           <el-input
             placeholder="请输入企业统一社会信用号"
             v-model="firmForm.creditNum"
@@ -217,7 +217,7 @@ export default {
           value
         ) === false
       ) {
-        callback(new Error("请输入有效的的社会统一信用号"));
+        callback(new Error("请输入有效的的统一社会信用号"));
       } else {
         // 校验通过
         callback();

src/views/userManage/customerManage.vue

@@ -53,7 +53,7 @@
           width="230"
         ></el-table-column>
         <el-table-column
-          label="社会统一信用号"
+          label="统一社会信用号"
           prop="creditNum"
           width="230"
         ></el-table-column>