111

config/dev.env.js

@@ -4,6 +4,7 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-	BASE_API: '"http://localhost:8080/thware/"'
+	 BASE_API: '"http://localhost:8080/thware/"'
 	// BASE_API: '"http://47.104.245.159:8081/thware/"'
+	// BASE_API: '"http://120.224.213.150/thware_zg/"'
 })

src/components/PopupOut.vue

@@ -33,6 +33,12 @@
 				<el-form-item label="">
 					<el-button style="margin-left: 25px" size="medium" type="success" @click="handleOut">出库</el-button>
 				</el-form-item>
+				<el-form-item label="是否打印地址">
+					<el-switch v-model="addressYN" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
+				</el-form-item>
+				<el-form-item label="是否打印备注">
+					<el-switch v-model="teleYN" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
+				</el-form-item>
 			</el-form>
 			<el-table :data="customerTableData" border style="width: 99%;" v-if="customerTableVisible">
 				<el-table-column prop="customerName" label="客户" show-overflow-tooltip header-align="center">
@@ -136,6 +142,8 @@
 					tallyPeople:'',
 					listDetail: []
 				},
+				addressYN: true,
+				teleYN:true,
 				time: '',
 				tallyPeopleOption:[]
 			};
@@ -285,8 +293,20 @@
 					return
 				}
 				this.getTime()
+				var addressYN1 = 'N';
+				var teleYN1 = 'N';
+				if(this.addressYN == true){
+					addressYN1 = 'Y' 
+				}else{
+					addressYN1 = 'N'
+				}
+				if(this.teleYN == true){
+					teleYN1 = 'Y'
+				}else{
+					teleYN1 = 'N'
+				}
 				window.open(this.serverName + 'ureport/preview?_u=file:out.ureport.xml&id=' + this.distribution.id +
-					'&customerName=' + row.customerName + '&time=' + this.time)
+					'&customerName=' + row.customerName + '&time=' + this.time+ '&addressYN=' + addressYN1 + '&teleYN=' + teleYN1)
 			},
 			getTime() {
 				var date = new Date();

src/view/customer/storequery.vue

@@ -1,42 +1,5 @@
 <template>
 	<div style="height:100%;">
-		<!-- <el-form :model="query" label-width="60px" inline="">
-			<el-row >
-				<el-form-item label="仓库" style="margin-left: -1px"> 
-					<el-select v-model="query.wareName" size="small" style="width:120px;margin-left: -8px">
-						<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="垛位" style="margin-left: -25px">
-					<el-input v-model="query.stackName" size="small" style="width:120px;margin-left: -8px"></el-input>
-				</el-form-item>
-				<el-form-item label="物料" style="margin-left: -25px">
-					<el-input v-model="query.materialName" size="small" style="width:120px;margin-left: -8px">
-						<el-button slot="append" icon="el-icon-search" @click="showMaterial"></el-button>
-					</el-input>
-				</el-form-item>
-				<el-form-item label="钢种" style="margin-left: -25px">
-					<el-input v-model="query.standard" size="small" style="width:120px;margin-left: -8px">
-						<el-button slot="append" icon="el-icon-search" @click="showMaterial"></el-button>
-					</el-input>
-				</el-form-item>
-				<el-form-item label="规格" style="margin-left: -15px;">
-					<el-input v-model="query.model" size="small" style="width:150px;margin-left: -8px"></el-input>
-				</el-form-item>
-				<el-form-item label="钢板号" style="margin-left: -15px;">
-					<el-input v-model="query.plateNo" size="small" style="width:150px;margin-left: -8px"></el-input>
-				</el-form-item>
-				<el-form-item label="客户" style="margin-left: -15px;margin-top: 4px;">
-					<el-input  v-model="query.customerName" clearable size = "small" :readonly="true"><el-button @click="clearCustomer" slot="append" icon="el-icon-delete"></el-button><el-button  size="small" @click="popCust" slot="append" icon="el-icon-search"></el-button></el-input>
-				</el-form-item>
-				<el-form-item label="订单号" style="margin-left:13px;margin-top: -18px">
-					<el-input v-model="query.ordNo" size="small" style="width:150px;margin-left: -8px"></el-input>
-				</el-form-item>
-				<el-form-item label="" style="margin-top: -20px">
-					<el-button @click="handleSearch" size="small" type="primary">查询</el-button>
-				</el-form-item>
-			</el-row>
-		</el-form> -->
 		<div class="searchForm-header">	
 			<el-form  :model="query" label-width="60px" inline="">
 				<el-row >

src/view/record/outrecord.vue

@@ -93,7 +93,13 @@
 							</el-dropdown-menu>
 						</el-dropdown>
 						
-					</el-form-item>						
+					</el-form-item>
+					<el-form-item label="是否打印地址">
+						<el-switch v-model="addressYN" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
+					</el-form-item>
+					<el-form-item label="是否打印备注">
+						<el-switch v-model="teleYN" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
+					</el-form-item>
 					</el-row>
 				</el-form>
 			</el-row>
@@ -345,7 +351,9 @@
 				truckNo:"",
 				driverName:"",
 				driverPhone:"",
-				optionsCust:[]
+				optionsCust:[],
+				addressYN: true,
+				teleYN:true,
 			};
 		},
 		//页面加载完成渲染
@@ -681,8 +689,20 @@
 					});
 					return;
 				}
+				var addressYN1 = 'N';
+				var teleYN1 = 'N';
+				if(this.addressYN == true){
+					addressYN1 = 'Y' 
+				}else{
+					addressYN1 = 'N'
+				}
+				if(this.teleYN == true){
+					teleYN1 = 'Y'
+				}else{
+					teleYN1 = 'N'
+				}
 				window.open(this.serverName + 'ureport/preview?_u=file:out.ureport.xml&id=' + distId +
-					'&time=' + this.time)
+					'&time=' + this.time + '&addressYN=' + addressYN1 + '&teleYN=' + teleYN1)
 
 			},
 			getTime() {