product_id to id

src/api/erp.js

@@ -52,7 +52,7 @@ export function erpGoods(data) {
   return request({
     url: "/erp/goods",
     method: "get",
-    data,
+    params:data,
   });
 }
 

src/api/systemAdmin.js

@@ -62,4 +62,38 @@ export function setShowApi (data) {
         url: `setting/set_status/${data.id}/${data.status}`,
         method: 'PUT'
     });
+};
+
+/**
+ * @description 获取收银台版本列表
+ * @param {Object} param data {Object} 传值
+ */
+export function getVersion (data) {
+    return request({
+        url: '/setting/version',
+        method: 'get',
+		  params: data
+    });
+};
+
+
+/**
+ * @description 收银台版本添加表单
+ */
+export function versionFromApi () {
+    return request({
+        url: '/setting/version/create',
+        method: 'get'
+    });
+};
+
+/**
+ * @description 收银台版本编辑表单
+ * @param {Number} param id {Number} 收银台版本id
+ */
+export function versionEditFromApi (id) {
+    return request({
+        url: `/setting/version/${id}/edit`,
+        method: 'get'
+    });
 };

src/pages/erp/purchase/addPurchase.vue

@@ -807,13 +807,18 @@
 			// 处理goods数据
 			handleGoods(list) {
 				let arr = []
-				let arr1 = JSON.parse(JSON.stringify(list))
+				let arr1 = JSON.parse(JSON.stringify(list)).map(item => {
+					item.product_id = item.id
+					return item
+				})
 				let uniqueArray = arr1.filter(function(item, index, self) {
 					return !self.slice(index + 1).some(function(otherItem) {
-						return item.product_id === otherItem.product_id && item.unit_type === otherItem
+						console.log(item.product_id,otherItem.product_id,item.unit_type,otherItem.unit_type);
+						return item.product_id == otherItem.product_id && item.unit_type == otherItem
 							.unit_type;
 					});
 				});
+				console.log(uniqueArray,'办处理',arr1);
 				arr = uniqueArray.map(item => {
 					let want = 0;
 					for (let i = 0; i < arr1.length; i++) {

src/pages/setting/systemAdmin/version.vue

@@ -0,0 +1,227 @@
+<template>
+<!-- 管理员列表 -->
+    <div>
+      <!-- <Card :bordered="false" dis-hover class="ivu-mt" :padding="0">
+			<div class="new_card_pd">
+                <Form ref="formValidate" :model="formValidate" inline 
+                :label-width="labelWidth" :label-position="labelPosition" 
+                @submit.native.prevent>
+                    <FormItem label="状态："  label-for="status1">
+                        <Select v-model="formValidate.status" placeholder="请选择" 
+                         clearable class="input-add">
+                            <Option value="">全部</Option>
+                            <Option value="1">开启</Option>
+                            <Option value="0">关闭</Option>
+                        </Select>
+                    </FormItem>
+                    <FormItem label="搜索："  label-for="status2">
+                        <Input placeholder="请输入姓名或者账号" 
+                        v-model="formValidate.name"
+                        class="input-add mr14"/>
+                        <Button @click="userSearchs()" type="primary">查询</Button>
+                    </FormItem>
+                </Form>
+			</div>
+		</Card> -->
+        <Card :bordered="false" dis-hover class="ivu-mt">
+            <Button v-auth="['setting-system_admin-add']" type="primary" @click="add">添加版本</Button>
+            <Table :columns="columns1" :data="list" class="mt25" no-userFrom-text="暂无数据"
+                   no-filtered-userFrom-text="暂无筛选结果"  :loading="loading" highlight-row>
+                <template slot-scope="{ row }" slot="roles">
+                    <div v-if="row.roles.length!==0">
+                        <Tag color="blue" v-for="(item,index) in row.roles.split(',')" :key="index" v-text="item"></Tag>
+                    </div>
+                </template>
+                <template slot-scope="{ row }" slot="status">
+                    <i-switch v-model="row.status" :value="row.status" :true-value="1" :false-value="0" @on-change="onchangeIsShow(row)" size="large">
+                        <span slot="open">开启</span>
+                        <span slot="close">关闭</span>
+                    </i-switch>
+                </template>
+                <template slot-scope="{ row, index }" slot="action">
+                    <a @click="edit(row)">编辑</a>
+                    <Divider type="vertical"/>
+                    <a @click="del(row,'删除管理员', index)">删除</a>
+                </template>
+            </Table>
+            <div class="acea-row row-right page">
+                <Page :total="total" :current="formValidate.page" show-elevator show-total @on-change="pageChange"
+                      :page-size="formValidate.limit"/>
+            </div>
+        </Card>
+       <!-- 添加 编辑 -->
+        <admin-from :FromData="FromData" ref="adminfrom" @submitFail="submitFail"></admin-from>
+    </div>
+</template>
+
+<script>
+    import { mapState } from 'vuex';
+    import { adminListApi, adminFromApi, adminEditFromApi, setShowApi,getVersion,versionFromApi,versionEditFromApi } from '@/api/systemAdmin';
+    import adminFrom from '../../../components/from/from';
+    export default {
+        name: 'systemAdmin',
+        components: { adminFrom },
+        data () {
+            return {
+                grid: {
+                    xl: 7,
+                    lg: 7,
+                    md: 12,
+                    sm: 24,
+                    xs: 24
+                },
+                total: 0,
+                loading: false,
+                roleData: {
+                    status1: ''
+                },
+                formValidate: {
+                    roles: '',
+                    status: '',
+                    name: '',
+                    page: 1, // 当前页
+                    limit: 20 // 每页显示条数
+                },
+                list: [],
+                columns1: [
+					{
+					    title: 'ID',
+					    key: 'id',
+					    minWidth: 80
+					},
+                    {
+                        title: '版本名称',
+                        key: 'version',
+                        minWidth: 120
+                    },
+                    {
+                        title: '版本号',
+                        key: 'version_code',
+                        minWidth: 150
+                    },
+                    {
+                        title: '更新内容',
+                        key: 'update_info',
+                        minWidth: 250
+                    },
+                    {
+                        title: '更新时间',
+                        key: 'add_time',
+                        minWidth: 180
+                    },
+                    {
+                        title: '操作',
+                        key: 'action',
+                        slot: 'action',
+                        fixed: 'right',
+                        minWidth: 120
+                    }
+                ],
+                FromData: null,
+                modalTitleSs: '',
+                ids: Number
+            }
+        },
+        computed: {
+            ...mapState('admin/layout', [
+                'isMobile'
+            ]),
+            labelWidth () {
+                return this.isMobile ? undefined : 96;
+            },
+            labelPosition () {
+                return this.isMobile ? 'top' : 'right';
+            }
+        },
+        created () {
+            this.getList();
+        },
+        methods: {
+            // 修改是否开启
+            onchangeIsShow (row) {
+                let data = {
+                    id: row.id,
+                    status: row.status
+                }
+                setShowApi(data).then(async res => {
+                    this.$Message.success(res.msg);
+                }).catch(res => {
+                    this.$Message.error(res.msg);
+                })
+            },
+            // 请求列表
+            submitFail () {
+                this.getList();
+            },
+            // 列表
+            getList () {
+                this.loading = true;
+                this.formValidate.roles = this.formValidate.roles || ''
+                getVersion(this.formValidate).then(async res => {
+                    this.total = res.data.count;
+                    this.list = res.data.list;
+                    this.loading = false;
+                }).catch(res => {
+                    this.loading = false;
+                    this.$Message.error(res.msg);
+                })
+            },
+            pageChange (index) {
+                this.formValidate.page = index
+                this.getList();
+            },
+            // 添加表单
+            add () {
+                versionFromApi().then(async res => {
+                    this.FromData = res.data;
+                    this.$refs.adminfrom.modals = true;
+                }).catch(res => {
+                    this.$Message.error(res.msg);
+                })
+            },
+            // 编辑
+            edit (row) {
+                versionEditFromApi(row.id).then(async res => {
+                    if (res.data.status === false) {
+                        return this.$authLapse(res.data);
+                    }
+                    this.FromData = res.data;
+                    this.$refs.adminfrom.modals = true;
+                }).catch(res => {
+                    this.$Message.error(res.msg);
+                })
+            },
+            // 删除
+            del (row, tit, num) {
+                let delfromData = {
+                    title: tit,
+                    num: num,
+                    url: `setting/version/${row.id}`,
+                    method: 'DELETE',
+                    ids: ''
+                };
+                this.$modalSure(delfromData).then((res) => {
+                    this.$Message.success(res.msg);
+                    this.list.splice(num, 1);
+                    if (!this.list.length) {
+                      this.formValidate.page =
+                          this.formValidate.page == 1 ? 1 : this.formValidate.page - 1;
+                    }
+                    this.getList();
+                }).catch(res => {
+                    this.$Message.error(res.msg);
+                });
+            },
+            // 表格搜索
+            userSearchs () {
+                this.formValidate.page = 1;
+                this.list = [];
+                this.getList();
+            }
+        }
+    }
+</script>
+
+<style scoped>
+
+</style>

src/router/modules/setting.js

@@ -105,6 +105,15 @@ export default {
             },
             component: () => import('@/pages/setting/systemAdmin/index')
         },
+		{
+		    path: 'system_admin/version',
+		    name: `${pre}systemAdmin`,
+		    meta: {
+		        auth: ['setting-system-version'],
+		        title: '版本列表'
+		    },
+		    component: () => import('@/pages/setting/systemAdmin/version')
+		},
         {
             path: 'system_menus/index',
             name: `${pre}systemMenus`,