yangfeng
2023-10-13 df7cd8c77806c252d865f50ad6a3ca8c725586f7
bug修复(5156)
3个文件已修改
182 ■■■■ 已修改文件
src/views/client/followupRecords/mixin/codeMixin.js 108 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sales/masterOrder/AddMasterOrderDialog.vue 72 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/service/clientServiceOrder/mixin/codeMixin.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/client/followupRecords/mixin/codeMixin.js
@@ -1,8 +1,8 @@
import WordInput from "@/components/wordInput";
import { getCodeStandardList } from "@/api/common/standard";
import WordInput from "@/components/wordInput"
import { getCodeStandardList } from "@/api/common/standard"
export default {
  components: {
    WordInput,
    WordInput
  },
  data() {
    return {
@@ -14,90 +14,88 @@
      codenumer: 0, //每次输入的编码
      codenumberList: [], //整条编码
      sum: 0,
      method:0,
      objCode: { name: "", page: 0, pageSize: 0, type: "跟进记录编码",codeStandID:'' },
      codeRule:{},
    };
      method: 0,
      objCode: { name: "", page: 0, pageSize: 0, type: "跟进记录编码", codeStandID: "" },
      codeRule: {}
    }
  },
  methods: {
    async getRCodeStandardList() {
      try {
        const res = await getCodeStandardList(this.objCode);
        this.codenumer = [];
        this.sum = 0;
        this.explain = "";
        if(res.data.code==200){
        const res = await getCodeStandardList(this.objCode)
        this.codenumer = []
        this.sum = 0
        this.explain = ""
        if (res.data.code == 200) {
          const {
            List = [],
            ID,
            AutoRule = {},
            Method,
          } = (res.data.data&&res.data.data.data) ? res.data.data.data[0] : [];
          this.codeRule= (res.data.data&&res.data.data.data) ? res.data.data.data[0]:{}
          let autoRule=AutoRule
          let method=Method?Method:0
          this.method=method
          let rules=List
          this.editConfig.infomation.ID=ID
            Method
          } = res.data.data && res.data.data.data ? res.data.data.data[0] : []
          this.codeRule = res.data.data && res.data.data.data ? res.data.data.data[0] : {}
          let autoRule = AutoRule
          let method = Method ? Method : 0
          this.method = method
          let rules = List
          this.editConfig.infomation.ID = ID
          if (method == 0 && res.data.data.data.length > 0) {
            console.log("sss")
            rules.forEach((item, index) => {
              // setTimeout(() => {
              //   this.codenumer = item.length;
              //   this.sum++;
              // }, 200);
              this.codenumer.push(item.Length);
              this.sum++;
              this.explain += item.Name + (index === rules.Length - 1 ? "" : "/");
            });
              this.codenumer.push(item.Length)
              this.sum++
              this.explain += item.Name + (index === rules.Length - 1 ? "" : "/")
            })
          }
          console.log(method)
          if (method == 1) {
            if (Object.keys(autoRule).length > 0) {
              this.isIdDisabled = true;
              this.isIdDisabled = true
              if (autoRule.PrefixMethod == 1) {
                let prefix = autoRule.PrefixValue.split("").length;
                this.codenumer.push(prefix);
                let prefix = autoRule.PrefixValue.split("").length
                this.codenumer.push(prefix)
                if (autoRule.SuffixMethod == 2) {
                  this.codenumer.push(8);
                  this.codenumer.push(8)
                }
                if (autoRule.AutoLength) {
                  this.codenumer.push(autoRule.AutoLength);
                  this.codenumer.push(autoRule.AutoLength)
                }
                this.sum = prefix + Number(autoRule.AutoLength);
                this.sum = prefix + Number(autoRule.AutoLength)
                this.codeList(
                  this.editConfig.infomation.number ? this.editConfig.infomation.number : autoRule.PrefixValue
                );
                return true;
                )
                return true
              }
            }
          }
          if(this.editConfig.infomation.id){
            this.codeList( this.editConfig.infomation.number);
          if (this.editConfig.title !== "新建") {
            this.codeList(this.editConfig.infomation.number)
          }
          this.$forceUpdate();
        }else{
          this.$message.error(res.data.msg?res.data.msg:'获取编码规范失败,请重试!')
          this.$forceUpdate()
        } else {
          this.$message.error(res.data.msg ? res.data.msg : "获取编码规范失败,请重试!")
        }
      } catch (err) {
        console.log(err);
        console.log(err)
      }
    },
    codeList(val) {
      console.log(val,'===val  codelist')
      this.inputValue = val;
      this.codenumberList = val.toString();
      this.editConfig.infomation.number =
        this.codenumberList.length > 0
          ? this.codenumberList.replace(/,/g, "")
          : "";
      console.log(this.codenumberList.replace(/,/g, ""));
      console.log(val, "===val  codelist")
      this.inputValue = val
      this.codenumberList = val.toString()
      this.editConfig.infomation.number = this.codenumberList.length > 0 ? this.codenumberList.replace(/,/g, "") : ""
      console.log(this.codenumberList.replace(/,/g, ""))
    },
    // 配置编码规范的跳转
    numberClick(){
      window.open('http://www.fai365.com:9080/facilty','_blank')
    },
  },
};
    numberClick() {
      window.open("http://www.fai365.com:9080/facilty", "_blank")
    }
  }
}
src/views/sales/masterOrder/AddMasterOrderDialog.vue
@@ -23,29 +23,25 @@
          <div v-if="isUnflod" class="basic-info-title">基本信息</div>
          <div class="basic-info-view">
            <el-row>
