zhaowei
7 天以前 3db6d5c4d17ab9942a5c89a167c1f06ca485f355
src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue
@@ -110,25 +110,25 @@
                </template>
              </j-vxe-table>
            </a-tab-pane>
            <a-tab-pane key='4' tab='精度检验' v-if="!isMaintenance">
              <j-vxe-table
                ref="editablePrecisionDetailTable"
                :rowNumber="true"
                :rowSelection="true"
                :bordered="true"
                :alwaysEdit="true"
                :toolbar="false"
                :toolbarConfig="precisionDetail.toolbarConfig"
                keep-source
                :height="300"
                :dataSource="precisionDetail.dataSource"
                :columns="precisionDetail.columns"
                style="margin-top: 8px;" >
                <template v-slot:actualValue="props">
                  <a-input-number v-model="props.row.actualValue" :disabled="disableSubmit || confirmDisable" style="width: 100%" />
                </template>
              </j-vxe-table>
            </a-tab-pane>
<!--            <a-tab-pane key='4' tab='精度检验' v-if="!isMaintenance">-->
<!--              <j-vxe-table-->
<!--                ref="editablePrecisionDetailTable"-->
<!--                :rowNumber="true"-->
<!--                :rowSelection="true"-->
<!--                :bordered="true"-->
<!--                :alwaysEdit="true"-->
<!--                :toolbar="false"-->
<!--                :toolbarConfig="precisionDetail.toolbarConfig"-->
<!--                keep-source-->
<!--                :height="300"-->
<!--                :dataSource="precisionDetail.dataSource"-->
<!--                :columns="precisionDetail.columns"-->
<!--                style="margin-top: 8px;" >-->
<!--                <template v-slot:actualValue="props">-->
<!--                  <a-input-number v-model="props.row.actualValue" :disabled="disableSubmit || confirmDisable" style="width: 100%" />-->
<!--                </template>-->
<!--              </j-vxe-table>-->
<!--            </a-tab-pane>-->
            <template v-if="selectShenpiData.procInstId">
              <a-tab-pane key='2' tab='流程节点'>
                <a-card :bordered="false">
@@ -249,7 +249,7 @@
          userSelect: '/eam/user_select/list',
          queryHisTaskList: '/assign/flow/queryHisTaskList',
          diagramView: '/assign/flow/diagramView',
          precisionCheckDetail: '/eam/precisionCheckDetail/queryList',
          // precisionCheckDetail: '/eam/precisionCheckDetail/queryList',
        },
        disableSubmit: false,
        taskData: [],
@@ -332,70 +332,70 @@
            btn: ['clearSelection']
          }
        },
        precisionDetail: {
          loading: false,
          dataSource: [],
          columns: [
            {
              title: 'ID',
              key: 'id',
              type: JVXETypes.hidden
            },
            {
              title: 'orderId',
              key: 'orderId',
              type: JVXETypes.hidden
            },
            {
              title: 'equipmentId',
              key: 'equipmentId',
              type: JVXETypes.hidden
            },
            {
              title: 'parameterId',
              key: 'parameterId',
              type: JVXETypes.hidden
            },
            {
              title: '检测项目',
              key: 'parameterId_dictText',
              type: JVXETypes.normal,
              width: '25%',
              align: 'center'
            },
            {
              title: '参数编码',
              key: 'parameterCode_dictText',
              type: JVXETypes.normal,
              width: '20%',
              align: 'center',
            },
            {
              title: '允差值',
              key: 'parameterValue',
              type: JVXETypes.normal,
              width: '15%',
              align: 'center',
            },
            {
              title: '实测值',
              key: 'actualValue',
              type: JVXETypes.slot,
              width: '15%',
              align: 'center',
              slotName: 'actualValue',
              validateRules: [
                { required: true, message: '请输入实测值!' }
              ]
            }
          ],
          toolbarConfig: {
            // prefix 前缀;suffix 后缀
            slot: ['prefix', 'suffix'],
            // add 新增按钮;remove 删除按钮;clearSelection 清空选择按钮
            btn: ['add', 'remove', 'clearSelection']
          }
        }
        // precisionDetail: {
        //   loading: false,
        //   dataSource: [],
        //   columns: [
        //     {
        //       title: 'ID',
        //       key: 'id',
        //       type: JVXETypes.hidden
        //     },
        //     {
        //       title: 'orderId',
        //       key: 'orderId',
        //       type: JVXETypes.hidden
        //     },
        //     {
        //       title: 'equipmentId',
        //       key: 'equipmentId',
        //       type: JVXETypes.hidden
        //     },
        //     {
        //       title: 'parameterId',
        //       key: 'parameterId',
        //       type: JVXETypes.hidden
        //     },
        //     {
        //       title: '检测项目',
        //       key: 'parameterId_dictText',
        //       type: JVXETypes.normal,
        //       width: '25%',
        //       align: 'center'
        //     },
        //     {
        //       title: '参数编码',
        //       key: 'parameterCode_dictText',
        //       type: JVXETypes.normal,
        //       width: '20%',
        //       align: 'center',
        //     },
        //     {
        //       title: '允差值',
        //       key: 'parameterValue',
        //       type: JVXETypes.normal,
        //       width: '15%',
        //       align: 'center',
        //     },
        //     {
        //       title: '实测值',
        //       key: 'actualValue',
        //       type: JVXETypes.slot,
        //       width: '15%',
        //       align: 'center',
        //       slotName: 'actualValue',
        //       validateRules: [
        //         { required: true, message: '请输入实测值!' }
        //       ]
        //     }
        //   ],
        //   toolbarConfig: {
        //     // prefix 前缀;suffix 后缀
        //     slot: ['prefix', 'suffix'],
        //     // add 新增按钮;remove 删除按钮;clearSelection 清空选择按钮
        //     btn: ['add', 'remove', 'clearSelection']
        //   }
        // }
      }
    },
    created() {
@@ -459,7 +459,7 @@
        this.model.instanceId = item.procInstId
        this.model.values = item.variables
        await this.loadDetail(item.dataId)
        await this.loadPrecisionDetail(item.dataId);
        // await this.loadPrecisionDetail(item.dataId);
      },
      recordDetail(record) {
@@ -549,15 +549,15 @@
            })
        }
      },
      loadPrecisionDetail(orderId) {
        if (orderId) {
          getAction(this.url.precisionCheckDetail, { orderId: orderId }).then(res => {
            if (res.success) {
              this.precisionDetail.dataSource = [...res.result]
            }
          })
        }
      },
      // loadPrecisionDetail(orderId) {
      //   if (orderId) {
      //     getAction(this.url.precisionCheckDetail, { orderId: orderId }).then(res => {
      //       if (res.success) {
      //         this.precisionDetail.dataSource = [...res.result]
      //       }
      //     })
      //   }
      // },
      loadMaintenanceOperatorList(equipmentId) {
        this.maintenanceOperatorOptions = []
        let params = { positionCode: 'PCR0001' }