Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/customer/edit.vue

@@ -657,6 +657,17 @@ export default {
 
           const form = {...this.form, type: this.form.type?.join(','), taxRate: Number(this.form.taxRate)}
 
+          // 检查路线是否启用了但是没选择目的仓
+          let errors = 0
+          form.customerLines.forEach(line => {
+            if(!line.objectiveIds || line.objectiveIds == ''){
+              errors ++
+            }
+          })
+          if(errors){
+            return this.$message.error('有两条路线未选择目的地')
+          }
+
           // 修改的提交
           if (this.form.id != null) {
             this.form.customerContacts.forEach(e => {

src/views/ecw/order/edit.vue

@@ -529,6 +529,7 @@ export default {
   },
   data() {
     let validatorPositiveNumber = (rule, value, callback) => {
+        if(!value || value == '')return callback();
         if (!value) return callback(new Error('请输入数字'))
         if (!Number(value)) return callback(new Error('请输入有效数字'))
         let reg = /((^[1-9]\d*)|^0)(\.\d*){0,1}$/;

src/views/ecw/productAttr/edit.vue

@@ -19,7 +19,7 @@
         <dict-selector :type="DICT_TYPE.ECW_PACKAGING_TYPE" v-model="form.packaging" />
       </el-form-item>
       <el-form-item :label="$t('是否预约入仓')" prop="needBook">
-        <dict-selector formatter="bool" form-type="radio" :type="DICT_TYPE.ECW_YESNO" v-model="form.needBook" :formater="Boolean" />
+        <dict-selector form-type="radio" :type="DICT_TYPE.ECW_YESNO" v-model="form.needBook" formatter="number" />
       </el-form-item>
       <el-form-item :label="$t('每日入仓上限')" prop="dayLimit" v-if="form.needBook">
         <el-input placeholder="" v-model="form.dayLimit" class="w-200">