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

# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js

jero-web/src/common/lang/en-us.js

@@ -1828,4 +1828,5 @@ module.exports = {
   projectProgressStatistics:'Project Progress Statistics',
   GRPSystemProjectProgressStatistics:'GRP system project progress statistics',
   statisticalNodes:'Statistical Nodes',
+  proportionWithInTheAreaOfResponsibility:'Proportion within the area of responsibility',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1929,4 +1929,5 @@ module.exports = {
   projectProgressStatistics:'项目进度统计',
   GRPSystemProjectProgressStatistics:'GRP系统项目进度统计',
   statisticalNodes:'统计节点',
+  proportionWithInTheAreaOfResponsibility:'责任领域内占比',
 }

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

@@ -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%">
@@ -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>
@@ -306,25 +329,7 @@
             <!--              <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>
           <div style="width: 100%">
             <!-- 表格-10控件-->
@@ -2308,7 +2313,7 @@
         let param = {
           ids: _array.join(','),
           paramsManifestId: this.$route.query.id,
-          projectId:this.$route.query.projectId,
+          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 {
+  .popconfirmDetailsText {
-  z-index: 999;
+    z-index: 1000;
-  /*top: 42px !important;*/
+    top: 42px !important;
   }
 
-.popconfirmDetails .ant-popover-buttons {
+  .popconfirmDetailsText .ant-popover-buttons {
     display: none !important;
   }
 
-.popconfirmDetails .anticon-exclamation-circle {
+  .popconfirmDetailsText .anticon-exclamation-circle {
     display: none !important;
   }
 </style>

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

@@ -2,14 +2,24 @@
   <div>
     <div class="box-content">
       <div class="box-content-left">
+        <div class="total-text">
+          <span>{{$t('totalTable')+' : '+mainLeftNum}}</span>
+        </div>
         <div id="main-left"></div>
       </div>
       <div class="box-content-right">
+        <div class="total-text">
+          <span>{{$t('totalTable')+' : '+mainRightNum}}</span>
+        </div>
         <div id="main-right"></div>
       </div>
     </div>
     <div class="box-content">
       <div class="box-content-bottom">
+        <div class="total-text-text" :class="{'total-text-text-cntop':long == 'zh-cn' ? true:false,
+        'total-text-text-entop':long == 'zh-cn' ? false:true}">
+          <span>{{$t('totalTable')+' : '+mainBottomNum}}</span>
+        </div>
         <div class="box-content-text">
           <div class="box-content-text-text" @click="boxContentClick(0)">
             {{$t('whole')}}
@@ -52,6 +62,10 @@
         },
         certificationProgressMap: {},
         num: '0',
+        mainLeftNum: 0,
+        mainRightNum: 0,
+        mainBottomNum: 0,
+        long: localStorage.getItem('language') || 'zh-cn'
       }
     },
     mounted() {
@@ -92,6 +106,7 @@
       dataEcharts(dataSource) {
         let data = []
         let color = []
+        this.mainLeftNum = 0
         if (dataSource && dataSource.length > 0) {
           this.dataSource = [{}]
           dataSource.forEach(res => {
@@ -128,6 +143,7 @@
               })
               color.push('#E83030')
             }
+            this.mainLeftNum += res.taskAffirmStatusCount
           })
         }
         this.getEcharts('main-left', this.$t('certificationTaskConfirmation'), color, data)
@@ -135,6 +151,7 @@
       mainRightEcharts(dataSource) {
         let data = []
         let color = []
+        this.mainRightNum = 0
         if (dataSource && dataSource.length > 0) {
           this.dataSource = [{}]
           dataSource.forEach(res => {
@@ -171,6 +188,7 @@
               })
               color.push('#E83030')
             }
+            this.mainRightNum += res.taskAffirmStatusCount
           })
         }
         this.getEcharts('main-right', this.$t('preHomoFlow'), color, data)
@@ -178,6 +196,7 @@
       mainBottomEcharts(dataSource) {
         let data = []
         let color = []
+        this.mainBottomNum = 0
         if (dataSource && dataSource.length > 0) {
           dataSource.forEach(res => {
             if (res.certificationProgress == 'Not start') {
@@ -237,6 +256,7 @@
               })
               color.push('#26BC4B')
             }
+            this.mainBottomNum += res.certificationProgressCount
           })
         }
         this.getEcharts('main-bottom', this.$t('CertificationProgress'), color, data)
