Merge branch 'master' of http://47.107.53.207:3000/ymy/oms

src/benyun/components/moduleView/moduleView.vue

@@ -135,13 +135,14 @@ export default class ModuleView extends ModuleViewHandle {
   }
   //清除搜索条件
   clearSearch(){
-    (this.$refs[this.searchID] as any).clearValue();
+    if(this.$refs[this.searchID]){
+      (this.$refs[this.searchID] as any).clearValue();
+    }
   }
   resert(){
     this.resertHandle()
   }
   clickHandle(e:string){
-    
     if(e == 'onAdd'){
       this.modalShow = true;
     }
@@ -161,7 +162,9 @@ export default class ModuleView extends ModuleViewHandle {
   modalHandle(e:string){
     if(e == 'onReturn'){
       this.modalShow = false;
-      (this.$refs[this.formID] as any).clearValue();
+      if(this.$refs[this.formID]){
+        (this.$refs[this.formID] as any).clearValue();
+      }
       this.$emit('backHandle')
     }else{
       this.$emit('modalHandle',e)

src/components/ForTab/index.vue

@@ -54,7 +54,7 @@
 		}
 		showInput(index : any) {
 			let inputValue = (this as any).$refs['getValue_' + index][0].getValue();
-			console.log(this.columns[index]);
+			// console.log(this.columns[index]);
 			if (this.columns[index].list.indexOf(inputValue) !== -1) return (this as any).$refs['getValue_' + index][0].clearValue();
 			if (inputValue) {
 				this.columns[index].list.push(inputValue);

src/views/audit/Information/index.vue

@@ -318,7 +318,7 @@
 		}
 		// 内页工具栏方法
 		insideTools(e : any) {
-			console.log(e);
+			// console.log(e);
 			if (e === 'onReturn') this.isShow = 'home';
 			if (e === 'onSave') this.confirm();
 		}
@@ -341,7 +341,7 @@
 				if (!query.telephone) query.telephone = null;
 				if (!query.phonenum) query.phonenum = null;
 				this.dialogFormVisible = false;
-				console.log(query);
+				// console.log(query);
 				let loading = this.$loading({ target: '.main-container' });
 				api.updateList(query, 'maindataMaterialManufacturer').then((res : any) => {
 					loading.close();

src/views/audit/agencyGoods/index.vue

@@ -327,7 +327,7 @@
 			clearInterval(this.timer)
 			let query = (this.$refs.moduleView as any).getQuery();
 			if (this.parentIds) query.parentIds = this.parentIds;
-			console.log('表单字段 ==> ', query);
+			// console.log('表单字段 ==> ', query);
 			this.getPageList(query)
 		}
 		getPageList(query : any) {

src/views/audit/brand/index.vue

@@ -211,7 +211,7 @@
 		confirm() {
 			(this as any).$refs.addFormId.validate().then(() => {
 				let query = (this as any).$refs.addFormId.getValue();
-				console.log(query);
+				// console.log(query);
 				query.status = this.radio;
 				this.dialogFormVisible = false;
 				if (this.popTitle === '新增') {

src/views/audit/depots/index.vue

@@ -668,7 +668,7 @@
 			}
 			clearInterval(this.timer2)
 			let query = (this.$refs.moduleView2 as any).getQuery();
-			console.log(query);
+			// console.log(query);
 			query.storehouseId = this.tableData.id;
 			let loading = this.$loading({ target: '.main-container' });
 			api.pageList(query, 'maindataStoringLocation').then((res : any) => {
@@ -706,7 +706,7 @@
 		}
 		// 打开编辑
 		openEdit(e : any) {
-			console.log(e);
+			// console.log(e);
 			this.popTitle = '编辑'
 			this.dialogFormVisible = true;
 			setTimeout(() => {
@@ -754,7 +754,7 @@
 					res.data.subList.map((v : any) => {
 						v.ckName = res.data.name;
 					})
-					console.log('仓库表数据 ==> ', res.data);
+					// console.log('仓库表数据 ==> ', res.data);
 					(this.$refs.moduleView2 as any).setTableValue(res.data.subList);
 					loading.close();
 				} else loading.close();
@@ -823,7 +823,7 @@
 		}
 		// 仓位操作删除
 		doDelete3(item : any, url : any) {
-			console.log('仓位操作删除:', item, url);
+			// console.log('仓位操作删除:', item, url);
 			this.$confirm('确定删除吗,此操作不能撤销！', '注意', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',

src/views/audit/distributor/index.vue

@@ -405,7 +405,7 @@
 		}
 		// 内页工具栏方法
 		insideTools(e : any) {
-			console.log(e);
+			// console.log(e);
 			if (e === 'onReturn') this.isShow = 'home';
 			if (e === 'onSave') this.confirm();
 		}
@@ -465,7 +465,7 @@
 			clearInterval(this.timer)
 			let query = (this.$refs.moduleView as any).getQuery();
 			if (this.categoryIds) query.categoryIds = this.categoryIds;
-			console.log('表单字段 ==> ', query);
+			// console.log('表单字段 ==> ', query);
 			this.getPageList(query)
 		}
 		getPageList(query : any) {

src/views/audit/manufacturer/index.vue

@@ -426,7 +426,7 @@
 		}
 		// 内页工具栏方法
 		insideTools(e : any) {
-			console.log(e);
+			// console.log(e);
 			if (e === 'onReturn') this.isShow = 'home';
 			if (e === 'onSave') this.confirm();
 		}
@@ -449,7 +449,7 @@
 				if (!query.telephone) query.telephone = null;
 				if (!query.phonenum) query.phonenum = null;
 				this.dialogFormVisible = false;
-				console.log(query);
+				// console.log(query);
 				let loading = this.$loading({ target: '.main-container' });
 				if (this.popTitle === '新增') {
 					api.saveList(query, 'maindataMaterialManufacturer').then((res : any) => {
@@ -487,7 +487,7 @@
 			clearInterval(this.timer)
 			let query = (this.$refs.moduleView as any).getQuery();
 			if (this.categoryIds) query.categoryIds = this.categoryIds;
-			console.log('表单字段 ==> ', query);
+			// console.log('表单字段 ==> ', query);
 			this.getPageList(query)
 		}
 		getPageList(query : any) {

src/views/audit/order/index.vue

@@ -341,7 +341,7 @@
 			query.pageNo = data.pageNo;
 			query.pageSize = data.pageSize;
 			query.submitState = 1; // 已提交状态
-			console.log('分页数据 ==> ', query);
+			// console.log('分页数据 ==> ', query);
 			let loading = this.$loading({ target: '.main-container' });
 			api.pageList(query, 'supplyTaskOrder').then((res : any) => {
 				loading.close();

src/views/audit/orderTask/index.vue

@@ -884,7 +884,7 @@
 		}
 		// 保存
 		onSave() {
-			console.log('保存tabType ==>', this.tabType);
+			// console.log('保存tabType ==>', this.tabType);
 			(this as any).$refs.bill.$refs.billForm.validate().then(() => {
 				let query = (this.$refs.bill as any).getBillFormValue(); // 获取单据数据
 				// 手机验证
@@ -1018,7 +1018,7 @@
 			api.single({ id: e.id }, 'supplyTaskOrder').then((res : any) => {
 				if (res.code === 200) {
 					let parentData = res.data ? res.data : e;
-					console.log('编辑 ==>', parentData);
+					// console.log('编辑 ==>', parentData);
 					this.baseInfo = parentData;
 					if (parentData.sourceType === '手工输入') {
 						// 已提交
@@ -1226,7 +1226,7 @@
 		}
 		// 操作反提交
 		onReturnSmt(e : any) {
-			console.log('反提交 ==>', e);
+			// console.log('反提交 ==>', e);
 			this.$confirm('确定反提交吗！', '注意', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
@@ -1245,7 +1245,7 @@
 		}
 		// 工具栏反提交
 		onReturnSmt2() {
-			console.log('工具栏反提交 ==>', this.baseInfo);
+			// console.log('工具栏反提交 ==>', this.baseInfo);
 			this.$confirm('确定反提交吗！', '注意', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
@@ -1277,7 +1277,7 @@
 		// 派单
 		onDispatch() {
 			let query = (this.$refs.bill as any).getTableSelectData(this.tabType); // 获取表格选中数据
-			console.log('派单 ==>', query);
+			// console.log('派单 ==>', query);
 			if (query.length <= 0) return this.$message.warning('请选择派单数据');
 			if (query.length > 1) return this.$message.warning('只能派单一条数据');
 			if (query[0].status == 1) return this.$message.warning('不能重复派单！');
@@ -1296,7 +1296,7 @@
 				let query : any = (this as any).$lodash.cloneDeep(this.supplierSelectData);
 				query.organizationName = e[0].name;
 				query.organizationId = e[0].id;
-				console.log(query);
+				// console.log(query);
 				let loading = this.$loading({ target: '.main-container' });
 				api.dispatch(query).then((res : any) => {
 					loading.close();
@@ -1340,7 +1340,7 @@
 			let data = (this.$refs.bill as any).getTablePage(this.tabType);
 			query.pageNo = data.pageNo;
 			query.pageSize = data.pageSize;
-			console.log('分页数据 ==> ', query);
+			// console.log('分页数据 ==> ', query);
 			let loading = this.$loading({ target: '.main-container' });
 			api.pageList(query, 'supplyTaskOrder').then((res : any) => {
 				loading.close();
@@ -1369,7 +1369,7 @@
 					} else this.$message.error(res.msg)
 				}).catch(() => loading.close());
 			} else {
-				console.log(e.type);
+				// console.log(e.type);
 				if (e.type == 'draftsBox') query.submitState = 0; // 草稿箱数据
 				if (e.type == 'smt') query.submitState = 1; // 已提交数据
 				api.pageList(query, 'supplyTaskOrder').then((res : any) => {
@@ -1385,7 +1385,7 @@
 			let data = (this.$refs.bill as any).getTablePage(this.tabType);
 			query.pageNo = data.pageNo;
 			query.pageSize = data.pageSize;
-			console.log('分页数据 ==> ', query);
+			// console.log('分页数据 ==> ', query);
 			let loading = this.$loading({ target: '.main-container' });
 			api.selectDeleteList(query, 'supplyTaskOrder').then((res : any) => {
 				loading.close();
@@ -1409,7 +1409,7 @@
 			let query = parames.value;
 			if (parames.type === 'draftsBox') query.submitState = 0 // 草稿箱数据
 			if (parames.type === 'smt') query.submitState = 1 // 已提交数据
-			console.log('搜索 ==> ', query);
+			// console.log('搜索 ==> ', query);
 			if (this.tabType === 'recycleBin') {
 				this.getSelectDeleteList(query); // 回收站分页数据
 			} else {
@@ -1428,7 +1428,7 @@
 		// 确定商品新增
 		confirmProduct(e : any) {
 			let nowData = (this.$refs.bill as any).getBillTableData(0);
-			console.log(e);
+			// console.log(e);
 			let names = '';
 			if (e.length > 0) {
 				for (const item of e) {
@@ -1456,7 +1456,7 @@
 						obj.financeSuborderId = item.financialCode
 						obj.prePrice = "0"
 						obj.isDeleted = 0
-						console.log(obj);
+						// console.log(obj);
 						this.tableData.push(obj);
 						nowData.push(obj);
 					}
@@ -1500,7 +1500,7 @@
 		}
 		// 工具栏删除
 		onDelete(e : any) {
-			console.log('工具栏删除 ==> ', e);
+			// console.log('工具栏删除 ==> ', e);
 			let selectData = (this.$refs.bill as any).getTableSelectData(e)
 			let ids : any = [];
 			if (selectData.length > 0) {

src/views/audit/organClassify/index.vue

@@ -224,7 +224,7 @@
 		}
 		getTreeList(){
 			api.treeList('maindataOrganizationCategory').then((res : any) => {
-				console.log(res);
+				// console.log(res);
 				var data:any = [{
 					id: 0,
 					name: '机构分类',
@@ -257,7 +257,7 @@
 		confirm() {
 			(this as any).$refs.addFormId.validate().then(() => {
 				let query = (this as any).$refs.addFormId.getValue();
-				console.log(query);
+				// console.log(query);
 				query.status = this.radio;
 				this.dialogFormVisible = false;
 				if (this.popTitle === '新增') {

src/views/audit/outbound/index.vue

@@ -894,7 +894,7 @@
 			api.single({ id: parentData[0].id }, 'supplyPurchaseOrder').then((res : any) => {
 				if (res.code === 200) {
 					parentData = res.data ? [res.data] : parentData;
-					console.log(parentData);
+					// console.log(parentData);
 					parentData = parentData.map((item : any) => {
 						item.receiveAddress = item.address
 						item.receive = item.consignee
@@ -928,7 +928,7 @@
 					parentData[0].operator = (this as any).$store.getters.userInfo.userName;
 					this.tableData = parentData[0].suborderList;
 					billConfig.tool.tools = { save: true, smt: true };
-					console.log('this.tableData ==> ', this.tableData);
+					// console.log('this.tableData ==> ', this.tableData);
 					this.isAdd = true;
 					(this.$refs.bill as any).showTab = 'bill';
 					loading.close();
@@ -994,7 +994,7 @@
 		}
 		// 保存
 		onSave() {
-			console.log('保存 ==>', this.tabType);
+			// console.log('保存 ==>', this.tabType);
 			(this as any).$refs.bill.$refs.billForm.validate().then(() => {
 				let query = (this.$refs.bill as any).getBillFormValue(); // 获取单据数据
 				// 子表数据
@@ -1017,7 +1017,7 @@
 					}
 				});
 				query.financeOrderId = "";
-				console.log('出库参数query ==> ', query);
+				// console.log('出库参数query ==> ', query);
 
 				let loading = this.$loading({ target: '.main-container' });
 				if (this.isAdd) {
@@ -1346,7 +1346,7 @@
 		}
 		// 操作反提交
 		onReturnSmt(e : any) {
-			console.log('反提交 ==>', e);
+			// console.log('反提交 ==>', e);
 			this.$confirm('确定反提交吗！', '注意', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
@@ -1365,7 +1365,7 @@
 		}
 		// 工具栏反提交
 		onReturnSmt2() {
-			console.log('工具栏反提交 ==>', this.baseInfo);
+			// console.log('工具栏反提交 ==>', this.baseInfo);
 			this.$confirm('确定反提交吗！', '注意', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
@@ -1432,7 +1432,7 @@
 		}
 		// 分页
 		pagination(e : any) {
-			console.log('分页 ==> ', e);
+			// console.log('分页 ==> ', e);
 			if (e.type === 'source_0') {
 
 				let query : any = (this as any).$refs.bill.$refs.source_0[0].getSearchValue();
@@ -1488,7 +1488,7 @@
 		}
 		// 搜索
 		search(parames : any) {
-			console.log('搜索 ==> ', parames);
+			// console.log('搜索 ==> ', parames);
 			let query = parames.value;
 			if (parames.type === 'source_0') {
 				this.getCitationList(query); // 引单数据
@@ -1505,7 +1505,7 @@
 		// 刷新/重置
 		resert(e : any) {
 			let data : any = e.type ? e.type : e;
-			console.log('刷新/重置 ==> ', data);
+			// console.log('刷新/重置 ==> ', data);
 			if (data === 'source_0') {
 				(this as any).$refs.bill.$refs.source_0[0].clearSearch();
 				this.getCitationList({}); // 引单数据
@@ -1534,7 +1534,7 @@
 						break
 					}
 				};
-				console.log(this.tableData);
+				// console.log(this.tableData);
 				for (const v of this.tableData) {
 					j++;
 					if (v.materialSku == item.materialSku && item.isDeleted === 0) {

src/views/audit/productClassification/index.vue

@@ -322,7 +322,7 @@
 			clearInterval(this.timer)
 			let query = (this.$refs.moduleView as any).getQuery();
 			if (this.parentIds.length > 0) query.parentIds = this.parentIds;
-			console.log('表单字段 ==> ', query);
+			// console.log('表单字段 ==> ', query);
 			this.getPageList(query);
 		}
 		getPageList(query : any) {

src/views/audit/productManagement/components/selectKin.vue

@@ -38,7 +38,7 @@
 		// 打开弹窗
 		openModal() {
 			let data = (this as any).$lodash.cloneDeep(this.propValue);
-			console.log(this.parentValue);
+			// console.log(this.parentValue);
 
 			this.vxeValue = true;
 		}

src/views/audit/productManagement/index.vue

@@ -1226,7 +1226,7 @@
 		doFormData() {
 			(this as any).$refs.form.validate().then(() => {
 				let query = (this as any).$refs.form.getValue();
-				console.log('物料信息 ==> ', query);
+				// console.log('物料信息 ==> ', query);
 				query.materialSpec = this.materialSpec; // 商品规格
 				query.attributeList = JSON.stringify(this.attributeList) // 物料属性
 				query.attributeId = this.attributeId // 物料属性ID
@@ -1240,7 +1240,7 @@
 				if (query.materialSpec === 1) {
 					if (this.tableList.length <= 0 || this.attributeList.length <= 0) return (this as any).$message.warning('多规格商品，物料属性不能为空！');
 
-					console.log('多规格表格数据 ==> ', this.tableList);
+					// console.log('多规格表格数据 ==> ', this.tableList);
 					for (let v of this.tableList) {
 						// if (!v.price) return this.$message.warning('物料属性价格必填');
 						// if (parseInt(v.price) <= 0) return this.$message.warning('物料属性价格不能小于1');
@@ -1328,7 +1328,7 @@
 					data.maindataMaterialReceiveParam.attributeList = ""
 				}
 				if (this.ismakeup === 0) {
-					console.log('this.makeupList ==> ', this.makeupList);
+					// console.log('this.makeupList ==> ', this.makeupList);
 					if (this.makeupList.length <= 0) return this.$message.warning('请选择组合商品');
 					data.maindataMaterialLinks = this.makeupList;
 					// 表格删除
@@ -1338,7 +1338,7 @@
 						}
 					});
 				}
-				console.log('data ==> ', data);
+				// console.log('data ==> ', data);
 				let loading = this.$loading({ target: '.main-container' });
 				if (this.isEdit) { // 编辑
 					api.updateList(data, 'maindataMaterial').then((res : any) => {
@@ -1438,7 +1438,7 @@
 						other.selectByMaterialId({ id: data.id }, 'maindataMaterialSku').then((info : any) => {
 							if (info.code === 200) {
 								this.status = data.status
-								console.log(data.ismakeup);
+								// console.log(data.ismakeup);
 								this.ismakeup = data.ismakeup
 								if (data.ismakeup === 0 && data.maindataMaterialLinks.length > 0) {
 									(this as any).makeupList = data.maindataMaterialLinks;
@@ -1487,8 +1487,8 @@
 									});
 									this.tableList = (this as any).$lodash.cloneDeep(info.data);
 									// console.log('表格配置 ==> ', tableConfig);
-									console.log('skuRuleList ==> ', skuRuleList);
-									console.log('表格数据 ==> ', this.tableList);
+									// console.log('skuRuleList ==> ', skuRuleList);
+									// console.log('表格数据 ==> ', this.tableList);
 									this.setTableConfig = tableConfig;
 									this.$nextTick(() => {
 										(this as any).$refs.table.setConfig(tableConfig); // 设置表格配置
@@ -1506,7 +1506,7 @@
 					other.selectByMaterialId({ id: data.id }, 'maindataMaterialSku').then((info : any) => {
 						if (info.code === 200) {
 							this.status = data.status
-							console.log(data.ismakeup);
+							// console.log(data.ismakeup);
 							this.ismakeup = data.ismakeup
 							if (data.ismakeup === 0 && data.maindataMaterialLinks.length > 0) {
 								(this as any).makeupList = data.maindataMaterialLinks;
@@ -1540,8 +1540,8 @@
 								});
 								this.tableList = (this as any).$lodash.cloneDeep(info.data);
 								// console.log('表格配置 ==> ', tableConfig);
-								console.log('skuRuleList ==> ', skuRuleList);
-								console.log('表格数据 ==> ', this.tableList);
+								// console.log('skuRuleList ==> ', skuRuleList);
+								// console.log('表格数据 ==> ', this.tableList);
 								this.setTableConfig = tableConfig;
 								this.$nextTick(() => {
 									(this as any).$refs.table.setConfig(tableConfig); // 设置表格配置
@@ -1566,7 +1566,7 @@
 					stime: (this as any).stime, 
 					etime: (this as any).etime
 				}
-				console.log(data)
+				// console.log(data)
 				api.syncMaterialByKingdeeToOms(data).then((res : any) => {
 					if(res.code === 200){
 						(this as any).dateDialogVisible = false;
@@ -1629,8 +1629,8 @@
 					field: v.field,
 				})
 			});
-			console.log('旧表格数据 ==> ', tableList);
-			console.log('新表格数据 ==> ', skuRuleList);
+			// console.log('旧表格数据 ==> ', tableList);
+			// console.log('新表格数据 ==> ', skuRuleList);
 			this.tableList = skuRuleList;
 			this.setTableConfig = tableConfig;
 			this.$nextTick(() => {
@@ -1677,8 +1677,8 @@
 								field: v.field,
 							})
 						});
-						console.log('表格配置 ==> ', tableConfig);
-						console.log('表格数据 ==> ', skuRuleList);
+						// console.log('表格配置 ==> ', tableConfig);
+						// console.log('表格数据 ==> ', skuRuleList);
 						this.setTableConfig = tableConfig;
 						this.tableList = skuRuleList;
 						this.$nextTick(() => {
@@ -1691,7 +1691,7 @@
 		}
 		// 关联金蝶财务系统物料选择
 		handleSelectionChange(row: any){
-			console.log(row)
+			// console.log(row)
 			this.tableRadio = row
 		}
 		// 关联金蝶财务系统物料列表搜索
@@ -1819,7 +1819,7 @@
 				this.$nextTick(() => {
 					// 设置单表格数据
 					if (this.singeTable) {
-						console.log('单表格数据 ==> ', this.singeTable);
+						// console.log('单表格数据 ==> ', this.singeTable);
 						(this as any).$refs.singeTable.setValue(this.singeTable);
 					} else (this as any).$refs.singeTable.setValue([{}]);
 				});
@@ -2039,7 +2039,7 @@
 			clearInterval(this.timer)
 			let query = (this.$refs.moduleView as any).getQuery();
 			if (this.categoryIds) query.categoryIds = this.categoryIds;
-			console.log('表单字段 ==> ', query);
+			// console.log('表单字段 ==> ', query);
 			this.getPageList(query)
 		}
 		getPageList(query : any) {
@@ -2076,7 +2076,7 @@
 		}
 		// 内页工具栏方法
 		insideTools(e : any) {
-			console.log(e);
+			// console.log(e);
 			if (e === 'onReturn') this.isShow = 'home';
 			if (e === 'onSave') this.doFormData();
 			if (e === 'onDelete') this.pageDelete(this.editInfo);
@@ -2089,7 +2089,7 @@
 				type: 'warning',
 				center: true
 			}).then((res) => {
-				console.log(res)
+				// console.log(res)
 				let data = (this.$refs.makeupTable as any).getValue();// 获取表格数据
 				// let i = -1;
 				// let j = -1;
@@ -2124,7 +2124,7 @@
 				// }, 10);
 			}).catch((err) => {
 				this.$message.info('已取消删除');
-				console.log(err)
+				// console.log(err)
 			});
 		}
 		// 内页删除

src/views/audit/saleOrder/components/orderType.vue

@@ -17,10 +17,10 @@
 		value : any = '';
 		@Watch('propConfig')
 		propValueChange(v : any) {
-			console.log(v);
+			// console.log(v);
 		};
 		onChange(v : any, i : any) {
-			console.log(v, i);
+			// console.log(v, i);
 		}
 	}
 </script>

src/views/audit/saleOrder/index.vue

@@ -796,7 +796,7 @@
 			let loading = this.$loading({ target: '.main-container' });
 			api.single({ id: item.id }, 'supplyPurchaseOrder').then((res : any) => {
 				loading.close();
-				console.log(res);
+				// console.log(res);
 				if (res.code === 200) {
 					this.vxeValue = true;
 					this.baseInfo = res.data;
@@ -973,7 +973,7 @@
 						billConfig.form.columns[1][0].compConfig.attr.readonly = false;
 						billConfig.tool.tools = { return: true, save: true };
 					};
-					console.log(parentData.suborderList);
+					// console.log(parentData.suborderList);
 					(this.$refs.bill as any).setBillConfig(billConfig);
 					(this.$refs.bill as any).setBillFormValue(parentData); // 设置单据表单数据
 					(this.$refs.bill as any).setBillTableValue(parentData.suborderList, 0);// 设置第1张单据表格数据
@@ -1069,7 +1069,7 @@
 		// 工具栏终止订单
 		doBackOrder() {
 			let selectData = (this as any).$refs.bill.getTableSelectData('all');
-			console.log(selectData);
+			// console.log(selectData);
 			// if (selectData.length > 1) return this.$message.warning('只能选择一条终止订单数据');
 			let ids : any = [];
 			if (selectData.length > 0) {
@@ -1116,7 +1116,7 @@
 		}
 		// 分页
 		pagination(e : any) {
-			console.log('分页 ==> ', e);
+			// console.log('分页 ==> ', e);
 			if (e.type === 'source_0') {
 				let query : any = (this as any).$refs.bill.$refs.source_0[0].getSearchValue();
 				query.pageNo = e.page.pageNum;
@@ -1153,7 +1153,7 @@
 		// 刷新/重置
 		resert(e : any) {
 			let data : any = e.type ? e.type : e;
-			console.log('刷新/重置 ==> ', data);
+			// console.log('刷新/重置 ==> ', data);
 			if (data === 'source_0') {
 				(this as any).$refs.bill.$refs.source_0[0].clearSearch();
 				this.getCitationList({}); // 引单数据

src/views/audit/store/index.vue

@@ -225,11 +225,11 @@
 		}
 		// 短驳
 		shortBarge(e : any) {
-			console.log(e);
+			// console.log(e);
 		}
 		// 调拨
 		allocate(item : any) {
-			console.log(item);
+			// console.log(item);
 		}
 		// 刷新/重置
 		onRefresh() {

src/views/audit/supplier/index.vue

@@ -404,7 +404,7 @@
 		}
 		// 内页工具栏方法
 		insideTools(e : any) {
-			console.log(e);
+			// console.log(e);
 			if (e === 'onReturn') this.isShow = 'home';
 			if (e === 'onSave') this.confirm();
 		}
@@ -426,7 +426,7 @@
 				if (!query.telephone) query.telephone = null;
 				if (!query.phonenum) query.phonenum = null;
 				this.dialogFormVisible = false;
-				console.log(query);
+				// console.log(query);
 				let loading = this.$loading({ target: '.main-container' });
 				if (this.popTitle === '新增') {
 					api.saveList(query, 'maindataMaterialSupplier').then((res : any) => {
@@ -464,7 +464,7 @@
 			clearInterval(this.timer)
 			let query = (this.$refs.moduleView as any).getQuery();
 			if (this.categoryIds) query.categoryIds = this.categoryIds;
-			console.log('表单字段 ==> ', query);
+			// console.log('表单字段 ==> ', query);
 			this.getPageList(query)
 		}
 		getPageList(query : any) {

src/views/audit/synchronous/index.vue

@@ -109,7 +109,7 @@ export default class SynchronousProduct extends Vue {
             },
             click:(item:any) => {
               this.$message('尚未开发！');
-              console.log('该行数据：',item)
+              // console.log('该行数据：',item)
             }
           }
         }]

src/views/audit/virtually/index.vue

@@ -252,7 +252,7 @@
 		}
 		getTreeList(){
 			api.treeList('maindataMaterialVmcategory').then((res : any) => {
-				console.log(res);
+				// console.log(res);
 				var data:any = [{
 					id: 0,
 					name: '虚拟分类',
@@ -287,7 +287,7 @@
 		confirm() {
 			(this as any).$refs.addFormId.validate().then(() => {
 				let query = (this as any).$refs.addFormId.getValue();
-				console.log(query);
+				// console.log(query);
 				query.status = this.radio;
 				this.dialogFormVisible = false;
 				if (this.popTitle === '新增') {
@@ -333,7 +333,7 @@
 			clearInterval(this.timer)
 			let query = (this.$refs.moduleView as any).getQuery();
 			if (this.parentIds) query.parentIds = this.parentIds;
-			console.log('表单字段 ==> ', query);
+			// console.log('表单字段 ==> ', query);
 			this.getPageList(query)
 		}
 		getPageList(query : any) {

src/views/audit/warehousing/components/batchNumber.vue

@@ -18,7 +18,7 @@
 			var d = t.getDate()
 			if(m<10){d='0'+d}
 			this.value = y+m+d+'001';
-			console.log(this.value)
+			// console.log(this.value)
 		};
 	}
 </script>

src/views/audit/warehousing/components/towInOne.vue

@@ -87,7 +87,7 @@
 		openModal() {
 			let data = (this as any).$lodash.cloneDeep(this.propValue);
 			data = data.split(',');
-			console.log(this.parentValue);
+			// console.log(this.parentValue);
 			setTimeout(() => {
 				(this as any).$refs.form.setValue({
 					storehouseName: this.parentValue.storehouseName,
@@ -101,7 +101,7 @@
 		// 确定仓库仓位
 		doConfirm() {
 			let data : any = (this as any).$refs.form.getValue();
-			console.log('data', data);
+			// console.log('data', data);
 			// console.log(this.parentValue);
 			if (!data.storehouseId || !data.storingLocationId) return this.$message.warning('仓库仓位为必填项');
 			data.towInOne = data.storehouseName + ',' + data.storingLocationName;

src/views/audit/warehousing/index.vue

@@ -826,7 +826,7 @@
 					}).catch(() => loading.close());
 				} else {
 					query.submitState = 0;
-					console.log('保存 ==>', query);
+					// console.log('保存 ==>', query);
 					api.updateList(query, 'supplyEntryOrder').then((res : any) => {
 						loading.close();
 						if (res.code === 200) {
@@ -906,7 +906,7 @@
 		// 打开编辑
 		openEdit(e : any) {
 			e = e.row ? e.row : e;
-			console.log('编辑 ==>', e);
+			// console.log('编辑 ==>', e);
 			let loading = this.$loading({ target: '.main-container' });
 			api.single({ id: e.id }, 'supplyEntryOrder').then((res : any) => {
 				if (res.code === 200) {
@@ -1103,7 +1103,7 @@
 		}
 		// 操作反提交
 		onReturnSmt(e : any) {
-			console.log('反提交 ==>', e);
+			// console.log('反提交 ==>', e);
 			this.$confirm('确定反提交吗！', '注意', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
@@ -1122,7 +1122,7 @@
 		}
 		// 工具栏反提交
 		onReturnSmt2() {
-			console.log('工具栏反提交 ==>', this.baseInfo);
+			// console.log('工具栏反提交 ==>', this.baseInfo);
 			this.$confirm('确定反提交吗！', '注意', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
@@ -1192,7 +1192,7 @@
 			let query : any = (this as any).$refs.bill.getSearchValue(e.type);
 			query.pageNo = e.page.pageNum;
 			query.pageSize = e.page.pageSize;
-			console.log('分页 ==> ', query);
+			// console.log('分页 ==> ', query);
 			let loading = this.$loading({ target: '.main-container' });
 			if (e.type === 'recycleBin') {
 				api.selectDeleteList(query, 'supplyEntryOrder').then((res : any) => {
@@ -1235,7 +1235,7 @@
 		}
 		// 搜索
 		search(parames : any) {
-			console.log('搜索 ==> ', parames);
+			// console.log('搜索 ==> ', parames);
 			let query = parames.value
 			if (parames.type === 'draftsBox') query.submitState = 0 // 草稿箱数据
 			if (parames.type === 'smt') query.submitState = 1 // 已提交数据
@@ -1329,7 +1329,7 @@
 		}
 		// 工具栏删除
 		onDelete(e : any) {
-			console.log('工具栏删除 ==> ', e);
+			// console.log('工具栏删除 ==> ', e);
 			let selectData = (this.$refs.bill as any).getTableSelectData(e)
 			let ids = '';
 			if (selectData.length > 0) {

src/views/oms/B2BOrder/components/importExcelModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <vxe-modal v-model="show" id="importExcelFailModel" width="600" height="300" title="B2B发货单导入" @hide="hide" resize transfer show-footer v-loading="load">
+  <vxe-modal v-model="show" id="importExcelFailModel" width="600" height="300" title="B2B订单导入" @hide="hide" resize transfer show-footer v-loading="load">
     <div class="upload" v-if="!uploadRes">
       <div class="upload-name">{{ value.name }}</div>
       <div class="upload-btn" @click="importOrder">{{value.name?'重新上传':'上传'}}</div>
@@ -46,7 +46,7 @@ export default class ImportExcelFailModel extends Vue {
       let link = document.createElement("a");
       link.style.display = "none";
       link.href = url;
-      link.setAttribute("download", '发货单导入模版.xlsx');
+      link.setAttribute("download", '订单导入模版.xlsx');
       document.body.appendChild(link);
       link.click();
       document.body.removeChild(link);

src/views/oms/B2BOrder/components/inputSelect.vue

@@ -38,7 +38,7 @@ export default class InputSelect extends Vue {
     }
   }
   input(v:any){
-    console.log(v)
+    // console.log(v)
     if(this.format && v){
       this.value=v.replace(this.format,'');
     }

src/views/oms/B2BOrder/components/purchaseModel.vue

@@ -226,7 +226,7 @@ export default class PurchaseModel extends Vue {
   hide(){}
 
   onChangeRow(row:any){
-    console.log(row,Number(row.qty),Number(row.residueQty))
+    // console.log(row,Number(row.qty),Number(row.residueQty))
     if(Number(row.qty) > Number(row.residueQty)){
       this.$message('数量不能大于可采购数量！');
       row.qty = '0';

src/views/oms/B2COrder/components/inputSelect.vue

@@ -38,7 +38,7 @@ export default class InputSelect extends Vue {
     }
   }
   input(v:any){
-    console.log(v)
+    // console.log(v)
     if(this.format && v){
       this.value=v.replace(this.format,'');
     }

src/views/oms/B2COrder/components/purchaseModel.vue

@@ -226,7 +226,7 @@ export default class PurchaseModel extends Vue {
   hide(){}
 
   onChangeRow(row:any){
-    console.log(row,Number(row.qty),Number(row.residueQty))
+    // console.log(row,Number(row.qty),Number(row.residueQty))
     if(Number(row.qty) > Number(row.residueQty)){
       this.$message('数量不能大于可采购数量！');
       row.qty = '0';

src/views/oms/WMSProduct/component/ItemSku.vue

@@ -42,7 +42,7 @@ export default class ItemSku extends Vue {
   del(data:any) {
     this.data.splice(data.rowIndex,1)
     this.$emit('onChange',this.data)
-    console.log(this.data)
+    // console.log(this.data)
   }
   qtyChange(row:any) {
     if(Number(row.qty) < 1) {

src/views/oms/order/components/inputSelect.vue

@@ -38,7 +38,7 @@ export default class InputSelect extends Vue {
     }
   }
   input(v:any){
-    console.log(v)
+    // console.log(v)
     if(this.format && v){
       this.value=v.replace(this.format,'');
     }

src/views/oms/order/components/purchaseModel.vue

@@ -226,7 +226,7 @@ export default class PurchaseModel extends Vue {
   hide(){}
 
   onChangeRow(row:any){
-    console.log(row,Number(row.qty),Number(row.residueQty))
+    // console.log(row,Number(row.qty),Number(row.residueQty))
     if(Number(row.qty) > Number(row.residueQty)){
       this.$message('数量不能大于可采购数量！');
       row.qty = '0';