修改UAT提出的问题

2023-05-09 11:31:50 +08:00
parent e972566364
commit 9d32a3c6f2
1 changed files with 121 additions and 102 deletions
@@ -6,6 +6,27 @@
          {{$t('ParameteItemCollectionList')}}({{$t(this.$route.query.projectName)}}) — {{$t(this.$route.query.title)}}
        </span>
      </div>
+      <div class="Virtual-detail-title-right">
+        <a-popconfirm overlayClassName="popconfirmDetailsText"
+                      :visible="visible"
+                      @visibleChange="handleVisibleChange"
+                      placement="bottomRight">
+          <template slot="title" id="popconfirmDetails">
+            <div @click="roleSwitchingClick(item.value)"
+                 v-for="(item,index) in RoleType"
+                 class="operator-text-title"
+                 :class="{'operator-text-title-color':item.label == rolename ? true : false}"
+                 :title="item.label">
+              {{ item.label }}
+            </div>
+            <JLoading :loading="JTextLoading"></JLoading>
+          </template>
+          <div class="operator-text" style="position: relative;margin-right: 0">
+            <a-icon type="select"/>
+            {{rolename}}
+          </div>
+        </a-popconfirm>
+      </div>
    </div>
    <div style="padding-top: 54px;background: #fff;height: 100%">
      <div class="detail-content" style="height: 100%">
@@ -33,28 +54,28 @@
                               v-model="formInline.paramsName"></a-input>
                    </div>
                  </a-col>
-<!--                  <a-col :md="6" :sm="8">-->
-<!--                    <div class="box-title-text">-->
-<!--                      <div class="title-text" :title="$t('NareaOfResponsibility')">-->
-<!--                        <span>{{$t('NareaOfResponsibility')}}</span>-->
-<!--                      </div>-->
-<!--                      <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"-->
-<!--                                          :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"-->
-<!--                                          :type="'select'"-->
-<!--                                          :triggerChange="false" :dictCode="'duty_territory'"/>-->
-<!--                    </div>-->
-<!--                  </a-col>-->
-                                    <a-col :md="6" :sm="8">
-                                      <div class="box-title-text">
-                                        <div class="title-text" :title="$t('certificationCategory')">
-                                          <span>{{$t('certificationCategory')}}</span>
-                                        </div>
-                                        <j-dict-select-tag class="box-input" v-model="formInline.certCategory"
-                                                           :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
-                                                           :type="'select'"
-                                                           :triggerChange="false" :dictCode="'cert_category'"/>
-                                      </div>
-                                    </a-col>
+                  <!--                  <a-col :md="6" :sm="8">-->
+                  <!--                    <div class="box-title-text">-->
+                  <!--                      <div class="title-text" :title="$t('NareaOfResponsibility')">-->
+                  <!--                        <span>{{$t('NareaOfResponsibility')}}</span>-->
+                  <!--                      </div>-->
+                  <!--                      <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"-->
+                  <!--                                          :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"-->
+                  <!--                                          :type="'select'"-->
+                  <!--                                          :triggerChange="false" :dictCode="'duty_territory'"/>-->
+                  <!--                    </div>-->
+                  <!--                  </a-col>-->
+                  <a-col :md="6" :sm="8">
+                    <div class="box-title-text">
+                      <div class="title-text" :title="$t('certificationCategory')">
+                        <span>{{$t('certificationCategory')}}</span>
+                      </div>
+                      <j-dict-select-tag class="box-input" v-model="formInline.certCategory"
+                                         :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
+                                         :type="'select'"
+                                         :triggerChange="false" :dictCode="'cert_category'"/>
+                    </div>
+                  </a-col>
                  <template v-if="toggleSearchStatus">
                    <a-col :md="6" :sm="8">
                      <div class="box-title-text">
@@ -269,9 +290,9 @@
              {{$t('CompulsoryWithdrawal')}}
            </div>
            <!--        列表设置-->
-<!--            v-if="!this.$route.query.it"-->
+            <!--            v-if="!this.$route.query.it"-->
            <a-popconfirm :visible="customizevisible" overlayClassName="popconfirmIndex"
-                          placement="bottomRight" >
+                          placement="bottomRight">
              <template slot="title" id="popconfirmmize">
                <div style="max-height:360px;overflow:scroll;overflow-x: auto;width: 211px">
                  <a-checkbox
@@ -283,13 +304,15 @@
                  >{{ $t('selectAll') }}
                  </a-checkbox>
                  <a-checkbox-group @change="onChange" v-model="checkedList" class="customize-text">
-                    <a-checkbox class="customize-text-title" :disabled="item.disabled" v-for="(item, key) in customizeList"
+                    <a-checkbox class="customize-text-title" :disabled="item.disabled"
+                                v-for="(item, key) in customizeList"
                                :key="key" :value="item.field">{{ item.db_field_txt }}
                    </a-checkbox>
                  </a-checkbox-group>
                  <div class="drawer-bootom-button">
                    <a-button @click="cancel" style="margin-right: 16px">{{ $t('cancel') }}</a-button>
