build

src/components/globalComponents/goodClassYouzan/main.vue

@@ -2,26 +2,26 @@
   <div class="select-goodsClass">
     <el-cascader
       v-if="!loading"
+      v-model="value"
       :size="size || 'medium'"
       style="width: 100%"
       filterable
       clearable
-      v-model="value"
       :placeholder="placeholder || ''"
       :props="props"
       :disabled="disabled"
       @change="handleChange"
-    ></el-cascader>
+    />
   </div>
 </template>
 
 <script>
-import asyncRequest from "@/apis/components/goods-class-youzan";
-import resToken from "@/mixins/resToken";
+import asyncRequest from '@/apis/components/goods-class-youzan'
+import resToken from '@/mixins/resToken'
 export default {
-  name: "goodClassYouzan",
+  name: 'GoodClassYouzan',
   mixins: [resToken],
-  props: ["size", "value", "placeholder", "isDetail", "disabled"],
+  props: ['size', 'value', 'placeholder', 'isDetail', 'disabled'],
   /**
    * 属性集合
    * @param {String}        size             : 组件大小            非必填
@@ -39,43 +39,44 @@ export default {
       loading: false,
       props: {
         checkStrictly: false,
-        expandTrigger: "hover",
-        lazy: true, //开启远程加载
+        expandTrigger: 'hover',
+        lazy: true, // 开启远程加载
         async lazyLoad(node, resolve) {
-          const { level, value, root, loading } = node;
-          let model = {
-            parent_cid: "",
-          };
-          let list = [];
-          console.log(level);
-          if (level > 1) {
-            resolve([]);
-            return;
+          const { level, value, root, loading, hasChildren } = node
+          const model = {
+            parent_cid: ''
           }
+          const list = []
+
+          if ('hasChildren' in node && !hasChildren) {
+            resolve([])
+            return
+          }
+
           if (level === 0) {
-            model.parent_cid = "0";
+            model.parent_cid = '0'
           } else {
-            model.parent_cid = value;
+            model.parent_cid = value
           }
-          const res = await asyncRequest.list(model);
-          const { code, data } = res;
+          const res = await asyncRequest.list(model)
+          const { code, data } = res
           if (code === 0) {
             data.forEach((v1) => {
-              let province = {
+              const province = {
                 youzanIid: v1.yz_cat_id,
                 value: v1.id,
                 label: v1.yz_cat_name,
-                leaf: level >= 1,
-              };
-              list.push(province);
-            });
-            resolve(list);
+                leaf: v1.has_children === '0'
+              }
+              list.push(province)
+            })
+            resolve(list)
           } else {
-            resolve([]);
+            resolve([])
           }
-        },
-      },
-    };
+        }
+      }
+    }
   },
   // watch: {
   //   // value: function (val, old) {
@@ -88,15 +89,15 @@ export default {
   //   // },
   // },
   mounted() {
-    this.options = [];
-    this.selectLoading = false;
+    this.options = []
+    this.selectLoading = false
   },
   methods: {
     async handleChange(value) {
-      this.$emit("handleChange", value);
-    },
-  },
-};
+      this.$emit('handleChange', value)
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/views/sellOut/sellReturn/components/set-work-order.vue

@@ -202,13 +202,7 @@ export default {
           }
         })
 
-        if (sum !== Number(this.outItem.return_num)) {
-          this.$message.warning('退货数量的和必须与发货单的退货数量一致')
-          return
-        }
-
         const salesWarehouseParams = { list, returnCode: this.sitem.returnCode, outCode: this.outItem.outCode }
-
         const parms = {
           list: [{
             return_wsm_code: Array.isArray(this.formData.return_wsm_code)
@@ -220,6 +214,11 @@ export default {
           outCode: this.outItem.outCode
         }
 
+        if (sum !== Number(this.outItem.return_num) && this.isSalesWarehouselist) {
+          this.$message.warning('退货数量的和必须与发货单的退货数量一致')
+          return
+        }
+
         const { code, message } = await asyncRequest.reorderChildAdd(this.isSalesWarehouselist ? salesWarehouseParams : parms)
         this.subLoading = false
         switch (code) {

src/views/youzan/othgoodsOnline/components/online-exam-form.vue

@@ -172,6 +172,16 @@
               />
             </el-form-item>
           </el-col>
+
+          <el-col :span="24">
+            <el-form-item label-width="120px" prop="distribution" label="支持的配送方式">
+              <el-checkbox-group v-model="ruleForm.distribution" @change="handleChange">
+                <el-checkbox label="1" key="1">快递发货</el-checkbox>
+                <el-checkbox label="2" key="2" >同城配送</el-checkbox>
+                <el-checkbox label="3" key="3">到店自提</el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-col>
       <el-col
@@ -200,22 +210,6 @@
           <el-table-column label="销售">
             <el-table-column prop="start_sale_num" label="起订量">
               <template slot-scope="scope">
-                <!-- <digital-input
-                  v-show="scope.row.edit"
-                  :values="scope.row.start_sale_num"
-                  :placeholder="'起订量'"
-                  :min="scope.row.min_num"
-                  :max="100000000000"
-                  :position="'right'"
-                  :precision="0"
-                  :controls="false"
-                  :append="''"
-                  :newTime="scope.row.newTime"
-                  :size="'mini'"
-                  :disabled="false"
-                  @reschange="num_change($event, 'start_sale_num', scope.$index)"
-                />
-                v-show="!scope.row.edit" -->
                 <span>
                   {{ scope.row.start_sale_num }}
                 </span>
@@ -243,8 +237,8 @@
                 <span v-show="!scope.row.edit">
                   {{ scope.row.final_price }}
                 </span>
-              </template></el-table-column
-            >
+              </template>
+            </el-table-column>
           </el-table-column>
         </el-table>
       </el-col>
@@ -359,6 +353,7 @@ export default {
         auto_listing_time: "",
         origin: "0",
         time: "0",
+        distribution: ['1']
       },
       rulesThis: this.rules,
       rules: {
@@ -442,6 +437,9 @@ export default {
     this.initForm();
   },
   methods: {
+    handleChange(values){
+      console.log(values)
+    },
     async initForm() {
       // this.loading = true;
       this.rulesThis = this.rules;