@@ -253,7 +273,7 @@
               fontWeight: 'normal',
               fontSize: 14,
               color: '#040B29',
-              fontFamily:'BlueSkyNoto',
+              fontFamily: 'BlueSkyNoto'
             },
             formatter: function(parms) {
               let str = parms.marker + ' ' + parms.data.name + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' + parms.data.value + ' (' + parms.percent + '%)'
@@ -350,6 +370,7 @@
     .box-content-left {
       width: calc(50% - 10px);
       height: 346px;
+      position: relative;
       border: 2px #eff1f3 solid;
       border-radius: 6px;
       margin-top: 4px;
@@ -365,6 +386,7 @@
     .box-content-right {
       width: calc(50% - 10px);
       height: 346px;
+      position: relative;
       border: 2px #eff1f3 solid;
       border-radius: 6px;
       margin-top: 4px;
@@ -384,6 +406,7 @@
       position: relative;
       border-radius: 6px;
       margin-top: 20px;
+      overflow: hidden;
 
       .box-content-text {
         height: 30px;
@@ -429,4 +452,27 @@
     }
   }
 
+  .total-text {
+    position: absolute;
+    right: 28px;
+    top: 19px;
+    font-size: 18px;
+    font-weight: bold;
+  }
+
+  .total-text-text {
+    position: absolute;
+    right: 28px;
+    top: 21px;
+    font-size: 18px;
+    font-weight: bold;
+  }
+
+  .total-text-text-cntop {
+    right: 180px;
+  }
+
+  .total-text-text-entop {
+    right: 290px;
+  }
 </style>

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

@@ -8,11 +8,12 @@
         <div class="process-content-content" :style="val.left"
              v-for="(val,indexOne) in timeData" :key="indexOne" v-if="val.g">
           <div class="process-content-right-top" :title="val.name">{{ val.name }}</div>
+          <div class="process-content-right-button" :title="val.time.slice(0, 11)">{{ val.time.slice(0, 11) }}</div>
           <!--                  <div class="process-content-right-button" v-if="indexOne % 2 == 1" :title="val.name">{{ val.name }}-->
           <!--                  </div>-->
           <a-tooltip placement="topLeft" overlayClassName="tooltipColor">
             <template slot="title">
-              <span>{{ val.time.slice(0, 11) }}</span>
+              <span>{{ val.name }}</span>
             </template>
             <img v-if="val.status == 1" src="../../../assets/heiTop.png" class="process-content-left"
                  alt="">
@@ -27,12 +28,12 @@
         </div>
         <div class="process-content-contentOne" :style="val.left"
              v-for="(val,indexTwo) in timeData" v-if="!val.g">
-          <!--                  <div class="process-content-right-top" v-if="indexOne % 2 == 0" :title="val.name">{{ val.name }}</div>-->
+          <div class="process-content-right-top" :title="val.time.slice(0, 11)">{{ val.time.slice(0, 11) }}</div>
           <div class="process-content-right-button" :title="val.name">{{ val.name }}
           </div>
           <a-tooltip placement="topLeft" overlayClassName="tooltipColor">
             <template slot="title">
-              <span>{{ val.time.slice(0, 11) }}</span>
+              <span>{{ val.name }}</span>
             </template>
             <img v-if="val.status == 1" src="../../../assets/huiBottom.png" class="process-content-left"
                  alt="">
@@ -192,10 +193,10 @@
         width: 83px;
         font-size: 12px;
         font-weight: 400;
-        color: #6F7385;
+        color: #9C9FAC;
         position: absolute;
         left: 50%;
-        top: 36px;
+        top: -36px;
         transform: translate(-50%, -50%);
         overflow: hidden;
         display: -webkit-box;
@@ -229,13 +230,13 @@
 
       .process-content-right-top {
         font-size: 12px;
-        color: #040B29;
         width: 83px;
         background: #fff;
         display: inline-block;
         overflow: hidden;
         position: absolute;
-        top: -12px;
+        color: #9C9FAC;
+        top: 57px;
         left: 50%;
         transform: translate(-50%, -50%);
         overflow: hidden;
@@ -253,10 +254,12 @@
         width: 83px;
         font-size: 12px;
         font-weight: 400;
-        color: #6F7385;
+        color: #040B29;
+        background: #fff;
         position: absolute;
         left: 50%;
         top: 36px;
+        line-height: 11px;
         transform: translate(-50%, -50%);
         overflow: hidden;
         display: -webkit-box;

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

@@ -1433,6 +1433,10 @@
     },
 
     mounted() {
+      if (this.areaOfResponsibilityList && this.areaOfResponsibilityList.dutyTerritory) {
+        this.queryParam.dutyTerritory = this.areaOfResponsibilityList.dutyTerritory
+        this.queryParam = { ...this.queryParam }
+      }
       this.JLoading = true
       this.getHeader()
       this.queryLawEngineerByProjectId()
@@ -1442,10 +1446,6 @@
       this.getRoleByUserId(() => {
         this.getAndUserId()
       })
-      if (this.areaOfResponsibilityList && this.areaOfResponsibilityList.dutyTerritory) {
-        this.queryParam.dutyTerritory = this.areaOfResponsibilityList.dutyTerritory
-        this.queryParam = { ...this.queryParam }
-      }
     },
     computed: {
       columnsFile() {

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

@@ -59,7 +59,7 @@
          this.$emit('projectStatusForm',this.activeKey)
       },
       currentStatus(item) {
-        this.$emit('TaskListChange', item)
+        this.$emit('currentStatus', item)
       },
       versionStatisticsClick() {
         this.$refs.versionStatisticsRef.addModel(JSON.parse(JSON.stringify(this.selectedRowKeys)))

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

@@ -1,15 +1,22 @@
 <template>
   <div class="box-content">
     <div class="box-content-top">
+      <div class="total-text">
+        <span>{{$t('totalTable')+' : '+mainTopNum}}</span>
+      </div>
       <div id="main-top"></div>
     </div>
     <div class="box-content-left">
+      <div class="total-text">
+        <span>{{$t('totalTable')+' : '+mainLeftNum}}</span>
+      </div>
       <div id="main-left"></div>
     </div>
     <div class="box-content-right">
-      <div id="main-right">
+      <div class="total-text">
-
+        <span>{{$t('totalTable')+' : '+mainRightNum}}</span>
       </div>
+      <div id="main-right"> </div>
     </div>
     <responsibilityList @responsibility="responsibility" ref="responsibilityListRef"/>
   </div>
@@ -39,6 +46,9 @@
         url: {
           getProjectDetailsStatistics: '/project/projectLibraryBase/getProjectDetailsStatistics'
         },
+        mainTopNum: 0,
+        mainLeftNum: 0,
+        mainRightNum: 0,
         columns: [
           {
             title: this.$t('red'),
@@ -103,7 +113,7 @@
               fontWeight: 'normal',
               fontSize: 14,
               color: '#040B29',
-              fontFamily:'BlueSkyNoto',
+              fontFamily: 'BlueSkyNoto'
             },
             formatter: function(parms) {
               let str = parms.marker + ' ' + parms.data.name + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' + parms.data.value + ' (' + parms.percent + '%)'
@@ -167,6 +177,7 @@
       mainTopEcharts(dataSource) {
         let data = []
         let color = []
+        this.mainTopNum = 0
         if (dataSource && dataSource.length > 0) {
           this.dataSource = [{}]
           dataSource.forEach(res => {
@@ -203,6 +214,7 @@
               })
               color.push('#E83030')
             }
+            this.mainTopNum += res.taskAffirmStatusCount
           })
         }
         this.getEcharts('main-top', this.$t('regulatoryTaskConfirmation'), color, data)
@@ -211,6 +223,7 @@
       mainLeftEcharts(dataSource) {
         let data = []
         let color = []
+        this.mainLeftNum = 0
         if (dataSource && dataSource.length > 0) {
           this.dataSource = [{}]
           dataSource.forEach(res => {
@@ -247,6 +260,7 @@
               })
               color.push('#707486')
             }
+            this.mainLeftNum += res.designFlowTaskStatusCount
           })
         }
         this.getEcharts('main-left', this.$t('designCompliance'), color, data)
@@ -255,6 +269,7 @@
       mainRightEcharts(dataSource) {
         let data = []
         let color = []
+        this.mainRightNum = 0
         if (dataSource && dataSource.length > 0) {
           this.dataSource = [{}]
           dataSource.forEach(res => {
@@ -291,13 +306,13 @@
               })
               color.push('#707486')
             }
+            this.mainRightNum += res.verifyFlowTaskStatusCount
           })
         }
         this.getEcharts('main-right', this.$t('verifyCompliance'), color, data)
       },
 
       responsibility(item) {
-        console.log(item)
         this.$emit('currentStatus', item)
       }
     }
