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

王震

2024-01-22 9b7448cd16743f59aa8148221732daea8c4ce485

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

 src/api/equipment/mouldRecord.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
import request from '@/router/axios'

export function fetchList(query) {
  return request({
    url: '/mes/mouldRecord/page',
    method: 'get',
    params: query
  })
}

 src/api/equipment/moulde.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
import request from '@/router/axios'

export function fetchList(query) {
  return request({
    url: '/mes/mould/page',
    method: 'get',
    params: query
  })
}

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

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

export function delById(id) {
  return request({
    url: '/mes/mould/'+id,
    method: 'delete',
  })
}

 src/views/common/ztt-table.vue

@@ -509,7 +509,7 @@
                åªèƒ½ä¸Šä¼ xlsx/xls文件，且不超过10M<el-button
                  type="text"
                  style="font-size:14px;text-decoration: underline;"
                  @click="downDataTemplate(uploadInfo.fileName)"   
                  @click="downDataTemplate(uploadInfo.fileName)"
                  v-if="uploadInfo.download"
                  >下载模板</el-button
                >

 src/views/equipment/mould/index.vue

@@ -1,33 +1,60 @@
<template>
  <div class="mod-config">
      <basic-container>
      <ttable
      :table="table"
      :isShowHide="true"
      :ajaxFun="ajaxFun"
      :prelang="prelang"
      :options="options" 
      ref="processconfiguration"
      >
      <template #toolbar></template>
      </ttable>
        <ttable
        @handleSelectionChange="handleSelectionChange"
        :table="table"
        :ajaxFun="ajaxFun"
        :prelang="prelang"
        :options="options"
        ref="mouldTable"
        class="mouldTable"
        >
        <template #toolbar></template>
        </ttable>
      </basic-container>
      <table-form
        v-if="addOrUpdateVisible"
      ></table-form>
      <el-dialog
        :title="editRow==null ? '新增':'修改'"
        :visible.sync="dialogVisible"
        width="40%">
            <el-form :model="editRow" label-position="right" label-width="100px" ref="editForm" :rules="editRules">
                <el-form-item prop="code" label="模具编码">
                    <el-input v-model="editRow.code" placeholder="请输入模具编码称"></el-input>
                </el-form-item>
                <el-form-item prop="name" label="模具名称">
                    <el-input v-model="editRow.name" placeholder="请输入模具名称"></el-input>
                </el-form-item>
            </el-form>
        <span slot="footer" class="dialog-footer">
            <el-button @click="dialogVisible = false">取 æ¶ˆ</el-button>
            <el-button type="primary" @click="confirmSaveOrUpdateMould">ç¡® å®š</el-button>
        </span>
        </el-dialog>
  </div>
</template>

