From 9bf5dc5bc503172bf71b898434d8a23362aa789b Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周四, 25 4月 2024 16:03:50 +0800
Subject: [PATCH] bug

---
 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue   | 1751 +++++++++++++++++++++++++++++-----------------------------
 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue |   43 
 2 files changed, 903 insertions(+), 891 deletions(-)

diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
index 43e0cb5..fb153d0 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
@@ -1,898 +1,907 @@
 锘�<template>
-  <div ref="boxOutWrap" class="boxOutWrap">
-	<div ref="boxForm" class="boxForm">  
-    <a-card :bordered="false" :bodyStyle="tstyle">
+	<div ref="boxOutWrap" class="boxOutWrap">
+		<div ref="boxForm" class="boxForm">
+			<a-card :bordered="false" :bodyStyle="tstyle">
 
-      <div class="table-page-search-wrapper" v-if="hasPerm('WmsMaterial:page')">
-        <a-form layout="inline">
-          <a-row :gutter="48">
-            <a-col :md="8" :sm="24">
-              <a-form-item label="鐗╂枡鍚嶇О">
-                <a-input v-model="queryParam.materialName" allow-clear placeholder="璇疯緭鍏ョ墿鏂欏悕绉�"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="8" :sm="24">
-              <a-form-item label="鐗╂枡缂栧彿">
-                <a-input v-model="queryParam.materialCode" allow-clear placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�"/>
-              </a-form-item>
-            </a-col><template v-if="advanced">
-              <a-col :md="8" :sm="24">
-                <a-form-item label="ERP缂栧彿">
-                  <a-input v-model="queryParam.erpCode" allow-clear placeholder="璇疯緭鍏RP缂栧彿"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="鐗╂枡绫诲瀷鍚嶇О">
-                  <a-input v-model="queryParam.materialTypeName" allow-clear placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬪悕绉�"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="鐗╂枡绫诲瀷鎻忚堪">
-                  <a-input v-model="queryParam.materialTypeDescr" allow-clear placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬫弿杩�"/>
-                </a-form-item>
-              </a-col><a-col :md="8" :sm="24">
-                <a-form-item label="鐗╂枡绫诲瀷">
-                  <a-input-number v-model="queryParam.materialType" style="width: 100%" allow-clear placeholder="璇疯緭鍏ョ墿鏂欑被鍨�"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="鐗╂枡缁�">
-                  <a-input v-model="queryParam.materialGroup" allow-clear placeholder="璇疯緭鍏ョ墿鏂欑粍"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="ABC鍒嗙被鍚嶇О">
-                  <a-input v-model="queryParam.aBCClassName" allow-clear placeholder="璇疯緭鍏BC鍒嗙被鍚嶇О"/>
-                </a-form-item>
-              </a-col><a-col :md="8" :sm="24">
-                <a-form-item label="ABC鍒嗙被">
-                  <a-input-number v-model="queryParam.aBCClass" style="width: 100%" allow-clear placeholder="璇疯緭鍏BC鍒嗙被"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="鐗╂枡瑙勬牸">
-                  <a-input v-model="queryParam.materialSpec" allow-clear placeholder="璇疯緭鍏ョ墿鏂欒鏍�"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="榛樿鍏ュ簱搴撲綅">
-                  <a-input v-model="queryParam.inPlaceCode" allow-clear placeholder="璇疯緭鍏ラ粯璁ゅ叆搴撳簱浣�"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="搴撳瓨鍗曚綅">
-                  <a-input v-model="queryParam.materialUnit" allow-clear placeholder="璇疯緭鍏ュ簱瀛樺崟浣�"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="閲囪喘鍗曚綅">
-                  <a-input v-model="queryParam.pOUnit" allow-clear placeholder="璇疯緭鍏ラ噰璐崟浣�"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="棰滆壊">
-                  <a-input v-model="queryParam.color" allow-clear placeholder="璇疯緭鍏ラ鑹�"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="閲嶉噺">
-                  <a-input v-model="queryParam.weight" allow-clear placeholder="璇疯緭鍏ラ噸閲�"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="鏍囧寘鏁伴噺">
-                  <a-input v-model="queryParam.sNP" allow-clear placeholder="璇疯緭鍏ユ爣鍖呮暟閲�"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="鎹㈢畻鐜�">
-                  <a-input v-model="queryParam.translateRate" allow-clear placeholder="璇疯緭鍏ユ崲绠楃巼"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="鎵规灞炴�ц鍒�">
-                  <a-input v-model="queryParam.batchRuleId" allow-clear placeholder="璇疯緭鍏ユ壒娆″睘鎬ц鍒�"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="鎺у埗灞炴�ц鍒�">
-                  <a-input v-model="queryParam.controlRuleId" allow-clear placeholder="璇疯緭鍏ユ帶鍒跺睘鎬ц鍒�"/>
-                </a-form-item>
-              </a-col>
-			<a-col :md="8" :sm="24">
-				<a-form-item label="鏄惁绂佺敤">
-					<a-select :allowClear="true" style="width: 100%" v-model="queryParam.isDisabled" placeholder="璇烽�夋嫨鏄惁绂佺敤">
-						<a-select-option v-for="(item,index) in isDisabledData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
-					</a-select>
-				</a-form-item>
-			</a-col>
-		
-              <a-col :md="8" :sm="24">
-                <a-form-item label="鎻忚堪">
-                  <a-input v-model="queryParam.materialDesc" allow-clear placeholder="璇疯緭鍏ユ弿杩�"/>
-                </a-form-item>
-              </a-col>          <!--骞存湀鏃ユ椂鍒嗙-->
-			<!--鏃堕棿鑼冨洿-->
+				<div class="table-page-search-wrapper" v-if="hasPerm('WmsMaterial:page')">
+					<a-form layout="inline">
+						<a-row :gutter="48">
+							<a-col :md="8" :sm="24">
+								<a-form-item label="鐗╂枡鍚嶇О">
+									<a-input v-model="queryParam.materialName" allow-clear placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" />
+								</a-form-item>
+							</a-col>
+							<a-col :md="8" :sm="24">
+								<a-form-item label="鐗╂枡缂栧彿">
+									<a-input v-model="queryParam.materialCode" allow-clear placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" />
+								</a-form-item>
+							</a-col><template v-if="advanced">
+								<a-col :md="8" :sm="24">
+									<a-form-item label="ERP缂栧彿">
+										<a-input v-model="queryParam.erpCode" allow-clear placeholder="璇疯緭鍏RP缂栧彿" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="鐗╂枡绫诲瀷鍚嶇О">
+										<a-input v-model="queryParam.materialTypeName" allow-clear
+											placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬪悕绉�" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="鐗╂枡绫诲瀷鎻忚堪">
+										<a-input v-model="queryParam.materialTypeDescr" allow-clear
+											placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬫弿杩�" />
+									</a-form-item>
+								</a-col><a-col :md="8" :sm="24">
+									<a-form-item label="鐗╂枡绫诲瀷">
+										<a-input-number v-model="queryParam.materialType" style="width: 100%" allow-clear
+											placeholder="璇疯緭鍏ョ墿鏂欑被鍨�" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="鐗╂枡缁�">
+										<a-input v-model="queryParam.materialGroup" allow-clear placeholder="璇疯緭鍏ョ墿鏂欑粍" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="ABC鍒嗙被鍚嶇О">
+										<a-input v-model="queryParam.abcClassName" allow-clear placeholder="璇疯緭鍏BC鍒嗙被鍚嶇О" />
+									</a-form-item>
+								</a-col><a-col :md="8" :sm="24">
+									<a-form-item label="ABC鍒嗙被">
+										<a-input-number v-model="queryParam.abcClass" style="width: 100%" allow-clear
+											placeholder="璇疯緭鍏BC鍒嗙被" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="鐗╂枡瑙勬牸">
+										<a-input v-model="queryParam.materialSpec" allow-clear placeholder="璇疯緭鍏ョ墿鏂欒鏍�" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="榛樿鍏ュ簱搴撲綅">
+										<a-input v-model="queryParam.inPlaceCode" allow-clear placeholder="璇疯緭鍏ラ粯璁ゅ叆搴撳簱浣�" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="搴撳瓨鍗曚綅">
+										<a-input v-model="queryParam.materialUnit" allow-clear placeholder="璇疯緭鍏ュ簱瀛樺崟浣�" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="閲囪喘鍗曚綅">
+										<a-input v-model="queryParam.pOUnit" allow-clear placeholder="璇疯緭鍏ラ噰璐崟浣�" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="棰滆壊">
+										<a-input v-model="queryParam.color" allow-clear placeholder="璇疯緭鍏ラ鑹�" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="閲嶉噺">
+										<a-input v-model="queryParam.weight" allow-clear placeholder="璇疯緭鍏ラ噸閲�" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="鏍囧寘鏁伴噺">
+										<a-input v-model="queryParam.sNP" allow-clear placeholder="璇疯緭鍏ユ爣鍖呮暟閲�" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="鎹㈢畻鐜�">
+										<a-input v-model="queryParam.translateRate" allow-clear placeholder="璇疯緭鍏ユ崲绠楃巼" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="鎵规灞炴�ц鍒�">
+										<a-input v-model="queryParam.batchRuleId" allow-clear placeholder="璇疯緭鍏ユ壒娆″睘鎬ц鍒�" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="鎺у埗灞炴�ц鍒�">
+										<a-input v-model="queryParam.controlRuleId" allow-clear placeholder="璇疯緭鍏ユ帶鍒跺睘鎬ц鍒�" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="鏄惁绂佺敤">
+										<a-select :allowClear="true" style="width: 100%" v-model="queryParam.isDisabled"
+											placeholder="璇烽�夋嫨鏄惁绂佺敤">
+											<a-select-option v-for="(item, index) in isDisabledData" :key="index"
+												:value="item.code">{{ item.name }}</a-select-option>
+										</a-select>
+									</a-form-item>
+								</a-col>
 
