浏览代码

Merge branch 'develop_yh23' of jianguan-web/jg-ocs-html into pre-release

李磊 1 年之前
父节点
当前提交
e455e05410
共有 27 个文件被更改,包括 309 次插入162 次删除
  1. 二进制
      public/templ/货位编号管理导入模板.xlsx
  2. 1 2
      src/api/allocateBill.js
  3. 0 1
      src/api/dispatch.js
  4. 2 2
      src/api/product.js
  5. 14 5
      src/components/Table/index.js
  6. 84 0
      src/libs/JGPrint.js
  7. 2 2
      src/views/allocationManagement/transferOut/detail.vue
  8. 2 2
      src/views/allocationManagement/transferOut/edit.vue
  9. 2 2
      src/views/allocationManagement/transfersPrint/list.vue
  10. 10 3
      src/views/inventoryManagement/inventoryQuery/list.vue
  11. 7 7
      src/views/productManagement/shelfNoManage/changeRecordModal.vue
  12. 9 7
      src/views/productManagement/shelfNoManage/chooseImportModal.vue
  13. 72 24
      src/views/productManagement/shelfNoManage/editHwModal.vue
  14. 11 19
      src/views/productManagement/shelfNoManage/importGuideModal.vue
  15. 20 17
      src/views/productManagement/shelfNoManage/list.vue
  16. 2 5
      src/views/salesManagement/examineVerify/list.vue
  17. 2 5
      src/views/salesManagement/matchSendOutOrder/list.vue
  18. 2 5
      src/views/salesManagement/outboundOrder/list.vue
  19. 2 2
      src/views/salesManagement/pushOrderManagement/detail.vue
  20. 1 1
      src/views/salesManagement/pushOrderManagement/list.vue
  21. 0 3
      src/views/salesManagement/receiptPrint/list.vue
  22. 13 5
      src/views/salesManagement/salesCollection/detailModal.vue
  23. 12 2
      src/views/salesManagement/salesList/list.vue
  24. 0 3
      src/views/salesManagement/salesOrderWarehouse/list.vue
  25. 26 35
      src/views/salesManagement/stockPrint/list.vue
  26. 11 1
      src/views/salesReturnManagement/returnSchedule/list.vue
  27. 2 2
      vue.config.js

二进制
public/templ/货位编号管理导入模板.xlsx


+ 1 - 2
src/api/allocateBill.js

@@ -141,14 +141,13 @@ export const allocateBillDetailSave = params => {
 }
 // 调拨管理 详情  打印
 export const allocateBillDetailPrint = params => {
-  const url = `/allocateBill/print/${params.printType}/${params.isPreview}`
+  const url = `/allocateBill/print/${params.printType}`
   delete params.printType
   delete params.isPreview
   return axios.request({
     url: url,
     data: params,
     method: 'post',
-    responseType: 'blob'
   })
 }
 // 调拨管理  详情  打印  产品列表

+ 0 - 1
src/api/dispatch.js

@@ -114,7 +114,6 @@ export const dispatchDetailPrint = params => {
     url: url,
     data: params,
     method: 'post',
-    responseType: 'blob'
   })
 }
 // 下推  详情  该销售单的产品二级分类

+ 2 - 2
src/api/product.js

