fix

fanguang
Showing 4 changed files with 52 additions and 25 deletions
src/views/data_meta/components/standardDialog.vue
src/views/data_meta/components/standardFieldsDialog.vue
src/views/data_meta/standard-codetable.vue
src/views/data_meta/standard.vue
--- a/src/views/data_meta/components/standardDialog.vue
View file @0d56994
+++ b/src/views/data_meta/components/standardDialog.vue
View file @0d56994
@@ -17,23 +17,6 @@
                    <el-input v-model="form.standardName" placeholder="请输入" maxlength="50"/>
                </el-form-item>
            </el-col>
-            <el-col :span="12">
-                <el-form-item label="标准编号" prop="standardCode">
-                    <el-input v-model="form.standardCode" placeholder="请输入" maxlength="20"/>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" style="padding-right:10px">
-                <el-form-item label="排序" prop="orderNum">
-                    <el-input v-model="form.orderNum" placeholder="请输入" type="number" maxlength="2"/>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" style="padding-right:10px">
-                <el-form-item label="发布单位" prop="publishingUnitCode">
-                    <el-select v-model="form.publishingUnitCode" placeholder="请选择">
-                        <el-option v-for="item in publishUnitOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
-                    </el-select>
-                </el-form-item>
-            </el-col>
            <el-col :span="12" style="padding-right:10px">
                <el-form-item label="上级标准" prop="parentGuid">
                    <el-tree-select 
@@ -60,6 +43,24 @@
                    /> -->
                </el-form-item>
            </el-col>
+            <el-col :span="12" style="padding-right:10px">
+                <el-form-item label="标准编号" prop="standardCode">
+                    <el-input v-model="form.standardCode" placeholder="请输入" maxlength="20"/>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" style="padding-right:10px">
+                <el-form-item label="排序" prop="orderNum">
+                    <el-input v-model="form.orderNum" placeholder="请输入" type="number" maxlength="2"/>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" style="padding-right:10px">
+                <el-form-item label="发布单位" prop="publishingUnitCode">
+                    <el-select v-model="form.publishingUnitCode" placeholder="请选择">
+                        <el-option v-for="item in publishUnitOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
            <el-col :span="24">
                <el-form-item label="描述" prop="description">
                    <el-input 
@@ -253,13 +254,21 @@ function parentGuidChange (val) {
    }   
 }
 function parentGuidCheck (node, {checkedKeys}) {
-    // console.log(node, isCheck)
+    let fieldRQVOS = []
-    // if (!node || !isCheck) {
+    if (checkedKeys.length) {
-    //     form.value.fieldRQVOS = []
+        fieldRQVOS = [{...tableFormTpl}]
-    //     return
+    }
-    // }
+    form.value.fieldRQVOS = fieldRQVOS
-    // form.value.fieldRQVOS = [{...tableFormTpl}]
+    // 新增状态，上级标准带出标准编号和发布单位
-    form.value.fieldRQVOS = checkedKeys.length ? [{...tableFormTpl}] : []
+    if (props.type === 'add') {
+        getMetaStandardDetail(node.guid).then((res:any) => {
+            if (res.code === proxy.$passCode) {
+                const data = res.data
+                form.value.standardCode = data.standardCode
+                form.value.publishingUnitCode = data.publishingUnitCode
+            }
+        })
+    }
 }
 const tableFormTpl = {
--- a/src/views/data_meta/components/standardFieldsDialog.vue
View file @0d56994
+++ b/src/views/data_meta/components/standardFieldsDialog.vue
View file @0d56994
@@ -37,6 +37,8 @@
                        :data="standardCodeTree"
                        :props="treeSelectProps"
                        placeholder="请选择"
+                        filterable
+                        clearable
                    />
                </el-form-item>
            </el-col>
--- a/src/views/data_meta/standard-codetable.vue
View file @0d56994
+++ b/src/views/data_meta/standard-codetable.vue
View file @0d56994
@@ -114,6 +114,7 @@ const tableInfo: any = ref({
  fields: [
    { label: "序号", type: "index", width: 56, align: "center" },
    { label: '代码名称', field: 'codeName', width: 140 },
+    { label: '代码编码', field: 'code', width: 140 },
    { label: '标准号', field: 'standard', width: 140 },
    { label: '标准名称', field: 'standardName', width: 140 },
    // { label: '启用状态', field: 'bizState', type: 'switch', activeText: '启用', inactiveText: '停用', activeValue: 1, inactiveValue: 0, switchWidth: 56, width: 100, align: 'center' },
@@ -172,6 +173,16 @@ const formItems: any = ref([
    required: true
  },
  {
+    label: '代码编码',
+    type: 'input',
+    placeholder: '请输入',
+    field: 'code',
+    default: '',
+    maxlength: 30,
+    clearable: true,
+    required: true
+  },
+  {
    label: '标准号',
    type: 'input',
    placeholder: '请输入',
@@ -225,6 +236,7 @@ const formItems: any = ref([
    placeholder: '请选择',
    field: 'typeCode',
    default: '1',
+    block: true,
    options: [
        { label: '列表结构', value: '1' },
        { label: '层级结构', value: '2' }
@@ -271,6 +283,7 @@ const formItems: any = ref([
 const formRules: any = ref({
  standardTypeCode: { required: true, message: '请选择标准类型' },
  codeName: { required: true, message: '请输入代码名称' },
+  code: { required: true, message: '请输入代码编码' },
  standard: { required: true, message: '请输入标准号' },
  standardName: { required: true, message: '请输入标准名称' },
  publishingUnitCode: { required: true, message: '请选择发布单位' },
--- a/src/views/data_meta/standard.vue
View file @0d56994
+++ b/src/views/data_meta/standard.vue
View file @0d56994
@@ -477,7 +477,10 @@ const viewGraph = () => {
    <div class="main_wrap">
        <div class="table_tool_wrap">
            <div class="tools_btns">
-                <el-button type="primary" @click="() => openStandardFieldsDialog('add')" v-preReClick>新建</el-button>
+                <el-button type="primary" 
+                  @click="() => openStandardFieldsDialog('add')" 
+                  :disabled="treeInfo.currentObj.children"
+                  v-preReClick>新建</el-button>
                <el-button @click="importData" v-preReClick>导入</el-button>
                <el-button @click="exportData" v-preReClick>导出</el-button>
                <el-button @click="viewGraph" v-preReClick>查看</el-button>