1

src/benyun/components/byForm/byForm.vue

@@ -247,17 +247,35 @@ export default class ByForm extends VueViews {
       if(!this.$refs.byForm){
         resolve(true)
       }
+      const failHandel = () => {
+        if(!parames || !parames.noMsg){
+          (this as any).$message({
+            message: '验证未通过，请检查！',
+            type: 'warning',
+          })
+        }
+        reject()
+      }
       (this as any).$refs.byForm.validate((valid:any) => {
         if (valid) {
-          resolve(true)
-        } else {
-          if(!parames || !parames.noMsg){
-            (this as any).$message({
-              message: '验证未通过，请检查！',
-              type: 'warning',
-            })
+          let va = true
+          for(const col of this.columns){
+            for(const item of col){
+              if(this.$refs[item.prop+this.suffixCode] && (this.$refs[item.prop+this.suffixCode] as any)[0] && (this.$refs[item.prop+this.suffixCode] as any)[0].validate){
+                va = (this.$refs[item.prop+this.suffixCode] as any)[0].validate()
+                if(!va) break
+              }
+            }
+            if(!va) break
+          }
+          if(va){
+            resolve(true)
+          }else{
+            failHandel()
           }
-          reject()
+          
+        } else {
+          failHandel()
         }
       });
     })

src/benyun/components/byInput/byInput.vue

