Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

qq_41295110

5 天以前 c466006a64f1cbbcbf04e0ae4a2d73de302aa92a

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

 src/router/index.js

@@ -1799,6 +1799,49 @@
    ],
  },
  //#endregion

  //#region 物流管理
  //#region 运输定位
  //#region 运单列表
  {
    path: "logistics/transportGPS/WL_YayBill",
    component: Layout,
    hidden: true,
    redirect: "noredirect",
    meta: {
      breadcrumb: false, // 如果设置为false，则不会在breadcrumb面包屑中显示
      activeMenu: "/logistics/transportGPS", // 当路由设置了该属性，则会高亮相对应的侧边栏。
    },
    children: [
      {
        path: "/logistics/transportGPS/WL_YayBill",
        component: () => import("@/views/logistics/transportGPS/WL_YayBill.vue"),
        name: "WL_YayBill",
        meta: { title: "出运单", activeMenu: "logistics/transportGPS" },
      },
    ],
  },
  //#endregion
  //#region 运单编辑
  {
    path: "logistics/transportGPS/Add_Edit_WL_YayBill",
    component: Layout,
    hidden: true,
    redirect: "noredirect",
    meta: {
      breadcrumb: false, // 如果设置为false，则不会在breadcrumb面包屑中显示
      activeMenu: "/logistics/transportGPS", // 当路由设置了该属性，则会高亮相对应的侧边栏。
    },
    children: [
      {
        path: "/logistics/transportGPS/Add_Edit_WL_YayBill",
        component: () => import("@/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue"),
        name: "Add_Edit_WL_YayBill",
        meta: { title: "运单编辑", activeMenu: "logistics/transportGPS" },
      },
    ],
  },
  //#endregion
];

// 动态路由，基于用户权限动态去加载

 src/store/modules/permission.js

@@ -41,6 +41,63 @@
              icon: "build",
              link: null,
              noCache: false,
              title: "物流管理",
            },
            hidden: false,
            name: "Logistics",
            path: "/logistics",
            redirect: "noRedirect",
            children: [
              {
                meta: {
                  icon: "build",
                  link: null,
                  noCache: false,
                  title: "运输定位",
                },
                hidden: false,
                name: "TransportGPS",
                path: "transportGPS",
                redirect: "noRedirect",
                component: "Layout",
                children: [
                  {
                    meta: {
                      icon: "build",
                      link: null,
                      noCache: false,
                      title: "出运单",
                    },
                    component: () =>
                      import("@/views/logistics/transportGPS/WL_YayBill.vue"),
                    hidden: false,
                    name: "WL_YayBill",
                    path: "WL_YayBill",
                  },
                  // {
                  //   meta: {
                  //     icon: "build",
                  //     link: null,
                  //     noCache: false,
                  //     title: "运单编辑",
                  //   },
                  //   component: () =>
                  //     import("@/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue"),
                  //   hidden: false,
                  //   name: "Add_Edit_WL_YayBill",
                  //   path: "Add_Edit_WL_YayBill",
                  // },
                ],
              },
            ],
          },
          {
            alwaysShow: true,
            component: "Layout",
            meta: {
              icon: "build",
              link: null,
              noCache: false,
              title: "销售管理",
            },
            hidden: false,
@@ -520,7 +577,9 @@
                      title: "承运合同单据",
                    },
                    component: () =>
                      import("@/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue"),
                      import(
                        "@/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue"
                      ),
                    hidden: false,
                    name: "CgContractTransportBillList",
                    path: "cgContractTransportBillList",
@@ -579,7 +638,7 @@
                    name: "GyCartypelist",
                    path: "gyCartypelist",
                  },
                   {
                  {
                    meta: {
                      icon: "build",
                      link: null,
@@ -638,7 +697,8 @@
                      noCache: false,
                      title: "货币列表",
                    },
                    component: () => import("@/views/basic/gyCurrency/gyCurrency.vue"),
                    component: () =>
                      import("@/views/basic/gyCurrency/gyCurrency.vue"),
                    hidden: false,
                    name: "GyCurrency",
                    path: "gyCurrency",
@@ -656,7 +716,7 @@
                    name: "GyUnit",
                    path: "gyUnit",
                  },
                  

                  {
                    meta: {
                      icon: "build",
@@ -701,7 +761,8 @@
                      noCache: false,
                      title: "辅助属性列表",
                    },
                    component: () => import("@/views/basic/gyProperty/gyPropertyList.vue"),
                    component: () =>
                      import("@/views/basic/gyProperty/gyPropertyList.vue"),
                    hidden: false,
                    name: "GyProperty",
                    path: "gyProperty",
@@ -914,7 +975,7 @@
                    hidden: false,
                    name: "Kf_POStockInBackBillList",
                    path: "Kf_POStockInBackBillList",
                    query: "{\"type\":1}"
                    query: '{"type":1}',
                  },
                  {
                    meta: {
@@ -930,7 +991,7 @@
                    hidden: false,
                    name: "Kf_POStockInBackBillList",
                    path: "Kf_POStockInBackBillList0",
                    query: "{\"type\":0}"
                    query: '{"type":0}',
                  },
                ],
              },
@@ -1448,7 +1509,7 @@
                      noCache: false,
                      title: "驾驶员列表",
                    },
                    component: () =>import("@/views/system/user/GyDriver.vue"),
                    component: () => import("@/views/system/user/GyDriver.vue"),
                    hidden: false,
                    name: "gyDriver",
                    path: "GyDriver",

 src/views/basic/gyUnit/gyUnit.vue

@@ -1,5 +1,5 @@
<template>
  <div style="padding: 10px">
  <div style="padding: 10px; position: relative;">
    <el-form
      :model="queryParams"
      ref="queryForm"

 src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue

New file
@@ -0,0 +1,10 @@
<template>
      <div style="padding: 10px;">
    2
</div>
</template>
<script>
    export default {
  name: 'Add_Edit_WL_YayBill',
  }
</script>

 src/views/logistics/transportGPS/WL_YayBill.vue

