Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-21 d05d95424986dc6e8defefb24fab6dc62e37ee08

 src/views/sales/salesDetails/AddSalesDetailsDialog.vue

@@ -24,7 +24,7 @@
          <div class="basic-info-view">
            <el-row>
              <el-col :span="12">
                <el-form-item label="订单编号" prop="number">
                <el-form-item label="明细单编号" prop="number">
                  <WordInput
                    v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
                    :codenumer="codenumer"
@@ -488,7 +488,8 @@
      editSelectChanceConfig: {
        editVisible: false,
        title: "",
        infomation: {}
        infomation: {},
        search_map: {}
      },
      editSelCommonConfig: {
        editVisible: false,
@@ -496,7 +497,7 @@
        infomation: {}
      },
      clientId: this.editCommonConfig.infomation.client_id,
      saleChanceId: this.editCommonConfig.infomation.saleChanceId,
      saleChanceId: this.editCommonConfig.infomation.sale_chance_id,
      subbillId: this.editCommonConfig.infomation.subbillId,
      productId: 1,
      isNoProduct: true,
@@ -563,6 +564,7 @@
    // 保存
    saveClick(formName) {
      this.$refs[formName].validate((valid) => {
        this.validateFormNumber()
        if (valid) {
          console.log(this.editConfig.infomation)
          for (let i = 0; i < this.tableData.length; i++) {
@@ -699,13 +701,15 @@
    },
    handleSelectClient(value, item) {
      if (value === "client") {
        this.editConfig.infomation.subbill_name =""
        this.editConfig.infomation.sale_chance_name=""
        this.clientId = item.id
        this.editConfig.infomation.client_name = item.name
        this.getSaleChanceList(item)
        this.getSubOrderList(item)
      } else if (value === "chance") {
        this.saleChanceId = item.id
        this.editConfig.infomation.client_name = item.name
        this.editConfig.infomation.sale_chance_name = item.name
      } else if (value === "subbill") {
        console.log("下拉框点击", item)
        this.subbillId = item.id
@@ -726,6 +730,8 @@
    },
    selClient(row, value) {
      if (value === "client") {
        this.editConfig.infomation.sale_chance_name=""
        this.editConfig.infomation.subbill_name=""
        this.editConfig.infomation.client_name = row.name
        this.clientId = row.id
        this.getSaleChanceList(row)
@@ -741,7 +747,9 @@
    // 清除已选择用户
    clearupClient(value) {
      if (value === "client") {
        this.editConfig.infomation.sale_chance_name=""
        this.editConfig.infomation.client_name = ""
        this.editConfig.infomation.subbill_name =""
        this.clientId = 0
      } else if (value === "chance") {
        this.editConfig.infomation.sale_chance_name = ""