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

王震

2023-12-25 1177e0550f0e80e759664d98d83b2bcef5a6acc0

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

 src/api/plan/productionschedul.js

@@ -23,6 +23,14 @@
  })
}

export function checkTimeLines(data) {
  return request({
    url: '/mes/productionSchedul/checkTimeLines',
    method: 'post',
    data: data
  })
}

export function deleteSchedul(mId) {
  return request({
    url: '/mes/productionSchedul/'+mId,

 src/views/plan/productionschedul/index.vue

@@ -185,6 +185,7 @@
  fillTime,
  deleteSchedul,
  updateState,
  checkTimeLines,
} from '@/api//plan/productionschedul'
import ttable from '@/views/common/ztt-table.vue'
import { mapGetters } from 'vuex'
@@ -547,8 +548,18 @@
        this.$message.error("请至少选择一条数据")
        return
      }
      this.scheduleEditList = JSON.parse(JSON.stringify(this.scheduleList))
      this.dialogVisible = true
      let mIds = this.multipleSelection.map(ele=>{
        return ele.mid
      })
      checkTimeLines(mIds).then(res=>{
        console.log(res);
        if(res.data.code===200){
          this.scheduleEditList = JSON.parse(JSON.stringify(this.scheduleList))
          this.dialogVisible = true
        }
      }).catch(error=>{
        console.error(error);
      })
    },
    confirmEditSchedul(){
      let data = this.scheduleEditList

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

@@ -28,16 +28,16 @@
            </el-col>
              <el-col :span="6">
                <el-form-item label="零件号" prop="code">
                <el-input v-model="dataForm.code" disabled>
                <el-input v-model="dataForm.code">
                  <el-button
                    slot="append"
                    icon="el-icon-search"
                    :disabled="resultVal!=null && dataForm.id!=null"
                    :disabled="resultVal!=null"
                    @click="queryCode"></el-button>
                    <el-button
                    slot="append"
                    icon="el-icon-full-screen"
                    :disabled="resultVal!=null && dataForm.id!=null"
                    :disabled="resultVal!=null"
                    @click="Turnonthecamera"></el-button>
                </el-input>
                </el-form-item>
@@ -241,6 +241,7 @@
              element-loading-text="请稍等，文件上传中"
            >
              <el-upload
                :disabled="dataForm.rawInsNo==null"
                drag
                ref="upload"
                action="/mes/rawInsProduct/upload"
@@ -493,6 +494,10 @@
    methods:{
      tabsClick(tab,even){
        if(tab.index == 1){
          if(this.dataForm.rawInsNo==null){
            this.$message.error("请先保存原材料检验信息")
            return
          }
            this.getConfigFiles();
        }
      },
@@ -518,13 +523,11 @@
            cancelButtonText: '取消',
            type: 'warning',
            closeOnClickModal: false
          }).then(function() {
            return deleteProcessConfigFile(row.id)
          }).then((data) => {
            this.getConfigFiles()
          })
            .then(function() {
              return deleteProcessConfigFile(row.id)
            })
            .then((data) => {
              this.getConfigFiles()
            })
      },
      submitUpload() {
        this.paramData.rawInsNo = this.dataForm.rawInsNo
@@ -539,7 +542,6 @@
        this.deviceCode = false
      },
      getDeviceResultInfo(val){
        console.log("扫描后数据",val);
        let id=val.split("id@")[1]
        if(id!=undefined&&id!=''&&id!=null){
          let filterData=this.deviceList.filter(item=>{

 src/views/technology/routing/index.vue

@@ -16,13 +16,13 @@
          <el-button v-if="permissions.technology_routing_add"
          type="primary" @click="addOrUpdateHandle">新增</el-button>
          <el-button @click="() => {this.approveHandle('ACCEPT')}" 
          :disabled="uniqueStateArr.includes('01draft')"
          :disabled="!uniqueStateArr.includes('01draft')"
          v-if="permissions.technology_routing_accept">批准</el-button>
          <el-button @click="() => {this.approveHandle('REVOKE')}" 
          :disabled="uniqueStateArr.includes('02accepted')"
          :disabled="!uniqueStateArr.includes('02accepted')"
          v-if="permissions.technology_routing_revoke">撤回</el-button>
          <el-button @click="() => {this.approveHandle('CANCEL')}"
          :disabled="uniqueStateArr.includes('02accepted')"
          :disabled="!uniqueStateArr.includes('02accepted')"
          v-if="permissions.technology_routing_cancel">拒绝</el-button>
          <el-button @click="copyRouting"
          v-if="permissions.technology_routing_cancel">复制</el-button>

 vue.config.js

@@ -5,7 +5,7 @@


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

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