Merge remote-tracking branch 'origin/master'

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

@@ -303,11 +303,11 @@
                                </span>
                   </a-select-option>
                 </a-select>
-<!--                <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"-->
+                <!--                <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"-->
-<!--                                    :disabled="disabled"-->
+                <!--                                    :disabled="disabled"-->
-<!--                                    :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
+                <!--                                    :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
-<!--                                    :type="'select'"-->
+                <!--                                    :type="'select'"-->
-<!--                                    :triggerChange="false" :dictCode="'duty_territory'"/>-->
+                <!--                                    :triggerChange="false" :dictCode="'duty_territory'"/>-->
               </a-form-model-item>
             </div>
           </a-col>
@@ -659,7 +659,8 @@
     </a-spin>
     <div class="drawer-bootom-button">
       <a-button style="margin-right: 8px" @click="handleCancel">{{$t('cancel')}}</a-button>
-      <a-button @click="handleSubmit" v-if="!disabled" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+      <a-button @click="handleSubmit" v-if="!disabled" type="primary" :loading="confirmLoading">{{$t('submit')}}
+      </a-button>
     </div>
     <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"/>
   </a-drawer>
@@ -739,21 +740,21 @@
               trigger: 'change'
             }
           ],
-          dutyDepart:[
+          dutyDepart: [
             {
               required: true,
               message: this.$t('statisticalNodes') + this.$t('cannotEmpty'),
               trigger: 'change'
             }
-          ],
+          ]
         },
         formInline: {},
         disabled: false,
         title: '',
         CategoryTreeList: [],
         DeliverableTreeList: [],
-        firstLevelDutyTerritoryList:[],
+        firstLevelDutyTerritoryList: [],
-        dutyTerritoryList:[],
+        dutyTerritoryList: []
       }
     },
     mounted() {
@@ -764,7 +765,7 @@
     methods: {
       DutyDepartChange(event) {
         this.formInline.dutyTerritory = []
-        this.formInline = {...this.formInline}
+        this.formInline = { ...this.formInline }
         this.getDutyTerritory(event.join(','))
       },
       getDutyTerritory(row) {
@@ -810,6 +811,7 @@
         this.visible = true
         this.disabled = false
         this.title = this.$t('edit')
+        this.dutyTerritoryList = []
         this.$nextTick(() => {
           this.formInline = item || {}
           this.formInline.technologyTerritory = this.formInline.technologyTerritory ? this.formInline.technologyTerritory.split(',') : []
@@ -817,6 +819,9 @@
           this.formInline.prehomoDeliverableType = this.formInline.prehomoDeliverableType ? this.formInline.prehomoDeliverableType.split(',') : []
           this.formInline.verifyDeliverableType = this.formInline.verifyDeliverableType ? this.formInline.verifyDeliverableType.split(',') : []
           this.formInline.dutyDepart = this.formInline.dutyDepart ? this.formInline.dutyDepart.split(',') : []
+          if (this.formInline.dutyDepart && this.formInline.dutyDepart.length > 0) {
+            this.getDutyTerritory(this.formInline.dutyDepart.join(','))
+          }
           this.formInline.dutyTerritory = this.formInline.dutyTerritory ? this.formInline.dutyTerritory.split(',') : []
           this.$refs.ruleForm.clearValidate()
         })
@@ -825,6 +830,7 @@
         this.visible = true
         this.disabled = true
         this.title = this.$t('view')
+        this.dutyTerritoryList = []
         this.$nextTick(() => {
           this.formInline = item || {}
           this.formInline.technologyTerritory = this.formInline.technologyTerritory ? this.formInline.technologyTerritory.split(',') : []
@@ -832,6 +838,9 @@
           this.formInline.prehomoDeliverableType = this.formInline.prehomoDeliverableType ? this.formInline.prehomoDeliverableType.split(',') : []
           this.formInline.verifyDeliverableType = this.formInline.verifyDeliverableType ? this.formInline.verifyDeliverableType.split(',') : []
           this.formInline.dutyDepart = this.formInline.dutyDepart ? this.formInline.dutyDepart.split(',') : []
+          if (this.formInline.dutyDepart && this.formInline.dutyDepart.length > 0) {
+            this.getDutyTerritory(this.formInline.dutyDepart.join(','))
+          }
           this.formInline.dutyTerritory = this.formInline.dutyTerritory ? this.formInline.dutyTerritory.split(',') : []
           this.$refs.ruleForm.clearValidate()
         })
@@ -1084,6 +1093,7 @@
     background: #fff;
     border-radius: 0 0 2px 2px;
   }
+
   ::v-deep .ant-form-item-with-help {
     margin-bottom: 25px;
   }

jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue

@@ -853,6 +853,7 @@
       },
       editModel(value) {
         this.formInline = {}
+        this.dutyTerritoryList = []
         this.visible = true
         this.personnelVisible = true
         value.dutyDepart = value.dutyDepart ? value.dutyDepart.split(',') : []

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

@@ -757,16 +757,26 @@
         })
       },
       isEdit(val) {
-        if (val.designFlowStatus == 'Task to be confirmed' || val.designFlowStatus == 'Results to be submitted' ||
+        // if (val.designFlowStatus == 'Task to be confirmed' || val.designFlowStatus == 'Results to be submitted' ||
-          val.designFlowStatus == 'Results to be reviewed') {
+        //   val.designFlowStatus == 'Results to be reviewed') {
+        //   return true
+        // } else {
+        //   return false
+        // }
+        if (val.roleCodeIndex == '0' || val.roleCodeIndex == '1') {
           return true
         } else {
           return false
         }
       },
       isEditVerifi(val) {
-        if (val.verifyFlowStatus == 'Task to be confirmed' || val.verifyFlowStatus == 'Results to be submitted' ||
+        // if (val.verifyFlowStatus == 'Task to be confirmed' || val.verifyFlowStatus == 'Results to be submitted' ||
-          val.verifyFlowStatus == 'Results to be reviewed') {
+        //   val.verifyFlowStatus == 'Results to be reviewed') {
+        //   return true
+        // } else {
+        //   return false
+        // }
+        if (val.roleCodeIndex == '0' || val.roleCodeIndex == '1') {
           return true
         } else {
           return false
@@ -896,6 +906,7 @@
       },
       editModel(item) {
         this.visible = true
+        this.dutyTerritoryList = []
         this.regulatoryEngineerList = []
         this.engineeringInterfacePersonList = []
         this.certificationEngineerList = []

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

@@ -369,6 +369,7 @@
       editModel(item, data) {
         this.visible = true
         this.title = this.$t('edit')
+        this.dutyTerritoryList = []
         this.$nextTick(() => {
           this.formInline = item || {}
           if (this.formInline.deliverableType) {
@@ -381,6 +382,9 @@
           } else {
             this.formInline.dutyDepart = []
           }
+          if (this.formInline.dutyDepart && this.formInline.dutyDepart.length > 0) {
+            this.getDutyTerritory(this.formInline.dutyDepart.join(','))
+          }
           if (this.formInline.dutyTerritory) {
             this.formInline.dutyTerritory = this.formInline.dutyTerritory.split(',')
           } else {
@@ -388,7 +392,6 @@
           }
           this.$refs.ruleForm.clearValidate()
         })
-        console.log(this.formInline)
         if (data == 1) {
           this.title = this.$t('view')
           this.disabled = true