待办中心-项目法规任务

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

@@ -1515,5 +1515,11 @@ module.exports = {
   Taskresponsibilityrecognition:'Task responsibility recognition',
   uploadattachment:'Upload attachment',
   Processhistory:'Process history',
-  resultofhandling:'Result of handling'
+  resultofhandling:'Result of handling',
+  Listoftreatableregulations:'List of treatable regulations',
+  Listofuntractableregulations:'List of untractable regulations',
+  project:'Project',
+  Categoryofdeliverables:'Category of deliverables',
+  Taskconfirmationresult:'Task confirmation result',
+  Compliancetaskhandling:'Compliance task handling'
 }

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

@@ -1617,5 +1617,11 @@ module.exports = {
   Taskresponsibilityrecognition:'任务责任确认',
   uploadattachment:'上传附件',
   Processhistory:'流程历史',
-  resultofhandling:'处理结果'
+  resultofhandling:'处理结果',
+  Listoftreatableregulations:'可处理法规列表',
+  Listofuntractableregulations:'不可处理法规列表',
+  project:'项目',
+  Categoryofdeliverables:"交付物类别",
+  Taskconfirmationresult:'任务确认结果',
+  Compliancetaskhandling:'符合性任务办理'
 }

jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue

@@ -59,78 +59,39 @@
           {{$t('basicInformation')}}
         </div>
         <div class="content-text">
-          <div class="text-field">
+          <div class="text-field" v-for="(item,index) in projectInformationList" :key="index">
-            <span class="text-field-left" :title="$t('entryName')">{{$t('entryName')}}</span>
+            <span class="text-field-left" :title="item.title">{{item.title}}</span>
-            <span class="text-field-right "
+            <span class="text-field-right text-field-right-url"
-                  :title="$t('entryName')"
+                  :title="queryForm[item.value]"
-            >{{$t('entryName')}}</span>
+                  v-if="item.type == 1"
+            >{{queryForm[item.value]}}</span>
+            <span class="text-field-right text-field-right-url"
+                  v-else-if="item.type == '4'" :title="queryForm[item.value]"
+            >{{queryForm[item.value]}}</span>
+            <span class="text-field-right" v-else :title="queryForm[item.value]"
+            >{{queryForm[item.value]}}</span>
           </div>
-          <div class="text-field">
+        </div>
-            <span class="text-field-left" :title="$t('regulationNo')">{{$t('regulationNo')}}</span>
-            <span class="text-field-right "
-                  :title="$t('regulationNo')"
-            >{{$t('regulationNo')}}</span>
-          </div>
-          <div class="text-field">
-            <span class="text-field-left" :title="$t('title')">{{$t('title')}}</span>
-            <span class="text-field-right "
-                  :title="$t('title')"
-            >{{$t('title')}}</span>
-          </div>
-          <div class="text-field">
-            <span class="text-field-left" :title="$t('subtitle')">{{$t('subtitle')}}</span>
-            <span class="text-field-right "
-                  :title="$t('subtitle')"
-            >{{$t('subtitle')}}</span>
-          </div>
-          <div class="text-field">
-            <span class="text-field-left" :title="$t('applicableSupplement')">{{$t('applicableSupplement')}}</span>
-            <span class="text-field-right "
-                  :title="$t('applicableSupplement')"
-            >{{$t('applicableSupplement')}}</span>
-          </div>
-      </div>
       </div>
       <div style="margin-bottom: 40px">
         <div class="header-text">
           {{$t('TaskRequirements')}}
         </div>
         <div class="content-text">