@@ -344,7 +344,7 @@ export const stackPlaceExport = (params) => {
 // 导入产品货位-导出错误
 export const stackPlaceExportError = (params) => {
   return axios({
-    url: '/product/stackPlace/exportImportError',
+    url: '/product/stackPlace/exportError',
     data: params,
     method: 'post',
     responseType: 'blob'
@@ -379,7 +379,7 @@ export const stackPlaceInsertImport = (params) => {
 // 查询产品货位历史变更记录
 export const stackPlaceListHistory = (params) => {
   return axios({
-    url: '/product/stackPlace/listHistoryByProductSn',
+    url: '/product/stackPlace/listHistory',
     data: params,
     method: 'post'
   })

+ 14 - 5
src/components/Table/index.js

@@ -10,6 +10,7 @@ export default {
       localLoading: false,
       localDataSource: [],
       localPagination: Object.assign({}, this.pagination),
+      sortObj: null,
       isSucceed: true ,//  是否请求成功
       leftAlignId:"",
     }
@@ -153,6 +154,7 @@ export default {
       this.localLoading = false
       this.localDataSource = []
       this.needTotalList = []
+      this.sortObj = null
       this.clearSelected()
       this.localPagination = Object.assign({}, {
         current: 1, pageSize: this.pageSize, total: 0
@@ -166,6 +168,7 @@ export default {
      */
     loadData (pagination, filters, sorter) {
       this.localLoading = true
+      console.log(sorter)
       const parameter = Object.assign({
         pageNo: (pagination && pagination.current) ||
           this.showPagination && this.localPagination.current || this.pageNum,
@@ -174,16 +177,22 @@ export default {
         tableId: this.tableId,
         index: this.index
       },
-      (sorter && sorter.field && {
+      (sorter ? sorter.field && {
         sortField: sorter.field
-      }) || {},
-      (sorter && sorter.order && {
+      } : this.sortObj&&{sortField:this.sortObj.field}) || {},
+      (sorter ? sorter.order && {
         sortOrder: sorter.order
-      }) || {}, {
+      } : this.sortObj&&{sortOrder:this.sortObj.order}) || {}, {
         ...filters
       }
       )
-      // console.log('parameter', parameter)
+      // 缓存排序参数
+      if(sorter){
+        this.sortObj = {
+          field: sorter.field||'',
+          order: sorter.order||''
+        }
+      }
       const result = this.data(parameter)
       // 对接自己的通用数据接口需要修改下方代码中的 r.pageNo, r.count, r.data
       // eslint-disable-next-line

+ 84 - 0
src/libs/JGPrint.js

@@ -406,6 +406,90 @@ export const jGPrintPdf = function (data, type, taskName, printLogParams, callba
   })
 }
 
+// printBase64Fun
+export const printBase64Fun = function (url, params, type, taskName, callback, printLogParams, hidePrint) {
+  url(params).then(res => {
+    if (res.type == 'application/json') {
+      var reader = new FileReader()
+      reader.addEventListener('loadend', function () {
+        const obj = JSON.parse(reader.result)
+        notification.error({
+          message: '提示',
+          description: obj.message
+        })
+      })
+      reader.readAsText(res)
+    } else {
+      console.log(res, 'printFun')
+      // 使用浏览器自带打印功能
+      if (type == 'orginPrint' || type == 'orginPreview') {
+        winPrintPdf(res, type, callback)
+      } else {
+        jGPrintBase64Pdf(res.data, type, taskName, printLogParams, callback, hidePrint)
+      }
+    }
+  })
+}
+// 打印pdf
+export const jGPrintBase64Pdf = function (dataurl, type, taskName, printLogParams, callback, hidePrint) {
+  if (!dataurl) {
+    return
+  }
+  const LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'))
+  if (!LODOP) {
+    confirm({
+      title: '提示?',
+      content: h => <div>打印控件未安装,请先下载并安装。安装完成后,刷新页面即可打印。</div>,
+      okText: '立即下载',
+      okType: 'danger',
+      cancelText: '暂不打印',
+      onOk () {
+        var agent = navigator.userAgent.toLowerCase()
+        if (agent.indexOf('win32') >= 0 || agent.indexOf('wow32') >= 0) {
+          window.open('http://www.lodop.net/demolist/CLodop_Setup_for_Win32NT.zip')
+        } else if (agent.indexOf('win64') >= 0 || agent.indexOf('wow64') >= 0) {
+          window.open('http://www.lodop.net/download/CLodop_Setup_for_Win64NT_4.155EN.zip')
+        }
+      }
+    })
+    return
+  }
+  
+  LODOP.PRINT_INIT(taskName)
+  LODOP.SET_SHOW_MODE('HIDE_PAPER_BOARD', 1) //  隐藏底图上有模拟走纸板的条纹线
+  // 执行该语句之后,PRINT指令不再返回那个所谓“打印成功”,才能获取到打印状态
+  // LODOP.SET_PRINT_MODE('CATCH_PRINT_STATUS', true)
+  // 隐藏打印按钮
+  if (hidePrint) {
+    LODOP.SET_SHOW_MODE('HIDE_PBUTTIN_PREVIEW', true)
+  }
+  // TaskID:任务id,Value:job代码
+  LODOP.On_Return = function (TaskID, Value) {
+    console.log(TaskID, Value!=0, printLogParams)
+    // 已打印
+    if (Value!=0) {
+      if(printLogParams){
+        console.log('已打印,统计打印次数')
+        printLog(printLogParams, callback)
+      }else{
+        callback({status:200,message:'打印已完成'})
+      }
+    } else {
+      callback()
+    }
+  }
+  for(let i=0;i<dataurl.length;i++){
+     LODOP.NewPageA()
+     LODOP.ADD_PRINT_PDF(0, 0, '100%', '100%', dataurl[i])
+  }
+  LODOP.SET_PRINT_PAGESIZE(3, 2090, 30, '')
+  if (type == 'preview') { //  预览
+    LODOP.PREVIEW()
+  } else if (type == 'print') { //  打印
+    LODOP.PRINTA()
+  }
+}
+
 // 获取打印机状态
 export const getStatusValue = function (ValueType, ValueIndex, callback) {
   const LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'))

+ 2 - 2
src/views/allocationManagement/transferOut/detail.vue

@@ -140,7 +140,7 @@
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import printModal from './printModal.vue'
-import { printFun, exportExcel } from '@/libs/JGPrint.js'
+import { printBase64Fun, exportExcel } from '@/libs/JGPrint.js'
 import { allocateBillDetailList, allocateBillDetail, allocateBillDetailCount, allocateBillDetailPrint, allocateBillDetailExcel } from '@/api/allocateBill'
 export default {
   name: 'TransferOutDetail',
@@ -258,7 +258,7 @@ export default {
       delete params.type
       _this.spinning = true
       const taskName = this.nowType == 'dbPrint' ? '调拨' : '调拨分类'
-      printFun(
+      printBase64Fun(
         allocateBillDetailPrint,
         params,
         objs.isPreview ? 'preview' : 'print',

+ 2 - 2
src/views/allocationManagement/transferOut/edit.vue

@@ -352,7 +352,7 @@ import basicInfoModal from './basicInfoModal.vue'
 import printModal from './printModal.vue'
 import dsModal from './dsModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
-import { printFun, exportExcel } from '@/libs/JGPrint.js'
+import { printBase64Fun, exportExcel } from '@/libs/JGPrint.js'
 import { queryStockProductPage } from '@/api/stock'
 import { productPriceInfo } from '@/api/product'
 import { departmentQueryList } from '@/api/expenseManagement'
@@ -763,7 +763,7 @@ export default {
       delete params.type
       const taskName = this.nowType == 'dbPrint' ? '调拨' : '调拨分类'
       _this.spinning = true
-      printFun(
+      printBase64Fun(
         allocateBillDetailPrint,
         params,
         objs.isPreview ? 'preview' : 'print',

+ 2 - 2
src/views/allocationManagement/transfersPrint/list.vue

@@ -190,7 +190,7 @@ import warehouse from '@/views/common/chooseWarehouse.js'
 import allocationDetailModal from '@/views/allocationManagement/transferOut/detail.vue'
 import recordModal from './recordModal.vue'
 import { allocateBillList, allocateBillDetailPrint, updatePrintState } from '@/api/allocateBill'
-import { printFun } from '@/libs/JGPrint.js'
+import { printBase64Fun } from '@/libs/JGPrint.js'
 export default {
   name: 'TransfersPrintList',
   mixins: [commonMixin],
@@ -353,7 +353,7 @@ export default {
       delete params.type
       _this.$store.state.app.curActionPermission = 'B_transferOut_type_print'
       _this.spinning = true
-      printFun(
+      printBase64Fun(
         allocateBillDetailPrint,
         params,
         objs.isPreview ? 'preview' : 'print',

+ 10 - 3
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -48,7 +48,7 @@
               </a-col>
             </template>
             <a-col :md="7" :sm="24">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryQueryList-refresh">查询</a-button>
+              <a-button type="primary" @click="$refs.table.refresh()" :disabled="disabled" id="inventoryQueryList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryQueryList-reset">重置</a-button>
               <a-button
                 v-if="$hasPermissions('B_inventoryQuery_export')"
@@ -154,15 +154,22 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
+        console.log(parameter)
         // 排序
-        if (parameter.sortField == 'currentStockQty') {
+        if (parameter.sortOrder&&parameter.sortField == 'currentStockQty') {
           parameter.sortField = 'qty'
           parameter.sortAlias = ''
         }
-        if (parameter.sortField == 'currentStockCost') {
+        if (parameter.sortOrder&&parameter.sortField == 'currentStockCost') {
           parameter.sortField = 'currentStockCost'
           parameter.sortAlias = 'stock'
         }
+        
+        if(!parameter.sortOrder){
+          parameter.sortField = ''
+          parameter.sortAlias = ''
+        }
+        
         const params = Object.assign(parameter, this.queryParam)
         if (params.zeroQtyFlag) {
           params.zeroQtyFlag = '0'

+ 7 - 7
src/views/productManagement/shelfNoManage/changeRecordModal.vue

@@ -9,10 +9,10 @@
     width="50%">
     <a-descriptions size="small" :column="1">
       <a-descriptions-item label="产品编码">
-        {{ detailData&&detailData.productVO.code || '--' }}
+        {{ detailData&&detailData.product.code || '--' }}
       </a-descriptions-item>
       <a-descriptions-item label="产品名称">
-        {{ detailData&&detailData.productVO.name || '--' }}
+        {{ detailData&&detailData.product.name || '--' }}
       </a-descriptions-item>
     </a-descriptions>
     <a-spin :spinning="spinning" tip="Loading...">
@@ -56,17 +56,17 @@ export default {
       isShow: this.openModal,
       columns: [
         { title: '序号', dataIndex: 'no', width: '10%', align: 'center' },
-        { title: '变更时间', dataIndex: 'updateDate', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '变更人', dataIndex: 'creatorName', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '货位编号-变更前', dataIndex: 'oldStackPlaceCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '货位编号-变更后', dataIndex: 'newStackPlaceCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '变更时间', dataIndex: 'updateDate', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '变更人', dataIndex: 'creatorName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '货位编号-变更前', dataIndex: 'oldStackPlaceCode', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '货位编号-变更后', dataIndex: 'newStackPlaceCode', width: '25%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.spinning = true
         delete parameter.tableId
         delete parameter.index
-        return stackPlaceListHistory({ productSn: this.detailData.productVO.productSn }).then(res => {
+        return stackPlaceListHistory({ productSn: this.detailData.product.productSn, newWarehouseSn: this.detailData.warehouseSn }).then(res => {
           let data
           if (res.status == 200) {
             data = res.data

+ 9 - 7
src/views/productManagement/shelfNoManage/chooseImportModal.vue

@@ -87,18 +87,20 @@ export default {
       isShow: this.openModal, //  是否打开弹框
       nowColumns: [
         { title: '序号', dataIndex: 'no', width: '10%', align: 'center' },
-        { title: '产品编码', dataIndex: 'code', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'name', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '货位编号-变更前', dataIndex: 'oldStackPlaceCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '货位编号-变更后', dataIndex: 'newStackPlaceCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '产品编码', dataIndex: 'code', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'name', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouseName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '货位编号-变更前', dataIndex: 'oldStackPlaceCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '货位编号-变更后', dataIndex: 'newStackPlaceCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       loadData: [],
       nowUnColumns: [
         { title: '序号', dataIndex: 'no', width: '10%', align: 'center' },
         { title: '产品编码', dataIndex: 'code', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'name', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '货位编号-变更前', dataIndex: 'oldStackPlaceCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '货位编号-变更后', dataIndex: 'newStackPlaceCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'name', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouseName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '货位编号-变更前', dataIndex: 'oldStackPlaceCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '货位编号-变更后', dataIndex: 'newStackPlaceCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '备注', dataIndex: 'errorMsg', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       unLoadData: [],

+ 72 - 24
src/views/productManagement/shelfNoManage/editHwModal.vue

@@ -4,7 +4,7 @@
     class="shelfSet-newHw-modal"
     :footer="null"
     :maskClosable="false"
-    title="编辑"
+    :title="title"
     v-model="isShow"
     @cancel="isShow=false"
     :width="600">
@@ -16,8 +16,27 @@
         :rules="rules"
         :label-col="formItemLayout.labelCol"
         :wrapper-col="formItemLayout.wrapperCol">
-        <a-form-model-item label="产品编码">{{ nowData&&nowData.productVO.code || '--' }}</a-form-model-item>
-        <a-form-model-item label="产品名称">{{ nowData&&nowData.productVO.name || '--' }}</a-form-model-item>
+        <div v-if="type=='edit'">
+          <a-form-model-item label="产品编码">{{ nowData&&nowData.product.code || '--' }}</a-form-model-item>
+          <a-form-model-item label="产品名称">{{ nowData&&nowData.product.name || '--' }}</a-form-model-item>
+          <a-form-model-item label="仓库">{{ nowData&&nowData.warehouseName || '--' }}</a-form-model-item>
+        </div>
+        <div v-if="type=='add'">
+          <a-form-model-item label="产品编码" prop="productSn">
+            <productCodeList ref="productCodeList" @change="productCodeChange" />
+          </a-form-model-item>
+          <a-form-model-item label="产品名称" v-if="productName">
+            {{ productName || '--' }}
+          </a-form-model-item>
+          <a-form-model-item label="仓库" prop="warehouseSn">
+            <warehouse
+              v-model="form.warehouseSn"
+              isPermission
+              placeholder="请选择仓库"
+              @load="warehouseLoad"
+            />
+          </a-form-model-item>
+        </div>
         <a-form-model-item label="货位编号" prop="stackPlaceCode">
           <a-input v-model="form.stackPlaceCode" :maxLength="10" placeholder="请输入货位编号(最多10个字符)"></a-input>
           <div style="color:#fba200;font-size:12px;">货位编号允许为空,为空则表示此产品没有货位编号</div>
@@ -32,20 +51,20 @@
 </template>
 
 <script>
+import { VSelect } from '@/components'
 import { commonMixin } from '@/utils/mixin'
+import productCodeList from '@/views/common/productCodeList.vue'
+import warehouse from '@/views/common/chooseWarehouse.js'
 import { stackPlaceSave } from '@/api/product'
 export default {
   name: 'EditHwModal',
+  components: { VSelect, productCodeList, warehouse },
   mixins: [commonMixin],
   props: {
     openModal: { //  弹框显示状态
       type: Boolean,
       default: false
     },
-    type: {
-      type: String,
-      default: 'edit'
-    },
     nowData: {
       type: Object,
       default: () => {
@@ -62,19 +81,25 @@ export default {
         wrapperCol: { span: 18 }
       },
       form: {
-        shelfPlaceCode: '',
+        stackPlaceCode: '',
         productSn: undefined,
         productCode: undefined,
-        price: '',
-        cost: '',
-        maxQty: ''
+        warehouseSn: undefined
       },
       rules: {
-        shelfPlaceCode: [
-          { required: true, message: '请输入货位编号', trigger: 'blur' }
+        // stackPlaceCode: [
+        //   { required: true, message: '请输入货位编号', trigger: 'blur' }
+        // ],
+        productSn: [
+          { required: true, message: '请选择产品', trigger: 'blur' }
+        ],
+        warehouseSn: [
+          { required: true, message: '请选择仓库', trigger: 'blur' }
         ]
       },
-      productName: ''
+      productName: '',
+      title: '',
+      type: 'add'
     }
   },
   methods: {
@@ -83,16 +108,11 @@ export default {
       const _this = this
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          const form = JSON.parse(JSON.stringify(_this.form))
-          const params = {
-            'stackPlaceCode': form.stackPlaceCode ? form.stackPlaceCode.toUpperCase() : '',
-            'product': {
-              'productSn': _this.nowData.productVO.productSn
-            }
-          }
+          const form = _this.form
+          form.stackPlaceCode = form.stackPlaceCode.toUpperCase()
           // 开始提交数据
           _this.spinning = true
-          stackPlaceSave(params).then(res => {
+          stackPlaceSave(form).then(res => {
             if (res.status == 200) {
               _this.$message.success(res.message)
               _this.isShow = false
@@ -107,9 +127,27 @@ export default {
         }
       })
     },
+    warehouseLoad (defSn, defObj) {
+      const def = this.$store.state.app.defWarehouse || defObj
+      this.form.warehouseSn = def && def.warehouseSn || undefined
+    },
+    productCodeChange (val) {
+      this.form.productSn = val.key || undefined
+      this.form.productCode = val.row && val.row.code ? val.row.code : undefined
+      this.productName = val.row && val.row.name ? val.row.name : undefined
+    },
     resetData () {
-      this.form.stackPlaceCode = undefined
-      this.$refs.ruleForm.resetFields()
+      this.productName = ''
+      if (this.type == 'add') {
+        this.$refs.productCodeList && this.$refs.productCodeList.resetForm()
+        this.$refs.ruleForm.resetFields()
+      }
+      this.form.stackPlaceCode = ''
+      this.form.stackPlaceSn = undefined
+      this.form.productSn = undefined
+      this.form.productCode = undefined
+      this.form.warehouseSn = undefined
+      this.form.id = undefined
     }
   },
   watch: {
@@ -123,8 +161,18 @@ export default {
         this.$emit('close')
         this.resetData()
       } else {
+        this.type = this.nowData ? 'edit' : 'add'
+        this.title = (this.nowData ? '编辑' : '新增') + '货位编号'
         if (this.type == 'edit') {
+          this.form.id = this.nowData.id
           this.form.stackPlaceCode = this.nowData.stackPlaceCode
+          this.form.stackPlaceSn = this.nowData.stackPlaceSn
+          this.form.productSn = this.nowData.productSn
+          this.form.productCode = this.nowData.product.code
+          this.form.warehouseSn = this.nowData.warehouseSn
+        } else {
+          this.form.stackPlaceCode = ''
+          this.warehouseLoad()
         }
       }
     }

+ 11 - 19
src/views/productManagement/shelfNoManage/importGuideModal.vue

@@ -15,11 +15,16 @@
             <span>1</span>准备导入
           </div>
           <ul>
-            <li>1) 导入的Excel文件中必须包含名为“产品编码”的列,且名称必须相同</li>
-            <li>2) “产品编码”必须是列表中已存在的产品</li>
-            <li>3) “货位编号”可为空,为空表示此产品没有货位信息</li>
+            <li>1) 导入的Excel文件中必须包含名为“产品编码”、“仓库”的列,且名称必须相同</li>
+            <li>2) “产品编码”必须是系统中已存在的产品</li>
+            <li>3) “仓库”必须是系统中已存在的仓库</li>
+            <li>4) “货位编号”可为空,为空表示此产品没有货位信息</li>
+            <li>
+              <a :href="filePath" style="margin: 5px 0 0;display: block;">
+                <a-icon type="download" style="padding-right: 5px;" />下载导入模板
+              </a>
+            </li>
           </ul>
-          <a-button type="link" icon="download" style="padding: 0 0 0 23px;" :loading="exportLoading" @click="handleExport">下载导入模板</a-button>
         </div>
         <div class="explain-item">
           <div class="explain-tit">
@@ -65,8 +70,6 @@
 <script>
 import ChooseImportModal from './chooseImportModal.vue'
 import { Upload } from '@/components'
-import { hdExportExcel } from '@/libs/exportExcel'
-import { stackPlaceImportTemplate } from '@/api/product'
 export default {
   name: 'ImportGuideModal',
   components: { ChooseImportModal, Upload },
@@ -89,7 +92,8 @@ export default {
       uploadParams: {
         savePathType: 'local'
       },
-      exportLoading: false
+      exportLoading: false,
+      filePath: location.protocol + '//' + location.host + '/templ/货位编号管理导入模板.xlsx'
     }
   },
   methods: {
@@ -120,18 +124,6 @@ export default {
     handleClose () {
       this.openImportModal = false
       this.isShow = false
-    },
-    //  位编号管理导入模板
-    handleExport () {
-      const _this = this
-      this.spinning = true
-      this.exportLoading = true
-      setTimeout(() => {
-        _this.exportLoading = false
-      }, 1000)
-      hdExportExcel(stackPlaceImportTemplate, {}, '货位编号管理导入模板', function () {
-        _this.spinning = false
-      })
     }
   },
   watch: {

+ 20 - 17
src/views/productManagement/shelfNoManage/list.vue

@@ -31,16 +31,16 @@
                   <productTypeAll placeholder="请选择产品分类" @change="changeProductType" v-model="productType" id="shelfNoMan-productType"></productTypeAll>
                 </a-form-item>
               </a-col>
-              <!-- <a-col :md="4" :sm="24" v-show="isShowWarehouse">
+              <a-col :md="4" :sm="24" v-show="isShowWarehouse">
                 <a-form-item label="仓库">
                   <warehouse
-                    v-model="queryParam.product.warehouseSn"
+                    v-model="queryParam.warehouseSn"
                     isPermission
                     id="shelfNoMan-warehouseSn"
                     placeholder="请选择仓库"
                   />
                 </a-form-item>
-              </a-col> -->
+              </a-col>
               <a-col :md="4" :sm="24">
                 <a-form-item label="产品状态">
                   <v-select code="PRODUCT_STATUS" id="shelfNoMan-state" v-model="queryParam.product.state" allowClear placeholder="请选择产品状态"></v-select>
@@ -92,6 +92,7 @@
           type="primary"
           @click="openGuideModal = true"
         >批量导入</a-button>
+        <a-button type="primary" @click="openNewModal" class="button-warning" id="shelfNoMan-add">新增</a-button>
       </div>
       <s-table
         class="sTable fixPagination"
@@ -106,7 +107,7 @@
         bordered>
         <!-- 产品分类 -->
         <template slot="productType" slot-scope="text, record">
-          <span v-if="record.productVO.productTypeName2 || record.productVO.productTypeName3">{{ record.productVO.productTypeName2 }} {{ record.productVO.productTypeName3 ? '>' : '' }} {{ record.productVO.productTypeName3 }}</span>
+          <span v-if="record.product.productTypeName2 || record.product.productTypeName3">{{ record.product.productTypeName2 }} {{ record.product.productTypeName3 ? '>' : '' }} {{ record.product.productTypeName3 }}</span>
           <span v-else>--</span>
         </template>
         <!-- 操作 -->
@@ -171,9 +172,9 @@ export default {
           productTypeSn1: '', //  产品一级分类
           productTypeSn2: '', //  产品二级分类
           productTypeSn3: '', //  产品三级分类
-          warehouseSn: undefined, // 仓库
           state: undefined //  产品状态
-        }
+        },
+        warehouseSn: undefined, // 仓库
       },
       productType: [],
       disabled: false, //  查询、重置按钮是否可操作
@@ -209,19 +210,16 @@ export default {
 	  columns () {
 	    const arr = [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productVO.code', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productVO.name', align: 'center', width: '20%', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'productVO.origCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品品牌', dataIndex: 'productVO.productBrandName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'product.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'product.name', align: 'center', width: '20%', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'product.origCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品品牌', dataIndex: 'product.productBrandName', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '10%', align: 'center' },
-        // { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品状态', dataIndex: 'productVO.stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品状态', dataIndex: 'product.stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '货位编号', dataIndex: 'stackPlaceCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '15%', align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
-      if (this.isShowWarehouse) {
-        // arr.splice(6, 0, { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } })
-      }
 	    return arr
 	  }
   },
@@ -239,6 +237,7 @@ export default {
       this.queryParam = {
         stackPlaceCode: undefined, // 货位编号
         haveStackCode: undefined,
+        warehouseSn: undefined, // 仓库
         product: {
           name: '', //  产品名称
           code: '', // 产品编码
@@ -247,13 +246,17 @@ export default {
           productTypeSn1: '', //  产品一级分类
           productTypeSn2: '', //  产品二级分类
           productTypeSn3: '', //  产品三级分类
-          warehouseSn: undefined, // 仓库
           state: undefined //  产品状态
         }
       }
       this.productType = []
       this.$refs.table.refresh(true)
     },
+    // 新增
+    openNewModal () {
+      this.nowData = null
+      this.openModal = true
+    },
     // 编辑
     handleEdit (row) {
       this.nowData = row

+ 2 - 5
src/views/salesManagement/examineVerify/list.vue

@@ -240,9 +240,6 @@ export default {
     }
   },
   computed: {
-    isShowWarehouse () {
-      return this.$store.state.app.isWarehouse
-    },
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
@@ -266,7 +263,7 @@ export default {
       if (this.$hasPermissions('M_examineVerifyList_salesPrice')) { //  售价权限
         arr.splice(this.isShowWarehouse ? 9 : 8, 0, { title: '售价', dataIndex: 'totalAmount', width: '5%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
-      
+
       return arr
     }
   },
@@ -291,7 +288,7 @@ export default {
       this.queryParam.buyerSn = undefined
       this.$refs.dealerSubareaScopeList.resetForm()
       this.queryParam.salesBillNo = ''
-      this.queryParam.dispatchBillNo = '' //备货单号
+      this.queryParam.dispatchBillNo = '' // 备货单号
       this.queryParam.stockOutNo = '' // 出库单号
       this.queryParam.billStatus = undefined
       this.queryParam.printStatus = undefined

+ 2 - 5
src/views/salesManagement/matchSendOutOrder/list.vue

@@ -217,9 +217,6 @@ export default {
     }
   },
   computed: {
-    isShowWarehouse () {
-      return this.$store.state.app.isWarehouse
-    },
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
@@ -244,9 +241,9 @@ export default {
 	    arr.splice(7, 0, { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
 	  }
       if (this.$hasPermissions('M_matchSendOutOrderList_salesPrice')) { //  售价权限
-        arr.splice(this.isShowWarehouse?10:9, 0, { title: '总售价', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(this.isShowWarehouse ? 10 : 9, 0, { title: '总售价', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
-      
+
       return arr
     }
   },

+ 2 - 5
src/views/salesManagement/outboundOrder/list.vue

@@ -245,9 +245,6 @@ export default {
     }
   },
   computed: {
-    isShowWarehouse () {
-      return this.$store.state.app.isWarehouse
-    },
     columns () {
       const arr = [
         { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -268,9 +265,9 @@ export default {
 	    arr.splice(6, 0, { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
 	  }
       if (this.$hasPermissions('M_outboundOrderList_salesPrice')) { //  售价权限
-        arr.splice(this.isShowWarehouse?8:7, 0, { title: '售价', dataIndex: 'productTotalPrice', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(this.isShowWarehouse ? 8 : 7, 0, { title: '售价', dataIndex: 'productTotalPrice', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
-      
+
       return arr
     }
   },

+ 2 - 2
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -120,7 +120,7 @@ import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import sendTypeModal from './sendTypeModal.vue'
 import exportExcelModal from './exportExcelModal.vue'
-import { printFun, exportExcel } from '@/libs/JGPrint.js'
+import { printBase64Fun, exportExcel } from '@/libs/JGPrint.js'
 import { dispatchDetaillList, dispatchFindBySn, dispatchDetailPrint, dispatchDetailExcel } from '@/api/dispatch'
 export default {
   name: 'PushOrderDetail',
@@ -283,7 +283,7 @@ export default {
         if(obj.packNo == 1){
           params.type = params.type + '_PACK_NUM'
         }
-        printFun(
+        printBase64Fun(
           dispatchDetailPrint,
           Object.assign(params, obj || {}),
           type,

+ 1 - 1
src/views/salesManagement/pushOrderManagement/list.vue

@@ -85,7 +85,7 @@
                   <Area id="pushOrder-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24" v-if="isShowWarehouse">
+              <a-col :md="6" :sm="24" v-show="isShowWarehouse">
                 <a-form-model-item label="出库仓库">
                   <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
                 </a-form-model-item>

+ 0 - 3
src/views/salesManagement/receiptPrint/list.vue

@@ -206,9 +206,6 @@ export default {
     }
   },
   computed: {
-    isShowWarehouse () {
-      return this.$store.state.app.isWarehouse
-    },
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },

+ 13 - 5
src/views/salesManagement/salesCollection/detailModal.vue

@@ -42,27 +42,33 @@
         <div ref="tableSearch" class="table-page-search-wrapper">
           <a-form layout="inline">
             <a-row :gutter="15">
-              <a-col :md="5" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="收款单号">
                   <a-input v-model.trim="queryParam.bookNo" allowClear placeholder="请输入收款单号"/>
                 </a-form-item>
               </a-col>
-              <a-col :md="5" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="财务收款事由">
                   <a-input v-model.trim="queryParam.bookReason" allowClear placeholder="请输入财务收款事由"/>
                 </a-form-item>
               </a-col>
-              <a-col :md="5" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="申请人">
                   <employee style="width: 100%;" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
                 </a-form-item>
               </a-col>
-              <a-col :md="5" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="申请时间">
                   <rangeDate ref="rangeApply" :value="applyDate" @change="dateApplyChange" />
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="付款方">
+                  <a-input id="financialCollectionList-payerName" v-model.trim="queryParam.payerName" allowClear placeholder="请输入付款方"/>
+                </a-form-item>
+              </a-col>
+
+              <a-col :md="6" :sm="24">
                 <span class="table-page-search-submitButtons">
                   <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                   <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
@@ -158,6 +164,7 @@ export default {
       handlePlData: [],
       applyDate: [],
       queryParam: {
+        payerName: undefined,
         bookNo: '',
         bookReason: '',
         applyPersonSn: undefined,
@@ -278,6 +285,7 @@ export default {
     // 重置
     resetSearchForm () {
       this.queryParam = {
+        payerName: undefined,
         bookNo: '',
         bookReason: '',
         applyPersonSn: undefined,

+ 12 - 2
src/views/salesManagement/salesList/list.vue

@@ -81,9 +81,19 @@
                   <Area id="salesList-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
                 </a-form-model-item>
               </a-col>
+              <!-- <a-col :md="6" :sm="24">
+                <a-form-model-item label="超时环节提醒">
+                  <v-select
+                    v-model="queryParam.sendFlag"
+                    id="outboundOrderList-sendFlag"
+                    code="SEND_FLAG"
+                    placeholder="请选择提醒环节"
+                    allowClear></v-select>
+                </a-form-model-item>
+              </a-col> -->
             </template>
-            <a-col :md="24" :sm="24">
-              <div class="table-page-search-submitButtons" style="text-align:center;">
+            <a-col :md="6" :sm="24">
+              <div class="table-page-search-submitButtons">
                 <a-button type="primary" :disabled="disabled" @click="handleSearch">查询</a-button>
                 <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                 <a @click="advanced=!advanced" style="margin-left: 8px">

+ 0 - 3
src/views/salesManagement/salesOrderWarehouse/list.vue

@@ -159,9 +159,6 @@ export default {
     }
   },
   computed: {
-    isShowWarehouse () {
-      return this.$store.state.app.isWarehouse
-    },
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },

+ 26 - 35
src/views/salesManagement/stockPrint/list.vue

@@ -111,7 +111,7 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
-          :scroll="{ y:tableHeight, x: 1500 }"
+          :scroll="{ y:tableHeight, x: 1600 }"
           :defaultLoadData="false"
           bordered>
           <!-- 销售单号 -->
@@ -208,7 +208,7 @@ import salesDetail from '@/views/salesManagement/salesQuery/detail.vue'
 import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
 import explainInfoModal from '@/views/salesManagement/pushOrderManagement/explainInfoModal.vue'
 import { dispatchlList, dispatchDetailPrint, dispatchPrintStatus } from '@/api/dispatch'
-import { printFun } from '@/libs/JGPrint.js'
+import { printBase64Fun } from '@/libs/JGPrint.js'
 export default {
   name: 'StockPrintList',
   mixins: [commonMixin],
@@ -268,43 +268,34 @@ export default {
     }
   },
   computed: {
-    isShowWarehouse () {
-      return this.$store.state.app.isWarehouse
-    },
     columns () {
       const arr = [
-        { title: '序号', dataIndex: 'no', width: '60px', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '120px', align: 'center' },
+        { title: '序号', dataIndex: 'no', width: '40px', align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '110px', align: 'center' },
         { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '120px', align: 'center' },
-        { title: '发货编号', dataIndex: 'sendNo', width: '50px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '发货编号', dataIndex: 'sendNo', width: '40px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货说明', scopedSlots: { customRender: 'explainInfo' }, width: '80px', align: 'center', ellipsis: true },
-        { title: '客户名称', dataIndex: 'buyerName', width: '130px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        // { title: '仓库', dataIndex: 'warehouseName', width: '130px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'buyerName', width: '100px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '收货客户名称', dataIndex: 'receiverName', width: '100px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品款数', dataIndex: 'totalCategory', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '产品数量', dataIndex: 'totalQty', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '90px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '70px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单据状态', dataIndex: 'voidFlagDictValue', width: '70px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '备货打印状态', width: '100px', align: 'center', scopedSlots: { customRender: 'printStatus' } },
-        { title: '允许打印时间', dataIndex: 'allowPrintTime', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '打印次数', dataIndex: 'stockUpPrintTimes', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '100px', align: 'center', fixed: 'right' }
+        { title: '产品款数', dataIndex: 'totalCategory', width: '60px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '产品数量', dataIndex: 'totalQty', width: '60px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '仓库', dataIndex: 'warehouseName', width: '80px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '60px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据状态', dataIndex: 'voidFlagDictValue', width: '60px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '备货打印状态', width: '60px', align: 'center', scopedSlots: { customRender: 'printStatus' } },
+        { title: '允许打印时间', dataIndex: 'allowPrintTime', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '打印次数', dataIndex: 'stockUpPrintTimes', width: '40px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '80px', align: 'center', fixed: 'right' }
       ]
-      if (this.isShowWarehouse) {
-        arr.splice(7, 0, { title: '仓库', dataIndex: 'warehouseName', width: '130px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
-      }
+
       if (this.$hasPermissions('M_stockPrintList_salesPrice')) { //  售价权限
-        const ind = this.isShowWarehouse ? 11 : 10
-		    arr.splice(ind, 0, { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '90px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-        arr.splice(ind+1, 0, { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '90px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-        arr.splice(ind+2, 0, { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '70px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-        arr.splice(ind+3, 0, { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '70px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-        arr.splice(ind+4, 0, { title: '轮胎售价', dataIndex: 'receiveLtTotalAmount', width: '70px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        const ind = this.isShowWarehouse ? 10 : 9
+		    arr.splice(ind, 0, { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(ind + 1, 0, { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(ind + 2, 0, { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(ind + 3, 0, { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(ind + 4, 0, { title: '轮胎售价', dataIndex: 'receiveLtTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr
     }
@@ -354,15 +345,15 @@ export default {
         params.type = params.type + '_STACK_PLACE'
       }
       // 原厂编码
-      if(obj.origCode == 1){
+      if (obj.origCode == 1) {
         params.type = params.type + '_ORIG_CODE'
       }
       // 装箱号
-      if(obj.packNo == 1){
+      if (obj.packNo == 1) {
         params.type = params.type + '_PACK_NUM'
       }
       _this.spinning = true
-      printFun(
+      printBase64Fun(
         dispatchDetailPrint,
         Object.assign(params, obj || {}),
         type,

+ 11 - 1
src/views/salesReturnManagement/returnSchedule/list.vue

@@ -65,8 +65,18 @@
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
+              <!-- <a-col :md="6" :sm="24">
+                <a-form-model-item label="超时环节提醒">
+                  <v-select
+                    v-model="queryParam.sendFlag"
+                    id="outboundOrderList-sendFlag"
+                    code="SEND_FLAG"
+                    placeholder="请选择提醒环节"
+                    allowClear></v-select>
+                </a-form-model-item>
+              </a-col> -->
             </template>
-            <a-col :md="24" :sm="24" style="margin-top:16px;text-align:center">
+            <a-col :md="6" :sm="24">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="returnSchedule-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="returnSchedule-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.111/ocs-admin',
+        target: 'http://192.168.2.111/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
+        // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {