Forráskód Böngészése

供货商和商品管理接口对接

zhangdan 4 éve
szülő
commit
027433d091

+ 6 - 6
src/api/shopSetting.js

@@ -19,7 +19,7 @@ export const changeGoodsStatus = (params) => {
   const url = `goodsType/enable/${params.id}/${params.flag}`
   return axios({
     url: url,
-    data: {},
+    data: params,
     method: 'get'
   })
 }
@@ -29,7 +29,7 @@ export const goodsClassDetails = (params) => {
   const url = `goodsType/findById/${params.id}`
   return axios({
     url: url,
-    data: {},
+    data: params,
     method: 'get'
   })
 }
@@ -48,7 +48,7 @@ export const saveGoodsClass = (params) => {
 
 // 列表
 export const getSupplierList = (params) => {
-  const url = `partner/query/${params.pageNo}/${params.pageSize}`
+  const url = `supplier/query/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -60,7 +60,7 @@ export const getSupplierList = (params) => {
 
 // 启用禁用
 export const changeSupplierStatus = (params) => {
-  const url = `partner/enable/${params.id}/${params.flag}`
+  const url = `supplier/enable/${params.id}/${params.flag}`
   return axios({
     url: url,
     data: {},
@@ -70,7 +70,7 @@ export const changeSupplierStatus = (params) => {
 
 // 详情
 export const supplierDetails = (params) => {
-  const url = `partner/findById/${params.id}`
+  const url = `supplier/findById/${params.id}`
   return axios({
     url: url,
     data: {},
@@ -80,7 +80,7 @@ export const supplierDetails = (params) => {
 
 // 编辑/保存
 export const saveSupplier = (params) => {
-  const url = `partner/save`
+  const url = `supplier/save`
   return axios({
     url: url,
     data: params,

+ 215 - 2
src/views/releaseRecord/releaseRecordList.vue

@@ -1,8 +1,221 @@
 <template>
+  <a-card :bordered="false" class="shopOrder-table-page-search-wrapper">
+    <div class="shopOrder-searchForm">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="48">
+          <a-col :span="6">
+            <a-form-item label="投递时间" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+              <a-range-picker
+                id="shopOrder-time"
+                v-model="time"
+                :format="dateFormat"
+                :placeholder="['开始时间','结束时间']"
+                :disabledDate="disabledDate"
+                @change="onChange" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="设备编号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+              <a-input id="shopOrder-orderNo" allowClear :maxLength="30" v-decorator="[ 'queryParam.orderNo', { initialValue: queryParam.orderNo, getValueFromEvent: $filterEmpty, rules: [] }]" placeholder="请输入设备编号" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="网点名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+              <v-select
+                v-model="queryParam.orderStatus"
+                ref="orderStatus"
+                id="shopOrder-status"
+                code="SETTLE_STATUS_ALL"
+                placeholder="请选择"
+                allowClear></v-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-button class="handle-btn serach-btn" id="shopOrder-btn-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+            <a-button class="handle-btn" type="" id="shopOrder-btn-reset" @click="handleReset">重置</a-button>
+          </a-col>
+        </a-row>
+        <a-row :gutter="48">
+          <a-col :span="6">
+            <a-form-item label="用户账号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+              <a-input id="shopOrder-contactPhone" allowClear :maxLength="11" v-decorator="[ 'queryParam.contactPhone', { initialValue: queryParam.contactPhone, getValueFromEvent: $filterEmpty, rules: [] }]" placeholder="请输入用户账号" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 合计 -->
+    <a-alert type="info" showIcon style="margin-bottom:15px">
+      <div class="ftext" slot="message">共<span>{{ orderTotal }}</span>单,实收<span>¥{{ amountTotal }}</span>元</div>
+    </a-alert>
+    <s-table
+      ref="table"
+      size="default"
+      :rowKey="(record) => record.id"
+      :columns="columns"
+      :data="loadData"
+      bordered>
+      <!-- 订单状态 -->
+      <!-- <template slot="orderStatus" slot-scope="text, record">
+        <span>{{ record.orderStatus==1 ? '已启用' : '已禁用' }}</span>
+      </template> -->
+      <!-- 订单总额 -->
+      <template slot="orderPrice" slot-scope="text, record">
+        <span>{{ record.orderPrice || 0 }}乐豆</span>
+      </template>
+      <!-- 操作 -->
+      <!-- <template slot="action" slot-scope="text, record">
+        <a-icon type="eye" id="shopOrder-handleView" title="详情" class="actionBtn icon-green" @click="handleView(record)" />
+      </template> -->
+    </s-table>
+  </a-card>
+
 </template>
 
 <script>
+import { STable, VSelect } from '@/components'
+import getDate from '@/libs/getDate.js'
+import moment from 'moment'
+export default {
+  name: 'ShopOrder',
+  components: { STable, VSelect },
+  data () {
+    return {
+      form: this.$form.createForm(this),
+      formItemLayout: {
+        labelCol: { span: 4 },
+        wrapperCol: { span: 16 }
+      },
+      // 查询参数
+      queryParam: {
+        beginDate: null, // 开始时间
+        endDate: null, // 结束时间
+        contactPhone: '', //  用户手机
+        orderNo: '', //  订单编号
+        orderStatus: null // 订单状态
+      },
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '投放时间', dataIndex: 'orderDate', width: 200, align: 'center' },
+        { title: '网点名称', dataIndex: 'userMoblie', width: 200, align: 'center' },
+        { title: '设备编号', dataIndex: 'orderNo', width: 200, align: 'center' },
+        { title: '用户账号', scopedSlots: { customRender: 'orderStatus' }, width: 200, align: 'center' },
+        { title: '本次兑换乐豆(个)', scopedSlots: { customRender: 'orderPrice' }, width: 200, align: 'center' },
+        { title: '1号箱(g)', width: 200, align: 'center' },
+        { title: '2号箱(g)', width: 200, align: 'center' },
+        { title: '3号箱(g)', width: 200, align: 'center' },
+        { title: '4号箱(g)', width: 200, align: 'center' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        // return getTenantsList(Object.assign(parameter, this.queryParam)).then(res => {
+        //   if (res.status == 200) {
+        //     const no = (res.data.pageNo - 1) * res.data.pageSize
+        //     for (let i = 0; i < res.data.list.length; i++) {
+        //       const _item = res.data.list[i]
+        //       _item.no = no + i + 1
+        //       _item.status = _item.status + '' === '1'
+        //     }
+        //     return res.data
+        //   }
+        // })
+        return new Promise((resolve) => {
+          const data = [
+            { no: 1, orderDate: '2020-10-30 09:14', userMoblie: '15709252525', orderNo: 'NO54456798', orderStatus: '1', orderPrice: '155' },
+            { no: 2, orderDate: '2020-10-30 09:14', userMoblie: '15709252525', orderNo: 'NO54456798', orderStatus: '0', orderPrice: '155' },
+            { no: 3, orderDate: '2020-10-30 09:14', userMoblie: '15709252525', orderNo: 'NO54456798', orderStatus: '1', orderPrice: '155' },
+            { no: 4, orderDate: '2020-10-30 09:14', userMoblie: '15709252525', orderNo: 'NO54456798', orderStatus: '1', orderPrice: '155' },
+            { no: 5, orderDate: '2020-10-30 09:14', userMoblie: '15709252525', orderNo: 'NO54456798', orderStatus: '0', orderPrice: '155' },
+            { no: 6, orderDate: '2020-10-30 09:14', userMoblie: '15709252525', orderNo: 'NO54456798', orderStatus: '0', orderPrice: '155' }
+          ]
+          resolve(data)
+        })
+      },
+      // 将默认当天时间日期回显在时间选择框中
+      time: [
+        moment(getDate.getToday().starttime, this.dateFormat),
+        moment(getDate.getToday().endtime, this.dateFormat)
+      ],
+      dateFormat: 'YYYY-MM-DD'
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.handleReset()
+    })
+  },
+  methods: {
+    moment,
+    // 不可选日期
+    disabledDate (date, dateStrings) {
+      return date && date.valueOf() > Date.now()
+    },
+    // 创建时间change
+    onChange (dates, dateStrings) {
+      if ((dates, dateStrings)) {
+        this.queryParam.beginDate = dateStrings[0]
+        this.queryParam.endDate = dateStrings[1]
+      }
+    },
+    //  查看详情
+    // handleView (row) {
+    //   this.$router.push({ path: `/shop/order/detail/${row.no}` })
+    // },
+    // 重置
+    handleReset () {
+      this.queryParam.beginDate = getDate.getToday().starttime
+      this.queryParam.endDate = getDate.getToday().endtime
+      this.time = [
+        moment(getDate.getToday().starttime, this.dateFormat),
+        moment(getDate.getToday().endtime, this.dateFormat)
+      ]
+      this.queryParam.contactPhone = ''
+      this.queryParam.orderNo = ''
+      this.queryParam.orderStatus = null
+      this.$refs.table.refresh(true)
+    }
+  }
+}
 </script>
-
-<style>
+<style lang="less" scoped>
+  .shopOrder-table-page-search-wrapper{
+    .shopOrder-searchForm{
+      .ant-form-inline .ant-form-item{
+        width: 100%;
+      }
+      // 搜索框的下间距
+      .ant-form-item {
+      	margin-bottom: 10px;
+      }
+      .handle-btn{
+        margin-bottom: 15px;
+      }
+      .serach-btn{
+        margin-right: 10px;
+      }
+    }
+    .export-btn{
+      background-color: #ff9900;
+      border-color: #ff9900;
+      color: #fff;
+    }
+    .export-btn.ant-btn:focus:not(.ant-btn-primary):not(.ant-btn-danger), .export-btn.ant-btn:hover:not(.ant-btn-primary):not(.ant-btn-danger){
+      color: #fff;
+      border-color: #ff9900;
+    }
+    .actionBtn {
+    	font-size: 20px;
+    	padding: 0 10px;
+    }
+    .blue {
+    	color: #1890FF;
+    }
+    .green {
+    	color: #16b50e;
+    }
+    .red {
+    	color: red;
+    }
+  }
 </style>

+ 84 - 129
src/views/shopSetting/addGoodsClassModal.vue

@@ -3,35 +3,29 @@
     <!-- 新增编辑商品分类弹窗 -->
     <a-modal
       v-model="isShow"
-      @cancle="cancel"
+      @cancle="isShow=false"
       :footer="null"
       width="60%"
       :centered="true"
       :title="titleText">
-      <a-form
-        id="components-form-demo-validate-other"
-        ref="form"
-        v-bind="formItemLayout"
-        @submit="handleSubmit"
-      >
+      <a-form id="components-form-demo-validate-other" :form="form" ref="form" v-bind="formItemLayout" @submit="handleSubmit">
         <a-form-item label="商品分类名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
           <a-input
             id="addGoodsClassModal-name"
             :maxLength="30"
             v-decorator="['formData.name', { initialValue: formData.name,getValueFromEvent: $filterEmpty, rules: [{ required: true, message: '请输入供应商名称(最多30个字符)!' }] }]"
-            :disabled="disabled"
             placeholder="请输入商品名称(最多30个字符)"
-            allowClear
-          />
+            allowClear />
         </a-form-item>
-        <a-form-item label="是否限制订单起购金额" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-          <v-select
-            v-model="formData.isGoldLimit"
-            ref="isGoldLimit"
-            id="addGoodsClassModal-isGoldLimit"
-            code="SETTLE_STATUS_ALL"
-            placeholder="请选择"
-            allowClear></v-select>
+        <a-form-item label="商城主页显示数量" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+          <a-input-number
+            id="addGoodsClassModal-popularizeGoodsLimit"
+            class="inpNumber"
+            :min="0"
+            :max="999999"
+            v-decorator="[ 'formData.popularizeGoodsLimit', { initialValue: formData.popularizeGoodsLimit, rules: [{ required: true, message: '请输入商城主页显示数量(0~999999)' }] } ]"
+            placeholder="请输入商城主页显示数量(0~999999)"
+            allowClear />
         </a-form-item>
         <a-form-item label="订单起购金额" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
           <a-input-number
@@ -45,29 +39,17 @@
             allowClear />
           <span class="inp-unit">乐豆</span>
         </a-form-item>
-        <!-- <a-form-item label="状态" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-          <a-radio-group
-            :disabled="disabled"
-            id="addGoodsClassModal-status"
-            v-decorator="['formData.status', { initialValue: formData.status, rules: [{ required: true, message: '请选择状态!' }] }]"
-          >
-            <a-radio value="1">启用</a-radio>
-            <a-radio value="0">禁用</a-radio>
-          </a-radio-group>
-        </a-form-item> -->
         <a-form-item label="备注" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
           <a-textarea
             :maxLength="500"
             v-decorator="['formData.remarks', { initialValue: formData.remarks, rules: [{ required: false, message: '请输入备注内容(最多500个字符)!' }] }]"
-            :disabled="disabled"
             id="addGoodsClassModal-remarks"
             placeholder="请输入备注内容(最多500个字符)"
-            allowClear
-          />
+            allowClear />
         </a-form-item>
         <a-form-item :wrapper-col="{ span: 12, offset: 6}" style="text-align: center;">
-          <a-button type="primary" html-type="submit" v-if="!disabled" id="bannerSetting-submit" style="margin-right: 15px">保存</a-button>
-          <a-button @click="close()" v-if="!disabled" style="margin-left: 15px" id="bannerSetting-close">取消</a-button>
+          <a-button type="primary" html-type="submit" id="bannerSetting-submit" style="margin-right: 15px">保存</a-button>
+          <a-button @click="isShow=false" style="margin-left: 15px" id="bannerSetting-close">取消</a-button>
         </a-form-item>
       </a-form>
     </a-modal>
@@ -75,15 +57,27 @@
 </template>
 
 <script>
-import { VSelect } from '@/components'
-import { saveGoodsClass } from '@/api/shopSetting.js'
+import {
+  VSelect
+} from '@/components'
+import {
+  goodsClassDetails,
+  saveGoodsClass
+} from '@/api/shopSetting.js'
 export default {
-  components: { VSelect },
+  name: 'AddGoodsClassModal',
+  components: {
+    VSelect
+  },
   props: {
     openGoodClassModal: {
       type: Boolean,
       default: false
     },
+    itemId: {
+      type: String,
+      default: ''
+    },
     itemData: {
       type: Object,
       default: function () {
@@ -91,129 +85,90 @@ export default {
       }
     }
   },
+
   data () {
     return {
       formItemLayout: {
-	  labelCol: {
+        labelCol: {
           span: 6
-	  },
-	  wrapperCol: {
+        },
+        wrapperCol: {
           span: 14
-	  }
+        }
       },
       isShow: this.openGoodClassModal,
       titleText: '新增',
-      closable: true,
-      visible: false,
-      confirmLoading: false,
       formLayout: 'horizontal',
-      // hideRequiredMark: false, // 是否显示必填的* 默认显示
+      form: this.$form.createForm(this, { name: 'addGoodsClassModal' }),
       formData: {
-		  name: '', // 分类名称
-		  isGoldLimit: '', // 是否限制订单起购金额
-		  goldLimit: '', // 限制金额
-		  remarks: '' // 备注
-      },
-      bannerType: 'app',
-      disabled: false,
-      value: '',
-      id: ''
+        name: '', // 分类名称
+        goldLimit: '', // 限制金额
+        remarks: '', // 备注
+        popularizeGoodsLimit: ''
+      }
     }
   },
   methods: {
-	  // 关闭弹窗
-	  cancel (e) {
-      this.close()
-	  	this.$emit('close')
-	  },
-    close () {
-	  this.visible = false
-	  this.formData.name = ''
-	  this.photo = ''
-	  this.formData.url = ''
-	  this.formData.status = ''
-	  this.formData.sort = ''
-	  this.formData.position = ''
-	  this.formData.photoBasePath = ''
-	  this.formData.photoPath = ''
-	  this.title = '新增'
-	  // this.$refs.bannerImage.setFileList('')
-	  // this.form.resetFields()
-    },
-    // 赋值
-    assignment (row) {
-
+    // 查看详情
+    getPageInfo () {
+      const _this = this
+      goodsClassDetails({
+        id: _this.itemId
+      }).then(res => {
+		  if (res.status == 200) {
+			  this.form.setFieldsValue({ 'formData': res.data })
+		  }
+      })
     },
     // 点击保存;
     handleSubmit (e) {
-	  e.preventDefault()
-	  const _this = this
-	  this.form.validateFields((err, values) => {
-	    if (!err) {
-	      // console.log('Received values of form: ', values, this.formData)
-	      // const formData = Object.assign({}, this.formData, values.formData)
-	      // console.log(formData, _this.radioGroup)
-	      // saveGoodsClass(formData, _this.radioGroup).then(res => {
-	      //   console.log(res, 'rrrrrrrrr')
-	      //   if (res.status == 200) {
-	      //     _this.$message.success(res.message)
-	      //     _this.$refs.table.refresh()
-	      //     _this.close()
-	      //   }
-	      // })
-	    }
-	  })
+      e.preventDefault()
+      const _this = this
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          const formData = Object.assign({}, this.itemData, this.formData, values.formData)
+		  formData.id = _this.itemId
+          saveGoodsClass(formData).then(res => {
+            console.log(res, 'rrrrrrrrr')
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+			  _this.$emit('refresh')
+              setTimeout(function () {
+                _this.isShow = false
+              }, 300)
+            }
+          })
+        }
+      })
     }
   },
   watch: {
     openGoodClassModal (newValue, oldValue) {
       this.isShow = newValue
+	  console.log(this.isShow)
     },
-    // isShow(val) {
-    // 	if (!val) {
-    // 		this.$emit('close')
-    // 	}
-
-    // },
-    isShow (newValue, oldValue) {
-	  if (newValue) {
-	    if (this.itemData.id) { // 编辑
-	      this.titleText = '编辑'
-	      // this.formData = Object.assign({}, this.itemData)
-	      // delete this.formData.no
-	      // let roleNames = this.formData.roleNames
-	      // if (roleNames) {
-	      //   roleNames = roleNames.split(',')
-	      //   const arr = []
-	      //   roleNames.map(item => {
-	      //     const row = this.roleList.find(a => {
-	      //       return a.name == item
-	      //     })
-	      //     if (row) {
-	      //       arr.push(row.id)
-	      //     }
-	      //   })
-	      //   this.formData.roleNames = arr
-	      // } else {
-	      //   this.formData.roleNames = []
-	      // }
-	      // this.formData.loginFlag = Number(this.formData.loginFlag)
-	    } else {
-	      this.titleText = '新增'
-	    }
+    isShow (val) {
+	  if (!val) {
+	    this.$emit('close')
 	  } else {
-	    this.cancel()
+		  this.form.resetFields()
 	  }
     },
-    itemData () {
-
+    itemId (newValue, oldValue) {
+      console.log(newValue, '----------id')
+      if (newValue && this.isShow) {
+        this.titleText = '编辑'
+        this.getPageInfo(newValue)
+      } else {
+		  this.titleText = '新增'
+	  }
     }
   }
 }
 </script>
 
 <style lang="less">
-	.inpNumber{
-		width:100%
+	.inpNumber {
+		width: 100%
 	}
 </style>

+ 88 - 136
src/views/shopSetting/addSupplierModal.vue

@@ -3,70 +3,55 @@
     <!-- 弹窗 -->
     <a-modal
       v-model="isShow"
-      @cancle="cancel"
+      @cancle="isShow=false"
       :footer="null"
       width="60%"
       :centered="true"
       :title="titleText">
-      <a-form
-        id="components-form-demo-validate-other"
-        ref="form"
-        v-bind="formItemLayout"
-        @submit="handleSubmit"
-        :hideRequiredMark="hideRequiredMark">
+      <a-form id="components-form-demo-validate-other" ref="form" :form="form" v-bind="formItemLayout" @submit="handleSubmit">
         <a-form-item label="供应商名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
           <a-input
-            id="addSupplierModal-contactName"
+            id="addSupplierModal-name"
             :maxLength="30"
-            v-decorator="['formData.contactName', { initialValue: formData.contactName,getValueFromEvent: $filterEmpty, rules: [{ required: true, message: '请输入供应商名称(最多30个字符)!' }] }]"
-            :disabled="disabled"
+            v-decorator="['formData.name', { initialValue: formData.name,getValueFromEvent: $filterEmpty, rules: [{ required: true, message: '请输入供应商名称(最多30个字符)!' }] }]"
             placeholder="请输入供应商名称(最多30个字符)"
-            allowClear
-          />
+            allowClear />
         </a-form-item>
         <a-form-item label="供应商简称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
           <a-input
             id="addSupplierModal-simpleName"
             :maxLength="30"
             v-decorator="['formData.simpleName', { initialValue: formData.simpleName,getValueFromEvent: $filterEmpty, rules: [{ required: true, message: '请输入供应商简称(最多30个字符)!' }] }]"
-            :disabled="disabled"
             placeholder="请输入供应商简称(最多30个字符)"
-            allowClear
-          />
+            allowClear />
         </a-form-item>
         <a-form-item label="联系人" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
           <a-input
-            id="addSupplierModal-title"
+            id="addSupplierModal-contactName"
             :maxLength="30"
-            v-decorator="['formData.title', { initialValue: formData.title,getValueFromEvent: $filterEmpty, rules: [{ required: true, message: '请输入联系人!' }] }]"
-            :disabled="disabled"
+            v-decorator="['formData.contactName', { initialValue: formData.contactName,getValueFromEvent: $filterEmpty, rules: [{ required: true, message: '请输入联系人!' }] }]"
             placeholder="请输入联系人"
-            allowClear
-          />
+            allowClear />
         </a-form-item>
         <a-form-item label="手机号码" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
           <a-input
-            id="addSupplierModal-simpleName"
+            id="addSupplierModal-contactPhone"
             :maxLength="11"
-            v-decorator="['formData.', { initialValue: formData.simpleName,getValueFromEvent: $filterEmpty, rules: [{ required: true, message: '请输入手机号码!' }] }]"
-            :disabled="disabled"
+            v-decorator="['formData.contactPhone', { initialValue: formData.contactPhone,getValueFromEvent: $filterEmpty, rules: [{ required: true, message: '请输入手机号码!' }] }]"
             placeholder="请输入手机号码"
-            allowClear
-          />
+            allowClear />
         </a-form-item>
         <a-form-item label="备注" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
           <a-textarea
             :maxLength="500"
-            v-decorator="['formData.url', { initialValue: formData.url, rules: [{ required: false, message: '请输入备注内容(最多500个字符)!' }] }]"
-            :disabled="disabled"
-            id="addSupplierModal-url"
+            v-decorator="['formData.remarks', { initialValue: formData.remarks, rules: [{ required: false, message: '请输入备注内容(最多500个字符)!' }] }]"
+            id="addSupplierModal-remarks"
             placeholder="请输入备注内容(最多500个字符)"
-            allowClear
-          />
+            allowClear />
         </a-form-item>
         <a-form-item :wrapper-col="{ span: 12, offset: 6}" style="text-align: center;">
-          <a-button type="primary" html-type="submit" v-if="!disabled" id="addSupplierModal-submit" style="margin-right: 15px">保存</a-button>
-          <a-button @click="close()" v-if="!disabled" style="margin-left: 15px" id="addSupplierModal-close">取消</a-button>
+          <a-button type="primary" html-type="submit" id="addSupplierModal-submit" style="margin-right: 15px">保存</a-button>
+          <a-button @click="isShow=false" style="margin-left: 15px" id="addSupplierModal-close">取消</a-button>
         </a-form-item>
       </a-form>
     </a-modal>
@@ -74,140 +59,107 @@
 </template>
 
 <script>
+import {
+  supplierDetails,
+  saveSupplier
+} from '@/api/shopSetting.js'
 export default {
+  name: 'AddSupplierModal',
   props: {
     openSupplierModal: {
       type: Boolean,
       default: false
     },
+    itemId: {
+      type: String,
+      default: ''
+    },
     itemData: {
-      type: Object,
-      default: function () {
-        return {}
-      }
+	  type: Object,
+	  default: function () {
+	    return {}
+	  }
     }
   },
   data () {
     return {
       formItemLayout: {
-	  labelCol: {
+        labelCol: {
           span: 6
-	  },
-	  wrapperCol: {
+        },
+        wrapperCol: {
           span: 14
-	  }
+        }
       },
+	  titleText: '新增',
       isShow: this.openSupplierModal,
-      titleText: '新增',
-      closable: true,
-      visible: false,
-      confirmLoading: false,
-      formLayout: 'horizontal',
-      hideRequiredMark: false, // 是否显示必填的* 默认显示
+      form: this.$form.createForm(this, { name: 'addSupplierModal' }),
       formData: {
-		  title: '', // 标题
-		  url: '', // 图片路径
-		  status: '', // 状态
-		  sort: '', // 排序
-		  position: '', // 广告图位置
-		  photoPath: '', // banner地址
-		  createDate: ''
-      },
-      bannerType: 'app',
-      disabled: false,
-      value: '',
-      id: ''
+        name: '', // 名称
+        simpleName: '', // 简称
+        contactName: '', // 联系人
+        remarks: '', // 备注
+        contactPhone: '' // 手机号码
+      }
     }
   },
   methods: {
-	  // 关闭弹窗
-	  cancel (e) {
-      this.close()
-	  	this.$emit('close')
-	  },
-    close () {
-	  this.visible = false
-	  this.formData.title = ''
-	  this.photo = ''
-	  this.formData.url = ''
-	  this.formData.status = ''
-	  this.formData.sort = ''
-	  this.formData.position = ''
-	  this.formData.photoBasePath = ''
-	  this.formData.photoPath = ''
-	  this.title = '新增'
-			  // this.$refs.bannerImage.setFileList('')
-			  // this.form.resetFields()
-    },
-    // 赋值
-    assignment (row) {
-
+    // 查看详情
+    getPageInfo () {
+      supplierDetails({
+        id: this.itemId
+      }).then(res => {
+        if (res.status == 200) {
+          // this.form.setFieldsValue({ 'formData': res.data })
+          this.form.setFieldsValue({ 'formData.name': res.data.name })
+          this.form.setFieldsValue({ 'formData.contactName': res.data.contactName })
+          this.form.setFieldsValue({ 'formData.simpleName': res.data.simpleName })
+          this.form.setFieldsValue({ 'formData.contactPhone': res.data.contactPhone })
+          this.form.setFieldsValue({ 'formData.remarks': res.data.remarks })
+        }
+      })
     },
     // 点击保存;
     handleSubmit (e) {
-	  e.preventDefault()
-	  const _this = this
-	  this.form.validateFields((err, values) => {
-	    if (!err) {
-	      // console.log('Received values of form: ', values, this.formData)
-	      // const formData = Object.assign({}, this.formData, values.formData, {
-	      //   bannerType: 'app'
-	      // })
-	      // console.log(formData, _this.radioGroup)
-	      // saveItem(formData, _this.radioGroup).then(res => {
-	      //   console.log(res, 'rrrrrrrrr')
-	      //   if (res.status == 200) {
-	      //     _this.$message.success(res.message)
-	      //     _this.$refs.table.refresh()
-	      //     _this.close()
-	      //   }
-	      // })
-	    }
-	  })
+      e.preventDefault()
+      const _this = this
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          const formData = Object.assign({}, this.itemData, this.formData, values.formData)
+          formData.id = _this.itemId
+          saveSupplier(formData).then(res => {
+            console.log(res, 'rrrrrrrrr')
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$emit('refresh')
+              setTimeout(function () {
+                _this.isShow = false
+              }, 300)
+            }
+          })
+        }
+      })
     }
   },
   watch: {
     openSupplierModal (newValue, oldValue) {
       this.isShow = newValue
     },
-    // isShow(val) {
-    // 	if (!val) {
-    // 		this.$emit('close')
-    // 	}
-
-    // },
-    isShow (newValue, oldValue) {
-	  if (newValue) {
-	    if (this.itemData.id) { // 编辑
-	      this.titleText = '编辑'
-	      // this.formData = Object.assign({}, this.itemData)
-	      // delete this.formData.no
-	      // let roleNames = this.formData.roleNames
-	      // if (roleNames) {
-	      //   roleNames = roleNames.split(',')
-	      //   const arr = []
-	      //   roleNames.map(item => {
-	      //     const row = this.roleList.find(a => {
-	      //       return a.name == item
-	      //     })
-	      //     if (row) {
-	      //       arr.push(row.id)
-	      //     }
-	      //   })
-	      //   this.formData.roleNames = arr
-	      // } else {
-	      //   this.formData.roleNames = []
-	      // }
-	      // this.formData.loginFlag = Number(this.formData.loginFlag)
-	    } else {
-	      this.titleText = '新增'
-	    }
-	  } else {
-	    this.cancel()
-	  }
+    isShow (val) {
+      if (!val) {
+        this.$emit('close')
+      } else {
+   	  this.form.resetFields()
+      }
     },
-    itemData () {
-
+    itemId (newValue, oldValue) {
+      console.log(newValue, '----------id')
+      if (newValue && this.isShow) {
+        this.titleText = '编辑'
+        this.getPageInfo(newValue)
+      } else {
+   	  this.titleText = '新增'
+      }
     }
   }
 }

+ 160 - 234
src/views/shopSetting/goodsClass.vue

@@ -3,71 +3,69 @@
     <!-- 搜索框 -->
     <div class="table-page-search-wrapper" style="margin-bottom: 15px;">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="48" >
+        <a-row :gutter="48">
           <a-col :md="6" :sm="24">
-            <a-form-item label="商品分类名称"><a-input allowClear v-model.trim="searchData.name" :maxLength="30" placeholder="请输入" id="OperateJournal-queryWord"/></a-form-item>
+            <a-form-item label="商品分类名称">
+              <a-input allowClear v-model="searchData.name" :maxLength="30" placeholder="请输入" id="goodsClass-name" />
+            </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
-            <a-button style="margin-right: 10px;" type="primary" @click="$refs.table.refresh(true)" id="OperateJournal-refreshTable">查询</a-button>
+            <a-button style="margin-right: 10px;" type="primary" @click="$refs.table.refresh(true)" id="goodsClass-refresh">查询</a-button>
             <a-button type="" @click="resetForm" id="OperateJournal-resetForm">重置</a-button>
           </a-col>
         </a-row>
       </a-form>
     </div>
-    <div class="add"><a-button type="primary" icon="plus" class="addBtn" @click="showModal" id="bannerSetting-showModal">新增</a-button></div>
-    <v-select ref="position" style="display: none;" code="ADVERT_POSITION"></v-select>
+    <div class="add">
+      <a-button type="primary" icon="plus" class="addBtn" @click="showModal" id="goodsClass-showModal">新增</a-button>
+    </div>
     <!-- table列表 -->
     <s-table
       ref="table"
       size="default"
-      :rowKey="row => row.id"
-      :showPagination="false"
+      :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
       bordered>
-      <!-- 广告图位置 -->
-      <!-- <span slot="position" slot-scope="text">{{ $refs.position.getNameByCode(text) }}</span> -->
       <span slot="action" slot-scope="text, record">
         <a-icon
-          type="eye"
-          id="bannerSetting-handleView"
-          title="查看"
-          class="actionBtn icon-green"
-          @click="handleEdit(record, 1)" />
-        <a-icon
+          v-if="record.state==0"
           type="edit"
           id="bannerSetting-handleEdit"
-          v-if="record.state == '0'"
           title="编辑"
           class="actionBtn icon-blues"
-          @click="handleEdit(record, 0)" />
-        <a-icon
-          type="delete"
-          id="bannerSetting-delect"
-          v-if="record.state == '0'"
-          title="删除"
-          class="actionBtn icon-red"
-          @click="delect(record)" />
+          @click="handleEdit(record)" />
+        <span v-if="record.state==1">--</span>
       </span>
       <span slot="state" slot-scope="text, record">
         <a-switch
           checkedChildren="启用"
           unCheckedChildren="禁用"
           id="bannerSetting-changeFlagHandle"
-          v-model="record.state == 1 ? true : false"
-          @change="changeFlagHandle(text, record)"
-        />
+          :checked="record.state == 1 ? true : false"
+          @change="changeFlagHandle(text, record)" />
       </span>
-    </s-table>
-    <add-goodsClass-modal :itemData="itemData" :openGoodClassModal="openGoodClassModal" @close="openGoodClassModal=false"></add-goodsClass-modal>
+      </span></s-table>
+    <add-goodsClass-modal
+      :itemId="itemId"
+      :itemData="itemData"
+      :openGoodClassModal="openGoodClassModal"
+      @refresh="$refs.table.refresh(true)"
+      @close="cancel"></add-goodsClass-modal>
   </a-card>
 </template>
 
 <script>
-import { Upload, STable, VSelect } from '@/components'
+import {
+  Upload,
+  STable,
+  VSelect
+} from '@/components'
 import addGoodsClassModal from './addGoodsClassModal.vue'
-// import Editor from '@/components/WEeditor'
-import { getGoodsClassList, changeGoodsStatus, goodsClassDetails } from '@/api/shopSetting.js'
+import {
+  getGoodsClassList,
+  changeGoodsStatus
+} from '@/api/shopSetting.js'
 
 export default {
   components: {
@@ -78,76 +76,13 @@ export default {
   },
   data () {
     return {
-      searchData: { name: '' },
-      openGoodClassModal: false, // 默认关闭弹窗
-      itemData: {}, // 编辑行数据
-      // 表头
-      columns: [
-        {
-          title: '序号',
-          dataIndex: 'no',
-          width: 60,
-          align: 'center'
-        },
-        {
-          title: '商品分类名称',
-          width: 100,
-          dataIndex: 'name',
-          align: 'center'
-        },
-        {
-          title: '订单起购金额',
-          width: 100,
-          dataIndex: 'goldLimit',
-          align: 'center'
-        },
-        {
-          title: '状态',
-          width: 100,
-          dataIndex: 'state',
-          align: 'center',
-          scopedSlots: {
-            customRender: 'state'
-          }
-        },
-        {
-		  title: '备注',
-		  width: 100,
-		  dataIndex: 'url',
-		  align: 'center',
-		  customRender: (text) => {
-		    return text || '--'
-		  }
-        },
-        {
-          title: '操作',
-          align: 'center',
-          width: 100,
-          scopedSlots: {
-            customRender: 'action'
-          }
-        }
-      ],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        // return getGoodsClassList({
-        //  Object.assign(parameter, this.searchData)
-        // }).then(res => {
-        //   // console.log(res, '1111')
-        //   const no = 0
-        //   for (let i = 0; i < res.data.length; i++) {
-        //     const _item = res.data[i]
-        //     _item.no = no + i + 1
-        //   }
-        //   return res.data
-        // })
+      searchData: {
+        name: ''
       },
-      title: '编辑',
-      closable: true,
-      visible: false,
-      confirmLoading: false,
+      openGoodClassModal: false, // 默认关闭弹窗
+      itemId: null, // 编辑行id
+	  itemData: {}, // 编辑行数据
       formLayout: 'horizontal',
-      // hideRequiredMark: false, // 是否显示必填的* 默认显示
       form: this.$form.createForm(this),
       formItemLayout: {
         labelCol: {
@@ -157,20 +92,74 @@ export default {
           span: 14
         }
       },
-      formData: {
-        title: '', // 标题
-        url: '', // 图片路径
-        status: '', // 状态
-        sort: '', // 排序
-        position: '', // 广告图位置
-        photoPath: '', // banner地址
-        createDate: ''
+      // 表头
+      columns: [{
+        title: '序号',
+        dataIndex: 'no',
+        width: 60,
+        align: 'center'
+      },
+      {
+        title: '商品分类名称',
+        width: 100,
+        dataIndex: 'name',
+        align: 'center'
+      },
+      {
+        title: '订单起购金额',
+        width: 100,
+        dataIndex: 'goldLimit',
+        align: 'center',
+        customRender: (text) => {
+          if (text >= 1) {
+            return text
+          } else {
+            return '--'
+          }
+        }
       },
-      bannerType: 'app',
-      disabled: false,
-      value: '',
-      id: '',
-      isShow: true
+      {
+        title: '状态',
+        width: 100,
+        dataIndex: 'state',
+        align: 'center',
+        scopedSlots: {
+          customRender: 'state'
+        }
+      },
+      {
+        title: '备注',
+        width: 100,
+        dataIndex: 'remarks',
+        align: 'center',
+        customRender: (text) => {
+          return text || '--'
+        }
+      },
+      {
+        title: '操作',
+        align: 'center',
+        width: 100,
+        scopedSlots: {
+          customRender: 'action'
+        }
+      }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        return getGoodsClassList(
+          Object.assign(parameter, this.searchData)
+        ).then(res => {
+          const no = (res.data.pageNo - 1) * res.data.pageSize
+          if (res.status == 200) {
+            for (let i = 0; i < res.data.list.length; i++) {
+              const _item = res.data.list[i]
+              _item.no = no + i + 1
+            }
+            return res.data
+          }
+        })
+      }
     }
   },
   beforeCreate () {
@@ -180,132 +169,68 @@ export default {
   },
   methods: {
     showModal () {
-      // this.disabled = false
-      // delete this.formData.id
-      // delete this.formData.createDate
-      // this.visible = true
-	  this.openGoodClassModal = true
-      this.title = '新增'
-      // this.hideRequiredMark = false
+      console.log('---新增')
+      this.itemId = null
+	  this.itemData = {}
+      this.openGoodClassModal = true
+    },
+    // 编辑
+    handleEdit (record) {
+      this.itemId = record.id
+	  this.itemData = record
+      console.log(this.itemId, '-------编辑')
+      this.openGoodClassModal = true
     },
-    // 轮播图change
-    // getbannerImage (data) {
-    //   this.formData.photoPath = data
-    // },
     // 重置
     resetForm () {
       this.searchData.name = ''
-	  this.$refs.table.refresh(true)
-    },
-    // 点击保存;
-    handleSubmit (e) {
-      // e.preventDefault()
-      // const _this = this
-      // this.form.validateFields((err, values) => {
-      //   if (!err) {
-      //     console.log('Received values of form: ', values, this.formData)
-      //     const formData = Object.assign({}, this.formData, values.formData, {
-      //       bannerType: 'app'
-      //     })
-      //     console.log(formData, _this.radioGroup)
-      //     saveItem(formData, _this.radioGroup).then(res => {
-      //       console.log(res, 'rrrrrrrrr')
-      //       if (res.status == 200) {
-      //         _this.$message.success(res.message)
-      //         _this.$refs.table.refresh()
-      //         _this.close()
-      //       }
-      //     })
-      //   }
-      // })
+      this.$refs.table.refresh(true)
     },
-    close () {
-      this.visible = false
-      this.formData.title = ''
-      this.photo = ''
-      this.formData.url = ''
-      this.formData.status = ''
-      this.formData.sort = ''
-      this.formData.position = ''
-      this.formData.photoBasePath = ''
-      this.formData.photoPath = ''
-      this.title = '新增'
-      // this.$refs.bannerImage.setFileList('')
-      // this.form.resetFields()
-    },
-    // 赋值
-    assignment (row) {
-      this.formData.id = row.id
-      this.formData.title = row.title
-      this.formData.photoPath = row.photoPath
-      this.formData.url = row.url
-      this.formData.status = row.status
-      this.formData.sort = row.sort
-      this.formData.position = row.position
-      this.formData.createDate = row.createDate
-    },
-    // 0 修改,1 查看详情
-    // handleEdit (row, type) {
-    //   const _this = this
-    //   console.log(row)
-    //   if (type == 1) {
-    //     this.title = '查看详情'
-    //     this.hideRequiredMark = true
-    //   } else if (type == 0) {
-    //     this.title = '编辑'
-    //     this.hideRequiredMark = false
-    //   }
-    //   this.assignment(row)
-    //   this.disabled = type == 1
-    //   this.visible = true
-    //   setTimeout(() => {
-    //     _this.$refs.bannerImage.setFileList(this.formData.photoPath)
-    //   }, 500)
-    // },
-    // 删除
-    delect (row) {
-      const _this = this
-      this.$confirm({
-        title: '警告',
-        centered: true,
-        content: '删除后无法恢复,确认删除?',
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          // deleteItem({
-          //   id: row.id
-          // }).then(res => {
-          //   if (res.status == 200) {
-          //     _this.$message.success(res.message)
-          //     _this.$refs.table.refresh()
-          //   }
-          // })
-        }
-      })
+    //
+    cancel () {
+      this.itemId = null
+      this.openGoodClassModal = false
     },
     // 更改启用禁用状态
     changeFlagHandle (text, record) {
+      console.log(text)
       const _this = this
-      this.$confirm({
-    	  title: '提示',
-    	  centered: true,
-    	  content: '商品分类被禁用后,该分类将不在显示给用户,确定禁用吗?',
-    	  okText: '确定',
-    	  cancelText: '取消',
-    	  onOk () {
-          const _data = {
-    		  id: record.id,
-    		  flag: record.status == 1 ? '0' : '1'
+      const _data = {
+        id: record.id,
+        flag: record.state == 1 ? '0' : '1'
+      }
+      if (record.state == 1) {
+        this.$confirm({
+          title: '提示',
+          centered: true,
+          content: '商品分类被禁用后,该分类将不在显示给用户,确定禁用吗?',
+          okText: '确定',
+          cancelText: '取消',
+          onOk () {
+            changeGoodsStatus(_data).then(res => {
+              if (res.status == 200) {
+                _this.$message.success(res.message)
+                _this.$refs.table.refresh()
+              } else {
+                record.state = !record.state
+              }
+            })
           }
-          changeStatus(_data).then(res => {
-    		  if (res.status == '200') {
-    		    _this.$message.success(res.message)
-    		    _this.$refs.table.refresh()
-    		  } else {
-    		    record.status = !record.status
-    		  }
-          })
-    	  }
+        })
+      } else {
+        changeGoodsStatus(_data).then(res => {
+          if (res.status == 200) {
+            _this.$message.success(res.message)
+            _this.$refs.table.refresh()
+          } else {
+            record.state = !record.state
+          }
+        })
+      }
+    },
+    beforeRouteEnter (to, from, next) {
+      next(vm => {
+        vm.resetForm()
       })
     }
   }
@@ -313,10 +238,11 @@ export default {
 </script>
 
 <style>
-	.w-e-toolbar{
-	  flex-wrap:wrap;
+	.w-e-toolbar {
+		flex-wrap: wrap;
+	}
+
+	.addBtn {
+		margin-bottom: 20px;
 	}
-.addBtn {
-  margin-bottom: 20px;
-}
 </style>

+ 92 - 180
src/views/shopSetting/supplier.vue

@@ -15,58 +15,42 @@
       </a-form>
     </div>
     <div class="add"><a-button type="primary" icon="plus" class="addBtn" @click="showModal" id="bannerSetting-showModal">新增</a-button></div>
-    <v-select ref="position" style="display: none;" code="ADVERT_POSITION"></v-select>
     <!-- table列表 -->
     <s-table
       ref="table"
       size="default"
-      :rowKey="row => row.id"
-      :showPagination="false"
+      :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
       bordered>
-      <!-- 广告图位置 -->
-      <span slot="position" slot-scope="text">{{ $refs.position.getNameByCode(text) }}</span>
       <span slot="action" slot-scope="text, record">
         <a-icon
-          type="eye"
-          id="bannerSetting-handleView"
-          title="查看"
-          class="actionBtn icon-green"
-          @click="handleEdit(record, 1)" />
-        <a-icon
+          v-if="record.state==0"
           type="edit"
           id="bannerSetting-handleEdit"
-          v-if="record.status == '0'"
           title="编辑"
           class="actionBtn icon-blues"
-          @click="handleEdit(record, 0)" />
-        <a-icon
-          type="delete"
-          id="bannerSetting-delect"
-          v-if="record.status == '0'"
-          title="删除"
-          class="actionBtn icon-red"
-          @click="delect(record)" />
+          @click="handleEdit(record)" />
+        <span v-if="record.state==1">--</span>
       </span>
-      <span slot="status" slot-scope="text, record">
+      <span slot="state" slot-scope="text, record">
         <a-switch
           checkedChildren="启用"
           unCheckedChildren="禁用"
           id="bannerSetting-changeFlagHandle"
-          v-model="record.status == 1 ? true : false"
+          :checked="record.state == 1 ? true : false"
           @change="changeFlagHandle(text, record)"
         />
       </span>
     </s-table>
     <!-- 新增编辑弹窗 -->
-    <add-supplier-modal :itemData="itemData" :openSupplierModal="openSupplierModal" @close="openSupplierModal=false"></add-supplier-modal>
+    <add-supplier-modal :itemId="itemId" :itemData="itemData" :openSupplierModal="openSupplierModal" @refresh="$refs.table.refresh(true)" @close="cancel"></add-supplier-modal>
   </a-card>
 </template>
 
 <script>
 import { Upload, STable, VSelect } from '@/components'
-import { getSupplierList, changeSupplierStatus, goodsClassDetails } from '@/api/shopSetting.js'
+import { getSupplierList, changeSupplierStatus } from '@/api/shopSetting.js'
 import addSupplierModal from './addSupplierModal.vue'
 export default {
   components: {
@@ -79,7 +63,8 @@ export default {
     return {
       searchData: { name: '' },
 	  openSupplierModal: false, // 默认关闭弹窗
-	  itemData: {}, // 编辑行数据
+	  itemId: null, // 编辑行id
+	  itemData:{},  // 编辑行数据
       // 表头
       columns: [
         {
@@ -90,8 +75,8 @@ export default {
         },
         {
           title: '供应商名称',
-          width: 100,
-          dataIndex: 'contactName',
+          width: 200,
+          dataIndex: 'name',
           align: 'center'
         },
         {
@@ -100,37 +85,43 @@ export default {
           dataIndex: 'simpleName',
           align: 'center'
         },
+		{
+		  title: '联系人',
+		  width: 100,
+		  dataIndex: 'contactName',
+		  align: 'center'
+		},
         {
 		  title: '手机号码',
-		  width: 200,
+		  width: 100,
 		  dataIndex: 'contactPhone',
 		  align: 'center',
 		  scopedSlots: {
 		    customRender: 'position'
 		  }
         },
-        {
-          title: '备注',
-          width: 100,
-          dataIndex: 'url',
-          align: 'center',
-          customRender: (text) => {
-            return text || '--'
-          }
-        },
         {
           title: '状态',
           width: 100,
-          dataIndex: 'status',
+          dataIndex: 'state',
           align: 'center',
           scopedSlots: {
-            customRender: 'status'
+            customRender: 'state'
           }
         },
+		{
+		  title: '备注',
+		  width: 200,
+		  dataIndex: 'remarks',
+		  align: 'center',
+		  customRender: (text) => {
+		    return text || '--'
+		  }
+		},
         {
           title: '操作',
           align: 'center',
-          width: 200,
+          width: 100,
           scopedSlots: {
             customRender: 'action'
           }
@@ -138,22 +129,19 @@ export default {
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        // return getSupplierList({
-        //   Object.assign(parameter, this.searchData)
-        // }).then(res => {
-        //   // console.log(res, '1111')
-        //   const no = 0
-        //   for (let i = 0; i < res.data.length; i++) {
-        //     const _item = res.data[i]
-        //     _item.no = no + i + 1
-        //   }
-        //   return res.data
-        // })
+        return getSupplierList(
+          Object.assign(parameter, this.searchData)
+        ).then(res => {
+          const no = (res.data.pageNo - 1) * res.data.pageSize
+		   if (res.status == 200) {
+            for (let i = 0; i < res.data.list.length; i++) {
+			  const _item = res.data.list[i]
+			   _item.no = no + i + 1
+            }
+            return res.data
+		   }
+        })
       },
-      title: '编辑',
-      closable: true,
-      visible: false,
-      confirmLoading: false,
       formLayout: 'horizontal',
       hideRequiredMark: false, // 是否显示必填的* 默认显示
       form: this.$form.createForm(this),
@@ -164,143 +152,67 @@ export default {
         wrapperCol: {
           span: 14
         }
-      },
-      formData: {
-        title: '', // 标题
-        url: '', // 图片路径
-        status: '', // 状态
-        sort: '', // 排序
-        position: '', // 广告图位置
-        photoPath: '', // banner地址
-        createDate: ''
-      },
-      bannerType: 'app',
-      disabled: false,
-      value: ''
+      }
     }
   },
-  beforeCreate () {
-    this.form = this.$form.createForm(this, {
-      name: 'validate_other'
-    })
-  },
   methods: {
     showModal () {
-      // if()
-      this.disabled = false
-      delete this.formData.id
-      delete this.formData.createDate
+      this.itemId = null
+	  this.itemData={}
       this.openSupplierModal = true
-	  // this.itemData=text
-      this.title = '新增'
-      this.hideRequiredMark = false
-    },
-    // 重置
-    resetForm () {},
-    // 轮播图change
-    getbannerImage (data) {
-      this.formData.photoPath = data
-    },
-    // 点击保存;
-    handleSubmit (e) {
-      e.preventDefault()
-      const _this = this
-      this.form.validateFields((err, values) => {
-        if (!err) {
-          console.log('Received values of form: ', values, this.formData)
-          const formData = Object.assign({}, this.formData, values.formData, {
-            bannerType: 'app'
-          })
-          console.log(formData, _this.radioGroup)
-          saveItem(formData, _this.radioGroup).then(res => {
-            console.log(res, 'rrrrrrrrr')
-            if (res.status == 200) {
-              _this.$message.success(res.message)
-              _this.$refs.table.refresh()
-              _this.close()
-            }
-          })
-        }
-      })
-    },
-    close () {
-      this.visible = false
-      this.formData.title = ''
-      this.photo = ''
-      this.formData.url = ''
-      this.formData.status = ''
-      this.formData.sort = ''
-      this.formData.position = ''
-      this.formData.photoBasePath = ''
-      this.formData.photoPath = ''
-      this.title = '新增'
-      this.$refs.bannerImage.setFileList('')
-      this.form.resetFields()
-    },
-    // 赋值
-    assignment (row) {
-      this.formData.id = row.id
-      this.formData.title = row.title
-      this.formData.photoPath = row.photoPath
-      this.formData.url = row.url
-      this.formData.status = row.status
-      this.formData.sort = row.sort
-      this.formData.position = row.position
-      this.formData.createDate = row.createDate
     },
-    // 0 修改,1 查看详情
-    handleEdit (row, type) {
-      const _this = this
-      console.log(row)
-      if (type == 1) {
-        this.title = '查看详情'
-        this.hideRequiredMark = true
-      } else if (type == 0) {
-        this.title = '编辑'
-        this.hideRequiredMark = false
-      }
-      this.assignment(row)
-      this.disabled = type == 1
-      this.visible = true
-      setTimeout(() => {
-        _this.$refs.bannerImage.setFileList(this.formData.photoPath)
-      }, 500)
+    // 编辑
+    handleEdit (record) {
+	  this.itemId = record.id
+	  this.itemData=record
+	  console.log(this.itemId, '-------编辑')
+	  this.openSupplierModal = true
     },
-    // 删除
-    delect (row) {
-      const _this = this
-      this.$confirm({
-        title: '警告',
-        centered: true,
-        content: '删除后无法恢复,确认删除?',
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          deleteItem({
-            id: row.id
-          }).then(res => {
-            if (res.status == 200) {
-              _this.$message.success(res.message)
-              _this.$refs.table.refresh()
-            }
-          })
-        }
-      })
+	cancel () {
+	  this.itemId = null
+	  this.openSupplierModal = false
+	},
+    // 重置
+    resetForm () {
+      this.searchData.name = ''
+      this.$refs.table.refresh(true)
     },
     // 更改启用禁用状态
     changeFlagHandle (text, record) {
+      console.log(text)
+      const _this = this
       const _data = {
-        id: record.id,
-        flag: record.status == 1 ? '0' : '1'
+    	  id: record.id,
+    	  flag: record.state == 1 ? '0' : '1'
+      }
+      if (record.state == 1) {
+    	  this.$confirm({
+    		  title: '提示',
+    		  centered: true,
+    		  content: '确定禁用该供货商吗?',
+    		  okText: '确定',
+    		  cancelText: '取消',
+    		  onOk () {
+    	      changeSupplierStatus(_data).then(res => {
+    			  if (res.status == 200) {
+                _this.$message.success(res.message)
+                _this.$refs.table.refresh()
+    			  } else {
+                record.state = !record.state
+    			  }
+    	      })
+    	     }
+    	  })
+      } else {
+        changeSupplierStatus(_data).then(res => {
+    	  if (res.status == 200) {
+            _this.$message.success(res.message)
+            _this.$refs.table.refresh()
+    	  } else {
+            record.state = !record.state
+    	  }
+        })
       }
-      changeStatus(_data).then(res => {
-        if (res.status == '200') {
-          _this.$message.success(res.message)
-          _this.$refs.table.refresh()
-        } else {
-          record.status = !record.status
-        }
-      })
     }
   }
 }