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

licp

2024-04-11 f980b32cd6d51f2208e07d44014fe6b605533b23

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

 src/router/axios.js

@@ -8,7 +8,7 @@
import qs from 'qs'
import store from '@/store' // progress bar style
import { webVersion } from '@/config/sysParam'
axios.defaults.timeout = 60000
axios.defaults.timeout = 20*60*1000
// 返回其他状态吗
axios.defaults.validateStatus = function(status) {
  return status >= 200 && status <= 500 // 默认的

 src/views/plan/customerorder/index.vue

@@ -1011,6 +1011,7 @@
  created() {
    // this.getManufactureAttrs()
    this.getTitles()
    if (this.permissions.plan_customerorder_add) {
    this.table.toolbar.push({
      text: '新增销售订单',
      type: 'primary',
@@ -1018,6 +1019,7 @@
      disabled: false,
      permitArr: [],
    })
    }
    if (this.permissions.customerorder_from_otc) {
      this.table.toolbar.push({
        text: '获取销售订单',
@@ -1064,6 +1066,7 @@
            fun: this.downloadProductionScheduling,
        })
    }
    if(this.permissions.plan_relevance_order){
    this.table.toolbar.push({
      text: '关联订单',
      disabled: false,
@@ -1071,6 +1074,7 @@
      fun: this.interrelatedOrderFun,
      permitArr: [],
    })
    }
    if (this.permissions.customerorder_create_masterplan) {
      this.table.toolbar.push({
        text: '主生产计划',

 src/views/quality/rawMaterial/index.vue

@@ -285,17 +285,19 @@

            })
        }
        this.table.operator = [{
            text: '审核',
            type: 'text',
            size: 'small',
            fun: this.examineHandle,
            showFun: (row)=>{return row.type==='首检'},
            show: {
                key: 'checkState',
                val: ['0']
            }
        }]
        if(this.permissions.quality_rawMaterial_check){
            this.table.operator = [{
                text: '审核',
                type: 'text',
                size: 'small',
                fun: this.examineHandle,
                showFun: (row)=>{return row.type==='首检'&& row.insState==='1'},
                show: {
                    key: 'checkState',
                    val: ['0','2']
                    }
            }]
        }
        if(this.permissions.quality_rawMaterial_del){
            this.table.operator.push({
                    text: '作废',

 src/views/quality/rawMaterial/rawMaterial-form.vue

@@ -704,6 +704,7 @@
          if(res.data.code == 0 && (res.data.data=='1'|| res.data.data=='0')){
            sessionStorage.setItem("raw-resultVal-"+this.dataForm.id,res.data.data)
            this.$message.success("上报成功");
            this.$router.go(-1)
          }else{
            this.$message.error("上报失败，",res.data.data);
          }
@@ -1012,7 +1013,7 @@
                data.rawInsProducts = this.list
                addRawInspects(data).then(res=>{
                    this.$message.success("保存成功")
                    // this.$router.go(-1)
                    this.$router.go(-1)
                }).catch(error=>{
                this.$message.error(error)
                })

 src/views/quality/teststandard/index.vue

@@ -867,8 +867,10 @@
      this.isSubmit = true
      if (this.testStandardParams.length > 0) {
        this.testStandardParams.map(m=>{
            m.referenceValue = m.referenceValue.replace(',','，').replace('(','（').replace(')','）')
          if(m.referenceValue !== undefined) {
              m.referenceValue = m.referenceValue.replace(',','，').replace('(','（').replace(')','）')
            return m
          }
        })
        addTestStandardParam(this.testStandardParams)
          .then((response) => {

 src/views/technology/completeproductstructure/index.vue

@@ -295,6 +295,7 @@
        fun: ()=>{this.deleteAll()},
      })
    }
    if(this.permissions.technology_completeproductstructure_bom_export){
    this.table.toolbar.push({
        text: 'BOM导出',
        type:'primary',
@@ -302,6 +303,7 @@
        permitArr: [],
        fun: ()=>{this.exportBomFun()},
      })
    }
    if(this.permissions.technology_completeproductstructure_del){
        this.table.operator = [
          {

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

@@ -36,6 +36,7 @@
                  style="width:100%"
                  v-model="dataForm.operationNo"
                  placeholder="工序编号"
                  :disabled="isUpdate"
                ></el-input>
              </el-form-item>
            </el-col>
@@ -403,7 +404,8 @@
      workCenterOptions: [],
      runTimeCodeDbOptions: [],
      laborClassNoOptions: [],
      outsideOpItemOptions: []
      outsideOpItemOptions: [],
      isUpdate:false
    }
  },
  computed: {
@@ -512,6 +514,7 @@
    init() {
      // this.operationId = this.dataForm.id
      // this.fetchCapabilityForOperation()
      
      if (this.dataForm.id) {
        getObj(this.dataForm.id).then((response) => {
          this.dataForm = response.data.data
@@ -1067,6 +1070,9 @@

  created() {
    this.dataForm.id = this.$route.params.id
    if(this.dataForm.id){
      this.isUpdate=true
    }
    this.init()
    this.initPartFamilySelect()
    this.getParamType()