Merge branch 'dev_天津军泰伟业' of http://114.132.189.42:9002/r/product-inventory...

zhangwencui

6 天以前 a54ac80a89efee9823a9f4b9e1f66bec1a0d3eac

Merge branch 'dev_天津军泰伟业' of http://114.132.189.42:9002/r/product-inventory-management into dev_天津军泰伟业

 src/views/basicData/product/index.vue

@@ -413,11 +413,16 @@
        _modelForm.model = _modelForm.otherModel;
      }
      delete _modelForm.otherModel;
      // 将选中的机器数组转换为逗号分隔的字符串
      // 确保 speculativeTradingName 是数组类型，然后转换为逗号分隔的字符串
      let speculativeTradingNameValue = modelForm.value.speculativeTradingName;
      if (!Array.isArray(speculativeTradingNameValue)) {
        // 如果不是数组，转换为数组
        speculativeTradingNameValue = speculativeTradingNameValue.split(',').filter(item => item);
      }
      const submitData = {
        ..._modelForm,
        productId: currentId.value,
        speculativeTradingName: modelForm.value.speculativeTradingName.join(',')
        speculativeTradingName: speculativeTradingNameValue.join(',')
      };
      addOrEditProductModel(submitData).then((res) => {
        proxy.$modal.msgSuccess("提交成功");

 src/views/salesManagement/salesLedger/index.vue

@@ -149,7 +149,7 @@
          <el-table-column align="center" label="序号" type="index" width="60" />
          <el-table-column label="产品大类" prop="productCategory" />
          <el-table-column label="规格型号" prop="specificationModel" />
          <el-table-column label="绑定机器" prop="speculativeTradingName" />
<!--          <el-table-column label="绑定机器" prop="speculativeTradingName" />-->
          <el-table-column label="单位" prop="unit" />
          <el-table-column label="数量" prop="quantity" />
          <el-table-column label="税率(%)" prop="taxRate" />
@@ -217,13 +217,13 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="24">
            <el-form-item label="绑定机器：">
              <el-input v-model="productForm.speculativeTradingName" placeholder="请先选择规格型号" clearable disabled />
            </el-form-item>
          </el-col>
        </el-row>
<!--        <el-row :gutter="30">-->
<!--          <el-col :span="24">-->
<!--            <el-form-item label="绑定机器：">-->
<!--              <el-input v-model="productForm.speculativeTradingName" placeholder="请先选择规格型号" clearable disabled />-->
<!--            </el-form-item>-->
<!--          </el-col>-->
<!--        </el-row>-->
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="单位：" prop="unit">
@@ -669,7 +669,7 @@
  if (index !== -1) {
    productForm.value.specificationModel = modelOptions.value[index].model;
    productForm.value.unit = modelOptions.value[index].unit;
    productForm.value.speculativeTradingName = modelOptions.value[index].speculativeTradingName || "";
    // productForm.value.speculativeTradingName = modelOptions.value[index].speculativeTradingName || "";
  } else {
    productForm.value.specificationModel = null;
    productForm.value.unit = null;