Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue

@@ -322,21 +322,13 @@ export default {
       brand_list: [],
       rebateType_list: [],
       state_list: [
-        {
-          dictKey: 0,
-          dictValue: '未上传'
-        },
         {
           dictKey: 1,
-          dictValue: '已上传'
-        },
-        {
-          dictKey: 2,
-          dictValue: '未调整'
+          dictValue: '未上传'
         },
         {
           dictKey: 3,
-          dictValue: '已调整'
+          dictValue: '已上传'
         }
       ],
       whether_list: [

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocated.vue

@@ -150,21 +150,13 @@ export default {
       brand_list: [],
       rebateType_list: [],
       state_list: [
-        {
-          dictKey: 0,
-          dictValue: '未上传'
-        },
         {
           dictKey: 1,
-          dictValue: '已上传'
-        },
-        {
-          dictKey: 2,
-          dictValue: '未调整'
+          dictValue: '未上传'
         },
         {
           dictKey: 3,
-          dictValue: '已调整'
+          dictValue: '已上传'
         }
       ],
       listLoading: false,

anrui-system-ui/src/views/dictManage/dictCommon.vue

@@ -179,41 +179,23 @@ export default {
       },
       save() {
         if (this.form.sid) {
-          const aa = this.form.dictKey.split('')
-          if (aa.length < 5) {
-            putdictCommon(this.form).then(res => {
-              this.editDialog = false
-              this.getPageList(this.page)
-              this.$message({
-                message: res.msg,
-                type: 'success'
-              })
-            })
-          } else {
+          putdictCommon(this.form).then(res => {
+            this.editDialog = false
+            this.getPageList(this.page)
             this.$message({
-              showClose: true,
-              message: '数据key的位数不可超过4位！',
-              type: 'error'
-            });
-          }
-        } else {
-          const bb = this.form.dictKey.split('')
-          if (bb.length < 5) {
-            savedictCommon(this.form).then(res => {
-              this.editDialog = false
-              this.getPageList(this.page)
-              this.$message({
-                message: res.msg,
-                type: 'success'
-              })
+              message: res.msg,
+              type: 'success'
             })
-          }else {
+          })
+        } else {
+          savedictCommon(this.form).then(res => {
+            this.editDialog = false
+            this.getPageList(this.page)
             this.$message({
-              showClose: true,
-              message: '数据key的位数不可超过4位！',
-              type: 'error'
-            });
-          }
+              message: res.msg,
+              type: 'success'
+            })
+          })
         }
       },
       deleteRow(row) {