对接任务清单

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

@@ -772,4 +772,5 @@ module.exports = {
   reminder:'reminder',
   adopt:'adopt',
   reviewedByThePersonInCharge:'Reviewed by the person in charge',
+  onlyDeleted:'Only data whose list confirmation status is not initiated or rejected can be deleted',
 }

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

@@ -777,4 +777,5 @@ module.exports = {
   reminder:'提醒',
   adopt:'通过',
   reviewedByThePersonInCharge:'负责人审核',
+  onlyDeleted:'只能删除清单确认状态为未发起或拒绝的数据',
 }

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

@@ -7,8 +7,8 @@
             <div class="title-text" :title="$t('standard')">
               <span>{{$t('standard')}}</span>
             </div>
-            <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+            <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
-                     v-model="queryParam.serialNumber"></a-input>
+                     v-model="queryParam.serialNumber"></j-input>
           </div>
         </a-col>
         <a-col :md="6" :sm="8">
@@ -39,6 +39,10 @@
         <a-icon type="export" :rotate="-90"/>
         {{$t('export')}}
       </div>
+      <div @click="addProcess" class="operator-text">
+        <a-icon type="export" :rotate="-90"/>
+        发起1
+      </div>
     </div>
     <div style="width: 100%">
       <a-table
@@ -57,26 +61,34 @@
           </div>
         </div>
         <div slot="areaOfResponsibility" slot-scope="text,result" class="box-left">
-          <span class="box-content">1212sdfdsf</span><br/>
+          <div class="content">
-          <span>责任领土</span>
+            <span class="box-content">1212sdfdsf</span><br/>
+            <span>责任领土</span>
+          </div>
         </div>
         <div slot="confirmationOfDesignConformity" slot-scope="text,result" class="box-left">
-          <span class="box-content">截止时间: 2022-06-01</span><br/>
+          <div class="content">
-          <span class="box-content">流程状态: 待审核</span><br/>
+            <span class="box-content">截止时间: 2022-06-01</span><br/>
-          <span class="box-content-color">待追踪</span>
+            <span class="box-content">流程状态: 待审核</span><br/>
+            <span class="box-content-color">待追踪</span>
+          </div>
           <div class="content-box">
             <div class="content-box-jiao"></div>
           </div>
         </div>
         <div slot="PrehomoConfirmation" slot-scope="text,result" class="box-left">
-          <span class="box-content">截止时间: 2022-06-01</span><br/>
+          <div class="content">
-          <span class="box-content">流程状态: 待审核</span><br/>
+            <span class="box-content">截止时间: 2022-06-01</span><br/>
-          <span class="box-content-color">待追踪</span>
+            <span class="box-content">流程状态: 待审核</span><br/>
+            <span class="box-content-color">待追踪</span>
+          </div>
         </div>
         <div slot="verificationAndConformityconfirmation" slot-scope="text,result" class="box-left">
-          <span class="box-content">截止时间: 2022-06-01</span><br/>
+          <div class="content">
-          <span class="box-content">流程状态: 待审核</span><br/>
+            <span class="box-content">截止时间: 2022-06-01</span><br/>
-          <span class="box-content-color">待追踪</span>
+            <span class="box-content">流程状态: 待审核</span><br/>
+            <span class="box-content-color">待追踪</span>
+          </div>
         </div>
         <div slot="CertificationProgress" slot-scope="text,result">
              <span class="box-content-color">
@@ -96,6 +108,7 @@
 
 <script>
   import certificationDirectory from './certificationDirectory'
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
 
   export default {
     name: 'TaskList',
@@ -160,19 +173,23 @@
         ],
         selectedRowKeys: [],
         queryParam: {},
-        url: {},
+        url: {
+          list: '/project/projectTaskInventoryEO/list'
+        },
         loading: false,
-        dataSource: [{}]
+        dataSource: []
       }
     },
     mounted() {
+      this.getList()
     },
     methods: {
       searchQuery() {
-
+        this.getList()
       },
       searchReset() {
-
+        this.queryParam = {}
+        this.getList()
       },
       onSelectChange() {
 
@@ -182,6 +199,19 @@
       },
       CertificationDirectory() {
         this.$refs.certificationDirectoryRef.addModel()
+      },
+      getList() {
+        let query = {
+          projectLibraryId: this.$route.query.id,
+          ...this.queryParam
+        }
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result
+          } else {
+            this.dataSource = []
+          }
+        })
       }
     }
   }
