Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

Fixiaobai

2023-12-15 ad2437550eb0c8f3c3c8736df1a38a713f920ec2

Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

 src/views/equipment/equipment/index.vue

@@ -236,12 +236,12 @@
              type: 'primary',
              fun: this.labelPrint
            },
          // {
          //   text: '同步',
          //   type: 'primary',
          //   loading: false,
          //   fun: this.pullEquipFun
          // }
          {
            text: '同步',
            type: 'primary',
            loading: false,
            fun: this.pullEquipFun
          }
        ],
        operator: [
          {

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

@@ -699,14 +699,14 @@
      },
      dataRule: {
        partNo: [
          { required: true, message: '零件不能为空', trigger: 'change' }
          { required: true, message: '零件不能为空', trigger: 'blur' }
        ],
        bomTypeDb: [
          { required: true, message: '工艺类型不能为空', trigger: 'change' }
        ],
        bomId: [{ required: true, message: 'BOM不能为空', trigger: 'change' }],
        phaseInDate: [
          { required: true, message: '逐步采用日期不能为空', trigger: 'blur' }
          { required: true, message: '逐步采用日期不能为空', trigger: 'change' }
        ],
        alternativeNo: [
          { required: true, message: '替代不能为空', trigger: 'blur' }

 vue.config.js

@@ -5,12 +5,12 @@


// const url = 'http://192.168.2.7:9999'
const url = 'http://localhost:9999'
const url = 'http://192.168.32.45:9999'
//const url = 'http://192.168.2.7:9999'
//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'

// const url = 'http://localhost:9999'
const url = 'http://localhost:9999'


const localUrl = 'http://localhost:8089'