-          <div class="text-field">
+          <div class="text-field" :class="{'text-content-button-one':item.type == 4 ? true :false}"
-            <span class="text-field-left" :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
+               v-for="(item,index) in standardContentList" :key="index">
-            <span class="text-field-right "
+            <span class="text-field-left" :title="item.title">{{item.title}}</span>
-                  :title="$t('Sponsor')"
-            >{{$t('Sponsor')}}</span>
-          </div>
-          <div class="text-field">
-            <span class="text-field-left" :title="$t('personLiable')">{{$t('personLiable')}}</span>
-            <span class="text-field-right "
-                  :title="$t('personLiable')"
-            >{{$t('personLiable')}}</span>
-          </div>
-          <div class="text-field">
-            <span class="text-field-left" :title="$t('closingDate')">{{$t('closingDate')}}</span>
-            <span class="text-field-right "
-                  :title="$t('closingDate')"
-            >{{$t('closingDate')}}</span>
-          </div>
-          <div class="text-field">
-            <span class="text-field-left" :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
-            <span class="text-field-right "
-                  :title="$t('typeOfDeliverables')"
-            >{{$t('typeOfDeliverables')}}</span>
-          </div>
-          <div class="text-field">
-            <span class="text-field-left" :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
             <span class="text-field-right text-field-right-url"
-                  :title="$t('deliverableTemplate')"
+                  v-if="item.type == 1"
-            >{{$t('deliverableTemplate')}}</span>
+            ></span>
-          </div>
+            <span class="text-field-right text-field-right-url"
-          <div class="text-field"  style="width: 100%">
+                  v-else-if="item.type == '5'"
-            <span class="text-field-left" :title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
+            ></span>
-            <span class="text-field-right "
+            <span class="text-field-right text-field-right-url"
-                  :title="$t('descriptionDeliverables')"
+                  v-else-if="item.type == 2"
-            >{{$t('descriptionDeliverables')}}</span>
+            >{{ $t('viewFile') }}</span>
+            <span class="text-field-right" v-else
+            ></span>
           </div>
         </div>
       </div>
@@ -169,7 +130,8 @@
             <span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span>
           </div>
           <a-form-model-item class="itemModel">
-            <a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')" />
+            <a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')"
+                        rows="4"/>
           </a-form-model-item>
         </div>
         <div class="box-title-text">