New file
@@ -0,0 +1,912 @@
<template>
    <div style="padding: 10px; position: relative;">
        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
            <el-form-item label="开始日期" style="margin-left: 100px;">
                <el-date-picker v-model="queryParams.sTime" type="date" placeholder="开始日期" style="width: 150px;">
                </el-date-picker>
            </el-form-item>
            <el-form-item label="结束日期">
                <el-date-picker v-model="queryParams.eTime" type="date" placeholder="结束日期" style="width: 150px;">
                </el-date-picker>
            </el-form-item>
            <el-form-item label="日期间隔">
                <el-select v-model="queryParams.HInitTimeCycle" placeholder="请选择" @change="riqiChange"
                    style="width: 150px;">
                    <el-option v-for="(item, index) in rqsgList" :key="index" :label="item.label" :value="item.value">
                    </el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="单据号" prop="HBillNo">
                <el-input v-model="queryParams.HBillNo" placeholder="请输入单据号" @keyup.enter.native="handleQuery" />
            </el-form-item>
            <el-form-item label="组织" prop="HOrgID">
                <el-select v-model="queryParams.HOrgID" placeholder="请选择组织">
                    <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name"
                        :value="item.ID">
                    </el-option>
                </el-select>
            </el-form-item>
            <el-form-item label-width="78px">
                <el-button type="primary" icon="el-icon-search" @click="handleQuery"> 搜 索</el-button>
                <el-button icon="el-icon-circle-close" @click="resetQuery">重 置</el-button>
            </el-form-item>
            <el-collapse v-model="activeSeach">
                <el-collapse-item title="更多" name="1">
                    <el-card class="box-card">
                        <el-form-item label="供应商" prop="HSupName">
                            <el-input v-model="queryParams.HSupName" placeholder="请输入供应商名称"
                                @keyup.enter.native="handleQuery" />
                        </el-form-item>
                        <el-form-item label="物料代码" prop="HMaterNumber">
                            <el-input v-model="queryParams.HMaterNumber" placeholder="请输入物料代码"
                                @keyup.enter.native="handleQuery" />
                        </el-form-item>
                        <el-form-item label="物料名称" prop="HMaterName">
                            <el-input v-model="queryParams.HMaterName" placeholder="请输入物料名称"
                                @keyup.enter.native="handleQuery" />
                        </el-form-item>
                        <div slot="header" class="clearfix"><span>过滤</span></div>
                        <div>
                            <el-row>
                                <el-form-item label-width="0">
                                    <el-row>
                                        <el-col :span="7">
                                            <el-select v-model="queryParams.ColName1" placeholder="请选择"
                                                @change="riqiChange">
                                                <span v-for="(item, index) in btList" :key="index">
                                                    <el-option :label="item.field" :value="item.field"
                                                        v-if="!item.hide"></el-option>
                                                </span>
                                            </el-select>
                                        </el-col>
                                        <el-col :span="6" style="padding: 0 10px;">
                                            <el-select v-model="queryParams.Comparator1" placeholder="请选择"
                                                @change="riqiChange">
                                                <el-option v-for="(item, index) in comparatorList" :key="index"
                                                    :label="item.label" :value="item.value"></el-option>
                                            </el-select>
                                        </el-col>
                                        <el-col :span="11">
                                            <el-input v-model="queryParams.ColContent1" placeholder="请输入" clearable
                                                @keyup.enter.native="handleQuery" />
                                        </el-col>
                                    </el-row>
                                </el-form-item>
                            </el-row>
                            <el-row>
                                <el-form-item label-width="0">
                                    <el-row>
                                        <el-col :span="7">
                                            <el-select v-model="queryParams.ColName2" placeholder="请选择"
                                                @change="riqiChange">
                                                <span v-for="(item, index) in btList" :key="index">
                                                    <el-option :label="item.field" :value="item.field"
                                                        v-if="!item.hide"></el-option>
                                                </span>
                                            </el-select>
                                        </el-col>
                                        <el-col :span="6" style="padding: 0 10px;">
                                            <el-select v-model="queryParams.Comparator2" placeholder="请选择"
                                                @change="riqiChange">
                                                <el-option v-for="(item, index) in comparatorList" :key="index"
                                                    :label="item.label" :value="item.value"></el-option>
                                            </el-select>
                                        </el-col>
                                        <el-col :span="11">
                                            <el-input v-model="queryParams.ColContent2" placeholder="请输入" clearable
                                                @keyup.enter.native="handleQuery" />
                                        </el-col>
                                    </el-row>
                                </el-form-item>
                            </el-row>
                            <el-form-item label-width="0">
                                <el-row>
                                    <el-col :span="7">
                                        <el-select v-model="queryParams.ColName" placeholder="请选择" @change="riqiChange">
                                            <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
                                                :value="item.field"></el-option>
                                        </el-select>
                                    </el-col>
                                    <el-col :span="6" style="padding: 0 10px;">
                                        <el-select v-model="queryParams.Comparator" placeholder="请选择"
                                            @change="riqiChange">
                                            <el-option v-for="(item, index) in comparatorList" :key="index"
                                                :label="item.label" :value="item.value"></el-option>
                                        </el-select>
                                    </el-col>
                                    <el-col :span="11">
                                        <el-input v-model="queryParams.ColContent" placeholder="请输入" clearable
                                            @keyup.enter.native="handleQuery" />
                                    </el-col>
                                </el-row>
                            </el-form-item>
                        </div>
                    </el-card>
                </el-collapse-item>
            </el-collapse>
        </el-form>
        <el-row :gutter="10" class="mb8" style="margin-top: 10px;">
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit(OperationType = 1)"
                    id="btn-Add">新增</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
                    @click="handleEdit(row = rowForm, OperationType = 3)">编辑</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
                    @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">复制</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">删除
                </el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
                    @click="set_CheckBill(0, form = rowForm)">审核</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
                    @click="set_CheckBill(1, form = rowForm)">返审核</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-date" size="mini" @click="handleRowHide">隐藏列设置</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-printer" size="mini" @click="get_PrintReport">打印</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single"
                    @click="get_BarCodeDetail">条码明细</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single"
                    @click="get_PackStockDetail">包装容器出入库明细</el-button>
            </el-col>
        </el-row>
        <div class="tableBox" v-loading="loading">
            <el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
                @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick"
                :row-style="rowStyle" @cell-dblclick="handleDblclick" v-if="tableShow">
                <template v-for="(item, index) in btList">
                    <el-table-column type="selection" width="55" align="center" :fixed="item.fixed"
                        v-if="item.type == 'checkbox'" :key="index" />
                    <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width"
                        :key="item.id" v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort"
                        show-overflow-tooltip :fixed="item.fixed">
                        <template slot-scope="{row,  column }">
                            <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
                            <div :style="item.style">
                                <span v-if="column.property.includes('日期')">{{ parseTime(row[column.property],
                                    '{y}-{m}-{d}') }}</span>
                                <el-button type="text" @click="handleEdit(row, OperationType = 3)"
                                    v-else-if="column.property == '单据号'">{{
                                        row.单据号
                                    }}</el-button>
                                <span v-else>{{ row[column.label] }}</span>
                            </div>
                        </template>
                    </el-table-column>
                </template>
            </el-table>
            <!-- 记录数、页数、当前页 -->
            <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize"
                @pagination="handleQuery" />
            <!-- 列设置 -->
            <el-dialog title="隐藏列设置" :visible.sync="openRowHide" width="816px" append-to-body>
                <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose"
                    v-if="rowHideShow" />
            </el-dialog>
            <!-- 编辑 -->
            <el-dialog title="编辑" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
                @close="close">
                <edit :OperationType=OperationType :linterid=this.rowForm.HInterID
                    :HSouceBillType=this.rowForm.HSourceBillType :copyType="copyType" @editClose="editClose"
                    v-if="editShow" />
            </el-dialog>
            <!-- 打印 -->
            <el-dialog title="打印模板选择" :visible.sync="openPrintList" width="800px" append-to-body>
                <PrintList :linterid=this.rowForm.HInterID :MyMsg=this.rowForm.HInterID :Type='HBillType'
                    :HModName="HModName" @rowEditClose="rowSetClose" v-if="printListShow" />
                <!-- <div>111</div> -->
            </el-dialog>
            <!-- 条码明细 -->
            <BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail" />
            <!-- 包装容器出入库明细 -->
            <PackStockDetail :visible.sync="packStockDetailShow" ref="packStockDetail" />
        </div>
    </div>
