Merge branch 'moss_dev'

* moss_dev:
  no message
  feat：辅材配件销售单 - 选择网点和仓库后清掉列表数据

src/views/auxiliaryFittings/salesManagement/components/attachmentSalesOrderDetail.vue

@@ -127,6 +127,7 @@
 								<el-select v-model="formData.storage" value-key="storageId" @focus="()=>{
 										if(!this.formData.websitId){return this.$message.warning('请先选择网点名称！');}
 									}" @change="(e)=>{
+										dataList = [];
 										formData.storageId = e.storageId
 										formData.storageName = e.storageName
 									}" :disabled="(['SAVE','PAY_NOT_TAKE'].indexOf(formData.flag) == -1 && formData.orderSource == 'ONLINE') || (formType!=0 && ['SAVE','PAY_NOT_TAKE'].indexOf(formData.flag) == -1)" placeholder="请选择" style="width: 100%;">
@@ -290,7 +291,7 @@
 							{{(scope.row.price * 100) * scope.row.salesQty / 100}}
 						</template>
 					</el-table-column>
-					<el-table-column prop="goods.qty" align="center" label="全部库存数量"></el-table-column>
+					<!-- <el-table-column prop="goods.qty" align="center" label="全部库存数量"></el-table-column> -->
 					<el-table-column label="操作" align="right" width="140">
 						<template slot-scope="scope" v-if="formType != 2">
 							<el-button size="mini" type="primary" v-if="scope.$index != isEdit" @click="isEdit = scope.$index">编辑</el-button>
@@ -528,6 +529,7 @@
 				})
 			},
 			changeWebsit(e){
+				this.dataList = [];
 				this.formData.websitId = e.websitId
 				this.formData.websitName = e.name
 				this.formData.storageName = ''

src/views/auxiliaryFittings/salesManagement/components/auxiliarySalesOrderDetail.vue

@@ -27,13 +27,13 @@
 						<el-col :span="8">
 							<el-form-item label="网点名称" prop="websitId">
 								<el-select v-model="formData.websit" :disabled="formData.flag != 'SAVE' && formType!=0" value-key="websitId" @change="changeWebsit" placeholder="请选择" style="width: 100%;">
-								    <el-option
-								      v-for="item in websitList"
-								      :key="item.websitId"
-								      :label="item.name"
-								      :value="item">
-								    </el-option>
-								  </el-select>
+									<el-option
+										v-for="item in websitList"
+										:key="item.websitId"
+										:label="item.name"
+										:value="item">
+									</el-option>
+								</el-select>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
@@ -127,6 +127,7 @@
 								<el-select v-model="formData.storage" value-key="storageId" @focus="()=>{
 										if(!this.formData.websitId){return this.$message.warning('请先选择网点名称！');}
 									}" @change="(e)=>{
+										dataList = [];
 										formData.storageId = e.storageId
 										formData.storageName = e.storageName
 									}" :disabled="(['SAVE','PAY_NOT_TAKE'].indexOf(formData.flag) == -1 && formData.orderSource == 'ONLINE') || (formType!=0 && ['SAVE','PAY_NOT_TAKE'].indexOf(formData.flag) == -1)" placeholder="请选择" style="width: 100%;">
@@ -558,6 +559,7 @@
 				})
 			},
 			changeWebsit(e){
+				this.dataList = [];
 				this.formData.websitId = e.websitId
 				this.formData.websitName = e.name
 				this.formData.storageName = ''