备品备件:调整/  基础数据修改(取消  保存并继续添加 , 左树右表结构  布局调整,异常处理)
已修改17个文件
91 ■■■■■ 文件已修改
src/views/eam/EquipmentCategoryList.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/FaultTypeList.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/PrecisionParametersList.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/PrecisionParametersTemplateList.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/faultType/FaultType2List.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/faultType/FaultTypeModel.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/precisionParameter/PrecisionParametersModel.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/precisionParameter/PrecisionParametersRight.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/processParameters/ProcessParametersModel.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/transferMethod/TransferMethodModel.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/transferMethod/TransferMethodRight.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/unitCategory/MomBaseUnitCategoryForm.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/spare/modules/sparePartScrapRequirement/SpareSelectList.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/EquipmentCategoryList.vue
@@ -4,16 +4,16 @@
    :gutter="16"
  >
    <a-col
      :md="6"
      :md="4"
      :sm="24"
    >
      <equipment-category-left />
      <equipment-category-left/>
    </a-col>
    <a-col
      :md="24-6"
      :md="24-4"
      :sm="24"
    >
      <equipment-category-right />
      <equipment-category-right/>
    </a-col>
  </a-row>
</template>
src/views/eam/FaultTypeList.vue
@@ -4,16 +4,16 @@
    :gutter="16"
  >
    <a-col
      :md="6"
      :md="4"
      :sm="24"
    >
      <fault-type-left />
    </a-col>
    <a-col
      :md="24-6"
      :md="24-4"
      :sm="24"
    >
      <fault-type-right />
      <fault-type-right/>
    </a-col>
  </a-row>
</template>
src/views/eam/PrecisionParametersList.vue
@@ -4,13 +4,13 @@
    :gutter="16"
  >
    <a-col
      :md="6"
      :md="4"
      :sm="24"
    >
      <precision-parameters-category-left @clickTreeNode="getSelectNode" />
    </a-col>
    <a-col
      :md="24-6"
      :md="24-4"
      :sm="24"
    >
      <precision-parameters-right :recordSelect="currentNodeSelect" />
src/views/eam/PrecisionParametersTemplateList.vue
@@ -76,7 +76,13 @@
    <a-tabs defaultActiveKey="1">
      <a-tab-pane tab="精度参数明细" key="1" >
        <PrecisionParametersTemplateDetail :precisionParametersTemplateId="precisionParametersTemplateId" />
        <div
          class='table-operator'
          style='margin:-20px'
        >
          <PrecisionParametersTemplateDetail :precisionParametersTemplateId="precisionParametersTemplateId" />
        </div>
      </a-tab-pane>
    </a-tabs>