</template>

<script>
import axios from 'axios'
import moment from 'moment';                                              //时间格式化
import RowSettings from '@/views/component/rowSettings'                   //列设置组件
import PrintList from '@/views/component/printList'                       //打印组件
import BarCodeDetail from '@/views/component/BarCodeDetail'               //条码明细组件
import PackStockDetail from '@/views/component/PackStockDetail'               //条码明细组件
import Edit from '@/views/logistics/transportGPS/Add_Edit_WL_YayBill'   //编辑页面组件

export default {
    name: 'WL_YayBill',
    components: { RowSettings, Edit, PrintList, BarCodeDetail, PackStockDetail },
    data() {
        return {
            baseURL: process.env.VUE_APP_BASE_API,                //后端接口前缀(后端服务器ip地址)

            HModName: "Cg_ContractTransportBillMainList",
            HBillType: "Cg_ContractTransportBillMainList",
            OperationType: null,                                  //保存类型（新增1修改3）
            copyType: 0,                                          //复制标记。打开编辑组件时，用于区分编辑还是复制
            HInterID: null,
            hPriceTypeList: ['成本价', '结算价'],

            rqsgList: [                                           //日期间隔下拉列表数据
                { label: '今天', value: 0 },
                { label: '近两天', value: 1 },
                { label: '近三天', value: 2 },
                { label: '近四天', value: 3 },
                { label: '近五天', value: 4 },
                { label: '近六天', value: 5 },
                { label: '近七天', value: 6 },
                { label: '近30天', value: 29 },
                { label: '近半年', value: 180 },
                { label: '近一年', value: 365 },
            ],
            organizationList: JSON.parse(sessionStorage.getItem('organizationList')),                                 //组织列表
            btList: [],                                           //列表表头字段列表
            comparatorList: [                                     //运算标识下拉列表
                { label: '=', value: '=' },
                { label: '>=', value: '>=' },
                { label: '>', value: '>' },
                { label: '<=', value: '<=' },
                { label: '<', value: '<' },
                { label: '<>', value: '<>' },
                { label: '包含', value: '7' },
                { label: '左包含', value: '8' },
                { label: '右包含', value: '9' },
                { label: '不包含', value: '10' },
            ],

            dialogTitle: '',                                      // 弹窗标题
            title: "",                                            // 弹出层标题
            open: false,                                          // 是否显示弹出层
            loading: true,                                        // 遮罩层

            activeSeach: '',
            // addBtnShow: false,                                    //编辑组件容器显示标记
            editShow: false,                                      //编辑组件容器显示标记
            openEdit: false,                                      //编辑组件显示标记
            openPrintList: false,                                 //打印组件容器显示标记
            printListShow: false,                                 //打印组件显示标记
            openBtnHide: false,                                   //按钮组件容器显示标记
            btnHideShow: false,                                   //按钮组件显示标记
            openRowHide: false,                                   //列设置组件显示标记
            rowHideShow: false,                                   //列设置组件容器显示标记
            barCodeDetailShow: false,                             //条码明细组件容器显示标记
            packStockDetailShow: false,                            //包装容器出入库明细容器显示标记



            // 查询参数
            sWhere: '',                                                   // 拼接过滤条件
            queryParams: {                                                // form数据
                HBillNo: '',
                HInitTimeCycle: 29,
                sTime: '',
                eTime: '',
                HOrgID: sessionStorage["OrganizationID"] - 0,
                HSupName: null,
                HMaterNumber: '',
                HMaterName: '',
                ColName1: '',
                ColName2: '',
                ColName: '',
                Comparator1: '',
                Comparator2: '',
                Comparator: '',
                ColContent1: '',
                ColContent2: '',
                ColContent: '',
            },

            page: 1,                                                      //page页索引
            pageSize: 0,                                                  //page页面记录数
            total: 0,                                                     //记录合计数
            tableShow: true,                                              // table显示标记
            totalNameList: [],                                            // 需要设置合计行的列数组
            tableData: [],                                                // 列表数据。用于table监听事件
            ids: [],                                                      // 选中行的hmainid数组
            single: true,                                                 // 当选中的行数不为1时为true。用于禁用相关操作
            multiple: true,                                               // 当选中的行数为0时为true。用于禁用相关操作
            lastSelectedRowIndex: null,                                   // 用于记录上次点击的行索引
            lastSelectedRow: null,                                        // 上一次选中的行
            selectedRow: null,                                            // 当前选中的行
            rowForm: {},                                                  // 当选中的只有一行时，更新数据为该选中的行。

            tyResList: [],                                                // 列表数据，用于导出
            titleData: ["HInterID", "HEntryID", "HBillStatus", "HMaterID", "HPreventErrMouldID","HOrgID"],           // 不需要显示的字段 可扩展
            btResList: [],                                                // 列表表头数据。用于列设置
            dataList: [],                                                 // option记录。用于当option数据无效时，用于列设置
        };
    },
    created() {
        this.riqiChange()
        this.handleQuery();
    },

    methods: {
        //#region 设置表头
        renderHeader(h, { column, $index }) {// 新建一个 span
            let span = document.createElement(span)// 设置表头名称
            span.innerText = column.label
            //临时插入 document
            document.body.appendChild(span)// 重点:获取 span 最小宽度，设置当前列，注意这里加了 20，字段较多时column.minWidth=span.getBoundingClientRect().width + 50.//移除 document 中临时的 span
            document.body.removeChild(span)
            return h(span, column.label)
        },
        //#endregion

        //#region 点击行
        handleRowClick(row, column, event) {
            this.lastSelectedRow = this.selectedRow; // 记录上一次选中的行
            this.selectedRow = row; // 记录当前选中的行
            this.lastSelectedRowIndex = this.tableData.indexOf(row);
            this.$refs.tableData.toggleRowSelection(row);
        },
        //#endregion

        //#region 选中行高亮样式
        rowStyle({ row, rowIndex }) {
            if (this.ids.includes(row.HInterID)) {
                return { "background": "#ecf5ff" }
            }
        },
        //#endregion

        //#region 双击行
        handleDblclick(row, column, cell, event) {
            this.OperationType = 3
            this.handleEdit()
        },
        //#endregion

        //#region 多选框选中数据
        handleSelectionChange(selection) {
            // this.rowForm = {}
            this.ids = selection.map(item => item.HInterID)
            this.single = selection.length != 1
            this.multiple = !selection.length
            if (!this.single) {
                this.rowForm = selection[0]
            }
        },
        //#endregion

        //#region 根据日期间隔，设置开始日期、结束日期
        riqiChange() {
            const end = new Date();
            const start = new Date();
            start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
            const yyyyS = start.getFullYear();
            const mmS = String(start.getMonth() + 1).padStart(2, '0'); // 月份是从0开始的
            const ddS = String(start.getDate()).padStart(2, '0');
            const yyyyE = end.getFullYear();
            const mmE = String(end.getMonth() + 1).padStart(2, '0'); // 月份是从0开始的
            const ddE = String(end.getDate()).padStart(2, '0');
            this.queryParams.sTime = yyyyS + '-' + mmS + '-' + ddS
            this.queryParams.eTime = yyyyE + '-' + mmE + '-' + ddE
        },
        //#endregion

        //#region 重置
        resetQuery() {
            this.sWhere = ''
            this.queryParams = {
                HBillNo: '',
                HInitTimeCycle: 29,
                HSupName: null,
                HMaterNumber: '',
                HMaterName: '',
                ColName1: '',
                ColName2: '',
                ColName: '',
                Comparator1: '',
                Comparator2: '',
                Comparator: '',
                ColContent1: '',
                ColContent2: '',
                ColContent: '',
            }
            this.riqiChange()
            this.resetForm("queryForm")
            this.handleQuery()
        },
        //#endregion

        //#region 快速过滤
        handleQuery() {
            this.sWhere = ''
            if (this.queryParams.ColName && this.queryParams.Comparator) {
                var com = "";
                switch (this.queryParams.Comparator) {
                    case "7":
                        com = "like'%" + this.queryParams.ColContent + "%'";
                        break;
                    case "8":
                        com = "like'%" + this.queryParams.ColContent + "'";
                        break;
                    case "9":
                        com = "like'" + this.queryParams.ColContent + "%'";
                        break;
                    case "10":
                        com = "not like'%" + this.queryParams.ColContent + "%'";
                        break;
                    default:
                        com = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
                        break;
                }
                this.sWhere += " and " + this.queryParams.ColName + " " + com;
            }
            if (this.queryParams.ColName1 && this.queryParams.Comparator1) {
                var com1 = "";
                switch (this.queryParams.Comparator1) {
                    case "7":
                        com1 = "like'%" + this.queryParams.ColContent1 + "%'";
                        break;
                    case "8":
                        com1 = "like'%" + this.queryParams.ColContent1 + "'";
                        break;
                    case "9":
                        com1 = "like'" + this.queryParams.ColContent1 + "%'";
                        break;
                    case "10":
                        com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
                        break;
                    default:
                        com1 = "" + this.queryParams.Comparator1 + "'" + this.queryParams.ColContent1 + "'";
                        break;
                }
                this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
            }
            if (this.queryParams.ColName2 && this.queryParams.Comparator2) {
                var com2 = "";
                switch (this.queryParams.Comparator2) {
                    case "7":
                        com2 = "like'%" + this.queryParams.ColContent2 + "%'";
                        break;
                    case "8":
                        com2 = "like'%" + this.queryParams.ColContent2 + "'";
                        break;
                    case "9":
                        com2 = "like'" + this.queryParams.ColContent2 + "%'";
                        break;
                    case "10":
                        com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
                        break;
                    default:
                        com2 = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
                        break;
                }
                this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
            }
            if (this.queryParams.sTime) {
                this.queryParams.sTime = moment(this.queryParams.sTime).format('YYYY-MM-DD')
                this.queryParams.eTime = moment(this.queryParams.eTime).format('YYYY-MM-DD')
                console.log(this.queryParams.sTime, this.queryParams.eTime)
                this.sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + this.queryParams.sTime + "'" + " and CONVERT(varchar(100),日期, 23) <= '" + this.queryParams.eTime + "'";
            }
            if (this.queryParams.HBillNo) {
                this.sWhere += " and 单据号 like '%" + this.queryParams.HBillNo + "%'";
            }
            // if (this.queryParams.HOrgID) {
            //     this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
            // }
            this.getList()
        },
        //#endregion

        //#region 查询
        getList() {
            this.pageSize = 50
            if (this.pageSize == 0) {
                this.pageSize = 50
            }
            this.tableShow = false
            this.loading = true

            // 列表查询
            axios.get(this.baseURL + '/WLYayBillController/GetListPage', {
                params: {
                    "sWhere": this.sWhere,
                    "user": sessionStorage["HUserName"],
                    "page": this.page,
                    "size": this.pageSize
                },
            }).then(response => {
                this.tyResList = response.data.data//总数据
                let data1 = response.data
                let option = []
                if (data1.code == 1) {
                    this.btResList = data1.list             //列表表头数据
                    this.total = data1.count;
                    var data = [];//列字段数据
                    var col = [];
                    var totalArray = [];
                    //给空的数组赋值
                    for (var key in data1.list) {//循序遍历数组
                        data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//从每个对象中提取数据
                    }
                    //在列表左边添加勾选框
                    col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                    for (var i = 0; i < data.length; i++) {//遍历data数组重的数据
                        if (this.titleData.indexOf(data[i].name) > -1) {//检查data【i】.name是否在数组中  //计算列
                            col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                        } else if (totalArray.indexOf(data[i].name) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //计算列
                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                        }
                        else {
                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                        }
                    }
                    option.cols = [col]
                    this.dataList = option
                    option.data = data1.data;
                    var result = data1.data;
                    option.data = result;
                    let HModName = this.HModName
                    this.DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, this.dataList);
                }
            }).catch(error => {
                this.$modal.msgError("接口请求失败!");
            });
        },

        //#region 合计行数据处理
        getSummaries(param) {
            const { columns, data } = param;
            const sums = [];
            columns.forEach((column, index) => {
                if (index === 0) {
                    sums[index] = '合计';
                    return;
                }
                const values = data.map(item => Number(item[column.property]));
                if (this.totalNameList[index].totalRow) {
                    if (!values.every(value => isNaN(value))) {
                        sums[index] = values.reduce((prev, curr) => {
                            const value = Number(curr);
                            if (!isNaN(value)) {
                                return prev + curr;
                            } else {
                                return prev;
                            }
                        }, 0)

                    } else {
                        sums[index] = '';
                    }
                }
            }, 1000);
            return sums;
        },
        //#endregion

        //#endregion

        //#region 新增
        handleAddEdit() {
            this.rowForm.HInterID = 0
            this.editShow = true
            this.openEdit = true
        },
        //#endregion

        //#region 编辑
        handleEdit(row) {
            this.rowForm = row
            this.editShow = true
            this.openEdit = true
        },
        editClose(val) {
            this.open = val
            this.editShow = false
            this.openEdit = val
            this.handleQuery()
        },
        //#endregion

        //#region 删除
        handleDelete() {
            this.$modal.confirm('确认要删除吗，删除后不能恢复').then(() => {
                if (this.rowForm.状态 == "创建") {
                    axios.get(this.baseURL + "/Kf_POStockInBill/DeltetKf_POStockInBill", {
                        params: { 'HInterID': this.rowForm.HInterID.toString(), 'user': sessionStorage["HUserName"] }
                    }).then(response => {
                        if (response.data.count == 1) {
                            this.handleQuery()
                            this.$modal.msgSuccess("删除成功")
                        } else {
                            this.$modal.msgError("错误:" + result.code + result.Message);
                        }
                    }).catch(error => {
                        this.$modal.msgError("接口请求失败!");
                    });
                } else {
                    this.$modal.msgError("此条数据不是创建状态,无法删除!");
                }
            }).catch(() => { })
        },
        //#endregion

        //#region 审核/反审核
        set_CheckBill(num, form) {
            var InterID = form.hmainid || form.HInterID
            //逻辑审核方法
            axios.get(this.baseURL + "/Kf_POStockInBill/AuditKf_POStockInBill", {
                params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
            }).then(response => {
                let result = response.data
                if (result.code == 1) {
                    this.$modal.msgSuccess('操作成功');
                    this.handleQuery();
                }
                else {
                    this.$modal.msgError("错误:" + result.code + result.Message,);
                }
            }).catch(error => {
                this.$modal.msgError("接口请求失败!");
            });
        },
        //#endregion

        //#region 列设置
        handleRowHide() {
            this.rowHideShow = true
            this.openRowHide = true
        },
        rowSetClose(val) {
            this.rowHideShow = false
            this.tableShow = true
            this.openRowHide = val
            this.handleQuery()
        },
        DisPlay_HideColumn(HModName, user, option, dataOption) {
            this.totalNameList = []
            axios.get(this.baseURL + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
                params: {
                    "HModName": HModName,
                    "user": user,
                },
            }).then(res => {
                let data1 = res.data
                if (data1.data.length != 0) {
                    var dataCol = [];//数据库查询出的列数据
                    var newCols = [[]];//对应数据库列顺序col
                    newCols[0].push(option.cols[0][0]);//放入第一个checkbox
                    dataCol = data1.data[0].HGridString.split(',');
                    //列设置列数与页面列数是否一致
                    if (dataCol.length == option.cols[0].length - 1) {
                        //遍历寻找列设置对应列按顺序插入
                        for (var j = 0; j < option.cols[0].length - 1; j++) {
                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                var dataCols = dataCol[j].split('|');
                                //选择与datacols相应列进行修改
                                if (option.cols[0][i + 1]["field"] == dataCols[5]) {
                                    //隐藏列
                                    if (dataCols[1] == 1) {
                                        option.cols[0][i + 1]["hide"] = true;
                                    }
                                    //设置列宽
                                    if (dataCols[3] > 0) {
                                        option.cols[0][i + 1]["width"] = dataCols[3];
                                    }
                                    //设置内容字体大小
                                    if (data1.data[0].HFontSize != 0) {
                                        option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                    } else {
                                        option.cols[0][i + 1]["style"] = "font-size:100%";
                                    }
                                    //显示列
                                    if (dataCols[1] == 0 && this.titleData.indexOf(option.cols[0][i + 1]["title"]) == -1) {
                                        option.cols[0][i + 1]["hide"] = false;
                                    }
                                    //统计列
                                    if (dataCols[6] == 1) {
                                        option.cols[0][i + 1]["totalRow"] = true;
                                    } else {
                                        option.cols[0][i + 1]["totalRow"] = false;
                                    }
                                    //字体所在位置(左 居中 右)
                                    switch (dataCols[2]) {
                                        case "L":
                                            option.cols[0][i + 1]["align"] = "left";
                                            break;
                                        case "M":
                                            option.cols[0][i + 1]["align"] = "center";
                                            break;
                                        case "R":
                                            option.cols[0][i + 1]["align"] = "right";
                                            break;
                                    }
                                    //设置表格title属性显示别名
                                    if (dataCols[4] != null && dataCols[4] != "") {
                                        option.cols[0][i + 1]["title"] = dataCols[4];
                                    }
                                    newCols[0].push(option.cols[0][i + 1]);
                                    break;
                                }
                            }
                        }
                        //遍历循环后判断对应列数是否一致
                        if (dataCol.length == newCols[0].length - 1) {
                            option.cols = newCols;
                            //取消冻结列
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i + 1]["fixed"] != null) {
                                    option.cols[0][i + 1]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if (dataOption.cols[0].indexOf(option.cols[0][i + 1]["title"]) != -1) {
                                        data1.data[0].HFixCols += 1;
                                    }

                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            //设置列排序
                            for (var i = 1; i < option.cols[0].length; i++) {
                                if (data1.data[0].HSortFlag == "是") {
                                    option.cols[0][i]["sort"] = true;
                                }
                                else {
                                    option.cols[0][i]["sort"] = false;
                                }
                            }
                        }
                    }
                    this.btList = option.cols[0]
                    this.btList.map(item => {
                        if (!item.hide) {
                            this.totalNameList.push(item)
                        }
                    })
                    if (data1.data[0].HPageSize == 0) {
                        this.pageSize = 50
                    } else {
                        this.pageSize = data1.data[0].HPageSize
                    }
                    this.tableData = option.data
                    this.tableShow = true
                    this.loading = false
                } else {
                    this.btList = dataOption.cols[0]
                    this.btList.map(item => {
                        if (!item.hide) {
                            this.totalNameList.push(item)
                        }
                    })
                    this.tableData = dataOption.data
                    this.tableShow = true
                    this.loading = false
                }
            }).catch(error => {
                this.$modal.msgError("接口请求失败!");
            });
        },
        //#endregion

        //#region 按钮设置
        handleBtnHide() {
            this.btnHideShow = true
            this.openBtnHide = true
        },
        //#endregion

        //#region 导出
        handleExport() {
            const ws = this.$XLSX.utils.json_to_sheet(this.tyResList); // 将数据转换为工作表
            const wb = this.$XLSX.utils.book_new(); // 创建一个新的工作簿
            this.$XLSX.utils.book_append_sheet(wb, ws, "Sheet1"); // 将工作表添加到工作簿中，并命名为"Sheet1"
            this.$XLSX.writeFile(wb, `Cg_ContractTransportBillMainList_${new Date().getTime()}.xlsx`); // 导出文件      
        },
        //#endregion

        //#region 打印
        get_PrintReport() {
            if (this.ids.length != 1) {
                this.$modal.msgError("请选择一行数据")
            } else if (this.rowForm.状态 != "已审核" && !this.defaintOperationByCompanyName()) {
                this.$modal.msgError("打印失败!原因：单据状态不为'已审核'状态!!");
            } else {
                axios.get(this.baseURL + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
                    params: { "HInterID": this.rowForm.HInterID }
                }).then(response => {
                    var result = response.data
                    if (result.count == 1) {
                        this.printListShow = true
                        this.openPrintList = true
                        // this.$router.push({ path:'/printList', query: { linterid: this.rowForm.hmainid,MyMsg:this.rowForm.hmainid,Type:'Kf_SellOutBillList' }})
                    } else {
                        this.$modal.msgError(result.code + result.Message)
                    }
                }).catch(error => {
                    this.$modal.msgError("接口请求失败!");
                });


            }
            //  var content= ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
        },
        //#endregion

        //#region 条码明细
        get_BarCodeDetail() {
            // if (this.selectedRow.length !== 1) {
            //   this.$message.warning('请选择一行数据查看条码明细！')
            //   return
            // }
            this.barCodeDetailShow = true
            this.$nextTick(() => {
                this.$refs.barcodeDetail.open(this.rowForm)
            })
        },
        //#endregion

        //#region 包装容器出入库明细
        get_PackStockDetail() {
            // if (this.selectedRow.length !== 1) {
            //   this.$message.warning('请选择一行数据查看条码明细！')
            //   return
            // }
            this.packStockDetailShow = true
            this.$nextTick(() => {
                this.$refs.packStockDetail.open(this.rowForm)
            })
        },
        //#endregion

        //#region 退出
        close() {
            // this.reset()
            this.tableShow = true
            this.openEdit = false
            this.editShow = false
            this.handleQuery()
        },
        //#endregion

        //#region 获取公司名，根据公司进行定制化开发
        defaintOperationByCompanyName() {
            var result = false;
            axios.get(this.baseURL + '/Xt_getInfo/getCompanyName').then(response => {
                var data1 = response.data
                if (data1.count == 1) {
                    if (data1.data == "水务") {
                        result = true;
                    }
                }
            }).catch(error => {
                this.$modal.msgError("接口请求失败!");
            });
            return result;
        },
        //#endregion
    }
};
</script>
<style>
.xsckdBox .el-date-editor.el-input {
    width: 100%;
}
</style>

 src/views/scMould/basicModeling/Gy_MouldFile.vue

