新增商家端页面

src/components/ReturnSalesHeader/ReturnSalesHeader.vue

@@ -1,13 +1,80 @@
 <template>
-$END$
+  <div class="sales">
+    <div class="diy-table-1">
+      <el-row>
+        <el-col :span="8" class="item">
+          <div class="label">销售订单号</div>
+          <div class="value">
+            <el-input v-model="details.code"  placeholder="引用销售单"></el-input>
+          </div>
+        </el-col>
+        <el-col :span="16" class="item">
+          <div class="label">退货订单号</div>
+          <div class="value">2222</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">商家编号</div>
+          <div class="value">2222</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">商家名称</div>
+          <div class="value">2222</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">配送日期</div>
+          <div class="value">2222</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">用户名称</div>
+          <div class="value">2222</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">用户电话</div>
+          <div class="value">2222</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">备注</div>
+          <div class="value">2222</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">地址</div>
+          <div class="value">2222</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">发货仓库编码</div>
+          <div class="value">2222</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">发货仓库名称</div>
+          <div class="value">2222</div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">退货备注</div>
+          <div class="value">2222</div>
+        </el-col>
+      </el-row>
+    </div>
+  </div>
 </template>
 
 <script>
 export default {
-name: "ReturnSalesHeader"
+  name: 'ReturnSalesHeader',
+  props: {
+    details: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  }
 }
 </script>
 
 <style scoped>
-
+.sales {
+  margin: 20px;
+  padding: 20px;
+  box-shadow: 0 0 8px 0 rgb(0 0 0 / 20%);
+}
 </style>

src/components/ReturnSalesTable/ReturnSalesTable.vue

@@ -1,10 +1,10 @@
 <template>
-$END$
+  <div></div>
 </template>
 
 <script>
 export default {
-name: "ReturnSalesTable"
+  name: 'ReturnSalesTable'
 }
 </script>
 

src/components/SalesDialog/SalesDialog.vue

@@ -1,10 +1,188 @@
 <template>
-$END$
+  <div>
+    <el-dialog
+      title="添加产品"
+      :visible.sync="dialogVisible"
+      width="75%"
+      :before-close="handleClose"
+    >
+      <div>
+        <el-form label-position="left" label-width="80px" :model="screenForm">
+          <el-form-item label="名称">
+            <el-input v-model="screenForm.name"></el-input>
+          </el-form-item>
+          <el-form-item label="活动区域">
+            <el-input v-model="screenForm.region"></el-input>
+          </el-form-item>
+          <el-form-item label="活动形式">
+            <el-input v-model="screenForm.type"></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div>
+        <el-table
+          :data="dataList"
+          style="width: 100%"
+          v-bind="tableAttributes"
+        >
+          <el-table-column
+            v-if="isSelection"
+            type="selection"
+            width="55"
+          >
+          </el-table-column>
+          <el-table-column
+            v-if="isIndex"
+            type="index"
+            width="50"
+          >
+          </el-table-column>
+          <el-table-column
+            v-for="(item,index) in column"
+            :key="index"
+            v-bind="{...item,...columnAttributes}"
+          >
+            <template v-slot="{row}">
+              <template v-if="item.isInput">
+                {{ row.prop }}
+              </template>
+              <template v-else>
+                <el-input
+                  v-model.number="row.prop"
+                  class="yinput"
+                  :type="item.type?item.type:'number'"
+                  :placeholder="item.placeholder"
+                  size="mini"
+                  @mousewheel.native.prevent
+                />
+              </template>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="isOperation" fixed="left" label="操作" min-width="250" align="center">
+            <slot>
+              <template v-slot="{row}">
+                <el-popconfirm
+                  style="margin-left: 10px"
+                  title="删除？"
+                  @onConfirm="handleDel(row)"
+                >
+                  <el-button slot="reference" type="text" size="mini">提审</el-button>
+                </el-popconfirm>
+              </template>
+            </slot>
+          </el-table-column>
+        </el-table>
+
+      </div>
+      <div class="pagination clearfix">
+        <div class="fr">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-sizes="[10, 20, 30, 50]"
+            :page-size="10"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="listTotal"
+          >
+          </el-pagination>
+        </div>
+      </div>
+
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 export default {
-name: "SalesDialog"
+  name: 'SalesDialog',
+  props: {
+    isShow: {
+      type: Boolean,
+      default: false
+    },
+    screenForm: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    isSelection: {
+      type: Boolean,
+      default: false
+    },
+    isIndex: {
+      type: Boolean,
+      default: false
+    },
+    isOperation: {
+      type: Boolean,
+      default: false
+    },
+    tableAttributes: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    columnAttributes: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    dataList: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      column: [
+        {
+          prop: 'date',
+          label: '日期'
+        },
+        {
+          prop: 'date',
+          label: '日期'
+
+        },
+        {
+          prop: 'date',
+          label: '日期'
+
+        }
+      ],
+      currentPage: 1,
+      listTotal: 0
+    }
+  },
+  created() {
+    this.dialogVisible = this.isShow
+  },
+  methods: {
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done()
+        })
+        .catch(_ => {
+        })
+    },
+    handleDel(row) {
+      console.log(row)
+    },
+    handleSizeChange() {
+
+    },
+    handleCurrentChange() {
+
+    }
+  }
 }
 </script>
 

