Merge remote-tracking branch 'origin/master'

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

@@ -846,4 +846,13 @@ module.exports = {
   Importing:'Importing...',
   projectDeliveryDescription:'Project delivery description',
   cancelConfirm:'Cancel Confirm',
+  currentInformation:'Current Information',
+  deliveryHistory:'Delivery History',
+  projectDeliveryRequirements:'Project delivery requirements',
+  personLiableConfirm:'PersonLiable Confirm',
+  complianceResults:'Compliance results',
+  noData:'No data',
+  confirmOperation:'Confirm Operation',
+  sponsorReview:'Sponsor review',
+  fillInProjectDelivery:'Fill in project delivery',
 }

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

@@ -851,4 +851,13 @@ module.exports = {
   Importing:'导入中...',
   projectDeliveryDescription:'工程交付说明',
   cancelConfirm:'取消确认',
+  currentInformation:'当前信息',
+  deliveryHistory:'交付历史',
+  projectDeliveryRequirements:'工程交付要求',
+  personLiableConfirm:'责任人确认',
+  complianceResults:'符合性结果',
+  noData:'暂无数据',
+  confirmOperation:'确认操作',
+  sponsorReview:'发起人审查',
+  fillInProjectDelivery:'填写工程交付',
 }

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

@@ -39,21 +39,29 @@
             {{$t('viewFile')}}
          </a>
       </span>
+      <span slot="engineerFeedbackContent" slot-scope="text,result">
+             <a class="text"
+                @click="detailsClick(result)">
+           {{text}}
+         </a>
+      </span>
       <span slot="operation" slot-scope="result">
          <a class="text"
             v-if="$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'dreDispose'"
             :disabled="!result.createUser"
             @click="edit(result,$t('edit'))">
            {{$t('edit')}}
-         </a>
-         <a class="text"
-            @click="detailsClick(result)">
-           {{$t('details')}}
          </a>
            <a class="text"
               v-if="$route.query.TaskKey == 'zrrclrw'"
-              @click="answerClick(result,$t('replyFromProjectContactPerson'))">
-           {{$t('confirm')}}
+              :disabled="!result.status"
+              @click="confirm(result)">
+             <span v-if="result.status == 'NotDone'">
+               {{$t('confirm')}}
+             </span>
+             <span v-if="result.status == 'haveDone'">
+               {{$t('cancelConfirm')}}
+             </span>
          </a>
          <a class="text"
             v-if="$route.query.TaskKey == 'zrrclrw'"
@@ -167,7 +175,7 @@
     </a-modal>
     <a-modal
       :title="$t('engineeringConfirmationDetails')"
-      :width="600"
+      :width="900"
       :visible="visibleDetails"
       :maskClosable="false"
       @cancel="visibleDetails = false"
@@ -177,57 +185,88 @@
           {{$t('cancel')}}
         </a-button>
       </template>
-      <a-row :gutter="24" style="margin-bottom: 18px">
-        <a-col :span="6">
-          <div class="text-field-left">{{this.$t('feedbackFromTheEngineer')}}:</div>
-        </a-col>
-        <a-col :span="18">
-          <div class="text-field-right">
-            {{formInlineDetails.engineerFeedbackContent}}
+      <div class="engineeringBox">
+        <div style="width: calc(100% - 12px)" v-for="(item,index) in detailsList" v-if="detailsList.length > 0">
+          <div class="title-header-text" v-if="index == 0">
+            {{this.$t('currentInformation')}}
           </div>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24" style="margin-bottom: 18px">
-        <a-col :span="6">
-          <div class="text-field-left">{{this.$t('Deliverables')}}:</div>
-        </a-col>
-        <a-col :span="18">
-          <div v-if="formInlineDetails.fileId" class="text-field-right text-field-cou"
-               @click="viewFileClick(formInlineDetails.fileId)">
-            {{this.$t('viewFile')}}
+          <div class="title-header-text" style="margin-top: 40px" v-if="index == 1">
+            {{this.$t('deliveryHistory')}}
           </div>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24" style="margin-bottom: 18px">
