lilei 2 年之前
父節點
當前提交
02f84a3e52

+ 1 - 1
public/version.json

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

+ 9 - 0
src/api/allocLinkageOut.js

@@ -102,6 +102,15 @@ export const getTenantList = (params) => {
     method: 'get'
   })
 }
+// 调往对象
+export const getReportTenantList = (params) => {
+  return axios({
+    url: '/report/reportAllocLinkageOut/reportDealer',
+    data: params,
+    method: 'post'
+  })
+}
+
 // 连锁调拨调出 详情  打印
 export const allocLinkageOutDetailPrint = params => {
   const data = {

+ 8 - 1
src/api/allocLinkagePut.js

@@ -1,5 +1,12 @@
 import { axios } from '@/utils/request'
-
+// 调往对象
+export const getReportTenantList = (params) => {
+  return axios({
+    url: '/report/reportAllocLinkagePut/reportDealer',
+    data: params,
+    method: 'post'
+  })
+}
 //  连锁调拨调入 列表  分页
 export const allocLinkagePutList = (params) => {
   const url = `/allocLinkagePut/queryPage/${params.pageNo}/${params.pageSize}`

+ 2 - 2
src/config/router.config.js

@@ -2621,7 +2621,7 @@ export const asyncRouterMap = [
             meta: {
               title: '连锁调入报表',
               icon: 'profile',
-              permission: 'M_chainTransferReportList'
+              // permission: 'M_chainTransferReportList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -2645,7 +2645,7 @@ export const asyncRouterMap = [
             meta: {
               title: '连锁调出报表',
               icon: 'profile',
-              permission: 'M_chainCallReportList'
+              // permission: 'M_chainCallReportList'
             },
             hideChildrenInMenu: true,
             children: [

+ 1 - 1
src/views/chainReportData/chainCallReport/detailList.vue

@@ -117,7 +117,7 @@ import { downloadExcel } from '@/libs/JGPrint.js'
 import ProductType from '../../common/productType.js'
 import ProductBrand from '../../common/productBrand.js'
 import supplier from '@/views/common/supplier'
-import outTenant from '@/views/common/outTenant.js'
+import outTenant from './outTenant.js'
 import { reportAllocLinkageOutDetailList, reportAllocLinkageOutDetailCount, reportAllocLinkageOutDetailExport } from '@/api/reportData'
 export default {
   components: { STable, VSelect, rangeDate, ProductType, ProductBrand, supplier, outTenant },

+ 1 - 1
src/views/chainReportData/chainCallReport/list.vue

@@ -95,7 +95,7 @@ import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { downloadExcel } from '@/libs/JGPrint.js'
-import outTenant from '@/views/common/outTenant.js'
+import outTenant from './outTenant.js'
 import { reportAllocLinkageOutList, reportAllocLinkageOutCount, reportAllocLinkageOutExport } from '@/api/reportData'
 export default {
   components: { STable, VSelect, rangeDate, outTenant },

+ 76 - 0
src/views/chainReportData/chainCallReport/outTenant.js

@@ -0,0 +1,76 @@
+import { getReportTenantList } from '@/api/allocLinkagePut'
+// 调出对象
+const SettleStyle = {
+  template: `
+        <a-select
+          :id="id"
+          :placeholder="placeholder"
+          allowClear
+          :value="defaultVal"
+          :showSearch="true"
+          @change="handleChange"
+          :filter-option="filterOption">
+          <a-select-option v-for="item in list" :key="item[defValKey]" :value="item[defValKey]">{{ item.dealerName }}</a-select-option>
+        </a-select>
+    `,
+  props: {
+    value: {
+      type: String,
+      defatut: ''
+    },
+    id: {
+      type: String,
+      default: ''
+    },
+    defValKey: {
+      type: String,
+      default: 'dealerSn'
+    },
+    placeholder: {
+      type: String,
+      default: '请选择调出对象'
+    }
+  },
+  data() {
+    return {
+      defaultVal: this.value||undefined,
+      list: []
+    };
+  },
+  watch: {
+    value(newValue, oldValue) {
+      console.log(newValue)
+      this.defaultVal = newValue||undefined
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    filterOption (input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
+    },
+    handleChange(value) {
+      console.log(value)
+      this.defaultVal = value;
+      const row = this.list.find(item => item[this.defValKey] == value)
+      this.$emit('input', value);
+      this.$emit('change', this.defaultVal, row?row.dealerName:'');
+    },
+    // 列表数据
+    getList () {
+      const _this = this
+      getReportTenantList({}).then(res => {
+        if (res.status == 200) {
+          _this.list = res.data || []
+        } else {
+          _this.list = []
+        }
+      })
+    },
+  },
+};
+
+export default SettleStyle

+ 1 - 1
src/views/chainReportData/chainTransferReport/detailList.vue

@@ -112,7 +112,7 @@ import { downloadExcel } from '@/libs/JGPrint.js'
 import ProductType from '../../common/productType.js'
 import ProductBrand from '../../common/productBrand.js'
 import supplier from '@/views/common/supplier'
-import outTenant from '@/views/common/outTenant.js'
+import outTenant from './outTenant.js'
 import { reportAllocLinkagePutDetailList, reportAllocLinkagePutDetailCount, reportAllocLinkagePutDetailExport } from '@/api/reportData'
 export default {
   components: { STable, VSelect, rangeDate, ProductType, ProductBrand, supplier, outTenant },

+ 1 - 1
src/views/chainReportData/chainTransferReport/list.vue

@@ -84,7 +84,7 @@ import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { downloadExcel } from '@/libs/JGPrint.js'
-import outTenant from '@/views/common/outTenant.js'
+import outTenant from './outTenant.js'
 import { reportAllocLinkagePutList, reportAllocLinkagePutCount, reportAllocLinkagePutExport } from '@/api/reportData'
 export default {
   components: { STable, VSelect, rangeDate, outTenant },

+ 76 - 0
src/views/chainReportData/chainTransferReport/outTenant.js

@@ -0,0 +1,76 @@
+import { getReportTenantList } from '@/api/allocLinkageOut'
+// 调出对象
+const SettleStyle = {
+  template: `
+        <a-select
+          :id="id"
+          :placeholder="placeholder"
+          allowClear
+          :value="defaultVal"
+          :showSearch="true"
+          @change="handleChange"
+          :filter-option="filterOption">
+          <a-select-option v-for="item in list" :key="item[defValKey]" :value="item[defValKey]">{{ item.dealerName }}</a-select-option>
+        </a-select>
+    `,
+  props: {
+    value: {
+      type: String,
+      defatut: ''
+    },
+    id: {
+      type: String,
+      default: ''
+    },
+    defValKey: {
+      type: String,
+      default: 'dealerSn'
+    },
+    placeholder: {
+      type: String,
+      default: '请选择调出对象'
+    }
+  },
+  data() {
+    return {
+      defaultVal: this.value||undefined,
+      list: []
+    };
+  },
+  watch: {
+    value(newValue, oldValue) {
+      console.log(newValue)
+      this.defaultVal = newValue||undefined
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    filterOption (input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
+    },
+    handleChange(value) {
+      console.log(value)
+      this.defaultVal = value;
+      const row = this.list.find(item => item[this.defValKey] == value)
+      this.$emit('input', value);
+      this.$emit('change', this.defaultVal, row?row.dealerName:'');
+    },
+    // 列表数据
+    getList () {
+      const _this = this
+      getReportTenantList({}).then(res => {
+        if (res.status == 200) {
+          _this.list = res.data || []
+        } else {
+          _this.list = []
+        }
+      })
+    },
+  },
+};
+
+export default SettleStyle

+ 2 - 2
vue.config.js

@@ -211,8 +211,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.0.103/qpls-md',
-        target: 'http://p.iscm.360arrow.com/qpls-md',
+        target: 'http://192.168.0.216:8076/qpls-md',
+        // target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,