对接认证清单引用交付物

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

@@ -1434,4 +1434,5 @@ module.exports = {
   batchmodify:'Whether to batch modify',
   onlyDataListReleasedAndCertificationReturnCanSelected:'Only data with the process status of list to be released and certification return can be selected',
   type:'type',
+  select:'select',
 }

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

@@ -1536,4 +1536,5 @@ module.exports = {
   batchmodify:'是否批量修改',
   onlyDataListReleasedAndCertificationReturnCanSelected:'只能选择流程状态为清单待发布和认证退回的数据',
   type:'类型',
+  select:'选择',
 }

jero-web/src/views/documentManage/tags/dialog/DicList.vue

@@ -123,10 +123,14 @@
             id:'text',
             name:this.$t('text')
           },
+          {
+            id:'select',
+            name:this.$t('select')
+          },
           {
             id:'N/A',
             name:'NA'
-          }
+          },
         ],
         newVisible: false,
         rules: {

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

@@ -361,7 +361,6 @@
                       class="box-input"
                       style="width: 100%"
                       :tree-data="DeliverableTreeList"
-                      tree-checkable
                       :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
                     />
                   </a-form-model-item>
@@ -611,7 +610,7 @@
         }
       },
       getDeliverableTree() {
-        getAction('/sys/category/getDeliverableTree', {}).then((res) => {
+        getAction('/sys/category/getCertificationDeliverableTree', {}).then((res) => {
           if (res.success) {
             this.DeliverableTreeList = res.result
           } else {
@@ -632,18 +631,20 @@
         })
       },
       editModel(value) {
-        this.formInline = {}
+        // this.formInline = {}
         this.visible = true
-        this.formInline = value
+        this.formInline = JSON.parse(JSON.stringify(value))
-        if (this.formInline.deliverableType) {
+        // if (this.formInline.deliverableType) {
-          this.formInline.deliverableType = this.formInline.deliverableType.split(',')
+        //   this.formInline.deliverableType = this.formInline.deliverableType.split(',')
-        }
+        // }
         if (value.dutyTerritory) {
           this.queryPersonByProject(value.dutyTerritory)
         }
         this.getRegulationNo()
         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/components/batSetting.vue

@@ -76,6 +76,7 @@
               <span class="title-text-text" :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
             </div>
             <a-form-model-item class="itemModel-multi">
+              <!--              tree-checkable-->
               <a-tree-select
                 tree-node-filter-prop="title"
                 v-model="formInline.deliverableType"
@@ -84,7 +85,6 @@
                 class="box-input"
                 style="width: 100%"
                 :tree-data="DeliverableTreeList"
-                tree-checkable
                 :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
               />
             </a-form-model-item>
@@ -179,7 +179,7 @@
       },
 
       getDeliverableTree() {
-        getAction('/sys/category/getDeliverableTree', {}).then((res) => {
+        getAction('/sys/category/getCertificationDeliverableTree', {}).then((res) => {
           if (res.success) {
             this.DeliverableTreeList = res.result
           } else {

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

@@ -280,18 +280,44 @@
               </a>
         </span>
         <span slot="DeliverablesResult" slot-scope="text,record,index">
+                  <span v-if="record.flowStatus == 'Results to be submitted'">
                    <a-button type="primary" class="button-text"
-                            v-if="record.flowStatus == 'Results to be submitted'"
+                             v-if="record.valueType == 'file'"
                              @click="clickButtonToUpload('deliveryResult',index)">
                     {{ (record.deliveryResult === 'null' || record.deliveryResult === '' ||
                     record.deliveryResult == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                     }}
                    </a-button>
+                     <a-input class="box-input-index"
+                              v-else-if="record.valueType == 'text'"
+                              :maxLength="200"
+                              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'"
+                                   v-model="record.deliveryResult">
+                      <a-radio :value="'1'">
+                           {{$t('yes')}}
+                       </a-radio>
+                       <a-radio :value="'2'">
+                          {{$t('not')}}
+                        </a-radio>
+                    </a-radio-group>
+                    <span v-else>--</span>
+                  </span>
+
                    <span v-else>
                        <span class="viewFile"
-                             @click="viewFileClick(record.deliveryResult)" v-if="record.deliveryResult">
+                             @click="viewFileClick(record.deliveryResult)"
+                             v-if="record.deliveryResult && record.valueType == 'file'">
                            {{$t('viewFile')}}
                        </span>
+                        <span v-else-if="record.deliveryResult && record.valueType == 'text'">
+                             {{record.deliveryResult}}
+                        </span>
+                        <span v-else-if="record.deliveryResult && record.valueType == 'select'">
+                             {{record.deliveryResult == '1' ? $t('yes') :$t('not')}}
+                        </span>
                        <span v-else>--</span>
                    </span>
         </span>
@@ -487,7 +513,7 @@
           {
             type: 'string',
             value: 'configItem',
-            text: this.$t('configurationItem'),
+            text: this.$t('configurationItem')
           },
           {
             type: 'string',
@@ -977,7 +1003,7 @@
           onOk() {
             postAction('/project/projectCertificationInventoryEO/issue', {
               ids: ids.join(','),
-              projectLibraryId: _this.$route.query.id,
+              projectLibraryId: _this.$route.query.id
             }).then((res) => {
               if (res.success) {
                 _this.$message.success(_this.$t('OperationSuccessful'))