对接握手流程

jero-web/src/views/processCenter/components/examineInformation.vue

@@ -6,14 +6,15 @@
       </div>
     </div>
     <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
-      <a-row :gutter="24">
+      <a-row :gutter="24" v-if="isFlag">
         <a-col :span="24">
           <div class="box-title-text">
             <div class="title-text">
+              <span class="Required">*</span>
               <span class="title-text-text" :title="$t('reviewResults')">{{$t('reviewResults')}}</span>
             </div>
-            <a-form-model-item class="itemModel" prop="standard">
-              <a-radio-group style="margin-top: 2px" class="box-input" v-model="formInline.resource">
+            <a-form-model-item class="itemModel" prop="flag">
+              <a-radio-group style="margin-top: 2px" @change="flagChange" class="box-input" v-model="formInline.flag">
                 <a-radio value="1">
                   {{$t('agree')}}
                 </a-radio>
@@ -28,29 +29,47 @@
           </div>
         </a-col>
       </a-row>
-      <a-row :gutter="24">
+      <a-row :gutter="24" v-if="isTrue">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="Required">*</span>
+              <span class="title-text-text" :title="$t('selectIssuer')">{{$t('selectIssuer')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="dreUserIdName">
+              <PersonnelSelection class="box-input"
+                                  :personneQuery="formInline"
+                                  :query="{db_field_name:'dreUserId',db_field_txt:$t('selectIssuer')}"
+                                  :isInput="true"
+                                  @change="PersonnelSelectionChange"
+                                  v-model="formInline.dreUserIdName"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24" v-if="isApprovalOpinion">
         <a-col :span="12">
           <div class="box-title-text">
             <div class="title-text">
               <span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span>
             </div>
             <a-form-model-item class="itemModel" prop="standard">
-              <a-textarea placeholder="Basic usage" v-model="formInline.desc" :rows="4" />
+              <a-textarea placeholder="Basic usage" v-model="formInline.approvalOpinion" :rows="4"/>
             </a-form-model-item>
           </div>
         </a-col>
       </a-row>
-      <a-row :gutter="24">
+      <a-row :gutter="24" v-if="isViewUploadedFiles">
         <a-col :span="12">
           <div class="box-title-text">
             <div class="title-text">
               <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
             </div>
-            <a-form-model-item class="itemModel" prop="enclosure">
+            <a-form-model-item class="itemModel" prop="approvalFile">
               <a-button type="primary" class="button-text"
-                        @click="clickButtonToUpload('enclosure')">
-                {{ (formInline.enclosure === 'null' || formInline.enclosure === '' ||
-                formInline.enclosure == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                        @click="clickButtonToUpload('approvalFile')">
+                {{ (formInline.approvalFile === 'null' || formInline.approvalFile === '' ||
+                formInline.approvalFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                 }}
               </a-button>
             </a-form-model-item>
@@ -65,20 +84,53 @@
 <script>
   import { getAction, postAction } from '@/api/manage'
   import uploadFile from '@/components/uploadFile/file'
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
+
   export default {
     name: 'examineInformation',
-    components:{
-      uploadFile
+    props: {
+      isFlag:{
+         type:Boolean,
+         default:false,
+      },
+      isViewUploadedFiles:{
+        type:Boolean,
+        default:false,
+      },
+      isApprovalOpinion:{
+        type:Boolean,
+        default:false,
+      },
+    },
+    components: {
+      uploadFile,
+      PersonnelSelection
     },
     data() {
       return {
         formInline: {},
-        rules: {}
+        isTrue: false,
+        rules: {
+          flag: [
+            {
+              required: true,
+              message: this.$t('reviewResults') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          dreUserIdName: [
+            {
+              required: true,
+              message: this.$t('selectIssuer') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ]
+        }
       }
     },
     mounted() {
     },
-    methods:{
+    methods: {
       clickButtonToUpload(item) {
         this.$refs.uploadFile.perentHandleFunc()
         this.$refs.uploadFile.visible = true
@@ -103,7 +155,25 @@
         this.formInline[this.uploadName] = attIdList.join(',')
         this.formInline = { ...this.formInline }
       },
-    },
+      PersonnelSelectionChange(value, id) {
+        this.formInline[value] = id
+        this.formInline = { ...this.formInline }
+      },
+      flagChange(event) {
+        if (event.target.value == 3) {
+          this.isTrue = true
+        } else {
+          this.isTrue = false
+        }
+      },
+      submit(callBack) {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            callBack(this.formInline)
+          }
+        })
+      }
+    }
   }
 </script>
 
@@ -133,7 +203,7 @@
   }
 
   .title-text {
-    width: 57px;
+    width: 88px;
     text-align: right;
     display: inline-block;
     font-weight: 500;
@@ -172,6 +242,7 @@
   .formAdd {
     margin-bottom: 40px;
   }
+
   .button-text {
     height: 38px;
     width: calc(100% - 100px);

jero-web/src/views/processCenter/components/projectInformation.vue

@@ -8,7 +8,7 @@
     <div class="content-text">
       <div class="text-field" v-for="(item,index) in projectInformationList" :key="index">
         <span class="text-field-left" :title="item.title">{{item.title}}</span>
-        <span class="text-field-right"
+        <span class="text-field-right" :title="queryForm[item.value]"
         >{{queryForm[item.value]}}</span>
       </div>
     </div>

jero-web/src/views/processCenter/components/standardContent.vue

@@ -8,7 +8,7 @@
     <div class="content-text">
       <div class="text-field" v-for="(item,index) in standardContentList" :key="index">
         <span class="text-field-left" :title="item.title">{{item.title}}</span>
-        <span class="text-field-right"
+        <span class="text-field-right" :title="queryForm[item.value]"
         >{{queryForm[item.value]}}</span>
       </div>
     </div>
@@ -31,30 +31,20 @@
         type: Object,
         default: {}
       },
-      standardContentId: {
-        type: String,
-        default: ''
+      standardContentQuery: {
+        type: Object,
+        default: {}
       }
     },
     data() {
       return {
-        queryForm: {},
+        queryForm: {}
       }
     },
     mounted() {
-      // this.getQueryForm()
+      this.queryForm = this.standardContentQuery
     },
-    methods: {
-      getQueryForm() {
-        getAction(this.url.urlFrom, { id: this.projectInformationId }).then((res) => {
-          if (res.success) {
-            this.queryForm = res.result[0] || {}
-          } else {
-            this.queryForm = {}
-          }
-        })
-      }
-    }
+    methods: {}
   }
 </script>
 

jero-web/src/views/processCenter/components/standardContentList.vue

@@ -74,6 +74,12 @@
 
   export default {
     name: 'standardContentList',
+    props: {
+      standardContentListQuery: {
+        type: Object,
+        default: {}
+      }
+    },
     data() {
       return {
         dataSource: [],
@@ -159,7 +165,7 @@
         ],
         loading: false,
         dataSourceFile: [],
-        visibleFile:false,
+        visibleFile: false,
         columnsFile: [
           {
             title: this.$t('deliverableTemplate'),
@@ -178,6 +184,8 @@
       }
     },
     mounted() {
+      this.dataSource = []
+      this.dataSource.push(this.standardContentListQuery)
     },
     methods: {
       pdfPreview(fileQuery) {