@@ -95,9 +95,9 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="单位" prop="HUnitName" v-show="isHide">
              <el-form-item label="单位" prop="HUnitName" v-show="isShow">
                <el-input v-model="form.HUnitName" placeholder="请输入单位" disabled>
                  <el-button slot="append" icon="el-icon-search"></el-button>
                  <el-button slot="append" icon="el-icon-search"  @click="openDataDialog(11)"></el-button>
                </el-input>
              </el-form-item>
            </el-col>
@@ -505,6 +505,7 @@
      <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
      <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
      <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
      <GyUnit @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyUnitShow" />
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="deptClickSub">确 定</el-button>
        <el-button @click="deptClose">取 消</el-button>
@@ -527,11 +528,12 @@
import GySupplier from '@/views/basic/gy/gySupplier.vue'
import GyCustomer from '@/views/GyCustomer'
import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
import GyUnit from '@/views/basic/gyUnit/gyUnit.vue'
import moment from 'moment';

export default {
  name: 'Gy_MouldFile',
  components: { Dept, Warehouse, Material, RowSettings, GyEmployee, GySource, GySupplier, GyCustomer, GyStockPlace },
  components: { Dept, Warehouse, Material, RowSettings, GyEmployee, GySource, GySupplier, GyCustomer, GyStockPlace,GyUnit },
  props: {
    OperationType: { type: Number, },
    linterid: { type: Number, },
@@ -569,6 +571,7 @@
      gySupplierShow: false,
      gyCustomerShow: false,
      gyStockPlaceShow: false,
      gyUnitShow: false,
      deptform: {},//弹窗选中数据
      openData: false,//数据弹窗
      dialogTitle: '',
@@ -856,6 +859,10 @@
          }
          this.gyStockPlaceShow = false
          this.openData = false
        } else if (num == 11){
          this.gyUnitShow= false
          this.openData = false

        }
      } else {
        this.$modal.msgError("请选择单条数据!");
@@ -962,7 +969,7 @@
        HMouldDotCheckRuleInterID: 0,
        HMouldMaintainRuleInterName: '',
        HMouldMaintainRuleInterID: 0,
        HBarCode: '',
        HBarCode: '1',
        HMadeSupID: 0,
        HMadeSupName: '',
        HMouldClass: '',
@@ -1503,6 +1510,7 @@
      this.gySupplierShow = false
      this.gyCustomerShow = false
      this.gyStockPlaceShow = false
      this.gyUnitShow= false
    },
    //  打开数据列表弹窗
    openDataDialog(num, row) {
@@ -1543,6 +1551,10 @@
        this.dialogTitle = '仓位列表'
        this.gyStockPlaceShow = true
        this.openData = true
      } else if (num == 11) {
        this.dialogTitle = '单位列表'
        this.gyUnitShow = true
        this.openData = true
      }
    },
  }

 src/views/scMould/basicModeling/Gy_MouldFileList.vue

