Merge branch 'master' into sit

src/views/goodStore/goodsOnline/components/fixed-price-form.vue

@@ -644,6 +644,7 @@ export default {
       addrForm: {
         good_ladder: [],
       },
+      good_ladder: [],
       addrRules: {
         min_num: [
           {
@@ -883,6 +884,10 @@ export default {
                 ? JSON.parse(JSON.stringify(ladderlist))
                 : [],
           };
+          this.good_ladder =
+            ladderlist && ladderlist.length > 0
+              ? JSON.parse(JSON.stringify(ladderlist))
+              : [];
           // console.log(this.ruleForm.proof_url);
           switch (this.ruleForm.proof_type) {
             case "1":
@@ -973,6 +978,13 @@ export default {
               delete n["index"];
               list2.push(n);
             });
+            this.good_ladder.forEach((si, sii) => {
+              const index = list2.findIndex((ai, aii) => si.id === ai.id);
+              if (index === -1) {
+                si.is_del = "1";
+                list2.push(si);
+              }
+            });
             model.good_ladder = list2;
             model.skuCode = this.id;
             model.exam_remark = model.remark;

src/views/purchaseIn/recovery/index.vue

@@ -39,7 +39,7 @@
                 >
                 </el-input>
               </el-col>
-              <el-col :span="6" style="width: 400px; padding: 0 0 0 10px">
+              <!-- <el-col :span="6" style="width: 400px; padding: 0 0 0 10px">
                 <el-input
                   clearable
                   placeholder="商品名称"
@@ -53,7 +53,7 @@
                   "
                 >
                 </el-input>
-              </el-col>
+              </el-col> -->
               <!-- <el-col :span="6" style="width: 150px; padding: 0 0 0 10px">
                 <el-input
                   clearable
@@ -69,19 +69,6 @@
                 >
                 </el-input>
               </el-col> -->
-
-              <el-col :span="4" style="width: 66px; float: right">
-                <el-button
-                  type="warning"
-                  class="fr"
-                  :size="searchSize"
-                  @click="restSearch"
-                >
-                  重置
-                </el-button>
-              </el-col>
-            </el-row>
-            <el-row>
               <el-col :span="6" style="width: 280px">
                 <el-input
                   clearable
@@ -97,7 +84,29 @@
                 >
                 </el-input>
               </el-col>
-              <el-col :span="6" style="width: 400px; padding: 0 0 0 10px">
+              <el-col :span="4" style="width: 66px; float: right">
+                <el-button
+                  type="warning"
+                  class="fr"
+                  :size="searchSize"
+                  @click="restSearch"
+                >
+                  重置
+                </el-button>
+              </el-col>
+              <el-col :span="3" style="width: 66px; float: right">
+                <el-button
+                  :size="searchSize"
+                  type="primary"
+                  style="float: right; margin-left: 5px"
+                  @click="searchList"
+                >
+                  刷新
+                </el-button>
+              </el-col>
+            </el-row>
+            <el-row>
+              <!-- <el-col :span="6" style="width: 400px; padding: 0 0 0 10px">
                 <el-input
                   clearable
                   placeholder="供应商名称"
@@ -111,7 +120,7 @@
                   "
                 >
                 </el-input>
-              </el-col>
+              </el-col> -->
               <!-- <el-col :span="6" style="width: 150px; padding: 0 0 0 10px">
                 <el-input
                   clearable
@@ -127,17 +136,6 @@
                 >
                 </el-input>
               </el-col> -->
-
-              <el-col :span="3" style="width: 66px; float: right">
-                <el-button
-                  :size="searchSize"
-                  type="primary"
-                  style="float: right; margin-left: 5px"
-                  @click="searchList"
-                >
-                  刷新
-                </el-button>
-              </el-col>
             </el-row>
           </div>
         </template>