lilei 3 тижнів тому
батько
коміт
16a9d5947f

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

@@ -25,7 +25,7 @@
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="客户关系">
-              <v-select code="CUSTOMER_RELATION_TYPE" id="salesDetailReportList-buyerRelationType" v-model="queryParam.buyerRelationType" allowClear placeholder="请选择客户关系"></v-select>
+              <v-select code="CUSTOMER_RELATION_TYPE" id="salesDetailReportList-customerRelationType" v-model="queryParam.customerRelationType" allowClear placeholder="请选择客户关系"></v-select>
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -138,7 +138,7 @@ export default {
           name: '' //  产品名称
         },
         salesReturnNo: '',
-        buyerRelationType: undefined //  客户类型
+        customerRelationType: undefined //  客户类型
       },
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
@@ -242,7 +242,7 @@ export default {
       this.queryParam.salesReturnNo = ''
       this.queryParam.buyerNameCurrent = undefined
       this.queryParam.buyerSnCurrent = undefined
-      this.queryParam.buyerRelationType = undefined
+      this.queryParam.customerRelationType = undefined
       this.$refs.custSatelliteList.resetForm()
       this.queryParam.productEntity.productBrandSn = undefined
       this.queryParam.productEntity.productTypeSn1 = ''

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

@@ -25,7 +25,7 @@
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="客户关系">
-              <v-select code="CUSTOMER_RELATION_TYPE" id="salesReturnReportList-buyerRelationType" v-model="queryParam.buyerRelationType" allowClear placeholder="请选择客户关系"></v-select>
+              <v-select code="CUSTOMER_RELATION_TYPE" id="salesReturnReportList-customerRelationType" v-model="queryParam.customerRelationType" allowClear placeholder="请选择客户关系"></v-select>
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -102,7 +102,7 @@ export default {
         buyerNameCurrent: undefined, // 客户名称
         buyerSnCurrent: undefined, // 客户sn
         salesReturnNo: '', // 销售退货单号
-        buyerRelationType: undefined // 客户关系
+        customerRelationType: undefined // 客户关系
       },
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
@@ -205,7 +205,7 @@ export default {
       this.queryParam.salesReturnNo = ''
       this.queryParam.buyerNameCurrent = undefined
       this.queryParam.buyerSnCurrent = undefined
-      this.queryParam.buyerRelationType = undefined
+      this.queryParam.customerRelationType = undefined
       this.$refs.custSatelliteList.resetForm()
       this.$refs.ruleForm.resetFields()
       this.totalData = null

+ 2 - 1
src/views/salesManagement/urgentItemsOffset/list.vue

@@ -136,11 +136,12 @@ export default {
         { title: '急件单号', scopedSlots: { customRender: 'urgentBillNo' }, width: '15%', align: 'center' },
         { title: '关联单号', dataIndex: 'bizBillNo', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         // { title: '销售单来源', dataIndex: 'sourceTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'buyerNameCurrent', width: '22%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'buyerNameCurrent', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总款数', dataIndex: 'totalCategory', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'totalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总成本', dataIndex: 'totalCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '总售价', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '毛利', dataIndex: 'grossProfit', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '冲减时间', dataIndex: 'offSetTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', scopedSlots: { customRender: 'status' }, width: '4%', align: 'center' },