Merge remote-tracking branch 'origin/master'

zss

2024-01-18 c205e0765ae18536a5b15b5ecbd5d3d0558b57fc

Merge remote-tracking branch 'origin/master'

 src/page/wel.vue

@@ -8,10 +8,18 @@
      id="myiframe"
      >你的浏览器不支持该iframe标签</iframe
    > -->
    <!-- <iframe
      src="http://124.221.177.11/#/home"
      width="100%"
      height="100%"
      style="border: none;"
      id="myiframe"
      >你的浏览器不支持该iframe标签</iframe
    > -->
    <!-- <el-image :src="url" style="width:100%;height:100%;"></el-image> -->
    <el-row style="width: 100%; height: 100%;background-color: white;">
    <!-- <el-row style="width: 100%; height: 100%;background-color: white;">
      <span>暂未开发。。。。。。</span>
    </el-row>
    </el-row> -->
  </div>
</template>
<style scoped="scoped" lang="scss">

 src/views/equipment/mould/index.vue

@@ -1,19 +1,33 @@
<template>
    <div class="mod-config">
        <basic-container>
        <!-- <ttable
        :table="table"
        :isShowHide="true"
        :ajaxFun="ajaxFun"
        :prelang="prelang"
        :options="options" 
        ref="processconfiguration"
        > -->
        <!-- <template #toolbar></template>
        </ttable> -->
        <div>开发中。。。</div>
        </basic-container>
    </div>
  <div class="mod-config">
      <basic-container>
      <ttable
      :table="table"
      :isShowHide="true"
      :ajaxFun="ajaxFun"
      :prelang="prelang"
      :options="options" 
      ref="processconfiguration"
      >
      <template #toolbar>
        <el-button  type="primary"
                @click="">新增</el-button>
                <!-- <el-dropdown style="margin-left: 20px;" @command="handleCommand">
                    <el-button >
                      状态变更<i class="el-icon-arrow-down el-icon--right"></i>
                    </el-button>
                    <el-dropdown-menu slot="dropdown">
                      <el-dropdown-item :key="index" 
                        :command="item.label"
                        v-for="(item,index) in taskTypeArr" 
                        >{{ item.label }}</el-dropdown-item
                      >
                    </el-dropdown-menu>
                </el-dropdown> -->
      </template>
      </ttable>
      </basic-container>
  </div>
</template>

<script>
@@ -21,120 +35,106 @@
import { fetchList, } from '@/api/quality/finishedDelivery'

