From 0609ad2318e9d20dfa1d1eebe3c24242717cd112 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周三, 24 4月 2024 13:06:46 +0800
Subject: [PATCH] 新增实体

---
 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/index.vue |  897 ++++++++++++++++++++++++++++-------------------------------
 1 files changed, 430 insertions(+), 467 deletions(-)

diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/index.vue
index e7dc390..9f5f938 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/index.vue
@@ -1,500 +1,463 @@
 锘�<template>
   <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('WmsFactory:page')">
-          <a-form layout="inline">
-            <a-row :gutter="48">
+	<div ref="boxForm" class="boxForm">  
+    <a-card :bordered="false" :bodyStyle="tstyle">
+
+      <div class="table-page-search-wrapper" v-if="hasPerm('WmsFactory:page')">
+        <a-form layout="inline">
+          <a-row :gutter="48">
+            <a-col :md="8" :sm="24">
+              <a-form-item label="缂栧彿">
+                <a-input v-model="queryParam.factoryCode" allow-clear placeholder="璇疯緭鍏ョ紪鍙�"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="8" :sm="24">
+              <a-form-item label="鍚嶇О">
+                <a-input v-model="queryParam.factoryName" allow-clear placeholder="璇疯緭鍏ュ悕绉�"/>
+              </a-form-item>
+            </a-col><template v-if="advanced">
               <a-col :md="8" :sm="24">
