houjie
2023-08-30 34dc1aa1e6a2a063088c48d976f876fa3cacaf4e
设备处理调整
已修改6个文件
130 ■■■■■ 文件已修改
src/views/eam/modules/equipmentScrap/EquipmentScrapForm.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/equipmentScrap/EquipmentScrapModal.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/equipmentSeal/EquipmentSealForm.vue 80 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/spare/modules/sparePart/SparePart2List.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksModal.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/spare/modules/sparePartInventory/SparePart2List.vue 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/equipmentScrap/EquipmentScrapForm.vue
@@ -4,6 +4,7 @@
    <!--   <a-tabs v-model="activeKey" @change="handleChangeTabs">-->
    <!--主表区域 -->
    <!--    <a-tab-pane tab="设备变动" :key="refKeys[0]" :forceRender="true" :class="'jeecg-tabs-top'" :animated="false">-->
    <j-form-container :disabled="formDisabled">
    <a-form-model ref="form" :model="model" :rules="validatorRules">
      <a-row>
        <a-col :xs="24" :sm="24">
@@ -29,7 +30,7 @@
      </a-row>
    </a-form-model>
    </j-form-container>
    <!--     </a-tab-pane>-->
<!--    <a-button-->
src/views/eam/modules/equipmentScrap/EquipmentScrapModal.vue
@@ -5,6 +5,7 @@
    :maskClosable="false"
    switchFullscreen
    @ok="handleOk"
    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
    :title="title"
    @cancel="handleCancel">
     <equipment-scrap-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"/>
src/views/eam/modules/equipmentSeal/EquipmentSealForm.vue
@@ -74,8 +74,8 @@
          :dataSource="equipmentSealDetailTable.dataSource"
          :maxHeight="300"
          :disabled="formDisabled"
          :alwaysEdit='true'
          :bordered='true'
          :alwaysEdit="true"
          :bordered="true"
          :rowNumber="true"
          :rowSelection="true"
          :toolbar="true"
@@ -92,27 +92,6 @@
            </a-button>
          </template>
          <!-- 设备图片插槽 -->
          <!-- <template v-slot:equipmentPhoto='props'>
            <Tooltip
              placement="top"
              title="预览图片"
            >
              <span
                v-if="!text"
                style="font-size: 12px;font-style: italic;"
              >无图片</span>
              <img
                v-else
                :preview="props.equipmentId"
                :src="getImgView(text)"
                height="25px"
                alt=""
                style="max-width:80px;font-size: 12px;font-style: italic;"
              />
            </Tooltip>
          </template> -->
          <!-- :preview="props.rowId"equipmentId -->
          <template v-slot:action="props">
            <a-popconfirm
              title="确定删除吗?"
@@ -125,19 +104,13 @@
      </a-tab-pane>
    </a-tabs>
    <equipment-select-modal ref="EquipmentSelectModal"></equipment-select-modal>
    <!-- <equipment-selection @selectionRows="selectionRows" :equipmentStatus="['2', '3']"
      ref="EquipmentSelection"></equipment-selection> -->
  </a-spin>
</template>
<script>
import { JEditableTableModelMixin } from '@/mixins/JEditableTableModelMixin'
import { randomUUID, randomNumber } from '@/utils/util'
import { validateDuplicateValue } from '@/utils/util'
import pick from 'lodash.pick'
import { getAction, postAction, requestPut } from '@api/manage'
// import EquipmentSelection from '@/components/tools/EquipmentSelection.vue'
import EquipmentSelectModal from './EquipmentSelectModal.vue'
import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
@@ -169,19 +142,15 @@
        xs: { span: 24 },
        sm: { span: 16 }
      },
      // manageList: [
      //   { label: '空', value: '' },
      //   { label: '保养标准一', value: '1001' },
      //   { label: '保养标准二', value: '1002' }
      // ],
      // 新增时子表默认添加几行空数据
      addDefaultRowNum: 0,
      model: {},
      validatorRules: {
        num: [
          { required: true, message: '请输入单据号!' },
          { validator: (rule, value, callback) => validateDuplicateValue('mom_eam_equipment_change', 'num', value, this.model.id, callback) }
        ],
        remark: [
          { required: false, message: '请输入备注!' }
        ]
@@ -208,7 +177,7 @@
            title: '设备封存明细id',
            key: 'id',
            type: JVXETypes.hidden,
            width: '100px',
            width: '100px'
          },
          // fixed: 'left'
          {
@@ -229,7 +198,7 @@
            key: 'equipmentNum',
            type: JVXETypes.normal,
            width: '150px',
            align: "center",
            align: 'center'
            // placeholder: '请输入${title}',
          },
          // fixed: 'left'
