计量单位：重构， 备件相关功能页面调整

houjie

2023-08-23 1ec4da063b3195f4f46af969a9d170bda2df7c2a

计量单位：重构， 备件相关功能页面调整

 src/views/eam/UnitList.vue

@@ -1,187 +1,258 @@
<template>
  <div>
    <a-card
      :bordered="true"
      style="height: 50%"
    >
      <a-row type="flex">
        <a-col><a-button
            type="primary"
            @click="handleAdd(da)"
          >新建</a-button></a-col>
        <a-col><a-button
            type="primary"
            @click="handleEdit(selectedRows)"
          >编辑</a-button></a-col>
        <a-col><a-button
            type="primary"
            @click="batchDel(da)"
          >删除</a-button></a-col>
        <a-col style="left: 5%"><a-button type="primary">模板</a-button></a-col>
        <a-col style="left: 5%"><a-button type="primary">导入</a-button></a-col>
        <a-col style="left: 5%"><a-button type="primary">导出</a-button></a-col>
      </a-row>
    </a-card>
    <a-row
      type="flex"
      :gutter="16"
    >
      <a-col
        :md="5"
        :sm="24"
  <a-card :bordered="false" title='计量单位'>
    <!-- æŸ¥è¯¢åŒºåŸŸ -->
    <div class="table-page-search-wrapper">
      <a-form
        layout="inline"
        @keyup.enter.native="searchQuery"
      >
        Â  Â  Â 
        <MomUnitListLeft
          ref="MomUnitListLeft"
          class="MomUnitListLeft"
          @treeSelect="treeSelect"
        />
        Â  Â 
      </a-col>
      <a-col
        :md="24 - 5"
        :sm="24"
        <a-row :gutter="24">

          <a-col
            :xl="6"
            :lg="7"
            :md="8"
            :sm="24"
          >
            <a-form-item label="单位编码">
              <j-input
                placeholder="请输入单位编码"
                v-model="queryParam.num"
              ></j-input>
            </a-form-item>
          </a-col>
          <template>
            <a-col
              :xl="6"
              :lg="7"
              :md="8"
              :sm="24"
            >
              <a-form-item label="单位名称">
                <j-input
                  placeholder="请输入单位名称"
                  v-model="queryParam.name"
                ></j-input>
              </a-form-item>
            </a-col>
          </template>
          <a-col
            :xl="6"
            :lg="7"
            :md="8"
            :sm="24"
          >
            <span
              style="float: left;overflow: hidden;"
              class="table-page-search-submitButtons"
            >
              <a-button
                type="primary"
                @click="searchQuery"
                icon="search"
              >查询</a-button>
              <a-button
                type="primary"
                @click="searchReset"
                icon="reload"
                style="margin-left: 8px"
              >重置</a-button>
            </span>
          </a-col>
        </a-row>
      </a-form>
    </div>
    <!-- æŸ¥è¯¢åŒºåŸŸ-END -->

    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator">
      <a-button
        @click="handleAdd"
        type="primary"
        icon="plus"
      >新增</a-button>
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item
            key="1"
            @click="batchDel"
          ><a-icon type="delete" />删除</a-menu-item>
        </a-menu>
        <a-button style="margin-left: 8px"> æ‰¹é‡æ“ä½œ <a-icon type="down" /></a-button>
      </a-dropdown>
    </div>

    <!-- table区域-begin -->
    <div>
      <div
        class="ant-alert ant-alert-info"
        style="margin-bottom: 16px;"
      >
        <MomUnitListRight
          ref="MomUnitListRight"
          class="MomUnitListRight"
          @searchkeys="selectedKeys"
        />
      </a-col>
    </a-row>
    <mom-unit-modal
        <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"
        >清空</a>
      </div>

      <a-table
        ref="table"
        size="middle"
        :scroll="{x:true}"
        bordered
        rowKey="id"
        :columns="columns"
        :dataSource="dataSource"
        :pagination="ipagination"
        :loading="loading"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        class="j-table-force-nowrap"
        @change="handleTableChange"
      >

        <span
          slot="action"
          slot-scope="text, record"
        >
          <a @click="handleEdit(record)">编辑</a>

          <a-divider type="vertical" />
          <a-dropdown>
            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
            <a-menu slot="overlay">
              <a-menu-item>
                <a @click="handleDetail(record)">详情</a>
              </a-menu-item>
              <a-menu-item>
                <a-popconfirm
                  title="确定删除吗?"
                  @confirm="() => handleDelete(record.id)"
                >
                  <a>删除</a>
                </a-popconfirm>
              </a-menu-item>
            </a-menu>
          </a-dropdown>
        </span>

      </a-table>
    </div>

    <unit-modal
      ref="modalForm"
      @ok="modalFormOk"
    ></mom-unit-modal>
  </div>
    ></unit-modal>
  </a-card>
</template>

<script>
import MomUnitListLeft from './modules/unit/MomUnitListLeft'
import MomUnitListRight from './modules/unit/MomUnitListRight'
import MomUnitModal from './modules/unit/MomUnitModal'

import '@assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { deleteAction } from '@/api/manage'
import UnitModal from './modules/unit/UnitModal'