<script>
import ttable from '@/views/common/ztt-table.vue'
import { page, } from '@/api/equipment/mould'
import TableForm from './mould-from.vue'
import * as fecha from 'element-ui/lib/utils/date'
import { fetchList,addMould,updateMould,delById } from '@/api/equipment/moulde'
import { mapGetters } from 'vuex'
export default {
  data(){
      return {
          ajaxFun: page,
          prelang: 'operation',
          addOrUpdateVisible: false,
          diaPrintTab: false,
          editRules: {
            code: [{required:true,message:'请输入模具编号',trigger:'blur'}],
            name: [{required:true,message:'请输入模具名称',trigger:'blur'}]
          },
          editRow: {
            code: null,
            name: null,
          },
          dialogVisible: false,
          ajaxFun: fetchList,
          prelang: 'moudle',
          multipleSelection: [],
          dataListLoading: false,
          options: {
              height: 300, // é»˜è®¤é«˜åº¦-为了表头固定
              stripe: true, // æ˜¯å¦ä¸ºæ–‘马纹 table
@@ -50,86 +77,155 @@
              // æ ‡é¢˜
              column: [
                {
                  minWidth: '140',
                  prop: 'packageNo',
                  label: '设备',
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                },{
                  minWidth: '140',
                  prop: 'outBatchNo',
                  minWidth: '140px',
                  prop: 'code',
                  label: '模具编号',
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                 
                  render: { fun: this.addOrUpdateHandle }
                },
                {
                  minWidth: '140',
                  prop: 'partNo',
                  minWidth: '140px',
                  prop: 'name',
                  label: '模具名称',
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                },
                {
                  minWidth: '140',
                  prop: 'partName',
                  label: '工序',
                  minWidth: '140px',
                  prop: 'createUser',
                  label: '责任人',
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                },
                {
                  minWidth: '140',
                  prop: 'specs',
                  label: '工步',
                  minWidth: '140px',
                  prop: 'status',
                  label: '模具状态',
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                },
                {
                  minWidth: '140',
                  prop: 'unit',
                  label: '寿命转换系数',
                  minWidth: '140px',
                  prop: 'createTime',
                  label: '创建时间',
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                  searchInfoType: 'date',
                  formatter: this.formatDateTime
                },
              ],
              toolbar: [{
                text: '新增',
                type: 'primary',
                fun: this.addOrUpdateHandle
                }],
              operator: [{
                text: '删除',
                type: 'text',
                size: 'small',
                fun: this.deleteHandle
              }],
              toolbar: [],
              operator: null,
              operatorConfig: {
                fixed: 'right',
                label: '操作',
                width: 100,
                minWidth: 100
                },
              },
          },
     }
  },
  // computed: {
  //   ...mapGetters(['permissions'])
  // },
  computed: {
    ...mapGetters(['permissions'])
  },
  components: {
    ttable,
    TableForm
  },
  watch: {
    dialogVisible(newVal){
        if(!newVal){
            this.editRow = {
                code: null,
                name: null,
            }
        }
    }
  },
  created(){
    if(this.permissions.equipment_mould_add){
        this.table.toolbar.push({
            text: '新增',
            type: 'primary',
            fun: this.addOrUpdateHandle
        })
    }
    if(this.permissions.equipment_mould_del){
        this.table.operator = [{
            text: '删除',
            type: 'text',
            fun: this.deleteHandle
        }]
    }
  },
  mounted(){

  },
  methods: {
        addOrUpdateHandle() {
          this.addOrUpdateVisible = true
          console.log(this.addOrUpdateVisible,"--=--");
        },
    handleSelectionChange(val) {
      this.multipleSelection = val
    },
    deleteHandle(row){
        this.$confirm('是否确认删除模具名称为' + row.name, '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
          closeOnClickModal: false,
          type: 'warning'
        })
          .then(function() {
            return delById(row.id)
          }).then((data) => {
            this.$message.success('删除成功')
            this.getData()
          })
    },
    confirmSaveOrUpdateMould(){
        this.$refs.editForm.validate(valid=>{
            if(valid){
                if(this.editRow.id){
                    updateMould(this.editRow).then(res=>{
                        if(res.status===200){
                            this.$message.success("修改成功")
                            this.getData()
                        }
                    }).catch(error=>{
                        console.error(error)
                    })
                }else{
                    addMould(this.editRow).then(res=>{
                        if(res.status===200){
                            this.$message.success("新增成功")
                            this.getData()
                        }
                    }).catch(error=>{
                        console.error(error)
                    })
                }
                this.dialogVisible = false
            }
        })
    },
    addOrUpdateHandle(row){
        if(row){
            this.editRow = row
        }
        this.dialogVisible = true
    },
    formatDateTime(row, column, cellValue) {
        return cellValue ? fecha.format(new Date(cellValue), 'yyyy-MM-dd HH:mm:ss') : ''
    },
    getData() {
      this.$refs.mouldTable.getDataList()
    },
  },
}
</script>
</script>
<style scoped>
.mouldTable >>>.el-table__fixed-right .el-table__fixed-body-wrapper {
  top: 74px !important;
}
</style>

 src/views/equipment/mouldrecord/index.vue

@@ -6,7 +6,7 @@
      :isShowHide="true"
      :ajaxFun="ajaxFun"
      :prelang="prelang"
      :options="options" 
      :options="options"
      ref="processconfiguration"
      >
      <template #toolbar>
@@ -19,8 +19,9 @@

<script>
import ttable from '@/views/common/ztt-table.vue'
import { fetchList, } from '@/api/quality/finishedDelivery'

