合并

licp

2024-04-24 18f93f25e8aea5eb0a35a5526fa8de7f4553b75f

合并

 src/views/basic/template/index.vue

@@ -616,6 +616,12 @@
      var obj = {}
      obj.technologyOperationParamId = row.id
      obj.technologyOperationTemplateId = row.technologyOperationTemplateId
      if(row.defaultValue!=null){
        row.defaultValue=row.defaultValue.replace(',','，').replace('(','（').replace(')','）')
          if (!isNaN(row.defaultValue)) {
            row.defaultValue='='+row.defaultValue
          }
      }
      obj.defaultValue = row.defaultValue
      putRelateOperationParamTemplate(obj).then((response) => {
        this.$message.success('参数保存成功')

 src/views/plan/manufacturingorder/productorder-form.vue

@@ -2100,18 +2100,15 @@
    },
    // 保存所有参数的修改
    saveAllParamChange() {
      const paramJson = { routingOperationParam: this.templateParamList }
      let num = 0
      this.templateParamList.forEach(e=>{
        var regex=/^[^\(\)|^,]+$/;
        if(!regex.test(e.paramValue)){
            num+=1
        if(e.paramValue!=null){
          e.paramValue=e.paramValue.replace(',','，').replace('(','（').replace(')','）')
          if (!isNaN(e.paramValue)) {
            e.paramValue='='+e.paramValue
          }
        }
      })
      if(num>0){
        this.$message.error("参数值不能包含英文括号或逗号,请检查")
        return
      }
      const paramJson = { routingOperationParam: this.templateParamList }
      putRoutingTemplateParamForOrder(paramJson).then((response) => {
        const data = response.data
        if (data.code === 0) {

 src/views/plan/operationtask/operationtask-form.vue

@@ -592,6 +592,9 @@
        workCenter: [
          { required: true, message: '工作中心不能为空', trigger: 'change' }
        ],
        workstations: [
          { required: true, message: '工作站不能为空', trigger: 'change' }
        ],
        plannedQuantity: [
          { required: true, message: '接收数量不能为空', trigger: 'blur' },
          { validator: validateSixDecimalNotNull, trigger: 'blur' }

 src/views/technology/routing/routing-form.vue

@@ -1429,18 +1429,15 @@
    },
    // 保存所有参数的修改
    saveAllParamChange() {
      const paramJson = { routingOperationParam: this.paramData }
      let num = 0
      this.paramData.forEach(e=>{
        var regex=/^[^\(\)|^,]+$/;
        if(!regex.test(e.paramValue)){
            num+=1
        if(e.paramValue!=null){
        e.paramValue=e.paramValue.replace(',','，').replace('(','（').replace(')','）')
          if (!isNaN(e.paramValue)) {
            e.paramValue='='+e.paramValue
          }
        }
      })
      if(num>0){
        this.$message.error("参数值不能包含英文括号或逗号,请检查")
        return
      }
      const paramJson = { routingOperationParam: this.paramData }
      putRoutingTemplateParam(paramJson).then((response) => {
        const data = response.data
        if (data.code == 0) {

 vue.config.js

@@ -13,8 +13,8 @@



const url = 'https://ztms-mes.chinaztt.cn/'
// const url = 'http://localhost:9999'
//const url = 'https://ztms-mes.chinaztt.cn/'
const url = 'http://localhost:9999'
// const url = 'http://192.168.32.45:9999'