维修工单修改

lyh

2 天以前 a16a7006603e4b68b52689e88479881bff8c6106

 src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue

@@ -66,11 +66,11 @@
          </a-col>

          <a-col class="scroll-col"
                 :span="model.maintenanceStatus&&model.maintenanceStatus!='WAIT_MAINTENANCE'&&model.maintenanceStatus!='UNDER_MAINTENANCE'?10:16">
                 :span="model.maintenanceStatus&&model.maintenanceStatus!=='WAIT_MAINTENANCE'&&model.maintenanceStatus!=='UNDER_MAINTENANCE'?10:16">
            <a-tabs :active-key="activeTabKey" @change="handleTabChange">
              <a-tab-pane :key="1" tab="操作工"
                          v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey==='operator_task'||
                          (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE')">
                          v-if="(selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey==='operator_task')||
                          (model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE')">
                <j-vxe-table ref="editableDetailTable1" :rowNumber="false" rowSelection bordered
                             alwaysEdit keep-source
                             :dataSource="detail.operatorMaintenanceList" :columns="detail.columns"
@@ -78,25 +78,25 @@
                  <template v-slot:maintenanceResult="props">
                    <j-dict-select-tag v-model="props.row.maintenanceResult" dictCode="maintenance_result"
                                       placeholder="请选择保养结果"
                                       :disabled="disableSubmit||(model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE')"
                                       :disabled="disableSubmit||(model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE')"
                                       @change="handleInspectionResultSelectChange($event,props.row)"
                                       style="width: 100%"/>
                  </template>

                  <template v-slot:exceptionDescription="props">
                    <a-textarea :rows="1" :autoSize="false" v-model="props.row.exceptionDescription"
                                :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!='1'?'请输入异常描述':''"
                                :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!=='1'?'请输入异常描述':''"
                                :disabled="disableSubmit||
                                (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE') ||
                                (model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE') ||
                                 !props.row.maintenanceResult ||
                                  props.row.maintenanceResult === '1'"/>
                  </template>

                  <template v-slot:reportFlag="props">
                    <j-dict-select-tag v-model="props.row.reportFlag" dictCode="yn" style="width: 100%"
                                       :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!='1'?'请选择异常是否报修':''"
                                       :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!=='1'?'请选择异常是否报修':''"
                                       :disabled="disableSubmit ||
                                       (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE') ||
                                       (model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE') ||
                                        !props.row.maintenanceResult ||
                                         props.row.maintenanceResult === '1'"/>
                  </template>
@@ -104,8 +104,8 @@
              </a-tab-pane>

              <a-tab-pane :key="2" tab="维修工"
                          v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey==='maintenance_task'||
                          (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE')">
                          v-if="(selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey==='maintenance_task')||
                          (model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE')">
                <j-vxe-table ref="editableDetailTable2" :rowNumber="false" rowSelection bordered
                             alwaysEdit kee-source
                             :dataSource="detail.repairerMaintenanceList" :columns="detail.columns"
@@ -113,26 +113,26 @@
                  <template v-slot:maintenanceResult="props">
                    <j-dict-select-tag v-model="props.row.maintenanceResult" dictCode="maintenance_result"
                                       placeholder="请选择保养结果"
                                       :disabled="disableSubmit||(model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE')"
                                       :disabled="disableSubmit||(model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE')"
                                       @change="handleInspectionResultSelectChange($event,props.row)"
                                       style="width: 100%"/>
                  </template>

                  <template v-slot:exceptionDescription="props">
                    <a-textarea :rows="1" :autoSize="false" v-model="props.row.exceptionDescription"
                                :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!='1'?'请输入异常描述':''"
                                :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!=='1'?'请输入异常描述':''"
                                :disabled="disableSubmit ||
                                (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE') ||
                                (model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE') ||
                                !props.row.maintenanceResult ||
                                 props.row.maintenanceResult === '1'"/>
                  </template>

                  <template v-slot:reportFlag="props">
                    <j-dict-select-tag v-model="props.row.reportFlag"
                                       :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!='1'?'请选择异常是否报修':''"
                                       :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!=='1'?'请选择异常是否报修':''"
                                       dictCode="yn" style="width: 100%"
                                       :disabled="disableSubmit||
                                       (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE') ||
                                       (model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE') ||
                                       !props.row.maintenanceResult ||
                                        props.row.maintenanceResult === '1'"/>
                  </template>
@@ -148,7 +148,7 @@
              <a-button
                v-if="activeTabKey!=='3'"
                :disabled="disableSubmit ||
                (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE') ||
                (model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE') ||
                (activeTabKey==='1'&&selectedOperatorMaintenanceRowKeys.length === 0)||
                (activeTabKey==='2'&&selectedRepairerMaintenanceRowKeys.length === 0)"
                slot="tabBarExtraContent"
@@ -159,7 +159,7 @@

          <!--右侧审批列-->
          <a-col :span="6" class="scroll-col"
                 v-if="model.maintenanceStatus&&model.maintenanceStatus!='WAIT_MAINTENANCE'&&model.maintenanceStatus!='UNDER_MAINTENANCE'">
                 v-if="model.maintenanceStatus&&model.maintenanceStatus!=='WAIT_MAINTENANCE'&&model.maintenanceStatus!=='UNDER_MAINTENANCE'">
            <a-tabs v-if="displayAdminConfirmFlag">
              <a-tab-pane tab="管理员确认">
                <a-row>
@@ -167,19 +167,19 @@
                    <a-form-model-item prop="manageUserResult" label="确认类型">
                      <j-dict-select-tag type='radio' v-model='model.manageUserResult' dictCode='approve_reject'
                                         placeholder="请选择确认类型"
                                         :disabled="disableSubmit || model.maintenanceStatus!='WAIT_ADMIN_CONFIRM'"/>
                                         :disabled="disableSubmit || model.maintenanceStatus!=='WAIT_ADMIN_CONFIRM'"/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="24">
                    <a-form-model-item label="问题描述">
                      <a-textarea placeholder="请描述问题" v-model='model.problemDescription'
                                  :disabled="disableSubmit || model.maintenanceStatus!='WAIT_ADMIN_CONFIRM'"/>
                                  :disabled="disableSubmit || model.maintenanceStatus!=='WAIT_ADMIN_CONFIRM'"/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="24">
                    <a-form-model-item label="处理措施描述">
                      <a-textarea placeholder="请描述处理措施" v-model="model.dealDescription"
                                  :disabled="disableSubmit || model.maintenanceStatus!='WAIT_ADMIN_CONFIRM'"/>
                                  :disabled="disableSubmit || model.maintenanceStatus!=='WAIT_ADMIN_CONFIRM'"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
@@ -193,13 +193,13 @@
                    <a-form-model-item prop="inspectorResult" label="确认类型">
                      <j-dict-select-tag type='radio' v-model='model.inspectorResult' dictCode='approve_reject'
                                         placeholder="请选择确认类型"
                                         :disabled="disableSubmit || model.maintenanceStatus!='WAIT_INSPECTOR_CONFIRM'"/>
                                         :disabled="disableSubmit || model.maintenanceStatus!=='WAIT_INSPECTOR_CONFIRM'"/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="24">
                    <a-form-model-item label="确认意见">
                      <a-textarea placeholder="请输入意见" v-model="model.inspectConfirmComment"
                                  :disabled="disableSubmit || model.maintenanceStatus!='WAIT_INSPECTOR_CONFIRM'"/>
                                  :disabled="disableSubmit || model.maintenanceStatus!=='WAIT_INSPECTOR_CONFIRM'"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
@@ -499,7 +499,7 @@
      handleTabToFirstTable() {
        this.$nextTick(() => {
          console.log('taskDefKey', this.selectShenpiData.taskDefKey)
          if ((this.selectShenpiData.taskDefKey && this.selectShenpiData.taskDefKey === 'operator_task') || !this.selectShenpiData.taskDefKey) this.activeTabKey = 1
          if ((this.selectShenpiData.taskDefKey && this.selectShenpiData.taskDefKey === 'operator_task') || !this.selectShenpiData.taskDefKey || (this.model.maintenanceStatus !== 'UNDER_MAINTENANCE')) this.activeTabKey = 1
          else if (this.selectShenpiData.taskDefKey && this.selectShenpiData.taskDefKey === 'maintenance_task') this.activeTabKey = 2
        })
      },