@@ -242,6 +272,14 @@
 
   .box-left {
     position: relative;
+    display: block;
+    height: 100%;
+  }
+
+  .content {
+    text-align: left;
+    margin: 0 auto;
+    display: inline-block;
   }
 
   .content-box {

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

@@ -145,6 +145,7 @@
                  @click="deleteLib(record)">
                 {{ $t('deleteLib') }}
               </a>
+                 <a @click="addProcess(record)">发起</a>
         </span>
         <span slot="titleName" slot-scope="text,record" :title="text">
                   {{ text && text.length > 10 ? text.slice(0, 9) + '...' : text }}
@@ -159,6 +160,7 @@
               @click="clickButtonToUpload(record.designDeliverableTemplate)">{{ $t('viewFile') }}</a>
            <span v-else>--</span>
         </span>
+
         <span slot="prehomoDeliverableTemplateName" slot-scope="text,record">
            <span>{{ record.prehomoDeliverableType_dictText }}</span><br v-if="record.prehomoDeliverableType_dictText">
            <a v-if="record.prehomoDeliverableTemplate && record.prehomoDeliverableTemplate.split(',').length == 1"
@@ -169,6 +171,7 @@
               @click="clickButtonToUpload(record.prehomoDeliverableTemplate)">{{ $t('viewFile') }}</a>
            <span v-else>--</span>
         </span>
+
         <span slot="verifyDeliverableTemplateName" slot-scope="text,record">
           <span>{{ record.verifyDeliverableType_dictText }}</span><br v-if="record.verifyDeliverableType_dictText">
            <a v-if="record.verifyDeliverableTemplate && record.verifyDeliverableTemplate.split(',').length == 1"
@@ -684,24 +687,41 @@
       handleDel() {
         if (this.selectedRowKeys.length > 0) {
           let _this = this
-          this.$confirm({
+          let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
-            content: _this.$t('ConfirmBatchDeletion'),
+          let isTrue
-            onOk() {
+          for (let i = 0; i < this.dataSource.length; i++) {
-              let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+            for (let j = 0; j < selectedRowKeys.length; j++) {
-              deleteAction(_this.url.deleteBatch, {
+              if (this.dataSource[i].id == selectedRowKeys[j]) {
-                ids: idList.join(','),
+                if (this.dataSource[i].inventoryAffirmStatus == 'Not started' || this.dataSource[i].inventoryAffirmStatus == 'rejected') {
-                projectLibraryId: _this.$route.query.id
+                  isTrue = true
-              }).then((res) => {
-                if (res.success) {
-                  _this.$message.success(_this.$t('OperationSuccessful'))
-                  _this.selectedRowKeys = []
-                  _this.getList()
                 } else {
-                  _this.$message.warning(_this.$t('operationFailed'))
+                  isTrue = false
+                  this.$message.warning(this.$t('onlyDeleted'))
+                  return
                 }
-              })
+              }
             }
-          })
+          }
+          if (isTrue) {
+            this.$confirm({
+              content: _this.$t('ConfirmBatchDeletion'),
+              onOk() {
+                let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+                deleteAction(_this.url.deleteBatch, {
+                  ids: idList.join(','),
+                  projectLibraryId: _this.$route.query.id
+                }).then((res) => {
+                  if (res.success) {
+                    _this.$message.success(_this.$t('OperationSuccessful'))
+                    _this.selectedRowKeys = []
+                    _this.getList()
+                  } else {
+                    _this.$message.warning(_this.$t('operationFailed'))
+                  }
+                })
+              }
+            })
+          }
         } else {
           this.$message.warning(this.$t('selectLeastOne'))
         }
@@ -1053,6 +1073,43 @@
             })
           }
         })
+      },
+      addProcess(val) {
+        let num = 2
+        for (let i = 0; i < 3; i++) {
+          setTimeout(() => {
+            this.startProcessDesign(val, num)
+          }, 500)
+        }
+      },
+      startProcessDesign(value, num) {
+        let query = {
+          type: num,
+          msg: JSON.stringify(value).replace(/\"/g, '\'')
+        }
+        postAction('/workFlow/startProcess', query).then((res) => {
+          if (res.success) {
+            this.completeTaskDesign(value, res.result)
+          }
+        })
+      },
+      completeTaskDesign(value, taskId) {
+        let query = {
+          userid: this.userInfo().id,
+          taskId: taskId,
+          json: JSON.stringify(value).replace(/\"/g, '\'')
+        }
+        postAction('/workFlow/completeTask', query).then((res) => {
+          if (res.success) {
+            this.visible = false
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.$router.push({
+              path: '/ProcessCenter'
+            })
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
       }
     }
   }