export default {
  name: 'MomUnitList',
  mixins: [JeecgListMixin],
  components: { MomUnitListLeft, MomUnitListRight, MomUnitModal },
  name: 'EquipmentImportanceList',
  mixins: [JeecgListMixin, mixinDevice],
  components: {
    UnitModal
  },
  data() {
    return {
      description: '计量单位页面',
      currentOrgCode: '',
      selectedRowKeys: [],
      selectedRows: [],
      description: '计量单位管理页面',
      // è¡¨å¤´
      columns: [
        {
          title: '#',
          dataIndex: '',
          key: 'rowIndex',
          width: 60,
          align: "center",
          customRender: function (t, r, index) {
            return parseInt(index) + 1;
          }
        },
        {
          title: ' è®¡é‡å•ä½ç¼–码',
          align: "center",
          dataIndex: 'num'
        },
        {
          title: '计量单位名称',
          align: "center",
          dataIndex: 'name'
        },
        {
          title: '创建人',
          align: "center",
          dataIndex: 'createBy'
        },
        {
          title: '创建日期',
          align: "center",
          dataIndex: 'createTime'
        },
        {
          title: '更新人',
          align: "center",
          dataIndex: 'updateBy'
        },
        {
          title: '更新日期',
          align: "center",
          dataIndex: 'updateTime'
        },
        {
          title: '备注',
          align: "center",
          dataIndex: 'remark'
        },

        {
          title: '操作',
          dataIndex: 'action',
          align: "center",
          fixed: "right",
          width: 147,
          scopedSlots: { customRender: 'action' }
        }
      ],
      url: {
        list: '/base/getTree',
        deleteBatch: '/base/unit/deleteMomUnit',
        list: "/base/unit/list",
        delete: "/base/unit/delete",
        deleteBatch: "/base/unit/deleteBatch",
        exportXlsUrl: "/eam/equipmentImportance/exportXls",
        importExcelUrl: "/eam/equipmentImportance/importExcel",

      },
      da: [],
      dictOptions: {},
      superFieldList: [],
    }
  },

  methods: {
    //新增数据（新建按钮触发）
    handleAdd(da) {
      if (this.da.length <= 0) {
        this.$message.warning('请选择一个树节点！')
        return
      } else {
        this.$refs.modalForm.add(da, { cb: this.callback })
      }
    },
    //修改数据（修改按钮触发）
    handleEdit(selectedRows) {
      if (this.selectedRows.length <= 0) {
        this.$message.warning('请选择一条需要修改的计量单位！')
        return
      } else if (this.selectedRows.length > 1) {
        this.$message.warning('注意：只能选择一条计量单位进行修改！')
        return
      } else {
        this.$refs.modalForm.edit(selectedRows, { cb: this.callback })
      }
    },
    //批量删除右侧数据（删除按钮触发）
    batchDel(da) {
      if (!this.url.deleteBatch) {
        this.$message.error('请设置url.deleteBatch属性!')
        return
      }
      if (this.selectedRowKeys.length <= 0) {
        this.$message.warning('请选择一条记录！')
        return
      } else {
        var ids = ''
        for (var a = 0; a < this.selectedRowKeys.length; a++) {
          ids += this.selectedRowKeys[a] + ','
        }
        var that = this
        this.$confirm({
          title: '确认删除',
          content: '是否删除选中数据?',
          onOk: function () {
            that.loading = true
            deleteAction(that.url.deleteBatch, { ids: ids })
              .then((res) => {
                if (res.success) {
                  that.$message.success(res.message)
                } else {
                  that.$message.warning(res.message)
                }
              })
              .finally(() => {
                that.loading = false
                //重新计算分页问题
                that.reCalculatePage(that.selectedRowKeys.length)
                that.onClearSelected()
                that.$refs.MomUnitListRight.loadData({ id: da.id })
                that.loadTree()
              })
          },
        })
      }
    },
    //重新计算分页
    reCalculatePage(count) {
      //总数量-count
      let total = this.ipagination.total - count
      //获取删除后的分页数
      let currentIndex = Math.ceil(total / this.ipagination.pageSize)
      //删除后的分页数<所在当前页
      if (currentIndex < this.ipagination.current) {
        this.ipagination.current = currentIndex
      }
      console.log('currentIndex', currentIndex)
    },
    //清除右侧选中项
    onClearSelected() {
      this.selectedRowKeys = []
      this.selectedRows = []
    },
    //左右联动（da为左侧选中树的数据，子控件中返回）
    treeSelect(da) {
      let id = da.id
      this.da = da
      this.onClearSelected()
      this.$refs.MomUnitListRight.loadData({ unitCategoryId: id })
    },
    //右侧列表选中事件
    selectedKeys(selectedRowKeys, selectedRows) {
      this.selectedRowKeys = selectedRowKeys
      this.selectedRows = selectedRows
    },
    //加载左侧树
    loadTree() {
      this.$refs.MomUnitListLeft.queryTreeData()
    },
    //新增编辑保存后回调函数回显页面数据
    callback(id) {
      this.$refs.MomUnitListRight.loadData({ id: id })
      this.$refs.MomUnitListRight.getList()
  created() {
    // this.getSuperFieldList();
  },
  computed: {
    importExcelUrl: function () {
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
    },
  },
  methods: {
    // initDictConfig() {
    // },
    // getSuperFieldList() {
    //   let fieldList = [];
    //   fieldList.push({ type: 'string', value: 'num', text: '重要度编码', dictCode: '' })
    //   fieldList.push({ type: 'string', value: 'name', text: '重要度名称', dictCode: '' })
    //   fieldList.push({ type: 'string', value: 'remark', text: '备注', dictCode: '' })
    //   fieldList.push({ type: 'string', value: 'createBy', text: '创建人', dictCode: '' })
    //   fieldList.push({ type: 'datetime', value: 'createTime', text: '创建日期' })
    //   fieldList.push({ type: 'string', value: 'updateBy', text: '更新人', dictCode: '' })
    //   fieldList.push({ type: 'datetime', value: 'updateTime', text: '更新日期' })
    //   this.superFieldList = fieldList
    // }
  }
}
</script>
<style scoped>

 src/views/eam/modules/unit/UnitForm.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,125 @@
<template>
  <a-spin :spinning='confirmLoading'>
    <j-form-container :disabled='formDisabled'>
      <a-form-model ref='form' :model='model' :rules='validatorRules' slot='detail'>
        <a-row :span='24'>
          <a-col :span='12'>
            <a-form-model-item label='单位编码' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='num'>
              <a-input v-model='model.num' placeholder='请输入单位编码'></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span='12'>
            <a-form-model-item label='单位名称' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='name'>
              <a-input v-model='model.name' placeholder='请输入单位名称'></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :span='24'>
          <a-col :span='12'>
            <a-form-model-item label='备注' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='remark'>
              <a-textarea v-model='model.remark' placeholder='请输入备注'></a-textarea>
            </a-form-model-item>
          </a-col>

        </a-row>


      </a-form-model>
    </j-form-container>
  </a-spin>
</template>

<script>

import { httpAction, getAction } from '@api/manage'
import { validateDuplicateValue } from '@/utils/util'

export default {
  name: 'UnitForm',
  components: {},
  props: {
    //表单禁用
    disabled: {
      type: Boolean,
      default: false,
      required: false
    }
  },
  data() {
    return {
      model: {},
      labelCol: {
        xs: { span: 24 },
        sm: { span: 8 },
      },
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 16 },
      },
      confirmLoading: false,
      validatorRules: {
        num: [
          { required: true, message: '请输入单位编码!' },
          { validator: (rule, value, callback) => validateDuplicateValue('mom_base_unit', 'num', value, this.model.id, callback) }
        ],
        name: [
          { required: true, message: '请输入单位名称!' },
          { validator: (rule, value, callback) => validateDuplicateValue('mom_base_unit', 'name', value, this.model.id, callback) }
        ]
      },
      url: {
        add: '/base/unit/add',
        edit: '/base/unit/edit',
        queryById: '/base/unit/queryById'
      }
    }
  },
  computed: {
    formDisabled() {
      return this.disabled
    }
  },
  created() {
    //备份model原始值
    this.modelDefault = JSON.parse(JSON.stringify(this.model))
  },
  methods: {
    add() {
      this.edit(this.modelDefault)
    },
    edit(record) {
      this.model = Object.assign({}, record)
      this.visible = true
    },
    submitForm() {
      const that = this
      // è§¦å‘表单验证
      this.$refs.form.validate(valid => {
        if (valid) {
          that.confirmLoading = true
          let httpurl = ''
          let method = ''
          if (!this.model.id) {
            httpurl += this.url.add
            method = 'post'
          } else {
            httpurl += this.url.edit
            method = 'put'
          }
          httpAction(httpurl, this.model, method).then((res) => {
            if (res.success) {
              that.$message.success(res.message)
              that.$emit('ok')
            } else {
              that.$message.warning(res.message)
            }
          }).finally(() => {
            that.confirmLoading = false
          })
        }

      })
    }
  }
}
</script>

 src/views/eam/modules/unit/UnitModal.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,60 @@
