Browse Source

card manage md

zhangjie 3 years ago
parent
commit
75a18f6ea1

+ 9 - 6
src/assets/styles/element-ui-costom.scss

@@ -200,16 +200,19 @@
 }
 // radio
 .el-radio-button {
-  &:hover {
+  &:not(.is-disabled):hover {
     .el-radio-button__inner {
       color: $--color-primary;
     }
   }
-}
-.el-radio-button__orig-radio:checked + .el-radio-button__inner {
-  color: $--color-white;
-  border-color: $--color-primary;
-  background: $--color-primary;
+
+  &.is-active {
+    .el-radio-button__inner {
+      color: $--color-white !important;
+      border-color: $--color-primary !important;
+      background: $--color-primary !important;
+    }
+  }
 }
 // button
 .el-button {

+ 20 - 1
src/modules/base/components/ModifyCardInfo.vue

@@ -35,6 +35,16 @@
           placeholder="建议不超过50个字"
         ></el-input>
       </el-form-item>
+      <el-form-item prop="createType" label="题卡创建方式:">
+        <el-radio-group v-model="modalForm.createType" :disabled="isEdit">
+          <el-radio-button
+            v-for="(val, key) in CARD_CREATE_TYPE"
+            :key="key"
+            :label="key"
+            >{{ val }}</el-radio-button
+          >
+        </el-radio-group>
+      </el-form-item>
       <el-form-item v-if="IS_UPLOAD" prop="attachmentId" label="上传模板文件:">
         <upload-file-view
           :upload-data="uploadData"
@@ -72,13 +82,14 @@
 <script>
 import { updateTemplate } from "../api";
 import { attachmentDetail } from "../../login/api";
+import { CARD_CREATE_TYPE } from "../../../constants/enumerate";
 import UploadFileView from "@/components/UploadFileView";
 import SelectOrgs from "./SelectOrgs";
 
 const initModalForm = {
   id: null,
   name: "",
-  createType: "",
+  createType: "UPLOAD",
   remark: "",
   cardRuleId: "",
   attachmentId: "",
@@ -120,6 +131,7 @@ export default {
       modalForm: {},
       attachment: {},
       format: ["html"],
+      CARD_CREATE_TYPE,
       rules: {
         name: [
           {
@@ -129,6 +141,13 @@ export default {
             trigger: "change"
           }
         ],
+        createType: [
+          {
+            required: true,
+            message: "请选择题卡创建方式",
+            trigger: "change"
+          }
+        ],
         attachmentId: [
           {
             required: true,

+ 34 - 42
src/modules/base/views/CardManage.vue

@@ -40,7 +40,7 @@
           v-if="checkPrivilege('button', 'add')"
           type="primary"
           icon="el-icon-circle-plus-outline"
-          @click="toSelectCardCreateType"
+          @click="toAdd"
           >添加题卡</el-button
         >
       </div>
@@ -80,12 +80,22 @@
               @click="toPreview(scope.row)"
               >查看</el-button
             >
+            <el-button
+              v-if="
+                checkPrivilege('link', 'edit') &&
+                  scope.row.createType !== 'UPLOAD'
+              "
+              class="btn-primary"
+              type="text"
+              @click="toEditCard(scope.row)"
+              >编辑题卡</el-button
+            >
             <el-button
               v-if="checkPrivilege('link', 'edit')"
               class="btn-primary"
               type="text"
-              @click="toEdit(scope.row)"
-              >编辑</el-button
+              @click="toEditInfo(scope.row)"
+              >编辑信息</el-button
             >
             <el-button
               v-if="checkPrivilege('link', 'delete')"
@@ -110,29 +120,6 @@
       </div>
     </div>
 
-    <!-- card-create-type -->
-    <el-dialog
-      class="card-create-type"
-      :visible.sync="modalIsShow"
-      title="题卡创建方式"
-      top="10vh"
-      width="600px"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      append-to-body
-    >
-      <div class="card-types">
-        <div
-          v-for="(val, key) in CARD_CREATE_TYPE"
-          :key="key"
-          class="card-type"
-          @click="toAdd(key)"
-        >
-          {{ val }}
-        </div>
-      </div>
-      <div slot="footer"></div>
-    </el-dialog>
     <!-- ModifyCardInfo -->
     <modify-card-info
       ref="ModifyCardInfo"
@@ -160,11 +147,19 @@ export default {
       size: this.GLOBAL.pageSize,
       total: 0,
       CARD_CREATE_TYPE,
-      cardList: [],
-      curCard: {},
-      // card-create-type dialog
-      modalIsShow: false,
-      editType: "ADD"
+      cardList: [
+        {
+          id: "11",
+          name: "标准题卡001",
+          type: "",
+          orgs: [],
+          orgNames: ["一中"],
+          createType: "STANDARD",
+          remark: "",
+          createTime: "152145785632145"
+        }
+      ],
+      curCard: {}
     };
   },
   methods: {
@@ -184,25 +179,22 @@ export default {
       this.current = page;
       this.getList();
     },
-    toAdd(createType) {
-      console.log(createType);
-      this.curCard = { createType };
-      this.modalIsShow = false;
-      setTimeout(() => {
-        this.$refs.ModifyCardInfo.open();
-      }, 200);
-    },
-    toSelectCardCreateType() {
-      this.modalIsShow = true;
+    toAdd() {
+      this.curCard = {};
+      this.$refs.ModifyCardInfo.open();
     },
     toPreview(row) {
       this.curCard = row;
       this.$refs.ModifyRole.open();
     },
-    toEdit(row) {
+    toEditCard(row) {
       this.curCard = row;
       this.$refs.ModifyRole.open();
     },
+    toEditInfo(row) {
+      this.curCard = row;
+      this.$refs.ModifyCardInfo.open();
+    },
     toDelete(row) {
       this.$confirm(`确定要删除题卡【${row.name}】吗?`, "提示", {
         type: "warning"