单选框修改

pages/system/project/atom/add.vue

@@ -18,18 +18,12 @@
           ><FormItem :label="l('englishFullName')" prop="englishFullName">
             <Input v-model="entity.englishFullName"> </Input> </FormItem
         ></Col>
-        <Col :span="12"
-          ><FormItem :label="l('englishName')" prop="englishName">
-            <Input v-model="entity.englishName"> </Input> </FormItem
-        ></Col>
         <Col :span="12">
-          <FormItem :label="l('status')" prop="status">
-            <Dictionary
-              code="base.project_atom.status"
-              v-model="entity.status"
-            ></Dictionary>
+          <FormItem :label="l('englishName')" prop="englishName">
+            <Input v-model="entity.englishName"> </Input>
           </FormItem>
         </Col>
+       
         <Col :span="12"
           ><FormItem :label="l('code')" prop="code">
             <Input v-model="entity.code"> </Input> </FormItem
@@ -42,6 +36,15 @@
           ><FormItem :label="l('version')" prop="version">
             <InputNumber v-model="entity.version"></InputNumber> </FormItem
         ></Col>
+         <Col :span="12">
+          <FormItem :label="l('status')" prop="status">
+            <Dictionary
+              code="base.project_atom.status"
+              v-model="entity.status"
+              type="radio"
+            ></Dictionary>
+          </FormItem>
+        </Col>
         <Col :span="24"
           ><FormItem :label="l('description')" prop="description">
             <Input
@@ -66,10 +69,10 @@
               :label="tab.name"
             >
             </TabPane>
-            <Button @click="modal1 = true" size="small" slot="extra"
+            <!-- <Button @click="modal1 = true" size="small" slot="extra"
               >增加</Button
-            >
-            <Modal
+            > -->
+            <!-- <Modal
               v-model="modal1"
               title="增加"
               @on-ok="okModal('formline')"
@@ -98,7 +101,7 @@
                   </FormItem>
                 </p>
               </Form>
-            </Modal>
+            </Modal> -->
           </Tabs>
         </Row>
         <Row>
@@ -137,7 +140,7 @@
           >
             <template slot-scope="{ row, index }" slot="columnDescription">
               <Input
-              v-on:input='onIpnt(row, index)'
+                v-on:input="onIpnt(row, index)"
                 v-model="row.columnDescription"
                 @on-change="setRow(row, index)"
                 placeholder="请输入"
@@ -155,7 +158,7 @@
             </template>
             <template slot-scope="{ row, index }" slot="propertyName">
               <Input
-               v-on:input='onIpnt(row, index)'
+                v-on:input="onIpnt(row, index)"
                 v-model="row.propertyName"
                 @on-change="setRow(row, index)"
                 placeholder="请输入"
@@ -203,17 +206,7 @@
               />
             </template>
             <template slot-scope="{ row, index }" slot="systemName">
-              <div>
-                {{ row.systemName }}
-              </div>
-              <!-- <Dictionary
-                @on-change="setRow(row, index)"
-                v-model="row.systemName"
-                code="project.main.systemName"
-                type="select"
-                :value="row.systemName"
-                :key="row.systemName"
-              ></Dictionary> -->
+              <state code="project.main.systemName" :value="row.systemName" />
             </template>
             <template slot-scope="{ row, index }" slot="list">
               <Checkbox v-model="row.list" @on-change="setRow(row, index)">
@@ -271,7 +264,7 @@ export default {
         name: [{ required: true, message: "请输入名称", trigger: "blur" }],
         code: [{ required: true, message: "请输入编码", trigger: "blur" }],
       },
-      modal1: false,
+      // modal1: false,
       iconType: "ios-arrow-up",
       textUp: "收起",
       upDrop: true,
@@ -374,11 +367,11 @@ export default {
           align: "center",
           slot: "systemName",
           width: 190,
-          render: (h, params) => {
-            return h("div", [
-              h("span", {}, this.sysDist(params.row.systemName)),
-            ]);
-          },
+          // render: (h, params) => {
+          //   return h("div", [
+          //     h("span", {}, this.sysDist(params.row.systemName)),
+          //   ]);
+          // },
         },
         {
           title: "是否可空",
@@ -466,34 +459,25 @@ export default {
     }
   },
   methods: {
-    sysDist(value) {
-      if (value == 0) {
-        return "系统";
-      } else if (value == 1) {
-        return "业务";
-      } else if (value == 2) {
-        return "扩展";
-      }
-    },
-    okModal(name) {
-      this.$refs[name].validate((valid) => {
-        if (valid) {
-          let obj = {
-            name: this.formline.name,
-            code: this.formline.code,
-            list: [],
-          };
-          this.content.dtos.push(obj);
-          console.log(this.content.dtos);
-          this.$refs[name].resetFields();
-          this.modal1 = false;
-        }
-      });
-    },
-    cancelModal(name) {
-      this.$refs[name].resetFields();
-      this.modal1 = false;
-    },
+    // okModal(name) {
+    //   this.$refs[name].validate((valid) => {
+    //     if (valid) {
+    //       let obj = {
+    //         name: this.formline.name,
+    //         code: this.formline.code,
+    //         list: [],
+    //       };
+    //       this.content.dtos.push(obj);
+    //       console.log(this.content.dtos);
+    //       this.$refs[name].resetFields();
+    //       this.modal1 = false;
+    //     }
+    //   });
+    // },
+    // cancelModal(name) {
+    //   this.$refs[name].resetFields();
+    //   this.modal1 = false;
+    // },
     onDragDrop(a, b) {
       this.checkList.splice(b, 0, ...this.checkList.splice(a, 1));
     },
@@ -550,8 +534,8 @@ export default {
         this.checkList.splice(index, 1);
       }
     },
-    onIpnt(a,b){
-      console.log(a,b)
+    onIpnt(a, b) {
+      console.log(a, b);
     },
     setRow(row, index) {
       // if (index >= 1) {

pages/system/project/project/add.vue

@@ -24,7 +24,7 @@
       ></Col>
       <Col :span="12">
        <FormItem :label="l('status')" prop="status">
-            <Dictionary code="base.project.status" v-model="entity.status" ></Dictionary>
+            <Dictionary code="base.project.status" v-model="entity.status" type='radio'></Dictionary>
         </FormItem>
       </Col>
       <Col :span="12"