Browse Source

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

lilei 2 years ago
parent
commit
33a1390035

+ 23 - 25
src/views/reportData/billingBackReport/list.vue

@@ -17,7 +17,7 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="5" :sm="24">
-              <a-form-model-item label="供应商名称" prop="salesStatusType">
+              <a-form-model-item label="供应商名称">
                 <a-input id="billingBackReport-supplierName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入供应商名称"/>
               </a-form-model-item>
             </a-col>
@@ -29,13 +29,13 @@
             <a-col :md="7" :sm="24">
               <a-form-model-item label="地区">
                 <div style="display:flex;algin-item:center;">
-                  <a-select v-model="queryParam.dealer.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
+                  <a-select v-model="queryParam.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
                     <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
                   </a-select>
-                  <a-select v-model="queryParam.dealer.citySn" allowClear @change="getAreaList" placeholder="请选择市">
+                  <a-select v-model="queryParam.citySn" allowClear @change="getAreaList" placeholder="请选择市">
                     <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
                   </a-select>
-                  <a-select v-model="queryParam.dealer.districtSn" allowClear placeholder="请选择区/县">
+                  <a-select v-model="queryParam.districtSn" allowClear placeholder="请选择区/县">
                     <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
                   </a-select>
                 </div>
@@ -79,7 +79,7 @@
                 <a-col span="4">冠牌滤清器:{{ (totalData && (totalData.gpLqqAmount || totalData.gpLqqAmount==0)) ? toThousands(totalData.gpLqqAmount) : '--' }}</a-col>
                 <a-col span="4">滤清器合计:{{ (totalData && (totalData.gpLqqAmount || totalData.gpLqqAmount==0)) ? toThousands(totalData.gpLqqAmount) : '--' }}</a-col>
                 <a-col span="4">箭牌雨刮片:{{ (totalData && (totalData.jpYgpAmount || totalData.jpYgpAmount==0)) ? toThousands(totalData.jpYgpAmount) : '--' }}</a-col>
-                <a-col span="4">箭牌雨燕雨刮片:{{ (totalData && (totalData.jpYgpAmount || totalData.jpYgpAmount==0)) ? toThousands(totalData.jpYgpAmount) : '--' }}</a-col>
+                <a-col span="4">箭牌雨燕雨刮片:{{ (totalData && (totalData.jpAmount || totalData.jpAmount==0)) ? toThousands(totalData.jpAmount) : '--' }}</a-col>
                 <a-col span="4">冠牌雨刮片:{{ (totalData && (totalData.gpYgpAmount || totalData.gpYgpAmount==0)) ? toThousands(totalData.gpYgpAmount) : '--' }}</a-col>
                 <a-col span="4">雨刮片合计:{{ (totalData && (totalData.gpYgpAmount || totalData.gpYgpAmount==0)) ? toThousands(totalData.gpYgpAmount) : '--' }}</a-col>
                 <a-col span="4">箭牌喇叭:{{ (totalData && (totalData.jpLbAmount || totalData.jpLbAmount==0)) ? toThousands(totalData.jpLbAmount) : '--' }}</a-col>
@@ -106,8 +106,6 @@
                 <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? toThousands(totalData.lbstAmount) : '--' }}</a-col>
                 <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? toThousands(totalData.defAmount) : '--' }}</a-col>
                 <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? toThousands(totalData.bndAmount) : '--' }}</a-col>
-                <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? toThousands(totalData.bndAmount) : '--' }}</a-col>
-                <a-col span="12">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? toThousands(totalData.bndAmount) : '--' }}</a-col>
                 <a-col span="4" style="margin-top:20px;">品牌合计:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
                 <a-col span="4" style="margin-top:20px;">代理品牌合计:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
                 <a-col span="4" style="margin-top:20px;">开单采退金额合计:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
@@ -147,14 +145,12 @@ export default {
         time: [],
         beginDate: '',
         endDate: '',
-        dealer: {
-          'dealerSn': undefined,
-          'provinceSn': undefined,
-          'citySn': undefined,
-          'districtSn': undefined,
-          'subareaSn': undefined,
-          'dealerLevel': undefined
-        },
+        supplierName: '',
+        dealerSn: undefined,
+        provinceSn: undefined,
+        citySn: undefined,
+        districtSn: undefined,
+        dealerLevel: undefined,
         dealerProvinceSn: undefined,
         subareaSn: undefined,
         salesStatusType: 'REAL_SALES'
@@ -164,6 +160,7 @@ export default {
       addrDistrictList: [], //  区下拉
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
+      totalData: null,
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }],
         'salesStatusType': [{ required: true, message: '请选择销售状态', trigger: 'change' }]