export default {
    data(){
        return {
            ajaxFun: fetchList,
            prelang: 'operation',
            dataListLoading: false,
            options: {
                height: 300, // 默认高度-为了表头固定
                stripe: true, // 是否为斑马纹 table
                highlightCurrentRow: false, // 是否要高亮当前行
                border: true, // 是否有纵向边框
                lazy: false, // 是否需要懒加载
                fit: true, // 列的宽度是否自撑开
                multiSelect: true, //
                seqNo: true,
                isShowHide: true, // 是否显示显影按钮
                isRefresh: true, // 是否显示刷新按钮
                isSearch: true, // 高级查询按钮
                defaultOrderBy: { column: 'createTime', direction: 'desc' }
            },
            table: {
                total: 0,
                currentPage: 1,
                pageSize: 20,
                data: [],
                // 标题
                column: [
                  {
                    minWidth: '140',
                    prop: 'packageNo',
                    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,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '140',
                    prop: 'number',
                    label: '数量',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '130',
                    prop: 'createTime',
                    label: '入库时间',
                    sort: true,
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'datetimerange',
                    formatter: this.formatDateTime,
                  },
                  {
                    minWidth: '130',
                    prop: 'createUser',
                    label: '创建人',
                    sort: true,
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                ],
                toolbar: [],
                // operator: [],
                // operatorConfig: {}
            },
       }
  data(){
      return {
          ajaxFun: fetchList,
          prelang: 'operation',
          dataListLoading: false,
          options: {
              height: 300, // 默认高度-为了表头固定
              stripe: true, // 是否为斑马纹 table
              highlightCurrentRow: false, // 是否要高亮当前行
              border: true, // 是否有纵向边框
              lazy: false, // 是否需要懒加载
              fit: true, // 列的宽度是否自撑开
              multiSelect: true, //
              seqNo: true,
              isShowHide: true, // 是否显示显影按钮
              isRefresh: true, // 是否显示刷新按钮
              isSearch: true, // 高级查询按钮
              defaultOrderBy: { column: 'createTime', direction: 'desc' }
          },
          table: {
              total: 0,
              currentPage: 1,
              pageSize: 20,
              data: [],
              // 标题
              column: [
                {
                  minWidth: '140',
                  prop: 'packageNo',
                  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,
                  searchInfoType: 'text',
                },
              ],
              toolbar: [],
              operator: [{
                text: '删除',
                type: 'text',
                size: 'small',
                fun: this.deleteHandle
              }],
              operatorConfig: {
                fixed: 'right',
                label: '操作',
                width: 100,
                minWidth: 100
                },
          },
     }
  },
  // computed: {
  //   ...mapGetters(['permissions'])
  // },
  components: {
    ttable
  },
  medthods: {
    formatDateTime(row, column, cellValue) {
        return cellValue ? fecha.format(new Date(cellValue), 'yyyy-MM-dd') : ''
    },
    components: {
      ttable
    },
    medthods: {
      formatDateTime(row, column, cellValue) {
          return cellValue ? fecha.format(new Date(cellValue), 'yyyy-MM-dd') : ''
      },
    },
  },
}
</script>

 src/views/equipment/mouldrecord/index.vue

@@ -1,19 +1,20 @@
<template>
    <div class="mod-config">
        <basic-container>
        <!-- <ttable
        :table="table"
        :isShowHide="true"
        :ajaxFun="ajaxFun"
        :prelang="prelang"
        :options="options" 
        ref="processconfiguration"
        >
        <template #toolbar></template>
        </ttable> -->
        <div>开发中。。。</div>
        </basic-container>
    </div>
  <div class="mod-config">
      <basic-container>
      <ttable
      :table="table"
      :isShowHide="true"
      :ajaxFun="ajaxFun"
      :prelang="prelang"
      :options="options" 
      ref="processconfiguration"
      >
      <template #toolbar>

      </template>
      </ttable>
      </basic-container>
  </div>
</template>

<script>
@@ -21,121 +22,137 @@
import { fetchList, } from '@/api/quality/finishedDelivery'

export default {
    data(){
        return {
            ajaxFun: fetchList,
            prelang: 'operation',
            dataListLoading: false,
            options: {
                height: 300, // 默认高度-为了表头固定
                stripe: true, // 是否为斑马纹 table
                highlightCurrentRow: false, // 是否要高亮当前行
                border: true, // 是否有纵向边框
                lazy: false, // 是否需要懒加载
                fit: true, // 列的宽度是否自撑开
                multiSelect: true, //
                seqNo: true,
                isShowHide: true, // 是否显示显影按钮
                isRefresh: true, // 是否显示刷新按钮
                isSearch: true, // 高级查询按钮
                defaultOrderBy: { column: 'createTime', direction: 'desc' }
            },
            table: {
                total: 0,
                currentPage: 1,
                pageSize: 20,
                data: [],
                // 标题
                column: [
                  {
                    minWidth: '140',
                    prop: 'packageNo',
                    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,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '140',
                    prop: 'number',
                    label: '数量',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '130',
                    prop: 'createTime',
                    label: '入库时间',
                    sort: true,
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'datetimerange',
                    formatter: this.formatDateTime,
                  },
                  {
                    minWidth: '130',
                    prop: 'createUser',
                    label: '创建人',
                    sort: true,
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                ],
                toolbar: [],
                // operator: [],
                // operatorConfig: {}
            },
       }
  data(){
      return {
          ajaxFun: fetchList,
          prelang: 'operation',
          dataListLoading: false,
          options: {
              height: 300, // 默认高度-为了表头固定
              stripe: true, // 是否为斑马纹 table
              highlightCurrentRow: false, // 是否要高亮当前行
              border: true, // 是否有纵向边框
              lazy: false, // 是否需要懒加载
              fit: true, // 列的宽度是否自撑开
              multiSelect: true, //
              seqNo: true,
              isShowHide: true, // 是否显示显影按钮
              isRefresh: true, // 是否显示刷新按钮
              isSearch: true, // 高级查询按钮
              defaultOrderBy: { column: 'createTime', direction: 'desc' }
          },
          table: {
              total: 0,
              currentPage: 1,
              pageSize: 20,
              data: [],
              // 标题
              column: [
                {
                  minWidth: '140',
                  prop: 'packageNo',
                  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,
                  searchInfoType: 'text',
                },
                {
                  minWidth: '140',
                  prop: 'number',
                  label: '产量',
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                },
                {
                  minWidth: '140',
                  prop: 'number',
                  label: '寿命转换系数',
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                },
                {
                  minWidth: '140',
                  prop: 'number',
                  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: {}
          },
     }
  },
  // computed: {
  //   ...mapGetters(['permissions'])
  // },
  components: {
    ttable
  },
  medthods: {
    formatDateTime(row, column, cellValue) {
        return cellValue ? fecha.format(new Date(cellValue), 'yyyy-MM-dd') : ''
    },

    components: {
      ttable
    },
    medthods: {
      formatDateTime(row, column, cellValue) {
          return cellValue ? fecha.format(new Date(cellValue), 'yyyy-MM-dd') : ''
      },
    },
  },
}
</script>
</script>

 src/views/quality/teststandard/index.vue

@@ -24,7 +24,7 @@
                <el-col :span="8">
                  <span>标准参数</span>
                </el-col>
                <el-col :span="8" :offset="4">
                <!-- <el-col :span="8" :offset="4">
                  <el-button
                    v-if="permissions.quality_teststandard_layout"
                    style="float: right; padding: 3px 0"
@@ -33,8 +33,8 @@
                  >
                    布局
                  </el-button>
                </el-col>
                <el-col :span="2">
                </el-col> -->
                <el-col :span="14">
                  <el-button
                    style="float: right; padding: 3px 0"
                    type="text"