-                    <a-button @click="handleSubmitcustomize" type="primary" :loading="confirmLoading">{{ $t('determine') }}
+                    <a-button @click="handleSubmitcustomize" type="primary" :loading="confirmLoading">{{ $t('determine')
+                      }}
                    </a-button>
                  </div>
                </div>
@@ -300,31 +323,13 @@
              </div>
            </a-popconfirm>
            <!--       角色切换   -->
-<!--            <div class="operator-text"-->
-<!--                 v-if="!this.$route.query.it"-->
-<!--                 @click="roleSwitchingClick">-->
-<!--              <a-icon type="select"/>-->
-<!--              {{ $t('roleSwitching') }} ({{ $t(this.rolename)}})-->
-<!--            </div>-->
-            <a-popconfirm overlayClassName="popconfirmDetails"
-                          :visible="visible"
-                          @visibleChange="handleVisibleChange"
-                          placement="bottomRight">
-              <template slot="title" id="popconfirmDetails">
-                <div @click="roleSwitchingClick(item.value)"
-                     v-for="(item,index) in RoleType"
-                     class="operator-text-title"
-                     :class="{'operator-text-title-color':item.label == rolename ? true : false}"
-                     :title="item.label">
-                  {{ item.label }}
-                </div>
-                <JLoading :loading="JTextLoading"></JLoading>
-              </template>
-              <div class="operator-text" style="position: relative">
-                <a-icon type="select"/>
-                {{rolename}}
-              </div>
-            </a-popconfirm>
+            <!--            <div class="operator-text"-->
+            <!--                 v-if="!this.$route.query.it"-->
+            <!--                 @click="roleSwitchingClick">-->
+            <!--              <a-icon type="select"/>-->
+            <!--              {{ $t('roleSwitching') }} ({{ $t(this.rolename)}})-->
+            <!--            </div>-->
+
          </div>
          <div style="width: 100%">
            <!-- 表格-10控件-->
@@ -868,7 +873,7 @@
        //     status: 2
        //   }
        // ],
-        customizeList:[],
+        customizeList: [],
        selectedRowKeys: [],
        textLoading: false,
        formInline: {},
@@ -885,7 +890,7 @@
        },
        loading: false,
        dataSource: [],
-        statuList:[],
+        statuList: [],
        areaVisible: false, // 弹框的控制
        configureareaVisible: false, // 配置的彈框
        pageNo: 1,