src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue
@@ -221,7 +221,7 @@
          },
          width: 50,
        },
        {
      /*   {
          title: '上级设备分类编码',
          align: "center",
          dataIndex: 'parentNum',
@@ -234,7 +234,7 @@
          title: '上级设备分类名称',
          align: "center",
          dataIndex: 'parentName',
        },
        }, */
        {
          title: '设备分类编码',
          align: "center",
src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue
@@ -14,7 +14,7 @@
    <a-spin :spinning="confirmLoading">
      <a-form :form="form">
        <a-row :gutter="24">
<!--        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item
              label="上级设备分类编号"
@@ -43,7 +43,7 @@
              />
            </a-form-item>
          </a-col>
        </a-row>
        </a-row>-->
        <a-row :gutter="24">
          <a-col :span="12">
@@ -103,13 +103,13 @@
      >
        关闭
      </a-button>
      <a-button
<!--      <a-button
        v-if="!this.model.id"
        :disabled="disableSubmit || confirmLoading"
        :loading="confirmLoading"
        @click="handleOkAndAdd"
        type="primary"
      >保存并继续新增</a-button>
      >保存并继续新增</a-button>-->
      <a-button
        :disabled="disableSubmit || confirmLoading"
        :loading="confirmLoading"
src/views/eam/modules/faultType/FaultType2List.vue
@@ -230,7 +230,7 @@
          },
          width: 50
        },
        {
      /*   {
          title: '上级故障类型编码',
          align: 'center',
          dataIndex: 'parentNum'
@@ -240,7 +240,7 @@
          align: 'center',
          dataIndex: 'parentName'
        },
        }, */
        {
          title: '故障类型编码',
          align: 'center',
src/views/eam/modules/faultType/FaultTypeModel.vue
@@ -14,7 +14,7 @@
    <a-spin :spinning="confirmLoading">
      <a-form :form="form">
        <a-row :gutter="24">
<!--        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item
              label="上级故障类型编号:"
@@ -43,7 +43,7 @@
              />
            </a-form-item>
          </a-col>
        </a-row>
        </a-row>-->
        <a-row :gutter="24">
          <a-col :span="12">
@@ -103,13 +103,13 @@
      >
        关闭
      </a-button>
      <a-button
<!--      <a-button
        v-if="!this.model.id"
        :disabled="disableSubmit || confirmLoading"
        :loading="confirmLoading"
        @click="handleOk"
        type="primary"
      >保存并继续新增</a-button>
      >保存并继续新增</a-button>-->
      <a-button
        :disabled="disableSubmit || confirmLoading"
        :loading="confirmLoading"
src/views/eam/modules/precisionParameter/PrecisionParametersModel.vue
@@ -105,13 +105,13 @@
      >
        关闭
      </a-button>
      <a-button
<!--      <a-button
        v-if="!this.model.id"
        :disabled="disableSubmit || confirmLoading"
        :loading="confirmLoading"
        @click="handleOk"
        type="primary"
      >保存并继续新增</a-button>
      >保存并继续新增</a-button>-->
      <a-button
        :disabled="disableSubmit || confirmLoading"
        :loading="confirmLoading"
src/views/eam/modules/precisionParameter/PrecisionParametersRight.vue
@@ -262,7 +262,7 @@
          },
          // sorter: true,
        },
        {
       /*  {
          title: '精度参数分类',
          align: 'center',
          dataIndex: 'precisionParametersCategoryNumName',
@@ -270,7 +270,7 @@
            customRender: 'precisionParametersCategoryNumName'
          },
          // sorter: true,
        },
        }, */
        {
          title: '计量单位',
          align: 'center',
src/views/eam/modules/processParameters/ProcessParametersModel.vue
@@ -105,13 +105,13 @@
      >
        关闭
      </a-button>
      <a-button
<!--      <a-button
        v-if="!this.model.id"
        :disabled="disableSubmit || confirmLoading"
        :loading="confirmLoading"
        @click="handleOk"
        type="primary"
      >保存并继续新增</a-button>
      >保存并继续新增</a-button>-->
      <a-button
        :disabled="disableSubmit || confirmLoading"
        :loading="confirmLoading"
src/views/eam/modules/transferMethod/TransferMethodModel.vue
@@ -89,13 +89,13 @@
      >
        关闭
      </a-button>
      <a-button
<!--      <a-button
        v-if="!this.model.id"
        :disabled="disableSubmit || confirmLoading"
        :loading="confirmLoading"
        @click="handleOk"
        type="primary"
      >保存并继续新增</a-button>
      >保存并继续新增</a-button>-->
      <a-button
        :disabled="disableSubmit || confirmLoading"
        :loading="confirmLoading"
src/views/eam/modules/transferMethod/TransferMethodRight.vue
@@ -262,7 +262,7 @@
          },
          // sorter: true,
        },
        {
       /*  {
          title: '增减方式分类',
          align: 'center',
          dataIndex: 'transferMethodCategoryNumName',
@@ -270,7 +270,7 @@
            customRender: 'transferMethodCategoryNumName'
          },
          // sorter: true,
        },
        }, */
        {
          title: '创建人',
          align: "center",
src/views/eam/modules/unitCategory/MomBaseUnitCategoryForm.vue
@@ -32,9 +32,9 @@
            <a-button type="primary" @click="submitForm">保存</a-button>
          </a-col>
          <a-col>
<!--          <a-col>
            <a-button type="primary" @click="submitFormAndAdd">保存并新增</a-button>
          </a-col>
          </a-col>-->
          <a-col>
            <a-button type="primary" @click="close">取消</a-button>
src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
@@ -70,6 +70,7 @@
          :columns='sparesScrapDetailTable.columns'
          :dataSource='sparesScrapDetailTable.dataSource'
          :maxHeight='300'
          @valueChange="changeAuxiliaryQuantity"
          :disabled='formDisabled'
          :rowNumber='true'
          :rowSelection='true'
@@ -551,6 +552,13 @@
      this.visible = false
      this.$emit('close')
      this.$refs.form.clearValidate()
    },
    changeAuxiliaryQuantity(target){
      console.log(target.columnIndex)
      let num=target.columnIndex
      if (target.columnIndex ===num){
        target.row.scrapAuxiliaryQuantity=Math.abs(target.row.conversionRatio*target.row.scrapMainQuantity)
      }
    }
  }
}
src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue
@@ -59,6 +59,7 @@
          :dataSource='sparesScrapRequirementDetailTable.dataSource'
          :maxHeight='300'
          :disabled='formDisabled'
          @valueChange="changeAuxiliaryQuantity"
          :alwaysEdit='true'
          :rowNumber='true'
          :bordered='bordered'
@@ -458,6 +459,13 @@
      this.visible = false
      this.$emit('close')
      this.$refs.form.clearValidate()
    },
    changeAuxiliaryQuantity(target){
      console.log(target.columnIndex)
      let num=target.columnIndex
      if (target.columnIndex ===num){
        target.row.auxiliaryQuantity=Math.abs(target.row.conversionRatio*target.row.mainQuantity)
      }
    }
  }
}
src/views/spare/modules/sparePartScrapRequirement/SpareSelectList.vue
@@ -190,7 +190,6 @@
      let params = this.getQueryParams()//查询条件
      await getAction(this.url.list, params).then((res) => {
        if (res.success) {
            debugger
          for (let i = 0; i < res.result.records.length; i++) {
            if (this.oldSelectRows.indexOf(res.result.records[i].id) > -1) {
              res.result.records[i].distable = true