bug修复

yangfeng

2023-08-21 46ed69e3b72658140a40127f4bae16bef9a02d56

 src/views/sales/subOrder/AddSubOrderDialog.vue

@@ -50,10 +50,10 @@
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="销售总单" prop="masterOrderNumber">
                <el-form-item label="销售总单" prop="master_order_number">
                  <div class="custom-name">
                    <el-autocomplete
                      v-model="editConfig.infomation.masterOrderNumber"
                      v-model="editConfig.infomation.master_order_number"
                      :fetch-suggestions="
                        (queryString, callback) => {
                          querySearchAsync(queryString, callback, 'master')
@@ -118,78 +118,22 @@
            产品管理
            <div style="margin-left: 400px">
              币种
              <el-select
                v-model="editConfig.infomation.currency"
                placeholder="请选择"
                size="mini"
                style="width: 63%"
                disabled
              >
                <el-option v-for="item in currencyOptions" :key="item.value" :label="item.label" :value="item.value">
              <el-select v-model="editConfig.infomation.currency" placeholder="请选择" size="mini" style="width: 63%">
                <el-option v-for="item in currencyOptions" :key="item.id" :label="item.name" :value="item.id">
                </el-option>
              </el-select>
            </div>
          </div>
          <div class="product-view">
            <CommonFormTableView :product-table-list="productTableList" />
          </div>
          <!-- 合计 -->
          <div class="basic-info-view">
            <el-row>
              <el-col :span="7" :offset="17">
                <el-form-item prop="discount">
                  <template slot="label">
                    <span>整单折扣</span>
                    <el-select
                      v-model="discount"
                      placeholder="请选择"
                      size="mini"
                      style="width: 104px; margin-left: 3px"
                      disabled
                    >
                      <el-option
                        v-for="item in discountOptions"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value"
                      >
                      </el-option>
                    </el-select>
                  </template>
                  <el-input v-model="editConfig.infomation.discount" disabled></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="7" :offset="17">
                <el-form-item prop="discount">
                  <template slot="label">
                    <span>调整</span>
                    <el-select
                      v-model="adjust"
                      placeholder="请选择"
                      size="mini"
                      style="width: 74px; margin-left: 3px"
                      disabled
                    >
                      <el-option
                        v-for="item in adjustOptions"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value"
                      >
                      </el-option>
                    </el-select>
                  </template>
                  <el-input v-model="editConfig.infomation.discount" disabled></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="7" :offset="17">
                <el-form-item label="合计" prop="total">
                  <el-button type="text" v-model="editConfig.infomation.total" style="color: #555; font-size: 13px">{{
                    editConfig.infomation.total ? editConfig.infomation.total : "0.00"
                  }}</el-button>
                </el-form-item>
              </el-col>
            </el-row>
            <CommonFormTableView
              :show-summary="showSummary"
              :product-table-list="productTableList"
              @inputContent="inputContent"
              @addProductClick="addProductClick"
              @emptyProductClick="emptyProductClick"
              @recalculateProductClick="recalculateProductClick"
              @clearupProduct="clearupProduct"
            />
          </div>
        </div>
      </el-form>
@@ -253,7 +197,7 @@
      },
      memberOptions: [],
      discount: "2",
      currencyOptions: [],
      currencyOptions: [{ id: 1, name: "人民币" }], // 币种
      discountOptions: [
        { value: "1", label: "百分比降价" },
        { value: "2", label: "直接降价" }
@@ -266,9 +210,9 @@
      productTableList: {},
      showSummary: {
        show: true,
        total: false,
        sumProp: ["other1", "other7"],
        mergeNumber: 7
        total: true,
        sumProp: ["Amount", "total"],
        mergeNumber: 2
      },
      editSelectClientConfig: {
        editVisible: false,
@@ -281,7 +225,10 @@
        infomation: {}
      },
      clientId: this.editCommonConfig.infomation.client_id,
      masterId: this.editCommonConfig.infomation.masterOrderId
      masterId: this.editCommonConfig.infomation.masterOrderId,
      tableData: [],
      productId: 1,
      addProductArr: []
    }
  },
  created() {
@@ -307,7 +254,7 @@
    dataProcess() {
      this.masterOrderList.map((item) => {
        if (this.masterId === item.id) {
          this.editConfig.infomation.masterOrderNumber = item.number
          this.editConfig.infomation.master_order_number = item.number
        }
      })
    },
@@ -316,40 +263,38 @@
      this.$refs[formName].validate((valid) => {
        if (valid) {
          console.log(this.editConfig.infomation)
          const params = this.saveParams()
          console.log(params)
          if (this.editConfig.title === "新建") {
            getAddSubOrder(params)
              .then((res) => {
                console.log(res)
                this.editConfig.visible = false
                if (res.code === 200) {
                  this.$message({
                    message: "添加成功",
                    type: "success"
                  })
                  this.$parent.getData()
                }
              })
              .catch((err) => {
                console.log(err)
              })
          for (let i = 0; i < this.tableData.length; i++) {
            if (this.tableData[i].name.length === 0) {
              this.isNoProduct = true
              break
            } else {
              this.isNoProduct = false
            }
          }
          if (this.isNoProduct) {
            this.$message.error("产品名称不能为空")
          } else {
            getUpdateSubOrder(params)
              .then((res) => {
            const params = this.saveParams()
            console.log(params)
            if (this.editConfig.title === "新建") {
              getAddSubOrder(params).then((res) => {
                console.log(res)
                this.editConfig.visible = false
                if (res.code === 200) {
                  this.$message({
                    message: "编辑成功",
                    type: "success"
                  })
                  this.$message.success("添加成功")
                  this.$parent.getData()
                }
              })
              .catch((err) => {
                console.log(err)
            } else {
              getUpdateSubOrder(params).then((res) => {
                console.log(res)
                this.editConfig.visible = false
                if (res.code === 200) {
                  this.$message.success("编辑成功")
                  this.$parent.getData()
                }
              })
            }
          }
        } else {
          console.log("error submit")
@@ -361,21 +306,11 @@
      let data = this.editConfig.infomation
      let params = {
        id: this.editConfig.title === "新建" ? 0 : data.id,
        clientId: parseInt(this.clientId) || 0,
        masterOrderId: parseInt(this.masterId) || 0,
        clientId: this.clientId || 0,
        masterOrderId: this.masterId || 0,
        memberId: data.memberId || 0,
        number: data.number || "",
        product: [
          {
            amount: 0,
            desc: "",
            id: 0,
            name: "",
            number: "",
            price: 0,
            total: 0
          }
        ]
        product: this.tableData
      }
      return params
    },
@@ -390,11 +325,6 @@
      } else if (value === "master") {
        restaurants = this.masterOrderList
      }
      // else if (value === "chance") {
      //   restaurants = this.saleChancelist
      // } else {
      //   restaurants = this.saleLeadlist
      // }
      var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants
      cb(results)
    },
@@ -431,7 +361,7 @@
        this.editConfig.infomation.client_id = row.id
        this.clientId = row.id
      } else if (value == "master") {
        this.editConfig.infomation.masterOrderNumber = row.number
        this.editConfig.infomation.master_order_number = row.number
        this.masterId = row.id
      }
    },
@@ -442,7 +372,7 @@
        this.editConfig.infomation.client_id = 0
        this.clientId = 0
      } else if (value == "master") {
        this.editConfig.infomation.masterOrderNumber = ""
        this.editConfig.infomation.master_order_number = ""
        this.masterId = 0
      }
    },
@@ -451,32 +381,83 @@
    // 设置允许上传文件格式
    setFormatClick() {},
    setTableForm() {
      this.productTableList = {
        tableData: [
      if (this.editConfig.title === "新建" || this.editConfig.infomation.products.length === 0) {
        this.tableData = [
          {
            id: "1",
            productName: "上海有限公司",
            other0: "ZDYBD03-1",
            other1: "12",
            other2: "",
            other6: "3.00",
            other7: "2.00"
            productId: this.productId,
            id: 0,
            amount: 0,
            desc: "",
            name: "",
            number: "",
            price: 0,
            total: 0
          }
        ],
        ]
      } else {
        this.tableData = this.editConfig.infomation.products
        this.tableData.map((item, index) => {
          item.productId = index + 1
        })
      }
      this.productTableList = {
        tableData: this.tableData,
        tableColumn: [
          { label: "#", prop: "id", width: 40 },
          { label: "产品名称", prop: "productName", input: true, isRequird: true },
          { label: "产品编号", prop: "other0" },
          { label: "计量单位", prop: "other2" },
          { label: "规格编号", prop: "other3" },
          { label: "源单类型", prop: "other4" },
          { label: "合同信息", prop: "other5" },
          { label: "数量", prop: "other1", input: true, isRequird: true },
          { label: "含税单价", prop: "other6", input: true },
          { label: "价税合计", prop: "other7", input: true },
          { label: "描述", prop: "other8" }
          { label: "#", prop: "productId", width: 40 },
          { label: "产品名称", prop: "name", productName: true, isRequird: true },
          { label: "产品编号", prop: "number" },
          { label: "数量", prop: "amount", inputNumber: true, isRequird: true },
          { label: "销售单价", prop: "price", inputFloat: true },
          { label: "价税合计", prop: "total", inputFloat: true }
        ]
      }
    },
    // 产品列表输入
    inputContent(val, prop, row) {
      this.productId = row.productId
      this.tableData.map((item) => {
        if (item.productId === row.productId) {
          item[prop] = val
        }
      })
    },
    // 产品新增
    addProductClick() {
      this.productId++
      this.tableData.push({
        productId: this.productId,
        id: 0,
        amount: 0,
        desc: "",
        name: "",
        number: "",
        price: 0,
        total: 0
      })
      this.showSummary.show = true
    },
    //  产品清空
    emptyProductClick() {
      this.productId = 1
      this.tableData = [
        {
          productId: this.productId,
          id: 0,
          amount: 0,
          desc: "",
          name: "",
          number: "",
          price: 0,
          total: 0
        }
      ]
      this.productTableList.tableData = this.tableData
    },
    // 产品重算
    recalculateProductClick() {},
    clearupProduct(data) {
      this.tableData = data
      this.productTableList.tableData = this.tableData
    }
  }
}