<template>
  <j-modal
    :title="title"
    :width="width"
    :visible="visible"
    switchFullscreen
    @ok="handleOk"
    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
    @cancel="handleCancel"
    cancelText="关闭">
    <unit-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></unit-form>
  </j-modal>
</template>

<script>

  import UnitForm from './UnitForm'
  export default {
    name: 'UnitModal',
    components: {
      UnitForm
    },
    data () {
      return {
        title:'',
        width:800,
        visible: false,
        disableSubmit: false
      }
    },
    methods: {
      add () {
        this.visible=true
        this.$nextTick(()=>{
          this.$refs.realForm.add();
        })
      },
      edit (record) {
        this.visible=true
        this.$nextTick(()=>{
          this.$refs.realForm.edit(record);
        })
      },
      close () {
        this.$emit('close');
        this.visible = false;
      },
      handleOk () {
        this.$refs.realForm.submitForm();
      },
      submitCallback(){
        this.$emit('ok');
        this.visible = false;
      },
      handleCancel () {
        this.close()
      }
    }
  }
</script>

 src/views/spare/modules/sparePart/SparePart2List.vue

@@ -238,15 +238,15 @@
          dataIndex: 'constructorId_dictText',
        },
        {
          title: '主单位',
          title: '单位',
          align: "center",
          dataIndex: 'mainUnitId_dictText',
        },
        {
       /*  {
          title: '辅单位',
          align: "center",
          dataIndex: 'auxiliaryUnitId_dictText',
        },
        }, */
        // {
        //   title: '主数量',
        //   align: "center",

 src/views/spare/modules/sparePart/SparePartModel.vue

@@ -89,12 +89,12 @@
            <a-form-item
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              label="主单位"
              label="单位"
            >
              <j-dict-select-tag
                allow-clear
                :disabled="disableSubmit"
                :placeholder="disableSubmit?'':'请选择主单位'"
                :placeholder="disableSubmit?'':'请选择单位'"
                :triggerChange="true"
                dictCode="mom_base_unit,name,id,status!='0' and del_flag!='1'"
                v-decorator="['mainUnitId', validatorRules.mainUnitId]"
@@ -104,7 +104,7 @@
          </a-col>
        </a-row>
        <a-row style="width: 100%">
          <a-col :span="24 / 2">
<!--          <a-col :span="24 / 2">
            <a-form-item
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
@@ -119,7 +119,7 @@
                @change="(e)=>handle3Change(e)"
              />
            </a-form-item>
          </a-col>
          </a-col>-->
          <a-col :span="24 / 2  ">
            <a-form-item
              :labelCol="labelCol"
@@ -134,8 +134,8 @@
            </a-form-item>
          </a-col>
        </a-row>
        <a-row style="width: 100%">
          <!-- hidden -->
<!--        <a-row style="width: 100%">
          &lt;!&ndash; hidden &ndash;&gt;
          <a-col :span="24 / 2  ">
            <a-form-item
              :labelCol="labelCol"
@@ -149,7 +149,7 @@
              />
            </a-form-item>
          </a-col>
        </a-row>
        </a-row>-->
        <a-row style="width: 100%">
          <a-col :span="24 / 2">
            <a-form-item

 src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksDetailList.vue

@@ -140,22 +140,22 @@
          dataIndex: 'supplierName'
        },
        {
          title: '主单位',
          title: '单位',
          align: 'center',
          dataIndex: 'mainUnitName'
        },
        {
       /*  {
          title: '辅单位',
          align: 'center',
          dataIndex: 'auxiliaryUnitName'
        },
        }, */
        {
          title: '出库数量',
          align: 'center',
          dataIndex: 'outboundMainQuantity'
        },
        {
          title: '退库主数量',
          title: '退库数量',
          align: 'center',
          dataIndex: 'mainQuantity'
        },

 src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksModal.vue

@@ -246,7 +246,7 @@
          dataIndex: 'warehouseLocationNum'
        },
        {
          title: '主单位',
          title: '单位',
          align: 'center',
          dataIndex: 'mainUnitName'
        },