@@ -219,16 +181,72 @@
 <script>
   import { getAction, postAction, deleteAction } from '@/api/manage'
   import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+  import confirmationDrawer from './confirmationDrawer'
 
   export default {
     name: 'dealtWith',
+    components:{
+      confirmationDrawer
+    },
     mixins:[ResizeHeader, ResizeColumnProvide,],
     data() {
       return {
         visible: false,
         title:'',
+        queryForm: {},
         dataSource: [],
         loading: false,
+        projectInformationList: [
+          {
+            title: this.$t('entryName'),
+            value: 'projectName'
+          },
+          {
+            title: this.$t('regulationNo'),
+            value: 'targetMarket_dictText'
+          },
+          {
+            title: this.$t('title'),
+            value: 'subtitle'
+          },
+          {
+            title: this.$t('subtitle'),
+            value: 'serialNumber',
+            type: '4'
+          },
+          {
+            title: this.$t('applicableSupplement'),
+            value: 'title'
+          },
+        ],
+        standardContentList: [
+          {
+            title: this.$t('Sponsor'),
+            value: this.$route.query.Sponsor
+          },
+          {
+            title: this.$t('personLiable'),
+            value: this.$route.query.personLiable
+          },
+          {
+            title: this.$t('closingDate'),
+            value: this.$route.query.DueDate
+          },
+          {
+            title: this.$t('typeOfDeliverables'),
+            value: this.$route.query.typeOfDeliverables
+          },
+          {
+            title: this.$t('deliverableTemplate'),
+            value: this.$route.query.deliverableTemplate,
+            type: 2
+          },
+          {},
+          {
+            title: this.$t('descriptionDeliverables'),
+            value: this.$route.query.remarks
+          }
+        ],
         columns: [
           {
             title: this.$t('RelatedItems'),
@@ -340,7 +358,8 @@
         pageNo: 1,
         total: 0,
         url: {
-          list: '/todoCenter/projectProcess/todoTaskList'
+          list: '/todoCenter/projectProcess/todoTaskList',
+          urlFrom: 'project/projectLibraryBase/queryById',
         },
         queryParam: {},
         regulatoryCertificationTaskPlanList: []
@@ -457,6 +476,8 @@
           // window.open(newUrl.href, '_blank')
           this.visible = true
           this.title = this.$t('designComplianceReview')
+          this.getQueryForm()
+
         } else if (row.flowType == '3') {
           row.taskId = row.taskId + ''
           if (row.taskId.length > 30) {
@@ -578,7 +599,20 @@
       },
       handleCancel() {
         this.visible = false
-      }
+      },
+      getQueryForm() {
+        getAction(this.url.urlFrom).then((res) => {
+          if (res.success) {
+            this.queryForm = res.result[0] || {}
+            if (this.queryProject) {
+              this.queryForm = { ...this.queryForm, ...this.queryProject }
+              console.log(this.queryForm)
+            }
+          } else {
+            this.queryForm = {}
+          }
+        })
+      },
     }
   }
 </script>
@@ -627,18 +661,6 @@
     width: 50%;
     margin-bottom: 8px;
 
-  .text-field-left {
-    width: 124px;
-    display: inline-block;
-    font-size: 14px;
-    font-weight: 400;
-    color: #6F7385;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-    margin-right: 24px;
-  }
-
   .text-field-right {
     width: calc(100% - 200px);
     display: inline-block;
@@ -700,15 +722,15 @@
     height: 38px;
     width: 100%;
   }
-
+  //
-  .button-text {
+  //.button-text {
-    height: 38px;
+  //  height: 38px;
-    width: calc(100% - 250px);
+  //  width: calc(100% - 250px);
-    line-height: 38px;
+  //  line-height: 38px;
-    background: #fff;
+  //  background: #fff;
-    border: 1px #00B3BE solid;
+  //  border: 1px #00B3BE solid;
-    color: #00B3BE;
+  //  color: #00B3BE;
-  }
+  //}
 
   .process-content {
     margin-top: 4px;

jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue

@@ -78,12 +78,12 @@
     </div>
     <div class="table-operator" style="margin-bottom: 8px"
          v-if="tabActive == $t('toDoProcess')">
-      <div @click=""
+      <div @click="TaskresponsibilityrecognitionClick"
            class="operator-text">
         <a-icon type="form"/>
         {{$t('Taskresponsibilityrecognition')}}
       </div>
-      <div @click=""
+      <div @click="complianceConfirmationClick"
            class="operator-text">
         <a-icon type="form"/>
         {{$t('complianceConfirmation')}}
@@ -100,6 +100,7 @@
         <SentList v-if="tabActive == $t('sentProcess')" ref="SentListRef"/>
       </a-tab-pane>
     </a-tabs>
+    <confirmation-drawer ref="confirmationdrawer"></confirmation-drawer>
   </a-card>
 </template>
 
@@ -108,16 +109,19 @@
   import dealtWith from './components/dealtWith'
   import doneList from './components/doneList'
   import SentList from './components/SentList'
+  import confirmationDrawer from './components/confirmationDrawer'
 
   export default {
     name: 'index',
     components: {
       dealtWith,
       doneList,
-      SentList
+      SentList,
+      confirmationDrawer
     },
     data() {
       return {
+        title: '',
         queryParam: {
           projectName:this.$route.query.projectName?this.$route.query.projectName:''
         },
@@ -170,6 +174,14 @@
       }
     },
     methods: {
+      TaskresponsibilityrecognitionClick() {
+        this.$refs.confirmationdrawer.confirmation(1)
+        // this.title = this.$t('Taskresponsibilityrecognition')
+      },
+      complianceConfirmationClick() {
+        this.$refs.confirmationdrawer.confirmation(2)
+        // this.title = this.$t('complianceConfirmation')
+      },
       callback(value) {
         this.tabActive = value
       },