Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/views/assign/components/selectItem.vue

@@ -6,7 +6,7 @@
     <div class="select-content">
       <ul class="data-list-content">
         <li v-for="(item,index) in dataList" :key="item.key" @click="onChange(item,index)" class="data-list-content-item">
-          <input type="checkbox" class="list-checkbox-input" :checked="item.selected" :disabled="item.disabled">
+          <input type="checkbox" class="list-checkbox-input" :checked="item.selected">
           <span style="font-size:8pt;" :title="item.description" :class="{'font-red':item.disabled}">
             <span>{{item.title}}<span style="font-style: italic;color: #8e99a5;" :class="{'font-red':item.disabled}">({{item.description}})</span></span>
           </span>
@@ -54,21 +54,19 @@ export default {
       };
     },
     onChange (e) {
-      if (!e.disabled) {
-        e.selected = !e.selected
-        if (e.selected) {
-          this.selectKeys.push(e)
-        } else {
-          for (let j = 0; j < this.selectKeys.length; j++) {
-            if (e.key == this.selectKeys[j].key) {
-              this.selectKeys.splice(j, 1)
-              break
-            }
+      e.selected = !e.selected
+      if (e.selected) {
+        this.selectKeys.push(e)
+      } else {
+        for (let j = 0; j < this.selectKeys.length; j++) {
+          if (e.key == this.selectKeys[j].key) {
+            this.selectKeys.splice(j, 1)
+            break
           }
         }
-        this.initData()
-        this.$emit("input", this.selectKeys)
       }
+      this.initData()
+      this.$emit("input", this.selectKeys)
     },
     onCheckAllChange (e) {
       if (e.target.checked) {

src/views/peAssign/projKeyAssign.vue

@@ -530,7 +530,7 @@ export default {
     margin: 14px 0px 0px 0px !important;
   }
   ::v-deep .ant-drawer .ant-drawer-content-wrapper {
-    width: 600px !important;
+    width: 700px !important;
     .ant-drawer-content .ant-drawer-wrapper-body {
       .ant-drawer-header {
         padding: 10px 10px !important;