-				<a-col :md="8" :sm="24">
-					<a-form-item label="鍒涘缓鏃堕棿">
-						<a-range-picker style="width: 100%" :placeholder="['寮�濮嬫椂闂�', '缁撴潫鏃堕棿']"  :show-time="{
-format: 'HH:mm:ss',  defaultValue: [moment('00:00:00', 'HH:mm:ss'),moment('23:59:59', 'HH:mm:ss')]}" v-model="queryParam.createdTime"  value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"   @change="onChangecreatedTime"/>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="鎻忚堪">
+										<a-input v-model="queryParam.materialDesc" allow-clear placeholder="璇疯緭鍏ユ弿杩�" />
+									</a-form-item>
+								</a-col> <!--骞存湀鏃ユ椂鍒嗙-->
+								<!--鏃堕棿鑼冨洿-->
 
-					</a-form-item>
-				</a-col>
-			          <!--骞存湀鏃ユ椂鍒嗙-->
-			<!--鏃堕棿鑼冨洿-->
+								<a-col :md="8" :sm="24">
+									<a-form-item label="鍒涘缓鏃堕棿">
+										<a-range-picker style="width: 100%" :placeholder="['寮�濮嬫椂闂�', '缁撴潫鏃堕棿']" :show-time="{
+											format: 'HH:mm:ss', defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
+										}"
+											v-model="queryParam.createdTime" value-format="YYYY-MM-DD HH:mm:ss"
+											format="YYYY-MM-DD HH:mm:ss" @change="onChangecreatedTime" />
 
