签审

qushaowei

2023-11-21 e9ad171baa8ae05e47fb3698d2f2bc6fd9fc3124

签审

 src/views/eam/Daily3MaintenanceOrderList.vue

@@ -432,12 +432,12 @@
          dataIndex: 'maintenanceCycleName',
          width: 100,
        },
        {
          title: '派工方式',
          align: "center",
          dataIndex: 'assignModeName',
          width: 100,
        },
        // {
        //   title: '派工方式',
        //   align: "center",
        //   dataIndex: 'assignModeName',
        //   width: 100,
        // },
        {
          title: '统一编码',
          align: "center",
@@ -459,7 +459,7 @@
          dataIndex: 'checkStatusName',
        },
        {
          title: '未通过原因',
          title: '验收未通过原因',
          align: "center",
          dataIndex: 'notPassReason',
          scopedSlots: { customRender: 'notPassReason' }

 src/views/eam/DailyInspectionOrderList.vue

@@ -332,7 +332,14 @@
        {
          title: '状态',
          align: "center",
          width: 100,
          dataIndex: 'statusName'
        },
        {
          title: '点检周期',
          align: "center",
          width: 100,
          dataIndex: 'inspectionCycleName'
        },
        // {
        //   title: '点检日期',
@@ -397,11 +404,7 @@
        //   align: "center",
        //   dataIndex: 'inspectionStandardNum'
        // },
        {
          title: '点检周期',
          align: "center",
          dataIndex: 'inspectionCycleName'
        },

        // {
        //   title: '派工方式',
        //   align: "center",

 src/views/eam/DailyMaintenanceOrderList.vue

@@ -67,14 +67,14 @@
        v-has="'dailyMaintenanceOrder:add'"
      >新增</a-button>
      <a-button
        v-if="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
        v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
        @click="handlePrintInfo(selectionRows[0])"
        type="primary"
        style="margin-left: 8px"
      >移交单打印
      </a-button>
      <!-- <a-button
        v-if="selectedRowKeys.length > 0"
        v-show="selectedRowKeys.length > 0"
        type="primary"
        @click="batchAssign"
        style="margin-left: 8px"
@@ -97,7 +97,7 @@
          icon="import"
        >导入</a-button>
      </a-upload> -->
      <!-- <a-dropdown v-if="selectedRowKeys.length > 0">
      <!-- <a-dropdown v-show="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item
            key="1"
@@ -146,10 +146,10 @@
            @confirm="() => handleOrderIssue(record)"
            v-has="'dailyMaintenanceOrder:issue'"
          >
            <a v-if="record.status == '1'">接收</a>
            <a v-show="record.status == '1'">接收</a>
          </a-popconfirm>
          <a-divider
            v-if="record.status == '1'"
            v-show="record.status == '1'"
            type="vertical"
          />
          <a-popconfirm
@@ -157,32 +157,14 @@
            @confirm="() => handleOrderReset(record)"
            v-has="'dailyMaintenanceOrder:issue'"
          >
            <a v-if="record.status == '2'">撤回</a>
            <a v-show="record.status == '2'">撤回</a>
          </a-popconfirm>
          <a-divider
            v-if="record.status == '2'"
            v-show="record.status == '2'"
            type="vertical"
          />
          <!-- <a-popconfirm
            title="确定恢复工单吗?"
            @confirm="() => handleOrderRecover(record)"
            v-has="'dailyMaintenanceOrder:recover'"
          >
            <a v-if="record.status == '7'">恢复</a>
          </a-popconfirm>
          <a-divider
            v-if="record.status == '7'"
            type="vertical"
          /> -->
          <!-- <a-popconfirm
            title="确定作废工单吗?"
            @confirm="() => handleOrderCancel(record)"
            v-has="'dailyMaintenanceOrder:recover'"
          >
            <a v-if="record.status == '2'">作废</a>
          </a-popconfirm> -->
          <a-divider
            v-if="record.status == '2'"
            v-show="record.status == '2'"
            type="vertical"
          />
          <a-popconfirm
@@ -190,54 +172,66 @@
            @confirm="() => handleOrderGet(record)"
            v-has="'dailyMaintenanceOrder:get'"
          >
            <a v-if="record.status == '2' && record.assignMode == '1'">领取</a>
            <a v-show="record.status == '2' && record.assignMode == '1'">领取</a>
          </a-popconfirm>
          <a
            v-if="record.status == '2' && record.assignMode == '2'  "
          <!-- <a
            v-show="record.status == '2' && record.assignMode == '2'  "
            @click="handleAssignOrder(record)"
            v-has="'dailyMaintenanceOrder:assign'"
          >派工</a>
          <!-- <a
            v-if="record.status == '3'&& record.assignMode == '2'  && record.maintenanceUserName != null  "
            @click="handleAssignOrder(record)"
            v-has="'dailyMaintenanceOrder:assign'"
          >改派</a> -->
          <!-- <a
            v-if="record.status == '3'"
            @click="handleAssignOrder(record)"
          >改派</a> -->

          <a-divider
            v-if="record.status == '2'"
            v-show="record.status == '2'"
            type="vertical"
          />
          /> -->
          <a-divider
            v-if="record.status === '3'&& record.assignMode == '2'  && record.maintenanceUserName != null  "
            v-show="record.status === '3'&& record.assignMode == '2'  && record.maintenanceUserName != null  "
            type="vertical"
          />
          <a
            v-if="record.status === '3' || record.status === '4'  "
            v-show="record.status === '3' || record.status === '4'  "
            @click="handleOrderExe(record)"
            v-has="'dailyMaintenanceOrder:exe'"
          >执行</a>
          <a-divider
            v-if="record.status === '3' || record.status === '4' "
            v-show="record.status === '3' || record.status === '4' "
            type="vertical"
          />
          <a
            v-if="record.status === '1'"
            v-show="record.status === '1'"
            @click="handleEdit(record)"
            v-has="'dailyMaintenanceOrder:edit'"
          >编辑</a>
          <a-divider
            v-if="record.status === '1'"
            v-show="record.status === '1'"
            type="vertical"
          />
          <a
            v-if="record.status === '5' || record.status === '8'"
            v-show="(record.status === '5' || record.status === '8') && (record.confirmStatus === '0' || record.confirmStatus === '2')"
            @click="handleFinish(record)"
            v-has="'dailyMaintenanceOrder:operateUser'"
          >完工移交单</a>
          <a
            v-show="(record.status === '5' || record.status === '8') && (record.confirmStatus === '1' || record.confirmStatus === '4')"
            @click="handleFinish(record)"
            v-has="'dailyMaintenanceOrder:repairUser'"
          >完工移交单</a>
          <a
            v-show="(record.status === '5' || record.status === '8') && (record.confirmStatus === '3' || record.confirmStatus === '6')"
            @click="handleFinish(record)"
            v-has="'dailyMaintenanceOrder:repairDirectorUser'"
          >完工移交单</a>
          <a
            v-show="(record.status === '5' || record.status === '8') && (record.confirmStatus === '5')"
            @click="handleFinish(record)"
            v-has="'dailyMaintenanceOrder:equipmentInspectorUser'"
          >完工移交单</a>
          <a
            v-show="(record.status === '5' || record.status === '8') && (record.confirmStatus === '7')"
            @click="handleFinish(record)"
          >完工移交单</a>
          <a-divider
            v-if="record.status === '5' || record.status === '8'"
            v-show="record.status === '5' || record.status === '8'"
            type="vertical"
          />
          <a-dropdown>
@@ -252,7 +246,7 @@
                  @confirm="() => handleDelete(record.id)"
                  v-has="'dailyMaintenanceOrder:delete'"
                >
                  <a v-if="record.status === '1'">删除</a>
                  <a v-show="record.status === '1'">删除</a>
                </a-popconfirm>
              </a-menu-item>
            </a-menu>
@@ -264,7 +258,7 @@
          slot-scope="text, record"
        >
          <a
            v-if="record.status === '3' || record.status === '4' ||record.status === '5'  ||record.status === '7' "
            v-if="record.status === '3' || record.status === '4' ||record.status === '5'  ||record.status === '7' ||record.status === '8'"
            class="lot"
            @click="handleOrderExe(record)"
          >{{record.num}}</a>
@@ -351,11 +345,16 @@
        //   align: "center",
        //   dataIndex: 'maintenanceCycleName',
        // },
        // {
        //   title: '派工方式',
        //   align: "center",
        //   dataIndex: 'assignModeName',
        //   width: 100,
        // },
        {
          title: '派工方式',
          title: '移交单确认状态',
          align: "center",
          dataIndex: 'assignModeName',
          width: 100,
          dataIndex: 'confirmStatusName'
        },
        {
          title: '统一编码',

 src/views/eam/EquipmentCalibrationOrder.vue

@@ -64,6 +64,7 @@
        @click='handleAdd'
        type='primary'
        icon='plus'
        v-has="'calibrationOrder:add'"
      >新增
      </a-button>
    </div>
@@ -74,8 +75,7 @@
        class='ant-alert ant-alert-info'
        style='margin-bottom: 16px;'
      >
        <i class='anticon anticon-info-circle ant-alert-icon'></i> å·²é€‰æ‹© <a
        style='font-weight: 600'>{{ selectedRowKeys.length }}</a>项
        <i class='anticon anticon-info-circle ant-alert-icon'></i> å·²é€‰æ‹© <a style='font-weight: 600'>{{ selectedRowKeys.length }}</a>项
        <a
          style='margin-left: 24px'
          @click='onClearSelected'
@@ -85,7 +85,7 @@
      <a-table
        ref='table'
        size='middle'
        :scroll="{ x: 'calc(700px + 50%)', y: 900 }"
        :scroll="{ x: 'calc(1000px + 50%)', y: 900 }"
        bordered
        rowKey='id'
        :columns='columns'
@@ -102,15 +102,27 @@
          slot='action'
          slot-scope='text, record'
        >
           <a
             v-if="record.status === '1'"
             @click='handleAddOrderReport(record)'
           >结果录入</a>
           <a-divider
             v-if="record.status === '1'"
             type='vertical'
           />
               <a @click='handleDetail(record)'>详情</a>
          <a
            v-show="record.status === '1' || record.status === '3'"
            @click='handleAddOrderReport(record)'
            v-has="'calibrationOrder:write'"
          >结果录入</a>

          <a-divider
            v-show="record.status === '1' || record.status === '3'"
            type='vertical'
          />
          <a
            v-show="record.status === '2'"
            @click='handleTechnologyStatus(record)'
            v-has="'calibrationOrder:audit'"
          >结果审核</a>

          <a-divider
            v-show="record.status === '2'"
            type='vertical'
          />
          <a @click='handleDetail(record)'>详情</a>
          <!--          <a-popconfirm-->
          <!--            title='确定下发工单吗?'-->
          <!--            @confirm='() => handleOrderIssue(record)'-->
@@ -194,7 +206,7 @@
          <!--          </a-dropdown>-->
        </span>

        <span
        <!-- <span
          slot='num'
          slot-scope='text, record'
        >
@@ -205,11 +217,9 @@
          >{{ record.num }}</a>

          <span v-else>{{ record.num }}</span>
        </span>
        </span> -->
      </a-table>
      <a-tabs
        defaultActiveKey='2'
      >
      <a-tabs defaultActiveKey='2'>
        <!--        <a-tab-pane  -->
        <!--          key="1"-->
        <!--          tab="检验项"-->
@@ -221,8 +231,10 @@
          key='2'
          tab='检定报告'
        >
          <equipment-calibration-order-report-list ref='EquipmentCalibrationOrderReportList'
                                                   :calibrationOrderId='mainId'></equipment-calibration-order-report-list>
          <equipment-calibration-order-report-list
            ref='EquipmentCalibrationOrderReportList'
            :calibrationOrderId='mainId'
          ></equipment-calibration-order-report-list>
        </a-tab-pane>

      </a-tabs>
@@ -237,12 +249,20 @@
      ref='EquipmentCalibrationOrderExeDrawer'
      @ok='modalFormOk'
    ></equipment-calibration-order-exe-drawer>
    <final-modal ref='finalModal' @ok='modalFormOk'></final-modal>
    <final-modal
      ref='finalModal'
      @ok='modalFormOk'
    ></final-modal>

    <equipment-calibration-order-report-modal
      ref='equipmentCalibrationOrderReportModal'
      @ok='modalFormOk'
    ></equipment-calibration-order-report-modal>

    <equipment-technology-status-modal
      ref="EquipmentTechnologyStatusModal"
      @ok="modalFormOk"
    ></equipment-technology-status-modal>
  </a-card>
</template>

@@ -259,6 +279,7 @@
import FinalModal from './modules/equipmentCalibrationOrder/FinalModal.vue'
import EquipmentCalibrationOrderReportModal
  from './modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal'
import EquipmentTechnologyStatusModal from './modules/equipmentCalibrationOrder/EquipmentTechnologyStatusModal'

export default {
  name: 'EquipmentCalibrationOrder',
@@ -269,7 +290,8 @@
    EquipmentPrecisionParametersList,
    EquipmentCalibrationOrderReportList,
    EquipmentCalibrationOrderReportModal,
    FinalModal
    FinalModal,
    EquipmentTechnologyStatusModal
  },
  data() {
    return {
@@ -295,7 +317,7 @@
          key: 'rowIndex',
          width: 60,
          align: 'center',
          customRender: function(t, r, index) {
          customRender: function (t, r, index) {
            return parseInt(index) + 1
          }
        },
@@ -307,10 +329,20 @@
          // scopedSlots: { customRender: 'num' }
        },
        {
          title: '检定方式',
          title: '状态',
          align: 'center',
          dataIndex: 'calibrationType_dictText'
          dataIndex: 'status_dictText'
        },
        {
          title: '判定结果',
          align: 'center',
          dataIndex: 'calibrationResult_dictText'
        },
        // {
        //   title: '检定方式',
        //   align: 'center',
        //   dataIndex: 'calibrationType_dictText'
        // },
        {
          title: '统一编码',
          align: 'center',
@@ -331,21 +363,12 @@
          align: 'center',
          dataIndex: 'equipmentSpecification'
        },
        {
          title: '判定依据',
          align: 'center',
          dataIndex: 'managementMode_dictText'
        },
        {
          title: '状态',
          align: 'center',
          dataIndex: 'status_dictText'
        },
        {
          title: '判定结果',
          align: 'center',
          dataIndex: 'calibrationResult_dictText'
        },
        // {
        //   title: '判定依据',
        //   align: 'center',
        //   dataIndex: 'managementMode_dictText'
        // },

        // {
        //   title: '创建人',
        //   align: 'center',
@@ -366,6 +389,11 @@
          align: 'center',
          dataIndex: 'calibrationTime'
        },
        {
          title: '审核意见',
          align: 'center',
          dataIndex: 'remark'
        },
        // {
        //   title: '下发时间',
        //   align: 'center',
@@ -375,8 +403,8 @@
          title: '操作',
          dataIndex: 'action',
          align: 'center',
          width: 200,
          fixed: 'right',
          width: 120,
          scopedSlots: { customRender: 'action' }
        }
      ],
@@ -390,7 +418,7 @@
  },

  computed: {
    importExcelUrl: function() {
    importExcelUrl: function () {
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
    }
  },
@@ -405,6 +433,12 @@
      }
      this.selectedRowKeys = selectedRowKeys
      this.selectionRows = selectionRows
    },

    handleTechnologyStatus(record) {
      this.$refs.EquipmentTechnologyStatusModal.edit(record);
      this.$refs.EquipmentTechnologyStatusModal.title = "审核";
      this.$refs.EquipmentTechnologyStatusModal.disableSubmit = false;
    },

    handleOrderExe(record) {
@@ -461,7 +495,7 @@
      }
    },
    // ç›´æŽ¥ä¸Šä¼ é‰´å®šæŠ¥å‘Š
    handleAddOrderReport: function(record) {
    handleAddOrderReport: function (record) {
      this.$refs.equipmentCalibrationOrderReportModal.add(record.id)
      this.$refs.equipmentCalibrationOrderReportModal.title = '上传检定报告'
      this.$refs.equipmentCalibrationOrderReportModal.disableSubmit = false

 src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue

@@ -390,8 +390,8 @@
          align: 'center',
          dataIndex: 'inspectionProjectResult',
          scopedSlots: { customRender: 'inspectionProjectResult' },
          className: 'red',
        },
        // className: 'red',
        // {
        //   title: '判定',
        //   align: 'center',
@@ -409,8 +409,8 @@
          align: 'center',
          dataIndex: 'abnormalDesc',
          scopedSlots: { customRender: 'abnormalDesc' },
          className: 'red',
        },
        // className: 'red',
        // {
        //   title: '异常拍照',
        //   align: 'center',