<!--              <el-col v-if="isUnflod" :span="12">-->
<!--                <el-form-item label="单据编号" prop="number">-->
<!--                  <el-input v-model="editConfig.infomation.number"></el-input>-->
<!--                </el-form-item>-->
<!--              </el-col>-->
              <!--              <el-col v-if="isUnflod" :span="12">-->
              <!--                <el-form-item label="单据编号" prop="number">-->
              <!--                  <el-input v-model="editConfig.infomation.number"></el-input>-->
              <!--                </el-form-item>-->
              <!--              </el-col>-->
              <el-col v-if="isUnflod" :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"
                    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
                    >请优先配置编码规范 <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,11 +174,11 @@
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],
  mixins: [codeMixin],
  props: {
    editCommonConfig: {
      type: Object,
@@ -195,7 +191,7 @@
      }
    }
  },
  components: {WordInput, SelectClientDialog },
  components: { WordInput, SelectClientDialog },
  computed: {
    clientList() {
      return this.$store.state.getClientName.clientList
@@ -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() {
@@ -228,23 +224,23 @@
    this.getCommonData()
    this.formInfo()
  },
  watch:{
    'editCommonConfig.visible'(val){
      if(val){
  watch: {
    "editCommonConfig.visible"(val) {
      if (val) {
        this.formInfo()
      }
    },
    'editCommonConfig.infomation.codeStandID'(val){
    "editCommonConfig.infomation.codeStandID"() {
      this.formInfo()
    }
  },
  methods: {
    formInfo(){
      this.objCode.codeStandID = ''
      if(this.editConfig.infomation.codeStandID){
        this.objCode.codeStandID = this.editConfig.infomation.codeStandID;
    formInfo() {
      this.objCode.codeStandID = ""
      if (this.editConfig.infomation.codeStandID) {
        this.objCode.codeStandID = this.editConfig.infomation.codeStandID
      }
      this.getRCodeStandardList();
      this.getRCodeStandardList()
    },
    getCommonData() {
      getAllData()
@@ -291,10 +287,10 @@
     * 强制刷新form组件
     * 外部更改表单值不会触发表单校验,导致即使有值夜被表单校验阻塞住
     */
    refresh(){
      this.refreshFlag=false
      requestAnimationFrame(()=>{
        this.refreshFlag=true
    refresh() {
      this.refreshFlag = false
      requestAnimationFrame(() => {
        this.refreshFlag = true
      })
    },
    saveParams() {
@@ -307,8 +303,8 @@
        money: data.money || 0,
        number: data.number || "",
        start_time: data.start_time || "",
        codeStandID:data.ID,
        codeRule:this.codeRule,
        codeStandID: data.ID,
        codeRule: this.codeRule
      }
      return params
    },
@@ -399,7 +395,7 @@
            font-size: 18px;
            cursor: pointer;
          }
          .el-autocomplete{
          .el-autocomplete {
            flex: 1;
          }
        }
src/views/service/clientServiceOrder/mixin/codeMixin.js
@@ -74,7 +74,7 @@
              }
            }
          }
          if (this.editConfig.infomation.id) {
          if (this.editConfig.title !== "新建") {
            this.codeList(this.editConfig.infomation.serviceNumber)
          }