1111

src/view/maint/price.vue

@@ -18,7 +18,7 @@
 		<el-table v-loading="loading" :data="tableData" border>
 			<el-table-column prop="id" label="编号" width="60" v-if="isShow"></el-table-column>
 			<el-table-column prop="customer.name" 		label="客户名称" 	width="180" show-overflow-tooltip ></el-table-column>
-			<el-table-column prop="materialName" 		label="品名" 	width="180" show-overflow-tooltip ></el-table-column>
+			<el-table-column prop="materialName" 		label="品名简称" 	width="180" show-overflow-tooltip ></el-table-column>
 			<el-table-column prop="keepDay" 			label="免堆时间（天）" 	width="200" show-overflow-tooltip ></el-table-column>
 			<el-table-column prop="ordPrice" 			label="免堆期价格（元/吨）" 	width="200" show-overflow-tooltip align="right"></el-table-column>
 			<el-table-column prop="outOrdPrice" 		label="超期价格（元/天/吨）" 	width="200" show-overflow-tooltip align="right"></el-table-column>
@@ -54,7 +54,7 @@
 				</el-form-item>
 				<el-form-item label="品名">
 					<el-select v-model="obj.materialName" filterable placeholder="请选择品名" clearable style="width: 300px;">
-						<el-option v-for="item in optionsmaterialName" :key="item.name" :label="item.name" :value="item.name" >
+						<el-option v-for="item in optionsmaterialName" :key="item.label" :label="item.label" :value="item.value" >
 						</el-option>
 					</el-select>
 				</el-form-item>
@@ -127,7 +127,16 @@
 					payWay:'月结',
 				},
 				optionsCust: [],
-				optionsmaterialName: [],
+				optionsmaterialName: [{
+					value: '厚板',
+					label: '厚板'
+				}, {
+					value: '热轧',
+					label: '热轧'
+				}, {
+					value: '冷轧',
+					label: '冷轧'
+				}],
 
 			}
 		},
@@ -135,7 +144,7 @@
 		mounted() {
 			this.getTableData();
 			this.getAllCustomer();
-			this.getmaterialName();
+			// this.getmaterialName();
 		},
 		methods: {
 			typeFormatter: function(row, column) {

src/view/record/outrecord.vue

@@ -162,6 +162,12 @@
 				</el-table-column>
 				<el-table-column prop="wgtDcnMtcCd" label="计量方式" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
+				<el-table-column prop="inWareDays" label="在库时间" width="100" show-overflow-tooltip header-align="center">
+				</el-table-column>
+				<el-table-column prop="invoicePrice" label="结算价格" width="100" show-overflow-tooltip header-align="center">
+				</el-table-column>
+				<el-table-column prop="payWay" label="支付方式" width="100" show-overflow-tooltip header-align="center">
+				</el-table-column>
 				<el-table-column prop="recordType" label="类型" width="100px" show-overflow-tooltip align="center" :formatter="typeFormatter">
 				</el-table-column>
 				<el-table-column prop="verifyAccountId" v-if="false" label="对账ID" width="100px" show-overflow-tooltip align="center" >