-				<a-col :md="8" :sm="24">
-					<a-form-item label="鏇存柊鏃堕棿">
-						<a-range-picker style="width: 100%" :placeholder="['寮�濮嬫椂闂�', '缁撴潫鏃堕棿']"  :show-time="{
-format: 'HH:mm:ss',  defaultValue: [moment('00:00:00', 'HH:mm:ss'),moment('23:59:59', 'HH:mm:ss')]}" v-model="queryParam.updatedTime"  value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"   @change="onChangeupdatedTime"/>
+									</a-form-item>
+								</a-col>
+								<!--骞存湀鏃ユ椂鍒嗙-->
+								<!--鏃堕棿鑼冨洿-->
 
-					</a-form-item>
-				</a-col>
-			
-              <a-col :md="8" :sm="24">
-                <a-form-item label="鍒涘缓鑰呭悕绉�">
-                  <a-input v-model="queryParam.createdUserName" allow-clear placeholder="璇疯緭鍏ュ垱寤鸿�呭悕绉�"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-form-item label="淇敼鑰呭悕绉�">
-                  <a-input v-model="queryParam.updatedUserName" allow-clear placeholder="璇疯緭鍏ヤ慨鏀硅�呭悕绉�"/>
-                </a-form-item>
-              </a-col>	</template>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="鏇存柊鏃堕棿">
+										<a-range-picker style="width: 100%" :placeholder="['寮�濮嬫椂闂�', '缁撴潫鏃堕棿']" :show-time="{
+											format: 'HH:mm:ss', defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
+										}"
+											v-model="queryParam.updatedTime" value-format="YYYY-MM-DD HH:mm:ss"
+											format="YYYY-MM-DD HH:mm:ss" @change="onChangeupdatedTime" />
 
-            <a-col :md="8" :sm="24" >
-              <span class="table-page-search-submitButtons">
-                <a-button type="primary" @click="$refs.table.refresh(true)" >鏌ヨ</a-button>
-                <a-button style="margin-left: 8px" @click="() => queryParam = {}">閲嶇疆</a-button>
-                <a @click="toggleAdvanced" style="margin-left: 8px"> {{ advanced ? '鏀惰捣' : '灞曞紑' }}
-                  <a-icon :type="advanced ? 'up' : 'down'"/>
-                </a>
-              </span>
-            </a-col>
+									</a-form-item>
+								</a-col>
 
-          </a-row>
-        </a-form>
-      </div>
-    </a-card>
-	</div>
-    <a-card :bordered="false">
-      <s-table
-        ref="table"
-        :columns="columns"
-        :data="loadData"
-        :alert="true"
-		@changeTablePage="pageInfo = $event"
-		:scroll="{x: true,y:tableHeight}"
-        :rowKey="(record) => record.id"
-        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
-        <template class="table-operator" slot="operator" v-if="hasPerm('WmsMaterial:add')" >
-		<div ref="actionBar" class="actionBar">
-			<a-button type="info" v-if="hasPerm('sysExcelTemplate:importExcel')" icon="upload" @click="$refs.excelForm.index()">
-            瀵煎叆
-          </a-button>
-          <a-button type="info" v-if="hasPerm('WmsMaterial:exportExcel')" icon="download" @click="WmsMaterialToExcel()">
-            瀵煎嚭
-          </a-button>
-			<!-- <a-button type="primary" v-if="hasPerm('WmsMaterial:add')" icon="plus" @click="$refs.addForm.add()">鏂板鐗╂枡淇℃伅琛�</a-button> -->
-			<!-- 鑷畾涔� -->
-			<a-button type="primary" v-if="hasPerm('WmsMaterial:add')" icon="plus" @click="$refs.tabForm.add()">鏂板鐗╂枡淇℃伅</a-button>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="鍒涘缓鑰呭悕绉�">
+										<a-input v-model="queryParam.createdUserName" allow-clear placeholder="璇疯緭鍏ュ垱寤鸿�呭悕绉�" />
+									</a-form-item>
+								</a-col>
+								<a-col :md="8" :sm="24">
+									<a-form-item label="淇敼鑰呭悕绉�">
+										<a-input v-model="queryParam.updatedUserName" allow-clear placeholder="璇疯緭鍏ヤ慨鏀硅�呭悕绉�" />
+									</a-form-item>
+								</a-col> </template>
+
+							<a-col :md="8" :sm="24">
+								<span class="table-page-search-submitButtons">
+									<a-button type="primary" @click="$refs.table.refresh(true)">鏌ヨ</a-button>
+									<a-button style="margin-left: 8px" @click="() => queryParam = {}">閲嶇疆</a-button>
+									<a @click="toggleAdvanced" style="margin-left: 8px"> {{ advanced ? '鏀惰捣' : '灞曞紑' }}
+										<a-icon :type="advanced ? 'up' : 'down'" />
+									</a>
+								</span>
+							</a-col>
+
+						</a-row>
+					</a-form>
+				</div>
+			</a-card>
 		</div>
