Browse Source

Merge branch 'develop_yh50' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh50

chenrui 7 months ago
parent
commit
4672cf2aac

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.491",
+    "version": "2.2.493",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 9 - 1
src/components/Select/index.js

@@ -36,6 +36,14 @@ export default {
       default: function () {
         return []
       }
+    },
+    size: {
+      type: String,
+      default: 'default'
+    },
+    placeholder: {
+      type: String,
+      default: ''
     }
   }),
   created () {
@@ -128,7 +136,7 @@ export default {
       )
     }
     return (
-      <Select vModel={props.value} {...{ props, on: on }}>
+      <Select vModel={props.value}  {...{ props, on: on }}>
         {
           this.dataList.map(item => {
             return (<a-select-option value={item.code} key={item.code}>{item['dispName']}</a-select-option>)

+ 26 - 10
src/views/allocationManagement/transferOut/chooseImportModal.vue

@@ -6,7 +6,8 @@
     :maskClosable="false"
     title="导入"
     v-model="isShow"
-    @cancel="isShow=false"
+    :closable="!spinning"
+    @cancel="isShow = false"
     :width="900">
     <div class="chooseImport-con">
       <!-- 可导入数据 -->
@@ -15,10 +16,10 @@
         class="sTable"
         ref="table"
         size="small"
-        :rowKey="(record) => record.allocateSn"
+        :rowKey="(record) => record.no"
         :columns="nowColumns"
         :dataSource="loadData"
-        :loading="loading"
+        :loading="spinning"
         :scroll="{ y: 200 }"
         :pagination="false"
         bordered>
@@ -30,10 +31,10 @@
         class="unTable"
         ref="unTable"
         size="small"
-        :rowKey="(record) => record.errorDesc"
+        :rowKey="(record) => record.no"
         :columns="nowUnColumns"
         :dataSource="unLoadData"
-        :loading="loading"
+        :loading="spinning"
         :scroll="{ y: 200 }"
         :pagination="false"
         bordered>
@@ -44,6 +45,7 @@
           type="primary"
           id="chooseImport-submit"
           size="large"
+          :loading="spinning"
           :class="loadData.length==0?'button-grey':'button-primary'"
           @click="handleSubmit"
           style="padding: 0 40px;">确认导入</a-button>
@@ -51,6 +53,7 @@
           id="chooseImport-cancel"
           size="large"
           class="button-cancel"
+          :disabled="spinning"
           @click="isShow=false"
           style="padding: 0 40px;margin-left: 15px;">取消</a-button>
         <a-button
@@ -58,6 +61,7 @@
           id="chooseImport-error"
           size="large"
           class="button-error"
+          :disabled="spinning"
           @click="handleError"
           style="padding: 0 40px;margin-left: 15px;">导出错误项</a-button>
       </div>
@@ -69,7 +73,7 @@
 import { commonMixin } from '@/utils/mixin'
 import { hdExportExcel } from '@/libs/exportExcel'
 // 接口
-import { allocateBillParseProducts, allocateBillFailExcel } from '@/api/allocateBill'
+import { allocateBillParseProducts, allocateBillFailExcel, allocateBillBatchInsert } from '@/api/allocateBill'
 export default {
   name: 'TransferOutChooseImportModal',
   mixins: [commonMixin],
@@ -88,6 +92,7 @@ export default {
   data () {
     return {
       isShow: this.openModal, //  是否打开弹框
+      spinning: false,
       nowColumns: [ //  正品
         { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', align: 'center', customRender: function (text) { return text || '--' } },
@@ -114,10 +119,10 @@ export default {
     // 获取表格数据
     getData () {
       const _this = this
-      this.loading = true
+      this.spinning = true
       // 获取列表数据  无分页
       allocateBillParseProducts(this.paramsData).then(res => {
-        this.loading = false
+        this.spinning = false
         if (res.status == 200) {
           if (res.data.okList && res.data.okList.length > 0) {
             res.data.okList.map((item, index) => {
@@ -139,10 +144,21 @@ export default {
       if (this.loadData.length == 0) {
         this.$message.warning('无可导入产品!')
       } else {
-        this.$emit('ok', this.loadData)
-        this.isShow = false
+        this.handleGuideOk(this.loadData)
       }
     },
+    // 导入产品
+    handleGuideOk (obj) {
+      this.spinning = true
+      allocateBillBatchInsert(obj).then(res => {
+        this.spinning = false
+        if (res.status == 200) {
+          this.isShow = false
+          this.$emit('ok')
+          this.$message.success('导入成功!')
+        }
+      })
+    },
     // 导出
     handleError () {
       const _this = this

+ 3 - 7
src/views/allocationManagement/transferOut/edit.vue

@@ -389,7 +389,7 @@ import { printBase64Fun, exportExcel } from '@/libs/JGPrint.js'
 import { queryStockProductForOtherPage } from '@/api/stock'
 import { productPriceInfo } from '@/api/product'
 import { departmentQueryList } from '@/api/expenseManagement'
-import { allocateBillDetailList, allocateBillDetailCount, allocateBillDetail, allocateBillDetailSave, allocateBillSubmit, allocateBillDetailDel, allocateBillDetailDelAll, allocateBillDetailPrint, allocateBillBatchInsert, allocateBillDetailExcel, updateBatchDepartment, queryStockProductPage } from '@/api/allocateBill'
+import { allocateBillDetailList, allocateBillDetailCount, allocateBillDetail, allocateBillDetailSave, allocateBillSubmit, allocateBillDetailDel, allocateBillDetailDelAll, allocateBillDetailPrint, allocateBillDetailExcel, updateBatchDepartment, queryStockProductPage } from '@/api/allocateBill'
 
 export default {
   name: 'TransferOutEdit',
@@ -621,12 +621,8 @@ export default {
     },
     // 导入产品
     handleGuideOk (obj) {
-      allocateBillBatchInsert(obj).then(res => {
-        if (res.status == 200) {
-          this.$refs.chooseTable.refresh(true)
-          this.getDetail(true)
-        }
-      })
+      this.$refs.chooseTable.refresh(true)
+      this.getDetail(true)
     },
     // 已选产品  重置
     chooseResetSearchForm (flag) {

+ 2 - 4
src/views/allocationManagement/transferOut/importGuideModal.vue

@@ -121,10 +121,8 @@ export default {
     },
     // 导入
     hanldeOk (obj) {
-      if (obj && obj.length > 0) {
-        this.$emit('ok', obj)
-        this.isShow = false
-      }
+      this.$emit('ok', obj)
+      this.isShow = false
     },
     // 关闭
     handleClose () {

+ 6 - 0
src/views/common/chooseWarehouse.js

@@ -4,9 +4,11 @@ const warehouse = {
       <a-select
         :placeholder="placeholder"
         :id="id"
+        style="width:100%;"
         :allowClear="allowClear"
         :value="defaultVal"
         :showSearch="true"
+        :size="size"
         :disabled="disabled"
         :mode="modeType"
         @change="handleChange"
@@ -27,6 +29,10 @@ const warehouse = {
       type: Boolean,
       default: true
     },
+    size: {
+      type: String,
+      default: 'default'
+    },
     id: {
       type: String,
       default: ''

+ 7 - 1
src/views/common/productBrand.js

@@ -5,6 +5,8 @@ const ProductBrand = {
         :placeholder="placeholder"
         :id="id"
         allowClear
+        style="width:100%;"
+        :size="size"
         :value="defaultVal"
         :showSearch="true"
         :disabled="disabled"
@@ -34,7 +36,11 @@ const ProductBrand = {
     disabled: {
       type: Boolean,
       default: false
-    }
+    },
+    size: {
+      type: String,
+      default: 'default'
+      }
   },
   data() {
     return {

+ 6 - 0
src/views/common/productType.js

@@ -5,11 +5,13 @@ const ProductType = {
         @change="handleChange"
         :change-on-select="changeOnSelect"
         :value="defaultVal"
+        style="width:100%;"
         :expand-trigger="expandType"
         :options="productTypeList"
         :show-search="{ filter }"
         :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
         :id="id"
+        :size="size"
         placeholder="请选择产品分类"
         :allowClear="true"/>
     `,
@@ -35,6 +37,10 @@ const ProductType = {
     changeOnSelect: {
       type: Boolean,
       default: true
+    },
+    size:{
+      type: String,
+      default: 'default'
     }
   },
   data () {

+ 6 - 0
src/views/common/productTypeAll.js

@@ -5,6 +5,8 @@ const ProductType = {
         @change="handleChange"
         change-on-select
         :value="defaultVal"
+        :size="size"
+        style="width:100%;"
         expand-trigger="hover"
         :options="productTypeList"
         :disabled="disabled"
@@ -36,6 +38,10 @@ const ProductType = {
     isAll: {
       type: Boolean,
       default: true
+    },
+    size: {
+      type: String,
+      default: 'default'
     }
   },
   data () {

+ 6 - 13
src/views/expenseManagement/expenseReimbursement/list.vue

@@ -211,9 +211,8 @@ import verifyModal from './verifyModal.vue'
 import previewModal from './previewModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import expenseType from '@/views/common/expenseType.js'
-import { getBatchLastProcessInstance } from '@/api/financeBook'
 import customerService from '@/views/common/customerService'
-import { expenseAccountList, expenseAccountDelete, expenseAccountAgainEdit, expenseAcctDetailFindList, expenseAccountUpdateBatch } from '@/api/expenseManagement'
+import { expenseAccountList, expenseAccountDelete, expenseAccountAgainEdit, expenseAcctDetailFindList, expenseAccountUpdateBatch, getProcessInstance } from '@/api/expenseManagement'
 import baseDataModal from './baseDataModal.vue'
 export default {
   name: 'ExpenseReimbursementList',
@@ -330,31 +329,25 @@ export default {
       // 开始打印
       this.spinning = true
       const pageData = []
-      const businessSnList = []
+      let newSpListData = []
       // 循环获取
       for (let i = 0; i < rows.length; i++) {
         // 费用明细
         const fyListData = await expenseAcctDetailFindList({ expenseAccountSn: rows[i].expenseAccountSn }).then(res => res.data)
         // 审核明细,待提交状态不获取
         if (rows[i].state != 'WAIT_SUBMIT') {
-          businessSnList.push(rows[i].expenseAccountSn)
+          // 获取审核进度信息
+          newSpListData = await getProcessInstance({ 'businessType':'EXPENSES', 'businessSn': rows[i].expenseAccountSn }).then(res => res.data[0].opinionList || [])
         }
         // 组装数据
         pageData.push({
           printRemark: this.printRemark,
           expenseInfo: rows[i],
           fyListData: fyListData,
-          spListData: []
+          spListData: newSpListData
         })
       }
-      // 获取审核进度信息
-      const spListData = await getBatchLastProcessInstance({ 'businessType': 'EXPENSES', 'businessSnList': businessSnList }).then(res => res.data)
-      pageData.map(item => {
-        if (spListData) {
-          const sp = spListData[item.expenseInfo.expenseAccountSn]
-          item.spListData = sp ? sp.taskVOList : []
-        }
-      })
+      
       // 打开预览弹框
       this.showTipModal = true
       this.$nextTick(() => {

+ 12 - 13
src/views/salesManagement/receiptPrint/list.vue

@@ -155,7 +155,8 @@ import recordModal from './recordModal.vue'
 import printModel from './printModel.vue'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
 import customerService from '@/views/common/customerService'
-import { financeBookDetailList, updateFinanceBookDetail, getBatchLastProcessInstance, checkPrintStatus } from '@/api/financeBook'
+import { financeBookDetailList, updateFinanceBookDetail, checkPrintStatus } from '@/api/financeBook'
+import { getProcessInstance } from '@/api/expenseManagement'
 export default {
   name: 'ReceiptPrintList',
   mixins: [commonMixin],
@@ -305,9 +306,8 @@ export default {
       }
 
       const retArr = []
-      const auditInfo = await getBatchLastProcessInstance({ 'businessType': 'FINANCE_BOOK', 'businessSnList': bookSns }).then(res => res.data)
-      console.log(auditInfo)
-      bookSns.map(item => {
+      for (let i = 0; i < bookSns.length; i++) {
+        const item = bookSns[i]
         // 授信明细,还款明细
         const rs = rows.filter(a => a.bookSn == item)
         let detailItemUseStr = ''
@@ -320,10 +320,11 @@ export default {
             detailPayUseStr += this.getUseDetailInfo(b.detailItemPayList)
           }
         })
+        const auditInfo = await getProcessInstance({ 'businessType': 'FINANCE_BOOK', 'businessSn': item }).then(res => (res.data[0] && res.data[0].opinionList) ? res.data[0].opinionList : [])
         // 审核信息
-        const auditStr = auditInfo ? this.getAuditInfo(auditInfo[item]) : ''
+        const auditStr = auditInfo ? this.getAuditInfo(auditInfo) : ''
         retArr.push({ audit: auditStr, detail: detailItemUseStr, payDetail: detailPayUseStr, subList: rs })
-      })
+      }
       this.handlePrint(retArr, 1, rows, bookSns)
     },
     // 获取授信西悉尼
@@ -337,10 +338,10 @@ export default {
     // 获取审核信息
     getAuditInfo (auditList) {
       let auditStr = ''
-      if (auditList && auditList.taskVOList) {
-        const auditLists = auditList.taskVOList.filter(item => item.userType == '审批人')
+      if (auditList && auditList.length) {
+        const auditLists = auditList.filter(item => item.processTaskType == '审批人')
         auditLists.map((a, i) => {
-          auditStr = auditStr + a.userName + '(' + a.state + ')' + (i == auditLists.length - 1 ? ';' : ',')
+          auditStr = auditStr + a.approvalName + '(' + a.approvalStateDictValue + ')' + (i == auditLists.length - 1 ? ';' : ',')
         })
       }
       return auditStr
@@ -365,10 +366,8 @@ export default {
             return
           }
         }
-
-        auditInfo = await getBatchLastProcessInstance({ 'businessType': 'FINANCE_BOOK', 'businessSnList': [list.bookSn] }).then(res => res.data)
+        auditInfo = await getProcessInstance({ 'businessType': 'FINANCE_BOOK', 'businessSn': list.bookSn }).then(res => (res.data[0] && res.data[0].opinionList) ? res.data[0].opinionList : [])
       }
-      console.log(auditInfo)
       this.spinning = true
       this.showTipModal = true
       let detailItemUseStr = ''
@@ -382,7 +381,7 @@ export default {
           detailPayUseStr = this.getUseDetailInfo(row.detailItemPayList)
         }
         // 审核信息
-        const auditStr = auditInfo ? this.getAuditInfo(auditInfo[list.bookSn]) : ''
+        const auditStr = auditInfo ? this.getAuditInfo(auditInfo) : ''
         this.$refs.printModel.getData(type ? row : [{ audit: auditStr, detail: detailItemUseStr, payDetail: detailPayUseStr, subList: [row] }], type ? list : [list])
       })
     },

+ 10 - 10
src/views/salesManagement/salesCollection/voucherModal.vue

@@ -114,7 +114,7 @@ import printModel from '../receiptPrint/printModel.vue'
 import detailModal from '@/views/financialManagement/financialCollection/detail.vue'
 import collectDetailModal from './detailModal.vue'
 import { settleReceiptFindBySn } from '@/api/settleReceipt.js'
-import { getBatchLastProcessInstance } from '@/api/financeBook'
+import { getProcessInstance } from '@/api/expenseManagement'
 export default {
   name: 'VoucherModal',
   mixins: [commonMixin],
@@ -192,10 +192,10 @@ export default {
     // 获取审核信息
     getAuditInfo (auditList) {
       let auditStr = ''
-      if (auditList && auditList.taskVOList) {
-        const auditLists = auditList.taskVOList.filter(item => item.userType == '审批人')
+      if (auditList && auditList.length) {
+        const auditLists = auditList.filter(item => item.processTaskType == '审批人')
         auditLists.map((a, i) => {
-          auditStr = auditStr + a.userName + '(' + a.state + ')' + (i == auditLists.length - 1 ? '。' : ';')
+          auditStr = auditStr + a.approvalName + '(' + a.approvalStateDictValue + ')' + (i == auditLists.length - 1 ? '。' : ';')
         })
       }
       return auditStr
@@ -216,10 +216,9 @@ export default {
         }
       })
       const retArr = []
-      const auditInfo = await getBatchLastProcessInstance({ 'businessType': 'FINANCE_BOOK', 'businessSnList': bookSns }).then(res => res.data)
-      console.log(bookSns, auditInfo)
-      bookSns.map(item => {
+      for (let i = 0; i < bookSns.length; i++) {
         // 授信明细
+        const item = bookSns[i]
         const rs = rows.filter(a => a.bookSn == item)
         let detailItemUseStr = ''
         rs.map(b => {
@@ -229,11 +228,12 @@ export default {
             })
           }
         })
+        const auditInfo = await getProcessInstance({ 'businessType': 'FINANCE_BOOK', 'businessSn': item }).then(res => (res.data[0] && res.data[0].opinionList) ? res.data[0].opinionList : [])
         // 审核信息
-        const auditStr = this.getAuditInfo(auditInfo[item])
+        const auditStr = this.getAuditInfo(auditInfo)
         retArr.push({ audit: auditStr, detail: detailItemUseStr, subList: rs })
-      })
-      console.log(retArr, '------------')
+      }
+
       if (retArr.length) {
         this.handlePrint(retArr, rows)
       } else {

+ 51 - 19
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -3,33 +3,59 @@
     <!-- 筛选条件 -->
     <div class="table-page-search-wrapper" style="margin:0" v-show="showSearchBox">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="15">
-          <a-col :md="4" :sm="24">
+        <a-row :gutter="15" type="flex">
+          <a-col flex="1">
             <a-form-item label="出库仓库" prop="warehouseSn">
-              <chooseWarehouse :id="'salesEdit-warehouseSn-'+id" ref="warehouse" v-model="queryParam.warehouseSn" @load="warehouseLoad"></chooseWarehouse>
+              <chooseWarehouse
+                style="width:100%;"
+                :id="'salesEdit-warehouseSn-'+id"
+                ref="warehouse"
+                v-model="queryParam.warehouseSn"
+                @load="warehouseLoad"></chooseWarehouse>
             </a-form-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col flex="1">
             <a-form-item label="产品编码" prop="productCode">
-              <a-input :id="'salesEdit-productCode-'+id" v-model.trim="queryParam.productCode" placeholder="请输入产品编码" allowClear />
+              <a-input
+                style="width:100%;"
+                :id="'salesEdit-productCode-'+id"
+                v-model.trim="queryParam.productCode"
+                placeholder="请输入产品编码"
+                allowClear />
             </a-form-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col flex="1">
             <a-form-item label="产品名称" prop="productName">
-              <a-input :id="'salesEdit-productName-'+id" v-model.trim="queryParam.productName" placeholder="请输入产品名称" allowClear />
+              <a-input
+                style="width:100%;"
+                :id="'salesEdit-productName-'+id"
+                v-model.trim="queryParam.productName"
+                placeholder="请输入产品名称"
+                allowClear />
             </a-form-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col flex="1">
             <a-form-item label="品牌">
               <ProductBrand :id="'salesEdit-productBrandSn-'+id" v-model="queryParam.productBrandSn"></ProductBrand>
             </a-form-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col flex="1">
             <a-form-item label="产品分类">
-              <productTypeAll :id="'salesEdit-productType-'+id" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></productTypeAll>
+              <productTypeAll
+                style="width:100%;"
+                :id="'salesEdit-productType-'+id"
+                size="small"
+                placeholder="请选择产品分类"
+                @change="changeProductType"
+                v-model="productType"></productTypeAll>
             </a-form-item>
           </a-col>
-          <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
+          <a-col flex="1">
+            <a-form-item label="满足起订量">
+              <v-select code="FLAG" allowClear placeholder="请选择是否满足起订量"></v-select>
+            </a-form-item>
+          </a-col>
+          <a-col flex="2" style="margin-bottom: 10px;">
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" :id="'salesEdit-refresh-'+id">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" :id="'salesEdit-reset-'+id">重置</a-button>
           </a-col>
@@ -70,6 +96,7 @@
           <span v-if="selectTotal" style="margin-left:10px;">已选{{ selectTotal }}项</span>
         </a-col>
         <a-col :md="12" :sm="24" style="text-align:right;">
+          <label><a-checkbox v-model="queryParam.showLj"></a-checkbox> 显示累计产品</label>
           <a-button
             :id="'salesEdit-searchBox-'+id"
             type="link"
@@ -125,6 +152,10 @@
         </div>
         <div v-else>--</div>
       </template>
+      <!-- 规则数量 -->
+      <template slot="rulesNums" slot-scope="text, record">
+        <a-button type="link" :id="'salesEdit-gzqty-'+id+'-'+record.id" size="small" class="button-info">1</a-button>
+      </template>
       <!-- 销售数量 -->
       <template slot="salesNums" slot-scope="text, record">
         <a-input-number
@@ -294,7 +325,7 @@ export default {
           return data
         })
       },
-      showSearchBox: false, // 是否显示筛选条件
+      showSearchBox: true, // 是否显示筛选条件
       openWarehouseModal: false, // 打开仓库设置
       delLoading: false, // 删除logding
       disabled: false, //  查询、重置按钮是否可操作
@@ -328,21 +359,22 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: '12%', align: 'center' },
         { title: '产品名称', dataIndex: 'productEntity.name', scopedSlots: { customRender: 'productName' }, width: '25%', align: 'left' },
-        { title: '起订量', dataIndex: 'unitQtyV', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '规则数量', scopedSlots: { customRender: 'rulesNums' }, width: '4%', align: 'center' },
+        { title: '起订量', dataIndex: 'unitQtyV', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '销售数量', scopedSlots: { customRender: 'salesNums' }, width: '6%', align: 'center' },
-        { title: '库存', dataIndex: 'stockQty', scopedSlots: { customRender: 'stockQty' }, width: '6%', align: 'center' },
-        { title: '出库仓库', scopedSlots: { customRender: 'warehouseBox' }, width: '10%', align: 'center' },
+        { title: '库存', dataIndex: 'stockQty', scopedSlots: { customRender: 'stockQty' }, width: '5%', align: 'center' },
+        { title: '出库仓库', scopedSlots: { customRender: 'warehouseBox' }, width: '8%', align: 'center' },
         { title: '单位', dataIndex: 'productEntity.unit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
       if (this.showStockCol) {
-        arr.splice(6, 0, { title: '第三方库存', dataIndex: 'thirdStockQty', width: '6%', align: 'center', customRender: text => ((text || text == 0) ? text : '--') })
+        arr.splice(7, 0, { title: '第三方库存', dataIndex: 'thirdStockQty', width: '6%', align: 'center', customRender: text => ((text || text == 0) ? text : '--') })
       }
       // 售价权限
       if (this.$hasPermissions('B_salesEdit_salesPrice')) {
-        arr.splice(3, 0, { title: '售价', dataIndex: 'price', width: '6%', align: 'right', scopedSlots: { customRender: 'price' } })
-        arr.splice(4, 0, { title: '价格级别', dataIndex: 'priceLevelDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } })
-        arr.splice((this.showStockCol ? 9 : 8), 0, { title: '售价小计', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(4, 0, { title: '售价', dataIndex: 'price', width: '6%', align: 'right', scopedSlots: { customRender: 'price' } })
+        arr.splice(5, 0, { title: '价格级别', dataIndex: 'priceLevelDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } })
+        arr.splice((this.showStockCol ? 10 : 9), 0, { title: '售价小计', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr
     }

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/productNormalList.vue

@@ -14,7 +14,7 @@
               <a-input id="salesEdit-productCode" v-model.trim="queryParam.productCode" placeholder="请输入产品编码" allowClear />
             </a-form-item>
           </a-col>
-          <a-col flex="2">
+          <a-col flex="1">
             <a-form-item label="产品名称" prop="productName">
               <a-input id="salesEdit-productName" v-model.trim="queryParam.productName" placeholder="请输入产品名称" allowClear />
             </a-form-item>