@@ -239,7 +208,7 @@
            type: JVXETypes.normal,
            disabled: true,
            width: '150px',
            align: "center",
            align: 'center',
            defaultValue: ''
          },
          {
@@ -248,7 +217,7 @@
            type: JVXETypes.normal,
            disabled: true,
            width: '150px',
            align: "center",
            align: 'center',
            defaultValue: ''
          },
          {
@@ -257,7 +226,7 @@
            type: JVXETypes.normal,
            disabled: true,
            width: '150px',
            align: "center",
            align: 'center',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
@@ -266,7 +235,7 @@
            key: 'assetNumber',
            type: JVXETypes.normal,
            width: '150px',
            align: "center",
            align: 'center',
            defaultValue: ''
          },
          {
@@ -274,7 +243,7 @@
            key: 'sealReason',
            type: JVXETypes.input,
            width: '200px',
            align: "center",
            align: 'center',
            placeholder: '请输入${title}',
            defaultValue: '',
            validateRules: [{
@@ -287,7 +256,7 @@
            key: 'sealDate',
            type: JVXETypes.datetime,
            width: '150px',
            align: "center",
            align: 'center',
            placeholder: '请选择${title}',
            defaultValue: '',
            validateRules: [{
@@ -301,7 +270,7 @@
            key: 'planUnsealDate',
            type: JVXETypes.date,
            width: '150px',
            align: "center",
            align: 'center',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
@@ -312,7 +281,7 @@
            disabled: true,
            placeholder: '请输入${title}',
            defaultValue: '',
            width: '150px',
            width: '150px'
          },
          {
            title: '特种设备',
@@ -320,7 +289,7 @@
            type: JVXETypes.normal,
            disabled: true,
            width: '150px',
            align: "center",
            align: 'center',
            defaultValue: ''
          },
@@ -330,7 +299,7 @@
            type: JVXETypes.normal,
            disabled: true,
            width: '150px',
            align: "center",
            align: 'center',
            defaultValue: ''
          },
          {
@@ -339,7 +308,7 @@
            type: JVXETypes.normal,
            disabled: true,
            width: '150px',
            align: "center",
            align: 'center',
            defaultValue: ''
          },
          {
@@ -348,7 +317,7 @@
            type: JVXETypes.normal,
            disabled: true,
            width: '200px',
            align: "center",
            align: 'center'
          },
          {
            title: '重要度',
@@ -356,14 +325,14 @@
            type: JVXETypes.normal,
            disabled: true,
            width: '150px',
            align: "center",
            align: 'center',
            defaultValue: ''
          },
          {
            title: '重要度',
            key: 'equipmentImportanceId',
            type: JVXETypes.hidden
          },
          }
          // {
          //   title: '设备图片',
          //   key: 'equipmentPhoto',
@@ -532,15 +501,8 @@
</script>
<style scoped>
/** tab panel 中有下拉框/日期 这类带下拉效果的,需要加此样式 */
::v-deep .jeecg-tabs-top {
/deep/ .jeecg-tabs-top {
  overflow: visible;
}
::v-deep .ant-form-explain {
  position: absolute;
  right: -50px;
  top: 12px;
}
</style>
src/views/spare/modules/sparePart/SparePart2List.vue
@@ -68,8 +68,17 @@
      <a-button
        type="primary"
        icon="download"
        @click="handleExportXls('???')"
        @click="handleExportXls('备件信息')"
      >导出</a-button>
      <a-upload
        name="file"
        :showUploadList="false"
        :multiple="false"
        :headers="tokenHeader"
        :action="importExcelUrl"
        @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      </a-upload>
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-button style="margin-left: 8px">
          批量操作
@@ -305,7 +314,7 @@
        delete: "/spare/sparePart/delete",
        deleteBatch: "/spare/sparePart/deleteBatch",
        exportXlsUrl: '/spare/sparePart/exportXls',
        // importExcelUrl: 'base/site/importExcel',
        importExcelUrl: '/spare/sparePart/importExcel',
      },
      //新增、编辑、删除、批量删除操作改变数据后刷新关联的组件的监听属性
      alterFlag: "",
@@ -333,6 +342,9 @@
        selectedRowKeys: this.selectedRowKeys,
      };
    },
    importExcelUrl(){
      return `${window._CONFIG['domianURL']}/${this.url.importUrl}`;
    }
  },
  methods: {
src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksModal.vue
@@ -31,21 +31,6 @@
              :labelCol='labelCol'
              :wrapperCol='wrapperCol'
            >
<!--              <j-dict-select-tag
                allow-clear
                :disabled='disableSubmit'
                :placeholder="disableSubmit?'':'请选择领用部门'"
                :triggerChange='true'
                dictCode="sys_depart,depart_name,id,del_flag!='1'"
                v-decorator="['departId', validatorRules.departId]"
              />-->
<!--              <a-select
                :placeholder="'请选择领用部门'"
                :options="this.departs"
                :disabled="disableSubmit"
                style="width: 100%"
                v-model='model.departId'
              />-->
              <a-tree-select
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
@@ -343,9 +328,6 @@
          model: data[i].model,
          mainUnitId: data[i].mainUnitId,
          mainUnitName: data[i].mainUnitName,
         /*  auxiliaryUnitId: data[i].auxiliaryUnitId,
          auxiliaryUnitName: data[i].auxiliaryUnitName, */
        /*   conversionRatio: data[i].conversionRatio, */
          constructorId: data[i].constructorId,
          constructorName: data[i].constructorName,
          supplierId: data[i].supplierId,
src/views/spare/modules/sparePartInventory/SparePart2List.vue
@@ -58,6 +58,15 @@
        @click="searchReset"
        icon="reload"
      >重置</a-button>
      <a-upload
        name="file"
        :showUploadList="false"
        :multiple="false"
        :headers="tokenHeader"
        :action="importExcelUrl"
        @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      </a-upload>
    </div>
    <a-table
@@ -231,6 +240,7 @@
      ],
      url: {
        list: "/spare/sparePart/sparePartInventoryList",
        importExcelUrl:'/spare/SparesPartInventory/importExcel'
      },
      //新增、编辑、删除、批量删除操作改变数据后刷新关联的组件的监听属性
      alterFlag: "",
@@ -278,7 +288,7 @@
        }else if(record.totalMainQuantity > record.inventoryUpperLimit){
          return 'yellow'
        }
      },
    searchReset() {
      this.queryParam = {};