-                <a-form-item label="缂栧彿">
-                  <a-input v-model="queryParam.factoryCode" allow-clear placeholder="璇疯緭鍏ョ紪鍙�" />
+                <a-form-item label="鍦板潃">
+                  <a-input v-model="queryParam.factoryAddress" 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-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.updatedTime"  value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"   @change="onChangeupdatedTime"/>
+
+					</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.factoryName" allow-clear placeholder="璇疯緭鍏ュ悕绉�" />
-                </a-form-item> </a-col
-              ><template v-if="advanced">
-                <a-col :md="8" :sm="24">
-                  <a-form-item label="鍦板潃">
-                    <a-input v-model="queryParam.factoryAddress" 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-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.createdTime"
-                      value-format="YYYY-MM-DD HH:mm:ss"
-                      format="YYYY-MM-DD HH:mm:ss"
-                      @change="onChangecreatedTime"
-                    />
-                  </a-form-item>
-                </a-col>
-                <!--骞存湀鏃ユ椂鍒嗙-->
-                <!--鏃堕棿鑼冨洿-->
+            <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-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-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>
+          </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('WmsFactory: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('WmsFactory:exportExcel')" icon="download" @click="WmsFactoryToExcel()">
-              瀵煎嚭
-            </a-button>
-            <a-button type="primary" v-if="hasPerm('WmsFactory:add')" icon="plus" @click="$refs.addForm.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 v-if="hasPerm('WmsFactory:edit')" @click="$refs.editForm.edit(record)">缂栬緫</a>
-          <a-divider type="vertical" v-if="hasPerm('WmsFactory:edit') & hasPerm('WmsFactory:delete')" />
-          <a-popconfirm
-            v-if="hasPerm('WmsFactory:delete')"
-            placement="topRight"
-            title="纭鍒犻櫎锛�"
-            @confirm="() => WmsFactoryDelete(record)"
-          >
+		@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('WmsFactory: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('WmsFactory:exportExcel')" icon="download" @click="WmsFactoryToExcel()">
+            瀵煎嚭
+          </a-button>
+			<a-button type="primary" v-if="hasPerm('WmsFactory:add')" icon="plus" @click="$refs.addForm.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 v-if="hasPerm('WmsFactory:edit')" @click="$refs.editForm.edit(record)">缂栬緫</a>
+          <a-divider type="vertical" v-if="hasPerm('WmsFactory:edit') & hasPerm('WmsFactory:delete')"/>
+          <a-popconfirm v-if="hasPerm('WmsFactory:delete')" placement="topRight" title="纭鍒犻櫎锛�" @confirm="() => WmsFactoryDelete(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" />
+	  <excel-form ref="excelForm" @ok="handleOk" />
     </a-card>
   </div>
 </template>
 <script>
-import { STable } from '@/components'
-import moment from 'moment'
-import { WmsFactoryPage, WmsFactoryDelete, WmsFactoryToExcel } from '@/api/modular/main/WmsBase/WmsFactoryManage'
-//鑷畾涔塼able楂樺害
-import setTableHtMixin from '@/mixins/handleTableHt.js'
-import addForm from './addForm.vue'
-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
-  },
-  data() {
-    return {
-      advanced: false, // 楂樼骇鎼滅储 灞曞紑/鍏抽棴
-      queryParam: {},
-      pageInfo: {
+	import { STable } from '@/components'
+	import moment from 'moment'
+	import { WmsFactoryPage, WmsFactoryDelete, WmsFactoryToExcel } from '@/api/modular/main/WmsBase/WmsFactoryManage'
+	//鑷畾涔塼able楂樺害
+	import setTableHtMixin from '@/mixins/handleTableHt.js'
+	import addForm from './addForm.vue'
+	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
+	},
+	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: 'factoryCode'
-        },
-        {
-          title: '鍚嶇О',
-          align: 'center',
-          customHeaderCell: () => {
-            return {
-              style: {
-                'min-width': '120px' //鏈�灏忓垪瀹借缃�
-              }
-            }
-          },
-          customCell: () => {
-            return {
-              style: {
-                'min-width': '120px' //鏈�灏忓垪瀹借缃�
-              }
-            }
-          },
-          sorter: true,
-          dataIndex: 'factoryName'
-        },
-        {
-          title: '鍦板潃',
-          align: 'center',
-          customHeaderCell: () => {
-            return {
-              style: {
-                'min-width': '120px' //鏈�灏忓垪瀹借缃�
-              }
-            }
-          },
-          customCell: () => {
-            return {
-              style: {
-                'min-width': '120px' //鏈�灏忓垪瀹借缃�
-              }
-            }
-          },
-          sorter: true,
-          dataIndex: 'factoryAddress'
-        },
-        {
-          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: '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 WmsFactoryPage(Object.assign(parameter, this.switchingDate())).then(res => {
-          return res.data
-        })
-      },
-      selectedRowKeys: [],
-      selectedRows: []
-    }
-  },
-  created() {
-    if (this.hasPerm('WmsFactory:edit') || this.hasPerm('WmsFactory: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')
+	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: 'factoryCode'
+	},
+	{
+	title: '鍚嶇О',
+	align: 'center',
+	customHeaderCell: () => {
+	return {
+	 style: {
+	'min-width': '120px'//鏈�灏忓垪瀹借缃�
+	 }
+	 }
+	},
+	customCell: () => {
+	return {
+	style: {
+	'min-width': '120px'//鏈�灏忓垪瀹借缃�
+	}
+	}
+	},
+	sorter: true,
+	dataIndex: 'factoryName'
+	},
+	{
+	title: '鍦板潃',
+	align: 'center',
+	customHeaderCell: () => {
+	return {
+	 style: {
+	'min-width': '120px'//鏈�灏忓垪瀹借缃�
+	 }
+	 }
+	},
+	customCell: () => {
+	return {
+	style: {
+	'min-width': '120px'//鏈�灏忓垪瀹借缃�
+	}
+	}
+	},
+	sorter: true,
+	dataIndex: 'factoryAddress'
+	},
+	{
+	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: '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 WmsFactoryPage(Object.assign(parameter, this.switchingDate())).then((res) => {
+	return res.data
+	})
+	},
+	selectedRowKeys: [],
+	selectedRows: []
+	}
+	},
+	created () {
+	if (this.hasPerm('WmsFactory:edit') || this.hasPerm('WmsFactory: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
-    )
-  },
-  methods: {
-    moment,
-    /**
-     * 鏌ヨ鍙傛暟缁勮
-     */
-    switchingDate() {
-      const obj = JSON.parse(JSON.stringify(this.queryParam))
-      return obj
-    },
-    WmsFactoryDelete(record) {
-      WmsFactoryDelete(record).then(res => {
-        if (res.success) {
-          this.$message.success('鍒犻櫎鎴愬姛')
-          this.$refs.table.refresh()
-        } else {
-          this.$message.error('鍒犻櫎澶辫触') // + res.message
-        }
-      })
-    },
+	this.handleTableHt() //璁剧疆涓昏〃琛ㄦ牸楂樺害
+	window.addEventListener(
+	'resize',
+	() => {
+	this.handleTableHt() // 鐩戝惉灞忓箷澶у皬鏀瑰彉琛ㄦ牸楂樺害
+	},
+	false
+	)
+	
+	},
+	methods: {
+	moment,
+	/**
+	* 鏌ヨ鍙傛暟缁勮
+	*/
+	switchingDate () {
+	const obj = JSON.parse(JSON.stringify(this.queryParam))
+	return obj
+	},
+	WmsFactoryDelete (record) {
+	WmsFactoryDelete(record).then((res) => {
+	if (res.success) {
+	this.$message.success('鍒犻櫎鎴愬姛')
+	this.$refs.table.refresh()
+	} else {
+	this.$message.error('鍒犻櫎澶辫触') // + res.message
+	}
+	})
+	},
 
-    WmsFactoryToExcel() {
-      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
-          }
-        })
-      }
-      WmsFactoryPage(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
-    }
-  }
-}
+	WmsFactoryToExcel() {
+	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
+	}
+	})
+	}
+	WmsFactoryPage(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
+	}
+	}
+	}
 </script>
 <style lang="less">
-.table-operator {
-  margin-bottom: 18px;
-}
-button {
-  margin-right: 8px;
-}
+  .table-operator {
+    margin-bottom: 18px;
+  }
+  button {
+    margin-right: 8px;
+  }
 </style>

--
Gitblit v1.9.3