@@ -255,11 +255,11 @@
          align: 'center',
          dataIndex: 'outboundMainQuantity'
        },
        {
        /* {
          title: '辅单位',
          align: 'center',
          dataIndex: 'auxiliaryUnitName'
        },
        }, */
        {
          title: '退库数量',
          align: 'center',
@@ -342,9 +342,9 @@
          model: data[i].model,
          mainUnitId: data[i].mainUnitId,
          mainUnitName: data[i].mainUnitName,
          auxiliaryUnitId: data[i].auxiliaryUnitId,
          auxiliaryUnitName: data[i].auxiliaryUnitName,
          conversionRatio: data[i].conversionRatio,
         /*  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/sparePartCancellingStocks/SpareSelectList.vue

@@ -153,12 +153,12 @@
          align: 'center',
          dataIndex: 'warehouseLocationNum'
        },*/
        {
      /*   {

          title: '计算比例',
          align: "center",
          dataIndex: 'conversionRatio',
        },
        }, */
        {
          title: '供应商',
          align: "center",
@@ -175,15 +175,15 @@
          dataIndex: 'mainUnitName'
        },
       {
          title: '出库主数量',
          title: '出库数量',
          align: 'center',
          dataIndex: 'outboundMainQuantity'
        },
        {
       /*  {
          title: '辅单位',
          align: 'center',
          dataIndex: 'auxiliaryUnitName'
        },
        }, */
       /* {
          title: '库存辅数量',
          align: 'center',

 src/views/spare/modules/sparePartInventory/SparePart2List.vue

@@ -178,25 +178,25 @@
          dataIndex: 'constructorId_dictText',
        },
        {
          title: '主单位',
          title: '单位',
          align: "center",
          dataIndex: 'mainUnitId_dictText',
        },
        {
      /*   {
          title: '辅单位',
          align: "center",
          dataIndex: 'auxiliaryUnitId_dictText',
        },
        }, */
        {
          title: '总主数量',
          title: '总数量',
          align: "center",
          dataIndex: 'totalMainQuantity',
        },
        {
       /*  {
          title: '总辅数量',
          align: "center",
          dataIndex: 'totalAuxiliaryQuantity',
        },
        }, */
        {
          title: '有效期',
          align: "center",

 src/views/spare/modules/sparePartInventory/SparePartInventoryList.vue

@@ -55,16 +55,16 @@
          dataIndex: 'batchNum',
        },
        {
          title: '主单位',
          title: '单位',
          align: "center",
          dataIndex: 'mainUnitName',
        },
        {
          title: '主数量',
          title: '数量',
          align: "center",
          dataIndex: 'mainQuantity',
        },
        {
       /*  {
          title: '辅单位',
          align: "center",
          dataIndex: 'auxiliaryUnitName',
@@ -73,7 +73,7 @@
          title: '辅数量',
          align: "center",
          dataIndex: 'auxiliaryQuantity',
        },
        }, */
        {
          title: '仓库',
          align: "center",

 src/views/spare/modules/sparePartOutbound/JSelectSparePartInventoryModal.vue

@@ -153,17 +153,17 @@
          dataIndex: 'manufactureDate'
        },
        {
          title: '主单位',
          title: '单位',
          align: 'center',
          dataIndex: 'mainUnitName'
        },

        {
          title: '库存主数量',
          title: '库存数量',
          align: 'center',
          dataIndex: 'mainQuantity'
        },
        {
      /*   {
          title: '辅单位',
          align: 'center',
          dataIndex: 'auxiliaryUnitName'
@@ -172,7 +172,7 @@
          title: '库存辅数量',
          align: 'center',
          dataIndex: 'auxiliaryQuantity'
        },
        }, */
      ],
      selectedRowKeys: [],
      oldSelectRows: [],

 src/views/spare/modules/sparePartOutbound/SparePartOutboundDetail.vue

@@ -148,12 +148,12 @@
          dataIndex: 'supplierName',
        },
        {
          title: '主单位',
          title: '单位',
          align: "center",
          dataIndex: 'mainUnitName',
        },
        {
          title: '出库主数量',
          title: '出库数量',
          align: "center",
          dataIndex: 'outboundMainQuantity',
        },

 src/views/spare/modules/sparePartOutbound/SparePartOutboundModal.vue

@@ -39,21 +39,6 @@
                tree-default-expand-all
                v-decorator="['departId', validatorRules.departId]"
              />
<!--              <a-select
                :placeholder="'请选择领用部门'"
                :disabled="disableSubmit"
                :options="this.departs"
                style="width: 100%"
                v-decorator="['departId', validatorRules.departId]"
              />-->
<!--              <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-form-item>
          </a-col>
        </a-row>
@@ -244,16 +229,16 @@
          dataIndex: 'warehouseLocationNum'
        },
        {
          title: '主单位',
          title: '单位',
          align: 'center',
          dataIndex: 'mainUnitName'
        },
        {
          title: '主数量',
          title: '数量',
          align: 'center',
          dataIndex: 'mainQuantity',
        },
        {
     /*    {
          title: '辅单位',
          align: 'center',
          dataIndex: 'auxiliaryUnitName'
@@ -262,9 +247,9 @@
          title: '辅数量',
          align: 'center',
          dataIndex: 'auxiliaryQuantity'
        },
        }, */
        {
          title: '出库主数量',
          title: '出库数量',
          align: 'center',
          dataIndex: 'outboundMainQuantity',
          scopedSlots: { customRender: 'outboundMainQuantity' }
@@ -351,10 +336,10 @@
          mainQuantity: data[i].mainQuantity,
          mainUnitId: data[i].mainUnitId,
          mainUnitName: data[i].mainUnitName,
          auxiliaryQuantity: data[i].auxiliaryQuantity,
          auxiliaryUnitId: data[i].auxiliaryUnitId,
          auxiliaryUnitName: data[i].auxiliaryUnitName,
          conversionRatio: data[i].conversionRatio,
      /*     auxiliaryQuantity: data[i].auxiliaryQuantity, */
       /*    auxiliaryUnitId: data[i].auxiliaryUnitId,
          auxiliaryUnitName: data[i].auxiliaryUnitName, */
        /*   conversionRatio: data[i].conversionRatio, */
          constructorId: data[i].constructorId,
          constructorName: data[i].constructorName,
          supplierId: data[i].supplierId,
@@ -482,7 +467,7 @@
      if (target) {
        if (column.dataIndex == 'outboundMainQuantity') {
          target[column.dataIndex] = value;
          target["outboundAuxiliaryQuantity"] = value * target.conversionRatio
        /*   target["outboundAuxiliaryQuantity"] = value * target.conversionRatio */
        }
        //显示带过来的数据
        that.dataSource = temp;

 src/views/spare/modules/sparePartPurchaseStorage/JSelectSparePartModal.vue

@@ -128,15 +128,15 @@
          dataIndex: 'constructorId_dictText'
        },
        {
          title: '主单位',
          title: '单位',
          align: 'center',
          dataIndex: 'mainUnitId_dictText'
        },
        {
       /*  {
          title: '辅单位',
          align: 'center',
          dataIndex: 'auxiliaryUnitId_dictText'
        },
        }, */
      ],
      selectedRowKeys: [],
      oldSelectRows: [],

 src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageDetail.vue

@@ -148,16 +148,16 @@
          dataIndex: 'supplierName',
        },
        {
          title: '主单位',
          title: '单位',
          align: "center",
          dataIndex: 'mainUnitName',
        },
        {
          title: '主数量',
          title: '数量',
          align: "center",
          dataIndex: 'mainQuantity',
        },
        {
       /*  {
          title: '辅单位',
          align: "center",
          dataIndex: 'auxiliaryUnitName',
@@ -166,7 +166,7 @@
          title: '辅数量',
          align: "center",
          dataIndex: 'auxiliaryQuantity',
        },
        }, */
        {
          title: '库区',
          align: "center",

 src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageModal.vue

@@ -31,14 +31,7 @@
              :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-tree-select
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
@@ -47,13 +40,6 @@
                tree-default-expand-all
                v-decorator="['departId', validatorRules.departId]"
              />
<!--              <a-select
                :placeholder="'请选择采购部门'"
                :options="this.departs"
                style="width: 100%"
                :disabled="disableSubmit"
                v-decorator="['departId', validatorRules.departId]"
              />-->
            </a-form-item>
          </a-col>
        </a-row>
@@ -291,17 +277,17 @@
          scopedSlots: { customRender: 'manufactureDate' }
        },
        {
          title: '主单位',
          title: '单位',
          align: 'center',
          dataIndex: 'mainUnitName'
        },
        {
          title: '主数量',
          title: '数量',
          align: 'center',
          dataIndex: 'mainQuantity',
          scopedSlots: { customRender: 'mainQuantity' }
        },
        {
        /* {
          title: '辅单位',
          align: 'center',
          dataIndex: 'auxiliaryUnitName'
@@ -310,7 +296,7 @@
          title: '辅数量',
          align: 'center',
          dataIndex: 'auxiliaryQuantity'
        },
        }, */
        {
          title: '操作',
          align: 'center',
@@ -387,9 +373,9 @@
          model: data[i].model,
          mainUnitId: data[i].mainUnitId,
          mainUnitName: data[i].mainUnitId_dictText,
          auxiliaryUnitId: data[i].auxiliaryUnitId,
       /*    auxiliaryUnitId: data[i].auxiliaryUnitId,
          auxiliaryUnitName: data[i].auxiliaryUnitId_dictText,
          conversionRatio: data[i].conversionRatio,
          conversionRatio: data[i].conversionRatio, */
          constructorId: data[i].constructorId,
          constructorName: data[i].constructorId_dictText,
          suppliers: this.suppliers,

 src/views/spare/modules/sparePartReceive/SparePartReceiveDeatilList.vue

@@ -169,18 +169,18 @@

        },
        {
          title: '主单位',
          title: '单位',
          align: 'center',
          dataIndex: 'mainUnitIdName',

        },
        {
          title: '主数量',
          title: '数量',
          align: 'center',
          dataIndex: 'mainQuantity',

        },
        {
       /*  {
          title: '辅单位',
          align: 'center',
          dataIndex: 'auxiliaryUnitIdName',
@@ -191,7 +191,7 @@
          align: 'center',
          dataIndex: 'auxiliaryQuantity',

        },
        }, */
        {
          title: '领用数量',
          align: 'center',

 src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue

@@ -190,7 +190,7 @@
            defaultValue: ''
          },
          {
            title: '主单位',
            title: '单位',
            key: 'mainUnitIdName',
            type: JVXETypes.normal,
            align:'center',
@@ -199,7 +199,7 @@
            defaultValue: ''
          },
          {
            title: '主单位',
            title: '单位',
            key: 'mainUnitId',
            type: JVXETypes.hidden,
            align:'center',
@@ -207,7 +207,7 @@
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
        /*   {
            title: '辅单位',
            key: 'auxiliaryUnitIdName',
            type: JVXETypes.normal,
@@ -224,16 +224,16 @@
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          }, */
          {
            title: '主数量',
            title: '数量',
            key: 'mainQuantity',
            type: JVXETypes.normal,
            align:'center',
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: 0,
            formatter({ cellValue, row, column }) {
/*             formatter({ cellValue, row, column }) {

              if (cellValue != null) {
                let conversionRatio = row.conversionRatio
@@ -243,7 +243,7 @@
              }
              return cellValue

            },
            }, */
            validateRules: [
              {
                required: true,
@@ -261,7 +261,7 @@
            ]
          },

          {
        /*   {
            title: '辅数量',
            key: 'auxiliaryQuantity',
            align:'center',
@@ -269,17 +269,17 @@
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: 0
          },
          }, */

          {
            title: '领用主数量',
            title: '领用数量',
            key: 'receiveMainQuantity',
            align:'center',
            type: JVXETypes.inputNumber,
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: 0,
            formatter({ cellValue, row, column }) {
/*             formatter({ cellValue, row, column }) {
              if (cellValue != null) {
                let conversionRatio = row.conversionRatio
                console.log(conversionRatio)
@@ -289,7 +289,7 @@
              }
              return cellValue

            },
            }, */
            validateRules: [
              {
                required: true,
@@ -308,7 +308,7 @@
              }
            ]
          },
          {
        /*   {
            title: '领用辅数量',
            align:'center',
            key: 'receiveMainQuantity',
@@ -316,7 +316,7 @@
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          }, */



@@ -423,18 +423,18 @@
            model: data[i].model,
            specification: data[i].specification,
            mainUnitId: data[i].mainUnitId,
            auxiliaryUnitId: data[i].auxiliaryUnitId,
          /*   auxiliaryUnitId: data[i].auxiliaryUnitId, */
            mainUnitIdName: data[i].mainUnitId_dictText,
            auxiliaryUnitIdName: data[i].auxiliaryUnitId_dictText,
          /*   auxiliaryUnitIdName: data[i].auxiliaryUnitId_dictText, */
            mainQuantity: data[i].mainQuantity,
            auxiliaryQuantity: data[i].auxiliaryQuantity,
         /*    auxiliaryQuantity: data[i].auxiliaryQuantity, */
            manufactureDate: data[i].manufactureDate,
            constructorId: data[i].constructorId,
            constructorName: data[i].constructorName,
            batchNum: data[i].batchNum,
            ReceiveReason: data[i].ReceiveReason,
            validityPeriod:data[i].validityPeriod,
            conversionRatio:data[i].conversionRatio
           /*  conversionRatio:data[i].conversionRatio */
          }
        }
        addRows.push(sparesReceiveDetail)

 src/views/spare/modules/sparePartReceive/SpareSelectList.vue

@@ -123,36 +123,36 @@
          width: 150,

        },
        { title: '主单位',
        { title: '单位',
          align: 'center',
          dataIndex: 'mainUnitId_dictText',
          width: 150,

        },
        { title: '辅单位',
        /* { title: '辅单位',
          align: 'center',
          dataIndex: 'auxiliaryUnitId_dictText',
          width: 150

        },
        { title: '主数量',
        }, */
        { title: '数量',
          align: 'center',
          dataIndex: 'mainQuantity',
          width: 150

        },
        { title: '辅数量',
      /*   { title: '辅数量',
          align: 'center',
          dataIndex: 'auxiliaryQuantity',
          width: 150

        },
        {
        }, */
       /*  {
          title: '换算比例',
          align: 'center',
          dataIndex: 'conversionRatio',
          width: 150
        }
        } */
      ],
      selectedRowKeys: [],
      oldSelectRows: [],

 src/views/spare/modules/sparePartScrap/SparePartScrapDetailList.vue

@@ -179,44 +179,44 @@
          ellipsis: true
        },
        {
          title: '主单位',
          title: '单位',
          align: 'center',
          dataIndex: 'mainUnitIdName',

        },
        {
          title: '库存主数量',
          title: '库存数量',
          align: 'center',
          dataIndex: 'mainQuantity',

        },
        {
       /*  {
          title: '辅单位',
          align: 'center',
          dataIndex: 'auxiliaryUnitIdName',

          ellipsis: true
        },
        {
        }, */
       /*  {
          title: '库存辅数量',
          align: 'center',
          dataIndex: 'auxiliaryQuantity',

        },
        }, */

        {
          title: '报废主数量',
          title: '报废数量',
          align: 'center',
          dataIndex: 'scrapMainQuantity',

        },

        {
      /*   {
          title: '报废辅数量',
          align: 'center',
          dataIndex: 'scrapAuxiliaryQuantity',

        },
        }, */
        {
          title: '报废原因',
          align: 'center',

 src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue

@@ -70,7 +70,6 @@
          :columns='sparesScrapDetailTable.columns'
          :dataSource='sparesScrapDetailTable.dataSource'
          :maxHeight='300'
          @valueChange="changeAuxiliaryQuantity"
          :disabled='formDisabled'
          :rowNumber='true'
          :rowSelection='true'
@@ -236,7 +235,7 @@
            ]
          },
          {
            title: '主单位',
            title: '单位',
            key: 'mainUnitIdName',
            type: JVXETypes.normal,
            width: '200px',
@@ -245,7 +244,7 @@
            defaultValue: ''
          },
          {
            title: '主单位',
            title: '单位',
            key: 'mainUnitId',
            type: JVXETypes.hidden,
            align:'center',
@@ -253,7 +252,7 @@
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
         /*  {
            title: '辅单位',
            key: 'auxiliaryUnitIdName',
            type: JVXETypes.normal,
@@ -270,9 +269,9 @@
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          }, */
          {
            title: '主数量',
            title: '数量',
            key: 'mainQuantity',
            align:'center',
            type: JVXETypes.normal,
@@ -281,7 +280,7 @@
            defaultValue: ''
          },

          {
       /*    {
            title: '辅数量',
            key: 'auxiliaryQuantity',
            type: JVXETypes.normal,
@@ -289,7 +288,7 @@
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          }, */
          {
            title: '备件id',
            key: 'sparePartId',
@@ -309,14 +308,14 @@
            defaultValue: ''
          },
          {
            title: '报废主数量',
            title: '报废数量',
            key: 'scrapMainQuantity',
            align:'center',
            type: JVXETypes.inputNumber,
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: 0,
            formatter({ cellValue, row, column }) {
   /*          formatter({ cellValue, row, column }) {
              if (cellValue != null) {
                let conversionRatio = row.conversionRatio
                console.log(conversionRatio)
@@ -326,7 +325,7 @@
              }
              return cellValue

            },
            }, */
            validateRules: [
              {
                required: true,
@@ -345,7 +344,7 @@
              }
            ]
          },
          {
          /* {
            title: '报废辅数量',
            align:'center',
            key: 'scrapAuxiliaryQuantity',
@@ -353,7 +352,7 @@
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          }, */
          {
            title: '库区',
            align:'center',
@@ -474,13 +473,13 @@
            model: data[i].model,
            specification: data[i].specification,
            mainUnitId: data[i].mainUnitId,
            auxiliaryUnitId: data[i].auxiliaryUnitId,
         /*    auxiliaryUnitId: data[i].auxiliaryUnitId, */
            mainUnitIdName: data[i].mainUnitId_dictText,
            auxiliaryUnitIdName: data[i].auxiliaryUnitId_dictText,
         /*    auxiliaryUnitIdName: data[i].auxiliaryUnitId_dictText, */
            mainQuantity: data[i].mainQuantity,
            auxiliaryQuantity: data[i].auxiliaryQuantity,
          /*   auxiliaryQuantity: data[i].auxiliaryQuantity, */
            scrapMainQuantity: data[i].scrapMainQuantity,
            scrapAuxiliaryQuantity: data[i].scrapAuxiliaryQuantity,
          /*   scrapAuxiliaryQuantity: data[i].scrapAuxiliaryQuantity, */
            manufactureDate: data[i].manufactureDate,
            constructorId: data[i].constructorId,
            constructorName: data[i].constructorName,
@@ -553,13 +552,13 @@
      this.$emit('close')
      this.$refs.form.clearValidate()
    },
    changeAuxiliaryQuantity(target){
/*     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)
      }
    }
    } */
  }
}
</script>

 src/views/spare/modules/sparePartScrap/SpareSelectList.vue

@@ -131,35 +131,35 @@
          width: 150,

        },
        { title: '主单位',
        { title: '单位',
          align: 'center',
          dataIndex: 'mainUnitId_dictText',
          width: 150,

        },
        { title: '辅单位',
     /*    { title: '辅单位',
          align: 'center',
          dataIndex: 'auxiliaryUnitId_dictText',
          width: 150

        },
        { title: '库存主数量',
        }, */
        { title: '库存数量',
          align: 'center',
          dataIndex: 'mainQuantity',
          width: 150

        },
        { title: '库存辅数量',
      /*   { title: '库存辅数量',
          align: 'center',
          dataIndex: 'auxiliaryQuantity',
          width: 150

        },
        {
        }, */
       /*  {
          title: '换算比例',
          align: 'center',
          dataIndex: 'conversionRatio'
        }
        } */
      ],
      selectedRowKeys: [],
      oldSelectRows: [],

 src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementDetailList.vue

@@ -167,29 +167,29 @@

        },
        {
          title: '主单位',
          title: '单位',
          align: 'center',
          dataIndex: 'mainUnitIdName',

        },
        {
          title: '主数量',
          title: '数量',
          align: 'center',
          dataIndex: 'mainQuantity',

        },
        {
       /*  {
          title: '辅数量',
          align: 'center',
          dataIndex: 'auxiliaryQuantity',

        },
        {
        }, */
      /*   {
          title: '辅单位',
          align: 'center',
          dataIndex: 'auxiliaryUnitIdName',

        },
        }, */
        {
          title: '需求日期',
          align: 'center',

 src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue

@@ -59,7 +59,6 @@
          :dataSource='sparesScrapRequirementDetailTable.dataSource'
          :maxHeight='300'
          :disabled='formDisabled'
          @valueChange="changeAuxiliaryQuantity"
          :alwaysEdit='true'
          :rowNumber='true'
          :bordered='bordered'
@@ -182,7 +181,7 @@
          },

          {
            title: '主单位',
            title: '单位',
            key: 'mainUnitIdName',
            type: JVXETypes.normal,
            align:'center',
@@ -191,7 +190,7 @@
            defaultValue: ''
          },
          {
            title: '主单位',
            title: '单位',
            key: 'mainUnitId',
            type: JVXETypes.hidden,
            align:'center',
@@ -199,7 +198,7 @@
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
         /*  {
            title: '辅单位',
            key: 'auxiliaryUnitIdName',
            align:'center',
@@ -216,7 +215,7 @@
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          }, */
          {
            title: '主数量',
            key: 'mainQuantity',
@@ -225,7 +224,7 @@
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: 0,
            Function({cellValue, row, column}){
/*             Function({cellValue, row, column}){
              console.log(cellValue)
              console.log(row)
              console.log(column)
@@ -237,7 +236,7 @@
              }
              console.log(cellValue)
              return cellValue
            },
            }, */
            validateRules: [
              {
                required: true,
@@ -255,7 +254,7 @@
            ]
          },

          {
         /*  {
            title: '辅数量',
            key: 'auxiliaryQuantity',
            type: JVXETypes.normal,
@@ -263,7 +262,7 @@
            align:'center',
            placeholder: '请输入${title}',
            defaultValue: 0
          },
          }, */
          {
            title: '备件id',
            key: 'sparePartId',
@@ -460,13 +459,13 @@
      this.$emit('close')
      this.$refs.form.clearValidate()
    },
    changeAuxiliaryQuantity(target){
/*     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)
      }
    }
    } */
  }
}
</script>

 src/views/spare/modules/sparePartScrapRequirement/SpareRequirementSelectModal.vue

@@ -38,19 +38,19 @@
        </a-row>
        <a-row style='width: 100%'>
          <a-col :span='12'>
            <a-form-model-item label='主单位' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='mainUnitId'>
            <a-form-model-item label='单位' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='mainUnitId'>
              <!--              <a-input v-model='model.mainUnitId' placeholder='请输入主单位' />-->
              <j-dict-select-tag
                allow-clear
                :placeholder="'请选择主单位'"
                :placeholder="'请选择单位'"
                v-model='model.departId'
                dictCode="mom_base_unit,name,id,del_flag!='1'"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span='12'>
<!--          <a-col :span='12'>
            <a-form-model-item label='辅单位' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='auxiliaryUnitId'>
              <!--              <a-input v-model='model.auxiliaryUnitId' placeholder='请输入辅单位' />-->
              &lt;!&ndash;              <a-input v-model='model.auxiliaryUnitId' placeholder='请输入辅单位' />&ndash;&gt;
              <j-dict-select-tag
                allow-clear
                :placeholder="'请选择辅单位'"
@@ -58,7 +58,7 @@
                dictCode="mom_base_unit,name,id,del_flag!='1'"
              />
            </a-form-model-item>
          </a-col>
          </a-col>-->
        </a-row>
        <a-row style='width: 100%'>
          <a-col :span='12'>

 src/views/spare/modules/sparePartScrapRequirement/SpareSelectList.vue

@@ -118,20 +118,20 @@
          width: 150

        },
        {
       /*  {
          title: '辅单位',
          align: 'center',
          dataIndex: 'auxiliaryUnitId_dictText',
          width: 150

        },
        {
        }, */
       /*  {
          title: '换算比例',
          align: 'center',
          width: 100,
          dataIndex: 'conversionRatio'

        }
        } */

      ],
      selectedRowKeys: [],