src/api/data.js

@@ -216,6 +216,25 @@
    id: 3,
  },
];
// 物料 毛重，净重的单位
const grossUnit=[
  {
    name: "g",
    id: 1,
  },
  {
    name: "kg",
    id: 2,
  },
  {
    name: "吨",
    id: 3,
  },
  {
    name: "斤",
    id: 4,
  },
]
export const getDataByType = (type) => {
  if (type == "purchaseStatus") {
    return purchaseStatus
@@ -241,5 +260,7 @@
    return baseOperationTypeTwo
  }else if(type=='purchaseType'){
    return purchaseType;
  }else if(type=='grossUnit'){
    return grossUnit;
  }
}

 src/views/overview/OverviewListView.vue

@@ -109,7 +109,7 @@
        title: "新建",
        infomation: {}
      },
      workType: this.$route.params.workType,
      workType: this.$route.query.workType,
      keyword: "",
      params: {},
      displayEdit: false,
@@ -120,7 +120,7 @@
      numberLabel: "单号",
      TabsIndex: "0",
      productTableList: {},
      showBottomCol: ["产品编号", "产品名称", "产品规格", "产品型号", "计量单位", "调出位置", "调入位置", "数量","主管","会计","保管员",],
      showBottomCol: ["产品编号", "产品名称", "产品规格", "产品型号", "计量单位", "调出位置", "调入位置", "数量","主管","会计","保管员",'辅助数量','辅助单位'],
      tableBottomColumn: [],
      selectRow: {},
      productColumn: [
@@ -128,8 +128,10 @@
        { label: "产品名称", prop: "productName" },
        { label: "产品规格", prop: "specs" },
        { label: "产品型号", prop: "model" },
        { label: "数量", prop: "amount" },
        { label: "计量单位", prop: "unit" },
        { label: "数量", prop: "amount" }
        { label: "辅助数量", prop: "adjunctAmount" },
        { label: "辅助单位", prop: "adjunctUnit" }
      ],
      allotProductColumn: [
        { label: "产品编号", prop: "id", default: true },
@@ -139,7 +141,9 @@
        { label: "计量单位", prop: "unit" },
        { label: "调出位置", prop: "location" },
        { label: "调入位置", prop: "toLocation" },
        { label: "数量", prop: "amount" }
        { label: "数量", prop: "amount" },
        { label: "辅助数量", prop: "adjunctAmount" },
        { label: "辅助单位", prop: "adjunctUnit" }
      ]
    }
  },
@@ -151,7 +155,8 @@
    if (paramsData) {
      params = JSON.parse(sessionStorage.getItem("paramsData"))
    } else {
      params = this.$route.params
      params = this.$route.query
      params.id=Number(params.id)
      sessionStorage.setItem("paramsData", JSON.stringify(params))
    }
    this.params = params
