chenrui 4 vuotta sitten
vanhempi
commit
c1f50c2ce0
41 muutettua tiedostoa jossa 170 lisäystä ja 164 poistoa
  1. 8 1
      src/api/customer.js
  2. 8 0
      src/api/purchase.js
  3. 1 0
      src/components/tools/UserMenu.vue
  4. 0 2
      src/views/allocationManagement/chainTransferIn/list.vue
  5. 0 4
      src/views/allocationManagement/chainTransferOut/list.vue
  6. 0 4
      src/views/allocationManagement/storeTransferOut/list.vue
  7. 0 4
      src/views/allocationManagement/warehouseAllocation/list.vue
  8. 1 5
      src/views/bulkManagement/bulkReturnGoods/list.vue
  9. 0 4
      src/views/bulkManagement/bulkWarehousingOrder/list.vue
  10. 1 1
      src/views/customerManagement/customerInfo/edit.vue
  11. 20 18
      src/views/customerManagement/customerInfo/list.vue
  12. 0 2
      src/views/financialManagement/companyCollectionPayment/list.vue
  13. 0 2
      src/views/financialManagement/expenseManagement/list.vue
  14. 0 2
      src/views/financialManagement/inventoryReview/list.vue
  15. 0 2
      src/views/financialManagement/ledgerRecord/list.vue
  16. 0 2
      src/views/financialManagement/warehousingAudit/list.vue
  17. 0 2
      src/views/financialManagement/withdrawalManagement/list.vue
  18. 0 2
      src/views/inventoryManagement/inventoryChecking/list.vue
  19. 0 2
      src/views/inventoryManagement/inventoryWarning/list.vue
  20. 19 3
      src/views/inventoryManagement/satelliteWarehouseInventory/list.vue
  21. 0 2
      src/views/inventoryManagement/warehouse/list.vue
  22. 0 2
      src/views/inventoryManagement/warehouse/storingLocation/list.vue
  23. 0 2
      src/views/power/dataDictionary/codeItemModal.vue
  24. 0 2
      src/views/power/dataDictionary/codeModal.vue
  25. 0 6
      src/views/power/dataDictionary/dataDictionary.vue
  26. 0 2
      src/views/power/register/register.vue
  27. 0 2
      src/views/power/role/menuModal.vue
  28. 0 2
      src/views/power/role/roleList.vue
  29. 0 2
      src/views/power/role/roleModal.vue
  30. 0 2
      src/views/power/user/userList.vue
  31. 0 2
      src/views/power/user/userModal.vue
  32. 21 22
      src/views/purchasingManagement/purchaseOrder/detail.vue
  33. 12 31
      src/views/purchasingManagement/purchaseOrder/list.vue
  34. 0 2
      src/views/purchasingManagement/purchaseOrder/receivingAddress/chooseAddressModal.vue
  35. 19 2
      src/views/salesManagement/giftRecord/list.vue
  36. 0 2
      src/views/salesManagement/quotation/list.vue
  37. 21 8
      src/views/salesManagement/salesQuery/list.vue
  38. 19 4
      src/views/salesManagement/salesReturn/list.vue
  39. 0 2
      src/views/salesManagement/urgentItemsOffset/detail.vue
  40. 19 2
      src/views/salesManagement/urgentItemsOffset/list.vue
  41. 1 1
      vue.config.js

+ 8 - 1
src/api/customer.js

@@ -11,7 +11,14 @@ export const custList = (params) => {
     method: 'post'
   })
 }
