From 328a3ffb285f23bff1212aff045682bd29cfae68 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 27 May 2022 11:56:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/components/customContent.vue    | 20 +++--
 .../virtualList/components/editModel.vue      | 82 ++++++++++++++----
 .../components/listEditModel.vue              | 86 ++++++++++++++-----
 .../projectLibrary/index.vue                  | 20 +++--
 4 files changed, 152 insertions(+), 56 deletions(-)

diff --git a/jero-web/src/views/dashboard/components/customContent.vue b/jero-web/src/views/dashboard/components/customContent.vue
index e7c154e31..ff021373d 100644
--- a/jero-web/src/views/dashboard/components/customContent.vue
+++ b/jero-web/src/views/dashboard/components/customContent.vue
@@ -1,15 +1,18 @@
 <template>
   <div class="customContent-box">
-    <div class="box-content-top">
-      <div class="box-content" v-for="(item,index) in dataSourceContentList" :key="index" @click="urlClick(item)">
-        <img :src="item.iconPath" class="img" alt="">
-        <div class="text" :title="item.iconName">{{item.iconName}}</div>
+    <div style="display: inline-block">
+      <div class="box-content-top">
+        <div class="box-content" v-for="(item,index) in dataSourceContentList" :key="index" @click="urlClick(item)">
+          <img :src="item.iconPath" class="img" alt="">
+          <div class="text" :title="item.iconName">{{item.iconName}}</div>
+        </div>
+      </div>
+      <div class="box-content" @click="customClick()" style=";margin-top: 0;float: right">
+        <img src="../../../assets/zdy.png" class="img" alt="">
+        <div class="text">{{$t('custom')}}</div>
       </div>
     </div>
-    <div class="box-content" @click="customClick()" style=";margin-top: 0">
-      <img src="../../../assets/zdy.png" class="img" alt="">
-      <div class="text">{{$t('custom')}}</div>
-    </div>
+
     <a-modal
       :title="$t('custom')"
       :width="1180"
@@ -177,7 +180,6 @@
       display: inline-block;
       overflow: hidden;
       white-space: nowrap;
-      float: left;
     }
 
     .box-content {
diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
index 958997538..7f5e4966a 100644
--- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
@@ -301,12 +301,22 @@
                       :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="typeOfDeliverables">
-                <j-dict-select-tag class="box-input" v-model="formInline.designDeliverableType"
-                                   :disabled="disabled"
-                                   @input="handleInput('designDeliverableType')"
-                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'deliverable_template'"/>
+                <a-tree-select
+                  v-model="formInline.designDeliverableType"
+                  :maxTagCount="1"
+                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                  class="box-input"
+                  style="width: 100%"
+                  :tree-data="DeliverableTreeList"
+                  tree-checkable
+                  :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+                />
+<!--                <j-dict-select-tag class="box-input" v-model="formInline.designDeliverableType"-->
+<!--                                   :disabled="disabled"-->
+<!--                                   @input="handleInput('designDeliverableType')"-->
+<!--                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
+<!--                                   :type="'select'"-->
+<!--                                   :triggerChange="false" :dictCode="'deliverable_template'"/>-->
               </a-form-model-item>
             </div>
           </a-col>
@@ -372,12 +382,22 @@
                       :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="prehomoDeliverableType">
-                <j-dict-select-tag class="box-input" v-model="formInline.prehomoDeliverableType"
-                                   :disabled="disabled"
-                                   @input="handleInput('prehomoDeliverableType')"
-                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'deliverable_template'"/>
+                <a-tree-select
+                  v-model="formInline.prehomoDeliverableType"
+                  :maxTagCount="1"
+                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                  class="box-input"
+                  style="width: 100%"
+                  :tree-data="DeliverableTreeList"
+                  tree-checkable
+                  :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+                />
+<!--                <j-dict-select-tag class="box-input" v-model="formInline.prehomoDeliverableType"-->
+<!--                                   :disabled="disabled"-->
+<!--                                   @input="handleInput('prehomoDeliverableType')"-->
+<!--                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
+<!--                                   :type="'select'"-->
+<!--                                   :triggerChange="false" :dictCode="'deliverable_template'"/>-->
               </a-form-model-item>
             </div>
           </a-col>
@@ -444,12 +464,22 @@
                       :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="verifyDeliverableType">
-                <j-dict-select-tag class="box-input" v-model="formInline.verifyDeliverableType"
-                                   :disabled="disabled"
-                                   @input="handleInput('verifyDeliverableType')"
-                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'deliverable_template'"/>
+                <a-tree-select
+                  v-model="formInline.verifyDeliverableType"
+                  :maxTagCount="1"
+                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                  class="box-input"
+                  style="width: 100%"
+                  :tree-data="DeliverableTreeList"
+                  tree-checkable
+                  :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+                />
+<!--                <j-dict-select-tag class="box-input" v-model="formInline.verifyDeliverableType"-->
+<!--                                   :disabled="disabled"-->
+<!--                                   @input="handleInput('verifyDeliverableType')"-->
+<!--                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
+<!--                                   :type="'select'"-->
+<!--                                   :triggerChange="false" :dictCode="'deliverable_template'"/>-->
               </a-form-model-item>
             </div>
           </a-col>
@@ -584,11 +614,13 @@
         },
         formInline: {},
         disabled: false,
