Merge branch 'master' of http://182.44.34.170:8081/jiankun/q-admin

src/components/Pagination/index.vue

@@ -35,7 +35,7 @@ export default {
     pageSizes: {
       type: Array,
       default() {
-        return [10, 15, 30]
+        return [10, 20, 30, 40, 50, 100]
       }
     },
     layout: {

src/views/rule/case/components/CreateDialog.vue

@@ -24,6 +24,17 @@
           <el-option v-for="item of types" :key="item" :label="item" :value="item" />
         </el-select>
       </el-form-item>
+      <el-form-item label="科室" prop="department">
+        <el-input v-model="ruleForm.department" placeholder="请输入" />
+      </el-form-item>
+      <el-form-item label="单项否决" prop="one_no">
+        <el-select v-model="ruleForm.one_no" clearable placeholder="请选择" style="width: 100%;">
+          <el-option v-for="item of oneNos" :key="item.name" :label="item.name" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="质控节点" prop="node">
+        <el-input v-model="ruleForm.node" placeholder="请输入" />
+      </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="data.bSwitch = false">取 消</el-button>
@@ -65,7 +76,10 @@ export default {
         notice: '',
         category: '',
         score: '',
-        type: ''
+        type: '',
+        department: '',
+        one_no: '',
+        node: ''
       },
       rules: {
         title: [
@@ -82,8 +96,18 @@ export default {
         ],
         type: [
           { required: true, message: '请输入', trigger: 'blur' }
+        ],
+        department: [
+          { required: true, message: '请输入', trigger: 'blur' }
+        ],
+        one_no: [
+          { required: true, message: '请输入', trigger: 'blur' }
+        ],
+        node: [
+          { required: true, message: '请输入', trigger: 'blur' }
         ]
-      }
+      },
+      oneNos: [{ name: '否', value: 0 }, { name: '是', value: 1 }]
     }
   },
   computed: {
@@ -93,13 +117,16 @@ export default {
   },
   created() {
     if (this.data.row.id) {
-      const { title, notice, category, id, score, type } = this.data.row
+      const { title, notice, category, id, score, type, department, one_no, node } = this.data.row
       this.ruleForm.title = title
       this.ruleForm.notice = notice
       this.ruleForm.category = category
       this.ruleForm.id = id
       this.ruleForm.score = score
       this.ruleForm.type = type
+      this.ruleForm.department = department
+      this.ruleForm.node = node
+      this.ruleForm.one_no = one_no
     }
   },
   methods: {

src/views/rule/case/components/TableBox.vue

@@ -35,6 +35,22 @@
         prop="type"
         label="质控类型"
       />
+      <el-table-column
+        prop="department"
+        label="科室"
+      />
+      <el-table-column
+        prop=""
+        label="单项否决"
+      >
+        <template slot-scope="scope">
+          <span type="one_no">{{ scope.row.one_no?'是':'否' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="node"
+        label="质控节点"
+      />
       <el-table-column
         prop="status"
         label="状态"