-
+//  客户列表  不分页
+export const custFindAll = (params) => {
+  return axios({
+    url: `/cust/findAll`,
+    data: {},
+    method: 'post'
+  })
+}
 // 新增/编辑客户
 export const custSave = params => {
   return axios({

+ 8 - 0
src/api/purchase.js

@@ -11,6 +11,14 @@ export const purchaseList = (params) => {
     method: 'post'
   })
 }
+//  采购 详情
+export const purchaseDetail = (params) => {
+  return axios({
+    url: `/purchase/findById/${params.id}`,
+    data: params,
+    method: 'get'
+  })
+}
 //  采购 打印
 export const purchasePrint = (params) => {
   return axios({

+ 1 - 0
src/components/tools/UserMenu.vue

@@ -67,6 +67,7 @@ export default {
       this.$confirm({
         title: '提示',
         content: '真的要注销登录吗 ?',
+        centered: true,
         onOk: () => {
           return this.Logout({}).then(() => {
             setTimeout(() => {

+ 0 - 2
src/views/allocationManagement/chainTransferIn/list.vue

@@ -159,8 +159,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '确认要审核通过吗?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
           // delectRolePower({

+ 0 - 4
src/views/allocationManagement/chainTransferOut/list.vue

@@ -169,8 +169,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '删除后不可恢复,确定要进行删除吗?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
           // delectRolePower({
@@ -195,8 +193,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '确认要审核通过吗?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
           // delectRolePower({

+ 0 - 4
src/views/allocationManagement/storeTransferOut/list.vue

@@ -169,8 +169,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '删除后不可恢复,确定要进行删除吗?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
           // delectRolePower({
@@ -193,8 +191,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '确认要审核通过吗?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
           // delectRolePower({

+ 0 - 4
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -167,8 +167,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '删除后不可恢复,确定要进行删除吗?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
           // delectRolePower({
@@ -189,8 +187,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '确认要审核通过吗?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
           // delectRolePower({

+ 1 - 5
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -186,8 +186,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '删除后不可恢复,确定要进行删除吗?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
           // warehouseDel({
@@ -207,9 +205,7 @@ export default {
       const content = '确认要审核' + row.adopt ? '不' : '' + '通过吗?'
       this.$confirm({
         title: '提示',
-        content: '确认要审核通过吗?',
-        okText: '确定',
-        cancelText: '取消',
+        content: content,
         centered: true,
         onOk () {
           // warehouseDel({

+ 0 - 4
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -190,8 +190,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '确定是否入库?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
           // delectRolePower({
@@ -212,8 +210,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '删除后不可恢复,确定要进行删除吗?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
           // delectRolePower({

+ 1 - 1
src/views/customerManagement/customerInfo/edit.vue

@@ -76,7 +76,7 @@
           <a-col :span="8">
             <a-form-model-item label="配送方式" prop="dispatchType">
               <v-select
-                code="DISPATCH_FASHION"
+                code="DISPATCH_TYPE"
                 id="customerManagementEdit-dispatchType"
                 v-model="form.dispatchType"
                 allowClear

+ 20 - 18
src/views/customerManagement/customerInfo/list.vue

@@ -26,7 +26,7 @@
                 :showSearch="true"
                 option-filter-prop="children"
                 :filter-option="filterOption">
-                <a-select-option v-for="item in custList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
+                <a-select-option v-for="item in custAllList" :key="item.customerSn" :value="item.customerName">{{ item.customerName }}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -132,7 +132,7 @@
 <script>
 import moment from 'moment'
 import { getArea } from '@/api/data'
-import { custList, custDel } from '@/api/customer'
+import { custList, custDel, custFindAll } from '@/api/customer'
 import { custTypeFindAll } from '@/api/custType'
 import { STable, VSelect } from '@/components'
 import customerManagementDetailModal from './detailModal.vue'
@@ -196,7 +196,7 @@ export default {
       addrProvinceList: [], //  省下拉
       addrCityList: [], //  市下拉
       addrDistrictList: [], //  区下拉
-      custList: [], //  客户 下拉数据
+      custAllList: [], //  客户 下拉数据
       custTypeList: [], //  客户类型 下拉数据
       openModal: false, //  查看客户详情  弹框
       itemId: '' //  当前客户id
@@ -209,7 +209,7 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.queryParam.customerName = ''
+      this.queryParam.customerName = undefined
       this.queryParam.contactName = ''
       this.queryParam.provinceSn = undefined
       this.queryParam.citySn = undefined
@@ -234,13 +234,9 @@ export default {
       this.$confirm({
         title: '提示',
         content: '删除后不可恢复,确定要进行删除吗?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
-          custDel({
-            id: row.id
-          }).then(res => {
+          custDel({ id: row.id }).then(res => {
             if (res.status == 200) {
               _this.$message.success(res.message)
               _this.$refs.table.refresh()
@@ -266,6 +262,17 @@ export default {
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     },
+    // 客户无分页列表数据
+    getCustAllList () {
+      const _this = this
+      custFindAll().then(res => {
+        if (res.status == 200) {
+          _this.custAllList = res.data || []
+        } else {
+          _this.custAllList = []
+        }
+      })
+    },
     //  获取客户类型列表
     getCustTypeList () {
       const _this = this
@@ -281,22 +288,16 @@ export default {
     getCityList (val) {
       this.addrCityList = []
       this.addrDistrictList = []
-      this.form.cityCode = undefined
-      this.form.districtCode = undefined
-      this.form.address = ''
+      this.queryParam.citySn = undefined
+      this.queryParam.countySn = undefined
       this.getArea('city', val)
     },
     // 获取区县列表
     getAreaList (val) {
       this.addrDistrictList = []
-      this.form.districtCode = undefined
-      this.form.address = ''
+      this.queryParam.countySn = undefined
       this.getArea('district', val)
     },
-    // 区县变更
-    areaCharged (val) {
-      this.form.address = ''
-    },
     //  省/市/区
     getArea (type, sn) {
       let params
@@ -329,6 +330,7 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.getArea('province')
+      vm.getCustAllList()
       vm.getCustTypeList()
     })
   }

+ 0 - 2
src/views/financialManagement/companyCollectionPayment/list.vue

@@ -164,8 +164,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '操作后不可恢复,确定要进行'+ (type==1 ? ' 通过 ' : ' 不通过 ') +'操作吗?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
           // delectRolePower({

+ 0 - 2
src/views/financialManagement/expenseManagement/list.vue

@@ -204,8 +204,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '操作后不可恢复,确定要进行' + (type == 1 ? ' 通过 ' : ' 不通过 ') + '操作吗?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
           // delectRolePower({

+ 0 - 2
src/views/financialManagement/inventoryReview/list.vue

@@ -138,8 +138,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '操作后不可恢复,确定要进行'+ (type==1 ? ' 通过 ' : ' 不通过 ') +'操作吗?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
           // delectRolePower({

+ 0 - 2
src/views/financialManagement/ledgerRecord/list.vue

@@ -137,8 +137,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '操作后不可恢复,确定要进行' + (type == 1 ? ' 通过 ' : ' 不通过 ') + '操作吗?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
           // delectRolePower({

+ 0 - 2
src/views/financialManagement/warehousingAudit/list.vue

@@ -150,8 +150,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '操作后不可恢复,确定要进行' + (type == 1 ? ' 通过 ' : ' 不通过 ') + '操作吗?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
           // delectRolePower({

+ 0 - 2
src/views/financialManagement/withdrawalManagement/list.vue

@@ -127,8 +127,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '操作后不可恢复,确定要进行' + (type == 1 ? ' 通过 ' : ' 不通过 ') + '操作吗?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
           // delectRolePower({

+ 0 - 2
src/views/inventoryManagement/inventoryChecking/list.vue

@@ -201,8 +201,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '删除后不可恢复,确定要进行删除吗?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
           // warehouseDel({

+ 0 - 2
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -340,8 +340,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '确定提交批量更新的内容吗?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
           // delectRolePower({

+ 19 - 3
src/views/inventoryManagement/satelliteWarehouseInventory/list.vue

@@ -21,7 +21,7 @@
                 option-filter-prop="children"
                 :filter-option="filterOption"
               >
-                <a-select-option v-for="item in brandData" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
+                <a-select-option v-for="item in custAllList" :key="item.customerSn" :value="item.customerName">{{ item.customerName }}</a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
@@ -73,9 +73,9 @@
 </template>
 
 <script>
-// import { customerBundleDelayList, customerBundleExportDelay } from '@/api/FinancialManagement'
 import { STable, VSelect } from '@/components'
 import satelliteWarehouseInventoryAddModal from './addModal.vue'
+import { custFindAll } from '@/api/customer'
 export default {
   components: { STable, VSelect, satelliteWarehouseInventoryAddModal },
   data () {
@@ -93,7 +93,7 @@ export default {
         customer: [{ required: true, message: '请输入客户名称', trigger: 'blur' }]
       },
       disabled: false, //  查询、重置按钮是否可操作
-      brandData: [], //  产品品牌下拉数据
+      custAllList: [], //  客户 下拉数据
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '客户名称', dataIndex: 'productName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
@@ -180,9 +180,25 @@ export default {
     closeModal () {
       this.openModal = false
     },
+    // 客户无分页列表数据
+    getCustAllList () {
+      const _this = this
+      custFindAll().then(res => {
+        if (res.status == 200) {
+          _this.custAllList = res.data || []
+        } else {
+          _this.custAllList = []
+        }
+      })
+    },
     filterOption (input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.getCustAllList()
+    })
   }
 }
 </script>

+ 0 - 2
src/views/inventoryManagement/warehouse/list.vue

@@ -106,8 +106,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '删除后不可恢复,确定要进行删除吗?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
           warehouseDel({

+ 0 - 2
src/views/inventoryManagement/warehouse/storingLocation/list.vue

@@ -124,8 +124,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '删除后不可恢复,确定要进行删除吗?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
           warehouseLocDel({

+ 0 - 2
src/views/power/dataDictionary/codeItemModal.vue

@@ -254,8 +254,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '确定取消吗?',
-        okText: '确定',
-        cancelText: '取消',
 		centered: true,
         onOk () {
           _this.clear()

+ 0 - 2
src/views/power/dataDictionary/codeModal.vue

@@ -148,8 +148,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '确定取消吗?',
-        okText: '确定',
-        cancelText: '取消',
 		centered: true,
         onOk () {
           _this.clear()

+ 0 - 6
src/views/power/dataDictionary/dataDictionary.vue

@@ -256,8 +256,6 @@ export default {
       this.$confirm({
         title: '警告',
         content: `确定要删除 ${this.codeList[this.selectedKey].name} 吗?`,
-        okText: '确定',
-        cancelText: '取消',
 		centered: true,
         onOk () {
           delLookUp({
@@ -297,8 +295,6 @@ export default {
       this.$confirm({
         title: '警告',
         content: `确定要删除您选择的这${this.selectedNum}条数据吗?`,
-        okText: '确定',
-        cancelText: '取消',
 		centered: true,
         onOk () {
           // delectUserPower({
@@ -320,8 +316,6 @@ export default {
       this.$confirm({
         title: '警告',
         content: '确定要删除吗?',
-        okText: '确定',
-        cancelText: '取消',
 		centered: true,
         onOk () {
           delLookUpItem({

+ 0 - 2
src/views/power/register/register.vue

@@ -341,8 +341,6 @@ export default {
       this.$confirm({
         title: '警告',
         content: `确定要删除您选择的 ${_this.formData.dispname} 的数据吗?`,
-        okText: '确定',
-        cancelText: '取消',
 		centered: true,
         onOk () {
           delRegisterNode({

+ 0 - 2
src/views/power/role/menuModal.vue

@@ -104,8 +104,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '确定取消吗?',
-        okText: '确定',
-        cancelText: '取消',
 		centered: true,
         onOk () {
           _this.clear()

+ 0 - 2
src/views/power/role/roleList.vue

@@ -203,8 +203,6 @@ export default {
       this.$confirm({
         title: '警告',
         content: '删除后无法恢复,确认删除?',
-        okText: '确定',
-        cancelText: '取消',
 		centered: true,
         onOk () {
           delectRolePower({

+ 0 - 2
src/views/power/role/roleModal.vue

@@ -123,8 +123,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '确定取消吗?',
-        okText: '确定',
-        cancelText: '取消',
 		centered: true,
         onOk () {
           _this.clear()

+ 0 - 2
src/views/power/user/userList.vue

@@ -176,8 +176,6 @@ export default {
       this.$confirm({
         title: '警告',
         content: '删除后无法恢复,确认删除?',
-        okText: '确定',
-        cancelText: '取消',
 		centered: true,
         onOk () {
           delectUserPower({

+ 0 - 2
src/views/power/user/userModal.vue

@@ -200,8 +200,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '确定取消吗?',
-        okText: '确定',
-        cancelText: '取消',
 		centered: true,
         onOk () {
           _this.clear()

+ 21 - 22
src/views/purchasingManagement/purchaseOrder/detail.vue

@@ -84,6 +84,8 @@
 
 <script>
 import { STable, VSelect } from '@/components'
+import { purchaseDetail } from '@/api/purchase'
+import { purchaseDetailList } from '@/api/purchaseDetail'
 export default {
   components: { STable, VSelect },
   data () {
@@ -103,40 +105,37 @@ export default {
       // 加载数据方法 必须为 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
-          }
+        return purchaseDetailList(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
-          resolve(data)
+          this.disabled = false
+          return data
         })
-      }
+      },
+      detailData: null //  详情数据
     }
   },
   methods: {
     //  返回列表
     handleBack () {
       this.$router.push({ path: '/purchasingManagement/purchaseOrder/list' })
+    },
+    //  详情
+    getDetail () {
+      purchaseDetail({ id: this.$route.params.id }).then(res => {
+        if (res.status == 200) {
+          this.detailData = res.data
+        } else {
+          this.detailData = null
+        }
+      })
     }
+  },
+  mounted () {
+    this.getDetail()
   }
 }
 </script>

+ 12 - 31
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -84,8 +84,8 @@
       :scroll="{ x: 1595 }"
       bordered>
       <!-- 采购单号 -->
-      <template slot="purchaseNo" slot-scope="text, record">
-        <span style="color: #ed1c24;cursor: pointer;">{{ record.purchaseNo }}</span>
+      <template slot="purchaseBillNo" slot-scope="text, record">
+        <span style="color: #ed1c24;cursor: pointer;">{{ record.purchaseBillNo }}</span>
       </template>
       <!-- 业务/审核状态 -->
       <template slot="auditStatus" slot-scope="text, record">
@@ -116,7 +116,7 @@
 <script>
 import { STable, VSelect } from '@/components'
 import basicInfoModal from './basicInfoModal.vue'
-// import { getRoleList, getServiceList } from '@/api/manage'
+import { purchaseList } from '@/api/purchase'
 export default {
   components: { STable, VSelect, basicInfoModal },
   data () {
@@ -130,12 +130,12 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '采购单号', scopedSlots: { customRender: 'purchaseNo' }, width: 140, align: 'center' },
-        { title: '创建时间', dataIndex: 'creatDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '采购单号', scopedSlots: { customRender: 'purchaseBillNo' }, width: 140, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '供应商', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品款数', dataIndex: 'totalP', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '采购数量', dataIndex: 'totalNums', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '采购金额(¥)', dataIndex: 'totalPrice', width: 115, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '产品款数', dataIndex: 'totalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '采购数量', dataIndex: 'totalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '采购金额(¥)', dataIndex: 'totalAmount', width: 115, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '业务状态', scopedSlots: { customRender: 'auditStatus' }, width: 100, align: 'center' },
         { title: '财务状态', scopedSlots: { customRender: 'financialStatus' }, width: 100, align: 'center' },
         { title: '重要提示', dataIndex: 'shDate', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
@@ -144,31 +144,14 @@ export default {
       // 加载数据方法 必须为 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: 'jgqp1111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-            ],
-            count: 10
-          }
+        return purchaseList(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
-          resolve(data)
+          this.disabled = false
+          return data
         })
       }
     }
@@ -204,8 +187,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '删除后不可恢复,确定要进行删除吗?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
           // delectRolePower({

+ 0 - 2
src/views/purchasingManagement/purchaseOrder/receivingAddress/chooseAddressModal.vue

@@ -130,8 +130,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '删除后不可恢复,确定要进行删除吗?',
-        okText: '确定',
-        cancelText: '取消',
 		  centered: true,
         onOk () {
           // delectRolePower({

+ 19 - 2
src/views/salesManagement/giftRecord/list.vue

@@ -42,7 +42,7 @@
                   :showSearch="true"
                   option-filter-prop="children"
                   :filter-option="filterOption">
-                  <a-select-option v-for="item in customerList" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
+                  <a-select-option v-for="item in custAllList" :key="item.customerSn" :value="item.customerName">{{ item.customerName }}</a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>
@@ -75,6 +75,7 @@
 <script>
 import moment from 'moment'
 import { getOperationalPrecision } from '@/libs/tools.js'
+import { custFindAll } from '@/api/customer'
 import { giftsDetailList } from '@/api/dealerProduct'
 import { STable, VSelect } from '@/components'
 export default {
@@ -128,7 +129,7 @@ export default {
           return data
         })
       },
-      customerList: [] //  客户下拉数据
+      custAllList: [] //  客户下拉数据
     }
   },
   methods: {
@@ -136,6 +137,17 @@ export default {
     disabledDate (date, dateStrings) {
       return date && date.valueOf() > Date.now()
     },
+    // 客户无分页列表数据
+    getCustAllList () {
+      const _this = this
+      custFindAll().then(res => {
+        if (res.status == 200) {
+          _this.custAllList = res.data || []
+        } else {
+          _this.custAllList = []
+        }
+      })
+    },
     filterOption (input, option) {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
@@ -150,6 +162,11 @@ export default {
       this.time = []
       this.$refs.table.refresh(true)
     }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.getCustAllList()
+    })
   }
 }
 </script>

+ 0 - 2
src/views/salesManagement/quotation/list.vue

@@ -187,8 +187,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '删除后不可恢复,确定要进行删除吗?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
           // warehouseDel({

+ 21 - 8
src/views/salesManagement/salesQuery/list.vue

@@ -25,7 +25,7 @@
                 :showSearch="true"
                 option-filter-prop="children"
                 :filter-option="filterOption">
-                <a-select-option v-for="item in customeList" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
+                <a-select-option v-for="item in custAllList" :key="item.customerSn" :value="item.customerName">{{ item.customerName }}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -145,6 +145,7 @@
 <script>
 import { STable, VSelect } from '@/components'
 import chooseCustomModal from './chooseCustomModal.vue'
+import { custFindAll } from '@/api/customer'
 import { salesList, salesDel } from '@/api/sales'
 export default {
   name: 'TableList',
@@ -156,7 +157,7 @@ export default {
       dateFormat: 'YYYY-MM-DD',
       time: [], //  创建时间
       openModal: false, // 选择客户弹框是否显示
-      customeList: [],
+      custAllList: [], //  客户 下拉数据
       // 查询参数
       queryParam: {
         buyerName: undefined, //  客户名称
@@ -218,10 +219,7 @@ export default {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: '确认要审核吗?',
-        okText: '审核通过',
-        cancelText: '审核不通过',
-        closable: true,
+        content: '确认要审核通过吗?',
         centered: true,
         onOk () {
           // delectRolePower({
@@ -242,7 +240,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '确认要出库吗?',
-        closable: true,
         centered: true,
         onOk () {
           // delectRolePower({
@@ -271,7 +268,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '确认要删除吗?',
-        closable: true,
         centered: true,
         onOk () {
           salesDel({ id: row.id }).then(res => {
@@ -283,6 +279,18 @@ export default {
         }
       })
     },
+    // 客户无分页列表数据
+    getCustAllList () {
+      const _this = this
+      custFindAll().then(res => {
+        if (res.status == 200) {
+          _this.custAllList = res.data || []
+        } else {
+          _this.custAllList = []
+        }
+      })
+    },
+    // 重置
     resetSearchForm () {
       this.queryParam.buyerName = undefined
       this.queryParam.salesBillNo = ''
@@ -299,6 +307,11 @@ export default {
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.getCustAllList()
+    })
   }
 }
 </script>

+ 19 - 4
src/views/salesManagement/salesReturn/list.vue

@@ -35,7 +35,7 @@
                 :showSearch="true"
                 option-filter-prop="children"
                 :filter-option="filterOption">
-                <a-select-option v-for="item in customeList" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
+                <a-select-option v-for="item in custAllList" :key="item.customerSn" :value="item.customerName">{{ item.customerName }}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -126,6 +126,7 @@
 <script>
 import { STable, VSelect } from '@/components'
 import chooseCustom from './chooseCustom.vue'
+import { custFindAll } from '@/api/customer'
 import { salesReturnList } from '@/api/salesReturn'
 export default {
   name: 'TableList',
@@ -143,7 +144,7 @@ export default {
       time: [], //  创建时间
       examineTime: [], //  审核时间
       openModal: false, // 选择客户弹框是否显示
-      customeList: [],
+      custAllList: [], //  客户下拉数据
       // 查询参数
       queryParam: {
         dealerName: undefined, //  客户名称
@@ -222,8 +223,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '确认要审核吗?',
-        okText: '审核通过',
-        cancelText: '审核不通过',
         centered: true,
         onOk () {
           // delectRolePower({
@@ -247,11 +246,27 @@ export default {
       this.newTime = undefined
       this.$refs.table.refresh(true)
     },
+    // 客户无分页列表数据
+    getCustAllList () {
+      const _this = this
+      custFindAll().then(res => {
+        if (res.status == 200) {
+          _this.custAllList = res.data || []
+        } else {
+          _this.custAllList = []
+        }
+      })
+    },
     filterOption (input, option) {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.getCustAllList()
+    })
   }
 }
 </script>

+ 0 - 2
src/views/salesManagement/urgentItemsOffset/detail.vue

@@ -139,8 +139,6 @@ export default {
       this.$confirm({
         title: '提示',
         content: '确定要进行冲减吗?',
-        okText: '确定',
-        cancelText: '取消',
         centered: true,
         onOk () {
           // delectRolePower({

+ 19 - 2
src/views/salesManagement/urgentItemsOffset/list.vue

@@ -26,7 +26,7 @@
                 :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-option v-for="item in custAllList" :key="item.customerSn" :value="item.customerName">{{ item.customerName }}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -88,6 +88,7 @@
 
 <script>
 import moment from 'moment'
+import { custFindAll } from '@/api/customer'
 import { urgentList } from '@/api/urgent'
 import { STable, VSelect } from '@/components'
 export default {
@@ -104,7 +105,7 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       dateFormat: 'YYYY-MM-DD',
       time: [], //  创建时间
-      brandData: [], //  客户 下拉数据
+      custAllList: [], //  客户下拉数据
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '急件单号', dataIndex: 'urgentBillNo', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
@@ -162,7 +163,23 @@ export default {
     //  详情
     handleDetail (row) {
       this.$router.push({ path: `/salesManagement/urgentItemsOffset/detail/${row.id}/${row.urgentBillSn}` })
+    },
+    // 客户无分页列表数据
+    getCustAllList () {
+      const _this = this
+      custFindAll().then(res => {
+        if (res.status == 200) {
+          _this.custAllList = res.data || []
+        } else {
+          _this.custAllList = []
+        }
+      })
     }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.getCustAllList()
+    })
   }
 }
 </script>

+ 1 - 1
vue.config.js

@@ -108,7 +108,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.16.194:8504/qpls-md',
+        target: 'http://192.168.16.104:8503/qpls-md',
         // target: 'http://it.test.zyucgj.com/zyit',
         // target: 'https://it.test.qiubcar.com/zyit',
         ws: false,