@@ -57,7 +57,7 @@ export default class ByInput extends VueViews {
     if(this.propValue){
       this.setValue(this.propValue)
     }
-    if(this.attrs.defaultValue && !this.value){
+    if((this.attrs.defaultValue || this.attrs.defaultValue === 0) && !this.value){
       this.setValue(this.attrs.defaultValue);
       this.onChange();
     }
@@ -75,7 +75,7 @@ export default class ByInput extends VueViews {
   }
 
   setValue(data:any){
-    if(data){
+    if(data || data === 0){
       this.value = (this as any).$lodash.cloneDeep(data);
       if(this.attrs.type == 'number'){
         this.value = Number(data);

src/components/skuModal/productModal.vue

@@ -1,6 +1,5 @@
 <template>
-  <vxe-modal v-model="value" id="productDialogModal" v-loading="load" :width="width?width+'px':'80%'" @show="show" :height="height?height+'px':'80%'" min-width="500" min-height="400" 
-  show-zoom resize transfer show-footer>
+  <vxe-modal v-model="value" id="productDialogModal" v-loading="load" :width="width?width+'px':'80%'" @show="show" :height="height?height+'px':'80%'" min-width="500" min-height="400" show-zoom resize transfer show-footer>
     <template #title>
       <span>选择商品</span>
     </template>
@@ -157,9 +156,7 @@ export default class ProductModal extends Vue {
   }
   //显示弹窗
   show(){
-    if(this.data.length ==0){
-      this.getList()
-    }
+    this.getList()
     if(this.$refs.view){
       (this.$refs.view as any).clearCheckboxRow();
     }
@@ -169,11 +166,10 @@ export default class ProductModal extends Vue {
       if(this.timeNum > 5){
         return
       }
+      this.timeNum ++;
       setTimeout(()=>{
         this.getList()
       },500) 
-      this.timeNum ++;
-
       return
     }
     let query:any = (this.$refs.view as any).getQuery();

src/views/audit/agencyGoods/index.vue

@@ -41,6 +41,7 @@
 	import Assembly from "@/components/Assembly/material.vue";
 	@Component
 	export default class AgencyGoods extends Vue {
+		parentId : any = 0
 		parentIds : any = ''
 		timeNum = 0;
 		timer : any = null
@@ -272,7 +273,8 @@
 		onChangeTree(e : any) {
 			let data : any = {};
 			e.isContain ? data.ids = e.id : data.parentId = e.id;
-			this.parentIds = e.id;
+			this.parentIds = (this as any).$lodash.cloneDeep(e.id);
+			this.parentId = e.id[0];
 			data.pageSize = 20;
 			data.pageNo = 1;
 			let loading = this.$loading({ target: '.main-container' });
@@ -295,6 +297,9 @@
 				let query = (this as any).$refs.addFormId.getValue();
 				query.status = this.radio;
 				if (this.popTitle === '新增') {
+					if(!query.parentId){
+						query.parentId=0
+					}
 					api.saveList(query, 'maindataMaterialOrganizationCategory').then((res : any) => {
 						if (res.code === 200) {
 							this.$message.success(this.popTitle + '成功!');
@@ -361,15 +366,27 @@
 		// 打开新增
 		onAdd() {
 			this.popTitle = '新增'
-			this.radio = 0
 			this.dialogFormVisible = true;
+			this.radio = 0
 			this.getTreeList();
 			setTimeout(() => {
-				(this as any).$refs.addFormId.setValue();
-				(this as any).$refs.addFormId.$refs['parentName--comp'][0].request();
-				this.$nextTick(()=>{
-					(this as any).$refs.addFormId.clearValidate();
-				})
+				if(this.parentId!=0){
+					var data = {
+						parentName: '',
+						parentId: 0
+					}
+					api.single({ id: this.parentId }, 'maindataMaterialOrganizationCategory').then((res : any) => {
+						if (res.code === 200) {
+							data.parentName = res.data.name;
+							data.parentId = res.data.id;
+							this.dialogFormVisible = true;
+							setTimeout(() => { (this as any).$refs.addFormId.setValue(data) }, 0);
+						}
+					}).catch(() => {});
+				}else{
+					(this as any).$refs.addFormId.setValue();
+					(this as any).$refs.addFormId.$refs['parentName--comp'][0].request();
+				}
 			}, 0)
 		}
 		// 打开编辑

src/views/audit/distributor/index.vue

@@ -257,8 +257,9 @@
 						label: '手机号码',
 						prop: 'telephone',
 						component: 'by-input',
-					},
-					{
+					}
+				],
+				[{
 						span: 6,
 						label: '联系电话',
 						prop: 'phonenum',

src/views/audit/manufacturer/index.vue

@@ -261,7 +261,8 @@
 						prop: 'telephone',
 						component: 'by-input',
 					},
-					{
+				],
+				[{
 						span: 6,
 						label: '联系电话',
 						prop: 'phonenum',

src/views/audit/organClassify/index.vue

@@ -37,6 +37,7 @@
 		popTitle : any = ''
 		radio : any = 0
 		dialogFormVisible : boolean = false
+		parentId : any = 0
 		parentIds : any = '';
 		treeConfig = {
 			attr: {
@@ -236,7 +237,8 @@
 		onChangeTree(e : any) {
 			let data : any = {};
 			e.isContain ? data.ids = e.id : data.parentId = e.id;
-			this.parentIds = e.id;
+			this.parentIds = (this as any).$lodash.cloneDeep(e.id);
+			this.parentId = e.id[0];
 			let loading = this.$loading({ target: '.main-container' });
 			api.childrenTreeList(data, 'maindataOrganizationCategory').then((res : any) => {
 				if (res.code === 200) {
@@ -259,6 +261,9 @@
 				query.status = this.radio;
 				this.dialogFormVisible = false;
 				if (this.popTitle === '新增') {
+					if(!query.parentId){
+						query.parentId=0
+					}
 					api.saveList(query, 'maindataOrganizationCategory').then((res : any) => {
 						if (res.code === 200) {
 							this.$message.success(this.popTitle + '成功!');
@@ -324,11 +329,26 @@
 		onAdd() {
 			this.popTitle = '新增'
 			this.dialogFormVisible = true;
-			this.radio = 0;
+			this.radio = 0
 			this.getTreeList();
 			setTimeout(() => {
-				(this as any).$refs.addFormId.setValue();
-				(this as any).$refs.addFormId.$refs['parentName--comp'][0].request();
+				if(this.parentId!=0){
+					var data = {
+						parentName: '',
+						parentId: 0
+					}
+					api.single({ id: this.parentId }, 'maindataOrganizationCategory').then((res : any) => {
+						if (res.code === 200) {
+							data.parentName = res.data.name;
+							data.parentId = res.data.id;
+							this.dialogFormVisible = true;
+							setTimeout(() => { (this as any).$refs.addFormId.setValue(data) }, 0);
+						}
+					}).catch(() => {});
+				}else{
+					(this as any).$refs.addFormId.setValue();
+					(this as any).$refs.addFormId.$refs['parentName--comp'][0].request();
+				}
 			}, 0)
 		}
 		// 打开编辑

src/views/audit/productClassification/index.vue

@@ -33,6 +33,7 @@
 	@Component
 	export default class ProductClassification extends Vue {
 		// 左边
+		parentId : any = 0
 		parentIds : any = ''
 		// 右边
 		timeNum = 0;
@@ -263,9 +264,11 @@
 		}
 		//点击树获取数据
 		onChangeTree(e : any) {
+			// console.log(e)
 			let data : any = {};
 			e.isContain ? data.ids = e.id : data.parentId = e.id;
 			this.parentIds = (this as any).$lodash.cloneDeep(e.id);
+			this.parentId = e.id[0];
 			this.parentIds.shift();
 			data.pageSize = 20;
 			data.pageNo = 1;
@@ -291,6 +294,9 @@
 				query.status = this.radio;
 				this.dialogFormVisible = false;
 				if (this.popTitle === '新增') {
+					if(!query.parentId){
+						query.parentId=0
+					}
 					api.saveList(query, 'maindataMaterialCategory').then((res : any) => {
 						if (res.code === 200) {
 							this.$message.success(this.popTitle + '成功!');
@@ -359,8 +365,23 @@
 			this.radio = 0
 			this.getTreeList();
 			setTimeout(() => {
-				(this as any).$refs.addFormId.setValue();
-				(this as any).$refs.addFormId.$refs['parentName--comp'][0].request();
+				if(this.parentId!=0){
+					var data = {
+						parentName: '',
+						parentId: 0
+					}
+					api.single({ id: this.parentId }, 'maindataMaterialCategory').then((res : any) => {
+						if (res.code === 200) {
+							data.parentName = res.data.name;
+							data.parentId = res.data.id;
+							this.dialogFormVisible = true;
+							setTimeout(() => { (this as any).$refs.addFormId.setValue(data) }, 0);
+						}
+					}).catch(() => {});
+				}else{
+					(this as any).$refs.addFormId.setValue();
+					(this as any).$refs.addFormId.$refs['parentName--comp'][0].request();
+				}
 			}, 0)
 		}
 		// 打开编辑

src/views/audit/productManagement/index.vue

@@ -113,7 +113,7 @@
 		<!-- 选择物料 -->
 		<productModal ref="product" :mulit="true" @confirm="confirmProduct" />
 		
-		<vxe-modal v-model="vxeValue" width="48%" height="88%" show-zoom resize transfer show-footer>
+		<vxe-modal v-model="vxeValue" width="48%" height="88%" show-zoom resize transfer show-footer :loading="tableloading">
 			<template #title>
 				<span>关联金蝶财务系统物料</span>
 			</template>
@@ -139,7 +139,6 @@
 				<el-table
 				    ref="multipleTable" 
 				    :data="newtableData"
-					v-loading="tableloading"
 					stripe
 					border
 				    style="width: 100%"
@@ -723,6 +722,9 @@
 					name: [{
 						required: true, message: '请输入名称', trigger: 'blur'
 					}],
+					// materialCode: [{
+					// 	required: true, message: '请输入物料编码', trigger: 'blur'
+					// }],
 					basePrice: [{
 						required: true, message: '请输入基本售价', trigger: 'blur'
 					}],
@@ -1086,7 +1088,7 @@
 			},
 		}
 		
-		tableloading = false
+		tableloading = true
 		tableRadio: any = {}
 		tableData: any = []
 		newtableData: any = []
@@ -1111,7 +1113,7 @@
 			this.tableSearchForm.stime = '2020-01-01';
 			this.tableSearchForm.etime = y+'-'+m+'-'+d;
 			this.etime = y+'-'+m+'-'+d;
-			this.getFinancialCode()
+			// this.getFinancialCode()
 			this.getTreeList();
 		}
 		getTreeList(){
@@ -1222,9 +1224,9 @@
 						// if (parseInt(v.height) <= 0) return this.$message.warning('物料属性高度不能小于1');
 						if (!v.skuTitle) return this.$message.warning('物料标题必填');
 						if (!v.skuCode) return this.$message.warning('物料编码必填');
-						if(v.weight&&v.weight!=0){
-							v.weight = v.weight/1000
-						}
+						// if(v.weight&&v.weight!=0){
+						// 	v.weight = v.weight/1000
+						// }
 					};
 					data = { maindataMaterialReceiveParam: query, maindataMaterialSkus: this.tableList }
 					let newArray : any = []
@@ -1266,12 +1268,12 @@
 						// if (parseInt(v.width) <= 0) return this.$message.warning('物料宽不能小于1');
 						// if (!v.height) return this.$message.warning('物料高必填');
 						// if (parseInt(v.height) <= 0) return this.$message.warning('物料高不能小于1');
-						if (!v.skuTitle) return this.$message.warning('物料标题必填');
-						if (!v.skuCode) return this.$message.warning('物料编码必填');
+						if (!v.skuTitle) return this.$message.warning('物料属性的标题需必填');
+						if (!v.skuCode) return this.$message.warning('物料属性的物料编码需必填');
 						
-						if(v.weight&&v.weight!=0){
-							v.weight = v.weight/1000
-						}
+						// if(v.weight&&v.weight!=0){
+						// 	v.weight = v.weight/1000
+						// }
 					};
 					data.maindataMaterialSkus[0].isDeleted = 0;
 					data.maindataMaterialReceiveParam.attributeList = ""
@@ -1398,10 +1400,13 @@
 									this.towTable = '' // 表格数据
 									this.attributeList = []; // 属性规格
 									this.$nextTick(() => {
-										console.log(info.data);
+										// console.log(info.data);
 										info.data.map((v : any, i : any) => {
-											if(v.weight!='0.00'&&v.weight!=0&&v.weight!='0'){
-												v.weight = parseFloat(v.weight)*1000
+											// if(v.volume&&v.weight!='0.00'&&v.weight!=0&&v.weight!='0'){
+											// 	v.weight = parseFloat(v.weight)*1000
+											// }
+											if(v.volume&&v.volume!='0.00'&&v.volume!=0&&v.volume!='0'){
+												v.volume = parseFloat(v.volume).toFixed(2)
 											}
 										});
 										(this as any).$refs.singeTable.setValue(info.data);
@@ -1414,8 +1419,11 @@
 									info.data.map((v : any, i : any) => {
 										v = Object.assign(v, skuRuleList[i])
 										v.dataIndex = i
-										if(v.weight!='0.00'&&v.weight!=0&&v.weight!='0'){
-											v.weight = parseFloat(v.weight)*1000
+										// if(v.volume&&v.weight!='0.00'&&v.weight!=0&&v.weight!='0'){
+										// 	v.weight = parseFloat(v.weight)*1000
+										// }
+										if(v.volume&&v.volume!='0.00'&&v.volume!=0&&v.volume!='0'){
+											v.volume = parseFloat(v.volume).toFixed(2)
 										}
 									});
 									newColumns.map((v : any) => {
@@ -1659,6 +1667,11 @@
 		// 打开关联金蝶财务系统物料选择
 		openVxeData(){
 			this.vxeValue = true;
+			if(this.tableData.length==0){
+				setTimeout(()=>{
+					this.getFinancialCode();
+				},0)
+			}
 		}
 		// 获取关联金蝶财务系统物料列表
 		getFinancialCode(){
@@ -1722,7 +1735,6 @@
 				val[0].unit = this.tableRadio.fbaseUnitName;
 				val[0].unitCode = this.tableRadio.fbaseUnitCode;
 			}
-			console.log(222,val);
 			(this as any).$refs.singeTable.setValue(val);
 			(this as any).$refs.form.setValue(val2);
 			this.vxeValue = false;

src/views/audit/sku/index.vue

@@ -9,7 +9,7 @@
 		<div class="detail" v-show="isShow==='detail'" key="index2">
 			<by-tool :propConfig="toolConfig" @clickHandle="insideTools" />
 			<div class="box-shadow">
-				<by-table :propConfig="skuConfig" ref="addFormId"></by-table>
+				<by-table :propConfig="skuConfig" @onChangeRow="getInputValue" ref="addFormId"></by-table>
 			</div>
 		</div>
 	</div>
@@ -49,7 +49,7 @@
 			columns: [
 				{
 					width: '200px',
-					title: '标题',
+					title: '标题（必填项）',
 					field: 'skuTitle',
 					component: 'by-input',
 					compConfig: {
@@ -75,7 +75,7 @@
 				},
 				{
 					width: '140px',
-					title: '物料编码',
+					title: '物料编码（必填项）',
 					field: 'skuCode',
 					component: 'by-input',
 					compConfig: {
@@ -108,7 +108,8 @@
 							size: 'mini',
 							placeholder: ' ',
 							type: "number",
-							defaultValue: 0
+							defaultValue: 0,
+							min: 0
 						},
 					}
 				},
@@ -146,12 +147,13 @@
 							size: 'mini',
 							placeholder: ' ',
 							type: "integer",
+							min: 0
 						},
 					}
 				},
 				{
 					width: '90px',
-					title: '重量/kg',
+					title: '重量/g',
 					field: 'weight',
 					component: 'by-input',
 					compConfig: {
@@ -159,6 +161,7 @@
 							size: 'mini',
 							placeholder: ' ',
 							type: "number",
+							min: 0
 						},
 					}
 				},
@@ -172,6 +175,7 @@
 							size: 'mini',
 							placeholder: ' ',
 							type: "number",
+							min: 0
 						},
 					}
 				},
@@ -185,6 +189,7 @@
 							size: 'mini',
 							placeholder: ' ',
 							type: "number",
+							min: 0
 						},
 					}
 				},
@@ -198,6 +203,7 @@
 							size: 'mini',
 							placeholder: ' ',
 							type: "number",
+							min: 0
 						},
 					}
 				},
@@ -311,7 +317,7 @@
 					},
 					{
 						width: '80px',
-						title: '重量/kg',
+						title: '重量/g',
 						field: 'weight',
 					},
 					{
@@ -417,8 +423,9 @@
 		}
 		// 保存
 		doFormData() {
-			let data : any = (this as any).$refs.addFormId.getValue()
-			if (!data[0].financialCode) return this.$message.warning('财务编号不能为空');
+			let data : any = (this as any).$refs.addFormId.getValue();
+			if (!data[0].skuTitle) return this.$message.warning('物料标题不能为空');
+			if (!data[0].skuCode) return this.$message.warning('物料编号不能为空');
 			api.updateList(data[0], 'maindataMaterialSku').then((res : any) => {
 				if (res.code === 200) {
 					this.$message.success('编辑成功');
@@ -446,6 +453,14 @@
 			api.pageList(query, 'maindataMaterialSku').then((res : any) => {
 				loading.close();
 				if (res.code === 200) {
+					res.data.records.map((v : any, i : any) => {
+						if(v.volume&&v.weight!='0.00'&&v.weight!=0&&v.weight!='0'){
+							v.weight = parseFloat(v.weight).toFixed(2)
+						}
+						if(v.volume&&v.volume!='0.00'&&v.volume!=0&&v.volume!='0'){
+							v.volume = parseFloat(v.volume).toFixed(2)
+						}
+					});
 					(this.$refs.moduleView as any).setTableValue(res.data.records);
 					let page = {
 						pageNo: res.data.current, //当前页
@@ -464,10 +479,20 @@
 					this.baseInfo = res.data;
 					this.isShow = 'detail';
 					loading.close();
+					if(res.data.volume&&res.data.volume!='0.00'&&res.data.volume!=0&&res.data.volume!='0'){
+						res.data.volume = parseFloat(res.data.volume).toFixed(2)
+					}
 					setTimeout(() => { (this as any).$refs.addFormId.setValue([res.data]) }, 0);
 				} else loading.close();
 			}).catch(() => loading.close());
 		}
+		// 监听表格数据
+		getInputValue(e : any) {
+			// console.log('监听表格 ==> ', e);
+			if (e.length && e.width && e.height) {
+				e.volume = (e.length * e.width * e.height).toFixed(2);
+			}
+		}
 		// 内页工具栏方法
 		insideTools(e : any) {
 			if (e === 'onReturn') this.isShow = 'home';

src/views/audit/supplier/index.vue

@@ -256,7 +256,8 @@
 						prop: 'telephone',
 						component: 'by-input',
 					},
-					{
+				],
+				[{
 						span: 6,
 						label: '联系电话',
 						prop: 'phonenum',

src/views/audit/virtually/index.vue

@@ -33,6 +33,7 @@
 	@Component
 	export default class Virtually extends Vue {
 		// 左边
+		parentId : any = 0
 		parentIds : any = ''
 		// 右边
 		timeNum = 0;
@@ -264,7 +265,8 @@
 		onChangeTree(e : any) {
 			let data : any = {};
 			e.isContain ? data.ids = e.id : data.parentId = e.id;
-			this.parentIds = e.id;
+			this.parentIds = (this as any).$lodash.cloneDeep(e.id);
+			this.parentId = e.id[0];
 			data.pageSize = 20;
 			data.pageNo = 1;
 			let loading = this.$loading({ target: '.main-container' });
@@ -289,6 +291,9 @@
 				query.status = this.radio;
 				this.dialogFormVisible = false;
 				if (this.popTitle === '新增') {
+					if(!query.parentId){
+						query.parentId=0
+					}
 					api.saveList(query, 'maindataMaterialVmcategory').then((res : any) => {
 						if (res.code === 200) {
 							this.$message.success(this.popTitle + '成功!');
@@ -357,8 +362,23 @@
 			this.radio = 0
 			this.getTreeList();
 			setTimeout(() => {
-				(this as any).$refs.addFormId.setValue();
-				(this as any).$refs.addFormId.$refs['parentName--comp'][0].request();
+				if(this.parentId!=0){
+					var data = {
+						parentName: '',
+						parentId: 0
+					}
+					api.single({ id: this.parentId }, 'maindataMaterialVmcategory').then((res : any) => {
+						if (res.code === 200) {
+							data.parentName = res.data.name;
+							data.parentId = res.data.id;
+							this.dialogFormVisible = true;
+							setTimeout(() => { (this as any).$refs.addFormId.setValue(data) }, 0);
+						}
+					}).catch(() => {});
+				}else{
+					(this as any).$refs.addFormId.setValue();
+					(this as any).$refs.addFormId.$refs['parentName--comp'][0].request();
+				}
 			}, 0)
 		}
 		// 打开编辑

src/views/components/rose.vue

@@ -68,11 +68,21 @@ export default class Rose extends Vue {
       series: [
         {
           type: 'pie',
-          radius: [30, 120],
-          center: ['50%', '50%'],
-          roseType: 'area',
-          itemStyle: {
-            borderRadius: 8
+          radius: ['40%', '70%'],
+          avoidLabelOverlap: false,
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold'
+            }
+          },
+          label: {
+            formatter: '{b}:\n {d}' + '%',
+            position:'inside'
+          },
+          labelLine: {
+            show: false
           },
           data: _data
         }

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

@@ -58,24 +58,30 @@ export default class CancelOrderModel extends Vue {
       this.$message('请选择取消类型！');
       return
     }
-    this.load = true;
-    cancelOrder({
-      idList:this.ids,
-      cancelType:this.type,
-      remark:this.reason
-    }).then(()=>{
-      this.load = false;
-      this.$message({
-        message:'订单取消成功！',
-        type:'success'
-      });
-      this.value = false;
-      this.type='';
-      this.reason = '';
-      this.$emit('handleSuccess');
-    }).catch((err:any)=>{
-      this.load = false;
-    })
+    this.$confirm('取消订单后将无法恢复, 是否继续?', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }).then(() => {
+      this.load = true;
+      cancelOrder({
+        idList:this.ids,
+        cancelType:this.type,
+        remark:this.reason
+      }).then(()=>{
+        this.load = false;
+        this.$message({
+          message:'订单取消成功！',
+          type:'success'
+        });
+        this.value = false;
+        this.type='';
+        this.reason = '';
+        this.$emit('handleSuccess');
+      }).catch((err:any)=>{
+        this.load = false;
+      })
+    }).catch(() => {});
   }
 }
 </script>

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

@@ -131,8 +131,8 @@
         <div class="g-label">物料信息</div>
         <div class="g-cont">
           <div class="g-total">
-            <span class="name-label">重量合计：</span>
-            <span class="total-num">{{totalWeight}}g</span>
+            <span class="name-label">重量合计(kg)：</span>
+            <span class="total-num">{{totalWeight}}</span>
           </div>
         </div>
       </div>
@@ -145,7 +145,7 @@
           :data="value.subItem">
           <vxe-column field="tmsGoodsCode" title="物料编码" width="130"></vxe-column>
           <vxe-column field="name" title="物料名称" width="260"></vxe-column>
-          <vxe-column field="weight" title="重量"></vxe-column>
+          <vxe-column field="weight" title="重量(g)"></vxe-column>
           <vxe-column field="price" title="单价"></vxe-column>
           <vxe-column field="tmsQuantity" title="数量"></vxe-column>
           <vxe-column field="tmsGoodsTotalPrice" title="小计"></vxe-column>
@@ -501,6 +501,7 @@ export default class DeliveryGoodsInfo extends Vue {
         if(Number(item.weight)){
           let totalWeight = multiply(Number(item.weight),Number(item.tmsQuantity))
           this.totalWeight = add(this.totalWeight,totalWeight);
+          this.totalWeight = divide(this.totalWeight,1000)
         }
       }
     }

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

@@ -275,7 +275,7 @@ export default class LoadOrderModal extends Vue {
       this.value = false;
       if(res.data > 0){
         (this as any).$message({
-          message: '成功更新' + res.data + '条数据！',
+          message: '已同步到' + res.data + '条订单！',
           type: 'success',
         });
         this.$emit('handleSuccess');

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

@@ -20,7 +20,7 @@
       </template>
     </vxe-column>
     <vxe-column field="rawSourceId" title="线上订单号" width="140"> </vxe-column>
-    <vxe-column field="isSubmitted" title="提交状态" width="130">
+    <vxe-column field="isSubmitted" title="提交状态" width="100">
       <template #default="{ row }">
         <el-tag v-if="row.isSubmitted == 1" size="small">已提交</el-tag>
         <el-tag v-else type="warning" size="small"> 未提交 </el-tag>
@@ -37,8 +37,8 @@
         </el-badge>
       </template>
     </vxe-column>
-    <vxe-column field="businessType" title="业务类型" width="120"></vxe-column>
-    <vxe-column field="orderType" title="订单类型" width="120">
+    <vxe-column field="businessType" title="业务类型" width="80"></vxe-column>
+    <vxe-column field="orderType" title="订单类型" width="100">
       <template #default="{ row }">
         <span v-if="row.orderType == 'Common'">普通订单</span>
         <span v-if="row.orderType == 'Reissue'">补发订单</span>
@@ -61,7 +61,7 @@
         <span v-if="row.status == 'Cancelled'">取消</span>
       </template>
     </vxe-column>
-    <vxe-column field="upSourceName" title="订单来源" width="120"></vxe-column>
+    <vxe-column field="upSourceName" title="订单来源" width="110"></vxe-column>
     <vxe-column field="operationFlag" title="操作标记" width="120">
       <template #default="{ row }">
         {{ getFromText(row.operationFlag) }}

src/views/oms/pullRecord/index.vue

@@ -46,13 +46,17 @@ export default class OrderPay extends Vue {
         field:'successQty',
         width:130
       },{
-        title:'新增的OMS数量',
+        title:'已同步到OMS的订单数量',
         field:'syncQty',
-        width:130
+        width:160
       },{
         title:'更新的OMS数量',
         field:'updateQty',
         width:130
+      },{
+        title:'新增的OMS订单数量',
+        field:'insertQty',
+        width:150
       },{
         title:'时间',
         field:'respTime',