@@ -422,8 +422,8 @@
          align: 'center',
          dataIndex: 'treatmentMeasure',
          scopedSlots: { customRender: 'treatmentMeasure' },
          className: 'red',
        },
        // className: 'red',
      ],
      url: {
        list: "/eam/inspectionOrderDetail/list",

 src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue

@@ -152,12 +152,39 @@
        å…³é—­
      </a-button>

      <a-button
      <!-- <a-button
        @click="handleOk()"
        type="primary"
        :loading="confirmLoading"
        :disabled="disableSubmit || confirmLoading"
      >确定</a-button>
      >确定</a-button> -->
      <a-popconfirm
        @confirm="() => handleReject()"
        title="确认将当前二保完工移交单驳回？"
        :disabled="this.model.confirmStatus == '0' || this.model.confirmStatus == '2'|| this.model.confirmStatus == '7'"
      >
        <a-button
          :loading='confirmLoading'
          :style="{marginRight: '8px'}"
          :disabled="this.model.confirmStatus == '0' || this.model.confirmStatus == '2'|| this.model.confirmStatus == '7'"
        >
          é©³å›ž
        </a-button>
      </a-popconfirm>
      <a-popconfirm
        @confirm="() => handleOk()"
        title="确认将当前二保完工移交单审核通过？"
        :disabled="this.model.confirmStatus == '7'"
      >
        <a-button
          type='primary'
          :loading='confirmLoading'
          :style="{marginRight: '8px'}"
          :disabled="this.model.confirmStatus == '7'"
        >
          é€šè¿‡
        </a-button>
      </a-popconfirm>
    </template>

  </a-modal>
@@ -294,12 +321,24 @@
      this.close();
    },

    handleOk() {

    handleReject() {
      const that = this;
      this.form.validateFields((err, values) => {
        if (!err) {
          that.confirmLoading = true;
          let formData = Object.assign(this.model, values);
          if (this.model.confirmStatus == '1') {
            formData.confirmStatus = '2'
          } else if (this.model.confirmStatus == '3') {
            formData.confirmStatus = '4'
          } else if (this.model.confirmStatus == '5') {
            formData.confirmStatus = '6'
          } else if (this.model.confirmStatus == '6') {
            formData.confirmStatus = '4'
          } else if (this.model.confirmStatus == '4') {
            formData.confirmStatus = '2'
          }
          requestPut(this.url.edit, formData, { id: this.model.id }).then((res) => {
            if (res.success) {
              that.$message.success(res.message);
@@ -315,6 +354,65 @@
      })
    },


    handleOk() {
      const that = this;
      that.form.validateFields((err, values) => {
        if (!err) {
          this.confirmLoading = true;
          let formData = Object.assign(this.model, values);
          if (this.model.confirmStatus == '0') {
            formData.confirmStatus = '1'
          } else if (this.model.confirmStatus == '2') {
            formData.confirmStatus = '1'
          } else if (this.model.confirmStatus == '1') {
            formData.confirmStatus = '3'
          } else if (this.model.confirmStatus == '4') {
            formData.confirmStatus = '3'
          } else if (this.model.confirmStatus == '3') {
            formData.confirmStatus = '5'
          } else if (this.model.confirmStatus == '6') {
            formData.confirmStatus = '5'
          } else if (this.model.confirmStatus == '5') {
            formData.confirmStatus = '7'
          }
          requestPut(this.url.edit, formData, { id: this.model.id }).then((res) => {
            if (res.success) {
              that.$message.success(res.message);
              that.$emit('ok');
            } else {
              that.$message.warning(res.message);
            }
          }).finally(() => {
            that.confirmLoading = false;
            that.close();
          })
        }
      })
    },


    // handleOk() {
    //   const that = this;
    //   this.form.validateFields((err, values) => {
    //     if (!err) {
    //       that.confirmLoading = true;
    //       let formData = Object.assign(this.model, values);
    //       requestPut(this.url.edit, formData, { id: this.model.id }).then((res) => {
    //         if (res.success) {
    //           that.$message.success(res.message);
    //           that.$emit('ok');
    //         } else {
    //           that.$message.warning(res.message);
    //         }
    //       }).finally(() => {
    //         that.confirmLoading = false;
    //         that.close();
    //       })
    //     }
    //   })
    // },

    handleDelete(text, record, index) {
      this.dataSource.splice(index, 1);
    },

 src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderModal.vue

@@ -1,7 +1,7 @@
<template>
  <a-modal
    :title='title'
    :width='1250'
    :width='650'
    :visible='visible'
    :maskClosable='false'
    @ok='handleOk'
@@ -12,7 +12,7 @@
    <a-spin :spinning='confirmLoading'>
      <a-form :form='form'>
        <a-row :gutter='24'>
          <a-col :span='12'>
          <a-col :span='24'>
            <a-form-item
              label='工单号'
              :labelCol='labelCol'
@@ -26,25 +26,7 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span='12'>
            <a-form-item
              label='检定方式'
              :labelCol='labelCol'
              :wrapperCol='wrapperCol'
            >
              <j-dict-select-tag
                allow-clear
                :disabled='disableSubmit'
                :placeholder="disableSubmit?'':'请选择检定方式'"
                :triggerChange='true'
                dictCode='calibration_type'
                v-decorator="['calibrationType', validatorRules.calibrationType]"
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter='24'>
          <a-col :span='12'>
          <a-col :span='24'>
            <a-form-item
              label='设备'
              :labelCol='labelCol'
@@ -60,8 +42,24 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span='24'>
            <a-form-item
              label='检定方式'
              :labelCol='labelCol'
              :wrapperCol='wrapperCol'
            >
              <j-dict-select-tag
                allow-clear
                :disabled='disableSubmit'
                :placeholder="disableSubmit?'':'请选择检定方式'"
                :triggerChange='true'
                dictCode='calibration_type'
                v-decorator="['calibrationType', validatorRules.calibrationType]"
              />
            </a-form-item>
          </a-col>

          <a-col :span='12'>
          <a-col :span='24'>
            <a-form-item
              label='判断依据'
              :labelCol='labelCol'
@@ -83,7 +81,7 @@
          hidden
          :gutter='24'
        >
          <a-col :span='12'>
          <a-col :span='24'>
            <a-form-item
              label='设备Id'
              :labelCol='labelCol'
@@ -99,7 +97,7 @@
          </a-col>
        </a-row>
        <a-row :gutter='24'>
          <a-col :span='24'>
          <!-- <a-col :span='24'>
            <a-form-item
              :labelCol='{span:3}'
              :wrapperCol='{span:21}'
@@ -112,7 +110,7 @@
                v-decorator="['remark', validatorRules.remark]"
              />
            </a-form-item>
          </a-col>
          </a-col> -->
          <a-col :span='24'>
            <a-form-item
              :labelCol='{span:3}'
@@ -131,16 +129,17 @@
        </a-row>
      </a-form>
    </a-spin>
    <a-table v-show='false'
             ref='table'
             bordered
             size='middle'
             rowKey='id'
             :columns='columns'
             :pagination='ipagination'
             :loading='loading'
             :dataSource='dataSource'
             @change='handleTableChange'
    <a-table
      v-show='false'
      ref='table'
      bordered
      size='middle'
      rowKey='id'
      :columns='columns'
      :pagination='ipagination'
      :loading='loading'
      :dataSource='dataSource'
      @change='handleTableChange'
    >

    </a-table>
@@ -221,7 +220,7 @@
      disableSubmit: false,
      codeDisable: true,
      dataSource: [],
      num:"",
      num: "",
      model: { 'management_mode': 'report', 'calibration_type': 'self' },
      labelCol: {
        xs: { span: 24 },
@@ -281,11 +280,12 @@
      this.precisionParametersTemplateId = '-1'
      getAction(this.url.getNum, { type: 'CalibrationOrder', length: '4' }).then((res) => {
        if (res.success) {
          this.num = res.message
          // this.num = res.message
          this.form.setFieldsValue({ "num": res.message })
        }
      })
      // æ–°å¢žæ—¶å€™è®¾ç½®é‰´å®šç±»åž‹ä¸ºè‡ªæ£€ã€ åˆ¤å®šä¾æ®ä¸ºæŠ¥å‘Š
      this.edit({ "num":this.num,'calibrationType': 'self', 'managementMode': 'report' })
      this.edit({ "num": this.num, 'calibrationType': 'self', 'managementMode': 'report' })
    },
    edit(record) {
      let that = this

 src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList.vue

@@ -101,7 +101,7 @@
  data() {
    return {
      description: '检定报告',
      disableMixinCreated:true,
      disableMixinCreated: true,
      columns: [
        {
          title: '#',
@@ -135,11 +135,11 @@
          dataIndex: 'size',
          scopedSlots: { customRender: 'size' },
        },
        {
          title: '判定结果',
          align: 'center',
          dataIndex: 'judgmentResultName'
        },
        // {
        //   title: '判定结果',
        //   align: 'center',
        //   dataIndex: 'judgmentResultName'
        // },
        {
          title: '操作',
          align: 'center',
@@ -156,27 +156,27 @@
      },
    }
  },
  props:{
    calibrationOrderId:{
        type:String,
        default:'',
        required:false
  props: {
    calibrationOrderId: {
      type: String,
      default: '',
      required: false
    }
  },
    watch:{
      calibrationOrderId:{
        immediate: true,
        handler(val) {
          if(!this.calibrationOrderId){
            this.clearList()
          }else{
            this.queryParam['calibrationOrderId'] = val;
            this.queryParam['delFlag'] = 0;
            this.loadData(1);
          }
  watch: {
    calibrationOrderId: {
      immediate: true,
      handler(val) {
        if (!this.calibrationOrderId) {
          // this.clearList()
        } else {
          this.queryParam['calibrationOrderId'] = val;
          this.queryParam['delFlag'] = 0;
          this.loadData(1);
        }
      }
    },
    }
  },
  // mounted() {
  //   this.$bus.$on('equipmentSelectionRows', (data) => {
  //     this.equipmentSelectionRows = data

 src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue

@@ -102,7 +102,7 @@
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
        <!-- <a-row :gutter="24">
          <a-col :span="24">
            <a-form-item
              :labelCol="{span:4}"
@@ -120,7 +120,7 @@

            </a-form-item>
          </a-col>
        </a-row>
        </a-row> -->

        <a-row :gutter="24">
          <a-col :span="24">

 src/views/eam/modules/equipmentCalibrationOrder/EquipmentTechnologyStatusModal.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,285 @@
<template>
  <a-modal
    :title='title'
    :width="650"
    :visible='visible'
    :maskClosable='false'
    cancelText='关闭'
    @cancel='handleCancel'
    :confirmLoading='confirmLoading'
  >
    <!-- @ok='handleOk' -->
    <a-spin :spinning='confirmLoading'>
      <a-form :form="form">
        <a-row :gutter="24">
          <a-col :span="24">
            <a-form-item
              label="统一编号"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <a-input
                allow-clear
                :disabled="true"
                :placeholder="disableSubmit?'':'请输入统一编号'"
                v-decorator="['equipmentNum', validatorRules.equipmentNum ]"
              />
            </a-form-item>
          </a-col>
          <a-col :span="24">
            <a-form-item
              label="设备名称"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <a-input
                allow-clear
                :disabled="true"
                :placeholder="disableSubmit?'':'请输入设备名称'"
                v-decorator="['equipmentName', validatorRules.equipmentName ]"
              />
            </a-form-item>
          </a-col>
          <a-col :span="24">
            <a-form-item
              label="型号"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <a-input
                allow-clear
                :disabled="true"
                :placeholder="disableSubmit?'':'请输入型号'"
                v-decorator="['equipmentModel', validatorRules.equipmentModel ]"
              />
            </a-form-item>
          </a-col>
          <a-col :span="24">
            <a-form-item
              label="规格"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <a-input
                allow-clear
                :disabled="true"
                :placeholder="disableSubmit?'':'请输入规格'"
                v-decorator="['equipmentSpecification', validatorRules.equipmentSpecification ]"
              />
            </a-form-item>
          </a-col>
          <a-col :span="24">
            <a-form-model-item
              label="技术状态"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <!-- prop="technologyStatus" -->
              <j-dict-select-tag
                allow-clear
                placeholder="请选择技术状态"
                :triggerChange="true"
                dictCode="technology_status"
                v-decorator="['judgmentResult', validatorRules.judgmentResult ]"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span='24'>
            <a-form-item
              label="审核意见"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <a-textarea
                rows='3'
                placeholder='请输入审核意见'
                v-decorator="['remark', validatorRules.remark ]"
              ></a-textarea>
            </a-form-item>
          </a-col>
        </a-row>
      </a-form>
    </a-spin>
    <template slot='footer'>
      <a-popconfirm
        @confirm="() => handleReject()"
        title="确认将当前结果驳回？"
      >
        <a-button
          :loading='confirmLoading'
          :style="{marginRight: '8px'}"
        >
          é©³å›ž
        </a-button>
      </a-popconfirm>
      <a-popconfirm
        @confirm="() => handleOk()"
        title="确认将当前结果审核通过？"
      >
        <a-button
          type='primary'
          :loading='confirmLoading'
          :style="{marginRight: '8px'}"
        >
          é€šè¿‡
        </a-button>
      </a-popconfirm>
    </template>
  </a-modal>

</template>

<script>
import { httpAction, requestPut, postAction } from '@/api/manage'
import Tooltip from 'ant-design-vue/es/tooltip'
import pick from 'lodash.pick'


export default {
  name: 'EquipmentTechnologyStatusModal',
  components: {
    Tooltip
  },
  data() {
    return {
      title: '操作',
      visible: false,
      disableSubmit: false,
      model: {},
      labelCol: {
        xs: { span: 24 },
        sm: { span: 5 }
      },
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 16 }
      },
      confirmLoading: false,
      form: this.$form.createForm(this),
      validatorRules: {
        remark: {
          rules: [
            { required: true, message: '请输入审核意见!' },
          ]
        },
        judgmentResult: {
          rules: [
            { required: true, message: '请选择技术状态!' },
          ]
        },
      },
      url: {
        auditApproval: "/eam/calibrationOrderReport/editEquipmentTechnologyStatus",
      },
    }
  },


  methods: {
    close() {
      this.$emit('close')
      this.visible = false
    },

    handleCancel() {
      this.close()
    },

    edit(record) {
      this.form.resetFields();
      this.model = Object.assign({}, record);
      this.visible = true;
      this.disableSubmit = false;
      this.$nextTick(() => {
        this.form.setFieldsValue(pick(this.model, 'equipmentNum', 'equipmentName', 'equipmentModel', 'equipmentSpecification', 'judgmentResult', 'remark'))
      });
      if (record.id) {
        this.codeDisable = true;
      } else {
        this.codeDisable = false;
      }
    },



    handleReject() {
      const that = this;
      this.form.validateFields((err, values) => {
        if (!err) {
          that.confirmLoading = true;
          let formData = Object.assign(this.model, values);
          formData.status = '3'
          requestPut(this.url.auditApproval, formData, { id: this.model.id }).then((res) => {
            if (res.success) {
              that.$message.success(res.message);
              that.$emit('ok');
            } else {
              that.$message.warning(res.message);
            }
          }).finally(() => {
            that.confirmLoading = false;
            that.close();
          })
        }
      })
    },


    handleOk() {
      const that = this;
      that.form.validateFields((err, values) => {
        if (!err) {
          this.confirmLoading = true;
          let formData = Object.assign(this.model, values);
          formData.status = '4'
          requestPut(this.url.auditApproval, formData, { id: this.model.id }).then((res) => {
            if (res.success) {
              that.$message.success(res.message);
              that.$emit('ok');
            } else {
              that.$message.warning(res.message);
            }
          }).finally(() => {
            that.confirmLoading = false;
            that.close();
          })
        }
      })
    },
  }

}
</script>

<style lang='less' scoped>
/deep/ .frozenRowClass {
  color: #c9c9c9;
}

.fontweight {
  font-weight: bold;
}

.ant-btn {
  padding: 0 10px;
  margin-left: 3px;
}

.ant-form-item-control {
  line-height: 0px;
}

/** ä¸»è¡¨å•è¡Œé—´è· */
.ant-form .ant-form-item {
  margin-bottom: 10px;
}

/** Tab页面行间距 */
.ant-tabs-content .ant-form-item {
  margin-bottom: 0px;
}

/deep/ .ant-modal-title {
  text-align: center;
}
</style>

 src/views/system/RoleUserList.vue

@@ -152,8 +152,8 @@
          </a-table>
        </div>
        <!-- å³ä¾§çš„角色权限配置 -->
        <!-- <user-role-modal ref="modalUserRole"></user-role-modal> -->
        <user-role-modal-new ref="modalUserRole"></user-role-modal-new>
        <user-role-modal ref="modalUserRole"></user-role-modal>
        <!-- <user-role-modal-new ref="modalUserRole"></user-role-modal-new> -->
        <role-modal
          ref="modalForm"
          @ok="modalFormOk"