lilei преди 2 години
родител
ревизия
567d68c39c
променени са 3 файла, в които са добавени 324 реда и са изтрити 4 реда
  1. 1 1
      public/version.json
  2. 315 0
      src/views/salesManagement/salesQuery/chooseShelfProduct.vue
  3. 8 3
      src/views/salesManagement/salesQuery/edit.vue

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1667548739234
+  "version": 1667553372586
 }

+ 315 - 0
src/views/salesManagement/salesQuery/chooseShelfProduct.vue

@@ -0,0 +1,315 @@
+<template>
+  <a-modal
+    centered
+    class="chooseShelf-modal"
+    :footer="null"
+    :maskClosable="false"
+    :title="mtitle"
+    v-model="isShow"
+    @cancel="isShow = false"
+    width="80%">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <a-tabs>
+        <a-tab-pane key="1" tab="待补货产品">
+          <!-- 搜索条件 -->
+          <div class="table-page-search-wrapper">
+            <a-form-model
+              ref="ruleForm"
+              class="form-model-con"
+              layout="inline"
+              :model="queryParam"
+              @keyup.enter.native="$refs.table.refresh(true)" >
+              <a-row :gutter="5">
+                <a-col :md="4" :sm="24">
+                  <a-form-model-item label="产品编码">
+                    <a-input id="chooseShelf-code" ref="searchProductCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+                  </a-form-model-item>
+                </a-col>
+                <a-col :md="4" :sm="24">
+                  <a-form-model-item label="产品名称">
+                    <a-input id="chooseShelf-name" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+                  </a-form-model-item>
+                </a-col>
+                <a-col :md="4" :sm="24">
+                  <a-form-model-item label="产品分类">
+                    <ProductType id="chooseShelf-productType" :isDealer="true" @change="changeProductType" v-model="productType"></ProductType>
+                  </a-form-model-item>
+                </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-model-item label="库存情况">
+                    <a-checkbox-group :options="options" @change="onStockChange" />
+                  </a-form-model-item>
+                </a-col>
+                <a-col :md="6" :sm="12" style="margin-bottom: 10px;">
+                  <a-button type="primary" @click="$refs.table.refresh(true)" id="chooseShelf-refresh">查询</a-button>
+                  <a-button style="margin-left: 5px" @click="resetSearchForm" id="chooseShelf-reset">重置</a-button>
+                </a-col>
+              </a-row>
+            </a-form-model>
+          </div>
+          <div class="chooseShelf-modal-table">
+            <!-- 列表 -->
+            <s-table
+              class="sTable"
+              ref="table"
+              size="small"
+              :rowKey="(record) => record.id"
+              :columns="columns"
+              :data="loadData"
+              :scroll="{ y: 450 }"
+              :defaultLoadData="false"
+              :showPagination="false"
+              bordered>
+            </s-table>
+          </div>
+        </a-tab-pane>
+        <a-tab-pane key="2" tab="全部货架产品" force-render>
+          <!-- 搜索条件 -->
+          <div class="table-page-search-wrapper">
+            <a-form-model
+              ref="ruleForm1"
+              class="form-model-con"
+              layout="inline"
+              :model="queryParam1"
+              @keyup.enter.native="$refs.table1.refresh(true)" >
+              <a-row :gutter="5">
+                <a-col :md="4" :sm="24">
+                  <a-form-model-item label="产品编码">
+                    <a-input id="chooseShelf-code1" v-model.trim="queryParam1.productCode" allowClear placeholder="请输入产品编码"/>
+                  </a-form-model-item>
+                </a-col>
+                <a-col :md="4" :sm="24">
+                  <a-form-model-item label="产品名称">
+                    <a-input id="chooseShelf-name1" v-model.trim="queryParam1.productName" allowClear placeholder="请输入产品名称"/>
+                  </a-form-model-item>
+                </a-col>
+                <a-col :md="4" :sm="24">
+                  <a-form-model-item label="产品分类">
+                    <ProductType id="chooseShelf-productType1" :isDealer="true" @change="changeProductType1" v-model="productType1"></ProductType>
+                  </a-form-model-item>
+                </a-col>
+                <a-col :md="6" :sm="12" style="margin-bottom: 10px;">
+                  <a-button type="primary" @click="$refs.table1.refresh(true)" id="chooseShelf-refresh">查询</a-button>
+                  <a-button style="margin-left: 5px" @click="resetSearchForm1" id="chooseShelf-reset">重置</a-button>
+                </a-col>
+              </a-row>
+            </a-form-model>
+          </div>
+          <div class="chooseShelf-modal-table">
+            <!-- 列表 -->
+            <s-table
+              class="sTable"
+              ref="table1"
+              size="small"
+              :rowKey="(record) => record.id"
+              :columns="columns1"
+              :data="loadData1"
+              :scroll="{ y: 450 }"
+              :defaultLoadData="false"
+              :showPagination="false"
+              bordered>
+            </s-table>
+          </div>
+        </a-tab-pane>
+      </a-tabs>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { commonMixin } from '@/utils/mixin'
+import { STable } from '@/components'
+import ProductType from '../../common/productType.js'
+import { stockOutDetailList } from '@/api/stockOut'
+export default {
+  name: 'OutinDetailModal',
+  components: { STable, ProductType },
+  mixins: [commonMixin],
+  props: {
+    openModal: {
+      //  弹框显示状态
+      type: Boolean,
+      default: false
+    },
+    baseData: {
+      type: Object,
+      default: function () {
+        return null
+      }
+    }
+  },
+  data () {
+    return {
+      spinning: false,
+      advanced: false,
+      isShow: this.openModal, //  是否打开弹框
+      options: [
+        { label: '库存充足', value: '1' },
+        { label: '部分缺货', value: '2' },
+        { label: '全部缺货', value: '3' }
+      ],
+      productType: [],
+      queryParam: {
+        productCode: '', //  产品编码
+        productName: '', //  产品名称
+        productTypeSn1: '', //  产品一级分类
+        productTypeSn2: '', //  产品二级分类
+        productTypeSn3: '' //  产品三级分类
+      },
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.spinning = true
+        return stockOutDetailList(Object.assign(parameter, this.queryParam)).then(res => {
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = 0
+            for (var i = 0; i < data.length; i++) {
+              data[i].no = no + i + 1
+              data[i].totalCost = Number(data[i].putCost * data[i].outQty).toFixed(2)
+            }
+          }
+          this.spinning = false
+          return data
+        })
+      },
+      // -------- 全部产品 --------
+      productType1: [],
+      queryParam1: {
+        productCode: '', //  产品编码
+        productName: '', //  产品名称
+        productTypeSn1: '', //  产品一级分类
+        productTypeSn2: '', //  产品二级分类
+        productTypeSn3: '' //  产品三级分类
+      },
+      // 加载数据方法 必须为 Promise 对象
+      loadData1: parameter => {
+        this.spinning = true
+        return stockOutDetailList(Object.assign(parameter, this.queryParam1)).then(res => {
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = 0
+            for (var i = 0; i < data.length; i++) {
+              data[i].no = no + i + 1
+              data[i].totalCost = Number(data[i].putCost * data[i].outQty).toFixed(2)
+            }
+          }
+          this.spinning = false
+          return data
+        })
+      }
+    }
+  },
+  computed: {
+    mtitle () {
+      return '货架产品' + (this.baseData && this.baseData.shelfName ? this.baseData.shelfName : '')
+    },
+    columns () {
+      const arr = [
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '库存批次', dataIndex: 'stockBatchNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '入库类型', dataIndex: 'putBizTypeDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouseName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓位', dataIndex: 'warehouseLocationName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        // { title: '成本价', dataIndex: 'putCost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '本次出库数量', dataIndex: 'outQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        // { title: '成本小计', dataIndex: 'totalCost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+      ]
+      if (this.$hasPermissions('M_ShowAllCost')) {
+        arr.splice(5, 0, { title: '成本价', dataIndex: 'putCost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(7, 0, { title: '成本小计', dataIndex: 'totalCost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+      }
+      return arr
+    },
+    columns1 () {
+      const arr = [
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '库存批次', dataIndex: 'stockBatchNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '入库类型', dataIndex: 'putBizTypeDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouseName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓位', dataIndex: 'warehouseLocationName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        // { title: '成本价', dataIndex: 'putCost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '本次出库数量', dataIndex: 'outQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        // { title: '成本小计', dataIndex: 'totalCost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+      ]
+      if (this.$hasPermissions('M_ShowAllCost')) {
+        arr.splice(5, 0, { title: '成本价', dataIndex: 'putCost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(7, 0, { title: '成本小计', dataIndex: 'totalCost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+      }
+      return arr
+    }
+  },
+  methods: {
+    cansel () {
+      this.isShow = false
+    },
+    //  产品分类  change
+    changeProductType (val, opt) {
+      this.queryParam.productTypeSn1 = val[0] ? val[0] : ''
+      this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
+      this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
+    },
+    onStockChange (val) {
+      console.log(val)
+    },
+    resetSearchForm () {
+      this.queryParam.productCode = ''
+      this.queryParam.productName = ''
+      this.queryParam.productTypeSn1 = ''
+      this.queryParam.productTypeSn2 = ''
+      this.queryParam.productTypeSn3 = ''
+      this.productType = []
+      this.$refs.ruleForm.resetFields()
+      this.$refs.table.refresh(true)
+    },
+    // ---------- 全部产品----------
+    //  产品分类  change
+    changeProductType1 (val, opt) {
+      this.queryParam1.productTypeSn1 = val[0] ? val[0] : ''
+      this.queryParam1.productTypeSn2 = val[1] ? val[1] : ''
+      this.queryParam1.productTypeSn3 = val[2] ? val[2] : ''
+    },
+    resetSearchForm1 () {
+      this.queryParam1.productCode = ''
+      this.queryParam1.productName = ''
+      this.queryParam1.productTypeSn1 = ''
+      this.queryParam1.productTypeSn2 = ''
+      this.queryParam1.productTypeSn3 = ''
+      this.productType1 = []
+      this.$refs.ruleForm1.resetFields()
+      this.$refs.table1.refresh(true)
+    }
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close')
+      } else {
+        this.$nextTick(() => {
+          this.$refs.table.refresh(true)
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less">
+.chooseShelf-modal {
+	.ant-modal-body {
+		padding: 0;
+    .chooseShelf-modal-table{
+      padding: 0 20px 10px;
+    }
+    .table-page-search-wrapper{
+      padding: 5px 20px 0;
+    }
+	}
+}
+</style>

+ 8 - 3
src/views/salesManagement/salesQuery/edit.vue

@@ -107,6 +107,7 @@
                   id="salesEdit-import">导入产品</a-button>
                 <a-button
                   type="default"
+                  @click="showShelfModal=true"
                   id="salesEdit-shelf">货架产品</a-button>
                 <a-button
                   type="link"
@@ -200,12 +201,14 @@
     <!-- <div class="affix-cont"></div> -->
     <!-- 选择客户弹框 -->
     <choose-custom-modal ref="custModal" :show="openModal" @updateData="updateData" @cancel="openModal=false" />
-    <!-- 导入明细 -->
+    <!-- 导入产品 -->
     <importGuideModal :openModal="openGuideModal" :params="{salesBillSn: $route.params.sn, salesBillNo:detailData?detailData.salesBillNo:''}" @close="openGuideModal=false" @ok="hanldeImprotOk" />
     <!-- 收付款弹框 -->
     <settleModal ref="settleModal" @ok="settleAcountPay" :openModal="openSettleModal" @close="openSettleModal=false"></settleModal>
-    <!-- 出库明细 -->
+    <!-- 出库明细 -->
     <outInDetialModal ref="outInDetialModal" outBizType="SALES" :openModal="showOutInModal" @close="showOutInModal=false"></outInDetialModal>
+    <!-- 选择货架产品 -->
+    <chooseShelfProduct ref="chooseShelfProduct" :baseData="detailData" :openModal="showShelfModal" @close="showShelfModal=false"></chooseShelfProduct>
   </div>
 </template>
 <script>
@@ -220,11 +223,12 @@ import { stockByProductSn } from '@/api/stock'
 import { salesDetail, salesWriteSubmit, salesWriteDiscount, salesDetailPrint, salesDetailExport, salesDel } from '@/api/sales'
 import { salesDetailList, salesDetailInsert, salesDetailUpdatePrice, salesDetailUpdateQty, salesDetailDel, salesDetailDelAll, salesDetailInsertImport } from '@/api/salesDetail'
 import outInDetialModal from '@/views/common/outInDetialModal.vue'
+import chooseShelfProduct from './chooseShelfProduct.vue'
 import Print from '@/views/common/print.vue'
 import { hdPrint } from '@/libs/JGPrint'
 export default {
   name: 'SalesEdit',
-  components: { STable, VSelect, queryPart, chooseCustomModal, Print, importGuideModal, settleModal, outInDetialModal },
+  components: { STable, VSelect, queryPart, chooseCustomModal, Print, importGuideModal, settleModal, outInDetialModal, chooseShelfProduct },
   mixins: [commonMixin],
   data () {
     return {
@@ -239,6 +243,7 @@ export default {
       openGuideModal: false, // 导入产品弹框
       openSettleModal: false, // 打开收款弹框
       enableFundAccount: false, // 是否开启资金账户管理
+      showShelfModal: false, // 货架产品弹框
       delLoading: false,
       detailData: { discountAmount: 0, id: null, salesBillSn: '' }, // 订单基础数据
       dataSource: [],