@@ -313,6 +328,7 @@
 
     .box-content-top {
       width: 100%;
+      position: relative;
       margin-top: 4px;
       height: 346px;
       border: 2px #eff1f3 solid;
@@ -330,6 +346,7 @@
       width: calc(50% - 10px);
       margin-top: 20px;
       height: 346px;
+      position: relative;
       border: 2px #eff1f3 solid;
       border-radius: 6px;
 
@@ -345,6 +362,7 @@
       width: calc(50% - 10px);
       margin-top: 20px;
       height: 346px;
+      position: relative;
       border-radius: 6px;
       border: 2px #eff1f3 solid;
 
@@ -367,4 +385,12 @@
     text-overflow: ellipsis;
     white-space: nowrap;
   }
+
+  .total-text {
+    position: absolute;
+    right: 28px;
+    top: 19px;
+    font-size: 18px;
+    font-weight: bold;
+  }
 </style>

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

@@ -12,25 +12,26 @@
         {{$t('cancel')}}
       </a-button>
     </template>
-        <div style="text-align: right;margin-bottom: 10px">
+    <!--        <div style="text-align: right;margin-bottom: 10px">-->
-            <div @click="handleExport" class="operator-text">
+    <!--            <div @click="handleExport" class="operator-text">-->
-                <a-icon type="export" :rotate="-90"/>
+    <!--                <a-icon type="export" :rotate="-90"/>-->
-                {{$t('export')}}
+    <!--                {{$t('export')}}-->
-            </div>
+    <!--            </div>-->
-        </div>
+    <!--        </div>-->
     <a-table
       ref="table"
       :components="drag(columns,'columns')"
       :loading="loading"
       :pagination="false"
