浏览代码

散件退货编辑新增页

chenrui 4 年之前
父节点
当前提交
78fcf8bffa

+ 111 - 0
src/views/bulkManagement/bulkReturnGoods/basicInfoModal.vue

@@ -0,0 +1,111 @@
+<template>
+  <a-modal
+    centered
+    class="bulkReturnGoods-basicInfo-modal"
+    :footer="null"
+    :maskClosable="false"
+    title="新增散件退货单"
+    v-model="isShow"
+    @cancle="isShow = false"
+    width="80%">
+    <a-form-model
+      id="bulkReturnGoods-basicInfo-form"
+      ref="ruleForm"
+      :model="form"
+      :rules="rules"
+      :label-col="formItemLayout.labelCol"
+      :wrapper-col="formItemLayout.wrapperCol">
+      <a-form-model-item label="供应商" prop="name">
+        <a-select
+          v-model="form.name"
+          placeholder="请选择"
+          allowClear
+          :showSearch="true"
+          option-filter-prop="children"
+          :filter-option="filterOption">
+          <a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
+        </a-select>
+      </a-form-model-item>
+      <a-form-model-item label="是否抓单" prop="type">
+        <a-radio-group v-model="form.type">
+          <a-radio value="a">是</a-radio>
+          <a-radio value="b">否</a-radio>
+        </a-radio-group>
+      </a-form-model-item>
+      <a-form-model-item label="备注" prop="remarks">
+        <a-textarea id="bulkReturnGoods-basicInfo-remarks" :maxLength="120" v-model="form.remarks" placeholder="请输入备注(最多120个字符)" allowClear />
+      </a-form-model-item>
+    </a-form-model>
+    <div class="btn-cont">
+      <a-button type="primary" id="bulkReturnGoods-basicInfo-modal-save" @click="handleSave">保存</a-button>
+      <a-button id="bulkReturnGoods-basicInfo-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
+    </div>
+  </a-modal>
+</template>
+
+<script>
+import { VSelect } from '@/components'
+export default {
+  name: 'BulkReturnGoodsBasicInfoModal',
+  components: { VSelect },
+  props: {
+    openModal: {
+      //  弹框显示状态
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      isShow: this.openModal, //  是否打开弹框
+      formItemLayout: {
+        labelCol: { span: 6 },
+        wrapperCol: { span: 16 }
+      },
+      form: {
+        type: 'a',
+        name: undefined, // 仓库名称
+        sort: '' //  排序
+      },
+      rules: {
+        name: [{ required: true, message: '请选择调出产品类型', trigger: 'change' }]
+      },
+      brandData: [] //  供应商  下拉数据
+    }
+  },
+  methods: {
+    //  保存
+    handleSave () {
+      this.isShow = false
+      this.$emit('ok')
+    },
+    filterOption (input, option) {
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    }
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close')
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less">
+.bulkReturnGoods-basicInfo-modal {
+  .ant-modal-body {
+    padding: 40px 40px 24px;
+  }
+  .btn-cont {
+    text-align: center;
+    margin: 35px 0 10px;
+  }
+}
+</style>

+ 331 - 1
src/views/bulkManagement/bulkReturnGoods/edit.vue

@@ -1,8 +1,338 @@
 <template>
+  <div class="bulkReturnGoodsEdit-wrap">
+    <a-page-header :ghost="false" @back="handleBack" >
+      <!-- 自定义的二级文字标题 -->
+      <template slot="subTitle">
+        <a id="bulkReturnGoodsEdit-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
+      </template>
+      <!-- 操作区,位于 title 行的行尾 -->
+      <template slot="extra">
+        <a-button key="2" id="bulkReturnGoodsEdit-preview-btn">打印预览</a-button>
+        <a-button key="1" type="primary" id="bulkReturnGoodsEdit-print-btn">快速打印</a-button>
+      </template>
+    </a-page-header>
+    <!-- 内容 -->
+    <a-page-header title="单号:CG2021010100001" ></a-page-header>
+    <!-- 基础信息 -->
+    <a-card :bordered="false" class="bulkReturnGoodsEdit-cont">
+      <a-collapse :activeKey="['1']">
+        <a-collapse-panel key="1">
+          <template slot="header">
+            基础信息
+            <a-button
+              type="primary"
+              shape="circle"
+              size="small"
+              icon="edit"
+              class="edit-circle-btn"
+              id="bulkReturnGoodsEdit-edit-circle-btn"
+              @click.stop="handleEditInfo" />
+          </template>
+          <a-descriptions :column="3">
+            <a-descriptions-item label="供应商">箭冠营销中心</a-descriptions-item>
+            <a-descriptions-item label="是否抓单">箭冠营销中心</a-descriptions-item>
+            <a-descriptions-item label="备注">箭冠营销中心</a-descriptions-item>
+          </a-descriptions>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-card>
+    <!-- 选择产品 -->
+    <a-card :bordered="false" class="bulkReturnGoodsEdit-cont">
+      <a-collapse :activeKey="['1']">
+        <a-collapse-panel key="1">
+          <template slot="header">
+            选择产品<span class="sub-title">以下是该供应商的所有散件入库产品,请选择本次需要退货的产品</span>
+          </template>
+          <!-- 选择产品 -->
+          <div>
+            <!-- 搜索条件 -->
+            <div class="table-page-search-wrapper">
+              <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+                <a-row :gutter="15">
+                  <a-col :md="6" :sm="24">
+                    <a-form-item label="关键词">
+                      <a-input id="bulkReturnGoodsEdit-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="产品名称/产品编码/原厂编码"/>
+                    </a-form-item>
+                  </a-col>
+                  <a-col :md="6" :sm="24">
+                    <a-form-item label="散件单号">
+                      <a-input id="bulkReturnGoodsEdit-sparePartsReturnNo" v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入散件退货单号"/>
+                    </a-form-item>
+                  </a-col>
+                  <a-col :md="6" :sm="24">
+                    <a-form-item label="散件单审核时间">
+                      <a-range-picker
+                        style="width:100%"
+                        id="bulkReturnGoodsEdit-creatTime"
+                        :disabledDate="disabledDate"
+                        v-model="time"
+                        :format="dateFormat"
+                        :placeholder="['开始时间', '结束时间']" />
+                    </a-form-item>
+                  </a-col>
+                  <a-col :md="6" :sm="24">
+                    <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkReturnGoodsEdit-refresh">查询</a-button>
+                    <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="bulkReturnGoodsEdit-reset">重置</a-button>
+                  </a-col>
+                </a-row>
+              </a-form>
+            </div>
+            <!-- 列表 -->
+            <s-table
+              class="sTable"
+              ref="table"
+              size="default"
+              :rowKey="(record) => record.id"
+              :columns="columns"
+              :data="loadData"
+              bordered>
+              <!-- 采购数量 -->
+              <template slot="storageQuantity" slot-scope="text, record">
+                <a-input-number
+                  id="bulkReturnGoodsEdit-storageQuantity"
+                  :value="record.storageQuantity"
+                  :precision="0"
+                  :min="0"
+                  :max="999999"
+                  placeholder="请输入" />
+              </template>
+              <!-- 操作 -->
+              <template slot="action" slot-scope="text, record">
+                <a-button size="small" type="primary" @click="handleAdd(record)" id="bulkReturnGoodsEdit-add-btn">添加</a-button>
+              </template>
+            </s-table>
+          </div>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-card>
+    <!-- 已选产品 -->
+    <a-card :bordered="false" class="bulkReturnGoodsEdit-cont">
+      <a-collapse :activeKey="['1']">
+        <a-collapse-panel key="1">
+          <template slot="header">
+            已选产品
+            <a-button size="small" class="import-btn" id="bulkReturnGoodsEdit-import-btn" @click.stop="handleImport">导入明细</a-button>
+          </template>
+          <!-- 已选产品 -->
+          <div>
+            <!-- 总计 -->
+            <a-alert type="info" showIcon style="margin-bottom:15px">
+              <div slot="message">产品款数 <strong>6</strong> ,退货数量合计 <strong>6</strong> ,退货金额合计¥<strong>6.33</strong></div>
+            </a-alert>
+            <!-- 列表 -->
+            <s-table
+              class="sTable"
+              ref="table"
+              size="default"
+              :rowKey="(record) => record.id"
+              :columns="chooseColumns"
+              :data="chooseLoadData"
+              bordered>
+              <!-- 采购数量 -->
+              <template slot="storageQuantity" slot-scope="text, record">
+                <a-input-number
+                  id="bulkReturnGoodsEdit-storageQuantity"
+                  :value="record.storageQuantity"
+                  :precision="0"
+                  :min="0"
+                  :max="999999"
+                  placeholder="请输入" />
+              </template>
+              <!-- 操作 -->
+              <template slot="action" slot-scope="text, record">
+                <a-button size="small" type="primary" @click="handleDel(record)" id="bulkReturnGoodsEdit-del-btn">删除</a-button>
+              </template>
+            </s-table>
+          </div>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-card>
+    <a-affix :offset-bottom="0">
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button type="primary" id="bulkReturnGoodsEdit-submit-btn" size="large" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
+      </div>
+    </a-affix>
+    <!-- 选择基本信息弹框 -->
+    <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
+  </div>
 </template>
 
 <script>
+import { STable, VSelect } from '@/components'
+import basicInfoModal from './basicInfoModal.vue'
+export default {
+  components: { STable, VSelect, basicInfoModal },
+  data () {
+    return {
+      queryParam: {
+
+      },
+      disabled: false, //  查询、重置按钮是否可操作
+      dateFormat: 'YYYY-MM-DD',
+      time: [], //  散件单审核时间
+      // 表头
+      columns: [
+        { title: '散件单号', dataIndex: 'creatDate', align: 'center' },
+        { title: '散件单审核时间', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'custsName', align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'totalP', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单位', scopedSlots: { customRender: 'outOfStockNum' }, align: 'center' },
+        { title: '成本价', dataIndex: 'totalNums', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '入库数量', dataIndex: 'totsalP', align: 'center' },
+        { title: '已退数量', dataIndex: 'totaslP', align: 'center' },
+        { title: '可退数量', dataIndex: 'tostalP', align: 'center' },
+        { title: '库存数量', dataIndex: 'todtalP', align: 'center' },
+        { title: '退货数量', scopedSlots: { customRender: 'storageQuantity' }, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+        //   const data = res.data
+        //   const no = (data.pageNo - 1) * data.pageSize
+        //   for (var i = 0; i < data.list.length; i++) {
+        //     data.list[i].no = no + i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function (resolve, reject) {
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+            ],
+            count: 10
+          }
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          _this.disabled = false
+          resolve(data)
+        })
+      },
+      // 表头
+      chooseColumns: [
+        { title: '产品编码', dataIndex: 'creatDaite', align: 'center', sorter: true },
+        { title: '产品名称', dataIndex: 'custNayme', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单位', dataIndex: 'custsNakme', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本价', dataIndex: 'mementPay', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '退货数量', scopedSlots: { customRender: 'storageQuantity' }, align: 'center' },
+        { title: '退货金额', dataIndex: 'custssNakme', align: 'center', customRender: function (text) { return ((text || text == 0) ? '¥' + text : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      chooseLoadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+        //   const data = res.data
+        //   const no = (data.pageNo - 1) * data.pageSize
+        //   for (var i = 0; i < data.list.length; i++) {
+        //     data.list[i].no = no + i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function (resolve, reject) {
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', purchaseNo: 'jgqp11111111111', custssName: 0, creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+            ],
+            count: 10
+          }
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          _this.disabled = false
+          resolve(data)
+        })
+      },
+      openModal: false // 选择基本信息弹框是否显示
+    }
+  },
+  methods: {
+    // 不可选日期
+    disabledDate (date, dateStrings) {
+      return date && date.valueOf() > Date.now()
+    },
+    //  重置
+    resetSearchForm () {
+      this.queryParam.orderBundleNo = ''
+      this.queryParam.orderBundle.custMobile = ''
+      this.queryParam.bundleName = ''
+      this.queryParam.itemName = ''
+      this.oldTime = undefined
+      this.newTime = undefined
+      this.$refs.table.refresh(true)
+    },
+    //  添加
+    handleAdd (row) {},
+    //  删除
+    handleDel (row) {},
+    //  编辑基本信息
+    handleEditInfo () {
+      this.openModal = true
+    },
+    //  提交
+    handleSubmit () {
+
+    },
+    //  基本信息  保存
+    handleOk () {
+
+    },
+    //  返回列表
+    handleBack () {
+      this.$router.push({ path: '/bulkManagement/bulkReturnGoods/list' })
+    },
+    //  导入明细
+    handleImport () {
+      console.log(333)
+    },
+    filterOption (input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.openModal = false
+    })
+  }
+}
 </script>
 