-        <a-col :span="6">
-          <div class="text-field-left">{{this.$t('completedBy')}}:</div>
-        </a-col>
-        <a-col :span="18">
-          <div class="text-field-right">
-            {{formInlineDetails.createBy}}
-          </div>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24" style="margin-bottom: 18px">
-        <a-col :span="6">
-          <div class="text-field-left">{{this.$t('completedTime')}}:</div>
-        </a-col>
-        <a-col :span="18">
-          <div class="text-field-right">
-            {{formInlineDetails.createTime}}
-          </div>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24" style="margin-bottom: 18px">
-        <a-col :span="6">
-          <div class="text-field-left">{{this.$t('replyFromProjectContactPerson')}}:</div>
-        </a-col>
-        <a-col :span="18">
-          <div class="text-field-right">
-            {{formInlineDetails.engineeringInterfacePersonReply}}
-          </div>
-        </a-col>
-      </a-row>
+          <a-row :gutter="24" style="margin-bottom: 18px">
+            <a-col :span="5">
+              <div class="text-field-left">{{this.$t('projectDeliveryRequirements')}}:</div>
+            </a-col>
+            <a-col :span="19">
+              <div class="text-field-right">
+                {{item.deliveryInstructions}}
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24" style="margin-bottom: 18px">
+            <a-col :span="5">
+              <div class="text-field-left">{{this.$t('feedbackFromTheEngineer')}}:</div>
+            </a-col>
+            <a-col :span="19">
+              <div class="text-field-right">
+                {{item.engineerFeedbackContent}}
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24" style="margin-bottom: 18px">
+            <a-col :span="5">
+              <div class="text-field-left">{{this.$t('Deliverables')}}:</div>
+            </a-col>
+            <a-col :span="19">
+              <div v-if="item.fileId" class="text-field-right text-field-cou"
+                   @click="viewFileClick(item.fileId)">
+                {{this.$t('viewUploadedFiles')}}
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24" style="margin-bottom: 18px">
+            <a-col :span="5">
+              <div class="text-field-left">{{this.$t('completedBy')}}:</div>
+            </a-col>
+            <a-col :span="7">
+              <div class="text-field-right">
+                {{item.createBy}}
+              </div>
+            </a-col>
+            <a-col :span="5">
+              <div class="text-field-left">{{this.$t('completedTime')}}:</div>
+            </a-col>
+            <a-col :span="7">
+              <div class="text-field-right">
+                {{item.createTime}}
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24" style="margin-bottom: 18px">
+            <a-col :span="5">
+              <div class="text-field-left">{{this.$t('replyFromProjectContactPerson')}}:</div>
+            </a-col>
+            <a-col :span="19">
+              <div class="text-field-right">
+                {{item.engineeringInterfacePersonReply}}
+              </div>
+            </a-col>
+          </a-row>
+        </div>
+        <div class="noData">
+          {{this.$t('noData')}}
+        </div>
+      </div>
+      <div class="page" v-if="detailsList.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          :page-size.sync="pageSize"
+          :total="total"
+          @change="pageOnChange"
+        />
+      </div>
+      <JLoading :loading="pageLoading">{{$t('dataLoading')}}</JLoading>
     </a-modal>
     <a-modal
       :title="$t('reminderHandling')"
@@ -277,8 +316,12 @@
       return {
         loading: false,
         visibleFile: false,
+        pageLoading: false,
         dataSource: [],
         dataSourceTable: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
         distributionEngineerList: [],
         columnsTable: [
           {
@@ -367,7 +410,8 @@
             title: this.$t('feedbackFromTheEngineer'),
             dataIndex: 'engineerFeedbackContent',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            scopedSlots: { customRender: 'engineerFeedbackContent' }
           },
           {
             title: this.$t('Deliverables'),
@@ -385,10 +429,11 @@
           {
             title: this.$t('operation'),
             align: 'center',
-            width: 200,
+            width: 300,
             scopedSlots: { customRender: 'operation' }
           }
         ],
+        detailsList: [],
         url: {
           list: '/project/projectTaskInventoryFeedbackEO/list',
           add: '/project/projectTaskInventoryFeedbackEO/add',
@@ -396,7 +441,9 @@
           deleted: '/project/projectTaskInventoryFeedbackEO/delete',
           DetailEOAdd: '/project/projectTaskInventoryDetailEO/add',
           queryByActiProcInstId: '/project/projectTaskInventoryDetailEO/queryByActiProcInstId',
-          remindDispose: '/project/projectTaskInventoryEO/remindDispose'
+          remindDispose: '/project/projectTaskInventoryEO/remindDispose',
+          page: '/project/feedbackHistory/page',
+          confirmEdit: '/project/projectTaskInventoryDetailEO/edit'
         }
       }
     },
