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

houjie

2023-08-23 1ec4da063b3195f4f46af969a9d170bda2df7c2a

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

@@ -23,10 +23,18 @@
          </a-col>
          <a-col :span='12'>
            <a-form-model-item label='领用部门' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='departId'>
              <a-select
<!--              <a-select
                :placeholder="'请选择领用部门'"
                :options="this.departs"
                style="width: 100%"
                v-model='model.departId'
              />-->
              <a-tree-select
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择领用部门"
                tree-default-expand-all
                v-model='model.departId'
              />
            </a-form-model-item>
@@ -60,6 +68,8 @@
        <j-vxe-table
          keep-source
          :ref='refKeys[0]'
          :alwaysEdit='true'
          :bordered='bordered'
          :loading='sparesReceiveDetailTable.loading'
          :columns='sparesReceiveDetailTable.columns'
          :dataSource='sparesReceiveDetailTable.dataSource'
@@ -99,7 +109,9 @@
  },
  data() {
    return {
      bordered:true,
      departs: [],
      treeData:[],
      labelCol: {
        xs: { span: 24 },
        sm: { span: 5 }
@@ -143,6 +155,7 @@
            title: '备件编码',
            key: 'spareNum',
            fixed: 'left',
            align:'center',
            type: JVXETypes.normal,
            width: '150px',
            placeholder: '请输入${title}',
@@ -154,12 +167,14 @@
            type: JVXETypes.normal,
            fixed: 'left',
            width: '150px',
            align:'center',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
            title: '型号',
            key: 'model',
            align:'center',
            type: JVXETypes.normal,
            width: '150px',
            placeholder: '请输入${title}',
@@ -168,31 +183,35 @@
          {
            title: '规格',
            key: 'specification',
            align:'center',
            type: JVXETypes.normal,
            width: '150px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
            title: '主单位',
            title: '单位',
            key: 'mainUnitIdName',
            type: JVXETypes.normal,
            align:'center',
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
            title: '主单位',
            title: '单位',
            key: 'mainUnitId',
            type: JVXETypes.hidden,
            align:'center',
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
        /*   {
            title: '辅单位',
            key: 'auxiliaryUnitIdName',
            type: JVXETypes.normal,
            align:'center',
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
@@ -201,18 +220,20 @@
            title: '辅单位',
            key: 'auxiliaryUnitId',
            type: JVXETypes.hidden,
            align:'center',
            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
@@ -222,7 +243,7 @@
              }
              return cellValue

            },
            }, */
            validateRules: [
              {
                required: true,
@@ -240,23 +261,25 @@
            ]
          },

          {
        /*   {
            title: '辅数量',
            key: 'auxiliaryQuantity',
            align:'center',
            type: JVXETypes.normal,
            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)
@@ -266,7 +289,7 @@
              }
              return cellValue

            },
            }, */
            validateRules: [
              {
                required: true,
@@ -285,14 +308,15 @@
              }
            ]
          },
          {
        /*   {
            title: '领用辅数量',
            align:'center',
            key: 'receiveMainQuantity',
            type: JVXETypes.hidden,
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          }, */



@@ -300,12 +324,14 @@
            title: '备件id',
            key: 'sparePartId',
            type: JVXETypes.hidden,
            align:'center',
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
            title: '备件库存id',
            align:'center',
            key: 'sparePartInventoryId',
            type: JVXETypes.hidden,
            width: '200px',
@@ -318,6 +344,7 @@
        add: '/spare/sparePartReceive/add',
        edit: '/spare/sparePartReceive/edit',
        getSysDeparts: "/eam/equipment/getSysDeparts",
        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
        sparesReceiveDetail: {
          list: '/spare/sparePartReceive/querySparePartReceiveDeatilByMainId'
        }
@@ -345,13 +372,22 @@
    })
  },
  created() {
    this.getSysDeparts();
    this.initOptions();
  },
  methods: {
    getSysDeparts() {
      getAction(this.url.getSysDeparts).then((res) => {
        if (res.success) {
          this.departs = res.result
        }
      })
    },
    initOptions() {
      getAction(this.url.loadOptions).then(res => {
        if (res.success) {
          this.treeData = res.result
        } else {
          this.$message.warning(res.message)
        }
      })
    },
@@ -387,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)