-                :scroll="{x: true,y:400}"
+      :scroll="{x: '100%',y:400}"
       :data-source="dataSource"
+      @change="tableOnChange"
       :columns="columns"
     >
-<!--          @click="areaOfResponsibilityClick(result)"-->
+      <!--         -->
-            <span slot="areaOfResponsibility" slot-scope="text,result">
+      <a slot="areaOfResponsibility" @click="areaOfResponsibilityClick(result)" slot-scope="text,result">
                 {{text}}
-            </span>
+      </a>
     </a-table>
   </a-modal>
 </template>
@@ -62,6 +63,7 @@
             align: 'left',
             width: 150,
             ellipsis: true,
+            sorter: true,
             scopedSlots: { customRender: 'areaOfResponsibility' }
           },
           {
@@ -69,14 +71,16 @@
             dataIndex: 'amount',
             align: 'left',
             ellipsis: true,
-            width: 150
+            width: 150,
+            sorter: true
           },
           {
-            title: this.$t('proportion'),
+            title: this.$t('proportionWithInTheAreaOfResponsibility'),
             dataIndex: 'percentage',
             align: 'left',
             ellipsis: true,
-            width: 150
+            width: 240,
+            sorter: true
           }
         ]
       }
@@ -88,11 +92,39 @@
         this.visible = true
         this.title = data.title
         this.queryParam = data
-        this.getList(data)
+        this.getList()
       },