@@ -404,6 +451,10 @@
       this.getList()
     },
     methods: {
+      pageOnChange(page, pageSize) {
+        this.pageNo = page
+        this.getList()
+      },
       handleOk() {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
@@ -482,6 +533,34 @@
           this.$refs.ruleForm.validateField()
         })
       },
+      confirm(val) {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('confirmOperation') + '?',
+          onOk() {
+            let query = {}
+            if (val.status == 'NotDone') {
+              query = {
+                id: val.projectTaskInventoryId,
+                status: 'haveDone'
+              }
+            } else {
+              query = {
+                id: val.projectTaskInventoryId,
+                status: 'NotDone'
+              }
+            }
+            putAction(_this.url.confirmEdit, query).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.getList()
+              } else {
+                _this.$message.warning(_this.$t('operationFailed'))
+              }
+            })
+          }
+        })
+      },
       reminderHandling() {
         this.visibleTable = true
         this.getReminderHandlingList()
@@ -526,8 +605,25 @@
         })
       },
       detailsClick(val) {
-        this.formInlineDetails = val || {}
         this.visibleDetails = true
+        this.getDetails(val)
+      },
+      getDetails(row) {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          feedbackId: row.id
+        }
+        this.pageLoading = true
+        getAction(this.url.page, query).then((res) => {
+          if (res.success) {
+            this.detailsList = res.result.records || []
+            this.total = res.result.total
+            this.pageLoading = false
+          } else {
+            this.pageLoading = false
+          }
+        })
       },
       PersonnelSelectionChange(value, id) {
         this.formInline[value] = id
@@ -754,4 +850,28 @@
     color: #00B3BE;
     cursor: pointer;
   }
+
+  .engineeringBox {
+    width: 100%;
+    max-height: 600px;
+    overflow: auto;
+  }
+
+  .title-header-text {
+    font-size: 16px;
+    font-weight: 400;
+    color: #000F16;
+    margin-bottom: 30px;
+  }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .noData {
+    height: 200px;
+    line-height: 200px;
+    text-align: center;
+  }
 </style>

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

@@ -2,11 +2,11 @@
   <div class="box">
     <div class="box-text">
       <div class="header-text">
-        {{$t('reviewedByThePersonInCharge')}}
+        {{$route.query.TaskKey == 'zrrclrw' ? $t('personLiableConfirm'):$t('fillInProjectDelivery')}}
       </div>
     </div>
     <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
-      <a-row :gutter="24">
+      <a-row :gutter="24" v-if="$route.query.TaskKey == 'zrrclrw'">
         <a-col :span="24">
           <div class="box-title-text">
             <div class="title-text">
@@ -35,7 +35,100 @@
           </div>
         </a-col>
       </a-row>
