bug修复（5235 5236）

yangfeng

2023-10-17 33836e44d74759010d8e79f3cc702186c4bdf4ea

 src/views/sales/salesReturn/AddSalesReturnDialog.vue

@@ -24,10 +24,26 @@
          <div class="basic-info-view">
            <el-row>
              <el-col :span="12">
                <el-form-item label="销售退货单编号" prop="number">
                  <WordInput
                    v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
                    :codenumer="codenumer"
                    :sum="sum"
                    :disabled="editConfig.title !== '新建' || isIdDisabled"
                    :inputValue="inputValue"
                    @codeList="codeList"
                  />
                  <span v-else-if="method == 0" style="color: #f56c6c"
                    >请优先配置编码规范 <el-button type="text" @click="numberClick"> 配置规范 </el-button></span
                  >
                  <span v-else>{{ editConfig.title === "新建" ? "自动生成" : editConfig.infomation.number }}</span>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="客户名称" prop="client_name">
                  <div class="custom-name">
                    <el-autocomplete
                      style="width:100%"
                      style="width: 100%"
                      v-model="editConfig.infomation.client_name"
                      :fetch-suggestions="
                        (queryString, callback) => {
@@ -50,31 +66,12 @@
                  </div>
                </el-form-item>
              </el-col>

              <el-col :span="12">
                <el-form-item label="销售退货单编号" prop="number">
                  <WordInput
                    v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
                    :codenumer="codenumer"
                    :sum="sum"
                    :disabled="editConfig.infomation.id || isIdDisabled"
                    :inputValue="inputValue"
                    @codeList="codeList"
                  />
                  <span v-else-if="method == 0" style="color: #f56c6c"
                    >请优先配置编码规范
                    <el-button type="text"  @click="numberClick">
                        配置规范
                      </el-button
                    ></span
                  >
                  <span v-else>{{editConfig.title==='新建'? '自动生成': editConfig.infomation.number}}</span>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="合同订单">
                <el-form-item label="销售明细单" prop="salesDetailNumber">
                  <div class="custom-name">
                    <el-autocomplete
                    style="width:100%"
                      style="width: 100%"
                      v-model="editConfig.infomation.salesDetailNumber"
                      :fetch-suggestions="
                        (queryString, callback) => {
@@ -88,7 +85,9 @@
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    </div>
                    <div
                      v-if="editConfig.infomation.number && editConfig.infomation.number.length > 0"
                      v-if="
                        editConfig.infomation.salesDetailNumber && editConfig.infomation.salesDetailNumber.length > 0
                      "
                      class="common-select-btn"
                      @click="clearupClient('contract')"
                    >
@@ -125,7 +124,7 @@
                    value-format="yyyy-MM-dd"
                    type="date"
                    placeholder="选择日期"
                    style="width:100%"
                    style="width: 100%"
                  >
                  </el-date-picker>
                </el-form-item>
@@ -133,14 +132,14 @@
            </el-row>
          </div>
          <!-- 动态信息 -->
          <div class="basic-info-title">动态信息</div>
          <div class="basic-info-view">
          <!-- <div class="basic-info-title">动态信息</div> -->
          <!-- <div class="basic-info-view">
            <el-row>
              <el-col :span="12">
                <el-form-item label="状态" prop="salesReturnStatusId">
                  <div class="common-select">
                    <el-select
                    style="width:100%"
                      style="width: 100%"
                      v-model="editConfig.infomation.salesReturnStatusId"
                      placeholder="请选择"
                      class="common-select-sel"
@@ -148,13 +147,14 @@
                    >
                      <el-option v-for="item in statusOptions" :key="item.id" :label="item.name" :value="item.id">
                      </el-option>
                    </el-select>
                    <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
                  </div>
                    </el-select> -->
          <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
          <!-- </div>
                </el-form-item>
              </el-col>
            </el-row>
          </div>
          </div> -->

          <!-- 备注信息 -->
          <div class="basic-info-title">备注信息</div>
          <div class="basic-info-view">
@@ -162,7 +162,7 @@
              <el-col :span="24">
                <el-form-item label="退货原因" prop="reason" label-width="15%">
                  <el-input
                  style="width:100%"
                    style="width: 100%"
                    type="textarea"
                    :autosize="{ minRows: 2 }"
                    v-model="editConfig.infomation.reason"
@@ -211,6 +211,7 @@
          </div>
          <div class="product-view">
            <CommonFormTableView
              :detail-enter="true"
              :show-summary="showSummary"
              :product-table-list="productTableList"
              @inputContent="inputContent"
@@ -232,7 +233,7 @@
        :edit-common-config="editSelectClientConfig"
        @selClient="selClient"
      />
      <!-- 选择合同订单 -->
      <!-- 销售明细单 -->
      <SelectCommonDialog
        v-if="editSelCommonConfig.editVisible"
        :edit-common-config="editSelCommonConfig"
@@ -247,12 +248,15 @@
import { getAllData } from "@/api/client/client"
import { getAddSalesReturn, getUpdateSalesReturn } from "@/api/sales/salesReturn"
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import { getProductList } from "@/api/common/other"
// import { getProductList } from "@/api/common/other"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
import codeMixin from "@/views/client/followupRecords/mixin/codeMixin";
import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
import { getSalesDetailsList } from "@/api/sales/salesDetails"
import { mapActions } from "vuex"

export default {
  name: "AddSalesReturnDialog",
  mixins:[codeMixin],
  mixins: [codeMixin],
  props: {
    editCommonConfig: {
      type: Object,
@@ -279,9 +283,10 @@
      dialogWidth: "50%",
      editConfig: this.editCommonConfig,
      rules: {
        number: [{ required: true, message: "请输入", trigger: "blur" }],
        repository: [{ required: true, message: "请选择", trigger: "change" }],
        memberId: [{ required: true, message: "请选择负责人", trigger: "change" }]
        number: [{ required: true, message: "请输入销售退货单号", trigger: "blur" }],
        repository: [{ required: true, message: "请选择退入仓库", trigger: "change" }],
        memberId: [{ required: true, message: "请选择负责人", trigger: "change" }],
        salesDetailNumber: [{ required: true, message: "请选择销售明细单", trigger: "change" }]
      },
      memberOptions: [],
      selSourceOrderOptions: [], // 选择源单
@@ -302,8 +307,9 @@
      },
      editSelCommonConfig: {
        editVisible: false,
        title: "",
        infomation: {}
        title: "销售明细单",
        infomation: {},
        clientId: ""
      },
      productId: 1,
      isNoProduct: true,
@@ -316,28 +322,32 @@
    this.$store.dispatch("geSalesDetails")
    this.setTableForm()
    this.getCommonData()
    this.getProductList()
    this.formInfo();
    // this.getProductList()
    this.formInfo()
    if (this.editConfig.title === "编辑") {
      this.productTableList.tableData = this.editConfig.infomation.products
    }
  },
  watch:{
    'editClientManageConfig.visible'(val){
      if(val){
  watch: {
    "editClientManageConfig.visible"(val) {
      if (val) {
        this.formInfo()
      }
    },
    'editClientManageConfig.infomation.codeStandID'(){
    "editClientManageConfig.infomation.codeStandID"() {
      this.formInfo()
    }
  },
  methods: {
    formInfo(){
      this.objCode.type='销售退货编码'
      this.objCode.codeStandID = ''
      if(this.editConfig.infomation.codeStandID){
        this.objCode.codeStandID = this.editConfig.infomation.codeStandID;
    ...mapActions(["getSalesDetailsFliter"]),
    formInfo() {
      this.objCode.type = "销售退货编码"
      this.objCode.codeStandID = ""
      if (this.editConfig.infomation.codeStandID) {
        this.objCode.codeStandID = this.editConfig.infomation.codeStandID
      }
      this.getRCodeStandardList();
    }, 
      this.getRCodeStandardList()
    },
    getCommonData() {
      getAllData()
        .then((res) => {
@@ -350,58 +360,58 @@
        })
    },
    // 获取产品列表
    async getProductList() {
      await getProductList({
        page: 0,
        pageSize: 0,
        productName: "",
        productNumber: ""
      }).then((res) => {
        console.log(res)
      })
    },
    // async getProductList() {
    //   await getProductList({
    //     page: 1,
    //     pageSize: 15,
    //     productName: "",
    //     productNumber: ""
    //   }).then((res) => {
    //     console.log(res)
    //   })
    // },
    // 保存
    saveClick(formName) {
      this.$refs[formName].validate((valid) => {
        if (valid) {
          console.log(this.editConfig.infomation)
          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("产品名称不能为空")
          // 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 {
          const params = this.saveParams()
          console.log(params)
          if (this.editConfig.title === "新建") {
            getAddSalesReturn(params).then((res) => {
              console.log(res)
              this.editConfig.visible = false
              if (res.code === 200) {
                this.$message.success("添加成功")
                this.$parent.getData()
              }
            })
          } else {
            const params = this.saveParams()
            console.log(params)
            if (this.editConfig.title === "新建") {
              getAddSalesReturn(params).then((res) => {
                console.log(res)
                this.editConfig.visible = false
                if (res.code === 200) {
                  this.$message.success("添加成功")
                  this.$parent.getData()
                }
              })
            } else {
              getUpdateSalesReturn(params).then((res) => {
                console.log(res)
                this.editConfig.visible = false
                if (res.code === 200) {
                  this.$message.success("编辑成功")
                  this.$parent.getData()
                }
              })
            }
            getUpdateSalesReturn(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")
          return false
        }
        // } else {
        //   console.log("error submit")
        //   return false
        // }
      })
    },
    saveParams() {
@@ -418,7 +428,8 @@
          returnDate: data.returnDate || "",
          salesReturnStatusId: data.salesReturnStatusId || 0,
          sourceId: this.SalesDetailsId,
          sourceType: 1
          sourceType: 1,
          codeRule: this.codeRule
        }
      }
      return params
@@ -446,10 +457,18 @@
        }
      }
    },
    handleSelectClient(value, item) {
    async handleSelectClient(value, item) {
      if (value === "client") {
        this.clientId = item.id
        this.editSelCommonConfig.clientId = item.id
        await getSalesDetailsList({
          clientId: this.clientId
        }).then((res) => {
          this.getSalesDetailsFliter(res.data.list)
        })
      } else if (value === "contract") {
        this.productTableList.tableData = item.products
        this.tableData = item.products
        this.SalesDetailsId = item.id
      }
    },
@@ -460,25 +479,37 @@
      } else if (value === "contract") {
        this.editSelCommonConfig.title = "销售明细单"
        this.editSelCommonConfig.editVisible = true
        this.editSelCommonConfig.client_name = this.editConfig.infomation.client_name
      }
    },
    selClient(row, value) {
    async selClient(row, value) {
      console.log(row, value)
      if (value === "client") {
        this.editConfig.infomation.client_name = row.name
        this.clientId = row.id
        this.editSelCommonConfig.clientId = row.id
        await getSalesDetailsList({
          clientId: row.id
        }).then((res) => {
          this.getSalesDetailsFliter(res.data.list)
        })
      } else if (value === "contract") {
        this.editConfig.infomation.salesDetailNumber = row.number
        this.SalesDetailsId = row.id
        this.productTableList.tableData = row.products
        this.tableData = row.products
      }
    },
    // 清除已选择用户
    clearupClient(value) {
      if (value === "client") {
        this.editConfig.infomation.client_name = ""
        this.clientId = 0
        this.editConfig.infomation = {}
        // this.editConfig.infomation.client_name = ""
        // this.clientId = 0
      } else if (value === "contract") {
        this.editConfig.infomation.salesDetailNumber = ""
        this.productTableList.tableData = []
        this.tableData = []
        this.SalesDetailsId = 0
      }
    },