Merge branch 'staging' of http://pms.inspur.com/web/msr into staging

src/api/base.js

@@ -22,7 +22,7 @@ export function addTenant (data) {
 }
 
 const Status = {
-  [State.READY]: [0],
+  [State.READY]: [-1, 0],
   [State.SUBMITTED]: [1],
   [State.RESOLVED]: [2],
   [State.REJECTED]: [3, 4, 5],

src/api/calendar.js

@@ -65,7 +65,7 @@ export function saveScheduleEvents (schedule, events) {
   return messageSend({
     url: `/content/calendar/${id}/eventList`,
     method: 'POST',
-    data: events
+    data: { eventAddCmdList: events, status: events.length ? 0 : -1 }
   }, '保存')
 }
 

src/api/program.js

@@ -61,6 +61,7 @@ export function updateProgram ({ id, duration, itemJsonStr, keyNameList, base64
   formData.append('duration', duration)
   formData.append('itemJsonStr', itemJsonStr)
   formData.append('keyNameList', JSON.stringify(keyNameList))
+  formData.append('status', keyNameList.length ? 0 : -1)
   return request({
     url: '/item/update',
     method: 'POST',

src/views/platform/profile/components/UserInfoItem.vue

@@ -172,6 +172,13 @@ export default {
         })
         return
       }
+      if (this.value === this.initial) {
+        this.$message({
+          type: 'warning',
+          message: `${this.config.tipText}不能相同`
+        })
+        return
+      }
       authcodeSend({
         [this.config.typeKey]: this.value
       })
@@ -215,6 +222,13 @@ export default {
         })
         return
       }
+      if (this.value === this.initial) {
+        this.$message({
+          type: 'warning',
+          message: `${this.config.tipText}不能相同`
+        })
+        return
+      }
       authcodeCheck({
         [this.config.typeKey]: this.value,
         [this.config.codeKey]: this.code