-      <a-row :gutter="24">
+      <a-row :gutter="24" v-if="$route.query.TaskKey == 'zrrclrw'">
+        <a-col :span="24">
+          <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="approvalOpinion">
+              <a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')" v-model="formInline.approvalOpinion"
+                          :rows="4"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24" v-if="$route.query.TaskKey == 'dreDispose'">
+        <a-col :span="24">
+          <div class="box-title-text">
+            <div class="title-text-fq">
+              <span class="title-text-text" :title="$t('projectDeliveryDescription')">{{$t('projectDeliveryDescription')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <span class="text-header">
+                 爱上克里夫就的撒开了房间圣诞快乐房价士大夫打扫房间圣诞快乐房价是罚款乱收费考虑是否就但是考虑
+              </span>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24" v-if="$route.query.TaskKey == 'dreDispose'">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text-fq">
+              <span class="title-text-text"
+                    :title="$t('feedbackFromTheEngineer')">{{$t('feedbackFromTheEngineer')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="engineerFeedbackContent">
+              <a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackFromTheEngineer')"
+                          v-model="formInline.engineerFeedbackContent"
+                          :rows="4"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24" v-if="$route.query.TaskKey == 'dreDispose'">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text-fq">
+          <span class="title-text-text"
+                :title="$t('Deliverables')">{{$t('Deliverables')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-button type="primary" class="button-text"
+                        @click="clickButtonToUpload('fileId')">
+                {{ (formInline.fileId === 'null' || formInline.fileId === '' ||
+                formInline.fileId == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                }}
+              </a-button>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24" v-if="$route.query.TaskKey == 'fqrsh'">
+        <a-col :span="24">
+          <div class="box-title-text">
+            <div class="title-text-fq">
+              <span class="title-text-text" :title="$t('complianceResults')">{{$t('complianceResults')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <span class="text-header">
+                 爱上克里夫就的撒开了房间圣诞快乐房价士大夫打扫房间圣诞快乐房价是罚款乱收费考虑是否就但是考虑
+              </span>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24" v-if="$route.query.TaskKey == 'fqrsh'">
+        <a-col :span="24">
+          <div class="box-title-text">
+            <div class="title-text-fq">
+              <span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <span class="text-header">
+                 爱上克里夫就的撒开了房间圣诞快乐房价士大夫打扫房间圣诞快乐房价是罚款乱收费考虑是否就但是考虑
+              </span>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <div class="box-text" v-if="$route.query.TaskKey == 'fqrsh'">
+        <div class="header-text">
+          {{$t('sponsorReview')}}
+        </div>
+      </div>
+      <a-row :gutter="24" v-if="$route.query.TaskKey == 'fqrsh'">
         <a-col :span="24">
           <div class="box-title-text">
             <div class="title-text">
@@ -49,12 +142,19 @@
         </a-col>
       </a-row>
     </a-form-model>
+    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
   </div>
 </template>
 
 <script>
+  import { getAction, postAction, putAction, deleteAction } from '@/api/manage'
+  import uploadFile from '@/components/uploadFile/file'
+
   export default {
     name: 'reviewedByThePersonInCharge',
+    components: {
+      uploadFile
+    },
     props: ['queryBy'],
     data() {
       return {
@@ -74,6 +174,13 @@
               message: this.$t('feedbackMessage') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
               trigger: 'blur'
             }
+          ],
+          engineerFeedbackContent: [
+            {
+              max: 300,
+              message: this.$t('feedbackFromTheEngineer') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
           ]
         }
       }
@@ -92,6 +199,33 @@
             callBack(this.formInline)
           }
         })
+      },
+      clickButtonToUpload(item) {
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+        this.uploadName = item
+        getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+          if (res.success) {
+            this.$refs.uploadFile.perentHandleFunc(res.result)
+          } else {
+            this.$refs.uploadFile.perentHandleFunc()
+          }
+        })
+      },
+      /** 上传文件的回调 */
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push(item.id || data.name)
+          })
+        }
+        /** 赋值给当前对应的表单文件 */
+        this.formInline[this.uploadName] = attIdList.join(',')
+        this.formInline = { ...this.formInline }
+        this.$nextTick(() => {
+          this.$refs.ruleForm.validateField([this.uploadName])
+        })
       }
     }
   }
@@ -138,6 +272,21 @@
     color: #000F16;
   }
 
+  .title-text-fq {
+    width: 124px;
+    text-align: left;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 48px;
+    color: #000F16;
+  }
+
   .box-input {
     display: inline-block;
     height: 38px;
@@ -164,9 +313,15 @@
   /*  margin-bottom: 40px;*/
   /*}*/
 
+  .text-header {
+    font-size: 16px;
+    color: #040B29;
+    font-weight: 400;
+  }
+
   .button-text {
     height: 38px;
-    width: calc(100% - 100px);
+    width: calc(50% - 100px);
     line-height: 38px;
     background: #fff;
     border: 1px #00B3BE solid;