-      getList(data) {
+      tableOnChange(pagination, filters, sorter) {
+        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+        if (sorter.columnKey == 'attestationRank_dictText') {
+          this.orderByField = 'attestationRank'
+        } else if (sorter.columnKey == 'dutyTerritory_dictText') {
+          this.orderByField = 'dutyTerritory'
+        } else if (sorter.columnKey == 'designDeliverableTypeName') {
+          this.orderByField = 'designDeliverableType'
+        } else if (sorter.columnKey == 'verifyDeliverableTypeName') {
+          this.orderByField = 'verifyDeliverableType'
+        } else if (sorter.columnKey == 'designDutyIdName') {
+          this.orderByField = 'designDutyId'
+        } else if (sorter.columnKey == 'verifyDutyIdName') {
+          this.orderByField = 'verifyDutyId'
+        }  else if (sorter.columnKey == 'verifyFlowStatusName') {
+          this.orderByField = 'verifyFlowStatus'
+        }  else if (sorter.columnKey == 'designFlowStatusName') {
+          this.orderByField = 'designFlowStatus'
+        } else {
+          this.orderByField = sorter.columnKey
+        }
+        this.getList()
+      },
+      getList() {
         this.loading = true
-        getAction(this.url.GroupByTerritory, data).then((res) => {
+        let query = {
+           ...this.queryParam,
+          orderBy: this.orderBy,
+          orderByField: this.orderByField,
+        }
+        getAction(this.url.GroupByTerritory, query).then((res) => {
           if (res.success) {
             this.loading = false
             this.dataSource = res.result.dataList || []
@@ -108,14 +140,14 @@
       handleCancel() {
         this.visible = false
       },
-      // areaOfResponsibilityClick(item) {
+      areaOfResponsibilityClick(item) {
-      //   if (this.queryParam.operatorType == 'queryFGTaskToConfirmStatistics' ||
+        if (this.queryParam.operatorType == 'queryFGTaskToConfirmStatistics' ||
-      //     this.queryParam.operatorType == 'queryDesignStatistics' ||
+          this.queryParam.operatorType == 'queryDesignStatistics' ||
-      //     this.queryParam.operatorType == 'queryVerifyStatistics') {
+          this.queryParam.operatorType == 'queryVerifyStatistics') {
-      //     item.isListing = '1'
+          item.isListing = '1'
-      //   }
+        }
-      //   this.$emit('responsibility', item)
+        this.$emit('responsibility', item)
-      // }
+      }
     }
   }
 </script>

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

@@ -11,6 +11,151 @@
     <a-spin :spinning="confirmLoading">
       <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
         <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" title="G0">
+                G0</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="zero">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+'G0'"
+                               @change="dateChange({db_field_name:'zero'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.zero"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" title="G1">
+                G1</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="one">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+'G1'"
+                               @change="dateChange({db_field_name:'one'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.one"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" title="G2">
+                G2</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="two">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+'G2'"
+                               @change="dateChange({db_field_name:'two'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.two"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" title="G3">
+                G3</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="three">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+'G3'"
+                               @change="dateChange({db_field_name:'three'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.three"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" title="G4">
+                G4</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="four">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+'G4'"
+                               @change="dateChange({db_field_name:'four'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.four"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" title="G5">
+                G5</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="five">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+'G5'"
+                               @change="dateChange({db_field_name:'five'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.five"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" title="G6">
+                G6</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="six">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+'G6'"
+                               @change="dateChange({db_field_name:'six'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.six"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" title="G7">
+                G7</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="seven">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+'G7'"
+                               @change="dateChange({db_field_name:'seven'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.seven"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -165,150 +310,6 @@
               </a-form-model-item>
             </div>
           </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" title="G0">
-                G0</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="zero">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+'G0'"
-                               @change="dateChange({db_field_name:'zero'})"
-                               format="YYYY-MM-DD"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.zero"
-                               :disabled="false"
-                               style="width: 100%"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" title="G1">
-                G1</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="one">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+'G1'"
-                               @change="dateChange({db_field_name:'one'})"
-                               format="YYYY-MM-DD"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.one"
-                               :disabled="false"
-                               style="width: 100%"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" title="G2">
-                G2</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="two">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+'G2'"
-                               @change="dateChange({db_field_name:'two'})"
-                               format="YYYY-MM-DD"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.two"
-                               :disabled="false"
-                               style="width: 100%"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" title="G3">
-                G3</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="three">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+'G3'"
-                               @change="dateChange({db_field_name:'three'})"
-                               format="YYYY-MM-DD"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.three"
-                               :disabled="false"
-                               style="width: 100%"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" title="G4">
-                G4</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="four">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+'G4'"
-                               @change="dateChange({db_field_name:'four'})"
-                               format="YYYY-MM-DD"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.four"
-                               :disabled="false"
-                               style="width: 100%"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" title="G5">
-                G5</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="five">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+'G5'"
-                               @change="dateChange({db_field_name:'five'})"
-                               format="YYYY-MM-DD"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.five"
-                               :disabled="false"
-                               style="width: 100%"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" title="G6">
-                G6</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="six">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+'G6'"
-                               @change="dateChange({db_field_name:'six'})"
-                               format="YYYY-MM-DD"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.six"
-                               :disabled="false"
-                               style="width: 100%"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" title="G7">
-                G7</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="seven">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+'G7'"
-                               @change="dateChange({db_field_name:'seven'})"
-                               format="YYYY-MM-DD"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.seven"
-                               :disabled="false"
-                               style="width: 100%"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
         </a-row>
       </a-form-model>
     </a-spin>