调取修改

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

@@ -70,12 +70,13 @@
         >{{queryForm.vehiclePlatform}}</span>
       </div>
       <div class="text-field">
-        <span class="text-field-left" :title="'RXSWIN'">RXSWIN</span>
+        <span class="text-field-left" style="float: left;margin-top: 3px" :title="'RXSWIN'">RXSWIN</span>
-        <span class="text-field-right text-field-right-color" :title="RXSWIN"
+        <span class="text-field-right text-field-right-color" :title="RXSWIN" style='margin-left: 2px;'
         >
           <span v-has="'projectRelatedPersonnel:page'"
                 @click="rxswinClick">
-             <a-icon type="eye"/>RXSWIN{{$t('detailedList')}}
+             <a-icon type="eye"/>
+             RXSWIN{{$t('detailedList')}}
           </span>
         </span>
       </div>

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

@@ -54,10 +54,10 @@
                           v-model="queryParam.version">
                   <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
                                    :key="key"
-                                   :label="item.key"
+                                   :label="item"
-                                   :value="item.key">
+                                   :value="item">
-                               <span style="display: inline-block;width: 100%" :title=" item.key ">
+                               <span style="display: inline-block;width: 100%" :title=" item ">
-                                     {{ item.key }}
+                                     {{ item }}
                                </span>
                   </a-select-option>
                 </a-select>
@@ -78,7 +78,7 @@
       </a-form>
       <div class="table-operator">
         <!--        提交-->
-        <div v-show="staFlag != '1'" class="operator-text" @click="submit" v-has="'rxswin:add'">
+        <div v-show="staFlag != '1'" class="operator-text" @click="submit" v-has="'rxswin:submit'">
           <a-icon type="check-circle"/>
           {{$t('submit')}}
         </div>

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

@@ -41,31 +41,31 @@
                            v-model="queryParam.rxswin"></a-input>
                 </div>
               </a-col>
-              <a-col :md="12" :sm="8">
+<!--              <a-col :md="12" :sm="8">-->
-                <div class="box-title-text-search">
+<!--                <div class="box-title-text-search">-->
-                  <div class="title-text-search" :title="$t('Correspondingversion')">
+<!--                  <div class="title-text-search" :title="$t('Correspondingversion')">-->
-                    <span>{{$t('Correspondingversion')}}</span>
+<!--                    <span>{{$t('Correspondingversion')}}</span>-->
-                  </div>
+<!--                  </div>-->
-                  <a-select :placeholder="$t('PleaseSelect')+$t('Correspondingversion')"
+<!--                  <a-select :placeholder="$t('PleaseSelect')+$t('Correspondingversion')"-->
-                            allowClear
+<!--                            allowClear-->
-                            show-search
+<!--                            show-search-->
-                            class="box-input-search"
+<!--                            class="box-input-search"-->
-                            optionFilterProp="label"
+<!--                            optionFilterProp="label"-->
-                            showSearch
+<!--                            showSearch-->
-                            :autoClearSearchValue="false"
+<!--                            :autoClearSearchValue="false"-->
-                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
+<!--                            :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
-                            v-model="queryParam.version">
+<!--                            v-model="queryParam.version">-->
-                    <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
+<!--                    <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"-->
-                                     :key="key"
+<!--                                     :key="key"-->
-                                     :label="item.key"
+<!--                                     :label="item.key"-->
-                                     :value="item.key">
+<!--                                     :value="item.key">-->
-                               <span style="display: inline-block;width: 100%" :title=" item.key ">
+<!--                               <span style="display: inline-block;width: 100%" :title=" item.key ">-->
-                                     {{ item.key }}
+<!--                                     {{ item.key }}-->
-                               </span>
+<!--                               </span>-->
-                    </a-select-option>
+<!--                    </a-select-option>-->
-                  </a-select>
+<!--                  </a-select>-->
-                </div>
+<!--                </div>-->
-              </a-col>
+<!--              </a-col>-->
             </template>
             <span style="float: right;overflow: hidden;margin-right: 11px;margin-bottom: 20px"
                   class="table-page-search-submitButtons">
@@ -132,7 +132,7 @@ export default {
         {
           title: this.$t('standard'),
           align: 'left',
-          dataIndex: 'standard',
+          dataIndex: 'serialNumber',
           ellipsis: true,
           sorter:true,
           width: 170
@@ -148,7 +148,7 @@ export default {
         {
           title: 'RXSWIN',
           align: 'left',
-          dataIndex: 'RXSWIN',
+          dataIndex: 'rxswin',
           ellipsis: true,
           sorter:true,
           width: 170
@@ -156,75 +156,12 @@ export default {
         {
           title: this.$t('Correspondingversion'),
           align: 'left',
-          dataIndex: 'Correspondingversion',
+          dataIndex: 'version',
           ellipsis: true,
           sorter:true,
           width: 170
         },
       ],
-      fieldList: [
-        {
-          type: 'string',
-          value: 'subtitle',
-          text: this.$t('subtitle')
-        },
-        {
-          type: '',
-          value: 'region',
-          text: this.$t('zoneOfApplication'),
-          dictCode: 'region'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
-        },
-        {
-          type: 'string',
-          value: 'correspondingStandard',
-          text: this.$t('correspondingStandard')
-        },
-        {
-          type: '',
-          value: 'implementType',
-          text: this.$t('implementationCategory'),
-          dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
-        },
-        {
-          type: 'date',
-          value: 'xin1Che1Xing2Shi2Shi1Ri4Qi1',
-          text: this.$t('ImplementationDate')
-        },
-        {
-          type: 'date',
-          value: 'implementTime',
-          text: this.$t('vehicleInProductionDate')
-        },
-        {
-          type: '',
-          value: 'attestationType',
-          text: this.$t('certificationType'),
-          dictCode: 'attestation_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
-        },
-        {
-          type: '',
-          value: 'attestationRank',
-          text: this.$t('certificationLevel'),
-          dictCode: 'attestation_rank'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
-        },
-        {
-          type: 'string',
-          value: 'applicableSupplement',
-          text: this.$t('applicableSupplement')
-        },
-        {
-          type: 'string',
-          value: 'wvtaId',
-          text: 'WVTA ID'
-        },
-        {
-          type: '',
-          value: 'dutyTerritory',
-          text: this.$t('areaOfResponsibility'),
-          dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
-        },
-
-      ],
       dataList: [],
       content: [],
       loading: false,
@@ -304,18 +241,19 @@ export default {
           if (res.success) {
             this.confirmLoading = false
             // this.$message.success(this.$t('OperationSuccessful'))
-            if(res.result.flag == 'YES'){
+            if(res.result == 'YES'){
               let _this = this
               this.$confirm({
                 content: _this.$t('AlreadyExists'),
                 onOk() {
-                  geteAction('/project/projectRxswinEO/addBatch', {
+                  getAction('/project/projectRxswinEO/addBatch', {
-                    ids: this.selectedRowKeys.join(','),
+                    ids: selectedRowKeys.join(','),
                     flag:'YES',
-                    projectId: this.projectId,
+                    projectId: _this.projectId,
                   }).then((res) => {
                     if (res.success) {
-                      _this.$message.success(this.$t('OperationSuccessful'))
+                      _this.$message.success(_this.$t('OperationSuccessful'))
+                      _this.visible = false
                       _this.$emit('transferListFormHomo')
                     } else {
                       _this.$message.warning(res.message)
@@ -323,6 +261,7 @@ export default {
                   })
                 },
                 onCancel() {
+                  this.visible = false
                   _this.$emit('transferListFormHomo')
                 }
               })