-<style>
+<style lang="less">
+  .bulkReturnGoodsEdit-wrap{
+    .bulkReturnGoodsEdit-cont{
+      margin-bottom: 15px;
+      .sub-title{
+        font-size: 12px;
+        color: #808695;
+        margin-left: 10px;
+      }
+      .tag-txt{
+        font-size: 12px;
+        color: #ed1c24;
+      }
+      .edit-circle-btn{
+        margin-left: 15px;
+        i{
+          vertical-align: text-bottom;
+        }
+      }
+      .import-btn{
+        margin-left: 15px;
+      }
+    }
+  }
 </style>

+ 3 - 4
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -19,7 +19,6 @@
                 :format="dateFormat"
                 :placeholder="['开始时间', '结束时间']" />
             </a-form-item>
-            </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="供应商">
@@ -81,7 +80,7 @@
       </template>
     </s-table>
     <!-- 选择基本信息弹框 -->
-    <!-- <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" /> -->
+    <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
   </a-card>
 </template>
 
@@ -89,9 +88,9 @@
 import moment from 'moment'
 import { sparePartsRetList } from '@/api/sparePartsRet'
 import { STable, VSelect } from '@/components'
-// import basicInfoModal from './basicInfoModal.vue'
+import basicInfoModal from './basicInfoModal.vue'
 export default {
-  components: { STable, VSelect },
+  components: { STable, VSelect, basicInfoModal },
   data () {
     return {
       advanced: false, // 高级搜索 展开/关闭