import * as fecha from 'element-ui/lib/utils/date'
import { fetchList, } from '@/api/equipment/mouldRecord'
import { mapGetters } from 'vuex'
export default {
  data(){
      return {
@@ -51,45 +52,13 @@
                {
                  minWidth: '140',
                  prop: 'packageNo',
                  label: '设备',
                  label: '报工单号',
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                },{
                  minWidth: '140',
                  prop: 'outBatchNo',
                  label: '模具编号',
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                },
                {
                  minWidth: '140',
                  prop: 'partNo',
                  label: '模具名称',
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                },
                {
                  minWidth: '140',
                  prop: 'partName',
                  label: '工序',
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                },
                {
                  minWidth: '140',
                  prop: 'specs',
                  label: '工步',
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                },
                {
                  minWidth: '140',
                  prop: 'unit',
                  label: '批号',
                  isTrue: true,
                  isSearch: true,
@@ -97,55 +66,39 @@
                },
                {
                  minWidth: '140',
                  prop: 'number',
                  label: '产量',
                  prop: 'partNo',
                  label: '工单编号',
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                },
                {
                  minWidth: '140',
                  prop: 'number',
                  label: '寿命转换系数',
                  prop: 'partName',
                  label: '工作站名称',
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                },
                {
                  minWidth: '140',
                  prop: 'number',
                  label: '使用量',
                  prop: 'specs',
                  label: '使用人编号',
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                },
                {
                  minWidth: '140',
                  prop: 'number',
                  label: '报工单号',
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                },
                {
                  minWidth: '130',
                  prop: 'createUser',
                  label: '状态',
                  sort: true,
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                },

              ],
              toolbar: [],
              // operator: [],
              // operatorConfig: {}
              operator: null,
              operatorConfig: {}
          },
     }
  },
  // computed: {
  //   ...mapGetters(['permissions'])
  // },
  computed: {
    ...mapGetters(['permissions'])
  },
  components: {
    ttable
  },
@@ -155,4 +108,4 @@
    },
  },
}
</script>
</script>

 src/views/quality/Packaging_ledger/index.vue

@@ -395,7 +395,7 @@
    },
    methods: {
      //包装详情
     

      //打印按钮
      printFun() {
          this.diaPrintTab = false;

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

@@ -3,7 +3,7 @@
    <div class="page-header">
      <div class="header-left">
        <a @click="$router.go(-1)"><i class="icon-btn-back"></i></a>
        <h2 v-if="resultVal!=null && dataForm.id!=null">查看-原材料检验</h2>
        <h2 v-if="(resultVal!=null || resultVal!='') && dataForm.id!=null">查看-原材料检验</h2>
        <h2 v-else>编辑-原材料检验</h2>
      </div>
      <div class="btn-group header-right">
@@ -32,12 +32,12 @@
                  <el-button
                    slot="append"
                    icon="el-icon-search"
                    :disabled="resultVal!=null"
                    :disabled="(resultVal!=null || resultVal!='')"
                    @click="queryCode"></el-button>
                    <el-button
                    slot="append"
                    icon="el-icon-full-screen"
                    :disabled="resultVal!=null"
                    :disabled="(resultVal!=null || resultVal!='')"
                    @click="Turnonthecamera"></el-button>
                </el-input>
                </el-form-item>
@@ -86,7 +86,7 @@
                </el-col>
                <el-col :span="6">
                  <el-form-item label="数量" prop="number">
                      <el-input v-model="dataForm.number" :disabled="resultVal!=null" />
                      <el-input v-model="dataForm.number" :disabled="(resultVal!=null || resultVal!='')" />
                  </el-form-item>
                </el-col>
            </el-row>
@@ -173,9 +173,9 @@
                        <template slot-scope="scope">
                          <div v-if="!scope.row.children">
                          <el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="请先选择设备！" placement="top-start">
                            <!-- <el-autocomplete clearable
                            :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&resultVal!=null)"
                            @blur="changeState(scope.row,scope.$index)"
                            <el-autocomplete clearable
                            :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&(resultVal!=null || resultVal!=''))"
                            @input="changeState(scope.row,scope.$index)"
                            v-model="scope.row.testValueList[index]"
                            :fetch-suggestions="querySearch"
                            placeholder="请输入或选择检测值" >
@@ -183,10 +183,10 @@
                            <template slot-scope="{ item }">
                                <div>{{ item.value }}</div>
                            </template>
                            </el-autocomplete> -->
                            </el-autocomplete>

                              <el-select style="width:100%" filterable
                              :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&resultVal!=null)"
                              <!-- <el-select style="width:100%" filterable
                              :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&(resultVal!=null || resultVal!=''))"
                              v-model="scope.row.testValueList[index]"
                              placeholder="请输入或选择检测值"
                              allow-create
@@ -196,7 +196,7 @@
                              >
                                <el-option label="是" value="是"/>
                                <el-option label="否" value="否"/>
                              </el-select>
                              </el-select> -->
                            </el-tooltip>
                          </div>
                        </template>
@@ -204,7 +204,7 @@
                      <el-table-column prop="deviceName" label="试验设备" min-width="200">
                        <template slot-scope="scope">
                          <div v-if="!scope.row.children">
                            <el-select ref="" :disabled="dataForm!=null && resultVal!=null" style="width:60%"
                            <el-select ref="" :disabled="dataForm!=null && (resultVal!=null || resultVal!='')" style="width:60%"
                            v-model="scope.row.deviceId" filterable @change="updateDevice(scope.row,scope.$index)">
                                <el-option v-for="(item,index) in deviceList"
                                :key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option>