-		</template>
-		  <span slot="isDisabledscopedSlots" slot-scope="text">
-			<div v-if="text===true ">
-				<a-tag color="green">鏄�</a-tag>
-			</div>
-			<div v-else-if="text==false">
-				<a-tag color="volcano">鍚�</a-tag>
-			</div>
-			<div v-else=""></div>
-			</span>
-		  <span slot="action" slot-scope="text, record">
-			
-			<!-- <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.editForm.edit(record)">缂栬緫</a> -->
-			<a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.tabForm.add(record)">缂栬緫</a>
-			<a-divider type="vertical" v-if="hasPerm('WmsMaterial:edit') & hasPerm('WmsMaterial:delete')"/>
-			<a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.tabForm.add(record,'璇︽儏')">璇︽儏</a>
-          <a-divider type="vertical" v-if="hasPerm('WmsMaterial:edit') & hasPerm('WmsMaterial:delete')"/>
-          <a-popconfirm v-if="hasPerm('WmsMaterial:delete')" placement="topRight" title="纭鍒犻櫎锛�" @confirm="() => WmsMaterialDelete(record)">
-            <a>鍒犻櫎</a>
-          </a-popconfirm>
-        </span>
-      </s-table>
-      <add-form ref="addForm" @ok="handleOk" />
-      <edit-form ref="editForm" @ok="handleOk" />
-	  <excel-form ref="excelForm" @ok="handleOk" />
-	  <!-- 鑷畾涔� -->
-	  <tab-form ref="tabForm" @ok="handleOk" />
+		<a-card :bordered="false">
+			<s-table ref="table" :columns="columns" :data="loadData" :alert="true" @changeTablePage="pageInfo = $event"
+				:scroll="{ x: true, y: tableHeight }" :rowKey="(record) => record.id"
+				:rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
+				<template class="table-operator" slot="operator" v-if="hasPerm('WmsMaterial:add')">
+					<div ref="actionBar" class="actionBar">
+						<a-button type="info" v-if="hasPerm('sysExcelTemplate:importExcel')" icon="upload"
+							@click="$refs.excelForm.index()">
+							瀵煎叆
+						</a-button>
+						<a-button type="info" v-if="hasPerm('WmsMaterial:exportExcel')" icon="download"
+							@click="WmsMaterialToExcel()">
+							瀵煎嚭
+						</a-button>
+						<!-- <a-button type="primary" v-if="hasPerm('WmsMaterial:add')" icon="plus" @click="$refs.addForm.add()">鏂板鐗╂枡淇℃伅琛�</a-button> -->
+						<!-- 鑷畾涔� -->
+						<a-button type="primary" v-if="hasPerm('WmsMaterial:add')" icon="plus"
+							@click="$refs.tabForm.add()">鏂板鐗╂枡淇℃伅</a-button>
+					</div>
+				</template>
+				<span slot="isDisabledscopedSlots" slot-scope="text">
+					<div v-if="text === true">
+						<a-tag color="green">鏄�</a-tag>
+					</div>
+					<div v-else-if="text == false">
+						<a-tag color="volcano">鍚�</a-tag>
+					</div>
+					<div v-else=""></div>
+				</span>
+				<span slot="action" slot-scope="text, record">
 
-    </a-card>
-  </div>
+					<!-- <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.editForm.edit(record)">缂栬緫</a> -->
+					<a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.tabForm.add(record)">缂栬緫</a>
+					<a-divider type="vertical" v-if="hasPerm('WmsMaterial:edit') & hasPerm('WmsMaterial:delete')" />
+					<a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.tabForm.add(record, '璇︽儏')">璇︽儏</a>
+					<a-divider type="vertical" v-if="hasPerm('WmsMaterial:edit') & hasPerm('WmsMaterial:delete')" />
+					<a-popconfirm v-if="hasPerm('WmsMaterial:delete')" placement="topRight" title="纭鍒犻櫎锛�"
+						@confirm="() => WmsMaterialDelete(record)">
+						<a>鍒犻櫎</a>
+					</a-popconfirm>
+				</span>
+			</s-table>
+			<add-form ref="addForm" @ok="handleOk" />
+			<edit-form ref="editForm" @ok="handleOk" />
+			<excel-form ref="excelForm" @ok="handleOk" />
+			<!-- 鑷畾涔� -->
+			<tab-form ref="tabForm" @ok="handleOk" />
+
+		</a-card>
+	</div>
 </template>
 <script>
-	import { STable } from '@/components'
-	import moment from 'moment'
-	import { WmsMaterialPage, WmsMaterialDelete, WmsMaterialToExcel } from '@/api/modular/main/WmsBase/WmsMaterialManage'
-	//鑷畾涔塼able楂樺害
-	import setTableHtMixin from '@/mixins/handleTableHt.js'
-	import addForm from './addForm.vue'
+import { STable } from '@/components'
+import moment from 'moment'
+import { WmsMaterialPage, WmsMaterialDelete, WmsMaterialToExcel } from '@/api/modular/main/WmsBase/WmsMaterialManage'
+//鑷畾涔塼able楂樺害
+import setTableHtMixin from '@/mixins/handleTableHt.js'
+import addForm from './addForm.vue'
 //鑷畾涔�
