From b1062d5bd744689b0954959e10ec223107fc6ab0 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 7 Sep 2023 15:50:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=90=BA=E5=B8=A6=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParameterItemCollectionList.vue           | 59 +++++++++++--------
 .../projectParameterTasks/index.vue           |  3 +
 2 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 22a43511a..e6e1ea4fb 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -120,27 +120,27 @@
                                  v-model="formInline.sdt"></a-input>
                       </div>
                     </a-col>
+                    <a-col :md="6" :sm="8">
+                      <div class="box-title-text">
+                        <div class="title-text" :title="$t('status')">
+                          <span>{{$t('status')}}</span>
+                        </div>
+                        <a-select :placeholder="$t('PleaseSelect')+$t('status')"
+                                  class="box-input"
+                                  allowClear
+                                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                                  v-model="formInline.state">
+                          <a-select-option v-for="(item, key) in statusList"
+                                           :key="key"
+                                           :value="item.value">
+                            <span style="display: inline-block;width: 100%" :title=" item.name ">
+                              {{ item.text}}
+                            </span>
+                          </a-select-option>
+                        </a-select>
+                      </div>
+                    </a-col>
                   </template>
-                  <!--                  <a-col :md="6" :sm="8">-->
-                  <!--                    <div class="box-title-text">-->
-                  <!--                      <div class="title-text" :title="$t('status')">-->
-                  <!--                        <span>{{$t('status')}}</span>-->
-                  <!--                      </div>-->
-                  <!--                      <a-select :placeholder="$t('PleaseSelect')+$t('status')"-->
-                  <!--                                class="box-input"-->
-                  <!--                                allowClear-->
-                  <!--                                :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
-                  <!--                                v-model="formInline.state">-->
-                  <!--                        <a-select-option v-for="(item, key) in statusList"-->
-                  <!--                                         :key="key"-->
-                  <!--                                         :value="item.value">-->
-                  <!--                     <span style="display: inline-block;width: 100%" :title=" item.name ">-->
-                  <!--                           {{ item.name}}-->
-                  <!--                     </span>-->
-                  <!--                        </a-select-option>-->
-                  <!--                      </a-select>-->
-                  <!--                    </div>-->
-                  <!--                  </a-col>-->
                   <span style="float: right;overflow: hidden;margin-right: 11px"
                         class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
@@ -799,12 +799,12 @@
             value: 'paramsNumber',
             text: this.$t('certificationCategoryNumber')
           },
-          {
-            type: '',
-            value: 'state',
-            text: this.$t('status'),
-            options: this.statusList//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
-          },
+          // {
+          //   type: '',
+          //   value: 'state',
+          //   text: this.$t('status'),
+          //   options: this.statusList//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          // },
           {
             type: 'string',
             value: 'params_batch',
@@ -1036,6 +1036,13 @@
       if (this.$route.query.type == '1') {
         this.handleOkRoleSwitching()
       }
+      if (this.$route.query.statusFlag == '1') {
+        this.formInline.state = '1'
+      } else if(this.$route.query.statusFlag == '2'){
+        this.formInline.state = '2'
+      }else if(this.$route.query.statusFlag == '4'){
+        this.formInline.state = '4'
+      }
       // clearTimeout(this.timeBatch)
       // this.timeBatch = setTimeout(() => {
       //   if (this.currentPersonRole == 'dre') {
diff --git a/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue b/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue
index 4b32d03cc..8e90ee156 100644
--- a/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue
+++ b/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue
@@ -189,6 +189,7 @@
            })
             let _this = this
             item.type = '1'
+            item.statusFlag = '4'
             item.userType = flag == undefined ?  valueList[0] : 'dre'
             this.loading = false
             let newUrl = _this.$router.resolve({
@@ -223,6 +224,7 @@
             })
             let _this = this
             item.type = '1'
+            item.statusFlag = '2'
             item.userType = flag == undefined ?  valueList[0] : 'sdt'
             this.loading = false
             let newUrl = _this.$router.resolve({
@@ -258,6 +260,7 @@
             })
             let _this = this
             item.type = '1'
+            item.statusFlag = '1'
             item.userType = flag == undefined ?  valueList[0] : 'homo'
             this.loading = false
             let newUrl = _this.$router.resolve({