@@ -213,7 +213,7 @@
                            size="small"
                            slot="append"
                            icon="el-icon-full-screen"
                            :disabled="dataForm!=null && resultVal!=null"
                            :disabled="dataForm!=null && (resultVal!=null || resultVal!='')"
                            @click="codeDevice(scope.row,scope.$index)"></el-button>
                          </div>
                        </template>
@@ -221,7 +221,7 @@
                      <el-table-column prop="note" label="检验描述" width="160" >
                        <template slot-scope="scope">
                          <div v-if="!scope.row.children">
                            <el-input @blur="changeState(scope.row, scope.$index)" :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&resultVal!=null)" v-model="scope.row.note" placeholder="检验描述"></el-input>
                            <el-input @blur="changeState(scope.row, scope.$index)" :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&(resultVal!=null || resultVal!=''))" v-model="scope.row.note" placeholder="检验描述"></el-input>
                          </div>
                        </template>
                      </el-table-column>
@@ -256,7 +256,7 @@
              element-loading-text="请稍等，文件上传中"
            >
              <el-upload
                :disabled="dataForm.rawInsNo==null || resultVal!=null"
                :disabled="dataForm.rawInsNo==null || (resultVal!=null || resultVal!='')"
                drag
                ref="upload"
                action="/mes/rawInsProduct/upload"
@@ -311,7 +311,7 @@
                    @click="delProcessConfigFile(scope.row)"
                    type="text"
                    size="small"
                    :disabled="resultVal!=null"
                    :disabled="(resultVal!=null || resultVal!='')"
                    >删除</el-button
                  >
                  <el-button
@@ -346,7 +346,7 @@
                </el-table-column>
                <el-table-column  label="操作">
                    <template>
                        <el-button type="text" :disabled="resultVal!=null && dataForm.id!=null" @click="showDialog()" size="small">上报</el-button>
                        <el-button type="text" :disabled="(resultVal!=null || resultVal!='') && dataForm.id!=null" @click="showDialog()" size="small">上报</el-button>
                    </template>
                </el-table-column>
            </el-table>
@@ -887,43 +887,41 @@
        console.log(e.target.value);
      },
      changeState(row, index) {
        this.$nextTick(()=>{
            if(row){
                let isTrue = true
                for(var i=0;i<row.testValueList.length;i++){
                let val = row.testValueList[i]
                let reg = /(^-?[0-9]{1,6}$)|(^-?[0-9]{1,6}[\.]{1}[0-9]{1,3}$)/
                if(!reg.test(val) && !['是','否'].includes(val)){
                    row.testValueList[i] = null
                    this.$message.error("请输入数字或选择是否")
                    isTrue = false
                }
                }
                if(!isTrue){
                return
                }
          }
          if (row.rpId != null && row.rpId != '') {
            let val = row.testValueList.join(",")
            if (val === undefined || val === '' || val === null) {
                return
        if(row){
            let isTrue = true
            for(var i=0;i<row.testValueList.length;i++){
              let val = row.testValueList[i]
              let reg = /(^-?[0-9]{1,6}$)|(^-?[0-9]{1,6}[\.]{1}[0-9]{1,3}$)/
              if(!reg.test(val) && !['是','否'].includes(val)){
                  row.testValueList[i] = null
                  this.$message.error("请输入6位数字或选择是否")
                  isTrue = false
              }
            }
            let obj = {
            if(!isTrue){
              return
            }
        }
        if (row.rpId != null && row.rpId != '') {
          let val = row.testValueList.join(",")
          if (val === undefined || val === '' || val === null) {
              return
          }
          let obj = {
              deviceId: row.deviceId,
              rpId: row.rpId,
              testValue: val,
              note: row.note
            }
            updateRawInsProduct(obj).then(res => {
                if (res.data.code == 0) {
                    this.$message.success("更新成功")
                } else {
                    this.$message.error("更新失败")
                }
                this.init(this.dataForm.id)
            })
          }
        })
          updateRawInsProduct(obj).then(res => {
              if (res.data.code == 0) {
                  this.$message.success("更新成功")
              } else {
                  this.$message.error("更新失败")
              }
              this.init(this.dataForm.id)
          })
        }
      },
      // åˆ é™¤å­é¡¹ç›®
      delChildren(row,index,isParent) {