-	import tabForm from './tabForm.vue'
+import tabForm from './tabForm.vue'
 
-	import { exportExcel } from '@/utils/exportToExcel'
-	import { downloadFile } from '@/utils/util'
-	import editForm from './editForm.vue'
-	import excelForm from './excelForm.vue'
-	export default {
+import { exportExcel } from '@/utils/exportToExcel'
+import { downloadFile } from '@/utils/util'
+import editForm from './editForm.vue'
+import excelForm from './excelForm.vue'
+export default {
 	mixins: [setTableHtMixin],
 	components: {
-	STable,
-	addForm,
-	editForm,
-	excelForm,
-	tabForm //鑷畾涔�
+		STable,
+		addForm,
+		editForm,
+		excelForm,
+		tabForm //鑷畾涔�
 	},
-	data () {
-	return {
-	advanced: false, // 楂樼骇鎼滅储 灞曞紑/鍏抽棴
-	queryParam: {},
-	 pageInfo: {
-        current: 1,
-        pageSize: 10
-      },
-	columns: [
-	{
-	title:'搴忓彿',
-	width: '60px',
-	align: 'center',
-	customRender: (text, record, index) => `${index + 1 + (this.pageInfo.current - 1) * this.pageInfo.pageSize}`
+	data() {
+		return {
+			advanced: false, // 楂樼骇鎼滅储 灞曞紑/鍏抽棴
+			queryParam: {},
+			pageInfo: {
+				current: 1,
+				pageSize: 10
+			},
+			columns: [
+				{
+					title: '搴忓彿',
+					width: '60px',
+					align: 'center',
+					customRender: (text, record, index) => `${index + 1 + (this.pageInfo.current - 1) * this.pageInfo.pageSize}`
+				},
+				{
+					title: '鐗╂枡鍚嶇О',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'materialName'
+				},
+				{
+					title: '鐗╂枡缂栧彿',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'materialCode'
+				},
+				{
+					title: 'ERP缂栧彿',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'erpCode'
+				},
+				{
+					title: '鐗╂枡绫诲瀷鍚嶇О',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'materialTypeName'
+				},
+				{
+					title: '鐗╂枡绫诲瀷鎻忚堪',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'materialTypeDescr'
+				},
+				{
+					title: '鐗╂枡绫诲瀷',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'materialType'
+				},
+				{
+					title: '鐗╂枡缁�',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'materialGroup'
+				},
+				{
+					title: 'ABC鍒嗙被鍚嶇О',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'abcClassName'
+				},
+				{
+					title: 'ABC鍒嗙被',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'abcClass'
+				},
+				{
+					title: '鐗╂枡瑙勬牸',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'materialSpec'
+				},
+				{
+					title: '榛樿鍏ュ簱搴撲綅',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'inPlaceCode'
+				},
+				{
+					title: '搴撳瓨鍗曚綅',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'materialUnit'
+				},
+				{
+					title: '閲囪喘鍗曚綅',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'pOUnit'
+				},
+				{
+					title: '棰滆壊',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'color'
+				},
+				{
+					title: '閲嶉噺',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'weight'
+				},
+				{
+					title: '鏍囧寘鏁伴噺',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'sNP'
+				},
+				{
+					title: '鎹㈢畻鐜�',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'translateRate'
+				},
+				{
+					title: '鎵规灞炴�ц鍒�',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'batchRuleId'
+				},
+				{
+					title: '鎺у埗灞炴�ц鍒�',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'controlRuleId'
+				},
+				{
+					title: '鏄惁绂佺敤',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'isDisabled',
+					scopedSlots: { customRender: 'isDisabledscopedSlots' }
+				},
+				{
+					title: '鎻忚堪',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'materialDesc'
+				},
+				{
+					title: '鍒涘缓鏃堕棿',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'createdTime'
+				},
+				{
+					title: '鏇存柊鏃堕棿',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'updatedTime'
+				},
+				{
+					title: '鍒涘缓鑰呭悕绉�',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'createdUserName'
+				},
+				{
+					title: '淇敼鑰呭悕绉�',
+					align: 'center',
+					customHeaderCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					customCell: () => {
+						return {
+							style: {
+								'min-width': '120px'//鏈�灏忓垪瀹借缃�
+							}
+						}
+					},
+					sorter: true,
+					dataIndex: 'updatedUserName'
+				}
+			],
+			tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
+			// 鍔犺浇鏁版嵁鏂规硶 蹇呴』涓� Promise 瀵硅薄
+			loadData: parameter => {
+				return WmsMaterialPage(Object.assign(parameter, this.switchingDate())).then((res) => {
+					return res.data
+				})
+			},
+			selectedRowKeys: [],
+			selectedRows: []
+		}
 	},
-	{
-	title: '鐗╂枡鍚嶇О',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'materialName'
-	},
-	{
-	title: '鐗╂枡缂栧彿',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'materialCode'
-	},
-	{
-	title: 'ERP缂栧彿',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'erpCode'
-	},
-	{
-	title: '鐗╂枡绫诲瀷鍚嶇О',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'materialTypeName'
-	},
-	{
-	title: '鐗╂枡绫诲瀷鎻忚堪',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'materialTypeDescr'
-	},
-	{
-	title: '鐗╂枡绫诲瀷',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'materialType'
-	},
-	{
-	title: '鐗╂枡缁�',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'materialGroup'
-	},
-	{
-	title: 'ABC鍒嗙被鍚嶇О',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'aBCClassName'
-	},
-	{
-	title: 'ABC鍒嗙被',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'aBCClass'
-	},
-	{
-	title: '鐗╂枡瑙勬牸',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'materialSpec'
-	},
-	{
-	title: '榛樿鍏ュ簱搴撲綅',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'inPlaceCode'
-	},
-	{
-	title: '搴撳瓨鍗曚綅',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'materialUnit'
-	},
-	{
-	title: '閲囪喘鍗曚綅',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'pOUnit'
-	},
-	{
-	title: '棰滆壊',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'color'
-	},
-	{
-	title: '閲嶉噺',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'weight'
-	},
-	{
-	title: '鏍囧寘鏁伴噺',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'sNP'
-	},
-	{
-	title: '鎹㈢畻鐜�',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'translateRate'
-	},
-	{
-	title: '鎵规灞炴�ц鍒�',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'batchRuleId'
-	},
-	{
-	title: '鎺у埗灞炴�ц鍒�',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'controlRuleId'
-	},
-	{
-	title: '鏄惁绂佺敤',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'isDisabled',
-	scopedSlots: { customRender: 'isDisabledscopedSlots' }
-	},
-	{
-	title: '鎻忚堪',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'materialDesc'
-	},
-	{
-	title: '鍒涘缓鏃堕棿',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'createdTime'
-	},
-	{
-	title: '鏇存柊鏃堕棿',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'updatedTime'
-	},
-	{
-	title: '鍒涘缓鑰呭悕绉�',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'createdUserName'
-	},
-	{
-	title: '淇敼鑰呭悕绉�',
-	align: 'center',
-	customHeaderCell: () => {
-	return {
-	 style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	 }
-	 }
-	},
-	customCell: () => {
-	return {
-	style: {
-	'min-width': '120px'//鏈�灏忓垪瀹借缃�
-	}
-	}
-	},
-	sorter: true,
-	dataIndex: 'updatedUserName'
-	}
-	],
-	tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
-	// 鍔犺浇鏁版嵁鏂规硶 蹇呴』涓� Promise 瀵硅薄
-	loadData: parameter => {
-	return WmsMaterialPage(Object.assign(parameter, this.switchingDate())).then((res) => {
-	return res.data
-	})
-	},
-	selectedRowKeys: [],
-	selectedRows: []
-	}
-	},
-	created () {
-	if (this.hasPerm('WmsMaterial:edit') || this.hasPerm('WmsMaterial:delete')) {
-	this.columns.push({
-	title: '鎿嶄綔',
-	width: '150px',
-	dataIndex: 'action',
-	scopedSlots: { customRender: 'action' }
-	})
-	}
-	const path = this.$route.path
-	const columnStr = window.localStorage.getItem(path)
-	if(columnStr) {
-	var _columns = JSON.parse(columnStr)
-	this.columns.forEach(element => {
-	var fObj = _columns.find((item, index) => {
-	return item.dataIndex === element.dataIndex;
-	})
-	if(fObj!=undefined && fObj!=null){
-	element.checked=fObj.checked;
-	}
-	});
-	}
-	const isDisabledOption = this.$options
-	this.isDisabledData = isDisabledOption.filters['dictData']('yes_true_false')
+	created() {
+		if (this.hasPerm('WmsMaterial:edit') || this.hasPerm('WmsMaterial:delete')) {
+			this.columns.push({
+				title: '鎿嶄綔',
+				width: '150px',
+				dataIndex: 'action',
+				scopedSlots: { customRender: 'action' }
+			})
+		}
+		const path = this.$route.path
+		const columnStr = window.localStorage.getItem(path)
+		if (columnStr) {
+			var _columns = JSON.parse(columnStr)
+			this.columns.forEach(element => {
+				var fObj = _columns.find((item, index) => {
+					return item.dataIndex === element.dataIndex;
+				})
+				if (fObj != undefined && fObj != null) {
+					element.checked = fObj.checked;
+				}
+			});
+		}
+		const isDisabledOption = this.$options
+		this.isDisabledData = isDisabledOption.filters['dictData']('yes_true_false')
 
-	this.handleTableHt() //璁剧疆涓昏〃琛ㄦ牸楂樺害
-	window.addEventListener(
-	'resize',
-	() => {
-	this.handleTableHt() // 鐩戝惉灞忓箷澶у皬鏀瑰彉琛ㄦ牸楂樺害
-	},
-	false
-	)
-	
+		this.handleTableHt() //璁剧疆涓昏〃琛ㄦ牸楂樺害
+		window.addEventListener(
+			'resize',
+			() => {
+				this.handleTableHt() // 鐩戝惉灞忓箷澶у皬鏀瑰彉琛ㄦ牸楂樺害
+			},
+			false
+		)
+
 	},
 	methods: {
-	moment,
-	/**
-	* 鏌ヨ鍙傛暟缁勮
-	*/
-	switchingDate () {
-	const obj = JSON.parse(JSON.stringify(this.queryParam))
-	return obj
-	},
-	WmsMaterialDelete (record) {
-	WmsMaterialDelete(record).then((res) => {
-	if (res.success) {
-	this.$message.success('鍒犻櫎鎴愬姛')
-	this.$refs.table.refresh()
-	} else {
-	this.$message.error('鍒犻櫎澶辫触') // + res.message
-	}
-	})
-	},
+		moment,
+		/**
+		* 鏌ヨ鍙傛暟缁勮
+		*/
+		switchingDate() {
+			const obj = JSON.parse(JSON.stringify(this.queryParam))
+			return obj
+		},
+		WmsMaterialDelete(record) {
+			WmsMaterialDelete(record).then((res) => {
+				if (res.success) {
+					this.$message.success('鍒犻櫎鎴愬姛')
+					this.$refs.table.refresh()
+				} else {
+					this.$message.error('鍒犻櫎澶辫触') // + res.message
+				}
+			})
+		},
 
 
-	WmsMaterialToExcel() {
-	this.loading = true
-	let entozh = {};
-	const path = this.$route.path;
-	if (window.localStorage.getItem(path)) {
-	JSON.parse(window.localStorage.getItem(path)).forEach(item => {
-	if (item.dataIndex != 'action' && item.checked) {
-	entozh[item.dataIndex] = item.title
-	}
-	})
-	} else { //鐩存帴鐐瑰鍑�
-	this.columns.forEach(item => {
-	if (item.dataIndex != 'action') {
-	entozh[item.dataIndex] = item.title
-	}
-	})
-	}
-	WmsMaterialPage(Object.assign({ pageSize: 100000, pageIndex: 1 }, this.queryParam)).then((res) => {
-	this.loading = false;
-	//闇�瑕佹埅鍙栨棩鏈熺殑瀛楁
-	var arrDataCutout = this.columns.filter(v => v.customCutout == true);
-	res.data.rows.forEach(item => {
-	var arrKeys = Object.keys(item);
-	arrKeys.forEach(key => {
-	var strFieldDic = key + 'Data';
-	//鏋氫妇杞��
-	if (this[strFieldDic] && this[strFieldDic].length > 0) {
-	let arrFieldDic = this[strFieldDic].filter(v => String(v.code) == String(item[key]));
-	if (arrFieldDic.length > 0) {
-	item[key] = arrFieldDic[0]?.name || '娌℃湁鏋氫妇鍊�';
-	}
-	}
-	// 鏃ユ湡鎴彇
-	if (arrDataCutout.length > 0) {
-	arrDataCutout.forEach(itemIn => {
-	if (key == itemIn.dataIndex && item[key]) {
-	item[key] = item[key].split(" ")[0]
-	}
-	})
-	}
-	});
-	})
-	exportExcel(res.data.rows, entozh, "xlsx", `${this.$route.meta.title}`)
-	}).catch((err) => {
-	this.loading = false
-	this.$message.error('涓嬭浇閿欒锛氳幏鍙栨枃浠舵祦閿欒' + err)
-	})
-	},
+		WmsMaterialToExcel() {
+			this.loading = true
+			let entozh = {};
+			const path = this.$route.path;
+			if (window.localStorage.getItem(path)) {
+				JSON.parse(window.localStorage.getItem(path)).forEach(item => {
+					if (item.dataIndex != 'action' && item.checked) {
+						entozh[item.dataIndex] = item.title
+					}
+				})
+			} else { //鐩存帴鐐瑰鍑�
+				this.columns.forEach(item => {
+					if (item.dataIndex != 'action') {
+						entozh[item.dataIndex] = item.title
+					}
+				})
+			}
+			WmsMaterialPage(Object.assign({ pageSize: 100000, pageIndex: 1 }, this.queryParam)).then((res) => {
+				this.loading = false;
+				//闇�瑕佹埅鍙栨棩鏈熺殑瀛楁
+				var arrDataCutout = this.columns.filter(v => v.customCutout == true);
+				res.data.rows.forEach(item => {
+					var arrKeys = Object.keys(item);
+					arrKeys.forEach(key => {
+						var strFieldDic = key + 'Data';
+						//鏋氫妇杞��
+						if (this[strFieldDic] && this[strFieldDic].length > 0) {
+							let arrFieldDic = this[strFieldDic].filter(v => String(v.code) == String(item[key]));
+							if (arrFieldDic.length > 0) {
+								item[key] = arrFieldDic[0]?.name || '娌℃湁鏋氫妇鍊�';
+							}
+						}
+						// 鏃ユ湡鎴彇
+						if (arrDataCutout.length > 0) {
+							arrDataCutout.forEach(itemIn => {
+								if (key == itemIn.dataIndex && item[key]) {
+									item[key] = item[key].split(" ")[0]
+								}
+							})
+						}
+					});
+				})
+				exportExcel(res.data.rows, entozh, "xlsx", `${this.$route.meta.title}`)
+			}).catch((err) => {
+				this.loading = false
+				this.$message.error('涓嬭浇閿欒锛氳幏鍙栨枃浠舵祦閿欒' + err)
+			})
+		},
 
 
-	toggleAdvanced () {
-	this.advanced = !this.advanced
-	this.handleTableHt() //璁剧疆涓昏〃琛ㄦ牸楂樺害
-	},
-	onChangecreatedTime(date, dateString) {
-	  this.queryParam.createdTime = dateString
-	},
-	onChangeupdatedTime(date, dateString) {
-	  this.queryParam.updatedTime = dateString
-	},
-	handleOk () {
-	this.$refs.table.refresh()
-	},
-	onSelectChange (selectedRowKeys, selectedRows) {
-	this.selectedRowKeys = selectedRowKeys
-	this.selectedRows = selectedRows
+		toggleAdvanced() {
+			this.advanced = !this.advanced
+			this.handleTableHt() //璁剧疆涓昏〃琛ㄦ牸楂樺害
+		},
+		onChangecreatedTime(date, dateString) {
+			this.queryParam.createdTime = dateString
+		},
+		onChangeupdatedTime(date, dateString) {
+			this.queryParam.updatedTime = dateString
+		},
+		handleOk() {
+			this.$refs.table.refresh()
+		},
+		onSelectChange(selectedRowKeys, selectedRows) {
+			this.selectedRowKeys = selectedRowKeys
+			this.selectedRows = selectedRows
+		}
 	}
-	}
-	}
+}
 </script>
-<style lang="less">
-  .table-operator {
-    margin-bottom: 18px;
-  }
-  button {
-    margin-right: 8px;
-  }
-</style>
+<style lang="less">.table-operator {
+	margin-bottom: 18px;
+}
+
+button {
+	margin-right: 8px;
+}</style>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
index 420db3b..e076ebf 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -29,8 +29,8 @@
 
             <a-form-item label="鐗╂枡绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-select style="width: 100%" placeholder="璇烽�夋嫨鐗╂枡绫诲瀷" v-decorator="['materialType']">
-                <a-select-option v-for="(item, index) in materialTypeData" :key="index"
-                  :value="item.materialTypeCode">{{ item.materialTypeName }}</a-select-option>
+                <a-select-option v-for="(item, index) in materialTypeData" :key="index" :value="item.materialTypeCode">{{
+                  item.materialTypeName }}</a-select-option>
               </a-select>
             </a-form-item>
 
@@ -104,7 +104,7 @@
           </a-form>
         </a-tab-pane>
         <a-tab-pane key="2" tab="鎺у埗灞炴��" force-render>
-          <add-control-rule v-if="visible" ref="WmsControlRule" />
+          <add-control-rule v-if="visible" ref="WmsControlRuleRef" />
         </a-tab-pane>
         <a-tab-pane key="3" tab="鎵规灞炴��">
           闇�姹傚緟瀹�
@@ -127,14 +127,14 @@
 <script>
 
 import {
-  WmsMaterialAdd, WmsMaterialEdit, WmsMaterialDetailList,materialTypeDataList
+  WmsMaterialAdd, WmsMaterialEdit, WmsMaterialDetailList, materialTypeDataList
 } from '@/api/modular/main/WmsBase/WmsMaterialManage'
 import addForm from './tabItem/addForm.vue'
 import addFormBaseCustomer from './tabItem/addFormBaseCustomer/addFormBaseCustomer.vue'
 import addFormContainerPackaging from './tabItem/WmsContainerPackaging/addFormContainerPackaging.vue'
 import addFormSub from './tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue'
 import addControlRule from './tabItem/WmsControlRule/addForm.vue'
-import { WmsUnitPage} from '@/api/modular/main/WmsBase/WmsUnitManage'
+import { WmsUnitPage } from '@/api/modular/main/WmsBase/WmsUnitManage'
 export default {
   components: {
     addForm,
@@ -169,8 +169,8 @@
       confirmLoading: false,
       form: this.$form.createForm(this),
       materialTypeData2: [],
-      selectTypeData2:[],
-      selectTypeData1:[]
+      selectTypeData2: [],
+      selectTypeData1: []
     }
   },
   methods: {
@@ -209,10 +209,10 @@
       // 鏇夸唬鍝�
       if (e == 4) {
         this.$nextTick(() => {
-        // let materialCode = this.form.getFieldValue('materialCode');
-        // let materialName = this.form.getFieldValue('materialName');
-        this.$refs.addFormWmsSubstituteGoodRef.initShowSubstituteGood()
-      })
+          // let materialCode = this.form.getFieldValue('materialCode');
+          // let materialName = this.form.getFieldValue('materialName');
+          this.$refs.addFormWmsSubstituteGoodRef.initShowSubstituteGood()
+        })
       }
     },
     handleOk() { },
