合并分支 'dev_2nd_20230213' 到 'master'

Dev 2nd 20230213

查看合并请求 laws-nio/laws-weilai!294

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

@@ -463,7 +463,7 @@
             </span>
             <!--        分配填写人  -->
             <span v-else-if='jurisdiction === "SDTFPTXRHOMO"' class="text-wraning">
-              '{{$t('completed')}}'
+              '{{$t('completed')}}''{{$t('or')}}'{{$t('Filledreturn')}}''{{$t('or')}}'{{$t('ReturnedEngineer')}}'
             </span>
             <!--            引用参数-->
             <span v-else-if='jurisdiction === "DREYYCS"' class="text-wraning">
@@ -1285,7 +1285,7 @@
         } else {
           this.selectedRowKeysValue.forEach((item, index) => {
             console.log(item.state)
-            if (item.state !== '待填写' && item.state !== 'To be filled') {
+            if (item.state !== '待填写' && item.state !== 'To be filled' && item.state !== '填写人退回' && item.state !== 'Rejected by the applicant' && item.state !== '认证工程师退回' && item.state !== 'Rejected by homo engineer') {
               this.NotSelectedRowKeysValue.push(item)
               flag = 0
             }
@@ -1774,15 +1774,20 @@
           this.returnData()
         } else if (homoJurisdictionReturn == 0) {
           this.visibleoperationFailed = true
+          this.returnData()
         }
       },
       // 退回
       returnData() {
         // todo  退回没有选择数据
         let _array = []
+        this.selectedRowKeysValue = this.selectedRowKeysValue.filter(item => item.state == '已提交' || item.state == 'Submitted')
         this.selectedRowKeysValue.forEach((item, index) => {
           _array.push(item.id)
         })
+        if(_array.length == 0){
+          return
+        }
         let _this = this
         let param = { ids: _array.join(','),
           currentPersonRole: this.currentPersonRole,

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

@@ -1950,14 +1950,10 @@ export default {
             this.columnsAll = this.column
           }
           this.columnsAll.forEach((item, index) => {
-            if (item.title != '设计符合性确认' && item.title != 'Pre-Homo确认' && item.title != '验证符合性确认') {
+            if (item.title != '设计符合性确认' && item.title != 'Pre-Homo确认' && item.title != '验证符合性确认' && item.title != '操作') {
               item.width = 180
               item.align = 'left'
-              if (item.title == '操作') {
-                item.scopedSlots = {
-                  customRender: 'operationOne'
-                }
-              } else if (item.title == '编号') {
+              if (item.title == '编号') {
                 item.sorter = true
                 item.scopedSlots = {
                   customRender: 'standard'