Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue

@@ -607,13 +607,13 @@
               }
             ]
           },
-          {
+          // {
-            title: this.$t('operation'),
+          //   title: this.$t('operation'),
-            align: 'left',
+          //   align: 'left',
-            fixed: 'right',
+          //   fixed: 'right',
-            width: 240,
+          //   width: 240,
-            scopedSlots: { customRender: 'operation' }
+          //   scopedSlots: { customRender: 'operation' }
-          }
+          // }
         ],
         columnsAll: [],
         confirmLoading: false,
@@ -1075,7 +1075,11 @@
           moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
         }).then((res) => {
           if (res.success) {
-            this.columnsAll = res.result
+            if(res.result && res.result.length > 0){
+              this.columnsAll = res.result
+            }else{
+              this.columnsAll = this.column
+            }
             for (let j = 0; j < this.columnsAll.length; j++) {
               for (let i = 0; i < this.column.length; i++) {
                 if (this.columnsAll[j].title == this.$t('confirmationOfDesignConformity')) {
@@ -1122,7 +1126,7 @@
               title: this.$t('operation'),
               align: 'left',
               fixed: 'right',
-              width: 160,
+              width: 240,
               scopedSlots: { customRender: 'operation' }
             })
 

jero-web/src/views/projectManagement/components/responsibilityList.vue

@@ -104,7 +104,7 @@
         if (this.queryParam.operatorType == 'queryListingToConfirmStatistics' || this.queryParam.operatorType == 'queryTaskToConfirmStatistics'){
             item.isListing = '1'
         }
-        this.$emit('responsibility', item)
+        // this.$emit('responsibility', item)
       }
     }
   }

jero-web/src/views/virtualAuthenticationList/components/editModel.vue

@@ -15,13 +15,14 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="$t('regulationNo')">{{$t('regulationNo')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="serialNumber">
                   <a-input @click.native="serialNumberClick"
                            :disabled="disabled"
                            class="box-input"
+                           :title="formInline.serialNumber"
                            :placeholder="$t('PleaseSelect')+$t('regulationNo')"
                            v-model="formInline.serialNumber"></a-input>
                 </a-form-model-item>
@@ -30,7 +31,7 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="dutyTerritory">
@@ -48,12 +49,13 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="'WVTA ID'">WVTA ID</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="wvtaId">
                   <a-input class="box-input"
                            :disabled="disabled"
+                           :title="formInline.wvtaId"
                            v-model="formInline.wvtaId"
                            :placeholder="$t('PleaseEnter')+'WVTA ID'"/>
                 </a-form-model-item>
@@ -64,13 +66,14 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="$t('category')">{{$t('category')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="category">
                   <a-input class="box-input"
                            v-model="formInline.category"
                            :disabled="disabled"
+                           :title="formInline.category"
                            :placeholder="$t('PleaseEnter')+$t('category')" />
                 </a-form-model-item>
               </div>
@@ -78,13 +81,14 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="$t('inspectionItems')">{{$t('inspectionItems')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="inspectionItem">
                   <a-input class="box-input"
                            v-model="formInline.inspectionItem"
                            :disabled="disabled"
+                           :title="formInline.inspectionItem"
                            :placeholder="$t('PleaseEnter')+$t('inspectionItems')"/>
                 </a-form-model-item>
               </div>
@@ -94,12 +98,13 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="configItem">
                   <a-input class="box-input"
                            v-model="formInline.configItem"
+                           :title="formInline.configItem"
                            :placeholder="$t('PleaseEnter')+$t('configurationItem')"
                            :disabled="disabled"
                   />
@@ -109,7 +114,7 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
                 </div>
                 <a-form-model-item class="itemModel"
@@ -264,7 +269,7 @@ export default {
       })
       if(data == 1) {
         this.title = this.$t('view')
-        this.disabled = true,
+        this.disabled = true
         this.button = false
       }
     },
@@ -414,4 +419,10 @@ export default {
   border: 1px #00B3BE solid;
   color: #00B3BE;
 }
+  ::v-deep .ant-input-disabled{
+    color: #040B29;
+  }
+  ::v-deep .ant-select-disabled .ant-select-selection-selected-value{
+    color: #040B29!important;
+  }
 </style>