lilei 2 år sedan
förälder
incheckning
68cae8c488

+ 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()

+ 3 - 3
src/views/reportData/salesReturnDetailReport/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">
@@ -179,7 +179,7 @@ export default {
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
-        billWarehouseSn: undefined,
+        warehouseSn: undefined,
         subareaArea:{
           subareaSn: undefined,
           subareaAreaSn: undefined
@@ -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) : '--') })

+ 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.111/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: {