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

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

@@ -426,7 +426,7 @@
           <!--          认证工程师-提示-->
           <div style='font-size: 16px;color: red;text-align: center' v-if='NoEngineer === 1'>
             {{ currentPersonRole =='homo'? $t('certifiedEngineer'): (currentPersonRole =='sdt'?
-            $t('engineeringInterfacePerson'): $t('completedBy')) }}{{$t('Datastatusis')}}
+            $t('engineeringInterfacePerson'): $t('completedBy')) }}{{jurisdiction === "homoQZTH"? $t('Datastateexcept') : $t('Datastatusis')}}
             <!--            下发收集时-->
             <span v-if='jurisdiction === "HOMOZFSJ"' class="text-wraning">
               '{{$t('CollectionInitiated')}}'、'{{$t('ReturnedPerson')}}'{{$t('or')}}'{{$t('alteration')}}'
@@ -459,7 +459,7 @@
             </span>
             <!--            强制撤回-->
             <span v-else-if='jurisdiction === "homoQZTH"' class="text-wraning">
-              '{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}'
+              '{{$t('SynchronizedLibrary')}}'{{$t('or')}}'{{$t('CollectionInitiated')}}'
             </span>
             <span v-else-if='jurisdiction === "sdtQZTH"' class="text-wraning">
               {{$t('completed')}}
@@ -1081,7 +1081,8 @@
             this.$message.warning(this.$t('selectLeastOne'))
           } else {
             this.selectedRowKeysValue.forEach((item, index) => {
-              if (item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'To be processed by eng. interface' && item.state !== 'Rejected by the applicant') {
+              console.log(item)
+              if (item.state == '已同步至上报库' || item.state == 'Synced to library' || item.state == '待发起收集' || item.state == 'To be collected') {
                 this.NotSelectedRowKeysValue.push(item)
                 this.jurisdiction = 'homoQZTH'
                 flag = 0
@@ -1665,8 +1666,14 @@
         let _this = this
         let param = { ids: _array.join(',') }
         this.textLoading = true
+        let url = ''
+        if(this.currentPersonRole == 'homo'){
+          url = '/jero-boot/params/collectManifest/mandatoryWithdraw'
+        }else{
+          url = '/jero-boot/params/collectManifest/withdraw'
+        }
         axios({
-          url: '/jero-boot/params/collectManifest/withdraw',
+          url: url,
           method: 'post',
           data: param,
           transformRequest: [function(data) {