Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

i18n/locale/zh-CN.js

@@ -1764,5 +1764,34 @@ export default {
       refName:'引用的文档名称',
       refId:'引用的文档id',
       name:'文档名称',
-    }
+    },
+    document_property_definition:{
+      title:'标题',
+      name:'编号',
+      revision:'版本',
+      description:'详细说明',
+      miji:"密级",
+      status:'状态',
+      filePath:'上传文件',
+      field:'字段',
+      dataType:'数据类型',
+      dataLength:'数据长度',
+      dictionaryId:'',
+      note:'',
+      unitName:'单位',
+      tag:'属性类别',
+      categoryId:'所属分类',
+      required:'必填',
+      isUnique:'是否唯一',
+      fieldType:'',
+      creationTime:'创建时间',
+      creatorUserId:'创建人',
+      lastModificationTime:'更新时间',
+      lastModifierUserId:'更新人',
+      isDeleted:'删除人',
+      deletionTime:'删除时间',
+      deleterUserId:'删除人',
+      dictionaryCode:'',
+      codeRuleId:'',
+           }
 }

pages/word/classification/add.vue

@@ -161,7 +161,7 @@ export default {
           note: "",
           dataType: 0,
           unitName: "",
-          required: true,
+          required: false,
           isunique: false,
           fieldType: 1,
           categoryId: 0,
@@ -328,7 +328,6 @@ export default {
             // this.entity.filePath = "";
             this.entity.templateId = "";
           }
-
           if (this.row.id) {
             this.entity.upId = this.row.id;
             this.entity.level = this.row.level;
@@ -338,7 +337,6 @@ export default {
             this.entity.level = 1;
             this.entity.inheritCategoryId = 0;
           }
-          alert(55);
           let data = {
             cat: this.entity,
             pros: this.checkList,

pages/word/classification/edit.vue

@@ -35,7 +35,7 @@
         </FormItem>
       </Col>
       <Col :span="12">
-        <FormItem :label="l('inheritCategoryId')" prop="inheritCategoryId">
+        <FormItem :label="l('inheritCategoryId')" prop="inheritCategoryId" v-if='entity.upId!=0'>
           <!-- <Checkbox v-model="entity.inheritCategoryId"></Checkbox> -->
           <RadioGroup v-model="inherit">
             <Radio label="1">是</Radio>
@@ -148,7 +148,7 @@ export default {
           note: "",
           dataType: 0,
           unitName: "",
-          required: true,
+          required: false,
           isunique: false,
           fieldType: 1,
           categoryId: 0,
@@ -342,7 +342,7 @@ export default {
           if (this.inherit == 0) {
             this.entity.inheritCategoryId = 0;
           } else {
-            this.entity.inheritCategoryId = this.entity.id;
+            this.entity.inheritCategoryId = this.entity.upId;
           }
 
           let data = {

pages/word/document/api.js

-import Api from '@/plugins/request'
+import Api from '@/plugins/request';
 export default {
-    index:`${material}documentref/paged`,
+    index:`${material}/document/paged`,
     paged(params){
-    return Api.post(`${material}documentref/paged`,params);
+    return Api.post(`${material}/document/paged`,params);
     },
     get(params){
-    return Api.get(`${material}documentref/get`,params);
+    return Api.get(`${material}/document/get`,params);
     },
     create(params){
-    return Api.post(`${material}documentref/create`,params);
+    return Api.post(`${material}/document/createnew`,params);
     },
     update(params){
-    return Api.post(`${material}documentref/update`,params);
+    return Api.post(`${material}/document/updatenew`,params);
     },
     delete(id) {
-    return Api.delete(`${material}documentref/delete`,{params:{id:id}});
+    return Api.delete(`${material}/document/delete`,{params:{id:id}});
     },
     deletes(params) {
-    return Api.post(`${material}documentref/batchdelete`,params);
-    }
-    }
\ No newline at end of file
+    return Api.post(`${material}/document/batchdelete`,params);
+    },
+    //文档分类列表
+    list(params){
+        return Api.post(`${material}/documentcategory/list`,params);
+    },
+    //自定义属性
+    listbyid(params){
+        return Api.get(`${material}/documentpropertydefinition/listbyid`,params);
+    },
+}
\ No newline at end of file

pages/word/document/detail.vue

@@ -2,6 +2,18 @@
     <div class="detail">
 
         <Row>
+<Filed :span="12" :name="l('title')">{{entity.title}}</Filed>
+<Filed :span="12" :name="l('field')">{{entity.field}}</Filed>
+<Filed :span="12" :name="l('dataType')">{{entity.dataType}}</Filed>
+<Filed :span="12" :name="l('dataLength')">{{entity.dataLength}}</Filed>
+<Filed :span="12" :name="l('dictionaryId')">{{entity.dictionaryId}}</Filed>
+<Filed :span="12" :name="l('note')">{{entity.note}}</Filed>
+<Filed :span="12" :name="l('unitName')">{{entity.unitName}}</Filed>
+<Filed :span="12" :name="l('tag')">{{entity.tag}}</Filed>
+<Filed :span="12" :name="l('categoryId')">{{entity.categoryId}}</Filed>
+<Filed :span="12" :name="l('required')">{{entity.required}}</Filed>
+<Filed :span="12" :name="l('isUnique')">{{entity.isUnique}}</Filed>
+<Filed :span="12" :name="l('fieldType')">{{entity.fieldType}}</Filed>
 <Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed>
 <Filed :span="12" :name="l('creatorUserId')">{{entity.creatorUserId}}</Filed>
 <Filed :span="12" :name="l('lastModificationTime')">{{entity.lastModificationTime}}</Filed>
@@ -9,10 +21,8 @@
 <Filed :span="12" :name="l('isDeleted')">{{entity.isDeleted}}</Filed>
 <Filed :span="12" :name="l('deletionTime')">{{entity.deletionTime}}</Filed>
 <Filed :span="12" :name="l('deleterUserId')">{{entity.deleterUserId}}</Filed>
-<Filed :span="12" :name="l('documentId')">{{entity.documentId}}</Filed>
-<Filed :span="12" :name="l('refName')">{{entity.refName}}</Filed>
-<Filed :span="12" :name="l('refId')">{{entity.refId}}</Filed>
-<Filed :span="12" :name="l('name')">{{entity.name}}</Filed>
+<Filed :span="12" :name="l('dictionaryCode')">{{entity.dictionaryCode}}</Filed>
+<Filed :span="12" :name="l('codeRuleId')">{{entity.codeRuleId}}</Filed>
         </Row>
        
     </div>
@@ -49,7 +59,7 @@
                 this.$emit('on-close')
             },
       l(key) {
-          key = "document_ref" + "." + key;
+          key = "document_property_definition" + "." + key;
           return this.$t(key)
       }
         },

pages/word/document/edit.vue

 <template>
     <Form ref="form" :model="entity" :rules="rules" :label-width="90">
         <Row>
+<Col :span="12"><FormItem :label="l('title')" prop="title">                    <Input v-model="entity.title"> </Input>
+</FormItem></Col>
+<Col :span="12"><FormItem :label="l('field')" prop="field">                    <Input v-model="entity.field"> </Input>
+</FormItem></Col>
+<Col :span="12"><FormItem :label="l('dataType')" prop="dataType">                    <InputNumber v-model="entity.dataType"></InputNumber>
+</FormItem></Col>
+<Col :span="12"><FormItem :label="l('dataLength')" prop="dataLength">                    <InputNumber v-model="entity.dataLength"></InputNumber>
+</FormItem></Col>
+<Col :span="12"><FormItem :label="l('dictionaryId')" prop="dictionaryId">                    <InputNumber v-model="entity.dictionaryId"></InputNumber>
+</FormItem></Col>
+<Col :span="12"><FormItem :label="l('note')" prop="note">                    <Input v-model="entity.note"> </Input>
+</FormItem></Col>
+<Col :span="12"><FormItem :label="l('unitName')" prop="unitName">                    <Input v-model="entity.unitName"> </Input>
+</FormItem></Col>
+<Col :span="12"><FormItem :label="l('tag')" prop="tag">                    <Input v-model="entity.tag"> </Input>
+</FormItem></Col>
+<Col :span="12"><FormItem :label="l('categoryId')" prop="categoryId">                    <InputNumber v-model="entity.categoryId"></InputNumber>
+</FormItem></Col>
+<Col :span="12"><FormItem :label="l('required')" prop="required">                    <InputNumber v-model="entity.required"></InputNumber>
+</FormItem></Col>
+<Col :span="12"><FormItem :label="l('isUnique')" prop="isUnique">                    <InputNumber v-model="entity.isUnique"></InputNumber>
+</FormItem></Col>
+<Col :span="12"><FormItem :label="l('fieldType')" prop="fieldType">                    <Input v-model="entity.fieldType"> </Input>
+</FormItem></Col>
 <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>
@@ -15,13 +39,9 @@
 </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('documentId')" prop="documentId">                    <Input v-model="entity.documentId"> </Input>
-</FormItem></Col>
-<Col :span="12"><FormItem :label="l('refName')" prop="refName">                    <Input v-model="entity.refName"> </Input>
-</FormItem></Col>
-<Col :span="12"><FormItem :label="l('refId')" prop="refId">                    <Input v-model="entity.refId"> </Input>
+<Col :span="12"><FormItem :label="l('dictionaryCode')" prop="dictionaryCode">                    <Input v-model="entity.dictionaryCode"> </Input>
 </FormItem></Col>
-<Col :span="12"><FormItem :label="l('name')" prop="name">                    <Input v-model="entity.name"> </Input>
+<Col :span="12"><FormItem :label="l('codeRuleId')" prop="codeRuleId">                    <InputNumber v-model="entity.codeRuleId"></InputNumber>
 </FormItem></Col>
         </Row>
         <FormItem>
@@ -82,7 +102,7 @@
                 this.$emit('on-close')
             },
       l(key) {
-          key = "document_ref" + "." + key;
+          key = "document_property_definition" + "." + key;
           return this.$t(key)
       }
         },