@@ -1118,7 +1123,7 @@
        }
      },
      roleSwitchingClick(roleCode) {
-        console.log(roleCode,1111)
+        console.log(roleCode, 1111)
        this.JTextLoading = true
        // this.visibleRoleSwitching = true
        this.$nextTick(() => {
@@ -1163,34 +1168,34 @@
        } else {
          // this.$refs.ruleFormRoleSwitching.validate(valid => {
          //   if (valid) {
-              let query = {
-                userType: roleCode,
-                paramsManifestId: this.$route.query.id,
-                projectId: this.$route.query.projectId,
-                userId: this.userInfo().id
-              }
-              this.confirmLoadingRoleSwitching = true
-              postAction('/params/userTypeLog/edit', query).then((res) => {
-                if (res.success) {
-                  this.currentPersonRole = roleCode
-                  this.$message.success(this.$t('OperationSuccessful'))
-                  this.visibleRoleSwitching = false
-                  this.confirmLoadingRoleSwitching = false
-                  this.JTextLoading = false
-                  this.visible = false
-                  localStorage.setItem('currentPersonRole', JSON.stringify(roleCode))
-                  this.RoleType.forEach((item, index) => {
-                    if (item.value == this.currentPersonRole) {
-                      this.rolename = item.label
-                    }
-                  })
-                  this.selectedRowKeysValue = []
-                } else {
-                  this.confirmLoadingRoleSwitching = false
-                  this.JTextLoading = false
-                  this.$message.warning(this.$t('operationFailed'))
+          let query = {
+            userType: roleCode,
+            paramsManifestId: this.$route.query.id,
+            projectId: this.$route.query.projectId,
+            userId: this.userInfo().id
+          }
+          this.confirmLoadingRoleSwitching = true
+          postAction('/params/userTypeLog/edit', query).then((res) => {
+            if (res.success) {
+              this.currentPersonRole = roleCode
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.visibleRoleSwitching = false
+              this.confirmLoadingRoleSwitching = false
+              this.JTextLoading = false
+              this.visible = false
+              localStorage.setItem('currentPersonRole', JSON.stringify(roleCode))
+              this.RoleType.forEach((item, index) => {
+                if (item.value == this.currentPersonRole) {
+                  this.rolename = item.label
                }
              })
+              this.selectedRowKeysValue = []
+            } else {
+              this.confirmLoadingRoleSwitching = false
+              this.JTextLoading = false
+              this.$message.warning(this.$t('operationFailed'))
+            }
+          })
          //   }
          // })
        }
@@ -1823,27 +1828,27 @@
        this.selectedValue = this.checkedList
        this.indeterminate = false
      },
-      getcustomizeList(item){
+      getcustomizeList(item) {
        let params = {
          paramsManifestId: this.$route.query.id,
-          projectName:this.$route.query.projectName,
+          projectName: this.$route.query.projectName,
          flag: '7'
        }
        getAction('params/collectManifest/getHeader', params).then((res) => {
          if (res.success) {
            let List = []
            let sList = []
-            res.result.forEach((item,index) => {
-              if(!item.isLock){
-                if(item.headFieldCn == '操作'){
+            res.result.forEach((item, index) => {
+              if (!item.isLock) {
+                if (item.headFieldCn == '操作') {
                  item.field = 'operation'
                  item.disabled = true
-                }else if(item.headFieldCn == 'NIO编号' || item.headFieldCn == '参数名称'){
+                } else if (item.headFieldCn == 'NIO编号' || item.headFieldCn == '参数名称') {
                  item.disabled = true
                }
                List.push(item)
              }
-              if(item.isLock) {
+              if (item.isLock) {
                sList.push(item)
              }
            })
@@ -1851,7 +1856,7 @@
            this.statuList = sList
          }
        })
-        if(item){
+        if (item) {
          console.log(item)
          this.checkedList = item
        }
@@ -2222,7 +2227,7 @@
      returnDataJurisdiction() {
        // 退回的状态权限
        let homoJurisdictionReturn = this.homoJurisdictionReturn()
-        console.log(homoJurisdictionReturn,'homoJurisdictionReturn')
+        console.log(homoJurisdictionReturn, 'homoJurisdictionReturn')
        if (homoJurisdictionReturn == 1) {
          this.returnData()
        } else if (homoJurisdictionReturn == 0) {
@@ -2306,9 +2311,9 @@
        })
        let _this = this
        let param = {
-          ids: _array.join(',') ,
-          paramsManifestId:this.$route.query.id,
-          projectId:this.$route.query.projectId,
+          ids: _array.join(','),
+          paramsManifestId: this.$route.query.id,
+          projectId: this.$route.query.projectId

        }
        let url = ''
@@ -2512,9 +2517,11 @@
  .popconfirmIndex .anticon-exclamation-circle {
    display: none !important;
  }
+
  ::v-deep .ant-table-fixed-header .ant-table-body-inner {
    overflow: visible;
  }
+
  popconfirmmize {
    z-index: 999;
  }
@@ -2530,6 +2537,7 @@
  .popconfirmmize .ant-popover-message {
    padding: 4px 0 36px !important;
  }
+
  ::v-deep .ant-popover-buttons {
    display: none !important;
  }
@@ -2639,6 +2647,7 @@
  .Required {
    color: red;
  }
+
  .customize-text {
    /*height: 1533px;*/
    display: flex;
@@ -2653,6 +2662,7 @@
    color: #040B29;
    margin-bottom: 22px;
  }
+
  .drawer-bootom-button {
    position: absolute;
    bottom: 0;
@@ -2665,6 +2675,7 @@
    background: #fff;
    border-radius: 0 0 2px 2px;
  }
+
  .ant-table-placeholder {
    padding: 0;
    border-top: none;
@@ -2673,9 +2684,11 @@
  .itemModelComment .ant-form-item-control-wrapper {
    width: 100% !important;
  }
+
  .second {
    padding: 0 !important;
  }
+
  .doc-detail {
    background: #fff;
    height: 100%;
@@ -2751,6 +2764,10 @@
        line-height: 68px;
      }

+      .Virtual-detail-title-right {
+        float: right;
+      }
+
      .doc-detail-right {
        width: 800px;
        line-height: 68px;
@@ -2782,9 +2799,11 @@
  .text-wraning {
    word-break: break-word;
  }
+
  .operator-text-title-color {
    color: #00B3BE;
  }
+
 </style>
 <style lang='less'>
  .popconfirmIndex .ant-popover-message-title {
@@ -2792,16 +2811,16 @@
  }
 </style>
 <style>
-.popconfirmDetails {
-  z-index: 999;
-  /*top: 42px !important;*/
-}
+  .popconfirmDetailsText {
+    z-index: 1000;
+    top: 42px !important;
+  }

-.popconfirmDetails .ant-popover-buttons {
-  display: none !important;
-}
+  .popconfirmDetailsText .ant-popover-buttons {
+    display: none !important;
+  }

-.popconfirmDetails .anticon-exclamation-circle {
-  display: none !important;
-}
+  .popconfirmDetailsText .anticon-exclamation-circle {
+    display: none !important;
+  }
 </style>