同步代码

src/views/mallManagement/commodity/productList/configuration/specification.json

@@ -14,7 +14,12 @@
       "label": "规格",
       "prop": "cname",
       "minWidth": 100,
-      "span": 24
+      "span": 24,
+      "rules": [{
+        "required": true,
+        "message": " ",
+        "trigger": "blur"
+      }]
     },{
       "label": "商品名称",
       "prop": "goodsName",
@@ -129,9 +134,8 @@
       "span": 24
     },
     {
-      "label": "商城价",
-      "prop": "price",
-      "minWidth": 100,
+      "label": "零售价",
+      "prop": "marketPrice",
       "type": "number",
       "span": 24,
       "precision":2,
@@ -151,8 +155,9 @@
       }]
     },
     {
-      "label": "市场价",
-      "prop": "marketPrice",
+      "label": "渠道价",
+      "prop": "price",
+      "minWidth": 100,
       "type": "number",
       "span": 24,
       "precision":2,

src/views/mallManagement/commodity/productList/detailsPageEdit.vue

@@ -467,8 +467,10 @@ export default {
     rowUpdateBankOfDeposit(row, index, done, loading) {
       done(row);
     },
+
     //修改提交触发
     editProductInfo() {
+      if (this.sftData.length == 0) return this.$message.error('请录入商品规格');
       this.$refs["form"].validate((valid) => {
         //校验明细列表
         if (valid) {

src/views/orderManagement/orderList/config/mainList.json

@@ -21,7 +21,7 @@
     "overHidden": true
   },{
     "label": "下单人",
-    "prop": "userRealName",
+    "prop": "customerName",
     "search": true,
     "index": 2,
     "width": 100,
@@ -87,7 +87,7 @@
     "overHidden": true
   },{
     "label": "下单人手机号",
-    "prop": "createUser",
+    "prop": "customerPhone",
     "search": true,
     "index": 7,
     "width": 180,
@@ -100,34 +100,18 @@
     "width": 100,
     "overHidden": true
   },{
-    "label": "支付方式",
-    "prop": "createUser",
-    "type": "select",
-    "dicUrl": "/api/blade-system/dict-biz/dictionary?code=order_status",
-    "search": true,
-    "index": 9,
-    "width": 100,
-    "overHidden": true
-  },{
     "label": "收货人",
-    "prop": "createUser",
+    "prop": "consigneeName",
     "search": true,
     "index": 10,
     "width": 100,
     "overHidden": true
   },{
     "label": "收货人手机号",
-    "prop": "createUser",
+    "prop": "consigneePhone",
     "search": true,
     "index": 11,
     "width": 100,
     "overHidden": true
-  },{
-    "label": "订单来源",
-    "prop": "createUser",
-    "search": false,
-    "index": 12,
-    "width": 100,
-    "overHidden": true
   }]
 }

src/views/orderManagement/orderList/index.vue

@@ -38,9 +38,6 @@
             >查看
             </el-button>
           </template>
-<!--          <template slot="menuLeft" slot-scope="{size}">-->
-<!--            <el-button type="primary" :size="size" @click="exportExcel">自定义按钮</el-button>-->
-<!--          </template>-->
         </avue-crud>
       </basic-container>
     </div>
@@ -80,17 +77,6 @@ export default {
     }
   },
   methods: {
-    //导出
-    exportExcel() {
-      console.log(this.$export)
-      // this.$export.excel({
-      //   title: "商户pos机",
-      //   columns: [
-      //     { label: "金额", prop: "actualPrice" }
-      //   ],
-      //   data: this.dataList
-      // });
-    },
     // 选择卡切换
     changeTags(name) {
       if (this.tagsName == name) return