no message

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

@@ -568,6 +568,7 @@
 				})
 			},
 			getWarehouseList(websitId){
+				if(!websitId){return this.warehouseList = []}
 				storageListPageV2({
 			      pageNum: 1,
 			      pageSize: -1,

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

@@ -648,6 +648,7 @@
 				})
 			},
 			getWarehouseList(websitId){
+				if(!websitId){return this.warehouseList = []}
 				storageListPageV2({
 			      pageNum: 1,
 			      pageSize: -1,

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

@@ -129,7 +129,7 @@
 									}" @change="(e)=>{
 										formData.storageId = e.storageId
 										formData.storageName = e.storageName
-									}" :disabled="formData.flag != 'SAVE' && formType!=0" placeholder="请选择" style="width: 100%;">
+									}" :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%;">
 								    <el-option
 									  v-for="(item,index) in warehouseList"
 								      :key="index"
@@ -553,6 +553,7 @@
 				})
 			},
 			getWarehouseList(websitId){
+				if(!websitId){return this.warehouseList = []}
 				storageListPageV2({
 			      pageNum: 1,
 			      pageSize: -1,
@@ -690,13 +691,15 @@
 				})
 			},
 			confirm(){
+				if(!this.formData.storageId){return this.$message.warning('请先选择出库仓库！')}
 				this.$confirm(`请确定是否确认提货, 是否继续?`, '提示', {
 					confirmButtonText: '确定',
 					cancelButtonText: '取消',
 					type: 'warning'
 				}).then(() => {
 					confirm({
-						salesId: this.formData.salesId
+						salesId: this.formData.salesId,
+						storageId: this.formData.storageId
 					}).then(res => {
 						if(res.code == 200){
 							this.$message.success('审核成功！')

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

@@ -129,7 +129,7 @@
 									}" @change="(e)=>{
 										formData.storageId = e.storageId
 										formData.storageName = e.storageName
-									}" :disabled="formData.flag != 'SAVE' && formType!=0" placeholder="请选择" style="width: 100%;">
+									}" :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%;">
 								    <el-option
 									  v-for="(item,index) in warehouseList"
 								      :key="index"
@@ -584,6 +584,7 @@
 				})
 			},
 			getWarehouseList(websitId){
+				if(!websitId){return this.warehouseList = []}
 				storageListPageV2({
 			      pageNum: 1,
 			      pageSize: -1,
@@ -598,7 +599,7 @@
 				})
 			},
 			async getGoods(categoryId,goodsName,type){
-				if(!this.formData.storageId){return this.$message.warning('请先选择出库仓库！')}
+				// if(!this.formData.storageId){return this.$message.warning('请先选择出库仓库！')}
 				const that = this
 				if(type == 1){
 					return new Promise((resolve, reject) => {
@@ -662,7 +663,7 @@
 				this.dataList[this.isEdit].qty = '',
 				this.dataList[this.isEdit].goodsCategoryId = e.categoryId
 				this.dataList[this.isEdit].goodsCategoryName = e.categoryName
-				if(!this.formData.storageId){return this.$message.warning('请先选择出库仓库！')}
+				// if(!this.formData.storageId){return this.$message.warning('请先选择出库仓库！')}
 				getGoods({websitId: this.formData.websitId,categoryId: e.categoryId,type: 'M',orderEnginBaseId: this.formData.orderEnginBaseId,saleType: this.formData.salesType,storageId: this.formData.storageId}).then(res => {
 					this.dataList[this.isEdit].goodsList = res.data
 				})
@@ -770,13 +771,15 @@
 				})
 			},
 			confirm(){
+				if(!this.formData.storageId){return this.$message.warning('请先选择出库仓库！')}
 				this.$confirm(`请确定是否确认提货, 是否继续?`, '提示', {
 					confirmButtonText: '确定',
 					cancelButtonText: '取消',
 					type: 'warning'
 				}).then(() => {
 					confirm({
-						salesId: this.formData.salesId
+						salesId: this.formData.salesId,
+						storageId: this.formData.storageId
 					}).then(res => {
 						if(res.code == 200){
 							this.$message.success('审核成功！')

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

@@ -603,6 +603,7 @@
 				})
 			},
 			getWarehouseList(websitId){
+				if(!websitId){return this.warehouseList = []}
 				storageListPageV2({
 			      pageNum: 1,
 			      pageSize: -1,

src/views/auxiliaryFittings/salesManagement/oldPartsReturnFactory/mixins/basicInfo.js

@@ -218,6 +218,7 @@ export default {
       })
     },
 	getWarehouseList(){
+		if(!this.formData.websitId){return this.warehouseList = []}
 		storageListPageV2({
 	        pageNum: 1,
 	        pageSize: -1,

src/views/auxiliaryFittings/salesManagement/oldPartsReturnFactory/mixins/productColumns.js

@@ -96,7 +96,8 @@ export default {
                   }}
                   type="number"
                   placeholder="请输入"
-                  disabled={this.openType == 1 || !!~["OK", "FAIL"].indexOf(this.formData.flag)}
+                  // disabled={this.openType == 1 || !!~["OK", "FAIL"].indexOf(this.formData.flag)}
+				  disabled={true}
                 ></el-input>
               </el-form-item>
             </div>