Explorar o código

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

chenrui %!s(int64=2) %!d(string=hai) anos
pai
achega
c00d5955a9

+ 1 - 1
public/version.json

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

+ 1 - 1
src/api/checkWarehouse.js

@@ -153,7 +153,7 @@ export const checkWarehouseExcelList = (params) => {
 }
 // 数据导出  导出盘点   盘点列表  导出
 export const checkWarehouseExport = params => {
-  const url = `/checkWarehouse/excel/${params.checkWarehouseSn}`
+  const url = `/checkWarehouse/excel`
   return axios.request({
     url: url,
     data: params,

+ 1 - 1
src/views/allocationManagement/transferOut/list.vue

@@ -237,7 +237,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return allocateBillList(Object.assign(parameter, this.queryParam)).then(res => {
+        return allocateBillList(Object.assign(parameter, this.queryParam, {authWarehouseFlag: 0})).then(res => {
           let data
           if (res.status == 200) {
             data = res.data

+ 3 - 2
src/views/allocationManagement/transferReturn/edit.vue

@@ -20,14 +20,15 @@
               <a-descriptions-item label="调拨退货对象">{{ (basicInfoData&&basicInfoData.targetTypeDictValue) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="调拨退货对象名称">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="调入仓库">
-                <warehouse
+                <!-- <warehouse
                 style="width:200px;"
                 :allowClear="false"
                   v-model="basicInfoData.warehouseSn"
                   @change="updateWarehouse"
                   id="basicInfo-warehouseSn"
                   placeholder="请选择调入仓库"
-                />
+                /> -->
+                {{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}
               </a-descriptions-item>
               <a-descriptions-item label="费用/调拨退货类型">
                 <AllocateType

+ 21 - 17
src/views/allocationManagement/transferReturn/editGrp.vue

@@ -20,14 +20,15 @@
               <a-descriptions-item label="调拨退货对象">{{ (basicInfoData&&basicInfoData.targetTypeDictValue) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="调拨退货对象名称">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="调入仓库">
-                <warehouse
+                <!-- <warehouse
                 style="width:200px;"
                 :allowClear="false"
                   v-model="basicInfoData.warehouseSn"
                   @change="updateWarehouse"
                   id="basicInfo-warehouseSn"
                   placeholder="请选择调入仓库"
-                />
+                /> -->
+                {{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}
               </a-descriptions-item>
               <a-descriptions-item label="费用/调拨退货类型">
                 <AllocateType
@@ -52,20 +53,28 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" :forceRender="true" header="选择产品">
             <!-- 筛选条件 -->
-            <div class="table-page-search-wrapper">
+            <div class="table-page-search-wrapper" style="display:flex;align-items: center;">
+              <div style="margin-bottom: 10px;padding-right: 20px;">
+                <a-button
+                  type="primary"
+                  class="button-info"
+                  id="salesEdit-plDel-btn"
+                  @click="handleBatchAdd">批量添加</a-button>
+                  <span>已选{{ selectTotal }}项</span>
+              </div>
               <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
                 <a-row :gutter="15">
-                  <a-col :md="5" :sm="24">
+                  <a-col :md="6" :sm="24">
                     <a-form-item label="调拨单号" prop="allocateNo">
                       <a-input id="editGrap-allocateNo" v-model.trim="queryParam.allocateNo" placeholder="请输入调拨单号" allowClear />
                     </a-form-item>
                   </a-col>
-                  <a-col :md="5" :sm="24">
+                  <a-col :md="6" :sm="24">
                     <a-form-item label="产品编码" prop="productCode">
                       <a-input id="editGrap-productCode" v-model.trim="queryParam.productCode" placeholder="请输入产品编码" allowClear />
                     </a-form-item>
                   </a-col>
-                  <a-col :md="5" :sm="24">
+                  <a-col :md="6" :sm="24">
                     <a-form-item label="产品名称" prop="productName">
                       <a-input id="editGrap-productName" v-model.trim="queryParam.productName" placeholder="请输入产品名称" allowClear />
                     </a-form-item>
@@ -74,16 +83,6 @@
                     <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="storeTransferOutList-refresh">查询</a-button>
                     <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="storeTransferOutList-reset">重置</a-button>
                   </a-col>
-                  <a-col :md="5" :sm="24" style="margin-bottom: 10px;text-align: right;">
-                    <span>已选{{ selectTotal }}项</span>
-                    <a-button
-                      style="margin:0 15px;"
-                      size="small"
-                      type="primary"
-                      class="button-info"
-                      id="salesEdit-plDel-btn"
-                      @click="handleBatchAdd">批量添加</a-button>
-                  </a-col>
                 </a-row>
               </a-form>
             </div>
@@ -178,7 +177,8 @@
               size="small"
               index="1"
               tableId="table2"
-              :rowKey="(record) => record.id"
+              :rowKey="(record) => record.no"
+              rowKeyName="no"
               :columns="chooseColumns"
               :data="chooseLoadData"
               :scroll="{ y: 300 }"
@@ -383,6 +383,8 @@ export default {
           'allocateNo': item.allocateNo,
           'allocateSn': item.allocateSn,
           'oldPrice': item.oldPrice,
+          'cost': item.cost,
+          'returnQty': item.returnQty,
           'price': item.returnPrice,
           'productSn': item.productSn,
           'productCode': item.productCode
@@ -505,6 +507,8 @@ export default {
       const params = {
         allocateReturnSn: this.$route.params.sn,
         productSn: row.productSn,
+        cost: row.cost,
+        returnQty: row.returnQty,
         price: isEdit ? row.price : row.returnPrice,
         allocateNo: row.allocateNo,
         allocateSn: row.allocateSn

+ 1 - 1
src/views/allocationManagement/transferReturn/list.vue

@@ -183,7 +183,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return allocateReturnQueryPage(Object.assign(parameter, this.queryParam)).then(res => {
+        return allocateReturnQueryPage(Object.assign(parameter, this.queryParam,{authWarehouseFlag: 0})).then(res => {
           let data
           if (res.status == 200) {
             data = res.data

+ 14 - 7
src/views/common/chooseWarehouse.js

@@ -53,8 +53,10 @@ const warehouse = {
     }
   },
   mounted () {
-    this.$store.state.app.defWarehouse = null
-    this.$store.state.app.isWarehouse = false
+    if(this.isPermission){
+      this.$store.state.app.defWarehouse = null
+      this.$store.state.app.isWarehouse = false
+    }
     this.getWarehouse()
   },
   watch: {
@@ -78,15 +80,20 @@ const warehouse = {
       const ajaxName = this.isPermission ? queryAuthWarehouse : warehouseAllList
       ajaxName({}).then(res => {
         if (res.status == 200) {
-          this.$store.state.app.isWarehouse = res.data && res.data.length > 1
-          const defWarehouse = res.data.find(item => item.defaultFlag == 1)
-          this.$store.state.app.defWarehouse = this.isPermission ? res.data && res.data[0] : defWarehouse
+          if(this.isPermission){
+            this.$store.state.app.isWarehouse = res.data && res.data.length > 1
+            const defWarehouse = res.data.find(item => item.defaultFlag == 1)
+            this.$store.state.app.defWarehouse = this.isPermission ? res.data && res.data[0] : defWarehouse
+          }
           this.warehouseData = res.data || []
         } else {
-          this.$store.state.app.isWarehouse = false
-          this.$store.state.app.defWarehouse = null
+          if(this.isPermission){
+            this.$store.state.app.isWarehouse = false
+            this.$store.state.app.defWarehouse = null
+          }
           this.warehouseData = []
         }
+        this.$emit('load')
       })
     },
     clearData () {

+ 9 - 2
src/views/dataExport/exportCheck/list.vue

@@ -18,6 +18,7 @@
                 <warehouse
                   v-model="queryParam.warehouseSn"
                   isPermission
+                  @load="loadWareHouse"
                   id="exportCheckList-warehouseSn"
                   placeholder="请选择仓库"
                   @change="getList"
@@ -114,11 +115,17 @@ export default {
         }
       })
     },
-    pageInit () {
-      this.$refs.ruleForm.resetFields()
+    loadWareHouse(){
       const defWareHouse = this.$store.state.app.defWarehouse
       this.queryParam.checkWarehouseSn = undefined
       this.queryParam.warehouseSn = this.isShowWarehouse ? undefined : (defWareHouse?defWareHouse.warehouseSn:undefined)
+
+      if(!this.isShowWarehouse){
+        this.getList(true)
+      }
+    },
+    pageInit () {
+      this.$refs.ruleForm.resetFields()
     }
   },
   mounted () {

+ 1 - 1
src/views/dealerManagement/rebateSettings/queryChild.vue

@@ -48,7 +48,7 @@ export default {
       this.data = []
       this.fetching = true
       const params = {'dealerLevelList': this.dealerLevelList, pageNo: 1, pageSize: 20 }
-      if(this.itemSn){
+      if(this.itemSn && !dealerName){
         params.dealerSn = this.itemSn
       }else{
         params.dealerName = dealerName

+ 3 - 3
src/views/reportData/allocationDetails/list.vue

@@ -64,7 +64,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="出库仓库">
-                  <chooseWarehouse ref="warehouse" v-model="queryParam.billWarehouseSn"></chooseWarehouse>
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -195,7 +195,7 @@ export default {
           subareaAreaSn: undefined
         },
         dealerProvinceSn: undefined,
-        billWarehouseSn: undefined
+        warehouseSn: undefined
       },
       productType: [],
       labelCol: { span: 8 },
@@ -368,7 +368,7 @@ export default {
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.dealerProvinceSn = undefined
-      this.queryParam.billWarehouseSn = undefined
+      this.queryParam.warehouseSn = undefined
       this.productType = []
       this.allocateTypeVal = []
       if(this.advanced){

+ 3 - 3
src/views/reportData/salesDetails/list.vue

@@ -66,7 +66,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="出库仓库">
-                  <chooseWarehouse ref="warehouse" v-model="queryParam.billWarehouseSn"></chooseWarehouse>
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -183,7 +183,7 @@ export default {
         dealerProvinceSn: undefined,
         dealerCitySn: undefined,
         dealerCountySn: undefined,
-        billWarehouseSn: undefined
+        warehouseSn: undefined
       },
       productType: [],
       rules: {
@@ -331,7 +331,7 @@ export default {
       this.queryParam.dealerProvinceSn = undefined
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined
-      this.queryParam.billWarehouseSn = undefined
+      this.queryParam.warehouseSn = undefined
       if(this.advanced){
         this.$refs.subarea.clearData()
         this.$refs.areaList.clearData()

+ 5 - 5
src/views/reportData/salesReturnDetailReport/list.vue

@@ -65,8 +65,8 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="出库仓库">
-                  <chooseWarehouse ref="warehouse" v-model="queryParam.billWarehouseSn"></chooseWarehouse>
+                <a-form-model-item label="退货仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -179,7 +179,7 @@ export default {
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
-        billWarehouseSn: undefined,
+        warehouseSn: undefined,
         subareaArea:{
           subareaSn: undefined,
           subareaAreaSn: undefined
@@ -225,7 +225,7 @@ export default {
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货单号', dataIndex: 'salesReturnBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '出库仓库', dataIndex: 'warehouseName', width: 150, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '退货仓库', dataIndex: 'warehouseName', width: 150, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '省份', dataIndex: 'dealerProvinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户名称', dataIndex: 'dealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -374,7 +374,7 @@ export default {
       this.queryParam.dealerProvinceSn = undefined
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined
-      this.queryParam.billWarehouseSn = undefined
+      this.queryParam.warehouseSn = undefined
       this.productType = []
       if (this.advanced) {
         this.$refs.subarea.clearData()

+ 3 - 3
src/views/reportData/urchaseDetailReturn/detailList.vue

@@ -60,7 +60,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="出库仓库">
-                  <chooseWarehouse ref="warehouse" v-model="queryParam.billWarehouseSn"></chooseWarehouse>
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -160,7 +160,7 @@ export default {
         endDate: getDate.getCurrMonthDays().endtime,
         sparePartsReturnNo: '', // 采购退货单号
         returnReason: '',
-        billWarehouseSn: undefined,
+        warehouseSn: undefined,
         product: {
           name: '',
           code: '',
@@ -292,7 +292,7 @@ export default {
       this.queryParam.supplier.provinceSn = undefined
       this.queryParam.supplier.citySn = undefined
       this.queryParam.supplier.districtSn = undefined
-      this.queryParam.billWarehouseSn = undefined
+      this.queryParam.warehouseSn = undefined
       this.totalData = null
       if(this.advanced){
         this.$refs.areaList.clearData()

+ 3 - 3
src/views/reportData/warehousingOrderDetail/list.vue

@@ -46,7 +46,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="入库仓库">
-                  <chooseWarehouse ref="warehouse" v-model="queryParam.billWarehouseSn"></chooseWarehouse>
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
             <template v-if="advanced">
@@ -147,7 +147,7 @@ export default {
         supplierName: '',
         productName: '',
         productCode: '',
-        billWarehouseSn: undefined
+        warehouseSn: undefined
       },
       rules: {
         'time': [{ required: true, message: '请选择完成日期', trigger: 'change' }]
@@ -250,7 +250,7 @@ export default {
       this.queryParam.supplierName = ''
       this.queryParam.productName = ''
       this.queryParam.productCode = ''
-      this.queryParam.billWarehouseSn = undefined
+      this.queryParam.warehouseSn = undefined
       this.totalData = null
       this.$refs.ruleForm.resetFields()
       this.$refs.table.clearTable()

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

@@ -156,7 +156,7 @@ export default {
         { title: '缺货数量', dataIndex: 'qty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '缺货金额', dataIndex: 'totalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '客户名称', dataIndex: 'buyerName', width: '18%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '仓库', dataIndex: 'billWarehouseName', width: '18%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
+        { title: '仓库', dataIndex: 'warehouseName', width: '18%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
       if (this.$hasPermissions('M_shortageStatisticsPList_salesPrice')) { //  售价权限
         arr.splice(6, 0, { title: '缺货金额', dataIndex: 'totalAmount', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })

+ 3 - 3
src/views/salesReturnManagement/receiveCheck/list.vue

@@ -33,7 +33,7 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24" v-show="isShowWarehouse">
-              <a-form-model-item label="出库仓库">
+              <a-form-model-item label="退货仓库">
                 <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
               </a-form-model-item>
             </a-col>
@@ -177,7 +177,7 @@ export default {
         { title: '审核时间', dataIndex: 'auditTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '10%', align: 'center' },
         { title: '客户名称', dataIndex: 'buyerName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        // { title: '出库仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        // { title: '退货仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '申请退货数量', dataIndex: 'totalInitialQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓库实收数量', dataIndex: 'totalReceiveQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'totalBadQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -187,7 +187,7 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
       if (this.isShowWarehouse) {
-        arr.splice(4, 0, { title: '出库仓库', dataIndex: 'warehouseName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true })
+        arr.splice(4, 0, { title: '退货仓库', dataIndex: 'warehouseName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true })
       }
       return arr
     }

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

@@ -7,12 +7,12 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-item label="产品编码">
-                <a-input id="salesReturnList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+                <a-input id="salesReturnList-productCode" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="产品名称">
-                <a-input id="salesReturnList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+                <a-input id="salesReturnList-productName" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
@@ -118,8 +118,8 @@ export default {
       buyerSn: '',
       priceType: '',
       queryParam: { //  查询条件
-        productName: '', // 产品名称
-        productCode: '' //  产品编码
+        name: '', // 产品名称
+        code: '' //  产品编码
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [],
@@ -161,8 +161,8 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.queryParam.productName = ''
-      this.queryParam.productCode = ''
+      this.queryParam.name = ''
+      this.queryParam.code = ''
       this.$refs.table.refresh(true)
     },
     pageInit (buyerSn, warehouseSn) {

+ 2 - 2
vue.config.js

@@ -107,9 +107,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.117/ocs-admin',
+        // target: 'http://192.168.2.111/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        // target: 'http://p.ocs.360arrow.com/ocs-admin', //  预发布
+        target: 'http://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {