zouyu
2024-01-22 3b02a02e6f615f167b06ca4d62d094cda777d862
模具使用记录
已修改4个文件
已添加1个文件
137 ■■■■■ 文件已修改
src/api/equipment/mouldRecord.js 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/equipment/mould/index.vue 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/equipment/mouldrecord/index.vue 83 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/quality/rawMaterial/rawMaterial-form.vue 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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/views/equipment/mould/index.vue
@@ -2,6 +2,7 @@
  <div class="mod-config">
      <basic-container>
        <ttable
        @handleSelectionChange="handleSelectionChange"
        :table="table"
        :ajaxFun="ajaxFun"
        :prelang="prelang"
@@ -40,6 +41,7 @@
export default {
  data(){
      return {
          diaPrintTab: false,
          editRules: {
            code: [{required:true,message:'请输入模具编号',trigger:'blur'}],
            name: [{required:true,message:'请输入模具名称',trigger:'blur'}]
@@ -51,6 +53,7 @@
          dialogVisible: false,
          ajaxFun: fetchList,
          prelang: 'moudle',
          multipleSelection: [],
          dataListLoading: false,
          options: {
              height: 300, // é»˜è®¤é«˜åº¦-为了表头固定
@@ -132,7 +135,6 @@
  },
  components: {
    ttable,
    TableForm
  },
  watch: {
    dialogVisible(newVal){
@@ -152,13 +154,6 @@
            fun: this.addOrUpdateHandle
        })
    }
    if(this.permissions.equipment_mould_lableprint){
        this.table.toolbar.push({
            text: '标签打印',
            type: 'primary',
            fun: this.lableprint
        })
    }
    if(this.permissions.equipment_mould_del){
        this.table.operator = [{
            text: '删除',
@@ -171,6 +166,9 @@
  },
  methods: {
    handleSelectionChange(val) {
      this.multipleSelection = val
    },
    deleteHandle(row){
        this.$confirm('是否确认删除模具名称为' + row.name, '提示', {
          confirmButtonText: '确定',
@@ -184,9 +182,6 @@
            this.$message.success('删除成功')
            this.getData()
          })
    },
    lableprint(){
    },
    confirmSaveOrUpdateMould(){
        this.$refs.editForm.validate(valid=>{
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/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>
@@ -174,7 +174,7 @@
                          <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)"
                            :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"
@@ -186,7 +186,7 @@
                            </el-autocomplete>
                              <!-- <el-select style="width:100%" filterable
                              :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&resultVal!=null)"
                              :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&(resultVal!=null || resultVal!=''))"
                              v-model="scope.row.testValueList[index]"
                              placeholder="请输入或选择检测值"
                              allow-create
@@ -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>
vue.config.js
@@ -4,10 +4,10 @@
 */
const url = 'http://192.168.2.7:9999'
// const url = 'http://192.168.2.7:9999'
// const url = 'https://ztms-mes.chinaztt.cn/'
// const url = 'http://localhost:9999'
const url = 'http://localhost:9999'
const localUrl = 'http://localhost:8089'