-        CategoryTreeList: []
+        CategoryTreeList: [],
+        DeliverableTreeList: []
       }
     },
     mounted() {
       this.getSysCategoryTree()
+      this.getDeliverableTree()
     },
     methods: {
       getSysCategoryTree() {
@@ -600,11 +632,23 @@
           }
         })
       },
+      getDeliverableTree() {
+        getAction('/sys/category/getDeliverableTree', {}).then((res) => {
+          if (res.success) {
+            this.DeliverableTreeList = res.result
+          } else {
+            this.DeliverableTreeList = []
+          }
+        })
+      },
       editModel(item) {
         this.visible = true
         this.$nextTick(() => {
           this.formInline = item || {}
           this.formInline.technologyTerritory = this.formInline.technologyTerritory ? this.formInline.technologyTerritory.split(',') : []
+          this.formInline.designDeliverableType = this.formInline.designDeliverableType ? this.formInline.designDeliverableType.split(',') : []
+          this.formInline.prehomoDeliverableType = this.formInline.prehomoDeliverableType ? this.formInline.prehomoDeliverableType.split(',') : []
+          this.formInline.verifyDeliverableType = this.formInline.verifyDeliverableType ? this.formInline.verifyDeliverableType.split(',') : []
           this.$refs.ruleForm.clearValidate()
         })
       },
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index 8e8a60291..d11b9aeac 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -322,12 +322,22 @@
                       :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="typeOfDeliverables">
-                <j-dict-select-tag class="box-input" v-model="formInline.designDeliverableType"
-                                   :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.designDeliverableType ? true : false"
-                                   @input="handleInput('designDeliverableType')"
-                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'deliverable_template'"/>
+                <a-tree-select
+                  v-model="formInline.designDeliverableType"
+                  :maxTagCount="1"
+                  :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.designDeliverableType ? true : false"
+                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                  class="box-input"
+                  style="width: 100%"
+                  :tree-data="DeliverableTreeList"
+                  tree-checkable
+                  :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+                />
+                <!--                <j-dict-select-tag class="box-input" v-model="formInline.designDeliverableType"-->
+                <!--                                   @input="handleInput('designDeliverableType')"-->
+                <!--                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
+                <!--                                   :type="'select'"-->
+                <!--                                   :triggerChange="false" :dictCode="'deliverable_template'"/>-->
               </a-form-model-item>
             </div>
           </a-col>
@@ -459,13 +469,23 @@
                       :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="prehomoDeliverableType">
-
-                <j-dict-select-tag class="box-input" v-model="formInline.prehomoDeliverableType"
-                                   :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.prehomoDeliverableType ? true : false"
-                                   @input="handleInput('prehomoDeliverableType')"
-                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'deliverable_template'"/>
+                <a-tree-select
+                  v-model="formInline.prehomoDeliverableType"
+                  :maxTagCount="1"
+                  :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.prehomoDeliverableType ? true : false"
+                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                  class="box-input"
+                  style="width: 100%"
+                  :tree-data="DeliverableTreeList"
+                  tree-checkable
+                  :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+                />
+                <!--                <j-dict-select-tag class="box-input" v-model="formInline.prehomoDeliverableType"-->
+                <!--                                   :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.prehomoDeliverableType ? true : false"-->
+                <!--                                   @input="handleInput('prehomoDeliverableType')"-->
+                <!--                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
+                <!--                                   :type="'select'"-->
+                <!--                                   :triggerChange="false" :dictCode="'deliverable_template'"/>-->
               </a-form-model-item>
             </div>
           </a-col>
@@ -598,12 +618,23 @@
                       :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="verifyDeliverableType">