@@ -235,15 +235,18 @@
         })
           .then(res => {
             if (res.success) {
-              console.log("666666666666")
+
               console.log(res)
-              this.$refs.WmsControlRule.list = res.data.baseCustomerList || []
-              this.$refs.addFormBaseCustomer.list = res.data.controlRuleDetailList || []
-              this.$refs.addFormWmsSubstituteGoodRef.list = res.data.substituteGoodList || []
-              // this.$message.success('缂栬緫鎴愬姛')
-              // this.confirmLoading = false
-              // this.$emit('ok', values)
-              // this.handleCancel()
+              this.$nextTick(() => {
+                if (res.data.controlRuleDetailList && res.data.controlRuleDetailList.length > 0) {
+                  this.$refs.WmsControlRuleRef.form.setFieldsValue({
+                    ...res.data.controlRuleDetailList[0]
+                  })
+                }
+                this.$refs.addFormWmsSubstituteGoodRef.list = res.data.substituteGoodList || []
+                this.$refs.addFormBaseCustomer.list = res.data.baseCustomerList || []
+              })
+
             } else {
               this.$message.error('璇︽儏澶辫触锛�' + JSON.stringify(res.message))
             }
@@ -296,7 +299,7 @@
           // }
 
           console.log(6666666666666 + '鎺у埗灞炴��')
-          var ControlRuleld = this.$refs.WmsControlRule.form.getFieldValue('id') || ''
+          var ControlRuleld = this.$refs.WmsControlRuleRef.form.getFieldValue('id') || ''
 
           let SubstituteGoodList = []
           if (this.$refs.addFormWmsSubstituteGoodRef && this.$refs.addFormWmsSubstituteGoodRef.list.length > 0) {

--
Gitblit v1.9.3