修改样式项目管理

i18n/locale/zh-CN.js

@@ -1265,5 +1265,6 @@ export default {
         module: '模块',
         version: '版本',
         projectId: '项目id',
+        systemName: "系统业务"
     }
 }
\ No newline at end of file

pages/system/project/atom/edit.vue

@@ -156,7 +156,7 @@
               >删除</a>
           </template>
         </Table>
-        <Button type="dashed" long @click="addNew('{}')" class="mt10"
+        <Button type="dashed" long @click="addNew(0,'{}')" class="mt10"
           >新增属性</Button
         >
       </Col>
@@ -266,7 +266,7 @@ export default {
             this.completeValue = "";
           }
         });
-        this.addNew(changeId);
+        this.addNew(1,changeId);
       }
     },
     upClick(value) {
@@ -314,18 +314,21 @@ export default {
     setRow(row, index) {
       this.$set(this.checkList, index, row);
     },
-    addNew(e) {
-      let id = "",
+    addNew(index,e) {
+     let id = "",
         code = "",
         name = "";
-      if (e == "{}") {
+      if (index == 0  && e=='{}') {
         id = "";
         code = "";
         name = "";
-      } else {
+      } else if(index == 1 && JSON.stringify(e)!='{}'){
         id = e.id;
         code = e.code;
         name = e.name;
+      }else{
+         this.$Message.warning("请选择导入字段！");
+        return;
       }
       let maxId = 0;
       this.checkList.map((u) => {

pages/system/project/atom/index.vue

@@ -21,7 +21,8 @@
         <Button type="primary" @click="add">新增</Button>
       </template>
     </DataGrid>
-    <Modal v-model="modal" :title="title" width="1200" footer-hide>
+    <!-- fullscreen -->
+    <Modal v-model="modal" :title="title" width="1200" footer-hide  fullscreen >
       <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
     </Modal>
   </div>

pages/system/project/project/add.vue

 <template>
   <Form ref="form" :model="entity" :rules="rules" :label-width="90">
     <Row>
-      <!-- <Col :span="12"
-        ><FormItem :label="l('creationTime')" prop="creationTime">
-          <DatePicker
-            type="date"
-            v-model="entity.creationTime"
-          ></DatePicker> </FormItem
-      ></Col>
-      <Col :span="12"
-        ><FormItem :label="l('creatorUserId')" prop="creatorUserId">
-          <InputNumber v-model="entity.creatorUserId"></InputNumber> </FormItem
-      ></Col>
-      <Col :span="12"
-        ><FormItem
-          :label="l('lastModificationTime')"
-          prop="lastModificationTime"
-        >
-          <DatePicker
-            type="date"
-            v-model="entity.lastModificationTime"
-          ></DatePicker> </FormItem
-      ></Col>
-      <Col :span="12"
-        ><FormItem :label="l('lastModifierUserId')" prop="lastModifierUserId">
-          <InputNumber
-            v-model="entity.lastModifierUserId"
-          ></InputNumber> </FormItem
-      ></Col>
-      <Col :span="12"
-        ><FormItem :label="l('isDeleted')" prop="isDeleted">
-          <InputNumber v-model="entity.isDeleted"></InputNumber> </FormItem
-      ></Col>
-      <Col :span="12"
-        ><FormItem :label="l('deletionTime')" prop="deletionTime">
-          <DatePicker
-            type="date"
-            v-model="entity.deletionTime"
-          ></DatePicker> </FormItem
-      ></Col>
-      <Col :span="12"
-        ><FormItem :label="l('deleterUserId')" prop="deleterUserId">
-          <InputNumber v-model="entity.deleterUserId"></InputNumber> </FormItem
-      ></Col> -->
       <Col :span="12"
         ><FormItem :label="l('name')" prop="name">
           <Input v-model="entity.name"> </Input> </FormItem
       ></Col>
       <Col :span="12">
       <FormItem :label="l('code')" prop="code">
-          <Input v-model="entity.code"> </Input> </FormItem
-      >
+          <Input v-model="entity.code"> </Input> </FormItem>
       </Col>
       <Col :span="12">
-      <!-- <FormItem :label="l('type')" prop="type">
-          <Input v-model="entity.type"> </Input> </FormItem
-      > -->
        <FormItem :label="l('type')" prop="type">
             <Dictionary code="base.project.type" v-model="entity.type" ></Dictionary>
         </FormItem>
       </Col>
-      <!-- <Col :span="12"
-        ><FormItem :label="l('level')" prop="level">
-          <Input v-model="entity.level"> </Input> </FormItem
-      ></Col> -->
-
       <Col :span="12"
         ><FormItem :label="l('englishFullName')" prop="englishFullName">
           <Input v-model="entity.englishFullName"> </Input> </FormItem
@@ -74,9 +23,6 @@
           <Input v-model="entity.englishName"> </Input> </FormItem
       ></Col>
       <Col :span="12">
-      <!-- <FormItem :label="l('status')" prop="status">
-          <Input v-model="entity.status"> </Input> </FormItem
-      > -->
        <FormItem :label="l('status')" prop="status">
             <Dictionary code="base.project.status" v-model="entity.status" ></Dictionary>
         </FormItem>
@@ -85,22 +31,6 @@
         ><FormItem :label="l('module')" prop="module">
           <Input v-model="entity.module"> </Input> </FormItem
       ></Col>
-      <!-- <Col :span="12"
-        ><FormItem :label="l('upId')" prop="upId">
-          <InputNumber v-model="entity.upId"></InputNumber> </FormItem
-      ></Col>  -->
-      <!-- 
-      <Col :span="12"
-        ><FormItem :label="l('tenantId')" prop="tenantId">
-          <InputNumber v-model="entity.tenantId"></InputNumber> </FormItem
-      ></Col> -->
-      <!-- <Col :span="12"
-        ><FormItem :label="l('inheritCategoryId')" prop="inheritCategoryId">
-          <InputNumber
-            v-model="entity.inheritCategoryId"
-          ></InputNumber> </FormItem
-      ></Col> -->
-
       <Col :span="24"
         ><FormItem :label="l('description')" prop="description">
           <Input
@@ -111,9 +41,7 @@
       ></Col>
     </Row>
     <FormItem>
-      <Button type="primary" @click="handleSubmit" :disabled="disabled"
-        >保存</Button
-      >
+      <Button type="primary" @click="handleSubmit" :disabled="disabled" >保存</Button >
       <Button @click="handleClose" class="ml20">取消</Button>
     </FormItem>
   </Form>
@@ -126,13 +54,6 @@ export default {
     return {
       disabled: false,
       entity: {
-        // creationTime: null,
-        // creatorUserId: null,
-        // lastModificationTime: null,
-        // lastModifierUserId: null,
-        // isDeleted: null,
-        // deletionTime: null,
-        // deleterUserId: null,
         name: "",
         upId: this.eid,
         level: null,

pages/system/project/project/edit.vue

 <template>
   <Form ref="form" :model="entity" :rules="rules" :label-width="90">
     <Row>
-      <!-- <Col :span="12"
-        ><FormItem :label="l('creationTime')" prop="creationTime">
-          <DatePicker
-            type="date"
-            v-model="entity.creationTime"
-          ></DatePicker> </FormItem
-      ></Col>
-      <Col :span="12"
-        ><FormItem :label="l('creatorUserId')" prop="creatorUserId">
-          <InputNumber v-model="entity.creatorUserId"></InputNumber> </FormItem
-      ></Col>
-      <Col :span="12"
-        ><FormItem
-          :label="l('lastModificationTime')"
-          prop="lastModificationTime"
-        >
-          <DatePicker
-            type="date"
-            v-model="entity.lastModificationTime"
-          ></DatePicker> </FormItem
-      ></Col>
       <Col :span="12"
-        ><FormItem :label="l('lastModifierUserId')" prop="lastModifierUserId">
-          <InputNumber
-            v-model="entity.lastModifierUserId"
-          ></InputNumber> </FormItem
-      ></Col>
-      <Col :span="12"
-        ><FormItem :label="l('isDeleted')" prop="isDeleted">
-          <InputNumber v-model="entity.isDeleted"></InputNumber> </FormItem
-      ></Col>
-      <Col :span="12"
-        ><FormItem :label="l('deletionTime')" prop="deletionTime">
-          <DatePicker
-            type="date"
-            v-model="entity.deletionTime"
-          ></DatePicker> </FormItem
-      ></Col>
-      <Col :span="12"
-        ><FormItem :label="l('deleterUserId')" prop="deleterUserId">
-          <InputNumber v-model="entity.deleterUserId"></InputNumber> </FormItem
-      ></Col> -->
-       <Col :span="12"
         ><FormItem :label="l('name')" prop="name">
           <Input v-model="entity.name"> </Input> </FormItem
       ></Col>
-       <Col :span="12"
+      <Col :span="12"
         ><FormItem :label="l('code')" prop="code">
           <Input v-model="entity.code"> </Input> </FormItem
       ></Col>
       <Col :span="12">
-       <FormItem :label="l('type')" prop="type">
-            <Dictionary code="base.project.type" v-model="entity.type" ></Dictionary>
+        <FormItem :label="l('type')" prop="type">
+          <Dictionary
+            code="base.project.type"
+            v-model="entity.type"
+          ></Dictionary>
         </FormItem>
       </Col>
-      <!-- <Col :span="12"
-        ><FormItem :label="l('level')" prop="level">
-          <Input v-model="entity.level"> </Input> </FormItem
-      ></Col> -->
       <Col :span="12"
         ><FormItem :label="l('englishFullName')" prop="englishFullName">
           <Input v-model="entity.englishFullName"> </Input> </FormItem
@@ -68,32 +25,18 @@
         ><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.status" v-model="entity.status" ></Dictionary>
+      <Col :span="12">
+        <FormItem :label="l('status')" prop="status">
+          <Dictionary
+            code="base.project.status"
+            v-model="entity.status"
+          ></Dictionary>
         </FormItem>
       </Col>
-       <Col :span="12"
+      <Col :span="12"
         ><FormItem :label="l('module')" prop="module">
           <Input v-model="entity.module"> </Input> </FormItem
       ></Col>
-       <!-- <Col :span="12"
-        ><FormItem :label="l('upId')" prop="upId">
-          <InputNumber v-model="entity.upId"></InputNumber> </FormItem
-      ></Col>
-      <Col :span="12"
-        ><FormItem :label="l('tenantId')" prop="tenantId">
-          <InputNumber v-model="entity.tenantId"></InputNumber> </FormItem
-      ></Col>
-      <Col :span="12"
-        ><FormItem :label="l('inheritCategoryId')" prop="inheritCategoryId">
-          <InputNumber
-            v-model="entity.inheritCategoryId"
-          ></InputNumber> </FormItem
-      ></Col> -->
-     
-     
       <Col :span="24"
         ><FormItem :label="l('description')" prop="description">
           <Input
@@ -142,9 +85,14 @@ export default {
       this.$refs.form.validate((v) => {
         if (v) {
           this.disabled = true;
-          let datas={
+          let datas = {
+            creationTime: this.entity.creationTime,
+            creatorUserId: this.entity.creatorUserId,
+            description: this.entity.description,
             code: this.entity.code,
             id: this.entity.id,
+            englishFullName: this.entity.englishFullName,
+            englishName: this.entity.englishName,
             inheritCategoryId: this.entity.inheritCategoryId,
             lastModificationTime: this.entity.lastModificationTime,
             lastModifierUserId: this.entity.lastModifierUserId,
@@ -153,9 +101,9 @@ export default {
             name: this.entity.name,
             status: this.entity.status,
             tenantId: this.entity.tenantId,
-            type:this.entity.type,
-            upId: this.entity.upId
-          }
+            type: this.entity.type,
+            upId: this.entity.upId,
+          };
           Api.update(datas)
             .then((r) => {
               this.disabled = false;

pages/system/project/project/index.vue

@@ -128,7 +128,6 @@ export default {
           key: "code",
           title: this.l("code"),
           align: "left",
-          code: "project.base.code",
           easy: true,
           high: true,
         },