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

houjie

2023-08-23 1ec4da063b3195f4f46af969a9d170bda2df7c2a

 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;