@@ -96,9 +96,9 @@
      </el-collapse>
    </el-form>
    <el-row :gutter="10" class="mb8" style="margin-top: 10px;">
      <el-col :span="1.5">
      <!-- <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleImport">导入</el-button>
      </el-col>
      </el-col> -->
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit(OperationType = 1)"
          id="btn-Add">新增</el-button>
@@ -107,10 +107,10 @@
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
          @click="handleEdit(row = rowForm, OperationType = 3)">编辑</el-button>
      </el-col>
      <el-col :span="1.5">
      <!-- <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
          @click="handleEdit(row = rowForm, OperationType = 2)">复制</el-button>
      </el-col>
          @click="handleEdit(row = rowForm, copyType = 1)">复制</el-button>
      </el-col> -->
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">删除
        </el-button>
@@ -123,14 +123,14 @@
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
          @click="set_CheckBill(1, form = rowForm)">返审核</el-button>
      </el-col>
      <el-col :span="1.5">
      <!-- <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
          @click="set_De_Stop(0, form = rowForm)">禁用</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
          @click="set_De_Stop(1, form = rowForm)">反禁用</el-button>
      </el-col>
      </el-col> -->
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
      </el-col>
@@ -295,7 +295,7 @@
        HUSEORGID: sessionStorage["OrganizationID"] - 0,
        HName: null,
        HNumber: null,
        HMouldTypeID: null,
        HMouldTypeID: 0,
        Comparator1: '',
        Comparator2: '',
        Comparator: '',
