Merge remote-tracking branch 'origin/master'

@@ -809,7 +809,6 @@
                         { pattern: /^([0-9]+)(\.\d{2})?$/, message: '只允许输入数字与小数,支持到小数点后两位' }
                         { pattern: /^([0-9]+)(\.\d{2})?$/, message: '只允许输入数字与小数,支持到小数点后两位' }
                     ],
                     ],
                     feeweight: [
                     feeweight: [
-                        { required: true, message: '计费重量为必填项', trigger: 'blur' },
                         { pattern: /^([0-9]+)(\.\d{2})?$/, message: '只允许输入数字与小数,支持到小数点后两位' }
                         { pattern: /^([0-9]+)(\.\d{2})?$/, message: '只允许输入数字与小数,支持到小数点后两位' }
                     ],
                     ],
                     area: [
                     area: [
@@ -1338,8 +1337,9 @@
                     return this.addForm.goodssize;
                     return this.addForm.goodssize;
                 },
                 },
                 set:function (value) {
                 set:function (value) {
-                    this.addForm.goodssize = value.replaceAll('*','x')
-                    this.addForm.goodssize = value.replaceAll('X','x')
+                    value = value.replaceAll('*','x')
+                    value = value.replaceAll('X','x')
+                    this.addForm.goodssize = value
                     // console.log("opebTab监视:value = "+ value);
                     // console.log("opebTab监视:value = "+ value);
                 }
                 }
             }
             }

 {
 {
-  "nmmsVer": "1.38"
+  "nmmsVer": "1.40"
 }
 }