对接认证清单引用交付物

jero-web/src/components/PersonnelSelection/index.vue

@@ -542,6 +542,7 @@
             // this.gData[0].isLeaf = false
             this.defaultExpandedKeys = [this.departId]
             if (num == 1) {
+              console.log(this.personneQuery)
               if (this.userName && this.userName.length == 0) {
                 if (this.personneQuery[this.query.db_field_name + 'Name']) {
                   this.userName = this.personneQuery[this.query.db_field_name + 'Name'].split(',')

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

@@ -448,6 +448,7 @@
                       :query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable')}"
                       :personneQuery="formInline"
                       :isSingleChoice="true"
+                      v-if="visible"
                       @change="PersonnelSelectionChange"
                       :disabled="disabled"
                       v-model="formInline.dutyPersonName"/>
@@ -644,7 +645,6 @@
         this.title = this.$t('edit')
         this.$nextTick(() => {
           this.formInline = {...this.formInline}
-          console.log(this.formInline)
           this.$refs.ruleForm.clearValidate()
         })
       },

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

@@ -280,7 +280,9 @@
               </a>
         </span>
         <span slot="DeliverablesResult" slot-scope="text,record,index">
-                  <span v-if="record.flowStatus == 'Results to be submitted'">
+                  <span v-if="(record.flowStatus == 'Results to be submitted' &&
+                  record.dutyPersonName == userInfoQuery.username && roleSwitchingCode == 20) ||
+                  record.flowStatus == 'Results to be submitted' && roleSwitchingCode == 21">
                    <a-button type="primary" class="button-text"
                              v-if="record.valueType == 'file'"
                              @click="clickButtonToUpload('deliveryResult',index)">
@@ -291,10 +293,12 @@
                      <a-input class="box-input-index"
                               v-else-if="record.valueType == 'text'"
                               :maxLength="200"
+                              @blur="deliveryBlur"
                               onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
                               v-model.trim="record.deliveryResult"
                               :placeholder="$t('PleaseEnter')"/>
                     <a-radio-group v-else-if="record.valueType == 'select'"
+                                   @change="deliveryChange"
                                    v-model="record.deliveryResult">
                       <a-radio :value="'1'">
                            {{$t('yes')}}
@@ -312,7 +316,7 @@
                              v-if="record.deliveryResult && record.valueType == 'file'">
                            {{$t('viewFile')}}
                        </span>
-                        <span v-else-if="record.deliveryResult && record.valueType == 'text'">
+                        <span :title="record.deliveryResult" v-else-if="record.deliveryResult && record.valueType == 'text'">
                              {{record.deliveryResult}}
                         </span>
                         <span v-else-if="record.deliveryResult && record.valueType == 'select'">
@@ -658,7 +662,7 @@
             align: 'left',
             dataIndex: 'deliveryResult',
             width: 180,
-            // ellipsis: true,
+            ellipsis: true,
             scopedSlots: { customRender: 'DeliverablesResult' }
           },
           {
@@ -720,13 +724,15 @@
         isDisplayNum: 2,
         long: '',
         toDoIds: [],
-        toDoNotConditions: []
+        toDoNotConditions: [],
+        userInfoQuery: {}
       }
     },
     mounted() {
       // this.getList()
       this.long = localStorage.getItem('language') || 'zh-cn'
       this.loading = true
+      this.userInfoQuery = this.userInfo()
       this.getProcessStatus()
       this.getRoleByUserId(() => {
         this.getAndUserId()
@@ -1444,6 +1450,12 @@
         this.dataSource = [...this.dataSource]
         this.preservationClick()
       },
+      deliveryBlur() {
+        this.preservationClick()
+      },
+      deliveryChange() {
+        this.preservationClick()
+      },
       CertificationProgressClick(val) {
         let item = JSON.parse(JSON.stringify(val))
         item.roleCode = this.roleSwitchingCode