-                <j-dict-select-tag class="box-input" v-model="formInline.verifyDeliverableType"
-                                   :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.verifyDeliverableType ? true : false"
-                                   @input="handleInput('verifyDeliverableType')"
-                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'deliverable_template'"/>
+                <a-tree-select
+                  v-model="formInline.verifyDeliverableType"
+                  :maxTagCount="1"
+                  :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.verifyDeliverableType ? true : false"
+                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                  class="box-input"
+                  style="width: 100%"
+                  :tree-data="DeliverableTreeList"
+                  tree-checkable
+                  :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+                />
+                <!--                <j-dict-select-tag class="box-input" v-model="formInline.verifyDeliverableType"-->
+                <!--                                   :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.verifyDeliverableType ? true : false"-->
+                <!--                                   @input="handleInput('verifyDeliverableType')"-->
+                <!--                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
+                <!--                                   :type="'select'"-->
+                <!--                                   :triggerChange="false" :dictCode="'deliverable_template'"/>-->
               </a-form-model-item>
             </div>
           </a-col>
@@ -821,12 +852,23 @@
         prehomoInitiatorIdDisabled: false,
         prehomoDutyIdDisabled: false,
         verifyDutyIdDisabled: false,
-        verifyInitiatorIdDisabled: false
+        verifyInitiatorIdDisabled: false,
+        DeliverableTreeList: []
       }
     },
     mounted() {
+      this.getDeliverableTree()
     },
     methods: {
+      getDeliverableTree() {
+        getAction('/sys/category/getDeliverableTree', {}).then((res) => {
+          if (res.success) {
+            this.DeliverableTreeList = res.result
+          } else {
+            this.DeliverableTreeList = []
+          }
+        })
+      },
       dutyTerritoryChange(event) {
         this.formInline.regulationOwnerId = undefined
         this.formInline.engineeringInterfacePerson = undefined
@@ -1001,6 +1043,10 @@
         this.verifyInitiatorList = []
         this.verifyDutyList = []
         this.prehomoDutyList = []
+        this.getDeliverableTree()
+        item.designDeliverableType = item.designDeliverableType ? item.designDeliverableType.split(',') : []
+        item.prehomoDeliverableType = item.prehomoDeliverableType ? item.prehomoDeliverableType.split(',') : []
+        item.verifyDeliverableType = item.verifyDeliverableType ? item.verifyDeliverableType.split(',') : []
         if (item.dutyTerritory) {
           this.queryPersonByProject(item)
         } else {
diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue
index 759864cc8..903eec9a7 100644
--- a/jero-web/src/views/projectManagement/projectLibrary/index.vue
+++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue
@@ -66,10 +66,12 @@
               <div class="title-text" :title="$t('ModelPlatform')">
                 <span>{{$t('ModelPlatform')}}</span>
               </div>
-              <j-dict-select-tag class="box-input" v-model="queryParam.vehiclePlatform"
-                                 :placeholder="$t('PleaseSelect')+$t('ModelPlatform')"
-                                 :type="'select'"
-                                 :triggerChange="false" :dictCode="'vehicle_platform'"/>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ModelPlatform')"
+                       v-model="queryParam.vehiclePlatform"></a-input>
+<!--              <j-dict-select-tag class="box-input" v-model="queryParam.vehiclePlatform"-->
+<!--                                 :placeholder="$t('PleaseSelect')+$t('ModelPlatform')"-->
+<!--                                 :type="'select'"-->
+<!--                                 :triggerChange="false" :dictCode="'vehicle_platform'"/>-->
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
@@ -77,10 +79,12 @@
               <div class="title-text" :title="$t('DigitalPlatform')">
                 <span>{{$t('DigitalPlatform')}}</span>
               </div>
-              <j-dict-select-tag class="box-input" v-model="queryParam.digitalPlatform"
-                                 :placeholder="$t('PleaseSelect')+$t('DigitalPlatform')"
-                                 :type="'select'"
-                                 :triggerChange="false" :dictCode="'digital_platform'"/>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('DigitalPlatform')"
+                       v-model="queryParam.digitalPlatform"></a-input>
+<!--              <j-dict-select-tag class="box-input" v-model="queryParam.digitalPlatform"-->
+<!--                                 :placeholder="$t('PleaseSelect')+$t('DigitalPlatform')"-->
+<!--                                 :type="'select'"-->
+<!--                                 :triggerChange="false" :dictCode="'digital_platform'"/>-->
             </div>
           </a-col>
         </template>