xiaodai2022 2 سال پیش
والد
کامیت
cf529abf7a

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/0.js


+ 28 - 11
src/views/goodStore/goodsCost/components/addEdit.vue

@@ -63,11 +63,7 @@
               min-width="100"
               show-overflow-tooltip
             />
-            <el-table-column
-              prop="brand_name"
-              label="品牌"
-              show-overflow-tooltip
-            />
+            <el-table-column prop="brand_name" label="品牌" show-overflow-tooltip />
             <el-table-column
               prop="good_type"
               label="定制"
@@ -79,8 +75,8 @@
                   :size="'mini'"
                   :type="scope.row.good_type == '1' ? '' : 'warning'"
                   v-text="
-                    (options1.find((item) => item.id == scope.row.status) || {})
-                      .name || '--'
+                    (options1.find((item) => item.id == scope.row.status) || {}).name ||
+                    '--'
                   "
                 ></el-tag>
               </template>
@@ -294,9 +290,7 @@ export default {
                 const { speclist } = v;
                 let str = "<span>";
                 speclist.forEach((a, ai) => {
-                  str += `${ai !== 0 ? "--" : ""}${a.spec_name}[${
-                    a.spec_value
-                  }]`;
+                  str += `${ai !== 0 ? "--" : ""}${a.spec_name}[${a.spec_value}]`;
                 });
                 htmlList += str + "</span>" + `</li>`;
               });
@@ -306,6 +300,29 @@ export default {
                 dangerouslyUseHTMLString: true,
                 message: htmlList,
               });
+            } else if (code === 1010) {
+              let resList = JSON.parse(JSON.stringify(data));
+
+              let htmlList = "<ul>";
+              resList.forEach((v) => {
+                htmlList += `<li>
+          <img src='${v.good_img}' style='width: 20px; height: 20px'
+                  class='hover'
+                  v-viewer/>
+                  <span>${v.good_name}__</span>`;
+                const { speclist } = v;
+                let str = "<span>";
+                speclist.forEach((a, ai) => {
+                  str += `${ai !== 0 ? "--" : ""}${a.spec_name}[${a.spec_value}]`;
+                });
+                htmlList += str + "</span>" + `</li>`;
+              });
+              htmlList += "</ul>";
+              this.$notify({
+                title: "该平台要求商品必须要有一件的成本!",
+                dangerouslyUseHTMLString: true,
+                message: htmlList,
+              });
             } else {
               this.$message.warning(res.message);
             }
@@ -320,7 +337,7 @@ export default {
 };
 </script>
 
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .brand {
 }
 </style>

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

@@ -179,6 +179,7 @@
         v-show="ruleForm.exam_status === '1'"
         style="padding: 0 0 10px 0"
       >
+        <!-- @current-change="handleCurrentChange" -->
         <el-table
           :data="nakelist"
           :size="'mini'"
@@ -186,7 +187,6 @@
           stripe
           highlight-current-row
           ref="singleTable"
-          @current-change="handleCurrentChange"
         >
           <el-table-column label="系统阶梯" width="80px">
             <template slot-scope="scope">
@@ -200,7 +200,7 @@
           <el-table-column label="销售">
             <el-table-column prop="start_sale_num" label="起订量">
               <template slot-scope="scope">
-                <digital-input
+                <!-- <digital-input
                   v-show="scope.row.edit"
                   :values="scope.row.start_sale_num"
                   :placeholder="'起订量'"
@@ -215,7 +215,8 @@
                   :disabled="false"
                   @reschange="num_change($event, 'start_sale_num', scope.$index)"
                 />
-                <span v-show="!scope.row.edit">
+                v-show="!scope.row.edit" -->
+                <span>
                   {{ scope.row.start_sale_num }}
                 </span>
               </template>
@@ -469,6 +470,7 @@ export default {
         this.$set(this.nakelist, sii, this.nakelist[sii]);
       });
       this.setCurrent(this.nakelist[0]);
+      this.handleCurrentChange(this.nakelist[0]);
       this.loading = false;
     },
     item_auto_change() {

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است