@@ -412,11 +412,9 @@
          "user": sessionStorage["HUserName"],
        },
      }).then(response => {

        let data1 = response.data
        if (data1.count == 1) {
          let data = JSON.parse(data1.data)
          console.log(JSON.parse(data1.data))
          var liStr = '[';
          //遍历生成主菜单
          for (var i = 0; i < data.length; i++) {
@@ -438,7 +436,6 @@
          this.treeOptions = JSON.parse(liStr);
        }
      }).catch(error => {
        console.log(error)
        this.$modal.msgError("接口请求失败!");
      });
    },
@@ -521,77 +518,78 @@
              col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
            }
          }
          option.cols = [[
            { type: 'checkbox', fixed: 'left', totalRowText: '合计行' }
            , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
            , { field: '日期', title: '日期', sort: true }
            , { field: '单据号', title: '单据号', sort: true, width: 120 }
            , { field: '条码编号', title: '条码编号', sort: true, width: 120 }
            , { field: '对应ERP物料编码', title: '物料编号', sort: true, width: 120 }
            , { field: '模具编号', title: '容器编号', sort: true, width: 120 }
            , { field: '模具名称', title: '容器名称', sort: true, width: 120 }
            , { field: '模具型号', title: '容器型号', sort: true, width: 120 }
            , { field: '模具品类', title: '容器品类', sort: true, width: 120 }
            , { field: '模具状态', title: '容器状态', sort: true, width: 120 }
            , { field: '模具可用状态', title: '模具可用状态', sort: true, width: 140 }
            , { field: '穴数', title: '穴数', sort: true, width: 120 }
            , { field: '对应ERP物料编码', title: '容器ERP物料', sort: true, width: 140 }
            , { field: '直径', title: '直径', sort: true, width: 120 }
            , { field: '辅助属性', title: '辅助属性', sort: true, width: 120 }
            , { field: '辅助属性2', title: '辅助属性2', sort: true, width: 120 }
            , { field: '图号', title: '图号', sort: true, width: 120 }
            , { field: '生产产品型号', title: '生产产品型号', sort: true, width: 120 }
            , { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true, width: 120 }
            , { field: '计量单位代码', title: '计量单位代码', sort: true, width: 120 }
            , { field: '计量单位', title: '计量单位', sort: true, width: 120 }
            , { field: '出厂日期', title: '出厂日期', sort: true, width: 120 }
            , { field: '出厂编号', title: '出厂编号', sort: true, width: 120 }
            , { field: '使用部门代码', title: '使用部门代码', sort: true, width: 120 }
            , { field: '使用部门', title: '使用部门', sort: true, width: 120 }
            , { field: 'HSupID', title: 'HSupID', hide: true, sort: true, width: 120 }
            , { field: '供应商代码', title: '供应商代码', sort: true, width: 120 }
            , { field: '供应商', title: '供应商', sort: true, width: 120 }
            , { field: 'HWhID', title: 'HWhID', hide: true, sort: true, width: 120 }
            , { field: '默认仓库', title: '默认仓库', sort: true, width: 120 }
            , { field: 'HSPID', title: 'HSPID', hide: true, sort: true, width: 120 }
            , { field: '默认仓位', title: '默认仓位', sort: true, width: 120 }
            , { field: '版本', title: '版本', sort: true, width: 120 }
            , { field: '当前仓库', title: '当前仓库', sort: true, width: 120 }
            , { field: '当前仓位', title: '当前仓位', sort: true, width: 120 }
            , { field: '虚拟仓类型', title: '虚拟仓类型', sort: true, width: 120 }
            , { field: '虚拟仓', title: '虚拟仓', sort: true, width: 120 }
            , { field: '当前模具规格', title: '当前容器规格', sort: true, width: 140 }
            , { field: '初始模具规格', title: '初始容器规格', sort: true, width: 140 }
            , { field: '当前设计寿命', title: '当前设计寿命', sort: true, totalRow: true, width: 140 }
            , { field: '初始设计寿命', title: '初始设计寿命', sort: true, totalRow: true, width: 140 }
            , { field: '使用寿命', title: '使用寿命', sort: true, totalRow: true, width: 120 }
            , { field: '剩余寿命', title: '剩余寿命', sort: true, totalRow: true, width: 120 }
            , { field: '已生产数量', title: '已生产数量', sort: true, totalRow: true, width: 120 }
            , { field: '已生产重量', title: '已生产重量', sort: true, totalRow: true, width: 120 }
            , { field: '备注', title: '备注', sort: true, width: 120 }
            , { field: '关联数量', title: '关联数量', sort: true, totalRow: true, width: 120 }
            , { field: '制单人', title: '制单人', sort: true, width: 120 }
            , { field: '制单日期', title: '制单日期', sort: true, width: 120 }
            , { field: '审核人', title: '审核人', sort: true, width: 120 }
            , { field: '审核日期', title: '审核日期', sort: true, width: 120 }
            , { field: '修改人', title: '修改人', sort: true, width: 120 }
            , { field: '修改日期', title: '修改日期', sort: true, width: 120 }
            , { field: '关闭人', title: '关闭人', sort: true, width: 120 }
            , { field: '关闭日期', title: '关闭日期', sort: true, width: 120 }
            , { field: '作废人', title: '作废人', sort: true, width: 120 }
            , { field: '作废日期', title: '作废日期', sort: true, width: 120 }
            , { field: 'hbilltype', title: 'hbilltype', hide: true, sort: true, width: 120 }
            , { field: '单据类型', title: '单据类型', hide: true, sort: true, width: 120 }
            , { field: 'HMoudType', title: 'HMoudType', hide: true, sort: true, width: 120 }
            , { field: 'hsubid', title: 'hsubid', hide: true, sort: true, width: 120 }
          ]]
          option.cols = [col]
          // option.cols = [[
          //   { type: 'checkbox', fixed: 'left', totalRowText: '合计行' }
          //   , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
          //   , { field: '日期', title: '日期', sort: true }
          //   , { field: '单据号', title: '单据号', sort: true, width: 120 }
          //   , { field: '条码编号', title: '条码编号', sort: true, width: 120 }
          //   , { field: '对应ERP物料编码', title: '物料编号', sort: true, width: 120 }
          //   , { field: '模具编号', title: '容器编号', sort: true, width: 120 }
          //   , { field: '模具名称', title: '容器名称', sort: true, width: 120 }
          //   , { field: '模具型号', title: '容器型号', sort: true, width: 120 }
          //   , { field: '模具品类', title: '容器品类', sort: true, width: 120 }
          //   , { field: '模具状态', title: '容器状态', sort: true, width: 120 }
          //   , { field: '模具可用状态', title: '模具可用状态', sort: true, width: 140 }
          //   , { field: '穴数', title: '穴数', sort: true, width: 120 }
          //   , { field: '对应ERP物料编码', title: '容器ERP物料', sort: true, width: 140 }
          //   , { field: '直径', title: '直径', sort: true, width: 120 }
          //   , { field: '辅助属性', title: '辅助属性', sort: true, width: 120 }
          //   , { field: '辅助属性2', title: '辅助属性2', sort: true, width: 120 }
          //   , { field: '图号', title: '图号', sort: true, width: 120 }
          //   , { field: '生产产品型号', title: '生产产品型号', sort: true, width: 120 }
          //   , { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true, width: 120 }
          //   , { field: '计量单位代码', title: '计量单位代码', sort: true, width: 120 }
          //   , { field: '计量单位', title: '计量单位', sort: true, width: 120 }
          //   , { field: '出厂日期', title: '出厂日期', sort: true, width: 120 }
          //   , { field: '出厂编号', title: '出厂编号', sort: true, width: 120 }
          //   , { field: '使用部门代码', title: '使用部门代码', sort: true, width: 120 }
          //   , { field: '使用部门', title: '使用部门', sort: true, width: 120 }
          //   , { field: 'HSupID', title: 'HSupID', hide: true, sort: true, width: 120 }
          //   , { field: '供应商代码', title: '供应商代码', sort: true, width: 120 }
          //   , { field: '供应商', title: '供应商', sort: true, width: 120 }
          //   , { field: 'HWhID', title: 'HWhID', hide: true, sort: true, width: 120 }
          //   , { field: '默认仓库', title: '默认仓库', sort: true, width: 120 }
          //   , { field: 'HSPID', title: 'HSPID', hide: true, sort: true, width: 120 }
          //   , { field: '默认仓位', title: '默认仓位', sort: true, width: 120 }
          //   , { field: '版本', title: '版本', sort: true, width: 120 }
          //   , { field: '当前仓库', title: '当前仓库', sort: true, width: 120 }
          //   , { field: '当前仓位', title: '当前仓位', sort: true, width: 120 }
          //   , { field: '虚拟仓类型', title: '虚拟仓类型', sort: true, width: 120 }
          //   , { field: '虚拟仓', title: '虚拟仓', sort: true, width: 120 }
          //   , { field: '当前模具规格', title: '当前容器规格', sort: true, width: 140 }
          //   , { field: '初始模具规格', title: '初始容器规格', sort: true, width: 140 }
          //   , { field: '当前设计寿命', title: '当前设计寿命', sort: true, totalRow: true, width: 140 }
          //   , { field: '初始设计寿命', title: '初始设计寿命', sort: true, totalRow: true, width: 140 }
          //   , { field: '使用寿命', title: '使用寿命', sort: true, totalRow: true, width: 120 }
          //   , { field: '剩余寿命', title: '剩余寿命', sort: true, totalRow: true, width: 120 }
          //   , { field: '已生产数量', title: '已生产数量', sort: true, totalRow: true, width: 120 }
          //   , { field: '已生产重量', title: '已生产重量', sort: true, totalRow: true, width: 120 }
          //   , { field: '备注', title: '备注', sort: true, width: 120 }
          //   , { field: '关联数量', title: '关联数量', sort: true, totalRow: true, width: 120 }
          //   , { field: '制单人', title: '制单人', sort: true, width: 120 }
          //   , { field: '制单日期', title: '制单日期', sort: true, width: 120 }
          //   , { field: '审核人', title: '审核人', sort: true, width: 120 }
          //   , { field: '审核日期', title: '审核日期', sort: true, width: 120 }
          //   , { field: '修改人', title: '修改人', sort: true, width: 120 }
          //   , { field: '修改日期', title: '修改日期', sort: true, width: 120 }
          //   , { field: '关闭人', title: '关闭人', sort: true, width: 120 }
          //   , { field: '关闭日期', title: '关闭日期', sort: true, width: 120 }
          //   , { field: '作废人', title: '作废人', sort: true, width: 120 }
          //   , { field: '作废日期', title: '作废日期', sort: true, width: 120 }
          //   , { field: 'hbilltype', title: 'hbilltype', hide: true, sort: true, width: 120 }
          //   , { field: '单据类型', title: '单据类型', hide: true, sort: true, width: 120 }
          //   , { field: 'HMoudType', title: 'HMoudType', hide: true, sort: true, width: 120 }
          //   , { field: 'hsubid', title: 'hsubid', hide: true, sort: true, width: 120 }
          // ]]
          this.dataList = option
          option.data = data1.data;
          var result = data1.data;
          option.data = result;
          this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
        } else {
          this.$modal.msgError("接口请求失败!");
          this.$modal.msgError(data1.Message);
        }
      }).catch(error => {
        this.$modal.msgError("接口请求失败!");
@@ -851,10 +849,10 @@
        this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
      }
      if (this.queryParams.HNumber) {
        this.sWhere += " and 器具编号 like '%" + this.queryParams.HNumber + "%'";
        this.sWhere += " and 模具编号 like '%" + this.queryParams.HNumber + "%'";
      }
      if (this.queryParams.HName) {
        this.sWhere += " and 器具名称 like '%" + this.queryParams.HName + "%'";
        this.sWhere += " and 模具名称 like '%" + this.queryParams.HName + "%'";
      }
      if (this.queryParams.HUSEORGID) {
        this.sWhere += " and HUSEORGID = '" + this.queryParams.HUSEORGID + "'"
@@ -903,9 +901,10 @@
    resetQuery() {
      this.sWhere = ''
      this.queryParams = {
        HUSEORGID: null,
        HUSEORGID: sessionStorage["OrganizationID"] - 0,
        HName: null,
        HNumber: null,
        HMouldTypeID: 0,
        Comparator1: '',
        Comparator2: '',
        Comparator: '',