@@ -318,7 +323,7 @@
    async getData() {
      await getOperation({
        number: this.keyword,
        operationTypeId: this.$route.params.id ? this.$route.params.id : this.params.id,
        operationTypeId: this.$route.query.id ? Number(this.$route.query.id) : this.params.id,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize,
        status: this.params.status
@@ -345,12 +350,27 @@
    // bottom产品信息数据处理
    bottomProductData(arr) {
      const list = arr.details.map((item) => {
        let adjunctUnit=''
        let adjunctAmount=''
        if(item.product.moreUnit&&item.product.moreUnitList){
          let moreUnitList=item.product.moreUnitList
          if(moreUnitList.length>0){
            for(let j in moreUnitList){
              if(moreUnitList[j].floating){
                adjunctUnit=moreUnitList[j].unit
                adjunctAmount=moreUnitList[j].amount
              }
            }
          }
        }
        return {
          ...item,
          productName: item.product.name,
          unit: item.product.unit,
          location: arr.location.name,
          toLocation: arr.toLocation.name
          toLocation: arr.toLocation.name,
          adjunctUnit:adjunctUnit,
          adjunctAmount:adjunctAmount
        }
      })
      this.productTableList.tableInfomation = list

 src/views/overview/index.vue

@@ -95,7 +95,7 @@
      console.log(item)
      this.$router.push({
        name: "overviewList",
        params: { name: item.name, workType: item.baseOperationType, id: item.id, status: status,code:item.warehouse.code }
        query: { name: item.name, workType: item.baseOperationType, id: item.id, status: status,code:item.warehouse.code }
      })
    },
    async getData() {

 src/views/productManage/product/AddProductDialog.vue

@@ -326,7 +326,7 @@
                      </el-option>
                    </el-select>
                  </el-form-item>
                  <el-form-item label="重量" prop="weight" label-width="80px">
                  <!-- <el-form-item label="重量" prop="weight" label-width="80px">
                    <el-input-number
                      v-model="editConfig.infomation.weight"
                      placeholder="请输入"
@@ -337,7 +337,63 @@
                      :disabled="!showFooter"
                    ></el-input-number>
                    <span> kg</span>
                  </el-form-item>
                  </el-form-item> -->
                  <el-form-item label="毛重" prop="grossWeight">
                  <el-col :span="15"
                >
                    <el-input
                        v-model="editConfig.infomation.grossWeight"
                        placeholder="请输入"
                        :disabled="!showFooter"
                      ></el-input>
                  </el-col>
                  <el-col :span="1">&nbsp;</el-col>
                  <el-col :span="4">
                  <el-select
                    v-model="editConfig.infomation.grossUnit"
                    placeholder="单位"
                    filterable
                    :disabled="!showFooter"
                    style="width: 100%; float: right"
                    :popper-append-to-body="false"
                  >
                    <el-option
                      v-for="ele in grossUnitList"
                      :key="ele.id"
                      :label="ele.name"
                      :value="ele.name"
                    ></el-option>
                  </el-select>
                  </el-col>
              </el-form-item>
              <el-form-item label="净重" prop="netWeight">
                <el-col :span="15"
              >
                  <el-input
                      v-model="editConfig.infomation.netWeight"
                      :disabled="!showFooter"
                      placeholder="请输入"
                    ></el-input>
                </el-col>
                <el-col :span="1">&nbsp;</el-col>
                 <el-col :span="4">
                <el-select
                  v-model="editConfig.infomation.netUnit"
                  placeholder="单位"
                  filterable
                  :disabled="!showFooter"
                  style="width: 100%; float: right"
                  :popper-append-to-body="false"
                >
                  <el-option
                    v-for="ele in grossUnitList"
                    :key="ele.id"
                    :label="ele.name"
                    :value="ele.name"
                  ></el-option>
                </el-select>
                </el-col>
              </el-form-item>
                  <el-form-item label="体积" prop="volume" label-width="80px">
                    <el-input-number
                      v-model="editConfig.infomation.volume"
@@ -615,7 +671,29 @@
        // salePrice: [{ required: true, message: "请输入销售价格", trigger: "blur" }],
        unit: [{ required: true, message: "请输入单位", trigger: ["blur"] }],
        // 采购类型
        purchaseTypeList: [{ required: true, message: "请选择", trigger: "blur" }]
        purchaseTypeList: [{ required: true, message: "请选择", trigger: "blur" }],
        netWeight: [
          {
            required: false,
            message: "请填写",
            trigger: "change",
          },
          {
            validator: this.validatorNumFour,
            trigger: "blur",
          },
        ],
        grossWeight: [
          {
            required: false,
            message: "请填写",
            trigger: "change",
          },
          {
            validator: this.validatorNumFour,
            trigger: "blur",
          },
        ],
      },
      memberOptions: [],
      productCategoryOptions: [], // 产品类别
@@ -673,6 +751,7 @@
      isView: false,
      fileFormdata: null, // 上传图片入参
      bomPurchaseTypeList: getDataByType("purchaseType"),
      grossUnitList:getDataByType("grossUnit"),
      unitList: [],
      editRow:{
        editDialogVisible:false,
@@ -701,6 +780,23 @@
    this.getUnitInfo()
  },
  methods: {
    validatorNumFour(rule, value, callback) {
      if (value != "") {
        if (value == undefined || value == null) {
          callback(new Error("请输入有效数字"));
        } else {
          let reg2 =
            /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
          if (!reg2.test(value) || value == 0) {
            callback(new Error("请填写大于零的2位小数的数字"));
          } else {
            callback();
          }
        }
      } else {
        callback();
      }
    },
    // 单位
    handleUnitShow() {
      this.editRow.editDialogVisible = true;