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

houjie

2023-08-23 1ec4da063b3195f4f46af969a9d170bda2df7c2a

 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)