wms成品页面修改5

src/views/wms/detailed/index.vue

@@ -73,86 +73,23 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="备用1" prop="userDefined1">
+<!--			<el-form-item label="备用1" prop="userDefined1">-->
-				<el-input
+<!--				<el-input-->
-					v-model="queryParams.userDefined1"
+<!--					v-model="queryParams.userDefined1"-->
-					placeholder="请输入备用1"
+<!--					placeholder="请输入备用1"-->
-					clearable
+<!--					clearable-->
-					@keyup.enter.native="handleQuery"
+<!--					@keyup.enter.native="handleQuery"-->
-				/>
+<!--				/>-->
-			</el-form-item>
+<!--			</el-form-item>-->
-			<el-form-item label="备用2" prop="userDefined2">
+<!--			<el-form-item label="备用2" prop="userDefined2">-->
-				<el-input
+<!--				<el-input-->
-					v-model="queryParams.userDefined2"
+<!--					v-model="queryParams.userDefined2"-->
-					placeholder="请输入备用2"
+<!--					placeholder="请输入备用2"-->
-					clearable
+<!--					clearable-->
-					@keyup.enter.native="handleQuery"
+<!--					@keyup.enter.native="handleQuery"-->
-				/>
+<!--				/>-->
-			</el-form-item>
+<!--			</el-form-item>-->
-			<el-form-item label="备用3" prop="userDefined3">
+
-				<el-input
-					v-model="queryParams.userDefined3"
-					placeholder="请输入备用3"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="备用4" prop="userDefined4">
-				<el-input
-					v-model="queryParams.userDefined4"
-					placeholder="请输入备用4"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="备用5" prop="userDefined5">
-				<el-input
-					v-model="queryParams.userDefined5"
-					placeholder="请输入备用5"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="备用6" prop="userDefined6">
-				<el-input
-					v-model="queryParams.userDefined6"
-					placeholder="请输入备用6"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="备用7" prop="userDefined7">
-				<el-input
-					v-model="queryParams.userDefined7"
-					placeholder="请输入备用7"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="备用8" prop="userDefined8">
-				<el-input
-					v-model="queryParams.userDefined8"
-					placeholder="请输入备用8"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="备用9" prop="userDefined9">
-				<el-input
-					v-model="queryParams.userDefined9"
-					placeholder="请输入备用9"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="备用10" prop="userDefined10">
-				<el-input
-					v-model="queryParams.userDefined10"
-					placeholder="请输入备用10"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
 			<el-form-item label="创建时间" prop="gmtCreate">
 				<el-date-picker clearable
 					v-model="queryParams.gmtCreate"
@@ -177,30 +114,8 @@
 					placeholder="请选择最后更新时间">
 				</el-date-picker>
 			</el-form-item>
-			<el-form-item label="有效标记" prop="activeFlag">
+
-				<el-input
+
-					v-model="queryParams.activeFlag"
-					placeholder="请输入有效标记"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="工厂编码" prop="factoryCode">
-				<el-input
-					v-model="queryParams.factoryCode"
-					placeholder="请输入工厂编码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="sap工厂编码" prop="sapFactoryCode">
-				<el-input
-					v-model="queryParams.sapFactoryCode"
-					placeholder="请输入sap工厂编码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
 			<el-form-item>
 				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
 				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -255,7 +170,7 @@
 
 		<el-table v-loading="loading" :data="detailedList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column label="唯一序列号" align="center" prop="storageId" />
+			<el-table-column label="唯一序列号" align="center" prop="storageId" v-if="false" />
 			<el-table-column label="仓库编码" align="center" prop="whCode" />
 			<el-table-column label="库区编码" align="center" prop="waCode" />
 			<el-table-column label="库位编码" align="center" prop="wlCode" />
@@ -265,16 +180,16 @@
 			<el-table-column label="托盘号" align="center" prop="sn" />
 			<el-table-column label="条码" align="center" prop="barCode" />
 			<el-table-column label="数量" align="center" prop="amount" />
-			<el-table-column label="备用1" align="center" prop="userDefined1" />
+			<el-table-column label="备用1" align="center" prop="userDefined1" v-if="false" />
-			<el-table-column label="备用2" align="center" prop="userDefined2" />
+			<el-table-column label="备用2" align="center" prop="userDefined2" v-if="false" />
-			<el-table-column label="备用3" align="center" prop="userDefined3" />
+			<el-table-column label="备用3" align="center" prop="userDefined3" v-if="false" />
-			<el-table-column label="备用4" align="center" prop="userDefined4" />
+			<el-table-column label="备用4" align="center" prop="userDefined4" v-if="false" />
-			<el-table-column label="备用5" align="center" prop="userDefined5" />
+			<el-table-column label="备用5" align="center" prop="userDefined5" v-if="false" />
-			<el-table-column label="备用6" align="center" prop="userDefined6" />
+			<el-table-column label="备用6" align="center" prop="userDefined6" v-if="false" />
-			<el-table-column label="备用7" align="center" prop="userDefined7" />
+			<el-table-column label="备用7" align="center" prop="userDefined7" v-if="false" />
-			<el-table-column label="备用8" align="center" prop="userDefined8" />
+			<el-table-column label="备用8" align="center" prop="userDefined8" v-if="false" />
-			<el-table-column label="备用9" align="center" prop="userDefined9" />
+			<el-table-column label="备用9" align="center" prop="userDefined9" v-if="false" />
-			<el-table-column label="备用10" align="center" prop="userDefined10" />
+			<el-table-column label="备用10" align="center" prop="userDefined10" v-if="false" />
 			<el-table-column label="创建时间" align="center" prop="gmtCreate" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.gmtCreate, '{y}-{m}-{d}') }}</span>
@@ -286,27 +201,10 @@
 					<span>{{ parseTime(scope.row.gmtModified, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="有效标记" align="center" prop="activeFlag" />
+			<el-table-column label="有效标记" align="center" prop="activeFlag" v-if="false" />
-			<el-table-column label="工厂编码" align="center" prop="factoryCode" />
+			<el-table-column label="工厂编码" align="center" prop="factoryCode" v-if="false" />
-			<el-table-column label="sap工厂编码" align="center" prop="sapFactoryCode" />
+			<el-table-column label="sap工厂编码" align="center" prop="sapFactoryCode" v-if="false" />
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+
-				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-edit"
-						@click="handleUpdate(scope.row)"
-						v-hasPermi="['wms:detailed:edit']"
-					>修改</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['wms:detailed:remove']"
-					>删除</el-button>
-				</template>
-			</el-table-column>
 		</el-table>
 
 		<pagination

src/views/wms/odsRawOrderIn/index.vue

@@ -102,8 +102,13 @@
 			<el-table-column label="到货单号" align="center" prop="dnNo" />
 			<el-table-column label="采购订单号" align="center" prop="poNo" width="180"/>
 			<el-table-column label="采购行号" align="center" prop="poLine" />
-			<el-table-column label="物料号" align="center" prop="materialCode" />
+
-			<el-table-column label="物料描述" align="center" prop="materialDesc" />
+      <el-table-column label="物料编码" align="center" prop="materialCode"  min-width="200">
+        <template slot-scope="scope">
+          <span>{{ scope.row.materialCode.replace(/^0{7}/, '') }}</span>
+        </template>
+      </el-table-column>
+			<el-table-column label="物料描述" align="center" prop="materialDesc" :min-width="180"/>
 			<el-table-column label="单位" align="center" prop="unit" />
 			<el-table-column label="供应商编码" align="center" prop="supplyCode" width="180"/>
 			<el-table-column label="订单数量" align="center" prop="requestAmount" />