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

王震

2023-11-22 711f1644225a5ff10afa24dec8cafb1eb5343e6a

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

 src/api/product/personboard.js

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

export function getFeed2(query, workstationId) {
  return request({
    url: '/mes/stock/getFeedingStock2/' + workstationId,
    method: 'get',
    params: query
  })
}

export function getTodoStock(query) {
  return request({
    url: '/mes/stock/getToDealStockByWorkstationId',

 src/views/plan/manufacturingorder/index.vue

@@ -823,14 +823,7 @@
          }
        ],
        toolbar: [],
        operator: [
          // {
          //   text: '查看库存',
          //   type: 'text',
          //   size: 'small',
          //   fun: this.searchStock
          // }
        ],
        operator: null,
        operatorConfig: {
          fixed: 'right',
          label: '操作',

 src/views/plan/masterproductionschedule/index.vue

@@ -626,7 +626,7 @@
        operatorConfig: {
          fixed: 'right',
          label: '操作',
          width: 240,
          width: 140,
          minWidth: 100
        }
      },

 src/views/product/workbench/feed-pane.vue

@@ -1487,11 +1487,11 @@
</template>

<script>
import { getStock, getFeed, getTodoStock, submitInsPart, inputHandle } from '@/api/product/personboard'
import { getStock, getFeed,getFeed2, getTodoStock, submitInsPart, inputHandle } from '@/api/product/personboard'
import { getMaterial } from '@/api/plan/operationtask'
import {
  getERPStockListByPart,
  fetchList
  fetchList,
} from '@/api/warehouse/joinstockorder'
import feedFormDialog from './feed-form'
import returnMaterialFormDialog from './returnmaterial-form'
@@ -1814,7 +1814,7 @@
          this.paramObject,
          this.queryParamThree
        )
        getFeed(query, stationId)
        getFeed2(query, stationId)
          .then((response) => {
            var data = response.data
            if (data.code === 0) {
@@ -2035,8 +2035,7 @@
      getERPStockListByPart({
        partNo: part.partNo,
        partBatchNo: part.partBatchNo
      })
        .then((resp) => {
      }).then((resp) => {
          const respCode = resp.data.code
          const respData = resp.data.data
          if (respCode === 0) {
@@ -2045,8 +2044,7 @@
            this.isSubmit = false
            this.$message.error('库存列表查询失败')
          }
        })
        .catch(() => {
        }).catch(() => {
          this.isSubmit = false
          console.log('查询零件对应的库存列表时，发生错误')
        })

 src/views/product/workbench/operation-task-pane.vue

@@ -728,7 +728,7 @@
                      break
                    }
                  }
                  console.log(this.operationTasks)
                  // console.log(this.operationTasks)
                  // 若当前工单在工单列表未被找到且当前工单状态为已完成或已取消时，则将当前工单重置为空并抛出事件，否则不管
                  if (isResetCurrOpertionTaskFlag) {
                    getOperationTaskById(taskId).then((res) => {

 src/views/quality/exception/exception.vue

@@ -31,8 +31,8 @@
            action="/mes/exception/upload"
            :headers="headers"
            :before-upload="submitUpload"
            :on-preview="handlePreview"
            :on-remove="handleRemove"
            :on-preview="handlePreview"
            :on-success="uploadSuccess"
            :data="paramData"
            :file-list="fileList"
@@ -41,7 +41,7 @@
          >
            <el-button size="small" type="primary">点击上传</el-button>
            <div slot="tip" class="el-upload__tip">
              只能上传jpg图片，且不超过2MB
              只能上传jpg/png图片，且不超过5MB
            </div>
          </el-upload>
        </el-col>
@@ -53,6 +53,9 @@
        @refreshDataList="getData"
      ></table-form>
    </div>
    <el-dialog title="图片预览" width="60%" :visible.sync="previewVisible" top="5vh">
        <img style="width:100%;height: 70vh" :src="dialogImageUrl" alt="">
    </el-dialog>
  </div>
</template>
<style lang="scss" scoped>
@@ -111,6 +114,8 @@
  },
  data() {
    return {
      previewVisible: false,
      dialogImageUrl: null,
      fileList: [],
      headers: {
        Authorization: 'Bearer ' + getStore({ name: 'access_token' })
@@ -293,7 +298,7 @@
      }
    },
    handlePreview(file) {
      window.open(file.url)
      this.previewVisible = true
    },
    uploadSuccess(response, file, fileList) {
      this.getFileList()
@@ -312,6 +317,7 @@
              fileEl = {}
              fileEl.name = attachment.original
              fileEl.url = attachment.url
              this.dialogImageUrl = attachment.url
              fileEl.id = attachment.id
              fileEl.fileName = attachment.fileName
              this.fileList.push(fileEl)
@@ -320,10 +326,22 @@
        })
      }
    },
    submitUpload() {
    submitUpload(file) {
      console.info(this.currentRow && this.currentRow.id)
      console.log(file);
      if (this.currentRow && this.currentRow.id) {
        const maxSize = 5 * 1024 *1024
        let jpgType = 'image/jpeg'
        let pngType = 'image/png'
        if(file.type != jpgType && file.type != pngType){
          this.$message.error('只能上传.jpg/.png类型的图片')
          return false
        }
        if(file.szie > maxSize){
          this.$message.error('图片大小不能超过5MB')
        }
        this.paramData.exceptionId = this.currentRow.id

      } else {
        this.$message.error('请先选择生产异常记录')
        return false

 vue.config.js

@@ -2,10 +2,11 @@
 * 配置参考:
 * https://cli.vuejs.org/zh/config/
 */
// const url = 'http://192.168.0.23:9999'
const url = 'http://192.168.83.249:9999'

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

// const url = 'http://ztt-gateway:9999'
const localUrl = 'http://localhost:8089'