Merge branch 'dev' into songshankun/add-token

songshankun

2023-10-13 5e796658635bdfcb7806a49fd424ce08c7f8c4a3

 src/views/sales/masterOrder/AddMasterOrderDialog.vue

@@ -34,18 +34,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>
              <el-col :span="12">
@@ -178,8 +174,8 @@
import { getAllData } from "@/api/client/client"
import { getAddMasterOrder, getUpdateMasterOrder } from "@/api/sales/masterOrder"
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import WordInput from "@/components/wordInput.vue";
import codeMixin from "@/views/client/followupRecords/mixin/codeMixin";
import WordInput from "@/components/wordInput.vue"
import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
export default {
  name: "QuotationDialog",
  mixins:[codeMixin],
@@ -220,7 +216,7 @@
        infomation: {}
      },
      clientId: this.editCommonConfig.infomation.client_id,
      objCode: { name: "", page: 0, pageSize: 0, type: "销售总单编码",codeStandID:'' },
      objCode: { name: "", page: 0, pageSize: 0, type: "销售总单编码", codeStandID: "" }
    }
  },
  created() {
@@ -229,22 +225,22 @@
    this.formInfo()
  },
  watch:{
    'editCommonConfig.visible'(val){
    "editCommonConfig.visible"(val) {
      if(val){
        this.formInfo()
      }
    },
    'editCommonConfig.infomation.codeStandID'(val){
    "editCommonConfig.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()
@@ -308,7 +304,7 @@
        number: data.number || "",
        start_time: data.start_time || "",
        codeStandID:data.ID,
        codeRule:this.codeRule,
        codeRule: this.codeRule
      }
      return params
    },