Merge branch 'master' of http://123.206.9.27:3000/zhangqingyu/ZhongGongWave_vue

src/view/ware/storechange.vue

 							<el-button type="danger" size="small"> 其他操作<i class="el-icon-arrow-down el-icon--right"></i></el-button>
 							<el-dropdown-menu slot="dropdown">
 								<el-dropdown-item command="handleInBack" style="background-color: #f5f5f5;">取消入库</el-dropdown-item>
-								<el-dropdown-item command="handleChangeCustomer" style="background-color: #f5f5f5;">修改客户</el-dropdown-item>
+								<el-dropdown-item command="handleChangeCustomer" style="background-color: #f5f5f5;">批量修改</el-dropdown-item>
 							</el-dropdown-menu>
 						</el-dropdown>
 						
 			</el-form>
 		</el-dialog>
 
-		<el-dialog title="修改客户信息" :visible.sync="changeCUSTDialogVisible" width="500px">
+		<el-dialog title="批量修改信息明细" :visible.sync="changeCUSTDialogVisible" width="500px">
 			<el-form>
 				<el-form-item label="新客户名称" >
 					<el-select v-model="newCustomername" filterable placeholder="请选择客户名称" clearable size="small" >
 					</el-select>
 				</el-form-item>
 				<el-form-item label="新货权单位" >
-					<el-select v-model="newFKCustomername" filterable placeholder="请选择客户名称" clearable size="small" >
+					<el-select v-model="newFKCustomername" filterable placeholder="请选择货权单位" clearable size="small" >
 						<el-option v-for="item in optionsCust" :key="item.name" :label="item.name" :value="item.name" >
 						</el-option>
 					</el-select>
 				</el-form-item>
-				
+				<el-form-item label="新订单号">
+					<el-input v-model="newOrdno" style="width:200px;margin-left: 0px">
+					</el-input>
+				</el-form-item>
+				<el-form-item label="新合约号">
+					<el-input v-model="newContractno" style="width:200px;margin-left: 0px">
+					</el-input>
+				</el-form-item>
+				<el-form-item label="新收货地址">
+					<el-input v-model="newReceiveaddress" style="width:260px;margin-left: 0px">
+					</el-input>
+				</el-form-item>
+				<el-form-item label="新产地">
+					<el-input v-model="newProductionplace" style="width:260px;margin-left: 0px">
+					</el-input>
+				</el-form-item>
+				<el-form-item label="新捆包号">
+					<el-input v-model="newPackno" style="width:200px;margin-left: 0px">
+					</el-input>
+				</el-form-item>
+
 				<el-form-item label=" ">
-					<el-button type="success" @click="handleChangeCUSTSave">保存</el-button>
+					<el-button type="success" @click="handleChangeCUSTSave">确定</el-button>
 					<el-button type="danger" @click="handleChangeCUSTCancelSave">取消</el-button>
 				</el-form-item>
 			</el-form>
 				newRemark:'',
 				changeCUSTDialogVisible: false,
 				newCustomername:'',
-				newFKCustomername:''
+				newFKCustomername:'',
+				newContractno:'',
+				newOrdno:'',
+				newReceiveaddress:'',
+				newProductionplace:'',
+				newPackno:''
 			};
 		},
 		mounted() {
 			handleChangeCustomer(){
 				this.newCustomername = '',
 				this.newFKCustomername='',
+				this.newContractno='',
+				this.newOrdno='',
+				this.newReceiveaddress='',
+				this.newProductionplace='',
+				this.newPackno='',
 				this.changeCUSTDialogVisible= true
 			},
 			showOut() {
 				this.newRemark = '';
 			},
 			handleChangeCUSTSave(){
-				var url = 'WareStore/changeCustName.do'
+				var url = 'WareStore/changeAll.do'
 				var param = {
 					json: JSON.stringify(this.multipleSelection),
 					newCustomername: this.newCustomername,
 					newFKCustomername: this.newFKCustomername,
+					newContractno: this.newContractno,
+					newOrdno: this.newOrdno,
+					newReceiveaddress: this.newReceiveaddress,
+					newProductionplace: this.newProductionplace,
+					newPackno: this.newPackno,
+					
 				}
 				axios.post(url, param).then(response => {
 					if (response.data.code == 0) {