瀏覽代碼

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

李磊 1 年之前
父節點
當前提交
7a058bda79

二進制
public/templ/费用明细模板.xlsx


+ 2 - 2
src/components/Table/index.js

@@ -168,9 +168,9 @@ export default {
      */
     loadData (pagination, filters, sorter) {
       this.localLoading = true
-      console.log(sorter)
+      console.log(pagination,this.localPagination)
       const parameter = Object.assign({
-        pageNo: (pagination && pagination.current) ||
+        pageNo: this.showPagination && pagination && pagination.pageSize != this.localPagination.pageSize ? 1 : (pagination && pagination.current) ||
           this.showPagination && this.localPagination.current || this.pageNum,
         pageSize: (pagination && pagination.pageSize) ||
           this.showPagination && this.localPagination.pageSize || this.pageSize,

+ 14 - 12
src/components/UploadFile/index.vue

@@ -108,18 +108,20 @@ export default {
     const _this = this
     this.$nextTick(() => {
       const el = document.querySelector('.ant-upload-list-picture-card')
-      const sortable = Sortable.create(el, {
-        onEnd: function (evt) {
-          console.log(evt.oldIndex, evt.newIndex)
-          const a = _this.formatFile()
-          console.log(a.split(','))
-          const ret = moveElement(a.split(','), evt.oldIndex, evt.newIndex)
-          console.log(ret)
-
-          _this.$emit('change', ret.join(','))
-          _this.$emit('input', ret.join(','))
-        }
-      })
+      if(el){
+        const sortable = Sortable.create(el, {
+          onEnd: function (evt) {
+            console.log(evt.oldIndex, evt.newIndex)
+            const a = _this.formatFile()
+            console.log(a.split(','))
+            const ret = moveElement(a.split(','), evt.oldIndex, evt.newIndex)
+            console.log(ret)
+        
+            _this.$emit('change', ret.join(','))
+            _this.$emit('input', ret.join(','))
+          }
+        })
+      }
     })
   },
   methods: {

+ 9 - 0
src/libs/tools.js

@@ -511,4 +511,13 @@ export const moveElement = function (arr, fromIndex, toIndex) {
   const element = arr.splice(fromIndex, 1)[0];
   arr.splice(toIndex, 0, element);
   return arr;
+}
+// 校验特殊字符
+export const validateSpecialCharacter = function(rule, value, callback){
+  var regex = /[!@#$%^&*(),.?":{}|<>]/;
+  if(regex.test(value)){
+    return callback(new Error('不能输入特殊字符'));
+  }else{
+    callback()
+  }
 }

+ 21 - 4
src/views/allocationManagement/transferOut/printModal.vue

@@ -36,20 +36,25 @@
             <a-radio value="-1">不打印</a-radio>
           </a-radio-group>
         </a-form-model-item>
-        <a-form-model-item label="产品价格" prop="priceType" v-if="nowType=='dbPrint'">
+        <a-form-model-item label="产品价格" style="margin-bottom: 0;" prop="priceType" v-if="nowType=='dbPrint'">
           <a-radio-group v-model="form.priceType">
             <a-radio value="ALLOCATE_BILL_PRICE" v-if="$hasPermissions('B_transferOut_print_salesPrice')">销售价</a-radio>
             <a-radio value="ALLOCATE_BILL_COST" v-if="$hasPermissions('B_transferOut_print_costPrice')">成本价</a-radio>
             <a-radio value="ALLOCATE_BILL">不打印</a-radio>
           </a-radio-group>
         </a-form-model-item>
-        <a-form-model-item label="产品价格" prop="priceType" v-if="nowType=='dbExport'">
+        <a-form-model-item label="产品价格" style="margin-bottom: 0;" prop="priceType" v-if="nowType=='dbExport'">
           <a-radio-group v-model="form.priceType">
             <a-radio value="ALLOCATE_BILL_PRICE" v-if="$hasPermissions('B_transferOut_detail_export_salesPrice')">销售价</a-radio>
             <a-radio value="ALLOCATE_BILL_COST" v-if="$hasPermissions('B_transferOut_detail_export_costPrice')">成本价</a-radio>
             <a-radio value="ALLOCATE_BILL">不导出</a-radio>
           </a-radio-group>
         </a-form-model-item>
+        <a-form-model-item label="备注" v-if="nowType=='dbPrint'">
+          <a-checkbox @change="onChangeRemark" :checked="remarkFlag">
+            打印
+          </a-checkbox>
+        </a-form-model-item>
       </a-form-model>
       <div class="btn-cont">
         <a-button id="allocateBill-print-close" @click="handleClose('preview')">取消</a-button>
@@ -102,8 +107,10 @@ export default {
       form: {
         id: 'all',
         priceType: 'ALLOCATE_BILL',
-        orderBy: undefined
+        orderBy: undefined,
+        remarkFlag: 1// 备货打印  1打印 0不打印
       },
+      remarkFlag: true,
       rules: {
         id: [{ required: true, message: '请选择产品分类', trigger: 'change' }],
         priceType: [{ required: true, message: '请选择产品价格', trigger: 'change' }],
@@ -136,6 +143,10 @@ export default {
     }
   },
   methods: {
+    onChangeRemark (e) {
+      this.remarkFlag = e.target.checked
+      this.form.remarkFlag = e.target.checked ? 1 : 0
+    },
     // 确认
     handleSave (type) {
       const _this = this
@@ -159,6 +170,7 @@ export default {
             printType: _this.form.priceType,
             isPreview: type == 'preview' ? 1 : 0
           }
+
           // 分类打印/导出
           if (_this.nowType == 'dbflPrint' || _this.nowType == 'dbflExport') {
             const item = _this.typeList.find(item => item.id == _this.form.id)
@@ -175,6 +187,9 @@ export default {
             }
           }
           // 打印
+          if (this.nowType == 'dbPrint') {
+            obj.remarkFlag = this.form.remarkFlag
+          }
           if (_this.nowType == 'dbPrint' || _this.nowType == 'dbflPrint') {
             _this.$emit('ok', obj)
           } else {
@@ -204,8 +219,10 @@ export default {
       this.$refs.ruleForm.resetFields()
       this.form = {
         id: 'all',
-        priceType: 'ALLOCATE_BILL'
+        priceType: 'ALLOCATE_BILL',
+        remarkFlag: 1
       }
+      this.remarkFlag = true
     }
   },
   watch: {

+ 42 - 34
src/views/expenseManagement/expenseReimbursement/detail.vue

@@ -44,7 +44,7 @@
               <a-descriptions-item label="审核时间">{{ detailData&&detailData.finishDate || '--' }}</a-descriptions-item>
               <a-descriptions-item label="关联单号" v-if="detailData&&detailData.bizNo">{{ detailData&&detailData.bizNo || '--' }}</a-descriptions-item>
               <a-descriptions-item label="主题" :span="3">{{ detailData&&detailData.title || '--' }}</a-descriptions-item>
-              
+
               <a-descriptions-item label="详细说明" :span="4">
                 {{ detailData.content.join(',')||'' }}
               </a-descriptions-item>
@@ -72,7 +72,7 @@
           :columns="columns"
           :data="loadData"
           :showPagination="false"
-          :defaultLoadData="true"
+          :defaultLoadData="false"
           bordered>
           <!-- 记账名称 -->
           <template slot="jzname" slot-scope="text,record">
@@ -101,7 +101,13 @@
       </a-card>
     </a-spin>
     <!-- 打印预览 -->
-    <commonModal modalTit="费用报销单打印预览" width="700pt" okText="立即打印" :openModal="showTipModal" @cancel="showTipModal=false" @ok="$refs.printModal.prints()">
+    <commonModal
+      modalTit="费用报销单打印预览"
+      width="700pt"
+      okText="立即打印"
+      :openModal="showTipModal"
+      @cancel="showTipModal=false"
+      @ok="$refs.printModal.prints()">
       <previewModal v-if="printType=='preview'" ref="printModal" @printOk="printOk"></previewModal>
     </commonModal>
     <!-- 快捷打印 -->
@@ -123,14 +129,27 @@ export default {
   mixins: [commonMixin],
   components: { STable, previewModal, commonModal },
   data () {
-    let _this=this
+    const _this = this
     return {
       spinning: false,
       disabled: false,
       baseData: null,
       showTipModal: false,
-      printType:'',
+      printType: '',
       count: 0,
+      columns: [
+        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
+        { title: '记账类型', dataIndex: 'accountTypeDictValue', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
+        { title: '记账名称', dataIndex: 'accountName', scopedSlots: { customRender: 'jzname' }, align: 'center', width: '14%' },
+        { title: '所属区域', dataIndex: 'subareaNames', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '所属分区', dataIndex: 'subareaAreaName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '所属省份', dataIndex: 'provinceName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
+        { title: '所属城市', dataIndex: 'cityName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
+        { title: '记账费用', dataIndex: 'expense', align: 'right', width: '10%', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } },
+        { title: '费用承担方', scopedSlots: { customRender: 'fycdf' }, align: 'center', width: '15%' },
+        { title: '产品信息', scopedSlots: { customRender: 'cpxx' }, align: 'center', width: '15%' },
+        { title: '备注', dataIndex: 'remarks', align: 'center', width: '10%', customRender: function (text) { return text || '--' } }
+      ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.spinning = true
@@ -149,19 +168,6 @@ export default {
           return data
         })
       },
-      columns: [
-        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '记账类型', dataIndex: 'accountTypeDictValue', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
-        { title: '记账名称', dataIndex: 'accountName', scopedSlots: { customRender: 'jzname' }, align: 'center', width: '14%' },
-        { title: '所属区域', dataIndex: 'subareaNames', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '所属分区', dataIndex: 'subareaAreaName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '所属省份', dataIndex: 'provinceName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
-        { title: '所属城市', dataIndex: 'cityName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
-        { title: '记账费用', dataIndex: 'expense', align: 'right', width: '10%', customRender: function (text) { return (text||text==0)?_this.toThousands(text):'--' } },
-        { title: '费用承担方', scopedSlots: { customRender: 'fycdf' }, align: 'center', width: '15%' },
-        { title: '产品信息', scopedSlots: { customRender: 'cpxx' }, align: 'center', width: '15%' },
-        { title: '备注', dataIndex: 'remarks', align: 'center', width: '10%', customRender: function (text) { return text || '--' } }
-      ],
       chooseLoadData: [],
       detailData: null, //  详情数据
       total: 0
@@ -181,37 +187,37 @@ export default {
       // 审核明细,待提交状态不获取
       const spListData = this.detailData.state != 'WAIT_SUBMIT' ? await getProcessInstance({ businessType: 'EXPENSES', businessSn: this.$route.params.sn }).then(res => res.data) : null
       // 打印预览弹框
-      if(type == 'preview'){
+      if (type == 'preview') {
         this.showTipModal = true
-      } 
-      this.$nextTick(()=>{
+      }
+      this.$nextTick(() => {
         this.$refs.printModal.setData([{
           expenseInfo: this.detailData,
           fyListData,
-          spListData:spListData||[]
+          spListData: spListData || []
         }])
         // 立即打印
-        if(type == 'print'){
-          setTimeout(()=>{
+        if (type == 'print') {
+          setTimeout(() => {
             this.$refs.printModal.prints()
-          },500)
+          }, 500)
         }
         this.spinning = false
       })
     },
-    printOk(data){
-      if(data&&data.status == 200){
+    printOk (data) {
+      if (data && data.status == 200) {
         expenseAccountUpdateBatch([{
-            id: this.detailData.id,
-            printStatus:"PRINT"
-          }]).then(res => {
-          if(res.status == 200){
-             this.getDetail()
+          id: this.detailData.id,
+          printStatus: 'PRINT'
+        }]).then(res => {
+          if (res.status == 200) {
+            this.getDetail()
           }
           this.spinning = false
           this.showTipModal = false
         })
-      }else{
+      } else {
         this.spinning = false
       }
     },
@@ -224,7 +230,9 @@ export default {
           this.spinning = false
           this.detailData = res.data
           this.detailData.content = res.data.content.replace(/\n+/, '\n').split('\n')
-          this.$refs.table.refresh()
+          this.$nextTick(() => {
+            this.$refs.table.refresh()
+          })
         } else {
           this.detailData = null
         }

+ 12 - 1
src/views/expenseManagement/expenseReimbursement/epenseCdfModal.vue

@@ -41,6 +41,13 @@
                 :id="'cust-'+index"
                 :ref="'custList-'+record.no"
                 placeholder="请选择(输入名称搜索)"></custList>
+              <!-- 供应商 -->
+              <supplier
+                v-show="record.splitObjType=='SUPPLIER'"
+                style="width: 100%;"
+                enableFlag="1"
+                v-model="record.splitObjSn"
+                placeholder="请选择(输入名称搜索)"></supplier>
               <span v-if="!record.splitObjType">--</span>
             </template>
             <!-- 费用承担金额 -->
@@ -123,8 +130,9 @@ import { VSelect } from '@/components'
 import department from './department.js'
 import employee from './employee.js'
 import custList from '@/views/common/custList.vue'
+import supplier from '@/views/common/supplier.js'
 export default {
-  components: { VSelect, department, employee, custList },
+  components: { VSelect, department, employee, custList, supplier },
   name: 'EpenseCdfModal',
   props: {
     list: { //  弹框显示状态
@@ -188,6 +196,9 @@ export default {
         this.$set(row, 'splitObjName', undefined)
         this.$refs['custList-' + row.no].dealerName = []
       }
+      if (row.splitObjType == 'SUPPLIER') {
+        this.$set(row, 'splitObjSn', undefined)
+      }
       this.$emit('fyTotal', this.fyTotal())
     },
     // 经销商

+ 11 - 11
src/views/expenseManagement/expenseReimbursement/epenseDetailModal.vue

@@ -155,9 +155,9 @@ export default {
         id: undefined,
         accountType: undefined, // 记帐类型
         accountNameSn: undefined, //  记账名称
-        subareaArea:{
+        subareaArea: {
           subareaName: undefined, //  所属区域
-          subareaAreaName: undefined, // 分区
+          subareaAreaName: undefined // 分区
         },
         provinceSn: undefined, // 省份
         provinceName: '',
@@ -197,7 +197,7 @@ export default {
           this.form.cityName = row.cityName
           this.form.subareaArea.subareaName = row.subareaArea.subareaName
           this.form.subareaArea.subareaAreaName = row.subareaArea.subareaAreaName
-          this.subareaList = [row.subareaArea.subareaName,row.subareaArea.subareaAreaName]
+          this.subareaList = [row.subareaArea.subareaName, row.subareaArea.subareaAreaName]
         } else {
           this.form.accountNameSn = ''
           this.form.provinceSn = ''
@@ -215,7 +215,7 @@ export default {
       })
     },
     // 分区
-    subareaChange(val, row){
+    subareaChange (val, row) {
       this.form.subareaArea.subareaName = val[0] ? val[0] : ''
       this.form.subareaArea.subareaAreaName = val[1] ? val[1] : ''
     },
@@ -246,9 +246,9 @@ export default {
             if (res.data.accountType == 'CUSTOMER') {
               this.$refs.custList.setDufaultVal(res.data.accountName)
             }
-            this.form.subareaArea.subareaName = res.data.subareaNames||''
-            this.form.subareaArea.subareaAreaName = res.data.subareaAreaName||''
-            this.subareaList = res.data.subareaNames ?  [res.data.subareaNames,res.data.subareaAreaName] : undefined
+            this.form.subareaArea.subareaName = res.data.subareaNames || ''
+            this.form.subareaArea.subareaAreaName = res.data.subareaAreaName || ''
+            this.subareaList = res.data.subareaNames ? [res.data.subareaNames, res.data.subareaAreaName] : undefined
           }, 200)
           this.spinning = false
         })
@@ -293,9 +293,9 @@ export default {
           form.citySn = form.citySn ? form.citySn : ''
           form.cityName = form.cityName ? form.cityName : ''
           form.expense = Math.abs(form.expense)
-          
+
           console.log(form)
-        
+
           _this.spinning = true
           expenseAcctDetailSave(form).then(res => {
             if (res.status == 200) {
@@ -323,9 +323,9 @@ export default {
         id: undefined,
         accountType: undefined, // 记帐类型
         accountNameSn: undefined, //  记账名称
-        subareaArea:{
+        subareaArea: {
           subareaName: undefined, //  所属区域
-          subareaAreaName: undefined, // 分区
+          subareaAreaName: undefined // 分区
         },
         provinceSn: undefined, // 省份
         provinceName: '',

+ 14 - 8
src/views/productManagement/productInfo/edit.vue

@@ -223,6 +223,7 @@ import Editor from '@/components/WEeditor'
 import { productSave, productSnDetail } from '@/api/product'
 import { productTypeQueryAll } from '@/api/productType'
 import { productBrandQuery } from '@/api/productBrand'
+import { validateSpecialCharacter } from '@/libs/tools'
 export default {
   name: 'ProductInfoEdit',
   mixins: [commonMixin],
@@ -259,10 +260,15 @@ export default {
       },
       rules: {
         name: [
-          { required: true, message: '请输入产品名称', trigger: 'blur' }
+          { required: true, message: '请输入产品名称', trigger: 'change' },
+          // { validator: validateSpecialCharacter, trigger: 'change' }
         ],
         code: [
-          { required: true, message: '请输入产品编码', trigger: 'blur' }
+          { required: true, message: '请输入产品编码', trigger: 'change' },
+          // { validator: validateSpecialCharacter, trigger: 'change' }
+        ],
+        origCode: [
+          // { validator: validateSpecialCharacter, trigger: 'change' }
         ],
         productBrandSn: [
           { required: true, message: '请选择产品品牌', trigger: 'change' }
@@ -274,13 +280,13 @@ export default {
           { required: true, message: '请选择单位', trigger: 'change' }
         ],
         packQty: [
-          { required: true, message: '请输入包装数', trigger: 'blur' }
+          { required: true, message: '请输入包装数', trigger: 'change' }
         ],
         arrowFalg: [
           { required: true, message: '请选择是否为箭冠产品', trigger: 'change' }
         ],
         qrCode: [
-          { required: false, message: '请输入条形码', trigger: 'blur' },
+          { required: false, message: '请输入条形码', trigger: 'change' },
           { validator: this.validateQrCode }
         ]
       },
@@ -321,13 +327,13 @@ export default {
     handleSubmit (e) {
       e.preventDefault()
       const _this = this
-      if (!this.form.productTypeSn3) {
-        this.$message.warning('产品分类未选到第三级,请修改后再提交!')
-        return
-      }
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const form = JSON.parse(JSON.stringify(_this.form))
+          if (!form.productTypeSn3) {
+            this.$message.warning('产品分类未选到第三级,请修改后再提交!')
+            return false
+          }
           form.id = _this.$route.params.id ? _this.$route.params.id : undefined
           form.productPicList = []
           if (form.productMsg) {

+ 1 - 1
src/views/promotionRulesManagement/dealerPromotions/addModal.vue

@@ -184,7 +184,7 @@ export default {
     },
     //  附件上传
     changeAttach (file) {
-      this.attachList = JSON.parse(file)
+      this.attachList = file ? JSON.parse(file) : []
       this.attachList.map(item => {
         item.fileType = item.extName
       })

+ 2 - 2
src/views/promotionRulesManagement/dealerPromotions/chooseProductsModal.vue

@@ -41,7 +41,7 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-                <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="chooseProducts-refresh">查询</a-button>
+                <a-button type="primary" @click="$refs.table.refresh()" :disabled="disabled" id="chooseProducts-refresh">查询</a-button>
                 <a-button style="margin-left: 5px" @click="resetData" :disabled="disabled" id="chooseProducts-reset">重置</a-button>
               </a-col>
             </a-row>
@@ -185,7 +185,7 @@ export default {
       this.queryParam.productTypeSn3 = ''
       this.queryParam.productType = []
       this.$nextTick(() => {
-        this.$refs.table.refresh()
+        this.$refs.table.refresh(true)
       })
     },
     //  清空选项

+ 9 - 10
src/views/promotionRulesManagement/promotionManagement/chooseDealer.vue

@@ -150,15 +150,16 @@ export default {
     },
     handlePage (pagination, filters, sorter) {
       const pager = { ...this.pagination }
-      pager.current = pagination.current
+      pager.pageNo = pagination.pageSize != pager.pageSize ? 1 : pagination.current
       pager.pageSize = pagination.pageSize
+      pager.current = pager.pageNo
       this.pagination = pager
-
-      this.loadData({ pageNo: pagination.current, pageSize: pagination.pageSize })
+      this.loadData()
     },
-    loadData (pager) {
+    loadData () {
       this.spinning = true
-      const params = { pageSize: 20, pageNo: 1, ...pager }
+      console.log(this.pagination)
+      const params = { pageSize: 20, pageNo: 1, ...this.pagination }
       dealerQueryList(Object.assign(params, this.queryParam)).then(res => {
         let data
         if (res.status == 200) {
@@ -219,11 +220,9 @@ export default {
       } else {
         this.$refs.areaList.clearData()
       }
-      this.pagination = {
-        pageSize: 20,
-        showSizeChanger: true,
-        current: 1
-      }
+      
+      this.pagination.pageNo = 1
+      this.pagination.current = 1
       this.loadData()
       this.pageFlag = false
     },

+ 7 - 2
src/views/salesManagement/salesQueryNew/list.vue

@@ -126,7 +126,7 @@
             <div>
               <div>
                 总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
-                总款数:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '--' }}</strong>;
+                总款数:<strong>{{ totalData&&totalData.totalCategory || totalData.totalCategory == 0 ? totalData.totalCategory : '--' }}</strong>;
                 总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
                 已下推数量:<strong>{{ totalData&&(totalData.totalPushedQty || totalData.totalPushedQty==0) ? totalData.totalPushedQty : '--' }}</strong>;
                 已发货数量:<strong>{{ totalData&&(totalData.totalDispatchQty || totalData.totalDispatchQty==0) ? totalData.totalDispatchQty : '--' }}</strong>;
@@ -358,9 +358,14 @@ export default {
         this.spinning = true
         delete parameter.tableId
         delete parameter.index
+        if(parameter.sortOrder){
+          parameter["sortAlias"] = "sales_bill"
+        }else{
+          delete parameter.sortField
+        }
         // 查询总计
         salesCount(Object.assign(parameter, this.queryParam)).then(res => {
-          this.totalData = Object.assign(this.totalData, res.data || {})
+          this.totalData = res.data || {}
         })
         return salesList(Object.assign(parameter, this.queryParam)).then(res => {
           let data

+ 5 - 3
src/views/salesReturnManagement/custConfirm/list.vue

@@ -41,6 +41,8 @@
           size="small"
           :rowKey="(record) => record.id"
           :row-selection="{ columnWidth: 40 }"
+          :pagination="{pageSizeOptions: ['50','100','200','300','400']}"
+          :pageSize="50"
           @rowSelection="rowSelectionFun"
           :columns="columns"
           :data="loadData"
@@ -367,9 +369,9 @@ export default {
       this.$router.push({ name: 'salesReturnList', query: { closeLastOldTab: true } })
     },
     // 关闭批量设置退货单价弹窗
-    cancelPriceModal(){
-      this.$refs.setPriceModal.closeGrabOrder();
-      this.showSetPriceModal=false
+    cancelPriceModal () {
+      this.$refs.setPriceModal.closeGrabOrder()
+      this.showSetPriceModal = false
     },
     // 添加产品
     addProduct (data) {

+ 2 - 0
src/views/salesReturnManagement/receiveCheck/checking.vue

@@ -43,6 +43,8 @@
           @rowSelection="rowSelectionFun"
           :columns="columns"
           :data="loadData"
+          :pagination="{pageSizeOptions: ['50','100','200','300','400']}"
+          :pageSize="50"
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           bordered>

+ 2 - 0
src/views/salesReturnManagement/receiveCheck/receiving.vue

@@ -49,6 +49,8 @@
           @rowSelection="rowSelectionFun"
           :columns="columns"
           :data="loadData"
+          :pagination="{pageSizeOptions: ['50','100','200','300','400']}"
+          :pageSize="50"
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           bordered>

+ 0 - 1
src/views/salesReturnManagement/salesReturn/chooseCustomModal.vue

@@ -56,7 +56,6 @@
               <warehouse
                 v-model="form.warehouseSn"
                 showDef
-                disabled
                 id="chooseCustom-basicInfo-warehouseSn"
                 placeholder="请选择退货仓库"
               />

+ 3 - 3
src/views/salesReturnManagement/salesReturn/queryPart.vue

@@ -133,7 +133,7 @@ export default {
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [],
-      goodFlag:'',
+      goodFlag: '',
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
@@ -177,10 +177,10 @@ export default {
       this.queryParam.code = ''
       this.$refs.table.refresh(true)
     },
-    pageInit (buyerSn, warehouseSn, goodFlag) {
+    pageInit (buyerSn, warehouseName, goodFlag) {
       this.buyerSn = buyerSn
       this.goodFlag = goodFlag
-      // this.queryParam.warehouseSn = warehouseSn
+      this.queryParam.warehouseName = warehouseName
       const arr = [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
         { title: '产品编码', dataIndex: 'code', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },

+ 4 - 2
src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

@@ -12,6 +12,9 @@
           <span style="margin: 0 10px;color: #666;">
             退货类别:{{ ordeDetail&&ordeDetail.goodFlagDictValue }}
           </span>
+          <span style="color: #666;">
+            总部销退单号:{{ ordeDetail&&ordeDetail.salesReturnBillNo }}
+          </span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
@@ -166,7 +169,6 @@
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { printFun, exportExcel } from '@/libs/JGPrint.js'
-import { removeEmptyStr } from '@/libs/tools'
 import ImportGuideModal from './importGuideModal.vue'
 import queryPart from './queryPart.vue'
 import commonModal from '@/views/common/commonModal.vue'
@@ -416,7 +418,7 @@ export default {
         }
         this.$refs.table.refresh(!flag)
         if (!flag) {
-          this.$refs.partQuery.pageInit(this.buyerSn, this.ordeDetail.warehouseSn, this.goodFlag)
+          this.$refs.partQuery.pageInit(this.buyerSn, this.ordeDetail.warehouseName, this.goodFlag)
         }
       })
     },