src/components/SalesTable/SalesTable.vue

@@ -1,11 +1,13 @@
 <template>
   <div class="sales">
-    <h5>销售订单明细</h5>
+    <slot name="title">
+      <h5>销售订单明细</h5>
+    </slot>
     <slot name="bts">
-      <div>
-        <el-button type="primary" size="mini">添加</el-button>
-        <el-button type="danger" size="mini">删除</el-button>
-      </div>
+<!--      <div>-->
+<!--        <el-button type="primary" size="mini">添加</el-button>-->
+<!--        <el-button type="danger" size="mini">删除</el-button>-->
+<!--      </div>-->
     </slot>
     <div class="table">
       <el-table
@@ -62,47 +64,51 @@
       </el-table>
     </div>
     <slot />
-    <div>
-      <h5>物流信息</h5>
-      <div class="diy-table-1">
-        <el-row>
-          <el-col :span="6" class="item">
-            <div class="label">销售政策编号</div>
-            <div class="value">2222</div>
-          </el-col>
-          <el-col :span="6" class="item">
-            <div class="label">销售政策编号</div>
-            <div class="value">2222</div>
-          </el-col>
-          <el-col :span="6" class="item">
-            <div class="label">销售政策编号</div>
-            <div class="value">2222</div>
-          </el-col>
-          <el-col :span="6" class="item">
-            <div class="label">销售政策编号</div>
-            <div class="value">2222</div>
-          </el-col>
-          <el-col :span="6" class="item">
-            <div class="label">销售政策编号</div>
-            <div class="value">2222</div>
-          </el-col>
-        </el-row>
-      </div>
-      <el-timeline :reverse="reverse">
-        <el-timeline-item
-          v-for="(activity, index) in activities"
-          :key="index"
-          :timestamp="activity.timestamp"
-          :color="activity.color"
-        >
-          {{ activity.content }}
-        </el-timeline-item>
-      </el-timeline>
-    </div>
+<!--    <div>-->
+<!--      <h5>物流信息</h5>-->
+<!--      <div class="diy-table-1">-->
+<!--        <el-row>-->
+<!--          <el-col :span="6" class="item">-->
+<!--            <div class="label">销售政策编号</div>-->
+<!--            <div class="value">2222</div>-->
+<!--          </el-col>-->
+<!--          <el-col :span="6" class="item">-->
+<!--            <div class="label">销售政策编号</div>-->
+<!--            <div class="value">2222</div>-->
+<!--          </el-col>-->
+<!--          <el-col :span="6" class="item">-->
+<!--            <div class="label">销售政策编号</div>-->
+<!--            <div class="value">2222</div>-->
+<!--          </el-col>-->
+<!--          <el-col :span="6" class="item">-->
+<!--            <div class="label">销售政策编号</div>-->
+<!--            <div class="value">2222</div>-->
+<!--          </el-col>-->
+<!--          <el-col :span="6" class="item">-->
+<!--            <div class="label">销售政策编号</div>-->
+<!--            <div class="value">2222</div>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--      </div>-->
+<!--      <el-timeline :reverse="reverse">-->
+<!--        <el-timeline-item-->
+<!--          v-for="(activity, index) in activities"-->
+<!--          :key="index"-->
+<!--          :timestamp="activity.timestamp"-->
+<!--          :color="activity.color"-->
+<!--        >-->
+<!--          {{ activity.content }}-->
+<!--        </el-timeline-item>-->
+<!--      </el-timeline>-->
+<!--    </div>-->
     <slot name="events">
       <div>
-        <el-button type="primary" size="mini">保存</el-button>
+<!--        <el-button type="primary" size="mini">保存</el-button>-->
+<!--        <el-button size="mini">重置</el-button>-->
+        <el-button type="primary" size="mini">提交</el-button>
         <el-button size="mini">重置</el-button>
+        <el-button size="mini">通知退货</el-button>
+
       </div>
     </slot>
   </div>

src/views/sales/sales_management/components/customer_sales_details.vue

@@ -1,10 +1,10 @@
 <template>
-$END$
+
 </template>
 
 <script>
 export default {
-name: "customer_sales_details"
+  name: 'customer_sales_details'
 }
 </script>
 

src/views/sales/sales_management/components/customer_sales_form.vue

@@ -1,10 +1,10 @@
 <template>
-$END$
+  <div></div>
 </template>
 
 <script>
 export default {
-name: "customer_sales_form"
+  name: 'CustomerSalesForm'
 }
 </script>
 

src/views/sales/sales_management/components/return_sales_details.vue

@@ -1,10 +1,10 @@
 <template>
-$END$
+    <div></div>
 </template>
 
 <script>
 export default {
-name: "return_sales_details"
+  name: 'ReturnSalesDetails'
 }
 </script>
 

src/views/sales/sales_management/components/return_sales_form.vue

@@ -1,10 +1,12 @@
 <template>
-$END$
+  <div>
+
+  </div>
 </template>
 
 <script>
 export default {
-name: "return_sales_form"
+  name: 'ReturnSalesForm'
 }
 </script>
 

src/views/sales/sales_management/return_sales_list.vue

@@ -1,22 +1,29 @@
 <template>
   <div>
-    <zj-page-template
-      :getTableData="getTableData"
-      :optionsEvens="evens"
-      :tableAttributes="tableAttributes"
-      :tableEvents="tableEvents"
-      :columnParsing="columnParsing"
-      :plan="plan"
-      @columnWidthChange="columnWidthChange"
-      @columnListChange="columnListChange"
-    />
+    <!--    <zj-page-template-->
+    <!--      :getTableData="getTableData"-->
+    <!--      :optionsEvens="evens"-->
+    <!--      :tableAttributes="tableAttributes"-->
+    <!--      :tableEvents="tableEvents"-->
+    <!--      :columnParsing="columnParsing"-->
+    <!--      :plan="plan"-->
+    <!--      @columnWidthChange="columnWidthChange"-->
+    <!--      @columnListChange="columnListChange"-->
+    <!--    />-->
+    <return-sales-header />
+    <sales-table/>
   </div>
 </template>
 
 <script>
 import tableDataJson from './components/tableData'
-
+import ReturnSalesHeader from '@/components/ReturnSalesHeader/ReturnSalesHeader'
+import salesTable from '@/components/SalesTable/SalesTable'
 export default {
+  components: {
+    ReturnSalesHeader,
+    salesTable
+  },
   data() {
     return {
       // 按钮集合