Merge branch 'dev' into songshankun/add-token

songshankun

2023-10-13 5e796658635bdfcb7806a49fd424ce08c7f8c4a3

 src/views/sales/quotation/AddQuotationDialog.vue

@@ -30,18 +30,14 @@
                      v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
                      :codenumer="codenumer"
                      :sum="sum"
                      :disabled="editConfig.infomation.id || isIdDisabled"
                    :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
                    >请优先配置编码规范 <el-button type="text" @click="numberClick"> 配置规范 </el-button></span
                  >
                  <span v-else>{{editConfig.title==='新建'? '自动生成': editConfig.infomation.number}}</span>
                  <span v-else>{{ editConfig.title === "新建" ? "自动生成" : editConfig.infomation.number }}</span>
                </el-form-item>
              </el-col>

@@ -316,7 +312,7 @@
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import SelectContactDialog from "@/views/other/commonDialog/SelectContactDialog"
import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
import codeMixin from "@/views/client/followupRecords/mixin/codeMixin";
import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
export default {
  name: "QuotationDialog",
  mixins:[codeMixin],
@@ -391,7 +387,7 @@
      tableData: [],
      productId: 1,
      isNoProduct: true,
      objCode: { name: "", page: 0, pageSize: 0, type: "报价编码",codeStandID:'' },
      objCode: { name: "", page: 0, pageSize: 0, type: "报价编码", codeStandID: "" }
    }
  },
  created() {
@@ -403,22 +399,22 @@
    this.formInfo()
  },
  watch:{
    'editConfig.visible'(val){
    "editConfig.visible"(val) {
      if(val){
        this.formInfo()
      }
    },
    'editConfig.infomation.codeStandID'(){
    "editConfig.infomation.codeStandID"() {
      this.formInfo()
    }
  },
  methods: {
    formInfo(){
      this.objCode.codeStandID = ''
      this.objCode.codeStandID = ""
      if(this.editConfig.infomation.codeStandID){
        this.objCode.codeStandID = this.editConfig.infomation.codeStandID;
        this.objCode.codeStandID = this.editConfig.infomation.codeStandID
      }
      this.getRCodeStandardList();
      this.getRCodeStandardList()
    },
    getCommonData() {
      getAllData()
@@ -505,7 +501,7 @@
        validity_date: data.validity_date || "",
        products: this.tableData,
        codeStandID:data.ID,
        codeRule:this.codeRule,
        codeRule: this.codeRule
      }
      return params
    },