From c466006a64f1cbbcbf04e0ae4a2d73de302aa92a Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期二, 13 一月 2026 11:35:08 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/basicModeling/Gy_MouldFile.vue | 20
src/views/basic/gyUnit/gyUnit.vue | 2
src/views/logistics/transportGPS/WL_YayBill.vue | 912 +++++++++++++++++++++++++++++++++++++++++++
src/views/scMould/basicModeling/Gy_MouldFileList.vue | 157 +++---
src/store/modules/permission.js | 77 +++
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 10
src/router/index.js | 43 ++
7 files changed, 1,129 insertions(+), 92 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 8a0c348..7cdaf7a 100644
--- a/src/router/index.js
+++ b/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, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ 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, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ 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
];
// 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index e4bafd0..d4cc6e6 100644
--- a/src/store/modules/permission.js
+++ b/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",
diff --git a/src/views/basic/gyUnit/gyUnit.vue b/src/views/basic/gyUnit/gyUnit.vue
index 7418b3d..2905483 100644
--- a/src/views/basic/gyUnit/gyUnit.vue
+++ b/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"
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
new file mode 100644
index 0000000..0e9c73f
--- /dev/null
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -0,0 +1,10 @@
+<template>
+ <div style="padding: 10px;">
+ 2
+</div>
+</template>
+<script>
+ export default {
+ name: 'Add_Edit_WL_YayBill',
+ }
+</script>
\ No newline at end of file
diff --git a/src/views/logistics/transportGPS/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
new file mode 100644
index 0000000..7804c82
--- /dev/null
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -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, //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣╥p鍦板潃)
+
+ 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: [], // 鍒楄〃鏁版嵁銆傜敤浜巘able鐩戝惉浜嬩欢
+ 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) {//妫�鏌ata銆恑銆�.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]);//鏀惧叆绗竴涓猚heckbox
+ 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('|');
+ //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+ 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>
diff --git a/src/views/scMould/basicModeling/Gy_MouldFile.vue b/src/views/scMould/basicModeling/Gy_MouldFile.vue
index 7e4fa62..e45f187 100644
--- a/src/views/scMould/basicModeling/Gy_MouldFile.vue
+++ b/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
}
},
}
diff --git a/src/views/scMould/basicModeling/Gy_MouldFileList.vue b/src/views/scMould/basicModeling/Gy_MouldFileList.vue
index ab3efee..01eddec 100644
--- a/src/views/scMould/basicModeling/Gy_MouldFileList.vue
+++ b/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: '',
--
Gitblit v1.9.1