@@ -191,14 +188,14 @@ export default {
       const _this = this
       const arr = [
         { title: '区域', dataIndex: 'subareaNames', width: 50, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '分区', dataIndex: 'subareaNames', width: 50, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '供应商名称', dataIndex: 'subareaNames', width: 50, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '分区', dataIndex: 'subareaNames1', width: 50, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '供应商名称', dataIndex: 'subareaNames2', width: 50, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '箭牌滤清器', dataIndex: 'jpLqqAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '箭牌变速箱滤清器', dataIndex: 'jpLqqAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '箭牌变速箱滤清器', dataIndex: 'jpLqqAmount1', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '冠牌滤清器', dataIndex: 'gpLqqAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '滤清器合计', dataIndex: 'lqqAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '箭牌雨刮片', dataIndex: 'jpYgpAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '箭牌雨燕雨刮片', dataIndex: 'jpYgpAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '箭牌雨燕雨刮片', dataIndex: 'jpYgpAmount1', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '冠牌雨刮片', dataIndex: 'gpYgpAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '雨刮片合计', dataIndex: 'ygpAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '箭牌喇叭', dataIndex: 'jpLbAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
@@ -225,13 +222,13 @@ export default {
         { title: '品牌合计', dataIndex: 'ppAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: 'NGK火花塞', dataIndex: 'ngkAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '飞利浦', dataIndex: 'tbuGyxAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '车仆防冻液', dataIndex: 'tbuGyxAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '瓦尔塔', dataIndex: 'tbuGyxAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '雷贝斯托', dataIndex: 'tbuGyxAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '德尔福', dataIndex: 'tbuGyxAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '巴诺德', dataIndex: 'tbuGyxAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '车仆防冻液', dataIndex: 'tbuGyxAmount1', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '瓦尔塔', dataIndex: 'tbuGyxAmount2', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '雷贝斯托', dataIndex: 'tbuGyxAmount3', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '德尔福', dataIndex: 'tbuGyxAmount4', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '巴诺德', dataIndex: 'tbuGyxAmount5', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '代理品牌合计', dataIndex: 'ppAndNgkAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '开单采退金额合计', dataIndex: 'tbuGyxAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '开单采退金额合计', dataIndex: 'tbuGyxAmount6', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
       // if (this.activeKey == 0) {
       //   arr.splice(1, 0, { title: '省份', dataIndex: 'dealerProvinceName', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
@@ -331,6 +328,7 @@ export default {
       this.$refs.rangeDate.resetDate(this.queryParam.time)
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
+      this.queryParam.supplierName = ''
       this.queryParam.dealerProvinceSn = undefined
       this.queryParam.subareaSn = undefined
       this.queryParam.salesStatusType = 'REAL_SALES'

+ 2 - 5
src/views/reportData/billingOrderReport/list.vue

@@ -17,12 +17,12 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="5" :sm="24">
-              <a-form-model-item label="供应商名称" prop="salesStatusType">
+              <a-form-model-item label="供应商名称">
                 <a-input id="billingBackReport-supplierName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入供应商名称"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="5" :sm="24">
-              <a-form-model-item label="采购退货单号" prop="salesStatusType">
+              <a-form-model-item label="采购退货单号" >
                 <a-input id="billingBackReport-supplierName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入供应商名称"/>
               </a-form-model-item>
             </a-col>
@@ -112,12 +112,9 @@
                 <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? toThousands(totalData.lbstAmount) : '--' }}</a-col>
                 <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? toThousands(totalData.defAmount) : '--' }}</a-col>
                 <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? toThousands(totalData.bndAmount) : '--' }}</a-col>
-                <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? toThousands(totalData.bndAmount) : '--' }}</a-col>
-                <a-col span="12">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? toThousands(totalData.bndAmount) : '--' }}</a-col>
                 <a-col span="4" style="margin-top:20px;">品牌合计:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
                 <a-col span="4" style="margin-top:20px;">代理品牌合计:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
                 <a-col span="4" style="margin-top:20px;">开单采退金额合计:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
-
               </a-row>
             </a-col>
           </a-row>

+ 5 - 5
src/views/setting/erpMessageManagement/list.vue

@@ -51,8 +51,8 @@
           <a-button
             size="small"
             type="link"
-            v-if="$hasPermissions('B_rebateSettings_edit')"
             class="button-info"
+            v-if="record.status&&record.status!='success'"
             @click="handleAgainSync(record)"
             id="rebateSettingsList-edit-btn">重新同步</a-button>
           <span v-else>--</span>
@@ -84,11 +84,11 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '3.5%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '同步时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '业务模块', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '业务编码', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '同步时间', dataIndex: 'tbDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务模块', dataIndex: 'work', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务编码', dataIndex: 'ywno', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '同步状态', scopedSlots: { customRender: 'syncStatus' }, width: '7%', align: 'center' },
-        { title: '错误信息', dataIndex: 'createDate', width: '18%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '错误信息', dataIndex: 'errorInfo', width: '18%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象